Merge branch '深圳三院' of http://119.23.210.103:3000/wy/zdqy_firm_former into 深圳三院

src/views/statistics/index.vue

@@ -1546,15 +1546,15 @@
         console.log(type, 'tttttttttttt')
         if (type === 'pre') {
           if (this.pageOT === 1) {
-            this.pageOT = this.pageAll + 13
+            this.pageOT = this.pageAll + 12
 
             this.showFenZu.title =
-              this.zhiliangmuNeirong[this.pageAll + 12] !== undefined
-                ? this.zhiliangmuNeirong[this.pageAll + 12].name_
+              this.zhiliangmuNeirong[this.pageAll + 11] !== undefined
+                ? this.zhiliangmuNeirong[this.pageAll + 11].name_
                 : ''
             this.showFenZu.data =
-              this.zhiliangmuNeirong[this.pageAll + 12] !== undefined
-                ? this.zhiliangmuNeirong[this.pageAll + 12].data
+              this.zhiliangmuNeirong[this.pageAll + 11] !== undefined
+                ? this.zhiliangmuNeirong[this.pageAll + 11].data
                 : []
           } else {
             this.pageOT = this.pageOT - 1
@@ -1570,7 +1570,7 @@
             }
           }
         } else if (type === 'next') {
-          if (this.pageOT >= this.pageAll + 13) {
+          if (this.pageOT >= this.pageAll + 12) {
             this.pageOT = 1
 
             this.showFenZu.title =
@@ -2010,7 +2010,7 @@
         this.timer1 = null
         this.fadeinout = false
         this.timer1 = setInterval(() => {
-          if (this.pageOT >= this.pageAll + 13) {
+          if (this.pageOT >= this.pageAll + 12) {
             this.pageOT = 1
 
             this.showFenZu.title =
@@ -2228,7 +2228,7 @@
         this.rollstop()
         this.fadeinout = false
         this.timer1 = setInterval(() => {
-          if (this.pageOT >= this.pageAll + 13) {
+          if (this.pageOT >= this.pageAll + 12) {
             this.pageOT = 1
 
             this.showFenZu.title =

src/views/statistics/index_kanban.vue

@@ -4,46 +4,6 @@
         <!-- :style="{height:height}" -->
         <div class="statistics">
             <div class="editDate" style="background-color: rgba(0,0,0,0);display: block;width: 100%;height: 10%;">
-                <!-- 标题装饰组件 -->
-                <!-- <header-decoration />
-                <div class="stitle">实验室管理看板</div>
-                <div class="block" style="display:none">
-                    <span class="demonstration">开始:</span>
-                    <el-date-picker
-                        v-model="BeginDate"
-                        type="year"
-                        size="mini"
-                        value-format="yyyy"
-                        format="yyyy年"
-                        style="width: 96px;"
-                        :clearable="false"
-                        placeholder="选择日期"
-                        @change="checkYear(BeginDate,'begin')"
-                    />
-                </div>
-
-                <div class="block">
-                    <span class="demonstration">查询年度:</span>
-                    <el-date-picker
-                        v-model="endDate"
-                        type="year"
-                        size="mini"
-                        value-format="yyyy"
-                        format="yyyy年"
-                        :clearable="false"
-                        style="width: 96px;"
-                        placeholder="选择日期"
-                        @change="checkYear(endDate,'end')"
-                    >
-                        <el-date-picker
-                            v-model="endDate"
-                            type="year"
-                            value-format="yyyy"
-                            placeholder="选择年"
-                            @change="checkYear(endDate,'end')"
-                        />
-                    </el-date-picker>
-                </div> -->
                 <div
                     style="width: 100%;
                     height:45%;
@@ -98,7 +58,7 @@
                     style="height:50%;width:75%;"
                 >暂无数据</div>
 
-                <s5renYuanJianDu
+                <!-- <s5renYuanJianDu
                     v-if="showAll || showComponents[3]"
                     height="200%"
                     :width="displayType === 'row' ? '25%' : '100%'"
@@ -119,7 +79,7 @@
                     v-if="!gangqianpeixunfb.length && (showAll || showComponents[4])"
                     class="nullDate1"
                     style="height:50%;width:75%;"
-                >暂无数据</div>
+                >暂无数据</div> -->
 
                 <s7sheBeiJiaoZhun
                     v-if="showAll || showComponents[5]"
@@ -596,7 +556,7 @@ export default {
         },
         getqualityData () {
             const { deptList } = this.$store.getters || {}
-            const filterLetter = ['综合', '质量', '科研', '教学', '医疗', '样品', '助理', '急诊']
+            const filterLetter = ['科研', '教学', '医疗', '样品', '助理', '急诊','岗培学员']
             const AllDeptList = deptList.filter(d => d.depth === 4)
             const deptEntity = deptList.filter(d => d.depth === 4 && !filterLetter.some(i => d.positionName.includes(i)))
 
@@ -623,9 +583,9 @@ export default {
             return t2
         },
         /* 查询统计配置中的完成率*/
-        getConfigData (end, allDept, filterDept) {
-            console.log(end, allDept, filterDept)
+        getConfigData (delivery, allDept, filterDept) {
             const that = this
+            const end = structuredClone(delivery)
             end[2] = end[1]
             end[1] = this.getNextMonth(end[1])
             Promise.all([
@@ -750,7 +710,7 @@ export default {
         },
         getzzzbNum () {
             // 1. 生成月份数组
-            const [startDate, endDate] = [this.endDate[0], this.endDate[2]]
+            const [startDate, endDate] = [this.endDate[0], this.endDate[1]]
             const [startYear, startMonth] = startDate.split('-').map(Number)
             const [endYear, endMonth] = endDate.split('-').map(Number)
 

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
@@ -484,9 +496,9 @@ export default {
                     (v) => v.NAME_ == this.guanshenfbObj[i].NAME_
                 );
                 if (midI === -1) {
-                    continue
+                    continue;
                 }
-                console.log('wowowowo', this.guanshenfbObj[i].NAME_, midI)
+                console.log("wowowowo", this.guanshenfbObj[i].NAME_, midI);
                 mid[midI].numA =
                     this.guanshenfbObj[i].numA < 0
                         ? 0
@@ -640,6 +652,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
@@ -695,6 +710,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 =
@@ -753,6 +771,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 =
@@ -812,6 +833,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
@@ -872,6 +896,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
@@ -1045,6 +1072,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 =
@@ -1094,6 +1124,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
@@ -1125,6 +1158,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 =