云箭前端更新改进

imcs-ui/src/api/systemMgr/toolbar.js

@@ -48,6 +48,18 @@ const apiList = {
   manualXbk: {
     method: 'POST',
     url: `/authority/toolbar/manualXbk`
+  },
+  addNodeMsg: {
+    method: 'POST',
+    url: `/authority/toolbar/addNodeMsg`
+  },
+  addCacheMsg: {
+    method: 'POST',
+    url: `/authority/toolbar/addCacheMsg`
+  },
+  refreshPriority: {
+    method: 'POST',
+    url: `/authority/toolbar/refreshPriority`
   } 
 }
 
@@ -123,5 +135,23 @@ export default {
       ...apiList.manualXbk,
       data
     })
+  },
+  addNodeMsg (data) {
+    return axiosApi({
+      ...apiList.addNodeMsg,
+      data
+    })
+  },
+  addCacheMsg (data) {
+    return axiosApi({
+      ...apiList.addCacheMsg,
+      data
+    })
+  },
+  refreshPriority (data) {
+    return axiosApi({
+      ...apiList.refreshPriority,
+      data
+    })
   }
 }

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 url = data.taskNodeId ? "#/dispatchMgr/exception":"#/developer/warnLong";
+                  //let url = data.taskNodeId ? "#/dispatchMgr/exception":"#/developer/warnLong";
+                  let url = "#/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:10, title:"异常警报", showCloseIcn:true });

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

@@ -74,7 +74,7 @@
 	</el-card>
 
 	<el-card class="box-card">
-        <div slot="header" class="clearfix">设置设备上线\离线</div>
+        <div slot="header" class="clearfix">设置加工设备上线\掉线</div>
 		<el-form ref="form3" :model="form3" :rules="rules3" label-width="80px">
 			<el-row :gutter="12" >
 				<el-col :xs="6" :sm="5">
@@ -184,7 +184,7 @@
 	  </el-form>
 	</el-card>
 
-	<el-card class="box-card">
+	<el-card class="box-card" v-show="false">
         <div slot="header" class="clearfix">零件动态入线边库(产线内)</div>
 		<el-form ref="form8" :model="form8" :rules="rules1" label-width="80px">
 			<el-row :gutter="12" >
@@ -263,6 +263,76 @@
   			</el-form-item>
 	  </el-form>
 	</el-card>
+
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">添加动态消息</div>
+		<el-form ref="form12" :model="form12" :rules="rules9" label-width="80px">
+			<el-row :gutter="12" >
+				<el-col :xs="6" :sm="8">
+					<el-form-item label="节点ID:" prop="taskNodeId">
+                    	<el-input  v-model="form12.taskNodeId" placeholder="节点ID"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="6">
+					<el-form-item label="类型:" prop="msgType">
+                    	<el-select v-model="form12.msgType" placeholder="选择消息类型">
+							 <!--<el-option v-for="deviceType in typeList" :label="deviceType.name" :value="deviceType.value" :key="deviceType.value" ></el-option>	-->	
+			  			     <el-option label="普通消息" value="1"></el-option>
+							 <el-option label="线边库消息" value="2"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="次序号:" prop="count">
+                    	<el-input-number v-model="form12.count" :min="0" :max="2"></el-input-number>
+					</el-form-item>
+				</el-col>											
+			</el-row>
+			<el-form-item>
+    			<el-button type="primary" @click="addNodeMsg" >发送</el-button>    		
+  			</el-form-item>
+	  </el-form>
+	</el-card>
+
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">刷新加工优先级</div>
+		<el-form ref="form13" :model="form13" label-width="80px">			
+			<el-form-item>
+    			<el-button type="primary" @click="refreshPriority" >发送</el-button>    		
+  			</el-form-item>
+	  </el-form>
+	</el-card>
+
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">添加产线暂存位缓存</div>
+		<el-form ref="form14" :model="form14" :rules="rules10" label-width="80px">
+			<el-row :gutter="12" >
+				<el-col :xs="6" :sm="8">
+					<el-form-item label="节点ID:" prop="taskNodeId">
+                    	<el-input  v-model="form14.taskNodeId" placeholder="节点ID"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="6">
+					<el-form-item label="类型:" prop="msgType">
+                    	<el-select v-model="form14.msgType" placeholder="选择消息类型">
+			  			     <el-option label="框体125暂存位" value="KT_125"></el-option>
+							 <el-option label="框体126暂存位" value="KT_126"></el-option>
+							 <el-option label="舱体125暂存位" value="CT_125"></el-option>
+							 <el-option label="舱体126暂存位" value="CT_126"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="目标号:" prop="targetNo">
+                    	<el-input-number v-model="form14.targetNo" :min="0" :max="133"></el-input-number>
+					</el-form-item>
+				</el-col>											
+			</el-row>
+			<el-form-item>
+    			<el-button type="primary" @click="addCacheMsg" >发送</el-button>    		
+  			</el-form-item>
+	  </el-form>
+	</el-card>
   </div>
 </template>
 
@@ -327,6 +397,19 @@
 		  form11:{
 			completeBatchNo: ""
 		  },
+		  form12:{
+			taskNodeId: "",
+			count:0,
+			msgType:"1"
+		  },
+		  form13:{
+
+		  },
+		  form14:{
+			taskNodeId: "",
+			targetNo:0,
+			msgType:"KT_125"
+		  },
 		  lineList: [],
 		  typeList: [{"name":"全部","value":"0"},{"name":"FANUC","value":"1"},{"name":"HEIDENHAIN","value":"2"},{"name":"DMG","value":"3"},{"name":"HELLER","value":"4"}],
 	      tenantViewVisible: false,
@@ -394,6 +477,28 @@
 			completeBatchNo: [
 				{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
 			]
+		  },
+		  rules9: {
+			taskNodeId: [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
+			msgType: [
+				{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+			],
+			count: [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
+		  },
+		  rules10: {
+			taskNodeId: [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
+			msgType: [
+				{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+			],
+			targetNo: [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
 		  }
 		}
 	  },
@@ -712,6 +817,78 @@
 				}				
 			});
 		},
+		addNodeMsg(){
+			this.$refs.form12.validate((valid) => {
+				if(valid){
+					toolbarApi.addNodeMsg(this.form12).then(response=>{
+						const res = response.data
+						if(res.isSuccess){
+							this.$message({
+              					message: this.$t('tips.updateSuccess'),
+              					type: 'success'
+            				})
+						}else{
+							this.$message({
+              					message: res.msg,
+              					type: 'warning'
+            				})
+						}
+					}).finally(()=>{
+					   return true		
+					})					
+				}else{
+					return false
+				}				
+			});
+		},
+		addCacheMsg(){
+			this.$refs.form14.validate((valid) => {
+				if(valid){
+					toolbarApi.addCacheMsg(this.form14).then(response=>{
+						const res = response.data
+						if(res.isSuccess){
+							this.$message({
+              					message: this.$t('tips.updateSuccess'),
+              					type: 'success'
+            				})
+						}else{
+							this.$message({
+              					message: res.msg,
+              					type: 'warning'
+            				})
+						}
+					}).finally(()=>{
+					   return true		
+					})					
+				}else{
+					return false
+				}				
+			});
+		},
+		refreshPriority(){
+			this.$refs.form13.validate((valid) => {
+				if(valid){
+					toolbarApi.refreshPriority(this.form13).then(response=>{
+						const res = response.data
+						if(res.isSuccess){
+							this.$message({
+              					message: this.$t('tips.updateSuccess'),
+              					type: 'success'
+            				})
+						}else{
+							this.$message({
+              					message: res.msg,
+              					type: 'warning'
+            				})
+						}
+					}).finally(()=>{
+					   return true		
+					})					
+				}else{
+					return false
+				}				
+			});
+		},
 	    reset () {
 	      this.queryParams = initQueryParams({})
 	      this.$refs.table.clearSort()

imcs-ui/src/views/zuihou/machiningClient/touchScreen/components/View6.vue

@@ -81,7 +81,7 @@
         <!--
 	      <el-button v-if="xbkValid && unFeedingCount>0 || (unFeedingCount==0 && unBaitingCount==1 && xbkValid)" type="primary" :disabled="confirmDisabled" @click="submitForm(6)">{{ $t('machining.buttons.finished') }}</el-button>
         <el-button v-if="(unFeedingCount==0 && unBaitingCount>0) || !xbkValid" type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button> -->
-        <el-button v-if="xbkValid"  type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('machining.buttons.finished') }}</el-button>
+        <el-button v-if="xbkValid"  type="primary" :disabled="confirmDisabled" @click="submitForm(6)">{{ $t('machining.buttons.finished') }}</el-button>
         <el-button type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button>
       </div>
     </div>