From 9351b82d11efe53734aa60f3d168cc00f33eb1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Thu, 25 Apr 2024 17:02:52 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/ingredientReport/day.vue     | 20 +++++++++----------
 src/views/report/qcReport/optimizeCutData.vue |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue
index 47f90a44..a7740705 100644
--- a/src/views/report/ingredientReport/day.vue
+++ b/src/views/report/ingredientReport/day.vue
@@ -143,7 +143,7 @@ export default {
           valueFormat: "timestamp",
           rangeSeparator: '-',
           param: 'checkTime',
-          defaultSelect: Date.now(),
+          defaultSelect: Date.now() - 24 * 60 * 60 * 1000,
           width: 150
         },
         {
@@ -169,9 +169,9 @@ export default {
   },
   mounted() {
     // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = Date.now()
-    this.time = moment(new Date(Date.now())).format('YYYY-MM-DD')
-    this.listQuery.endTime = Date.now() + 24 * 60 * 60 * 1000
+    this.listQuery.startTime = Date.now() - 24 * 60 * 60 * 1000
+    this.time = moment(new Date((Date.now() - 24 * 60 * 60 * 1000)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now()).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss')
+    this.listQuery.endTime = Date.now()
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
     // this.getSpanArr(this.tableData)
@@ -308,7 +308,7 @@ export default {
             'sj11': null,
 
             'sj14': null,
-            putType: '原料投入'
+            putType: '原料投入(kg)'
           },
           {
             classType: 1,
@@ -374,7 +374,7 @@ export default {
             'sj11': null,
 
             'sj14': null,
-            putType: '原料投入',
+            putType: '原料投入(kg)',
           },
           {
             classType: 2,
@@ -440,7 +440,7 @@ export default {
             'sj11': null,
 
             'sj14': null,
-            putType: '原料投入',
+            putType: '原料投入(kg)',
           },
           {
             classType: 3,
@@ -535,9 +535,9 @@ export default {
       // Date.now() - 24 * 60 * 60 - 1000
       switch (val.btnName) {
         case 'search':
-          this.listQuery.startTime = val.checkTime ? val.checkTime : undefined;
-          this.time = moment(new Date(this.listQuery.startTime)).format('YYYY-MM-DD')
-          this.listQuery.endTime = val.checkTime ? val.checkTime + 24 * 60 * 60 * 1000 : undefined;
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime).setHours(8, 0, 0, 0)).getTime() : undefined;
+          this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss')
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).getTime() : undefined;
           this.getDataList();
           break;
         case 'export':
diff --git a/src/views/report/qcReport/optimizeCutData.vue b/src/views/report/qcReport/optimizeCutData.vue
index 35a210f6..45729b4f 100644
--- a/src/views/report/qcReport/optimizeCutData.vue
+++ b/src/views/report/qcReport/optimizeCutData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-25 13:41:27
+ * @LastEditTime: 2024-04-25 16:27:01
  * @LastEditors: zhp
  * @Description:
 -->
@@ -67,7 +67,7 @@ const tableProps = [
   },
   {
     prop: 'area',
-    label: '面积'
+    label: '面积(㎡)'
   },
   {
     prop: 'rate',
-- 
2.24.3


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

---
 src/views/report/ingredientReport/day.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue
index a7740705..47473fe2 100644
--- a/src/views/report/ingredientReport/day.vue
+++ b/src/views/report/ingredientReport/day.vue
@@ -169,8 +169,8 @@ export default {
   },
   mounted() {
     // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = Date.now() - 24 * 60 * 60 * 1000
-    this.time = moment(new Date((Date.now() - 24 * 60 * 60 * 1000)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now()).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss')
+    this.listQuery.startTime = Date.now()
+    this.time = moment(new Date((Date.now())).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now())).format('YYYY-MM-DD HH:mm:ss')
     this.listQuery.endTime = Date.now()
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
@@ -536,8 +536,8 @@ export default {
       switch (val.btnName) {
         case 'search':
           this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime).setHours(8, 0, 0, 0)).getTime() : undefined;
-          this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss')
-          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).getTime() : undefined;
+          this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).format('YYYY-MM-DD HH:mm:ss')
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).getTime() : undefined;
           this.getDataList();
           break;
         case 'export':
-- 
2.24.3


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

---
 src/views/report/ingredientReport/day.vue          | 8 ++++++--
 src/views/report/qcReport/cutDayReport/index.vue   | 6 +++++-
 src/views/report/qcReport/fullInspection/index.vue | 6 +++++-
 src/views/report/qcReport/lineReport.vue           | 7 ++++++-
 src/views/report/qcReport/optimizeCutData.vue      | 6 +++++-
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue
index 47473fe2..64d37df4 100644
--- a/src/views/report/ingredientReport/day.vue
+++ b/src/views/report/ingredientReport/day.vue
@@ -143,7 +143,7 @@ export default {
           valueFormat: "timestamp",
           rangeSeparator: '-',
           param: 'checkTime',
-          defaultSelect: Date.now() - 24 * 60 * 60 * 1000,
+          defaultSelect: Date.now(),
           width: 150
         },
         {
@@ -170,7 +170,7 @@ export default {
   mounted() {
     // this.formConfig[1].defaultSelect[]
     this.listQuery.startTime = Date.now()
-    this.time = moment(new Date((Date.now())).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now())).format('YYYY-MM-DD HH:mm:ss')
+    this.time = moment(new Date((Date.now())).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now() + 24*60*60*1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss')
     this.listQuery.endTime = Date.now()
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
@@ -551,6 +551,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable{
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }
diff --git a/src/views/report/qcReport/cutDayReport/index.vue b/src/views/report/qcReport/cutDayReport/index.vue
index 5e997255..3ccab238 100644
--- a/src/views/report/qcReport/cutDayReport/index.vue
+++ b/src/views/report/qcReport/cutDayReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-25 13:40:51
+ * @LastEditTime: 2024-04-25 17:13:14
  * @LastEditors: zhp
  * @Description:
 -->
@@ -493,6 +493,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }
diff --git a/src/views/report/qcReport/fullInspection/index.vue b/src/views/report/qcReport/fullInspection/index.vue
index d61b3f16..59c6b2ad 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-25 13:30:11
+ * @LastEditTime: 2024-04-25 17:13:28
  * @LastEditors: zhp
  * @Description:
 -->
@@ -413,6 +413,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }
diff --git a/src/views/report/qcReport/lineReport.vue b/src/views/report/qcReport/lineReport.vue
index 3636977a..c51d3580 100644
--- a/src/views/report/qcReport/lineReport.vue
+++ b/src/views/report/qcReport/lineReport.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-25 13:40:36
+ * @LastEditTime: 2024-04-25 17:13:43
  * @LastEditors: zhp
  * @Description:
 -->
@@ -395,6 +395,11 @@ export default {
 };
 </script>
 <style>
+
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 .baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }
diff --git a/src/views/report/qcReport/optimizeCutData.vue b/src/views/report/qcReport/optimizeCutData.vue
index 45729b4f..dfa25cf2 100644
--- a/src/views/report/qcReport/optimizeCutData.vue
+++ b/src/views/report/qcReport/optimizeCutData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-25 16:27:01
+ * @LastEditTime: 2024-04-25 17:13:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -387,6 +387,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }
-- 
2.24.3


From be83c8196e79c7b773349bbeb7e1b5756c8e1a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Thu, 25 Apr 2024 18:50:58 +0800
Subject: [PATCH 4/6] =?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   | 27 +++++++++----------
 src/views/report/qcReport/optimizeCutData.vue | 14 +++++-----
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index c5f6a23d..0f3a9547 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-25 09:02:38
+ * @LastEditTime: 2024-04-25 18:24:31
  * @Description:
 -->
 <template>
@@ -298,11 +298,11 @@ export default {
 			// equipmentList:[],
 			EnergyMonitoringList: [],
 			eqConfig: {
-				header: ['序号', '设备名称', '产线名', '设备状态'],
+        header: ['序号', '产线名', '设备名称', '设备状态'],
 				headerBGC: 'rgba(32, 55, 96, 0.8)',
 				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
 				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-				columnWidth: [70, 130, 240, 120],
+				columnWidth: [70, 150, 200, 120],
 				align: ['center'],
 				data: [],
 				// index:true,
@@ -462,8 +462,8 @@ export default {
 					name: ele.name,
           progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
           specifications: ele.specifications ?  '规格' + ele.specifications :'',
-          planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan)) : '',
-          actualQuantity: ele.actualQuantity ?this.getStr(String(ele.actualQuantity)) : '',
+          planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan,6)) : '',
+          actualQuantity: ele.actualQuantity ?this.getStr(String(ele.actualQuantity,6)) : '',
 				};
 			}
 		});
@@ -483,10 +483,9 @@ export default {
 			`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
             </span>`,
 			// formatDate(item.planStartTime) || '',
-			`
+      `<span style="color:rgba(255,255,255,0.5)">${item.lineName || ''}</span>`,`
           <span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
             </span>`,
-			`<span style="color:rgba(255,255,255,0.5)">${item.lineName || ''}</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' : item.status == '停机' ? 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;background-color: #FFBD02;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.status || ''}</span>`,
 		]);
     this.eqConfig.data = eqArr;
@@ -566,9 +565,9 @@ export default {
 	//   removeEventListener('resize', resizeFun)
 	// },
   methods: {
-    getStr(str) {
+    getStr(str,num) {
           //你要处理的字符串
-      if (str.length > 6) {      //如果字符长度超过10，后面的字符就变成...可自行调整长度和代替字符
+      if (str.length > num) {      //如果字符长度超过10，后面的字符就变成...可自行调整长度和代替字符
         str = str.substr(0, 6) + "..."   //截取从第一个字符开始，往后取10个字符，剩余的用...代替
         return str
       } else {
@@ -743,12 +742,12 @@ export default {
 					this.orderList = this.SJGWsData.detData.map((ele, index) => {
 						if (ele.progressRate && ele.progressRate != 1) {
 							return {
-								id: ele.id,
-								name: ele.name,
+                id: ele.id,
+                name: this.getStr(String(ele.name,8)),
                 progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
-                specifications: ele.specifications ?  '规格' + ele.specifications :null,
-                planQuantity: ele.planQuantity  ? '计划' + ele.planQuantity + '片' : null,
-                actualQuantity: ele.actualQuantity ? ele.actualQuantity + '片' : null,
+                specifications: ele.specifications ? '规格' + ele.specifications : '',
+                planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan,6)) : '',
+                actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity,6)) : '',
 							};
 						}
 					});
diff --git a/src/views/report/qcReport/optimizeCutData.vue b/src/views/report/qcReport/optimizeCutData.vue
index dfa25cf2..8b272d27 100644
--- a/src/views/report/qcReport/optimizeCutData.vue
+++ b/src/views/report/qcReport/optimizeCutData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-25 17:13:49
+ * @LastEditTime: 2024-04-25 18:50:41
  * @LastEditors: zhp
  * @Description:
 -->
@@ -129,7 +129,7 @@ export default {
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'checkTime',
-          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000],
+          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now().setHours(6, 59, 59))).getTime()],
           width: 350
         },
         {
@@ -167,8 +167,8 @@ export default {
   created() { },
   mounted() {
     // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
-    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
+    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
+    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
     this.getDict()
@@ -357,8 +357,10 @@ export default {
           // this.listQuery.materialId = val.materialId ? val.materialId : undefined;
           // this.listQuery.startTime = '1706144404000';
           // this.listQuery.endTime = '1706230804000';
-          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
-          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 : undefined;
+          // this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
+          // this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 : undefined;
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() : undefined;
           this.listQuery.lineId = val.lineId ? val.lineId : undefined
           this.getDataList();
           break;
-- 
2.24.3


From dacae0cbd8adaaf5378cf0c9cdf2574f164ffaeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 26 Apr 2024 08:32:32 +0800
Subject: [PATCH 5/6] =?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   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 0f3a9547..06a1d08a 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-25 18:24:31
+ * @LastEditTime: 2024-04-26 08:32:02
  * @Description:
 -->
 <template>
@@ -387,7 +387,7 @@ export default {
         progressRate: 0.933333,
         specifications: '1100*5554*22',
         plan: 111111111111,
-        actualQuantity:10000001111,
+        actualQuantity:1000000111111,
 			},
 			{
 				id: '2',
@@ -458,12 +458,12 @@ export default {
 		this.orderList = detData.map((ele, index) => {
 			if (ele.progressRate && ele.progressRate != 1) {
 				return {
-					id: ele.id,
-					name: ele.name,
+          id: ele.id,
+          name: this.getStr(String(ele.name), 8),
           progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
-          specifications: ele.specifications ?  '规格' + ele.specifications :'',
-          planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan,6)) : '',
-          actualQuantity: ele.actualQuantity ?this.getStr(String(ele.actualQuantity,6)) : '',
+          specifications: ele.specifications ? '规格' + ele.specifications : '',
+          planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan), 6) : '',
+          actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
 				};
 			}
 		});
@@ -568,7 +568,7 @@ export default {
     getStr(str,num) {
           //你要处理的字符串
       if (str.length > num) {      //如果字符长度超过10，后面的字符就变成...可自行调整长度和代替字符
-        str = str.substr(0, 6) + "..."   //截取从第一个字符开始，往后取10个字符，剩余的用...代替
+        str = str.substr(0, num) + "..."   //截取从第一个字符开始，往后取10个字符，剩余的用...代替
         return str
       } else {
         return str
@@ -743,11 +743,11 @@ export default {
 						if (ele.progressRate && ele.progressRate != 1) {
 							return {
                 id: ele.id,
-                name: this.getStr(String(ele.name,8)),
+                name: this.getStr(String(ele.name), 8),
                 progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
                 specifications: ele.specifications ? '规格' + ele.specifications : '',
-                planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan,6)) : '',
-                actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity,6)) : '',
+                planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan),6) : '',
+                actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
 							};
 						}
 					});
-- 
2.24.3


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

---
 src/views/report/qcReport/optimizeCutData.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/report/qcReport/optimizeCutData.vue b/src/views/report/qcReport/optimizeCutData.vue
index 8b272d27..0c7704a2 100644
--- a/src/views/report/qcReport/optimizeCutData.vue
+++ b/src/views/report/qcReport/optimizeCutData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-25 18:50:41
+ * @LastEditTime: 2024-04-26 08:42:00
  * @LastEditors: zhp
  * @Description:
 -->
@@ -129,7 +129,7 @@ export default {
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'checkTime',
-          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now().setHours(6, 59, 59))).getTime()],
+          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()],
           width: 350
         },
         {
-- 
2.24.3