数据统计修改

src/views/statistics/index_kanban.vue

@@ -67,7 +67,7 @@
                     :data="getS4renYuanPeiXun()"
                 />
                 <s4renYuanPeiXunCol
-                    v-if="zaigangrenyuanfb.length>0&&(showAll || showComponents[2])"
+                    v-if="showAll || showComponents[2]"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -75,7 +75,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="getS4renYuanPeiXunFB()"
                 />
-                <div v-if="zaigangrenyuanfb.length<=0&&(showAll || showComponents[2])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="zaigangrenyuanfb.length<=0&&(showAll || showComponents[2])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
 
                 <s5renYuanJianDu
                     v-if="showAll || showComponents[3]"
@@ -86,7 +86,7 @@
                     :data="getS5renYuanJianDu()"
                 />
                 <s5renYuanJianDuCol
-                    v-if="gangqianpeixunfb.length>0&&(showAll || showComponents[4])"
+                    v-if="(showAll || showComponents[4])"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -94,7 +94,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="getS5renYuanJianDuFB()"
                 />
-                <div v-if="gangqianpeixunfb.length<=0&&(showAll || showComponents[4])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="gangqianpeixunfb.length<=0&&(showAll || showComponents[4])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
 
                 <s7sheBeiJiaoZhun
                     v-if="showAll || showComponents[5]"
@@ -105,7 +105,7 @@
                     :data="getJiaoYanObjNum()"
                 />
                 <s7sheBeiJiaoZhunCol
-                    v-if="jiaoyanMGObj.length>0&&(showAll || showComponents[6])"
+                    v-if="(showAll || showComponents[6])"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -113,7 +113,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="getJiaoYanObjNumFB()"
                 />
-                <div v-if="jiaoyanMGObj.length<=0&&(showAll || showComponents[6])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="jiaoyanMGObj.length<=0&&(showAll || showComponents[6])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
 
                 <s8sheBeiHeCha
                     v-if="showAll || showComponents[7]"
@@ -124,7 +124,7 @@
                     :data="gethechaObjNum()"
                 />
                 <s8sheBeiHeChaCol
-                    v-if="hechaMGObj.length>0&&(showAll || showComponents[8])"
+                    v-if="(showAll || showComponents[8])"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -132,7 +132,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="gethechaObjNumFB()"
                 />
-                <div v-if="hechaMGObj.length<=0&&(showAll || showComponents[8])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="hechaMGObj.length<=0&&(showAll || showComponents[8])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
 
                 <s9neiBuZhiLiang
                     v-if="showAll || showComponents[9]"
@@ -143,7 +143,7 @@
                     :data="getS9neiBuZhiLiang()"
                 />
                 <s9neiBuZhiLiangCol
-                    v-if="neibuObjfb.length>0&&(showAll || showComponents[10])"
+                    v-if="(showAll || showComponents[10])"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -151,7 +151,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="getS9neiBuZhiLiangFB()"
                 />
-                <div v-if="neibuObjfb.length<=0&&(showAll || showComponents[10])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="neibuObjfb.length<=0&&(showAll || showComponents[10])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
 
                 <s10waiBuNengLi
                     v-if="showAll || showComponents[11]"
@@ -162,7 +162,7 @@
                     :data="getnengtliObjNum()"
                 />
                 <s10waiBuNengLiCol
-                    v-if="waibuObjfb.length>0&&(showAll || showComponents[12])"
+                    v-if="(showAll || showComponents[12])"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -170,7 +170,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="getnengtliObjNumFB()"
                 />
-                <div v-if="waibuObjfb.length<=0&&(showAll || showComponents[12])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="waibuObjfb.length<=0&&(showAll || showComponents[12])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
 
                 <s15tousu
                     v-if="showAll || showComponents[13]"
@@ -181,7 +181,7 @@
                     :data="getS3tousu()"
                 />
                 <s15tousuCol
-                    v-if="yingjifbObj.length>0&&(showAll || showComponents[14])"
+                    v-if="(showAll || showComponents[14])"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -189,7 +189,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="getS3tousuFB()"
                 />
-                <div v-if="yingjifbObj.length<=0&&(showAll || showComponents[14])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="yingjifbObj.length<=0&&(showAll || showComponents[14])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
 
                 <s12fengXian
                     v-if="showAll || showComponents[15]"
@@ -200,7 +200,7 @@
                     :data="getS12fengXian()"
                 />
                 <s12fengXianCol
-                    v-if="fengxianfbObj.length>0&&(showAll || showComponents[16])"
+                    v-if="(showAll || showComponents[16])"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -208,7 +208,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="getS12fengXianFB()"
                 />
-                <div v-if="fengxianfbObj.length<=0&&(showAll || showComponents[16])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="fengxianfbObj.length<=0&&(showAll || showComponents[16])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
 
                 <s2manYiDu
                     v-if="showAll || showComponents[17]"
@@ -219,7 +219,7 @@
                     :data="getS2manYiDu()"
                 />
                 <s2manYiDuCol
-                    v-if="neishenfbObj.length>0&&(showAll || showComponents[18])"
+                    v-if="(showAll || showComponents[18])"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -227,9 +227,9 @@
                     style="box-shadow:none;width:100%;"
                     :data="getS2manYiDuFB()"
                 />
-                <div v-if="neishenfbObj.length<=0&&(showAll || showComponents[18])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="neishenfbObj.length<=0&&(showAll || showComponents[18])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
                 <s14bufuhexiang
-                    v-if="bufuheObj.length>0&&(showAll || showComponents[19])"
+                    v-if="(showAll || showComponents[19])"
                     :height="'500%'"
                     :width="static=='row' ? '100%': '100%'"
                     :colorw="colorw"
@@ -237,7 +237,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="getS14bufuhexiang()"
                 />
-                <div v-if="bufuheObj.length<=0&&(showAll || showComponents[19])" class="nullDate1" style="height:50%;width:100%;">暂无数据</div>
+                // <div v-if="bufuheObj.length<=0&&(showAll || showComponents[19])" class="nullDate1" style="height:50%;width:100%;">暂无数据</div>
 
                 <s1zhiLiangMuBiao
                     v-if="showAll || showComponents[21]"
@@ -248,7 +248,7 @@
                     :data="getS1renwu()"
                 />
                 <s1zhiLiangMuBiaoCol
-                    v-if="guanshenfbObj.length>0&&(showAll || showComponents[22])"
+                    v-if="(showAll || showComponents[22])"
                     :height="'500%'"
                     :width="static=='row' ? '75%': '100%'"
                     :colorw="colorw"
@@ -256,9 +256,9 @@
                     style="box-shadow:none;width:100%;"
                     :data="getS1renwuFB()"
                 />
-                <div v-if="guanshenfbObj.length<=0&&(showAll || showComponents[22])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
+                // <div v-if="guanshenfbObj.length<=0&&(showAll || showComponents[22])" class="nullDate1" style="height:50%;width:75%;">暂无数据</div>
                 <s16bzJunZhu
-                    v-if="gaijinxiangObj.length>0&&(showAll || showComponents[23])"
+                    v-if="(showAll || showComponents[23])"
                     :height="'500%'"
                     :width="static=='row' ? '100%': '100%'"
                     :colorw="colorw"
@@ -266,9 +266,9 @@
                     style="box-shadow:none;width:100%;"
                     :data="getbzJunZhujNum()"
                 />
-                <div v-if="gaijinxiangObj.length<=0&&(showAll || showComponents[23])" class="nullDate1" style="height:50%;width:100%;">暂无数据</div>
+                // <div v-if="gaijinxiangObj.length<=0&&(showAll || showComponents[23])" class="nullDate1" style="height:50%;width:100%;">暂无数据</div>
                 <s11biaoZhunWu
-                    v-if=" buhegelvObj.length>0 && (showAll || showComponents[24])"
+                    v-if="(showAll || showComponents[24])"
                     :height="'500%'"
                     :width="static=='row' ? '100%': '100%'"
                     :colorw="colorw"
@@ -276,7 +276,7 @@
                     style="box-shadow:none;width:100%;"
                     :data="getyangPinCaiJiObjNum()"
                 />
-                <div v-if="buhegelvObj.length<=0&&( showAll || showComponents[24])" class="nullDate">暂无数据</div>
+                // <div v-if="buhegelvObj.length<=0&&( showAll || showComponents[24])" class="nullDate">暂无数据</div>
                 <div class="clear" />
             </div>
         </div>
@@ -585,8 +585,9 @@ export default {
             return t2
         },
         /* 查询统计配置中的完成率*/
-        getConfigData (end, info, info1) {
+        getConfigData (delivery, info, info1) {
             const that = this
+            const end = structuredClone(delivery)
             end[2] = end[1]
             end[1] = this.getNextMonth(end[1])
             Promise.all([repostCurd('sql', getConfig()), repostCurd('sql', getyangPinCaiJiObj(end, info1)), repostCurd('sql', getzhiliangzhibiaotitleObj(end, info1)),
@@ -717,7 +718,7 @@ export default {
         // 生成月份
             const that = this
             const d1 = this.endDate[0]
-            const d2 = this.endDate[2]
+            const d2 = this.endDate[1]
             const dateArry = new Array()
             const s1 = d1.split('-')
             const s2 = d2.split('-')

src/views/statistics/sendDatas.js

@@ -76,6 +76,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.jiaoyanMGObj[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.jiaoyanMGObj[i].numA < 0
                         ? 0
@@ -127,6 +130,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.hechaMGObj[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.hechaMGObj[i].numA < 0 ? 0 : this.hechaMGObj[i].numA;
                 mid[midI].num =
@@ -177,6 +183,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.waibuObjfb[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.waibuObjfb[i].numA < 0 ? 0 : this.waibuObjfb[i].numA;
                 mid[midI].num =
@@ -358,6 +367,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.gaijinxiangObj[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.gaijinxiangObj[i].numA < 0
                         ? 0
@@ -483,6 +495,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.guanshenfbObj[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.guanshenfbObj[i].numA < 0
                         ? 0
@@ -636,6 +651,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.neishenfbObj[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.neishenfbObj[i].numA < 0
                         ? 0
@@ -691,6 +709,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.yingjifbObj[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.yingjifbObj[i].numA < 0 ? 0 : this.yingjifbObj[i].numA;
                 mid[midI].num =
@@ -749,6 +770,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.yingjifbObj[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.yingjifbObj[i].numA < 0 ? 0 : this.yingjifbObj[i].numA;
                 mid[midI].num =
@@ -808,6 +832,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.zaigangrenyuanfb[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.zaigangrenyuanfb[i].numA < 0
                         ? 0
@@ -868,6 +895,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.gangqianpeixunfb[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.gangqianpeixunfb[i].numA < 0
                         ? 0
@@ -1041,6 +1071,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.neibuObjfb[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.neibuObjfb[i].numA < 0 ? 0 : this.neibuObjfb[i].numA;
                 mid[midI].num =
@@ -1090,6 +1123,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.fengxianfbObj[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.fengxianfbObj[i].numA < 0
                         ? 0
@@ -1121,6 +1157,9 @@ export default {
                 let midI = mid.findIndex(
                     (v) => v.NAME_ == this.bufuheObj[i].NAME_
                 );
+                if (midI === -1) {
+                    continue;
+                }
                 mid[midI].numA =
                     this.bufuheObj[i].numA < 0 ? 0 : this.bufuheObj[i].numA;
                 mid[midI].num =