高龄补贴名单统计去掉补发

ruoyi-ui/src/components/xxtjEcharts/EchartsBoxMdtj/index.vue

@@ -165,12 +165,22 @@ export default {
         }
         if (this.xStr === 'year') {
           arrX.push(item[xAxis])
+
+
           if (zt == 1) {
             for (let i = 0; i < temdata.length; i++) {
               arrY[i].push(item[temdata[i].prop])
             }
           }
-          else arrY.push(item[yAxis]);
+          else {
+            arrY.push(item[yAxis]);
+          }
+          // for (let i=0; i<arrX.length; i++){
+          //   if (arrX[i] == '合计'){
+          //     arrX.splice(i, 1)
+          //     arrY.splice(arrY.length-2, 1)
+          //   }
+          // }
         }
         if (this.hengzhu === 'yes') {
           arrX.unshift(item[xAxis])

ruoyi-ui/src/views/business/btgl/glbtmdtj/index.vue

@@ -30,7 +30,7 @@
                   导出
                 </el-button>
               </div>
-              <el-table v-loading="loading" :data="formData[3 * index + 1].vales" style="width: 100%" stripe >
+              <el-table v-loading="loading" :data="formData[3 * index + 1].vales2" style="width: 100%" stripe >
 <!--	              :summary-method="getSummaries" show-summary-->
                 <el-table-column type="index" label="序号" align="center"></el-table-column>
                 <!-- 判断一下v-if="!item.label === '未备案'" -->
@@ -82,7 +82,7 @@ export default {
       sbzt:'',
       formDataidx: 1,
       formData: {
-        unit: null, vales: null, keys: null
+        unit: null, vales: null, keys: null, vales2: null
       },
     };
   },
@@ -270,19 +270,20 @@ export default {
       this.loading = false;
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data);
-	      console.log(data[0],'aaaa');
-				let summation = { year:'合计',total:0,totaln:0,data80_89:0,datan80_89:0,data90_99:0,datan90_99:0,data100:0,datan100:0 }
-	      data[0].vales.forEach((item) => {
-		      summation.total += Number(item.total)
-		      summation.totaln += Number(item.totaln)
-		      summation.data80_89 += Number(item.data80_89)
-		      summation.datan80_89 += Number(item.datan80_89)
-		      summation.data90_99 += Number(item.data90_99)
-		      summation.datan90_99 += Number(item.datan90_99)
-		      summation.data100 += Number(item.data100)
-		      summation.datan100 += Number(item.datan100)
+        data[0].vales2=data[0].vales.slice(0) ;
+				let summation = { year:'合计',total:0,totaln:'',data80_89:0,datan80_89:'',data90_99:0,datan90_99:'',data100:0,datan100:'' }
+	      data[0].vales2.forEach((item) => {
+		      // summation.total += Number(item.total)
+		      summation.total += Number(item.totaln)
+		      summation.data80_89 += Number(item.datan80_89)
+		      // summation.datan80_89 += Number(item.datan80_89)
+		      summation.data90_99 += Number(item.datan90_99)
+		      // summation.datan90_99 += Number(item.datan90_99)
+		      summation.data100 += Number(item.datan100)
+		      // summation.datan100 += Number(item.datan100)
 	      })
-	      data[0].vales.push(summation)
+	      data[0].vales2.push(summation);
+        console.log(data[0])
 	      this.formData[this.formDataidx] = data[0];
       }
       this.keys();