Merge remote-tracking branch 'origin/master'

src/views/dashboard/DeviceChartLine.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div>
-    <div ref="chart" style="width:95%;height:300px"></div>
+    <div ref="chart" style="width:90%;height:300px"></div>
   </div>
 
 </template>

src/views/dashboard/QcChartLine.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div>
-    <div ref="chart" style="width:95%;height:300px"></div>
+    <div ref="chart" style="width:90%;height:300px"></div>
   </div>
 
 </template>

src/views/quality/qcIncome/selectUser.vue

@@ -126,12 +126,15 @@ export default {
     // 多选框选中数据
 		handleBomSelectionChange(selection) {
 
-      if(selection.length>1){
+      /* if(selection.length>1){
         this.$modal.msgSuccess("只能选一个");
-      }
+      } */
+      
 
-			this.ids = selection[0].userCode;
-      this.idsName = selection[0].userName;
+			/* this.ids = selection[0].userCode;
+      this.idsName = selection[0].userName; */
+      this.ids = selection.map(item => item.userCode).join(',');
+      this.idsName = selection.map(item => item.userName).join(',');
 		},
 
 

src/views/quality/qcProduce/index.vue

@@ -186,8 +186,8 @@
 					/>
 				</template>
 			</el-table-column>
-			<el-table-column label="检测人工号" align="center" prop="checkManCode" width="100"/>
-			<el-table-column label="检测人姓名" align="center" prop="checkManName" width="100"/>
+			<el-table-column label="检测人工号" align="center" prop="checkManCode" width="180" :show-overflow-tooltip="true"/>
+			<el-table-column label="检测人姓名" align="center" prop="checkManName" width="180" :show-overflow-tooltip="true"/>
 			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>