zzy

src/commomUse.js

@@ -14,6 +14,22 @@ export function getYear(){
     }
     return calendar.reverse();
 }
+export function getYearAnalysis(){
+    let current = new Date();
+    let year = current.getFullYear();
+    let month = current.getMonth() + 1;
+    let calendar = [];
+    while (year > current.getFullYear() - 1 ||month > current.getMonth() + 1) {
+        calendar.push(year + "-" + formatNumber(month));
+        month -= 1;
+        if (month <= 0) {
+            year -= 1;
+            month = 12;
+        }
+    }
+    return calendar.reverse();
+}
+
 function formatNumber(value) {
     return (value < 10 ? "0" : "") + value;
 }

src/components/analysis-average-time/AnalysisAverageTime.vue

@@ -15,7 +15,7 @@
 <script>
 import {setAnalysisAverageTime} from "@/echarts/option";
 import {mapMutations, mapState} from 'vuex';
-import {daysX, daysY} from "@/commomUse";
+import {daysX,getYearAnalysis, daysY} from "@/commomUse";
 import * as echarts from "echarts";
 export default {
   name: "AnalysisAverageTime",
@@ -55,6 +55,12 @@ export default {
     },
     basicShow(){
       this.loading=true;
+      let searchTime = '';
+      if(this.analysisObject['analysisTimer'] =='30'){
+        searchTime = '2'
+      }else if(this.analysisObject['analysisTimer'] =='365'){
+        searchTime = '1'
+      }
       this.$request({
         url:'/YWTBApi/queryAverageTimeTrend',
         method:'post',
@@ -62,25 +68,45 @@ export default {
           'TYPE':this.analysisObject['analysisThirdLevel'],
           "DATA_TYPE":this.analysisObject['analysisFirstLevel'],
           "ORGANIZATION":this.analysisObject['analysisSecondLevel'],
+          "DATE_TYPE":searchTime,
         }
       }).then(response => {
         let dataArr = response.data.msg[0].Rows;
         this.basicList = dataArr;
-        this.dataX = daysX(30);
-        this.dataY_TERM_BJ = daysY(30);
-        this.dataY_TERM_SL = daysY(30);
-        this.dataY_AVG_SL_TIME = daysY(30);
-        this.dataY_AVG_BJ_TIME = daysY(30);
-        for(let i=0;i<this.basicList.length;i++){
-          for(let j=0;j<this.dataX.length;j++){
-            if(this.dataX[j] ==dataArr[i].INSERT_TIME){
-              this.dataY_TERM_BJ[j]=dataArr[i].TERM_BJ!=undefined?dataArr[i].TERM_BJ:0;
-              this.dataY_TERM_SL[j]=dataArr[i].TERM_SL!=undefined?dataArr[i].TERM_SL:0;
-              this.dataY_AVG_SL_TIME[j]=dataArr[i].AVG_SL_TIME!=undefined?dataArr[i].AVG_SL_TIME:0;
-              this.dataY_AVG_BJ_TIME[j]=dataArr[i].AVG_BJ_TIME!=undefined?dataArr[i].AVG_BJ_TIME:0;
+        if(searchTime =='2'){
+          this.dataX = daysX(30);
+          this.dataY_TERM_BJ = daysY(30);
+          this.dataY_TERM_SL = daysY(30);
+          this.dataY_AVG_SL_TIME = daysY(30);
+          this.dataY_AVG_BJ_TIME = daysY(30);
+          for(let i=0;i<this.basicList.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].INSERT_TIME){
+                this.dataY_TERM_BJ[j]=dataArr[i].TERM_BJ!=undefined?dataArr[i].TERM_BJ:0;
+                this.dataY_TERM_SL[j]=dataArr[i].TERM_SL!=undefined?dataArr[i].TERM_SL:0;
+                this.dataY_AVG_SL_TIME[j]=dataArr[i].AVG_SL_TIME!=undefined?dataArr[i].AVG_SL_TIME:0;
+                this.dataY_AVG_BJ_TIME[j]=dataArr[i].AVG_BJ_TIME!=undefined?dataArr[i].AVG_BJ_TIME:0;
+              }
+            }
+          }
+        }else{
+          this.dataX = getYearAnalysis();
+          this.dataY_TERM_BJ = daysY(12);
+          this.dataY_TERM_SL = daysY(12);
+          this.dataY_AVG_SL_TIME = daysY(12);
+          this.dataY_AVG_BJ_TIME = daysY(12);
+          for(let i=0;i<this.basicList.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].INSERT_TIME){
+                this.dataY_TERM_BJ[j]=dataArr[i].TERM_BJ!=undefined?dataArr[i].TERM_BJ:0;
+                this.dataY_TERM_SL[j]=dataArr[i].TERM_SL!=undefined?dataArr[i].TERM_SL:0;
+                this.dataY_AVG_SL_TIME[j]=dataArr[i].AVG_SL_TIME!=undefined?dataArr[i].AVG_SL_TIME:0;
+                this.dataY_AVG_BJ_TIME[j]=dataArr[i].AVG_BJ_TIME!=undefined?dataArr[i].AVG_BJ_TIME:0;
+              }
             }
           }
         }
+
         this.$nextTick(() => {
           this.loading=false;
           let ele = this.$refs.echarts
@@ -114,6 +140,12 @@ export default {
     },
     itemShow(){
       this.loading=true;
+      let searchTime = '';
+      if(this.analysisObject['analysisTimer'] =='30'){
+        searchTime = '2'
+      }else if(this.analysisObject['analysisTimer'] =='365'){
+        searchTime = '1'
+      }
       this.$request({
         url:'/YWTBApi/queryAverageTimeTrend',
         method:'post',
@@ -122,25 +154,45 @@ export default {
           "DATA_TYPE":this.analysisObject['analysisFirstLevel'],
           "ORGANIZATION":this.analysisObject['analysisSecondLevel'],
           "MATTER_CODE":this.analysisObject['analysisForthLevel'],
+          "DATE_TYPE":searchTime,
         }
       }).then(response => {
         let dataArr = response.data.msg[0].Rows;
         this.basicList = dataArr;
-        this.dataX = daysX(30);
-        this.dataY_TERM_BJ = daysY(30);
-        this.dataY_TERM_SL = daysY(30);
-        this.dataY_AVG_SL_TIME = daysY(30);
-        this.dataY_AVG_BJ_TIME = daysY(30);
-        for(let i=0;i<this.basicList.length;i++){
-          for(let j=0;j<this.dataX.length;j++){
-            if(this.dataX[j] ==dataArr[i].INSERT_TIME){
-              this.dataY_TERM_BJ[j]=dataArr[i].TERM_BJ!=undefined?dataArr[i].TERM_BJ:0;
-              this.dataY_TERM_SL[j]=dataArr[i].TERM_SL!=undefined?dataArr[i].TERM_SL:0;
-              this.dataY_AVG_SL_TIME[j]=dataArr[i].AVG_SL_TIME!=undefined?dataArr[i].AVG_SL_TIME:0;
-              this.dataY_AVG_BJ_TIME[j]=dataArr[i].AVG_BJ_TIME!=undefined?dataArr[i].AVG_BJ_TIME:0;
+        if(searchTime =='2'){
+          this.dataX = daysX(30);
+          this.dataY_TERM_BJ = daysY(30);
+          this.dataY_TERM_SL = daysY(30);
+          this.dataY_AVG_SL_TIME = daysY(30);
+          this.dataY_AVG_BJ_TIME = daysY(30);
+          for(let i=0;i<this.basicList.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].INSERT_TIME){
+                this.dataY_TERM_BJ[j]=dataArr[i].TERM_BJ!=undefined?dataArr[i].TERM_BJ:0;
+                this.dataY_TERM_SL[j]=dataArr[i].TERM_SL!=undefined?dataArr[i].TERM_SL:0;
+                this.dataY_AVG_SL_TIME[j]=dataArr[i].AVG_SL_TIME!=undefined?dataArr[i].AVG_SL_TIME:0;
+                this.dataY_AVG_BJ_TIME[j]=dataArr[i].AVG_BJ_TIME!=undefined?dataArr[i].AVG_BJ_TIME:0;
+              }
+            }
+          }
+        }else{
+          this.dataX = getYearAnalysis();
+          this.dataY_TERM_BJ = daysY(12);
+          this.dataY_TERM_SL = daysY(12);
+          this.dataY_AVG_SL_TIME = daysY(12);
+          this.dataY_AVG_BJ_TIME = daysY(12);
+          for(let i=0;i<this.basicList.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].INSERT_TIME){
+                this.dataY_TERM_BJ[j]=dataArr[i].TERM_BJ!=undefined?dataArr[i].TERM_BJ:0;
+                this.dataY_TERM_SL[j]=dataArr[i].TERM_SL!=undefined?dataArr[i].TERM_SL:0;
+                this.dataY_AVG_SL_TIME[j]=dataArr[i].AVG_SL_TIME!=undefined?dataArr[i].AVG_SL_TIME:0;
+                this.dataY_AVG_BJ_TIME[j]=dataArr[i].AVG_BJ_TIME!=undefined?dataArr[i].AVG_BJ_TIME:0;
+              }
             }
           }
         }
+
         this.$nextTick(() => {
           this.loading=false;
           let ele = this.$refs.echarts
@@ -166,6 +218,12 @@ export default {
     },
     situationShow(){
       this.loading=true;
+      let searchTime = '';
+      if(this.analysisObject['analysisTimer'] =='30'){
+        searchTime = '2'
+      }else if(this.analysisObject['analysisTimer'] =='365'){
+        searchTime = '1'
+      }
       this.$request({
         url:'/YWTBApi/queryAverageTimeTrend',
         method:'post',
@@ -174,25 +232,45 @@ export default {
           "DATA_TYPE":this.analysisObject['analysisFirstLevel'],
           "ORGANIZATION":this.analysisObject['analysisSecondLevel'],
           "SITUATION_CODE":this.analysisObject['analysisFifthLevel'],
+          "DATE_TYPE":searchTime,
         }
       }).then(response => {
         let dataArr = response.data.msg[0].Rows;
         this.basicList = dataArr;
-        this.dataX = daysX(30);
-        this.dataY_TERM_BJ = daysY(30);
-        this.dataY_TERM_SL = daysY(30);
-        this.dataY_AVG_SL_TIME = daysY(30);
-        this.dataY_AVG_BJ_TIME = daysY(30);
-        for(let i=0;i<this.basicList.length;i++){
-          for(let j=0;j<this.dataX.length;j++){
-            if(this.dataX[j] ==dataArr[i].INSERT_TIME){
-              this.dataY_TERM_BJ[j]=dataArr[i].TERM_BJ!=undefined?dataArr[i].TERM_BJ:0;
-              this.dataY_TERM_SL[j]=dataArr[i].TERM_SL!=undefined?dataArr[i].TERM_SL:0;
-              this.dataY_AVG_SL_TIME[j]=dataArr[i].AVG_SL_TIME!=undefined?dataArr[i].AVG_SL_TIME:0;
-              this.dataY_AVG_BJ_TIME[j]=dataArr[i].AVG_BJ_TIME!=undefined?dataArr[i].AVG_BJ_TIME:0;
+        if(searchTime =='2'){
+          this.dataX = daysX(30);
+          this.dataY_TERM_BJ = daysY(30);
+          this.dataY_TERM_SL = daysY(30);
+          this.dataY_AVG_SL_TIME = daysY(30);
+          this.dataY_AVG_BJ_TIME = daysY(30);
+          for(let i=0;i<this.basicList.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].INSERT_TIME){
+                this.dataY_TERM_BJ[j]=dataArr[i].TERM_BJ!=undefined?dataArr[i].TERM_BJ:0;
+                this.dataY_TERM_SL[j]=dataArr[i].TERM_SL!=undefined?dataArr[i].TERM_SL:0;
+                this.dataY_AVG_SL_TIME[j]=dataArr[i].AVG_SL_TIME!=undefined?dataArr[i].AVG_SL_TIME:0;
+                this.dataY_AVG_BJ_TIME[j]=dataArr[i].AVG_BJ_TIME!=undefined?dataArr[i].AVG_BJ_TIME:0;
+              }
+            }
+          }
+        }else{
+          this.dataX = getYearAnalysis();
+          this.dataY_TERM_BJ = daysY(12);
+          this.dataY_TERM_SL = daysY(12);
+          this.dataY_AVG_SL_TIME = daysY(12);
+          this.dataY_AVG_BJ_TIME = daysY(12);
+          for(let i=0;i<this.basicList.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].INSERT_TIME){
+                this.dataY_TERM_BJ[j]=dataArr[i].TERM_BJ!=undefined?dataArr[i].TERM_BJ:0;
+                this.dataY_TERM_SL[j]=dataArr[i].TERM_SL!=undefined?dataArr[i].TERM_SL:0;
+                this.dataY_AVG_SL_TIME[j]=dataArr[i].AVG_SL_TIME!=undefined?dataArr[i].AVG_SL_TIME:0;
+                this.dataY_AVG_BJ_TIME[j]=dataArr[i].AVG_BJ_TIME!=undefined?dataArr[i].AVG_BJ_TIME:0;
+              }
             }
           }
         }
+
         this.$nextTick(() => {
           this.loading=false;
           let ele = this.$refs.echarts

src/components/analysis-total-notice/AnalysisTotalNotice.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import {daysX, daysY} from "@/commomUse";
+import {daysX,getYearAnalysis, daysY} from "@/commomUse";
 import {mapMutations, mapState} from 'vuex';
 import {setAnalysisTotalNotice} from "@/echarts/option";
 import * as echarts from "echarts";
@@ -58,6 +58,13 @@ export default {
     },
     basicShow(){
       this.loading=true;
+      let searchTime = '';
+      if(this.analysisObject['analysisTimer'] =='30'){
+        searchTime = '2'
+      }else if(this.analysisObject['analysisTimer'] =='365'){
+        searchTime = '1'
+      }
+
       this.$request({
         url:'/YWTBApi/queryTimingRemindInfo',
         method:'post',
@@ -65,27 +72,49 @@ export default {
           'TYPE':this.analysisObject['analysisThirdLevel'],
           "DATA_TYPE":this.analysisObject['analysisFirstLevel'],
           "ORGANIZATION":this.analysisObject['analysisSecondLevel'],
+          "DATE_TYPE":searchTime,
         }
       }).then(response => {
         let dataArr = response.data.msg[0].Rows;
         this.basicList = dataArr;
-        this.dataX=daysX(30);
-        this.dataY_COUNT_SD=daysY(30);
-        this.dataY_COUNT_ST=daysY(30);
-        this.dataY_COUNT_BD=daysY(30);
-        this.dataY_COUNT_BT=daysY(30);
+        if(searchTime =='2'){
+          this.dataX=daysX(30);
+          this.dataY_COUNT_SD=daysY(30);
+          this.dataY_COUNT_ST=daysY(30);
+          this.dataY_COUNT_BD=daysY(30);
+          this.dataY_COUNT_BT=daysY(30);
+          for(let j=0;j<this.dataX.length;j++){
+            for(let i=0;i<dataArr.length;i++){
+              if(this.dataX[j] ==dataArr[i].DATE_TIME){
+                this.dataY_COUNT_SD[j]=dataArr[i].SD!=undefined?dataArr[i].SD.toString():0;
+                this.dataY_COUNT_ST[j]=dataArr[i].ST!=undefined?dataArr[i].ST.toString():0;
+                this.dataY_COUNT_BD[j]=dataArr[i].BD!=undefined?dataArr[i].BD.toString():0;
+                this.dataY_COUNT_BT[j]=dataArr[i].BT!=undefined?dataArr[i].BT.toString():0;
+                console.log(dataArr[i].SD!=undefined?dataArr[i].SD:0,dataArr[i].ST!=undefined?dataArr[i].ST:0,dataArr[i].BD!=undefined?dataArr[i].BD:0,dataArr[i].BT!=undefined?dataArr[i].BT:0)
+                console.log(dataArr[i],this.dataY_COUNT_SD[j],this.dataY_COUNT_ST[j],this.dataY_COUNT_BD[j],this.dataY_COUNT_BT[j])
+              }
+            }
+          }
+        }else{
+          this.dataX=getYearAnalysis();
+          this.dataY_COUNT_SD=daysY(12);
+          this.dataY_COUNT_ST=daysY(12);
+          this.dataY_COUNT_BD=daysY(12);
+          this.dataY_COUNT_BT=daysY(12);
           for(let j=0;j<this.dataX.length;j++){
             for(let i=0;i<dataArr.length;i++){
-            if(this.dataX[j] ==dataArr[i].DATE_TIME){
-              this.dataY_COUNT_SD[j]=dataArr[i].SD!=undefined?dataArr[i].SD.toString():0;
-              this.dataY_COUNT_ST[j]=dataArr[i].ST!=undefined?dataArr[i].ST.toString():0;
-              this.dataY_COUNT_BD[j]=dataArr[i].BD!=undefined?dataArr[i].BD.toString():0;
-              this.dataY_COUNT_BT[j]=dataArr[i].BT!=undefined?dataArr[i].BT.toString():0;
-              console.log(dataArr[i].SD!=undefined?dataArr[i].SD:0,dataArr[i].ST!=undefined?dataArr[i].ST:0,dataArr[i].BD!=undefined?dataArr[i].BD:0,dataArr[i].BT!=undefined?dataArr[i].BT:0)
-              console.log(dataArr[i],this.dataY_COUNT_SD[j],this.dataY_COUNT_ST[j],this.dataY_COUNT_BD[j],this.dataY_COUNT_BT[j])
+              if(this.dataX[j] ==dataArr[i].DATE_TIME){
+                this.dataY_COUNT_SD[j]=dataArr[i].SD!=undefined?dataArr[i].SD.toString():0;
+                this.dataY_COUNT_ST[j]=dataArr[i].ST!=undefined?dataArr[i].ST.toString():0;
+                this.dataY_COUNT_BD[j]=dataArr[i].BD!=undefined?dataArr[i].BD.toString():0;
+                this.dataY_COUNT_BT[j]=dataArr[i].BT!=undefined?dataArr[i].BT.toString():0;
+                console.log(dataArr[i].SD!=undefined?dataArr[i].SD:0,dataArr[i].ST!=undefined?dataArr[i].ST:0,dataArr[i].BD!=undefined?dataArr[i].BD:0,dataArr[i].BT!=undefined?dataArr[i].BT:0)
+                console.log(dataArr[i],this.dataY_COUNT_SD[j],this.dataY_COUNT_ST[j],this.dataY_COUNT_BD[j],this.dataY_COUNT_BT[j])
+              }
             }
           }
         }
+
         this.$nextTick(() => {
           this.loading=false;
           let ele = this.$refs.echarts
@@ -118,6 +147,13 @@ export default {
     },
     itemShow(){
       this.loading=true;
+      let searchTime = '';
+      if(this.analysisObject['analysisTimer'] =='30'){
+        searchTime = '2'
+      }else if(this.analysisObject['analysisTimer'] =='365'){
+        searchTime = '1'
+      }
+
       this.$request({
         url:'/YWTBApi/queryTimingRemindInfo',
         method:'post',
@@ -126,25 +162,45 @@ export default {
           "DATA_TYPE":this.analysisObject['analysisFirstLevel'],
           "ORGANIZATION":this.analysisObject['analysisSecondLevel'],
           "MATTER_CODE":this.analysisObject['analysisForthLevel'],
+          "DATE_TYPE":searchTime,
         }
       }).then(response => {
         let dataArr = response.data.msg[0].Rows;
         this.basicList = dataArr;
-        this.dataX=daysX(30);
-        this.dataY_COUNT_SD=daysY(30);
-        this.dataY_COUNT_ST=daysY(30);
-        this.dataY_COUNT_BD=daysY(30);
-        this.dataY_COUNT_BT=daysY(30);
-        for(let i=0;i<dataArr.length;i++){
-          for(let j=0;j<this.dataX.length;j++){
-            if(this.dataX[j] ==dataArr[i].DATE_TIME){
-              this.dataY_COUNT_SD[j]=dataArr[i].SD!=undefined?dataArr[i].SD:0;
-              this.dataY_COUNT_ST[j]=dataArr[i].ST!=undefined?dataArr[i].ST:0;
-              this.dataY_COUNT_BD[j]=dataArr[i].BD!=undefined?dataArr[i].BD:0;
-              this.dataY_COUNT_BT[j]=dataArr[i].BT!=undefined?dataArr[i].BT:0;
+        if(searchTime =='2'){
+          this.dataX=daysX(30);
+          this.dataY_COUNT_SD=daysY(30);
+          this.dataY_COUNT_ST=daysY(30);
+          this.dataY_COUNT_BD=daysY(30);
+          this.dataY_COUNT_BT=daysY(30);
+          for(let i=0;i<dataArr.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].DATE_TIME){
+                this.dataY_COUNT_SD[j]=dataArr[i].SD!=undefined?dataArr[i].SD:0;
+                this.dataY_COUNT_ST[j]=dataArr[i].ST!=undefined?dataArr[i].ST:0;
+                this.dataY_COUNT_BD[j]=dataArr[i].BD!=undefined?dataArr[i].BD:0;
+                this.dataY_COUNT_BT[j]=dataArr[i].BT!=undefined?dataArr[i].BT:0;
+              }
+            }
+          }
+        }else{
+          this.dataX=getYearAnalysis();
+          this.dataY_COUNT_SD=daysY(12);
+          this.dataY_COUNT_ST=daysY(12);
+          this.dataY_COUNT_BD=daysY(12);
+          this.dataY_COUNT_BT=daysY(12);
+          for(let i=0;i<dataArr.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].DATE_TIME){
+                this.dataY_COUNT_SD[j]=dataArr[i].SD!=undefined?dataArr[i].SD:0;
+                this.dataY_COUNT_ST[j]=dataArr[i].ST!=undefined?dataArr[i].ST:0;
+                this.dataY_COUNT_BD[j]=dataArr[i].BD!=undefined?dataArr[i].BD:0;
+                this.dataY_COUNT_BT[j]=dataArr[i].BT!=undefined?dataArr[i].BT:0;
+              }
             }
           }
         }
+
         this.$nextTick(() => {
           this.loading=false;
           let ele = this.$refs.echarts
@@ -154,6 +210,12 @@ export default {
     },
     situationShow(){
       this.loading=true;
+      let searchTime = '';
+      if(this.analysisObject['analysisTimer'] =='30'){
+        searchTime = '2'
+      }else if(this.analysisObject['analysisTimer'] =='365'){
+        searchTime = '1'
+      }
       this.$request({
         url:'/YWTBApi/queryTimingRemindInfo',
         method:'post',
@@ -162,25 +224,46 @@ export default {
           "DATA_TYPE":this.analysisObject['analysisFirstLevel'],
           "ORGANIZATION":this.analysisObject['analysisSecondLevel'],
           "SITUATION_CODE":this.analysisObject['analysisFifthLevel'],
+          "DATE_TYPE":searchTime,
         }
       }).then(response => {
         let dataArr = response.data.msg[0].Rows;
         this.basicList = dataArr;
-        this.dataX=daysX(30);
-        this.dataY_COUNT_SD=daysY(30);
-        this.dataY_COUNT_ST=daysY(30);
-        this.dataY_COUNT_BD=daysY(30);
-        this.dataY_COUNT_BT=daysY(30);
-        for(let i=0;i<dataArr.length;i++){
-          for(let j=0;j<this.dataX.length;j++){
-            if(this.dataX[j] ==dataArr[i].DATE_TIME){
-              this.dataY_COUNT_SD[j]=dataArr[i].SD!=undefined?dataArr[i].SD:0;
-              this.dataY_COUNT_ST[j]=dataArr[i].ST!=undefined?dataArr[i].ST:0;
-              this.dataY_COUNT_BD[j]=dataArr[i].BD!=undefined?dataArr[i].BD:0;
-              this.dataY_COUNT_BT[j]=dataArr[i].BT!=undefined?dataArr[i].BT:0;
+        if(searchTime =='2'){
+          this.dataX=daysX(30);
+          this.dataY_COUNT_SD=daysY(30);
+          this.dataY_COUNT_ST=daysY(30);
+          this.dataY_COUNT_BD=daysY(30);
+          this.dataY_COUNT_BT=daysY(30);
+          for(let i=0;i<dataArr.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].DATE_TIME){
+                this.dataY_COUNT_SD[j]=dataArr[i].SD!=undefined?dataArr[i].SD:0;
+                this.dataY_COUNT_ST[j]=dataArr[i].ST!=undefined?dataArr[i].ST:0;
+                this.dataY_COUNT_BD[j]=dataArr[i].BD!=undefined?dataArr[i].BD:0;
+                this.dataY_COUNT_BT[j]=dataArr[i].BT!=undefined?dataArr[i].BT:0;
+              }
+            }
+          }
+        }else{
+          this.dataX=getYearAnalysis();
+          this.dataY_COUNT_SD=daysY(12);
+          this.dataY_COUNT_ST=daysY(12);
+          this.dataY_COUNT_BD=daysY(12);
+          this.dataY_COUNT_BT=daysY(12);
+          for(let i=0;i<dataArr.length;i++){
+            for(let j=0;j<this.dataX.length;j++){
+              if(this.dataX[j] ==dataArr[i].DATE_TIME){
+                this.dataY_COUNT_SD[j]=dataArr[i].SD!=undefined?dataArr[i].SD:0;
+                this.dataY_COUNT_ST[j]=dataArr[i].ST!=undefined?dataArr[i].ST:0;
+                this.dataY_COUNT_BD[j]=dataArr[i].BD!=undefined?dataArr[i].BD:0;
+                this.dataY_COUNT_BT[j]=dataArr[i].BT!=undefined?dataArr[i].BT:0;
+              }
             }
           }
         }
+
+
         this.$nextTick(() => {
           this.loading=false;
           let ele = this.$refs.echarts

src/views/units/local-data.js

@@ -438,7 +438,7 @@ export const analysisDataOptimizeUnitTableHeader = [
   sortable:'custom'
  },
  {
-  prop:'TERM_BJ',
+  prop:'TERM_SL',
   label:'承诺受理时间(H)',
   sortable:'custom'
  },
@@ -453,7 +453,7 @@ export const analysisDataOptimizeUnitTableHeader = [
   sortable:'custom'
  },
  {
-  prop:'TERM_SL',
+  prop:'TERM_BJ',
   label:'承诺办结时间(H)',
   sortable:'custom'
  },
@@ -483,7 +483,7 @@ export const analysisDataOptimizeMatterTableHeader = [
   sortable:true
  },
  {
-  prop:'TERM_BJ',
+  prop:'TERM_SL',
   label:'承诺受理时间(H)',
   width:'190',
   sortable:'custom'
@@ -501,7 +501,7 @@ export const analysisDataOptimizeMatterTableHeader = [
   sortable:'custom'
  },
  {
-  prop:'TERM_SL',
+  prop:'TERM_BJ',
   label:'承诺办结时间(H)',
   width:'190',
   sortable:'custom'
@@ -539,7 +539,7 @@ export const analysisDataOptimizeSituationTableHeader = [
   sortable:'custom'
  },
  {
-  prop:'TERM_BJ',
+  prop:'TERM_SL',
   label:'承诺受理时间(H)',
   width:'190',
   sortable:'custom'
@@ -558,7 +558,7 @@ export const analysisDataOptimizeSituationTableHeader = [
   sortable:'custom'
  },
  {
-  prop:'TERM_SL',
+  prop:'TERM_BJ',
   label:'承诺办结时间(H)',
   width:'190',
   sortable:'custom'