Просмотр исходного кода

紫外灯月度统计改动回滚,性能验证公式渲染bug修复

cfort 9 месяцев назад
Родитель
Сommit
fd3fc313dd

+ 3 - 3
src/business/platform/bpmn/form/index.vue

@@ -474,12 +474,12 @@ export default {
                 // 流程实例当前审批节点
                 this.endProcessTaskId = data.endProcessTaskId
                 if (this.timeModificationbtn) {
-                // 备份对比
+                    // 备份对比
                     this.$nextTick(() => {
                         setTimeout(() => {
-                            this.formDataBF = JSON.parse(JSON.stringify(this.getFormData()))
+                            this.formDataBF = structuredClone(this.getFormData())
                         }, 500)
-                        this.opinionListBF = JSON.parse(JSON.stringify(this.formParams.formOpinionData.opinionList))
+                        this.opinionListBF = structuredClone(this.formParams.formOpinionData.opinionList)
                     })
                 }
                 //  ============内嵌表单[按钮这边提供] ================

+ 3 - 3
src/views/business/performance/constants/index.js

@@ -567,17 +567,17 @@ export const formulaList = [
     {
         label: '室内标准差',
         key: 'sl',
-        value: '$$S_1=\sqrt{\frac{n-1}{n}·S_r^2+S_b^2}$$'
+        value: '$$S_1=\\sqrt{\\frac{n-1}{n}·S_r^2+S_b^2}$$'
     },
     {
         label: '批内标准差',
         key: 'sr',
-        value: '$$S_r=\sqrt{\frac{\sum_{d=1}^D\sum_{i-1}^n(x_{di}-\overline{x_d})^2}{D(n-1)}}$$'
+        value: '$$S_r=\\sqrt{\\frac{\\sum_{d=1}^D\\sum_{i-1}^n(x_{di}-\\overline{x_d})^2}{D(n-1)}}$$'
     },
     {
         label: '批间方差',
         key: 'vb',
-        value: '$$S_b^2=\frac{\sum_{d=1}^D(\overline{x_d}-\overset{=}{x})^2}{D-1}$$'
+        value: '$$S_b^2=\\frac{\\sum_{d=1}^D(\\overline{x_d}-\\overset{=}{x})^2}{D-1}$$'
     }
 ]
 

+ 30 - 34
src/views/component/facility/ultStatic.vue

@@ -101,7 +101,7 @@
                         <div v-for="(item,index) in formatData" :key="index" class="content-item">
                             <div class="item">{{ index+1 }}</div>
                             <div v-for="(i,ind) in item" :key="ind" class="item">
-                                <el-tooltip v-show="i.count > 0 && i.show" class="item" effect="light" placement="top-start">
+                                <el-tooltip v-show="i.count>0" class="item" effect="light" placement="top-start">
                                     <template slot="content">
                                         <div>
                                             <div v-for="(ii,indd) in i.data" :key="indd" class="detail">
@@ -112,15 +112,16 @@
                                                     <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.sysj1|| '/' }}</div>
                                                     <div class="item" style="margin:2px 0">擦拭情况:{{ ii.wan_cheng_qing_ku|| '/' }}</div>
                                                 </div>
                                             </div>
                                         </div>
                                     </template>
                                     <div class="green-circle" />
+                                    <!-- <div v-else class="orange-circle" /> -->
                                 </el-tooltip>
-                                <div v-if="i.wait>0 && i.show" class="red-circle" />
+                                <div v-if=" i.count===0 && i.show" class="red-circle" />
                             </div>
                         </div>
                     </div>
@@ -215,37 +216,35 @@ export default {
             const fliterData = this.dataList
             let result = []
             fliterData.forEach(item => {
-                const { she_shi_id_, zi_wai_deng_ming_, deng_guan_hao_, 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 { she_shi_id_, zi_wai_deng_ming_, deng_guan_hao_, bu_men_, gang_wei_ } = item
+                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_ || '',
                         gang_wei_: gang_wei_ || '',
-                        shi_fou_guo_shen_: shi_fou_guo_shen_ || '',
-                        bian_zhi_shi_jian: bian_zhi_shi_jian || '',
                         children: [item]
                     })
                 }
             })
-            console.log('fliterData', result)
+            // 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: []
-                //     })
-                // }
+                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)
@@ -267,24 +266,16 @@ export default {
                 const arr = []
                 const day = ('0' + (i + 1)).slice(-2)
                 const fullDay = this.month + '-' + day
+                // console.log(fullDay)
                 this.fliterData.forEach(item => {
-                    const obj = {  
+                    const obj = {
                         data: [],
                         count: 0,
-                        wait: 0,
                         show: true,
                         fullDay
                     }
-
-                    const tempList = item.children.filter(k => k.config_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_ == '无需处理'))
-                    obj.count = overList.length
-                    
-                    const waitList = item.children.filter(k => k.bian_zhi_shi_jian && k.bian_zhi_shi_jian.slice(0, 10) === fullDay && k.shi_fou_guo_shen_ == '待处理')
-                    obj.wait = waitList.length
-
-                    console.log('数量', overList.length, waitList.length)
-
+                    const tempList = item.children.filter(k => k.ri_qi_.slice(0, 10) === fullDay)
+                    obj.count = tempList.length
                     obj.data = tempList
                     if (new Date(fullDay).getTime() > new Date(this.curTime).getTime()) {
                         obj.show = false
@@ -293,6 +284,7 @@ export default {
                 })
                 answer[i] = arr
             }
+            // console.log('answer', answer)
             return answer
         }
     },
@@ -370,7 +362,11 @@ export default {
             })
             // console.log('data', data)
             this.dataList = data
-            console.log('dataList', data)
+            // this.dataList.forEach(item => {
+            //     if (!Object.hasOwn(item, 'wei_hu_lei_xing_') || !item.wei_hu_lei_xing_) {
+            //         item.wei_hu_lei_xing_ = '按需保养'
+            //     }
+            // })
             this.loading = false
         }
     }