From a8c3d2c5851922a6be9fdcc18772d254180fe1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 24 Apr 2024 14:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OperationalOverview/processingBoard.vue   |  7 +++++--
 src/views/report/ingredientReport/day.vue     | 13 +++++++------
 .../report/qcReport/fullInspection/index.vue  | 19 +++++++++++++------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index e83fa26b..5b905d8f 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-22 12:15:49
+ * @LastEditTime: 2024-04-24 14:21:39
  * @Description:
 -->
 <template>
@@ -482,7 +482,10 @@ export default {
             </span>`,
 			`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
       `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
-      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == false ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '}"></div>  ${item.error == true ? '是' : '否' || ''}</span>`,
+      `<span"><div style="${item.error == false
+        ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
+        : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
+      }"></div>  ${item.error == true ? '是' : '否' || ''}</span>`,
 		]);
     this.eqConfig.data = eqArr;
     let data = [
diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue
index 8bb92432..02bae6ee 100644
--- a/src/views/report/ingredientReport/day.vue
+++ b/src/views/report/ingredientReport/day.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-24 13:49:09
+ * @LastEditTime: 2024-04-24 13:52:45
  * @LastEditors: zhp
  * @Description:
 -->
@@ -24,19 +24,20 @@
       </el-table-column>
     </el-table> -->
 
-    <el-table  class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
-      <el-table-column prop="" label="配料日报" width="120">
+    <el-table class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
+      <el-table-column align="center" prop="" label="配料日报" width="120">
         <el-table-column label="原料样式" align="right" width="150">
-          <el-table-column prop="className" label="时间" width="120">
+          <el-table-column  prop="className" label="时间" width="120">
           </el-table-column>
         </el-table-column>
-        <el-table-column prop="putType" label="" width="180">
+        <el-table-column align="center" prop="putType" label="" width="180">
         </el-table-column>
         <!-- <el-table-column prop label="参考标准及评价方法">
         <el-table-column prop="activityName"></el-table-column>
         <el-table-column prop="message"></el-table-column>
       </el-table-column> -->
-        <el-table-column style="text-align: center;" v-for="(item,index) in codeList " :prop="item" :label="item">
+        <el-table-column align="center" style="text-align: center;" v-for="(item,index) in codeList " :prop="item"
+          :label="item">
           <!-- <template slot-scope="scope">
           <el-col :span="12">
             {{ codeList[index] }}
diff --git a/src/views/report/qcReport/fullInspection/index.vue b/src/views/report/qcReport/fullInspection/index.vue
index ba4e48b8..7deff9c0 100644
--- a/src/views/report/qcReport/fullInspection/index.vue
+++ b/src/views/report/qcReport/fullInspection/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-24 08:58:26
+ * @LastEditTime: 2024-04-24 14:12:24
  * @LastEditors: zhp
  * @Description:
 -->
@@ -61,7 +61,12 @@
       </el-table-column>
       <div slot="append" v-if="this.tableData.length != 0" style="text-align: center">
         <!--在此处添加你想要插入在表格最后一行的内容-->
-
+        <el-col :span="8">
+          人工监测人员
+        </el-col>
+        <el-col :span="8">
+          <!-- {{  }} -->
+        </el-col>
         <el-col :span="8">
           合计
         </el-col>
@@ -305,8 +310,9 @@ export default {
       return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
     },
     handleGetClass(e) {
-
-      this.listQuery.startTime = new Date(new Date().setHours(0, 7, 0, 0)).getTime()
+      let str = this.listQuery.startTime
+      // console.log(str);
+      this.listQuery.startTime = new Date(new Date(str).setHours(0, 7, 0, 0)).getTime()
       // console.log(startTime1)
       this.codeList = []
       if (e === '早班查询') {
@@ -369,8 +375,9 @@ export default {
         ])
         this.getDataList()
       } else {
-        // this.codeList = []
-        this.listQuery.startTime = new Date(new Date().setHours(1, 9, 0, 0)).getTime()
+        let str = this.listQuery.startTime
+        // console.log(str);
+        this.listQuery.startTime = new Date(new Date(str).setHours(0, 7, 0, 0)).getTime()
        let  arr = [
           {
            label: '19:00',
-- 
2.24.3