rj

embed_applications/app/front/vues/pages/noticetm/noticetm.html

@@ -2,7 +2,7 @@
         <div class="detail-loading" v-if="loading" v-loading="true"></div>
         <div class="detail-loading" v-if="loading" v-loading="true"></div>
         <div class="noticetm-main-name">商标公告</div>
         <div class="noticetm-main-name">商标公告</div>
         <div class="noticetm-main-title">
         <div class="noticetm-main-title">
-                <div :class="brandKey == 1 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 1">最新12期公告</div>
+                <div :class="brandKey == 1 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 1">最新11期公告</div>
                 <div :class="brandKey == 2 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 2">公告商标查询</div>
                 <div :class="brandKey == 2 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 2">公告商标查询</div>
         </div>
         </div>
         <div class="noticetm-notice" v-if="brandKey==1">
         <div class="noticetm-notice" v-if="brandKey==1">
@@ -98,9 +98,9 @@
                                 </el-checkbox-group> -->
                                 </el-checkbox-group> -->
                                 <el-radio-group v-model="selected_issue" size="mini" :border="true"
                                 <el-radio-group v-model="selected_issue" size="mini" :border="true"
                                         @change="noticetmquery" style="dispaly:flex">
                                         @change="noticetmquery" style="dispaly:flex">
-                                        <el-radio-button label="不限">
+                                        <!-- <el-radio-button label="不限">
                                                 不限
                                                 不限
-                                        </el-radio-button>
+                                        </el-radio-button> -->
                                         <div>
                                         <div>
                                                 <el-radio-button v-for="(item, index) in issue_list" :label="item.value"
                                                 <el-radio-button v-for="(item, index) in issue_list" :label="item.value"
                                                         v-model="item.value">
                                                         v-model="item.value">

embed_applications/app/front/vues/pages/noticetm/noticetm.js

@@ -91,8 +91,8 @@
       this.loading = true;
       this.loading = true;
       this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) {
       this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) {
         that.loading = false;
         that.loading = false;
-        that.issue_list = d.data.selectdata;
-        that.issue_data = d.data.rows;
+        that.issue_list = d.data.selectdata.slice(1,12);
+        that.issue_data = d.data.rows.slice(1,12);
         that.maxdata = d.data.selectdata[0].value;
         that.maxdata = d.data.selectdata[0].value;
         console.log(d, "//////////////////////////");
         console.log(d, "//////////////////////////");
       }).catch(function (e) {
       }).catch(function (e) {

embed_applications/app/front/vues/pages/tmbigdata/tmbigdata.js

@@ -17,7 +17,7 @@
                 }, {
                 }, {
                     value: '2015',
                     value: '2015',
                     label: '2015'
                     label: '2015'
-                }, {
+                }, { 
                     value: '2014',
                     value: '2014',
                     label: '2014'
                     label: '2014'
                 }, {
                 }, {
@@ -666,7 +666,7 @@
 
 
     methods: {
     methods: {
         brandEve(val) {
         brandEve(val) {
-            console.log(val);
+            console.log(val,"zxcvbnm");
             this.tmindexdetailPost()
             this.tmindexdetailPost()
         },
         },
         tmindexdetailPost() {
         tmindexdetailPost() {
@@ -861,8 +861,7 @@
 
 
         },
         },
         showProvince(pName, Chinese_){
         showProvince(pName, Chinese_){
-            ;
-            console.log(pName, Chinese_);
+            console.log(pName, Chinese_,"213231333333333333333333");
             this.provinceNameOne = Chinese_ || this.provinceNameOne;
             this.provinceNameOne = Chinese_ || this.provinceNameOne;
             this.cityEchartdata.series[0].mapType = '';
             this.cityEchartdata.series[0].mapType = '';
             this.provinceName = Chinese_;
             this.provinceName = Chinese_;
@@ -879,6 +878,7 @@
             var script = document.createElement("script");
             var script = document.createElement("script");
 
 
             script.type = "text/javascript";
             script.type = "text/javascript";
+            console.log(script.readyState,"script.readyState");
             if (script.readyState) {
             if (script.readyState) {
                 console.log(1);
                 console.log(1);
                 script.onreadystatechange = function () {
                 script.onreadystatechange = function () {
@@ -908,7 +908,7 @@
             this.myChart = echarts.init(document.getElementById('container'));
             this.myChart = echarts.init(document.getElementById('container'));
             this.myChart.setOption(this.regionEchartdata, true);
             this.myChart.setOption(this.regionEchartdata, true);
             this.myChart.on('click', function (params) {
             this.myChart.on('click', function (params) {
-                console.log(params);
+                console.log(params,"213321");
                 that.city = params.name;
                 that.city = params.name;
                 for (var i = 0; i < that.provincesText.length; i++) {
                 for (var i = 0; i < that.provincesText.length; i++) {
                     if (params.name == that.provincesText[i]) {
                     if (params.name == that.provincesText[i]) {