From b3edf33de93e27b4ae39c9795d8ee8c0e38496ca Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 18 Jan 2024 14:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B7=E6=96=99=E5=B0=8F=E6=95=B0=E7=82=B9&#?=
 =?UTF-8?q?117?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_photon.vue | 49 ++++++++++++++++++----------
 src/views/wpm/mlog_hun.vue           |  6 ++++
 src/views/wpm/worktask_form.vue      |  6 +++-
 3 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue
index 5061dd3f..b6db9f8c 100644
--- a/src/views/bigScreen/index_photon.vue
+++ b/src/views/bigScreen/index_photon.vue
@@ -350,23 +350,26 @@ export default {
                 that.showTime();
             }, 1000);
             that.notokTimer = setInterval(() => {
-                if (that.deptName == '10车间') {
-                    that.deptName = '7车间'
-                } else {
-                    that.deptName = '10车间'
-                }
-                let deptData = [];
-                if (that.deptName == '7车间') {
-                    deptData = that.dept7Data;
-                } else {
-                    deptData = that.dept10Data;
-                }
-                that.pieoption.series.data = deptData;
-                let pieoption = that.pieoption;
                 let pieDom = document.getElementById('pie');
-                let pieChart = echarts.init(pieDom);
-                pieChart.clear();
-                pieChart.setOption(pieoption, true);
+                if(pieDom){
+                    if (that.deptName == '10车间') {
+                        that.deptName = '7车间'
+                    } else {
+                        that.deptName = '10车间'
+                    }
+                    let deptData = [];
+                    if (that.deptName == '7车间') {
+                        deptData = that.dept7Data;
+                    } else {
+                        deptData = that.dept10Data;
+                    }
+                    that.pieoption.series.data = deptData;
+                    let pieoption = that.pieoption;
+                    
+                    let pieChart = echarts.init(pieDom);
+                    pieChart.clear();
+                    pieChart.setOption(pieoption, true);
+                }
             }, 5000);
 
             that.initChart();
@@ -1599,9 +1602,19 @@ export default {
             this.currentObj.deptName = '';
         },
     },
+    beforeUnmount() {
+        let that = this;
+        clearInterval(that.timerTime);
+        clearInterval(that.notokTimer);
+        that.timerTime = null;
+        that.notokTimer = null;
+    },
     beforeDestoryed() {
-        clearInterval(timerTime);
-        this.timerTime = null;
+        let that = this;
+        clearInterval(that.timerTime);
+        clearInterval(that.notokTimer);
+        that.timerTime = null;
+        that.notokTimer = null;
     },
 
 }
diff --git a/src/views/wpm/mlog_hun.vue b/src/views/wpm/mlog_hun.vue
index 2eeb62c6..7efdc0c6 100644
--- a/src/views/wpm/mlog_hun.vue
+++ b/src/views/wpm/mlog_hun.vue
@@ -22,6 +22,9 @@
                         <el-table-column label="数量/桶数" prop="count_real">
                         </el-table-column>
                         <el-table-column label="每桶重量/kg" prop="count_real_eweight">
+                            <template #default="scope">
+                                <span v-if="scope.row.count_real_eweight"> {{ scope.row.count_real_eweight.toFixed(2) }}</span>
+                            </template>
                         </el-table-column>
                         <el-table-column label="配料人" prop="handle_user_name">
                             <template #default="scope">
@@ -70,6 +73,9 @@
                         <el-table-column label="数量/桶数" prop="count">
                         </el-table-column>
                         <el-table-column label="每桶重量/kg" prop="count_eweight">
+                            <template #default="scope">
+                                <span v-if="scope.row.count_eweight"> {{ scope.row.count_eweight.toFixed(2) }}</span>
+                            </template>
                         </el-table-column>
                         <el-table-column label="交送人" prop="send_user_name">
                         </el-table-column>
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index ac99aacb..f646bc40 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -1216,7 +1216,11 @@ export default {
           let number = item.number;
           let equipment_number = number.substring(number.length - 1);
           this.equipment_number = equipment_number;
-          this.form.batch=this.material_model+'-'+equipment_number+'-'+this.dateNow+'-'+this.form.index;
+          let index= this.form.index
+          if(index!==undefined&&index!==''&&index!==null){
+            index=''
+          }
+          this.form.batch=this.material_model+'-'+equipment_number+'-'+this.dateNow+'-'+index;
         }
       })
     },