下半部分数据bug修改

src/components/userJoin/screenTwoPag2.vue

@@ -1439,6 +1439,14 @@
 
             bottomData_q.forEach((item, index) => {
 
+              if (item.XZQH_TEXT) {
+
+              } else if (item.YLJGDM_EX2) {
+
+              } else {
+
+                return false
+              }
               item.zbxx.forEach((item2, index2) => {
                 // IBM 数据赋值
                 if(this.mbType === 'gxy'){

src/components/userJoin/screenTwoPag4.vue

@@ -501,28 +501,6 @@
               return res
             }
           },
-          dataZoom: {
-            start: 0, //默认为0
-            end: 50, //默认为100
-            type: 'slider',
-            show: true ,
-            xAxisIndex: [0] ,
-            handleSize: 20 , //滑动条的 左右2个滑动条的大小
-            height: 5 , //组件高度
-            left: 50, //左边的距离
-            right: 45, //右边的距离
-            bottom: 40, //右边的距离
-            backgroundColor: '#ccc', //两边未选中的滑动条区域的颜色
-            showDataShadow: true, //是否显示数据阴影 默认auto
-            handleStyle: {
-                borderColor: "#CBBCDB",
-                borderWidth: "1",
-                shadowBlur: 1,
-                background: "#000",
-                shadowColor: "#000",
-            },
-            filterMode: 'filter',
-          },
           legend: {
             textStyle: {
               color: '#8393A9',
@@ -1125,6 +1103,14 @@
             }
 
             this.tableq.forEach((item, index) => {
+              if (item.XZQH_TEXT) {
+
+              } else if (item.YLJGDM_EX2) {
+
+              } else {
+
+                return false
+              }
               let obj = {
                 name: '',
                 code: '',

src/components/userJoin/screenTwoPag5.vue

@@ -34,7 +34,7 @@
       </div>
       <div class="card33-mod">
         <div class="page5left" id="pag5-left1" v-show="zlOrXn === 'zl'">1</div>
-        <div class="page5left" id="pag5-left2" v-show="zlOrXn === 'xn'">2</div>
+        <div class="page5left" id="pag5-left2" v-show="zlOrXn === 'xn' && pageLevel === 'sj'">2</div>
       </div>
     </div>
     <div class="card-dark card-02">
@@ -59,7 +59,7 @@
       </div>
       <div class="card33-mod">
         <div class="page5left" id="pag5-right1" v-show="zlOrXn === 'zl'"></div>
-        <div class="page5left" id="pag5-right2" v-show="zlOrXn === 'xn'"></div>
+        <div class="page5left" id="pag5-right2" v-show="zlOrXn === 'xn' && pageLevel === 'sj'"></div>
       </div>
     </div>
     <div class="clear10"></div>
@@ -74,7 +74,7 @@
     </div>
     <div class="card-dark card-04">
       <div class="card3title1">登记报告分析</div>
-      <div class="card3title2" v-show="zlOrXn === 'xn'">
+      <div class="card3title2" v-show="zlOrXn === 'xn' && pageLevel === 'sj'">
         <span @click="dengjiChange('')" :class="djNo==''?'myclk':''">全部</span> |
         <span @click="dengjiChange(1)" :class="djNo==1?'myclk':''">三级</span> |
         <span @click="dengjiChange(2)" :class="djNo==2?'myclk':''">二级</span> |
@@ -146,7 +146,7 @@
           <tbody class="scrollTbody">
           <tr v-for="(item, index) in topData" :key="index">
             <td><span>{{index+1}}</span></td>
-            <td @click="changecity(item.areacode,item.name)" class="underline">{{item.name}}</td>
+            <td @click="changecity(item.code,item.name)" class="underline">{{item.name}}</td>
             <td>{{item.tag1}} / {{item.tag2}}</td>
             <td>{{item.tag3}} / {{item.tag4}}</td>
           </tr>
@@ -844,7 +844,7 @@
         this.homebot()
       },
       changecity(code, name) {
-        this.areaname = name
+
         if (this.pageLevel === 'sj') {
           //  点击区 -- 展示城镇信息
           this.pageLevel = 'qj'
@@ -852,19 +852,13 @@
           this._group = 'YLJGDM'
           this.isShowBack = true
 
-          this.areaname2 = name
+          this.areaname = name
           this.aename = '社区'
           this.tablename = '医院'
           this.thname = '医院'
 
         } else if (this.pageLevel === 'qj') {
-          this._group = 'YWSJ'
-          this._yljgdm = code
-          this.pageLevel = 'sq'
-          this.isShowBack = true
-
-          this.tablename = '时间'
-          this.thname = '月份'
+          return false
 
         } else if (this.pageLevel === 'sq') {
           return false
@@ -953,6 +947,10 @@
             "name": "XZQH",
             "value": this._xzqh,
             "type": "1"
+          },{
+            "name": "YLJGDM",
+            "value": this._yljgdm,
+            "type": "1"
           }]
 
           let param = {
@@ -983,7 +981,6 @@
               _this.option1.series[0].data[1].name = '非信息化业务开展机构数'
               _this.option1.series[0].data[1].value = _this.msgclosedata.ZXZ
 
-
               _this.option2.series[0].data[0].name = '信息化登记报告数'
               _this.option2.series[0].data[0].value = _this.msgopendata.ZXZ
               _this.option2.series[0].data[1].name = '非信息化登记报告数'
@@ -1280,6 +1277,9 @@
         let line3_tbl = []
         let line4 = []
         let line4_tbl = []
+        this.kzqk_tabledata = []
+        this.blqb_tabledata = []
+        this.lbqk_tabledata = []
         if(_this.zlOrXn === 'zl'){
 
           let wd4 = [{
@@ -1361,7 +1361,7 @@
               
             })
 
-            bottomData.forEach((ite, index) => {
+            dataX.forEach((ite,index) =>{
               let kzqkObj = {},blqbObj = {},lbqkObj = {}
               kzqkObj.name = dataX[index]
               kzqkObj.code = dataCode[index]