紫外灯月度统计

src/views/component/facility/newStatic.vue

@@ -72,14 +72,15 @@
               <div class="green-circle" />
               <span>已完成</span>
             </div>
-            <!-- <div class="item">
-                          <div class="orange-circle" />
-                          <span>部分完成</span>
-                      </div> -->
+
             <div class="item">
               <div class="red-circle" />
               <span>待处理</span>
             </div>
+            <div class="item">
+              <div class="orange-circle" />
+              <span>无需处理</span>
+            </div>
             <!-- <div class="item">
                           <div class="red-bg" />
                           <span>设备状况异常</span>
@@ -89,7 +90,6 @@
             </div>
           </div>
         </div>
-
         <div v-if="fliterData.length > 0" class="table">
           <div class="column">
             <div class="item">紫外灯/日期</div>
@@ -128,29 +128,31 @@
                       >
                         <el-divider />
                         <div class="detail-item">
-                          <div class="item" style="margin: 2px 0">
-                            处理人：{{
+                          <div class="item" style="margin: 2px 0"
+                            >处理人：{{
                               switchIdToUserName(ii.qian_ming_) || '/'
-                            }}
-                          </div>
-                          <div class="item" style="margin: 2px 0">
-                            岗位：{{ ii.gang_wei_ || '/' }}
-                          </div>
-                          <div class="item" style="margin: 2px 0">
-                            额定时长：{{ ii.e_ding_shi_chang_ || '/' }}
-                          </div>
-                          <div class="item" style="margin: 2px 0">
-                            已使用总时长：{{ ii.zsc2 || '/' }}
-                          </div>
-                          <div class="item" style="margin: 2px 0">
-                            当次使用时长：{{ ii.shi_yong_shi_chan || '/' }}
-                          </div>
-                          <div class="item" style="margin: 2px 0">
-                            使用时间：{{ ii.ri_qi_ || '/' }}
-                          </div>
-                          <div class="item" style="margin: 2px 0">
-                            擦拭情况：{{ ii.wan_cheng_qing_ku || '/' }}
-                          </div>
+                            }}</div
+                          >
+                          <div class="item" style="margin: 2px 0"
+                            >岗位：{{ ii.gang_wei_ || '/' }}</div
+                          >
+                          <div class="item" style="margin: 2px 0"
+                            >额定时长：{{ ii.e_ding_shi_chang_ || '/' }}</div
+                          >
+                          <div class="item" style="margin: 2px 0"
+                            >已使用总时长：{{ ii.zsc1 || '/' }}</div
+                          >
+                          <div class="item" style="margin: 2px 0"
+                            >当次使用时长：{{
+                              ii.shi_yong_shi_chan || '/'
+                            }}</div
+                          >
+                          <div class="item" style="margin: 2px 0"
+                            >使用时间：{{ ii.ri_qi_ || '/' }}</div
+                          >
+                          <div class="item" style="margin: 2px 0"
+                            >擦拭情况：{{ ii.wan_cheng_qing_ku || '/' }}</div
+                          >
                         </div>
                       </div>
                     </div>
@@ -158,6 +160,7 @@
                   <div class="green-circle" />
                 </el-tooltip>
                 <div v-if="i.wait > 0 && i.show" class="red-circle" />
+                <div v-if="i.no > 0 && i.show" class="orange-circle" />
               </div>
             </div>
           </div>
@@ -258,15 +261,14 @@ export default {
           bu_men_,
           gang_wei_,
           shi_fou_guo_shen_,
-          config_id_,
           bian_zhi_shi_jian
         } = item
-        const t = result.find((i) => i.config_id_ === config_id_)
+        const t = result.find((i) => i.she_shi_id_ === she_shi_id_)
         if (t) {
           t.children.push(item)
         } else {
           result.push({
-            config_id_: config_id_ || '',
+            she_shi_id_: she_shi_id_,
             zi_wai_deng_ming_: zi_wai_deng_ming_ || '',
             deng_guan_hao_: deng_guan_hao_ || '',
             bu_men_: bu_men_ || '',
@@ -277,28 +279,21 @@ export default {
           })
         }
       })
-      console.log('fliterData', result)
-      this.totalList.forEach((item) => {
-        const {
-          she_shi_id_,
-          zi_wai_deng_ming_,
-          deng_guan_hao_,
-          bian_zhi_bu_men_,
-          gang_wei_,
-          config_id_
-        } = item
-        const t = result.find((i) => i.config_id_ === item.config_id_)
-        // if (!t) {
-        //     result.push({
-        //         config_id_: config_id_ || '',
-        //         zi_wai_deng_ming_: zi_wai_deng_ming_ || '',
-        //         deng_guan_hao_: deng_guan_hao_ || '',
-        //         bu_men_: bian_zhi_bu_men_ || '',
-        //         gang_wei_: gang_wei_ || '',
-        //         children: []
-        //     })
-        // }
-      })
+
+      //   this.totalList.forEach(item => {
+      //       const { she_shi_id_, zi_wai_deng_ming_, deng_guan_hao_, bian_zhi_bu_men_, gang_wei_ } = item
+      //       const t = result.find(i => i.she_shi_id_ === item.she_shi_id_)
+      //       if (!t) {
+      //           result.push({
+      //                 she_shi_id_: she_shi_id_ || '',
+      //                 zi_wai_deng_ming_: zi_wai_deng_ming_ || '',
+      //                 deng_guan_hao_: deng_guan_hao_ || '',
+      //                 bu_men_: bian_zhi_bu_men_ || '',
+      //                 gang_wei_: gang_wei_ || '',
+      //                 children: []
+      //           })
+      //       }
+      //   })
       if (this.position) {
         result = result.filter((item) => item.bu_men_ === this.position)
       }
@@ -317,6 +312,7 @@ export default {
           (item) => item.gang_wei_.indexOf(this.gangWei) > -1
         )
       }
+      console.log('fliterData', result)
       return result
     },
     formatData() {
@@ -335,16 +331,22 @@ export default {
           }
 
           const tempList = item.children.filter(
-            (k) => k.config_id_ && k.bian_zhi_shi_jian.slice(0, 10) === fullDay
+            (k) => k.she_shi_id_ && k.bian_zhi_shi_jian.slice(0, 10) === fullDay
           )
           const overList = item.children.filter(
             (k) =>
               k.bian_zhi_shi_jian &&
               k.bian_zhi_shi_jian.slice(0, 10) === fullDay &&
-              (k.shi_fou_guo_shen_ == '已完成' ||
-                k.shi_fou_guo_shen_ == '无需处理')
+              k.shi_fou_guo_shen_ == '已完成'
+          )
+          const noList = item.children.filter(
+            (k) =>
+              k.bian_zhi_shi_jian &&
+              k.bian_zhi_shi_jian.slice(0, 10) === fullDay &&
+              k.shi_fou_guo_shen_ == '无需处理'
           )
           obj.count = overList.length
+          obj.no = noList.length
 
           const waitList = item.children.filter(
             (k) =>
@@ -354,8 +356,6 @@ export default {
           )
           obj.wait = waitList.length
 
-          console.log('数量', overList.length, waitList.length)
-
           obj.data = tempList
           if (new Date(fullDay).getTime() > new Date(this.curTime).getTime()) {
             obj.show = false
@@ -364,20 +364,22 @@ export default {
         })
         answer[i] = arr
       }
+
+      console.log('紫外灯', answer)
       return answer
     }
   },
   async mounted() {
     this.init()
     // const sql = `select she_shi_id_,zi_wai_deng_ming_,deng_guan_hao_,bian_zhi_bu_men_,gang_wei_ from t_jykzwdxdjlbsc where di_dian_='${this.level}' and shi_fou_ting_yong='1'`
-    const {
-      variables: { data }
-    } = await this.$common.request('query', {
-      key: 'cxzwdb',
-      params: [this.level]
-    })
-    console.log('totalList', data)
-    this.totalList = data //紫外灯记录
+    // const {
+    //   variables: { data }
+    // } = await this.$common.request('query', {
+    //   key: 'cxzwdb',
+    //   params: [this.level]
+    // })
+    // console.log('totalList', data)
+    // this.totalList = data //紫外灯记录
   },
   methods: {
     handleActionEvent({ key }) {