调整

src/views/sf/grxnpgbg.vue

@@ -265,7 +265,7 @@ export default {
         },
         {
           label: "发起次数",
-          prop: "fqcs",
+          prop: "fqcs1",
           width: "auto",
         },
       ],
@@ -375,13 +375,16 @@ export default {
      * @description 绘制柱状图
      */
     startMyEcharts1(hData = [], zData = []) {
+      console.log(this.seriesList);
       // 基于准备好的dom，初始化echarts实例
       let barCharts = this.$echarts.init(document.getElementById("barMain"));
       barCharts.setOption({
         title: {
           text: "个人工作情况分析",
         },
-        color: ["#FFC36D"],
+        legend: {
+          data: ['刑事案件', '处理立案', '侦查终结案事件']
+        },
         tooltip: {
           trigger: "axis",
           axisPointer: {
@@ -421,12 +424,9 @@ export default {
             },
           },
         ],
-        yAxis: [
-          {
-            min: 0, //y轴的最小值
-            max: 100, //y轴最大值
-            interval: 20, //值之间的间隔
+        yAxis:   {
           type: "value",
+          minInterval : 1,
           axisLine: {
             show: false,
           },
@@ -440,19 +440,10 @@ export default {
             },
           },
         },
-        ],
-        series: [
-          {
-            name: "总数",
-            type: "bar",
-            barWidth: "60%",
-            data: zData,
-            barWidth: 24, //柱图宽度
-          },
-        ],
+        series: this.seriesList,
       });
     },
-    startMyEcharts2(hData = [], zData = []) {
+    startMyEcharts2(hData = [], zData = [],ZS=[]) {
       // 基于准备好的dom，初始化echarts实例
       let lineCharts = this.$echarts.init(document.getElementById("lineMain"));
       lineCharts.setOption({
@@ -493,9 +484,7 @@ export default {
         },
         yAxis: {
           type: "value",
-          min: 0, //y轴的最小值
-          max: 100, //y轴最大值
-          interval: 20, //值之间的间隔
+          minInterval : 1,
           axisLine: {
             show: false,
           },
@@ -509,14 +498,12 @@ export default {
             },
           },
         },
-        series: [
-          {
-            name: "发起次数",
-            type: "line",
-            stack: "Total",
-            data: zData,
+        series: {
+          name: '总数',
+          type: 'line',
+          stack: 'Total',
+          data: ZS
         },
-        ],
         tooltip: {
           trigger: "axis",
         },
@@ -528,17 +515,46 @@ export default {
       queryYwgzAllByPerson(cxFormDataCopy).then((res) => {
         if (res.success && res.code == 200) {
           if (res.data.rows) {
-            let hData1 = [];
-            let zData1 = [];
+            let [hData1,zData1,jsasjsLIst,lasLIst,zczjsLIst] = [[],[],[],[],[]];
+            let [jsasjs,las,zczjs,total] = [0,0,0,0];
             if (res.data.rows.length > 0) {
               res.data.rows.map((el) => {
                 el.name = res.data.name;
+                jsasjs+=el.total;
+                zczjs+=el.zczjs;
+                las+=el.las;
+                total+=el.total;
+                jsasjsLIst.push(el.jsasjs);
+                lasLIst.push(el.las);
+                zczjsLIst.push(el.zczjs);
                 hData1.push(el.month);
                 zData1.push(el.total);
               });
+              let seriesList = [
+                {
+                  name: '刑事案件',
+                  type: 'line',
+                  data: jsasjsLIst
+                },
+                {
+                  name: '处理立案',
+                  type: 'line',
+                  data: lasLIst
+                },
+                {
+                  name: '侦查终结案事件',
+                  type: 'line',
+                  data: zczjsLIst
+                },
+              ];
+              this.seriesList =seriesList
               this.startMyEcharts1(hData1, zData1);
-              self.headerInfo1 = `${self.cxFormData.kssj}至${self.cxFormData.jssj}，${res.data.name}共接受案事件${res.data.rows[0].jsasjs}起，
-                            处理立案${res.data.rows[0].las}起，侦查终结案事件${res.data.rows[0].zczjs}起。立案信息采集率为${res.data.rows[0].lal}、立案侦查终结率为${res.data.rows[0].zczjl}`;
+              let lal = las/total;
+              let zczjl = zczjs/total;
+              if(!lal){lal = 0}
+              if(!zczjl){zczjl = 0}
+              self.headerInfo1 = `${self.cxFormData.kssj}至${self.cxFormData.jssj}，${res.data.name}刑事案件${jsasjs}起，
+                            处理立案${las}起，侦查终结案事件${zczjs}起。立案信息补采率为${(100*lal).toFixed(2)}%、侦查终结补采率为${(100*zczjl).toFixed(2)}%`;
             }
             self.tableBarData = res.data.rows;
           } else {
@@ -554,6 +570,7 @@ export default {
         if (res.success && res.code == 200) {
           let hData1 = [];
           let zData1 = [];
+          let ZS = [];
           let arr = res.data.rows || res.data.message;
           if (arr.length > 0) {
             res.data.message ||
@@ -562,10 +579,24 @@ export default {
                 hData1.push(el.month);
                 zData1.push(el.fqcs);
               });
-            this.startMyEcharts2(hData1, zData1);
+
+            let [fqcs,xxtk,gzzl,rlqb,zdgk,zzfz] =[0,0,0,0,0,0];
+            for(let g of res.data.rows){
+              g['fqcs1']=g.gzzl+g.rlqb+g.zdgk+g.zzfz+g.xxtk;
+              gzzl+=g.gzzl;
+              rlqb+=g.rlqb;
+              zdgk+=g.zdgk;
+              zzfz+=g.zzfz;
+              xxtk+=g.xxtk;
+              ZS.push(g['fqcs1']);
+              fqcs+= g['fqcs1']
+
+            }
+            this.startMyEcharts2(hData1, zData1,ZS);
+            console.log(ZS);
             self.headerInfo2 = `${self.cxFormData.kssj}至${self.cxFormData.jssj}，
-                    ${res.data.name}刑嫌调控${res.data.rows[0].xxtk}次，工作指令${res.data.rows[0].gzzl}次、
-                      人力情报${res.data.rows[0].rlqb}起，阵地管控${res.data.rows[0].zdgk}起、处理组织犯罪${res.data.rows[0].zzfz}起、发起次数${res.data.rows[0].fqcs}次。`;
+                    ${res.data.name}刑嫌调控${xxtk}次，工作指令${gzzl}次、
+                      人力情报${rlqb}起，阵地管控${zdgk}起、处理组织犯罪${zzfz}起、发起次数${fqcs}次。`;
           }
           self.tableLineData = res.data.rows;
           self.loading.close();
@@ -588,8 +619,8 @@ export default {
     },
   },
   mounted() {
-    this.doQueryYwData();
-    this.doQueryXtData();
+  /*  this.doQueryYwData();
+    this.doQueryXtData();*/
   },
   watch: {
     "cxFormData.kssj": {