From 35bd7ab57ecd444e89a745af8523ab037ff15a64 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Fri, 22 Mar 2024 16:23:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=90=E6=9C=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cost/rawMaterialConfig/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/cost/rawMaterialConfig/index.vue b/src/views/cost/rawMaterialConfig/index.vue
index 2b1b33ae..abcc797b 100644
--- a/src/views/cost/rawMaterialConfig/index.vue
+++ b/src/views/cost/rawMaterialConfig/index.vue
@@ -79,10 +79,9 @@ const tableProps = [
 		align: 'right',
 	},
 	{
-		prop: 'enabledTime',
+		prop: 'time',
 		label: '生效时间',
-		filter: parseTime,
-		width: 150,
+		width: 235,
 	},
 	{
 		prop: 'remark',

From ba2aa7b1b8e03e45ac071141ba30b453591148f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 22 Mar 2024 16:45:17 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/linearBarChart.vue             | 23 ++++++++++---------
 .../OperationalOverview/processingBoard.vue   |  2 +-
 .../base/qualityScrapLog/add-or-updata.vue    |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/OperationalOverview/components/linearBarChart.vue b/src/views/OperationalOverview/components/linearBarChart.vue
index f166f979..abcd3892 100644
--- a/src/views/OperationalOverview/components/linearBarChart.vue
+++ b/src/views/OperationalOverview/components/linearBarChart.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div :id="id" :class="className" :style="{ height: height + 'px', width: width }" />
+    <div :id="id" :class="className" :style="{ height: '420px', width: width }" />
   </div>
 </template>
 
@@ -19,7 +19,7 @@ export default {
     },
     className: {
       type: String,
-      default: 'chart'
+      default: 'enChart'
     },
     width: {
       type: String,
@@ -84,7 +84,7 @@ export default {
   },
   methods: {
     initChart(nameList, dataList) {
-      console.log('1111', dataList);
+      // console.log('1111', dataList);
       // console.log(1)
       this.chart = echarts.init(document.getElementById(this.id))
       // if (dataList.length !== 0) {
@@ -123,13 +123,7 @@ export default {
             type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
           }
         },
-        grid: {
-          top: 30,
-          left: '2%',
-          right: '2%',
-          bottom: '3%',
-          containLabel: true
-        },
+        grid: { top: 90, right: 60, bottom: 20, left: 90 },
         // legend: {
         //   itemWidth: 10,
         //   itemHeight: 10,
@@ -205,4 +199,11 @@ export default {
   }
 }
 </script>
-
+<style>
+.enChart {
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  top: -30px;
+}
+</style>
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index dcf702b4..22366bf1 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-03-21 16:07:39
+ * @LastEditTime: 2024-03-22 16:40:46
  * @Description:
 -->
 <template>
diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
index 4917fe93..7eebe8be 100644
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-03-20 09:38:10
+ * @LastEditTime: 2024-03-22 15:02:21
  * @LastEditors: zhp
  * @Description:
 -->
@@ -10,7 +10,7 @@
     <el-row :gutter="20">
       <el-col :span="8">
         <el-form-item label="工单号" prop="workOrderId">
-          <el-select v-model="dataForm.workOrderId" placeholder="请选择工单号">
+          <el-select filterable  v-model="dataForm.workOrderId" placeholder="请选择工单号">
             <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>

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

---
 .../processEquMaterialBom/add-or-updata.vue   | 10 +++----
 .../processEquValueBom/add-or-updata.vue      |  6 ++---
 .../base/qualityScrapLog/add-or-updata.vue    | 11 ++++++--
 src/views/report/glass/day.vue                | 12 +++++----
 src/views/report/glass/month.vue              | 10 ++++---
 src/views/report/glass/weekly.vue             | 26 ++++++++++---------
 src/views/report/glass/year.vue               | 10 ++++---
 7 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/views/extend/processEquMaterialBom/add-or-updata.vue b/src/views/extend/processEquMaterialBom/add-or-updata.vue
index 4723d506..e9a0e2c9 100644
--- a/src/views/extend/processEquMaterialBom/add-or-updata.vue
+++ b/src/views/extend/processEquMaterialBom/add-or-updata.vue
@@ -2,11 +2,11 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-20 09:18:30
+ * @LastEditTime: 2024-03-22 17:11:55
  * @Description:
 -->
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="50%">
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" class="drawer" size="50%">
     <small-title slot="title" :no-padding="true">
       {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
     </small-title>
@@ -75,7 +75,7 @@
           :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
       </div>
     </div>
-    <div class="drawer-body__footer">
+    <div v-if="!isdetail" class="drawer-body__footer">
       <el-button style="" @click="goback()">取消</el-button>
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
     </div>
@@ -198,7 +198,7 @@ export default {
         }
         // 修改的提交
         if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
+          this.urlOptions.updateURL(this.dataForm).then(res => {
             this.$modal.msgSuccess("修改成功");
             this.visible = false;
             this.$emit("refreshDataList");
@@ -206,7 +206,7 @@ export default {
           return;
         }
         // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
+        this.urlOptions.createURL(this.dataForm).then(res => {
           this.$modal.msgSuccess("新增成功");
           this.idAttrShow = true;
           this.dataForm.id = res.data
diff --git a/src/views/extend/processEquValueBom/add-or-updata.vue b/src/views/extend/processEquValueBom/add-or-updata.vue
index c857d400..fb89cbe6 100644
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-22 09:01:30
+ * @LastEditTime: 2024-03-22 17:12:03
  * @Description:
 -->
 <template>
@@ -289,7 +289,7 @@ export default {
         }
         // 修改的提交
         if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
+          this.urlOptions.updateURL(this.dataForm).then(res => {
             this.$modal.msgSuccess("修改成功");
             this.visible = false;
             this.$emit("refreshDataList");
@@ -297,7 +297,7 @@ export default {
           return;
         }
         // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
+        this.urlOptions.createURL(this.dataForm).then(res => {
           this.$modal.msgSuccess("新增成功");
           this.idAttrShow = true;
           this.dataForm.id = res.data
diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
index 7eebe8be..e713de4c 100644
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-03-22 15:02:21
+ * @LastEditTime: 2024-03-22 17:13:16
  * @LastEditors: zhp
  * @Description:
 -->
@@ -10,7 +10,7 @@
     <el-row :gutter="20">
       <el-col :span="8">
         <el-form-item label="工单号" prop="workOrderId">
-          <el-select filterable  v-model="dataForm.workOrderId" placeholder="请选择工单号">
+          <el-select filterable v-model="dataForm.workOrderId" placeholder="请选择工单号">
             <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
@@ -58,6 +58,13 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-col :span="8">
+      <el-form-item label="来源" prop="source">
+        <el-select v-model="dataForm.source" placeholder="请选择来源" multiple>
+          <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
+        </el-select>
+      </el-form-item>
+    </el-col>
     <el-col :span="8">
       <el-form-item label="备注" prop="remark">
         <el-input v-model="dataForm.remark" placeholder="备注" />
diff --git a/src/views/report/glass/day.vue b/src/views/report/glass/day.vue
index e2d53d27..36581b9b 100644
--- a/src/views/report/glass/day.vue
+++ b/src/views/report/glass/day.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-03-22 10:14:23
+ * @LastEditTime: 2024-03-22 17:05:51
  * @LastEditors: zhp
  * @Description:
 -->
@@ -66,7 +66,7 @@ export default {
 		};
 	},
 	created() {
-    this.getDict()
+    // this.getDict()
     this.getTodayStartTimeAndEndTime()
     this.getDataList()
 	},
@@ -104,6 +104,8 @@ export default {
 
     },
     async getDataList() {
+      const res = await getCorePLList()
+      this.proLineList = res.data;
       this.dataListLoading = true
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -135,9 +137,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.dailyOutputTrend &&  item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.actualProductTrend = item.actualProductTrend &&  item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })
diff --git a/src/views/report/glass/month.vue b/src/views/report/glass/month.vue
index 087e0796..4678920f 100644
--- a/src/views/report/glass/month.vue
+++ b/src/views/report/glass/month.vue
@@ -57,7 +57,7 @@ export default {
 	},
   created() {
     this.getCurrentMonthFirst()
-    this.getDict()
+    // this.getDict()
     this.getDataList()
 	},
 	methods: {
@@ -98,6 +98,8 @@ export default {
     },
 		// 获取数据列表
     async getDataList() {
+      const res = await getCorePLList()
+      this.proLineList = res.data;
       this.dataListLoading = true;
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -129,9 +131,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })
diff --git a/src/views/report/glass/weekly.vue b/src/views/report/glass/weekly.vue
index 1f5316de..5bfcec71 100644
--- a/src/views/report/glass/weekly.vue
+++ b/src/views/report/glass/weekly.vue
@@ -86,23 +86,23 @@ export default {
 				},
 			],
 		};
-	},
+  },
+  created () {
+    // this.getDict()
+  },
 	mounted() {
 		// const day = new Date().getDay()
     // console.log('周四', day)
     this.getCurrentWeekStartTimeAndEndTime()
 		// this.changeTime(new Date(new Date().getTime() - day * 24 * 60 * 60 * 1000))
-    this.getDict()
     this.getDataList()
 	},
 	methods: {
-		async getDict() {
-			// 产线列表
-			await getCorePLList().then(res => {
-				this.proLineList = res.data;
-				// this.getDataList()
-			});
-    },
+		// async getDict() {
+		// 	// 产线列表
+
+
+    // },
     getCurrentWeekStartTimeAndEndTime() {
       this.reportTime = new Date()
       var weekday = new Array(7);
@@ -187,6 +187,8 @@ export default {
     },
 		// 获取数据列表
     async getDataList() {
+      const res = await getCorePLList()
+      this.proLineList = res.data;
       this.dataListLoading = true;
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -218,9 +220,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })
diff --git a/src/views/report/glass/year.vue b/src/views/report/glass/year.vue
index 63a5dc3a..3fd9aeaf 100644
--- a/src/views/report/glass/year.vue
+++ b/src/views/report/glass/year.vue
@@ -53,7 +53,7 @@ export default {
 		};
 	},
   created() {
-		this.getDict()
+		// this.getDict()
   },
   mounted () {
     this.getCurrentYearFirst()
@@ -98,6 +98,8 @@ export default {
     },
 		// 获取数据列表
     async getDataList() {
+      const res = await getCorePLList()
+      this.proLineList = res.data;
       this.dataListLoading = true;
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -129,9 +131,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })

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

---
 .env.dev                                      |  2 +-
 src/views/OperationalOverview/coldBoard.vue   |  2 +-
 .../components/coldDoubleYChart.vue           |  8 ++--
 .../components/pileBarChart.vue               | 29 ++++++++-------
 .../OperationalOverview/processingBoard.vue   | 37 +++++++++----------
 .../processEquValueBom/add-or-updata.vue      |  2 +-
 .../extend/processEquValueBom/attr-add.vue    |  4 +-
 .../extend/processEquValueBom/statusBtn.vue   | 26 ++++++-------
 src/views/login.vue                           | 10 ++---
 .../base/qualityHotMaterial/add-or-updata.vue | 10 ++---
 .../monitoring/materielDateFrom/index.vue     |  4 +-
 src/views/socialLogin.vue                     | 12 +++---
 12 files changed, 74 insertions(+), 72 deletions(-)

diff --git a/.env.dev b/.env.dev
index 35ec1e31..ec8ac65b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-22 14:18:33
+ # @LastEditTime: 2024-03-25 15:59:53
  # @LastEditors: zhp
  # @Description:
 ###
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index dcea1163..dba2685b 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-03-13 09:07:37
+ * @LastEditTime: 2024-03-25 13:37:34
  * @LastEditors: zhp
  * @Description:
 -->
diff --git a/src/views/OperationalOverview/components/coldDoubleYChart.vue b/src/views/OperationalOverview/components/coldDoubleYChart.vue
index 12279dae..e61dbcbf 100644
--- a/src/views/OperationalOverview/components/coldDoubleYChart.vue
+++ b/src/views/OperationalOverview/components/coldDoubleYChart.vue
@@ -2,7 +2,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-01-29 15:39:59
+ * @LastEditTime: 2024-03-25 16:56:54
  * @LastEditors: zhp
  * @Description:
 -->
@@ -158,7 +158,7 @@ export default {
         legend: {
           itemWidth: 10,
           itemHeight: 10,
-          top: '1%',
+          top: '20',
           // right: '20px',
           data: ['产线产量', '产线良品率'],
           textStyle: {
@@ -286,7 +286,7 @@ export default {
 }
 </script>
 <style>
-.productChart{
+/* .productChart{
   top: -10px;
-}
+} */
 </style>
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
index e03ec577..90edc21a 100644
--- a/src/views/OperationalOverview/components/pileBarChart.vue
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2024-03-13 09:04:11
+ * @LastEditTime: 2024-03-25 16:23:12
  * @LastEditors: zhp
  * @Description:
 -->
@@ -92,18 +92,20 @@ export default {
   methods: {
     initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
       let rawData = []
-      rawData.push(passRateList,wasteList)
-      // console.log(1)
-      const totalData = [];
-      for (let i = 0; i < rawData[0].length; ++i) {
-        let sum = 0;
-        for (let j = 0; j < rawData.length; ++j) {
-          sum += rawData[j][i];
+      let colors = ['#0fdedb', '#2359ec']
+      if (passRateList && wasteList) {
+        rawData.push(passRateList, wasteList)
+        // console.log(1)
+        const totalData = [];
+        for (let i = 0; i < rawData[0].length; ++i) {
+          let sum = 0;
+          for (let j = 0; j < rawData.length; ++j) {
+            sum += rawData[j][i];
+          }
+          totalData.push(sum);
         }
-        totalData.push(sum);
+        console.log('total', totalData);
       }
-      let colors = ['#0fdedb', '#2359ec' ]
-      console.log('total', totalData);
       this.chart = echarts.init(document.getElementById(this.id))
       const series = [
         '良品',
@@ -123,9 +125,9 @@ export default {
             formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
           },
           color:colors[sid],
-          data: rawData[sid].map((d, did) =>
+          data: rawData.length != 0 ? rawData[sid].map((d, did) =>
             totalData[did] <= 0 ? 0 : d / totalData[did]
-          )
+          ) : []
         };
       });
       // let series = [
@@ -172,6 +174,7 @@ export default {
         legend: {
           itemWidth: 12,
           itemHeight: 12,
+          top:'30',
           icon: 'rect',
           textStyle: {
             color: '#ffffff'
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 22366bf1..3011c0cb 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-03-22 16:40:46
+ * @LastEditTime: 2024-03-25 16:54:49
  * @Description:
 -->
 <template>
@@ -605,10 +605,7 @@ export default {
     }
   },
   created() {
-    // this.fetchList('exception-alarm')
-    // this.fetchList('inAndOutOfEachLine')
-    // this.fetchList('order-process')
-    // this.fetchList('line-chart-data')
+    this.getData()
     this.init()
     setTimeout(() => {
       window.location.reload()
@@ -671,6 +668,22 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
+    getData() {
+      let processArr = qualityMonthList.map((item, index) => [
+        // console.log(item)
+        `<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.productionLineName || ''}
+            </span>`,
+        `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
+        `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
+        `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
+      ])
+      this.processConfig.data = processArr
+      this.$refs['processScrollBoard'].updateRows(processArr)
+    },
     // getList() {
     //   // this.$axios.get(
     //   //   'base/core-production-line/listAll',
@@ -867,20 +880,6 @@ export default {
         // this.$nextTick(() => {
         this.$refs.productLineChart.initChart(nameList, passRateList, outputNumList)
       } else if (this.SJGInitWebSocket === 'inspection') {
-        let processArr = qualityMonthList.map((item, index) => [
-          // console.log(item)
-          `<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.productionLineName || ''}
-            </span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
-        ])
-        this.processConfig.data = processArr
-        this.$refs['processScrollBoard'].updateRows(processArr)
       }
     },
     // 数据发送
diff --git a/src/views/extend/processEquValueBom/add-or-updata.vue b/src/views/extend/processEquValueBom/add-or-updata.vue
index fb89cbe6..e1bce136 100644
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-22 17:12:03
+ * @LastEditTime: 2024-03-25 14:07:31
  * @Description:
 -->
 <template>
diff --git a/src/views/extend/processEquValueBom/attr-add.vue b/src/views/extend/processEquValueBom/attr-add.vue
index 873cf7a3..79e0521f 100644
--- a/src/views/extend/processEquValueBom/attr-add.vue
+++ b/src/views/extend/processEquValueBom/attr-add.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2023-12-04 15:19:33
+ * @LastEditTime: 2024-03-25 14:14:04
  * @LastEditors: zhp
  * @Description:
 -->
@@ -118,7 +118,7 @@ export default {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
           getProcessEquValueBomDet({
-						id: this.dataForm.id
+            id: this.dataForm.id,
 					}).then((res) => {
             this.dataForm = res.data;
             const arr = []
diff --git a/src/views/extend/processEquValueBom/statusBtn.vue b/src/views/extend/processEquValueBom/statusBtn.vue
index 658cb3f7..d1b45563 100644
--- a/src/views/extend/processEquValueBom/statusBtn.vue
+++ b/src/views/extend/processEquValueBom/statusBtn.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 14:00:52
- * @LastEditTime: 2023-11-09 09:59:53
+ * @LastEditTime: 2024-03-25 14:09:33
  * @LastEditors: zhp
  * @Description:
 -->
@@ -25,24 +25,24 @@ export default {
   },
   data() {
     return {
-      state: false
+      // state: false
+    }
+  },
+  computed: {
+    state() {
+      return this.injectData.enabled === 1 ? true : false
     }
   },
-  // computed: {
-  //   readonly() {
-  //     return !!this.injectData.readonly
-  //   }
-  // },
   mounted() {
-    this.mapToState()
+    // this.mapToState()
   },
 
   methods: {
-    mapToState() {
-      if (this.injectData.prop === 'enabled') {
-        this.state = this.injectData.enabled === 1 ? true : false
-      }
-    },
+    // mapToState() {
+    //   if (this.injectData.prop === 'enabled') {
+    //     this.state = this.injectData.enabled === 1 ? true : false
+    //   }
+    // },
     changeHandler() {
       // let params = {}
       let payload = {}
diff --git a/src/views/login.vue b/src/views/login.vue
index a184edf1..61460fa4 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -299,14 +299,14 @@ export default {
 		getCookie() {
 			// const username = getUsername();
 			// const password = getPassword();
-			// const rememberMe = getRememberMe();
-			const tenantName = getTenantName();
+			const rememberMe = getRememberMe()
+			// const tenantName = getTenantName();
 			this.loginForm = {
 				...this.loginForm,
-				username: username ? username : this.loginForm.username,
-				password: password ? password : this.loginForm.password,
+				username: this.loginForm.username,
+				password: this.loginForm.password,
 				rememberMe: rememberMe ? getRememberMe() : false,
-				tenantName: tenantName ? tenantName : this.loginForm.tenantName,
+				tenantName: this.loginForm.tenantName,
 			};
 		},
 		handleLogin(captchaParams) {
diff --git a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
index c7a415cc..58c54374 100644
--- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
+++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-08 13:46:17
- * @LastEditTime: 2024-03-21 10:40:52
+ * @LastEditTime: 2024-03-25 08:50:25
  * @LastEditors: zhp
  * @Description:
 -->
@@ -73,12 +73,12 @@
           </el-form-item>
         </el-row>
         <el-row :gutter="24" v-for="(item,index) in ingredientList" :key="item.id">
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="成分">
               {{ item.name }}
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
               :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
               <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
@@ -92,12 +92,12 @@
               </span>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
             </el-form-item>
diff --git a/src/views/quality/monitoring/materielDateFrom/index.vue b/src/views/quality/monitoring/materielDateFrom/index.vue
index a2191caf..cc52218d 100644
--- a/src/views/quality/monitoring/materielDateFrom/index.vue
+++ b/src/views/quality/monitoring/materielDateFrom/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-21 15:14:04
+ * @LastEditTime: 2024-03-25 16:07:07
  * @Description:
 -->
 <template>
@@ -64,7 +64,7 @@ const tableProps = [
   {
     prop: 'source',
     label: '数据来源',
-    filter: (val) => val == 1 ? '内部' : '外部'
+    filter: (val) => val == 1 ? '手动' : '自动'
   },
   {
     prop: 'remark',
diff --git a/src/views/socialLogin.vue b/src/views/socialLogin.vue
index 9364cada..53b4790e 100644
--- a/src/views/socialLogin.vue
+++ b/src/views/socialLogin.vue
@@ -83,8 +83,8 @@ export default {
       captchaEnable: true,
       loginForm: {
         loginType: "uname",
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         captchaVerification: "",
       },
@@ -140,12 +140,12 @@ export default {
       this.$refs.verify.show()
     },
     getCookie() {
-      const username = getUsername();
-      const password = getPassword();
+      // const username = getUsername();
+      // const password = getPassword();
       const rememberMe = getRememberMe();
       this.loginForm = {
-        username: username ? username : this.loginForm.username,
-        password: password ? password : this.loginForm.password,
+        username: this.loginForm.username,
+        password: this.loginForm.password,
         rememberMe: rememberMe ? getRememberMe() : false,
         loginType: this.loginForm.loginType,
       };