异常功能前端页面处理和展示bug处理

imcs-ui/src/layout/index.vue

@@ -84,7 +84,8 @@ export default {
               let datas = data.data.warnMap.warnData.records              
               datas.forEach((data)=>{
                   let msg = data.feedback ? data.feedback : " 响应超时 ";
-                  let content = "<a href='#/dispatchMgr/exception'>"+(data.resourceName? "["+ data.resourceName +"] " : "" )+(data.procedureName? data.procedureName : "")
+                  let url = data.taskNodeId ? "#/dispatchMgr/exception":"#/developer/warnLong";
+                  let content = "<a href='"+url+"'>"+(data.resourceName? "["+ data.resourceName +"] " : "" )+(data.procedureName? data.procedureName : "")
                    + (data.instructionName? "("+data.instructionName+")" : "") + msg+"</a>";                  
                   this.$notification.error(content, { messageIsHTML: true, timer:60, title:"异常警报", showCloseIcn:true });
               })

imcs-ui/src/views/zuihou/developer/warnLong/Index.vue

@@ -78,28 +78,37 @@
       <!-- CheckBox -->
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
       <!-- 编码 -->
-      <el-table-column prop="nodeNo" :label='$t("developer.table.warnLong.no")' :show-overflow-tooltip="true" width="180"></el-table-column>
+      <el-table-column prop="nodeNo" :label='$t("developer.table.warnLong.no")' :show-overflow-tooltip="true" width="160">
+		  <template slot-scope="{ row }">
+			   <span v-if="row.nodeNo"> {{row.nodeNo}}</span>
+			   <span v-else-if="!row.taskNodeId">设备状态监控</span>
+		   </template>
+	  </el-table-column>
       <!-- 设备 -->
-      <el-table-column prop="resourceName" :label='$t("developer.table.warnLong.name")' width="100"></el-table-column>
+      <el-table-column prop="resourceName" :label='$t("developer.table.warnLong.name")' width="180">
+		   <template slot-scope="{ row }">
+			   <span v-if="row.resourceName"> {{row.resourceName}}</span>
+			   <span v-else-if="!row.taskNodeId">{{row.feedback}}</span>
+		   </template>
+	  </el-table-column>
       <!-- 报警内容 -->
-      <el-table-column prop="shelvesDesc" :label='$t("developer.table.warnLong.storgeId")' >
+      <el-table-column prop="feedback" :label='$t("developer.table.warnLong.storgeId")' >
 	      <template slot-scope="{ row }">
-			<span> {{row.resourceName}}-{{row.procedureName}}-{{row.instructionName}}-</span>
-			<span v-if="row.feedback">{{row.feedback}}</span>
-			<span v-else>任务超时</span>
+			<span v-if="row.taskNodeId"> {{row.procedureName}}-{{row.instructionName}}-{{row.feedback}}</span>
+			<span v-else>设备监控推送异常</span>			
 		  </template>
 	  </el-table-column>
       <!-- 报警时间 -->
-      <el-table-column prop="createTime" :label='$t("developer.table.warnLong.updateTime")' width="180px"></el-table-column>
+      <el-table-column prop="createTime" :label='$t("developer.table.warnLong.updateTime")' width="160px"></el-table-column>
       <!-- 是否需要人员处理 -->
-      <el-table-column prop="num" :label='$t("developer.table.warnLong.num")' align="center" width="150px">
+      <el-table-column prop="manual" :label='$t("developer.table.warnLong.num")' align="center" width="150px">
       	<template slot-scope="{ row }">
       		<el-tag v-if="row.manual == '1'" type="success">{{$t("common.yes")}}</el-tag>
-	      	<el-tag v-else type="">{{$t("common.no")}}</el-tag>
+	      	<el-tag v-else type="failed">{{$t("common.no")}}</el-tag>			 
 		</template>
       </el-table-column>
       <!-- 处理状态 -->
-      <el-table-column prop="optType" :label='$t("developer.table.warnLong.goodsType")' align="center" width="120px">
+      <el-table-column prop="status" :label='$t("developer.table.warnLong.goodsType")' align="center" width="120px">
       	<template slot-scope="{ row }">
       		    <el-tag v-if="row.status == '0'" type="failed">{{$t("developer.common.status.start")}}</el-tag>
 	      	    <el-tag v-if="row.status == '1'" type="success">{{$t("developer.common.status.end")}}</el-tag>
@@ -107,7 +116,7 @@
 		</template>
       </el-table-column>
       <!-- 处理时间 -->
-      <el-table-column prop="updateTime" :label='$t("developer.table.warnLong.chuliTime")' width="180px">
+      <el-table-column prop="updateTime" :label='$t("developer.table.warnLong.chuliTime")' width="160px">
 	     <template slot-scope="{ row }">
 	         <span v-if="row.status == '1'">{{row.updateTime}}</span>
 	     </template>

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

@@ -83,7 +83,12 @@
         :label="$t('dispatch.table.exception.device')"
         :show-overflow-tooltip="true"
         align="center"
-      ></el-table-column>
+      >
+      <template slot-scope="{ row }">
+           <span v-if="row.resourceName">{{row.resourceName}}异常</span>
+           <span v-else>{{row.feedback}}</span>
+      </template>
+      </el-table-column>
 
       <!-- 指令内容 -->
       <el-table-column
@@ -92,7 +97,12 @@
         :show-overflow-tooltip="true"
         align="center"
         width="250px"
-      ></el-table-column>
+      >
+        <template slot-scope="{ row }">
+           <span v-if="row.instructionName">{{row.instructionName}}</span>
+           <span v-else>设备监控指令</span>
+      </template>      
+      </el-table-column>
 
        <!-- 状态 -->
       <el-table-column
@@ -109,16 +119,16 @@
       </el-table-column>
 
       <!-- 操作 -->
-      <el-table-column
+      <el-table-column 
         :label="$t('dispatch.table.exception.operation')"
         width="300px"  align="center">
         <template slot-scope="{ row }">
-          <el-button plain type="primary" size="medium" @click.native="resend(row)">
+          <el-button v-if="row.taskNodeId" plain type="primary" size="medium" @click.native="resend(row)">
 	        {{ $t("dispatch.button.resend") }}
 	       </el-button>
-	        <el-button plain type="primary" size="medium" @click.native="marked(row)">
+	        <!--<el-button plain type="primary" size="medium" @click.native="marked(row)">
 	          {{ $t("dispatch.button.marked") }}
-	        </el-button>
+	        </el-button> -->
         </template>
       ></el-table-column>
 

imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/components/programForm/components/ProgramncMgr.vue

@@ -434,6 +434,7 @@ export default {
       	this.fileList = []
     },
     submitForm () {
+	  let idArr = new Array();
       this.$refs.form.validate((valid) => {
 		let bool = true;
 		let msg = ""
@@ -446,6 +447,14 @@ export default {
 				 bool = false
 				 msg = "刀具名称不能为空"
 				 return false
+			  }else{
+				  if(idArr.indexOf(item.toolId)<0){
+				  	idArr.push(item.toolId)
+				  }else{
+					bool = false
+				 	msg = "同名刀具不能重复选择"
+				    return false 
+				  }	  
 			  }			  
 			});  
 		}

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

@@ -57,8 +57,8 @@
 				        >
                    <template slot-scope="{ row }">
 				            <span v-if="row.result==0">待定</span>
-                    <span v-if="row.result==1">合格</span>
-                    <span v-if="row.result==2" style="color:red">不合格</span>
+                    <span v-if="row.result=='OK'">合格</span>
+                    <span v-if="row.result=='NG'" style="color:red">不合格</span>
 				          </template>
                 </el-table-column>
                  <!-- 质检报告 -->