From 5c7aab117ba440772569a49b6b83f372265415af Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 20 Dec 2023 17:36:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9C=8B=E6=9D=BF=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/LineChart.vue       |  1 +
 src/views/index.vue                     | 12 ++++++++++--
 src/views/kanban/quality/kanban1.vue    |  9 ++++-----
 src/views/kanban/quality/kanban2.vue    |  9 ++++-----
 src/views/kanban/quality/kanban3.vue    |  9 ++++-----
 src/views/quality/material/index.vue    | 15 ++++++++++++---
 src/views/quality/material/userbind.vue | 17 +++++++++++------
 7 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue
index 410572b..1b58d81 100644
--- a/src/views/dashboard/LineChart.vue
+++ b/src/views/dashboard/LineChart.vue
@@ -108,6 +108,7 @@
           series:seriesDatas,
           toolbox:{
             show: true,
+            bottom:'-2%',
             feature: {
               dataZoom: {
                 yAxisIndex: 'none'
diff --git a/src/views/index.vue b/src/views/index.vue
index dc30c72..9d85684 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -22,12 +22,20 @@
     </el-row>
     <el-divider />
     <el-row :gutter="20">
-      <el-col :sm="12" :lg="24">
+      <el-col :span="12">
         <span style="font-size: 20px;margin: 20%;color: cadetblue;">{{deviceTitle}}</span>
       </el-col>
+      <el-col :span="12">
+        <span style="font-size: 20px;margin: 20%;color: cadetblue;">各线体生产不良率</span>
+      </el-col>
     </el-row>
     <el-row :gutter="20">
-      <DeviceChartLine :chart-data="deviceChartLineData" ref="DeviceChartLine"/>
+      <el-col :span="12">
+        <DeviceChartLine :chart-data="deviceChartLineData" ref="DeviceChartLine"/>
+      </el-col>
+      <el-col :span="12">
+        <DeviceChartLine :chart-data="deviceChartLineData" ref="DeviceChartLine"/>
+      </el-col>
     </el-row>
   </div>
 </template>
diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue
index b6c56bd..f58d3cf 100644
--- a/src/views/kanban/quality/kanban1.vue
+++ b/src/views/kanban/quality/kanban1.vue
@@ -3,7 +3,7 @@
         <div class="app-container home" style="">
             <div class="head">
                 <div class="head-content">
-                    <div class="title">榄菊设备管理云平台</div>
+                    <div class="title">榄菊质量管理平台</div>
                 </div>
                 <div class="head-logo">
                     <img src="../../../assets/images/logo.png" alt="" />
@@ -166,7 +166,7 @@
         </div>
     </v-scale-screen>
 </template>
-  
+
 <script>
 import {
     getBoardFactory,
@@ -233,7 +233,7 @@ export default {
     },
     mounted() {
         // this.datetime = moment().subtract(2, "day").format("yyyy-MM-DD");
-        //console.log('zhuanhuahou',this.dateRangeone) 
+        //console.log('zhuanhuahou',this.dateRangeone)
         // this.getdatalist(this.selectxt)
         this.selectFactorylist();
         this.gettime();
@@ -2186,5 +2186,4 @@ export default {
     background-color: #0091ff;
     // opacity: 0.1;
 }
-</style> 
-  
\ No newline at end of file
+</style>
diff --git a/src/views/kanban/quality/kanban2.vue b/src/views/kanban/quality/kanban2.vue
index 3903e14..74da350 100644
--- a/src/views/kanban/quality/kanban2.vue
+++ b/src/views/kanban/quality/kanban2.vue
@@ -3,7 +3,7 @@
         <div class="app-container home" style="">
             <div class="head">
                 <div class="head-content">
-                    <div class="title">榄菊设备管理云平台</div>
+                    <div class="title">榄菊质量管理平台</div>
                 </div>
                 <div class="head-logo">
                     <img src="../../../assets/images/logo.png" alt="" />
@@ -153,7 +153,7 @@
         </div>
     </v-scale-screen>
 </template>
-  
+
 <script>
 import {
     getBoardFactory,
@@ -244,7 +244,7 @@ export default {
     },
     mounted() {
         // this.datetime = moment().subtract(2, "day").format("yyyy-MM-DD");
-        //console.log('zhuanhuahou',this.dateRangeone) 
+        //console.log('zhuanhuahou',this.dateRangeone)
         // this.getdatalist(this.selectxt)
         this.selectfactoryCodelist();
 
@@ -1500,5 +1500,4 @@ export default {
         border-radius: 10px;
     }
 }
-</style> 
-  
\ No newline at end of file
+</style>
diff --git a/src/views/kanban/quality/kanban3.vue b/src/views/kanban/quality/kanban3.vue
index a860075..7a687b4 100644
--- a/src/views/kanban/quality/kanban3.vue
+++ b/src/views/kanban/quality/kanban3.vue
@@ -3,7 +3,7 @@
         <div class="app-container home" style="">
             <div class="head">
                 <div class="head-content">
-                    <div class="title">榄菊设备管理云平台</div>
+                    <div class="title">榄菊质量管理平台</div>
                 </div>
                 <div class="head-logo">
                     <img src="../../../assets/images/logo.png" alt="" />
@@ -116,7 +116,7 @@
         </div>
     </v-scale-screen>
 </template>
-  
+
 <script>
 import {
     getBoardFactory,
@@ -179,7 +179,7 @@ export default {
     },
     mounted() {
         // this.datetime = moment().subtract(2, "day").format("yyyy-MM-DD");
-        //console.log('zhuanhuahou',this.dateRangeone) 
+        //console.log('zhuanhuahou',this.dateRangeone)
         // this.getdatalist(this.selectxt)
         this.selectfactoryCodelist();
         this.gettime();
@@ -626,5 +626,4 @@ export default {
 .color3 {
     color: #66FFFF;
 }
-</style> 
-  
\ No newline at end of file
+</style>
diff --git a/src/views/quality/material/index.vue b/src/views/quality/material/index.vue
index 8cd8973..698d86d 100644
--- a/src/views/quality/material/index.vue
+++ b/src/views/quality/material/index.vue
@@ -40,7 +40,7 @@
 		<!-- 列表数据 -->
 		<el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="员工编号" align="center" prop="userId" />
+			<el-table-column label="员工编号" align="center" prop="userCode" />
 			<el-table-column label="姓名" align="center" prop="userName" />
 			<el-table-column label="联系方式" align="center" prop="phonenumber" />
 			<el-table-column label="邮箱" align="center" prop="email" />
@@ -84,7 +84,12 @@
 			</el-form>
 			<el-tabs type="border-card" v-if="form.userCodes != null">
 				<el-tab-pane label="关联物料">
-					<UserBind v-if="form.userCodes != null" :optType="optType" :userCodes="form.userCodes"></UserBind>
+					<UserBind v-if="form.userCodes != null"
+					:optType="optType"
+					:userCodes="form.userCodes"
+					:userNames="form.userNames"
+					>
+					</UserBind>
 				</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
@@ -129,6 +134,7 @@ export default {
 				userCode: null,
 				userName: null,
 				userCodes: null,
+				userNames: null,
 				materialCode: null,
 				materialName: null,
 				materialNames: null,
@@ -174,6 +180,7 @@ export default {
 				userCode: null,
 				userName: null,
 				userCodes: null,
+				userNames: null,
 				materialCode: null,
 				materialName: null,
 				materialNames: null,
@@ -215,8 +222,10 @@ export default {
 		/** 绑定按钮操作 */
 		handleUpdate(row) {
 			this.reset();
-			const userCodes = row.userCode || this.ids
+			const userCodes = row.userCode || this.ids;
+			const userNames = row.userName;
 			this.form.userCodes = userCodes;
+			this.form.userNames = userNames;
 			this.open = true;
 			this.title = "修改人员物料绑定";
 			this.optType = "edit";
diff --git a/src/views/quality/material/userbind.vue b/src/views/quality/material/userbind.vue
index 9b7c8d9..7a8b855 100644
--- a/src/views/quality/material/userbind.vue
+++ b/src/views/quality/material/userbind.vue
@@ -136,7 +136,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userCodes: this.userCodes,
+        userCode: this.userCodes,
+        userName: this.userNames,
         itemId: null,
         itemCode: null,
         materialName: null,
@@ -164,7 +165,8 @@ export default {
       leftLength: null,
       leftQueryParams: {
         materialName: null,
-         userCodes: this.userCodes,
+        userCode: this.userCodes,
+        userName: this.userNames,
         pageNum: 1,
         pageSize: 20,
       },
@@ -177,14 +179,16 @@ export default {
       RNextPage: null,
       rightQueryParams: {
         materialName: null,
-         userCodes: this.userCodes,
+        userCode: this.userCodes,
+        userName: this.userNames,
         pageNum: 1,
         pageSize: 20,
       },
     };
   },
   props: {
-     userCodes: undefined,
+    userCodes: undefined,
+    userNames: undefined,
     optType: undefined,
   },
   created() {
@@ -269,7 +273,8 @@ export default {
     reset() {
       this.form = {
         recordId: null,
-         userCodes: this. userCodes,
+        userCode: this.userCodes,
+        userName: this.userNames,
         itemId: null,
         itemCode: null,
         materialName: null,
@@ -288,7 +293,7 @@ export default {
 
     /** 提交按钮 */
     handleChange(value, direction, movedKeys) {
-      if (this.queryParams. userCodes != null) {
+      if (this.queryParams.userCode != null) {
         this.queryParams.selectedValues = value;
         addProduct(this.queryParams).then((response) => {
           this.$modal.msgSuccess("关联成功");