echarts图时间数据bug修改

src/components/userJoin/screenTwoPag1.vue

@@ -2074,8 +2074,10 @@
         })
       },
       toNextOrg(code, name) {
+        if(this._group === 'YWSJ'){
+          return false
+        }
         if (this.pageLevel === 'sj') {
-
           console.log("此处是第一次点击");
           this.pageLevel = 'qj'
           this._group = 'YLJGDM'

src/components/userJoin/screenTwoPag2.vue

@@ -839,6 +839,9 @@
         this.change_age(1)
       },
       changecity(code, name) {
+        if(this._group === 'YWSJ'){
+          return false
+        }
         if (this.pageLevel === 'sj') {
           //  点击区 -- 展示城镇信息
           this.pageLevel = 'qj'
@@ -1324,6 +1327,7 @@
               let obj = {}
               if (item.YWSJ) {
                 obj.name = parseInt(item.YWSJ.substring(6, 7))
+                dataX=['一季度','二季度','三季度','四季度']
               } else {
                 if (item.XZQH_TEXT) {
                   obj.name = item.XZQH_TEXT
@@ -1535,7 +1539,144 @@
 
             })
             this.topListData = []
+            if(this._group === 'YWSJ'){
+             if(bar1_g.length === 12){
+               bar1_g = [bar1_g[2],bar1_g[5],bar1_g[8],bar1_g[11]]
+               bar1_q = [bar1_q[2],bar1_q[5],bar1_q[8],bar1_q[11]]
+               bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[8],bar1_g_qn[11]]
+               bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[8],bar1_q_qn[11]]
+               line1 = [line1[2],line1[5],line1[8],line1[11]]
+               line2 = [line2[2],line2[5],line2[8],line2[11]]
+               line3 = [line3[2],line3[5],line3[8],line3[11]]
+               line4 = [line4[2],line4[5],line4[8],line4[11]]
+               line5 = [line5[2],line5[5],line5[8],line5[11]]
+               line6 = [line6[2],line6[5],line6[8],line6[11]]
+              }else if(bar1_g.length === 11){
+               bar1_g = [bar1_g[2],bar1_g[5],bar1_g[8],bar1_g[10]]
+               bar1_q = [bar1_q[2],bar1_q[5],bar1_q[8],bar1_q[10]]
+               bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[8],bar1_g_qn[10]]
+               bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[8],bar1_q_qn[10]]
+               line1 = [line1[2],line1[5],line1[8],line1[10]]
+               line2 = [line2[2],line2[5],line2[8],line2[10]]
+               line3 = [line3[2],line3[5],line3[8],line3[10]]
+               line4 = [line4[2],line4[5],line4[8],line4[10]]
+               line5 = [line5[2],line5[5],line5[8],line5[10]]
+               line6 = [line6[2],line6[5],line6[8],line6[10]]
+             }else if(bar1_g.length === 10){
+               bar1_g = [bar1_g[2],bar1_g[5],bar1_g[8],bar1_g[9]]
+               bar1_q = [bar1_q[2],bar1_q[5],bar1_q[8],bar1_q[11]]
+               bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[8],bar1_g_qn[9]]
+               bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[8],bar1_q_qn[9]]
+               line1 = [line1[2],line1[5],line1[8],line1[9]]
+               line2 = [line2[2],line2[5],line2[8],line2[9]]
+               line3 = [line3[2],line3[5],line3[8],line3[9]]
+               line4 = [line4[2],line4[5],line4[8],line4[9]]
+               line5 = [line5[2],line5[5],line5[8],line5[9]]
+               line6 = [line6[2],line6[5],line6[8],line6[9]]
+             }else if(bar1_g.length === 9){
+               bar1_g = [bar1_g[2],bar1_g[5],bar1_g[8],0]
+               bar1_q = [bar1_q[2],bar1_q[5],bar1_q[8],0]
+               bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[8],0]
+               bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[8],0]
+               line1 = [line1[2],line1[5],line1[8],0]
+               line2 = [line2[2],line2[5],line2[8],0]
+               line3 = [line3[2],line3[5],line3[8],0]
+               line4 = [line4[2],line4[5],line4[8],0]
+               line5 = [line5[2],line5[5],line5[8],0]
+               line6 = [line6[2],line6[5],line6[8],0]
+             }else if(bar1_g.length === 8){
+               bar1_g = [bar1_g[2],bar1_g[5],bar1_g[7],0]
+               bar1_q = [bar1_q[2],bar1_q[5],bar1_q[7],0]
+               bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[7],0]
+               bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[7],0]
+               line1 = [line1[2],line1[5],line1[7],0]
+               line2 = [line2[2],line2[5],line2[7],0]
+               line3 = [line3[2],line3[5],line3[7],0]
+               line4 = [line4[2],line4[5],line4[7],0]
+               line5 = [line5[2],line5[5],line5[7],0]
+               line6 = [line6[2],line6[5],line6[7],0]
+             }else if(bar1_g.length === 7){
+               bar1_g = [bar1_g[2],bar1_g[5],bar1_g[6],0]
+               bar1_q = [bar1_q[2],bar1_q[5],bar1_q[6],0]
+               bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[6],0]
+               bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[6],0]
+               line1 = [line1[2],line1[5],line1[6],0]
+               line2 = [line2[2],line2[5],line2[6],0]
+               line3 = [line3[2],line3[5],line3[6],0]
+               line4 = [line4[2],line4[5],line4[6],0]
+               line5 = [line5[2],line5[5],line5[6],0]
+               line6 = [line6[2],line6[5],line6[6],0]
+             }else if(bar1_g.length === 6){
+               bar1_g = [bar1_g[2],bar1_g[5],0,0]
+               bar1_q = [bar1_q[2],bar1_q[5],0,0]
+               bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],0,0]
+               bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],0,0]
+               line1 = [line1[2],line1[5],0,0]
+               line2 = [line2[2],line2[5],0,0]
+               line3 = [line3[2],line3[5],0,0]
+               line4 = [line4[2],line4[5],0,0]
+               line5 = [line5[2],line5[5],0,0]
+               line6 = [line6[2],line6[5],0,0]
+             }else if(bar1_g.length === 5){
+               bar1_g = [bar1_g[2],bar1_g[4],0,0]
+               bar1_q = [bar1_q[2],bar1_q[4],0,0]
+               bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[4],0,0]
+               bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[4],0,0]
+               line1 = [line1[2],line1[4],0,0]
+               line2 = [line2[2],line2[4],0,0]
+               line3 = [line3[2],line3[4],0,0]
+               line4 = [line4[2],line4[4],0,0]
+               line5 = [line5[2],line5[4],0,0]
+               line6 = [line6[2],line6[4],0,0]
+             }else if(bar1_g.length === 4){
+               bar1_g = [bar1_g[2],bar1_g[3],0,0]
+               bar1_q = [bar1_q[2],bar1_q[5],0,0]
+               bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[3],0,0]
+               bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[3],0,0]
+               line1 = [line1[2],line1[3],0,0]
+               line2 = [line2[2],line2[3],0,0]
+               line3 = [line3[2],line3[3],0,0]
+               line4 = [line4[2],line4[3],0,0]
+               line5 = [line5[2],line5[3],0,0]
+               line6 = [line6[2],line6[3],0,0]
+             }else if(bar1_g.length === 3){
+               bar1_g = [bar1_g[2],0,0,0]
+               bar1_q = [bar1_q[2],0,0,0]
+               bar1_g_qn = [bar1_g_qn[2],0,0,0]
+               bar1_q_qn = [bar1_q_qn[2],0,0,0]
+               line1 = [line1[2],0,0,0]
+               line2 = [line2[2],0,0,0]
+               line3 = [line3[2],0,0,0]
+               line4 = [line4[2],0,0,0]
+               line5 = [line5[2],0,0,0]
+               line6 = [line6[2],0,0,0]
+             }else if(bar1_g.length === 2){
+               bar1_g = [bar1_g[1],0,0,0]
+               bar1_q = [bar1_q[1],0,0,0]
+               bar1_g_qn = [bar1_g_qn[1],0,0,0]
+               bar1_q_qn = [bar1_q_qn[1],0,0,0]
+               line1 = [line1[1],0,0,0]
+               line2 = [line2[1],0,0,0]
+               line3 = [line3[1],0,0,0]
+               line4 = [line4[1],0,0,0]
+               line5 = [line5[1],0,0,0]
+               line6 = [line6[1],0,0,0]
+             }else if(bar1_g.length === 1){
+               bar1_g = [bar1_g[0],0,0,0]
+               bar1_q = [bar1_q[0],0,0,0]
+               bar1_g_qn = [bar1_g_qn[0],0,0,0]
+               bar1_q_qn = [bar1_q_qn[0],0,0,0]
+               line1 = [line1[0],0,0,0]
+               line2 = [line2[0],0,0,0]
+               line3 = [line3[0],0,0,0]
+               line4 = [line4[0],0,0,0]
+               line5 = [line5[0],0,0,0]
+               line6 = [line6[0],0,0,0]
+             }
+
+            }
             bar1_g.forEach((item, index) => {
+
               let obj = {}
               let a = getActiveNum(bar1_g[index] - bar1_q[index])
               let b = getActiveNum(bar1_g_qn[index] - bar1_q_qn[index])
@@ -1551,14 +1692,14 @@
               this.topListData.push(obj)
 
               let tooltip = {}
-              tooltip.num1 = bar1_g[index]
-              tooltip.num2 = bar1_q[index]
-              tooltip.num3 = bar1_g_qn[index]
-              tooltip.num4 = bar1_q_qn[index]
-              tooltip.num5 = line1[index]
-              tooltip.num6 = line1_qn[index]
-              tooltip.num7 = line2[index]
-              tooltip.num8 = line2_qn[index]
+              tooltip.num1 = getActiveNum(bar1_g[index])
+              tooltip.num2 = getActiveNum(bar1_q[index])
+              tooltip.num3 = getActiveNum(bar1_g_qn[index])
+              tooltip.num4 = getActiveNum(bar1_q_qn[index])
+              tooltip.num5 = getActiveNum(line1[index])
+              tooltip.num6 = getActiveNum(line1_qn[index])
+              tooltip.num7 = getActiveNum(line2[index])
+              tooltip.num8 = getActiveNum(line2_qn[index])
 
               bar1_q[index] = Object.assign({value:bar1_q[index]}, tooltip)
               bar1[index] = Object.assign({value:a}, tooltip)
@@ -1566,15 +1707,18 @@
               bar1_g_qn[index] = Object.assign({value:b}, tooltip)
             })
 
+
+
             let legendMy = []
 
             if (this.mbType === 'gxy') {
               // 高血压板块
-              if (this.groupType === 'org' && this.rqType === 'glrq') {
+              if (this.rqType === 'glrq') {
                 legendMy = ['管理/签约人群自动上传血压合格人数', '去年管理/签约人群自动上传血压合格人数', '管·自动上传血压控制率/去年', '签·自动上传血压控制率/去年',
                   '管·报告血压控制率/去年', '签·报告血压控制率/去年', '管·BMI异常比/去年', '签·BMI异常比/去年'
                 ]
                 this.option2.legend.data = legendMy
+                if(this.groupType === 'org'){
 
                   this.option2.xAxis[0].data = dataX
                   this.option2.series[1].data = bar1_q
@@ -1588,14 +1732,28 @@
                   this.option2.series[9].data = line4
                   this.option2.series[10].data = line5
                   this.option2.series[11].data = line6
+                }else{
+                  this.option2.xAxis[0].data = ['一季度','二季度','三季度','四季度']
+                  this.option2.series[1].data = bar1_q
+                  this.option2.series[2].data = bar1
+                  this.option2.series[4].data = bar1_q_qn
+                  this.option2.series[5].data = bar1_g_qn
 
-              } else {
+                  this.option2.series[6].data = line1
+                  this.option2.series[7].data = line2
+                  this.option2.series[8].data = line3
+                  this.option2.series[9].data = line4
+                  this.option2.series[10].data = line5
+                  this.option2.series[11].data = line6
+                }
 
+
+              } else if (this.rqType === 'gfgl') {
                 legendMy = ['管理/签约人群自动上传血压合格人数', '去年管理/签约人群自动上传血压合格人数', '管·自动上传血压控制率/去年', '签·自动上传血压控制率/去年',
                   '管·报告血压控制率/去年', '签·报告血压控制率/去年'
                 ]
-
                 this.option2.legend.data = legendMy
+                if(this.groupType === 'org'){
 
                   this.option2.xAxis[0].data = dataX
                   this.option2.series[1].data = bar1_q
@@ -1609,6 +1767,21 @@
                   this.option2.series[9].data = line4
                   this.option2.series[10].data = []
                   this.option2.series[11].data = []
+                }else{
+                  this.option2.xAxis[0].data = ['一季度','二季度','三季度','四季度']
+                  this.option2.series[1].data = bar1_q
+                  this.option2.series[2].data = bar1_g
+                  this.option2.series[4].data = bar1_q_qn
+                  this.option2.series[5].data = bar1_g_qn
+
+                  this.option2.series[6].data = line1
+                  this.option2.series[7].data = line2
+                  this.option2.series[8].data = line3
+                  this.option2.series[9].data = line4
+                  this.option2.series[10].data = []
+                  this.option2.series[11].data = []
+                }
+
 
               }