Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/lang/zh/dispatch.js

@@ -8,6 +8,7 @@ export default {
         // 列表搜索表单名称
         searchForm: {
             name: '指令名称',
+            feedback: '异常内容',            
             type: '分类',
             status: '状态',
             startTime: '开始时间',
@@ -16,6 +17,9 @@ export default {
         table: {
             record: {
                 name: '指令名称',
+                device: '设备',
+                nodeNo: '指令内容',
+                procedureName: '工序名',
                 status: '启用状态',
                 createTime: '创建时间',
                 updateTime: '修改时间',

imcs-ui/src/views/login/index.vue

@@ -215,7 +215,7 @@
     </el-form>
     <span class="login-footer">
       © 2019 - 2022
-      <span>{{$t('login.shuoming.tips')}}</span>
+      <span>{{$t('login.shuoming2.tips')}}</span>
     </span>
   </div>
 </template>
@@ -256,7 +256,7 @@
           {img: "microsoft.png", name: "microsoft", radius: false}
         ],
         loginForm: {
-          account: "zuihou",
+          account: "",
           password: "",   // zuihou
           tenantView: "0000", //显示用的
           tenant: "", //传递给后端的

imcs-ui/src/views/zuihou/dispatchMgr/dispatchRecord/Index.vue

@@ -5,7 +5,7 @@
       <span>
         <span>{{ $t("dispatch.searchForm.name") }}：</span>
         <el-input
-          v-model="queryParams.model.name"
+          v-model="queryParams.model.instructionName"
           :placeholder="$t('common.pleaseEnter')"
           style="width: 150px"
           size="medium"
@@ -70,6 +70,28 @@
           </div>
         </template>
       </el-table-column>
+      
+       <el-table-column
+        prop="resourceName"
+        :label="$t('dispatch.table.record.device')"
+        :show-overflow-tooltip="true"
+        align="center"
+      ></el-table-column>
+
+      <el-table-column
+        prop="nodeNo"
+        :label="$t('dispatch.table.record.nodeNo')"
+        :show-overflow-tooltip="true"
+        align="center"
+      ></el-table-column>
+
+      <el-table-column
+        prop="procedureName"
+        :label="$t('dispatch.table.record.procedureName')"
+        :show-overflow-tooltip="true"
+        align="center"
+      ></el-table-column>          
+
       <!-- 指令内容 -->
       <el-table-column
         prop="instructionName"

imcs-ui/src/views/zuihou/dispatchMgr/exception/Index.vue

@@ -3,9 +3,9 @@
     <!-- 搜索模块 -->
     <div class="filter-container">
       <span>
-        <span>{{ $t("dispatch.searchForm.name") }}：</span>
+        <span>{{ $t("dispatch.searchForm.feedback") }}：</span>
         <el-input
-          v-model="queryParams.model.name"
+          v-model="queryParams.model.feedback"
           :placeholder="$t('common.pleaseEnter')"
           style="width: 150px"
           size="medium"

imcs-ui/src/views/zuihou/largeScreen/cabinLine/index.vue

@@ -27,7 +27,7 @@
 	    	<span class="rebackLine" @click="rebackLine()">{{$t('largeScreen.common.returns')}}</span>
     	</div>
     </el-row>
-    
+
   	<!-- 区域模块 -->
   	<div class="areaDiv">
   		<!-- 搜索-部分 -->
@@ -41,7 +41,7 @@
 				    </el-option>
 				  </el-select>
 	  	</div>
-	  	
+
 	  	<table border="0" cellspacing="0" cellpadding="0" style="width: 100%; table-layout: fixed;">
 	  		<tr>
 	  			<td width="250">
@@ -69,7 +69,7 @@
 							  			</table>
 											<!-- 状态 -->
 											<div class="statusDiv">
-												<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+												<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 												<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 												<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 											</div>
@@ -80,7 +80,7 @@
 			  		</el-row>
 	  			</td>
 	  			<td>
-	  				
+
 				  	<!-- 上-部分 -->
 			  		<el-row class="topRow alignLeft">
 			  			<div class="bottomDiv2" style="width: 100%;overflow-x: auto;">
@@ -95,9 +95,9 @@
 					  			</table>
 				  				<div class="linTitle">边线库</div>
 				  			</el-card>
-			  				
+
 				  			<!-- 打标机 -->
-					  		<template v-for="item in moduleList">		
+					  		<template v-for="item in moduleList">
 						  		<el-card v-if="item.code == 'KT_121'" :key="item.id" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -146,15 +146,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 						  		</el-card>
-								</template>	
-								
+								</template>
+
 								<!-- 清洗机 -->
-						  	<template v-for="item in moduleList">	
+						  	<template v-for="item in moduleList">
 									<el-card class="box-card" v-if="item.code == 'KT_122'" :key="item.id">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -203,15 +203,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 								</template>
-								
+
 				  			<!-- SMU50-4 -->
-					  		<template v-for="item in moduleList">	
+					  		<template v-for="item in moduleList">
 									<el-card v-if="item.code == 'KT_127'" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -260,15 +260,15 @@
 						  			</table>
 										<!-- 状态 -->
 						  			<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 					  		</template>
-			  			
+
 			  				<!-- 打标机 -->
-					  		<template v-for="item in moduleList">		
+					  		<template v-for="item in moduleList">
 						  		<el-card v-if="item.code == 'KT_128'" :key="item.id" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -317,15 +317,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 						  		</el-card>
-								</template>	
-								
+								</template>
+
 								<!-- 清洗机 -->
-						  	<template v-for="item in moduleList">	
+						  	<template v-for="item in moduleList">
 									<el-card class="box-card" v-if="item.code == 'KT_129'" :key="item.id">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -374,15 +374,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 								</template>
-								
+
 				  			<!-- SMU50-4 -->
-					  		<template v-for="item in moduleList">	
+					  		<template v-for="item in moduleList">
 									<el-card v-if="item.code == 'KT_130'" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -431,7 +431,7 @@
 						  			</table>
 										<!-- 状态 -->
 						  			<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
@@ -439,7 +439,7 @@
 					  		</template>
 			  			</div>
 			  		</el-row>
-			  	
+
 			  		<!-- 中-部分 -->
 			  		<el-row class="topRow">
 			  			<table border="0" cellspacing="0" cellpadding="0" style="width: 100%;margin: 30px auto;">
@@ -471,19 +471,19 @@
 								  			</table>
 												<!-- 状态 -->
 					  						<div class="statusDiv">
-													<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+													<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 													<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 													<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 												</div>
 											</el-card>
-										</template>	
+										</template>
 			  					</td>
 			  				</tr>
 			  			</table>
-			  			
-							
+
+
 			  		</el-row>
-			  		
+
 			  		<!-- 下-部分 -->
 			  		<el-row class="topRow" style="text-align: left;">
 			  			<div class="bottomDiv2">
@@ -498,9 +498,9 @@
 					  			</table>
 				  				<div class="linTitle">边线库</div>
 				  			</el-card>
-				  			
+
 				  			<!-- 打标机 -->
-					  		<template v-for="item in moduleList">		
+					  		<template v-for="item in moduleList">
 						  		<el-card v-if="item.code == 'KT_131'" :key="item.id" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -549,15 +549,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 						  		</el-card>
-								</template>	
-								
+								</template>
+
 								<!-- 清洗机 -->
-						  	<template v-for="item in moduleList">	
+						  	<template v-for="item in moduleList">
 									<el-card class="box-card" v-if="item.code == 'KT_132'" :key="item.id">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -606,15 +606,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 								</template>
-								
+
 				  			<!-- SMU50-4 -->
-					  		<template v-for="item in moduleList">	
+					  		<template v-for="item in moduleList">
 									<el-card v-if="item.code == 'KT_133'" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -663,21 +663,21 @@
 						  			</table>
 										<!-- 状态 -->
 						  			<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 					  		</template>
-			  			
+
 			  			</div>
 			  		</el-row>
-			  		
+
   				</td>
-  				
+
 	  		</tr>
 	  	</table>
-  		
+
   	</div>
   </div>
 </template>
@@ -789,10 +789,10 @@
 	  				console.log("2D模式-模块信息: ",res.data);
 	  				this.moduleList = res.data.list;
 	  			}
-	  			
+
 	  		})
 	  	},
-	  	
+
 	  	// [选择单元]的值变化-事件
 	  	selectChange(val){
 	  		console.log("[选择单元]的值变化: ", val);
@@ -806,12 +806,12 @@
 	  		if(val == "C"){  // 保障中心
 	  			paths = "/largeScreen/supportCenter";
 	  		}
-	  		
+
 	  		if(paths){
 	  			this.toRouter(paths);
 	  		}
 	  	},
-	  	
+
 	  	// 根据路由，跳转页面
 	  	toRouter(paths){
 	  		// 调用全局挂载的方法
@@ -819,7 +819,7 @@
 					this.$router.push({ path: paths, query: {resourceId: this.tabDownData.list.length > 0 ? this.tabDownData.list[0].id : '' }}) //带参跳转
 				})
 	  	},
-	  	
+
 	  	// 是否设置大屏
 	  	setMaxScreen(){
 	  		let isCurrScreen = db.get("isCurrScreen");
@@ -875,7 +875,7 @@
 	        //console.log(evt)
 	      }
 	    },
-	    
+
 	  	// 【SUM50】点击-事件
 	  	boxCardClk(){
 	  		let paths = "/largeScreen/twoDatasModel";
@@ -886,7 +886,7 @@
 				// this.$router.push('/runManageCenter/lineBoardDetail')
 	  		// console.log("弹出详情页面！", paths)
 	  	},
-	  	
+
 	  	// 全屏
 	  	fullPing(){
 	  		this.$nextTick(() => {
@@ -911,12 +911,12 @@
 	  			exitFullScreen(document.getElementById('playerMap'))
 	  		})
 	  	},
-	  	
+
 	  	// 【返回产线】按钮-事件
 	  	rebackLine(){
 	  		this.$router.go(-1);
 	  	},
-	  	
+
 	  	// 【SUM50】点击-事件
 	  	boxCardClkCard(id){
 	  		let paths = "/runManageCenter/lineBoardDetail";
@@ -925,12 +925,12 @@
 					this.$router.push({ path: paths, query: { resourceId: id }}) //带参跳转
 				})
 	  	},
-	  	
+
 	  	// 加载背景颜色
 	  	setBackground(color){
 	  		return "background: "+ color +";"
 	  	},
-	  	
+
 	  	// 生产资源，计算返回class
 	  	reJisuanCls(obj, flag) {
 	  		let str = "contentView hebingDiv";
@@ -945,16 +945,16 @@
 	  		}
 	  		return str;
 	  	},
-	  	
+
 	  	// 加载【本地图片】
 	  	resolveLogo(logo) {
         return require(`@/assets/icon/${logo}`);
       },
-      
+
 	    // 获取列表数据
 	    getTabList(){
 	    	lineBoardAPI.getBigScreenList({}).then(res => {
-	    		res = res.data 
+	    		res = res.data
 	    		console.log("神抽狗资源：", res)
 	    		if(res.isSuccess){
 	    			this.tabDownData.list = res.data.list
@@ -965,7 +965,7 @@
 	    		}
 	    	})
 	    },
-	    
+
 	    // 边线库
 	    getQualitySide(type) {
 	    	/*this.sideList = [
@@ -985,7 +985,7 @@
 	    		]
 	    	];*/
 	    	LargeScreenAPI.kuangtiCard({ type }).then(res => {
-	    		res = res.data 
+	    		res = res.data
 	    		console.log("【边线库】5：", res)
 	    		if(res.isSuccess){
 	    			if(type == "1"){
@@ -1292,8 +1292,8 @@
 	.statusDiv{
 		position: absolute;
 		top: 5px;
-		right: 15px;
-		text-align: right;
+		right: 55px;
+		text-align: left;
 	}
 	.statusDiv span{
 		display: inline-block;
@@ -1322,4 +1322,4 @@
 	.footerDiv a:hover{
 		opacity: 0.7;
 	}
-</style>
+</style>

imcs-ui/src/views/zuihou/largeScreen/frameLine/index.vue

@@ -27,7 +27,7 @@
 	    	<span class="rebackLine" @click="rebackLine()">{{$t('largeScreen.common.returns')}}</span>
     	</div>
     </el-row>
-    
+
   	<!-- 区域模块 -->
   	<div class="areaDiv">
   		<!-- 搜索-部分 -->
@@ -41,16 +41,16 @@
 				    </el-option>
 				  </el-select>
 	  	</div>
-	  	
+
 	  	<table border="0" cellspacing="0" cellpadding="0" style="width: 100%;table-layout: fixed;">
 	  		<tr>
 	  			<td>
-	  				
+
 				  	<!-- 上-部分 -->
 			  		<el-row class="topRow alignLeft">
 			  			<div class="bottomDiv2">
 				  			<!-- 打标机 -->
-					  		<template v-for="item in moduleList">		
+					  		<template v-for="item in moduleList">
 						  		<el-card v-if="item.code == 'CT_127'" :key="item.id" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -99,15 +99,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+<!--                      <span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 						  		</el-card>
-								</template>	
-								
+								</template>
+
 								<!-- 清洗机 -->
-						  	<template v-for="item in moduleList">	
+						  	<template v-for="item in moduleList">
 									<el-card class="box-card" v-if="item.code == 'CT_121'" :key="item.id">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -156,15 +156,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 								</template>
-								
+
 				  			<!-- SMU50-4 -->
-					  		<template v-for="item in moduleList">	
+					  		<template v-for="item in moduleList">
 									<el-card v-if="item.code == 'CT_122'" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -213,13 +213,13 @@
 						  			</table>
 										<!-- 状态 -->
 						  			<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 					  		</template>
-			  			
+
 			  				<!-- 方块 -->
 				  			<el-card class="box-card" style="margin-left: 100px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
@@ -233,7 +233,7 @@
 				  			</el-card>
 			  			</div>
 			  		</el-row>
-			  	
+
 			  		<!-- 中-部分 -->
 			  		<el-row class="topRow">
 			  			<table border="0" cellspacing="0" cellpadding="0" style="width: 100%;margin: 30px auto;">
@@ -265,24 +265,24 @@
 								  			</table>
 												<!-- 状态 -->
 					  						<div class="statusDiv">
-													<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+													<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 													<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 													<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 												</div>
 											</el-card>
-										</template>	
+										</template>
 			  					</td>
 			  				</tr>
 			  			</table>
-			  			
-							
+
+
 			  		</el-row>
-			  		
+
 			  		<!-- 下-部分 -->
 			  		<el-row class="topRow" style="text-align: left;">
 			  			<div class="bottomDiv2">
 				  			<!-- 打标机 -->
-					  		<template v-for="item in moduleList">		
+					  		<template v-for="item in moduleList">
 						  		<el-card v-if="item.code == 'CT_129'" :key="item.id" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -331,15 +331,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 						  		</el-card>
-								</template>	
-								
+								</template>
+
 								<!-- 清洗机 -->
-						  	<template v-for="item in moduleList">	
+						  	<template v-for="item in moduleList">
 									<el-card class="box-card" v-if="item.code == 'CT_130'" :key="item.id">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -388,15 +388,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 								</template>
-								
+
 				  			<!-- SMU50-4 -->
-					  		<template v-for="item in moduleList">	
+					  		<template v-for="item in moduleList">
 									<el-card v-if="item.code == 'CT_131'" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -445,13 +445,13 @@
 						  			</table>
 										<!-- 状态 -->
 						  			<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 					  		</template>
-			  			
+
 				  			<!-- 方块 -->
 				  			<el-card class="box-card" style="margin-left: 100px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
@@ -465,7 +465,7 @@
 				  			</el-card>
 			  			</div>
 			  		</el-row>
-			  		
+
   				</td>
   				<td width="250">
 	  				<!-- 下-部分 -->
@@ -492,7 +492,7 @@
 							  			</table>
 											<!-- 状态 -->
 											<div class="statusDiv">
-												<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+												<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 												<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 												<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 											</div>
@@ -504,7 +504,7 @@
 	  			</td>
 	  		</tr>
 	  	</table>
-  		
+
   	</div>
   </div>
 </template>
@@ -616,10 +616,10 @@
 	  				console.log("2D模式-模块信息: ",res.data);
 	  				this.moduleList = res.data.list;
 	  			}
-	  			
+
 	  		})
 	  	},
-	  	
+
 	  	// [选择单元]的值变化-事件
 	  	selectChange(val){
 	  		// console.log("[选择单元]的值变化: ", val);
@@ -633,12 +633,12 @@
 	  		if(val == "C"){  // 保障中心
 	  			paths = "/largeScreen/supportCenter";
 	  		}
-	  		
+
 	  		if(paths){
 	  			this.toRouter(paths);
 	  		}
 	  	},
-	  	
+
 	  	// 根据路由，跳转页面
 	  	toRouter(paths){
 	  		// 调用全局挂载的方法
@@ -646,7 +646,7 @@
 					this.$router.push({ path: paths, query: {resourceId: this.tabDownData.list.length > 0 ? this.tabDownData.list[0].id : '' }}) //带参跳转
 				})
 	  	},
-	  	
+
 	  	// 是否设置大屏
 	  	setMaxScreen(){
 	  		let isCurrScreen = db.get("isCurrScreen");
@@ -702,7 +702,7 @@
 	        //console.log(evt)
 	      }
 	    },
-	    
+
 	  	// 【SUM50】点击-事件
 	  	boxCardClk(){
 	  		let paths = "/largeScreen/twoDatasModel";
@@ -713,7 +713,7 @@
 				// this.$router.push('/runManageCenter/lineBoardDetail')
 	  		// console.log("弹出详情页面！", paths)
 	  	},
-	  	
+
 	  	// 全屏
 	  	fullPing(){
 	  		this.$nextTick(() => {
@@ -738,12 +738,12 @@
 	  			exitFullScreen(document.getElementById('playerMap'))
 	  		})
 	  	},
-	  	
+
 	  	// 【返回产线】按钮-事件
 	  	rebackLine(){
 	  		this.$router.go(-1);
 	  	},
-	  	
+
 	  	// 【SUM50】点击-事件
 	  	boxCardClkCard(id){
 	  		let paths = "/runManageCenter/lineBoardDetail";
@@ -752,12 +752,12 @@
 					this.$router.push({ path: paths, query: { resourceId: id }}) //带参跳转
 				})
 	  	},
-	  	
+
 	  	// 加载背景颜色
 	  	setBackground(color){
 	  		return "background: "+ color +";"
 	  	},
-	  	
+
 	  	// 生产资源，计算返回class
 	  	reJisuanCls(obj, flag) {
 	  		let str = "contentView hebingDiv";
@@ -772,16 +772,16 @@
 	  		}
 	  		return str;
 	  	},
-	  	
+
 	  	// 加载【本地图片】
 	  	resolveLogo(logo) {
         return require(`@/assets/icon/${logo}`);
       },
-      
+
 	    // 获取列表数据
 	    getTabList(){
 	    	lineBoardAPI.getBigScreenList({}).then(res => {
-	    		res = res.data 
+	    		res = res.data
 	    		console.log("神抽狗资源：", res)
 	    		if(res.isSuccess){
 	    			this.tabDownData.list = res.data.list
@@ -792,7 +792,7 @@
 	    		}
 	    	})
 	    },
-	    
+
 	    // 边线库
 	    getQualitySide(type) {
 	    	/*this.sideList = [
@@ -814,7 +814,7 @@
 	    		]
 	    	];*/
 	    	LargeScreenAPI.cangtiCard({ type }).then(res => {
-	    		res = res.data 
+	    		res = res.data
 	    		console.log("【边线库】5：", res)
 	    		if(res.isSuccess){
 	    			if(type == "1"){
@@ -1121,7 +1121,7 @@
 	.statusDiv{
 		position: absolute;
 		top: 5px;
-		right: 15px;
+		right: 55px;
 		text-align: right;
 	}
 	.statusDiv span{
@@ -1151,4 +1151,4 @@
 	.footerDiv a:hover{
 		opacity: 0.7;
 	}
-</style>
+</style>

imcs-ui/src/views/zuihou/largeScreen/supportCenter/index.vue

@@ -27,7 +27,7 @@
 	    	<span class="rebackLine" @click="rebackLine()">{{$t('largeScreen.common.returns')}}</span>
     	</div>
     </el-row>
-    
+
   	<!-- 区域模块 -->
   	<div class="areaDiv">
   		<!-- 搜索-部分 -->
@@ -58,7 +58,7 @@
 				  			</el-card>
 			  			</div>
 			  		</el-row>
-			  	
+
 			  		<!-- 中-部分 -->
 			  		<el-row class="topRow">
 			  			<table border="0" cellspacing="0" cellpadding="0" style="width: 100%;margin: 30px auto;">
@@ -90,24 +90,24 @@
 								  			</table>
 												<!-- 状态 -->
 					  						<div class="statusDiv">
-													<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+													<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 													<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 													<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 												</div>
 											</el-card>
-										</template>	
+										</template>
 			  					</td>
 			  				</tr>
 			  			</table>
-			  			
-							
+
+
 			  		</el-row>
-			  		
+
 			  		<!-- 下-部分 -->
 			  		<el-row class="topRow" style="text-align: left;">
 			  			<div class="bottomDiv2">
 			  				<!-- AGV上下料站-1 -->
-					  		<template v-for="item in moduleList">		
+					  		<template v-for="item in moduleList">
 						  		<el-card v-if="item.code == 'BZ_361'" :key="item.id" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -156,15 +156,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 						  		</el-card>
-								</template>	
-								
+								</template>
+
 								<!-- 清洗机 -->
-						  	<template v-for="item in moduleList">	
+						  	<template v-for="item in moduleList">
 									<el-card class="box-card" v-if="item.code == 'BZ_362'" :key="item.id">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -213,15 +213,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 								</template>
-								
+
 				  			<!-- SMU50-4 -->
-					  		<template v-for="item in moduleList">	
+					  		<template v-for="item in moduleList">
 									<el-card v-if="item.code == 'BZ_363'" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -270,13 +270,13 @@
 						  			</table>
 										<!-- 状态 -->
 						  			<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 					  		</template>
-			  			
+
 			  				<!-- 方块 -->
 				  			<el-card class="box-card" style="margin: 0 20px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
@@ -288,7 +288,7 @@
 					  			</table>
 				  				<div class="linTitle">框体缓存库</div>
 				  			</el-card>
-				  			
+
 				  			<!-- 方块 -->
 				  			<el-card class="box-card" style="margin: 0 20px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
@@ -300,9 +300,9 @@
 					  			</table>
 				  				<div class="linTitle">舱体缓存库</div>
 				  			</el-card>
-				  			
+
 				  			<!-- 三坐标 -->
-					  		<template v-for="item in moduleList">		
+					  		<template v-for="item in moduleList">
 						  		<el-card v-if="item.code == 'BZ_szb'" :key="item.id" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -351,15 +351,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 						  		</el-card>
-								</template>	
-								
+								</template>
+
 								<!-- 打标机 -->
-						  	<template v-for="item in moduleList">	
+						  	<template v-for="item in moduleList">
 									<el-card class="box-card" v-if="item.code == 'BZ_370'" :key="item.id">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -408,15 +408,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 								</template>
-								
+
 				  			<!-- SMU50-4 -->
-					  		<template v-for="item in moduleList">	
+					  		<template v-for="item in moduleList">
 									<el-card v-if="item.code == 'BZ_364'" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -465,15 +465,15 @@
 						  			</table>
 										<!-- 状态 -->
 						  			<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 					  		</template>
-			  			
+
 			  				<!-- 打标机 -->
-					  		<template v-for="item in moduleList">		
+					  		<template v-for="item in moduleList">
 						  		<el-card v-if="item.code == 'BZ_365'" :key="item.id" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -522,15 +522,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 						  		</el-card>
-								</template>	
-								
+								</template>
+
 								<!-- 清洗机 -->
-						  	<template v-for="item in moduleList">	
+						  	<template v-for="item in moduleList">
 									<el-card class="box-card" v-if="item.code == 'BZ_366'" :key="item.id">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -579,15 +579,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 								</template>
-								
+
 				  			<!-- SMU50-4 -->
-					  		<template v-for="item in moduleList">	
+					  		<template v-for="item in moduleList">
 									<el-card v-if="item.code == 'BZ_367'" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -636,15 +636,15 @@
 						  			</table>
 										<!-- 状态 -->
 						  			<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 					  		</template>
-			  			
+
 			  				<!-- 打标机 -->
-					  		<template v-for="item in moduleList">		
+					  		<template v-for="item in moduleList">
 						  		<el-card v-if="item.code == 'BZ_368'" :key="item.id" class="box-card">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -693,15 +693,15 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 						  		</el-card>
-								</template>	
-								
+								</template>
+
 								<!-- 清洗机 -->
-						  	<template v-for="item in moduleList">	
+						  	<template v-for="item in moduleList">
 									<el-card class="box-card" v-if="item.code == 'BZ_369'" :key="item.id">
 						  			<!-- 内容区域(格式一) -->
 						  			<table style="width: 100%;" @click="boxCardClkCard(item.id)">
@@ -750,16 +750,16 @@
 						  			</table>
 										<!-- 状态 -->
 										<div class="statusDiv">
-											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>
+											<!--											<span class="linkLine" :style="setBackground(item.linkStatus.background)">{{item.linkStatus.text}}</span>-->
 											<span class="jianguan" :style="setBackground(item.controlStatus.background)">{{item.controlStatus.text}}</span>
 											<span class="producting" :style="setBackground(item.productionStatus.background)">{{item.productionStatus.text}}</span>
 										</div>
 									</el-card>
 								</template>
-								
+
 			  			</div>
 			  		</el-row>
-  		
+
 	  	</div>
   	</div>
   </div>
@@ -876,10 +876,10 @@
 	  				console.log("2D模式-模块信息123: ",res.data);
 	  				this.moduleList = res.data.list;
 	  			}
-	  			
+
 	  		})
 	  	},
-	  	
+
 	  	// [选择单元]的值变化-事件
 	  	selectChange(val){
 	  		console.log("[选择单元]的值变化: ", val);
@@ -897,7 +897,7 @@
 	  			this.toRouter(paths);
 	  		}
 	  	},
-	  	
+
 	  	// 根据路由，跳转页面
 	  	toRouter(paths){
 	  		// 调用全局挂载的方法
@@ -905,7 +905,7 @@
 					this.$router.push({ path: paths, query: {resourceId: this.tabDownData.list.length > 0 ? this.tabDownData.list[0].id : '' }}) //带参跳转
 				})
 	  	},
-	  	
+
 	  	// 是否设置大屏
 	  	setMaxScreen(){
 	  		let isCurrScreen = db.get("isCurrScreen");
@@ -961,7 +961,7 @@
 	        //console.log(evt)
 	      }
 	    },
-	    
+
 	  	// 【SUM50】点击-事件
 	  	boxCardClk(){
 	  		let paths = "/largeScreen/twoDatasModel";
@@ -972,7 +972,7 @@
 				// this.$router.push('/runManageCenter/lineBoardDetail')
 	  		// console.log("弹出详情页面！", paths)
 	  	},
-	  	
+
 	  	// 全屏
 	  	fullPing(){
 	  		this.$nextTick(() => {
@@ -997,12 +997,12 @@
 	  			exitFullScreen(document.getElementById('playerMap'))
 	  		})
 	  	},
-	  	
+
 	  	// 【返回产线】按钮-事件
 	  	rebackLine(){
 	  		this.$router.go(-1);
 	  	},
-	  	
+
 	  	// 【SUM50】点击-事件
 	  	boxCardClkCard(id){
 	  		let paths = "/runManageCenter/lineBoardDetail";
@@ -1011,12 +1011,12 @@
 					this.$router.push({ path: paths, query: { resourceId: id }}) //带参跳转
 				})
 	  	},
-	  	
+
 	  	// 加载背景颜色
 	  	setBackground(color){
 	  		return "background: "+ color +";"
 	  	},
-	  	
+
 	  	// 生产资源，计算返回class
 	  	reJisuanCls(obj, flag) {
 	  		let str = "contentView hebingDiv";
@@ -1031,16 +1031,16 @@
 	  		}
 	  		return str;
 	  	},
-	  	
+
 	  	// 加载【本地图片】
 	  	resolveLogo(logo) {
         return require(`@/assets/icon/${logo}`);
       },
-      
+
 	    // 获取列表数据
 	    getTabList(){
 	    	lineBoardAPI.getBigScreenList({}).then(res => {
-	    		res = res.data 
+	    		res = res.data
 	    		console.log("神抽狗资源：", res)
 	    		if(res.isSuccess){
 	    			this.tabDownData.list = res.data.list
@@ -1051,15 +1051,15 @@
 	    		}
 	    	})
 	    },
-	    
+
 	    // 边线库
 	    getQualitySide(type) {
 	    	/*for(let i = 1; i <= 10; i++){
 	    		let arr = [];
 	    		for(let j = 1; j <= 30; j++){
 	    			arr.push({
-	    				no: 'wks'+ Math.random(), 
-	    				haveGoods: randomFloor(1,10000) > 9000 ? '1' : '0', 
+	    				no: 'wks'+ Math.random(),
+	    				haveGoods: randomFloor(1,10000) > 9000 ? '1' : '0',
 	    				lockStatus: randomFloor(1,10000) > 9000 ? '0' : '1',
 	    				name: (i-1)*30+j
 	    			});
@@ -1084,7 +1084,7 @@
 	    		]
 	    	];*/
 	    	LargeScreenAPI.baozhangCard({ type }).then(res => {
-	    		res = res.data 
+	    		res = res.data
 	    		console.log("【边线库】5：", res)
 	    		if(res.isSuccess){
 	    			if(type == "1") {
@@ -1394,7 +1394,7 @@
 	.statusDiv{
 		position: absolute;
 		top: 5px;
-		right: 15px;
+		right: 55px;
 		text-align: right;
 	}
 	.statusDiv span{
@@ -1424,4 +1424,4 @@
 	.footerDiv a:hover{
 		opacity: 0.7;
 	}
-</style>
+</style>

imcs-ui/src/views/zuihou/largeScreen/twoDatasModel/Index.vue

@@ -58,16 +58,22 @@
 		  	<div class="rightDiv marginBottom15">
 		  		<div class="modelTitle marginBottom15">设备利用率</div>
 		  		<el-row :gutter="15">
-					  <el-col :span="12">
+					  <el-col :span="8">
 					  	<div id="percenter1" class="percenter">
 					  		<el-progress type="circle" :percentage="percentages[0]" :stroke-width="10" :width="100"></el-progress>
-					  		<span class="pcText">智能生产单元</span>
+					  		<span class="pcText">智能生产保障系统</span>
 					  	</div>
 					  </el-col>
-					  <el-col :span="12">
+					  <el-col :span="8">
 					  	<div id="percenter2" class="percenter">
 					  		<el-progress type="circle" :percentage="percentages[1]" color="#5cb87a" :stroke-width="10" :width="100"></el-progress>
-					  		<span class="pcText">柔性智能加工</span>
+					  		<span class="pcText">舱体类加工单元</span>
+					  	</div>
+					  </el-col>
+					  <el-col :span="8">
+					  	<div id="percenter3" class="percenter">
+					  		<el-progress type="circle" :percentage="percentages[2]" color="#6a5acd" :stroke-width="10" :width="100"></el-progress>
+					  		<span class="pcText">框体类加工单元</span>
 					  	</div>
 					  </el-col>
 					</el-row>
@@ -501,9 +507,7 @@
 	  	initDatas(){	  		
 	  		
 	  		// [预警信息]
-	  		this.yujingList = [
-	  			{itemname: '[设备离线]柔性线打标机离线', time: '2021-11-04 08:41'},
-	  			{itemname: '[设备离线]柔性线机器人离线', time: '2021-11-04 08:57'}	  			
+	  		this.yujingList = [	  			  			
 	  		];
 	  	},
 	  	
@@ -511,15 +515,19 @@
 	  	initPercentPie(vals){
 			var elm = echarts.init(document.getElementById("percenter1"))
 			var elm2 = echarts.init(document.getElementById("percenter2"))
+			var elm3 = echarts.init(document.getElementById("percenter3"))
 			if(elm != null && elm !='' && elm != undefined){
 				elm.dispose()
 			}
 			if(elm2 != null && elm2 !='' && elm2 != undefined){
 				elm2.dispose()
 			}
+			if(elm3 != null && elm3 !='' && elm3 != undefined){
+				elm3.dispose()
+			}
 	  		var option1 = {
 			    value: vals == null ? randomFloor(67,77) : vals[0],    //百分比,必填
-			    name:'智能生产单元利用率',		//必填
+			    name:'智能保障系统利用率',		//必填
 			    name2:'未利用率',
 			    title:'',
 			    backgroundColor: null,
@@ -531,7 +539,7 @@
 				
 				var option2 = {
 			    value: vals == null ? randomFloor(49,59) : vals[1],	  //百分比,必填
-			    name:'柔性智能加工利用率',				//必填
+			    name:'舱体类加工利用率',				//必填
 			    name2:'未利用率',			//必填
 			    title:'',
 			    backgroundColor: null,
@@ -539,7 +547,19 @@
 			    fontSize:12,
 			    domEle:document.getElementById("percenter2")//必填
 				};
-				percentPie(option2);				
+				percentPie(option2);	
+				
+				var option3 = {
+			    value: vals == null ? randomFloor(49,69) : vals[2],	  //百分比,必填
+			    name:'框体类加工利用率',				//必填
+			    name2:'未利用率',			//必填
+			    title:'',
+			    backgroundColor: null,
+			    color:['#6a5acd','#DDDDDD'],
+			    fontSize:12,
+			    domEle:document.getElementById("percenter3")//必填
+				};
+				percentPie(option3);
 				
 	  	},
 	  		
@@ -559,7 +579,7 @@
 			  if(data.type == 'PUSH_TYPE_DATA_SCREEN'){
 					this.$nextTick(()=> {
 						// 数据变更
-						this.initPercentPie([randomFloor(77,87), randomFloor(59,69)])
+						this.initPercentPie([randomFloor(77,87), randomFloor(59,69), randomFloor(49,69)])
 						this.orderDatas = data.data.zoneMap.zoneData
 						this.runDatas = data.data.planMap.planData.records
 												
@@ -589,7 +609,12 @@
 						    let msg = data.feedback ? data.feedback : " 响应超时 ";
 							let arr = data.createTime;                            							 
 							let time = arr[0] + "-" + arr[1] + "-" + arr[2] + "\t" + arr[3] + ":" + arr[4];	
-                            let itemname = "["+ data.resourceName +"] "+data.procedureName+"("+data.instructionName+")" + msg; 	
+							let itemname = ""
+							if(data.taskNodeId){
+                                itemname = "["+ data.resourceName +"] "+data.procedureName+"("+data.instructionName+")" + msg; 
+							}else{
+                                itemname = "[监控推送]" + msg;
+							}                            	
                             if(data.status == '0'){
 							    setTimeout(function(){
 								    that.$notify({

imcs-ui/src/views/zuihou/prepareProductMgr/bomMgr/components/Edit.vue

@@ -302,7 +302,16 @@ export default {
     		console.log("动态表单的数据：", res)
     		if(res.isSuccess){
     			// 初始化，表单的数据
-    			this.commList[fieldObj.identifier] = res.data
+				if(fieldObj.identifier=="meterial_id" || fieldObj.identifier=="tray_id"){
+				   //数据权限过滤	
+				   let role = this.$store.state.account.user.roles.indexOf('舱体')<0 ? "舱体" : (this.$store.state.account.user.roles.indexOf('框体')<0 ? "框体": null);
+                    if(role!=null){						
+						res.data = res.data.filter(item=>{							
+							return item.name.indexOf(role) < 0;
+						}) 						
+					} 
+				}
+				this.commList[fieldObj.identifier] = res.data				
     		}
     	})
     	if(this.isEnd){

imcs-ui/src/views/zuihou/prepareProductMgr/frockMgr/components/Edit.vue

@@ -175,8 +175,9 @@ export default {
     	loading: false,
       type: 'add',
       tableData: [],
-      zoneList: [],
+      zoneList: [],     
       tenant: this.initTenant(),
+      oldVal: {},
       screenWidth: 0,
       width: this.initWidth(),
       confirmDisabled: false,
@@ -192,10 +193,29 @@ export default {
           { required: true, message: this.$t("rules.require"), trigger: 'blur' },
         ],
         no: [
-          { required: true, message: this.$t("rules.require"), trigger: 'blur' },
+          { required: true, message: this.$t("rules.require"), trigger: 'blur' }, 
+          { validator: (rule, value, callback) => {		
+				    if(this.type === "edit" && value === this.oldVal.no){
+        			return callback()
+      			}			 
+                if (value.trim().length > 0) {					
+                  frockMgrApi.checkField({"no":value})
+                    .then((response) => {
+                      const res = response.data
+                      if (res.data) {
+                        callback('物料编码重复')
+                      } else {
+                        callback()
+                      }
+                    })
+                } else {
+                  callback()
+                }                
+               }, trigger: 'blur'
+              }         
         ],
         name: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },          
         ],
         model: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
@@ -254,6 +274,10 @@ export default {
         res = res.data;
         if (res.isSuccess) {
           this.zoneList = res.data;
+          if(this.zoneList.length == 1){
+              //默认选中第一个
+              this.tenant.zoneId = this.zoneList[0].id
+          }
         }
       });
     },
@@ -344,6 +368,7 @@ export default {
         }
     		// 根据id,查询规格列表数据
     		//this.getSpecsList(val)
+        this.oldVal = { ...val }
     	}
       // 字典表
       this.dicts = dicts

imcs-ui/src/views/zuihou/prepareProductMgr/material/components/Edit.vue

@@ -95,10 +95,11 @@
 	  },
 	  data () {
 	    return {
-	    	loading: false,
+	      loading: false,
 	      type: 'add',
 	      tableData: [],
 	      zoneList: [],
+		  oldVal: {},
 	      materialTypeShowFlag: false,
 	      tenant: this.initTenant(),
 	      screenWidth: 0,
@@ -115,10 +116,48 @@
             { required: true, message: this.$t("rules.require"), trigger: 'blur' }
           ],
 	        meterialCode: [
-	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+				{ validator: (rule, value, callback) => {
+				if(this.type === "edit" && value === this.oldVal.meterialCode){					
+        			return callback()
+      			}			 
+                if (value.trim().length > 0) {					
+                  MaterialApi.checkField({"meterialCode":value})
+                    .then((response) => {
+                      const res = response.data
+                      if (res.data) {
+                        callback('物料编码重复')
+                      } else {
+                        callback()
+                      }
+                    })
+                } else {
+                  callback()
+                }                
+              }, trigger: 'blur'
+            }
 	        ],
 	        tradeMark: [
-	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+				{ validator: (rule, value, callback) => {		
+				if(this.type === "edit" && value === this.oldVal.tradeMark){
+        			return callback()
+      			}			 
+                if (value.trim().length > 0) {					
+                  MaterialApi.checkField({"tradeMark":value})
+                    .then((response) => {
+                      const res = response.data
+                      if (res.data) {
+                        callback('材料牌号重复')
+                      } else {
+                        callback()
+                      }
+                    })
+                } else {
+                  callback()
+                }                
+               }, trigger: 'blur'
+              }
 	        ],
 	        specification: [
 	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
@@ -236,6 +275,7 @@
 	    setTenant (val, dicts) {
 	    	if(val){
 	    		this.tenant = { ...val }
+				this.oldVal = {... val }
 	    		/*if("04" === this.tenant.category.key){
 	            this.materialTypeShowFlag = true;
 	        }else{

imcs-ui/src/views/zuihou/prepareProductMgr/trayMgr/components/Edit.vue

@@ -10,7 +10,7 @@
   >
     <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
     	<!--所属产线-->
-      <el-form-item v-if="$store.state.account.user.roles.indexOf('舱体') < 0 || $store.state.account.user.roles.indexOf('框体') < 0" label='所属产线：' prop="zoneId">
+      <el-form-item v-if="$store.state.account.user.roles.indexOf('舱体') < 0 && $store.state.account.user.roles.indexOf('框体') < 0" label='所属产线：' prop="zoneId">
         <el-select
           v-model="tenant.zoneId"
            :placeholder='$t("common.pleaseSelect")'
@@ -100,6 +100,7 @@ export default {
       type: 'add',
       zoneList: [],
       tableData: [],
+      oldVal: {},
       tenant: this.initTenant(),
       screenWidth: 0,
       width: this.initWidth(),
@@ -110,13 +111,51 @@ export default {
       roles: [],
       rules: {
         name: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+           { validator: (rule, value, callback) => {		
+				    if(this.type === "edit" && value === this.oldVal.name){
+        			return callback()
+      			}			 
+            if (value.trim().length > 0) {					
+                  trayMgrApi.checkField({"name":value})
+                    .then((response) => {
+                      const res = response.data
+                      if (res.data) {
+                        callback('托盘名称重复')
+                      } else {
+                        callback()
+                      }
+                    })
+                } else {
+                  callback()
+                }                
+               }, trigger: 'blur'
+            }
         ],
         zoneId: [
           { required: true, message: this.$t("rules.require"), trigger: 'blur' }
         ],
         no: [
-          { required: true, message: this.$t("rules.require"), trigger: 'blur' }
+          { required: true, message: this.$t("rules.require"), trigger: 'blur' },
+          { validator: (rule, value, callback) => {		
+				    if(this.type === "edit" && value === this.oldVal.no){
+        			return callback()
+      			}			 
+            if (value.trim().length > 0) {					
+                  trayMgrApi.checkField({"no":value})
+                    .then((response) => {
+                      const res = response.data
+                      if (res.data) {
+                        callback('物料编码重复')
+                      } else {
+                        callback()
+                      }
+                    })
+                } else {
+                  callback()
+                }                
+               }, trigger: 'blur'
+            }
         ],
         num: [
           { required: true, message: this.$t("rules.require"), trigger: 'blur' }
@@ -166,6 +205,9 @@ export default {
         res = res.data;
         if (res.isSuccess) {
           this.zoneList = res.data;
+          if(this.zoneList.length == 1){
+             this.zoneId = this.zoneList[0].id
+          }
         }
       });
     },
@@ -239,6 +281,7 @@ export default {
     	}
       // 字典表
       this.dicts = dicts
+      this.oldVal = {...val }
     },
     close () {
       this.$emit('close')

imcs-ui/src/views/zuihou/resourceProductMgr/deviceMgr/Index.vue

@@ -209,21 +209,21 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="linkStatus"
-        :label="$t('resource.table.resours.linkStatus')"
-        width="180px"
-        align="center"
-      >
-        <template slot-scope="{ row }">
-          <div
-            class="statusDiv"
-            :style="'background:' + row.linkStatus.background"
-          >
-            {{ row.linkStatus.text }}
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="linkStatus"-->
+<!--        :label="$t('resource.table.resours.linkStatus')"-->
+<!--        width="180px"-->
+<!--        align="center"-->
+<!--      >-->
+<!--        <template slot-scope="{ row }">-->
+<!--          <div-->
+<!--            class="statusDiv"-->
+<!--            :style="'background:' + row.linkStatus.background"-->
+<!--          >-->
+<!--            {{ row.linkStatus.text }}-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
         prop="controlStatus"
         :label="$t('resource.table.resours.controlStatus')"

imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/Index.vue

@@ -197,21 +197,21 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="linkStatus"
-        :label="$t('resource.table.resours.linkStatus')"
-        width="180px"
-        align="center"
-      >
-        <template slot-scope="{ row }">
-          <div
-            class="statusDiv"
-            :style="'background:' + row.linkStatus.background"
-          >
-            {{ row.linkStatus.text }}
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="linkStatus"-->
+<!--        :label="$t('resource.table.resours.linkStatus')"-->
+<!--        width="180px"-->
+<!--        align="center"-->
+<!--      >-->
+<!--        <template slot-scope="{ row }">-->
+<!--          <div-->
+<!--            class="statusDiv"-->
+<!--            :style="'background:' + row.linkStatus.background"-->
+<!--          >-->
+<!--            {{ row.linkStatus.text }}-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
         prop="controlStatus"
         :label="$t('resource.table.resours.controlStatus')"

imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/ViewResult.vue

@@ -149,6 +149,8 @@
 <script>
 // 【夹具管理】-API
 import inspectionApi from "@/api/runManageCenter/inspection"
+//检测报告-API
+import qualityResultApi from "@/api/machiningClient/qualityResultMgr"
 // 【分页】组件
 import Pagination from "@/components/Pagination"
 // 【共通】函数
@@ -267,7 +269,7 @@ export default {
     downloadFile(row) {
         this.queryParams.map.fileName = '下载抽检报表'+row.report
         this.queryParams.model.id = row.id
-        inspectionApi.export(this.queryParams).then(response => {
+        qualityResultApi.download(this.queryParams).then(response => {
           downloadFile(response);
        });
     },