前端页面功能处理

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

@@ -52,6 +52,10 @@ const apiList = {
   addNodeMsg: {
     method: 'POST',
     url: `/authority/toolbar/addNodeMsg`
+  },
+  updateBizStatus: {
+    method: 'POST',
+    url: `/authority/toolbar/updateBizStatus`
   }  
 }
 
@@ -133,5 +137,11 @@ export default {
       ...apiList.addNodeMsg,
       data
     })
+  },
+  updateBizStatus (data) {
+    return axiosApi({
+      ...apiList.updateBizStatus,
+      data
+    })
   }
 }

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

@@ -1,31 +1,6 @@
 <template>
   <div class="app-container space">
 
-	<el-card class="box-card">
-        <div slot="header" class="clearfix">查询产线设备在线率</div>
-		<el-form ref="form" :model="form" label-width="100px">
-			<el-row :gutter="12" >
-				<el-col :xs="6" :sm="5">
-					<el-form-item label="产线类型:" prop="zoneCode">
-                    	<el-select v-model="form.zoneCode" placeholder="选择产线类型">
-							 <el-option v-for="zoneCode in lineList" :label="zoneCode.name" :value="zoneCode.value" :key="zoneCode.value" ></el-option>		
-			  			</el-select>
-					</el-form-item>
-				</el-col>											
-			</el-row>
-			<el-form-item>
-    			<el-button type="primary" @click="getZoneRateList" >发送</el-button>    		
-  			</el-form-item>	
-			  <el-row :gutter="12" >			  
-				<el-col :span="4" v-for="(item, index) in zoneRateList" :key="item.id">
-					<el-form-item :label="index==0? '加工设备数':(index==1? '设备联网率':'设备上线率')">
-					  {{zoneRateList[index].rate}}{{index!=0?'%':''}}
-					</el-form-item>	
-				</el-col>
-			  </el-row>	
-	  </el-form>
-	</el-card>
-
 	<el-card class="box-card">		
         <div slot="header" class="clearfix">查询业务节点状态</div>
 		<el-form ref="form2" :model="form2" label-width="80px">
@@ -86,63 +61,7 @@
 			</el-row>	
 		</el-form>
 	</el-card>
-
-	<el-card class="box-card">
-        <div slot="header" class="clearfix">查询AGV锁定状态</div>
-		<el-form label-width="80px">
-		<el-row :gutter="10" v-for="agvLock in agvLockList" :key="agvLock.id">
-			    <el-col :span="6">
-					<el-form-item label="ID:">
-					 {{agvLock.id}}
-					</el-form-item>	
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="设备ID:">
-						{{agvLock.target_resource_id}}
-					</el-form-item>
-			    </el-col>
-				<el-col :span="6">
-					<el-form-item label="目标设备:">
-						{{agvLock.name}}
-					</el-form-item>
-				</el-col>				
-		   </el-row>
-		</el-form>
-	</el-card>
-
-	<el-card class="box-card">
-        <div slot="header" class="clearfix">查询节点回调数据</div>
-		<el-form label-width="80px">
-		<el-row :gutter="10" v-for="cacheCallback in cacheCallbackList" :key="cacheCallback.Id">
-			    <el-col :span="5">
-					<el-form-item label="节点ID:">
-					 {{cacheCallback.taskNodeId}}
-					</el-form-item>	
-				</el-col>
-				<el-col :span="5">
-					<el-form-item label="任务名称:">
-						{{cacheCallback.operateName}}
-					</el-form-item>
-			    </el-col>
-				<el-col :span="5">
-					<el-form-item label="任务ID:">
-						{{cacheCallback.taskId}}
-					</el-form-item>
-				</el-col>
-				<el-col :span="3">
-					<el-form-item label="任务状态:">
-						{{cacheCallback.state=="1"?"未完成":"已完成"}}
-					</el-form-item>
-				</el-col>
-				<el-col :span="5">
-					<el-form-item label="地址:">
-						{{cacheCallback.address}}
-					</el-form-item>
-				</el-col>				
-		   </el-row>
-		</el-form>
-		
-	</el-card>
+	
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">查询点库位锁定状态</div>
@@ -204,95 +123,7 @@
 		   </el-row>
 		</el-form>
 	</el-card>
-
-	<el-card class="box-card">
-        <div slot="header" class="clearfix">查询自定义订单</div>		
-		<el-form label-width="80px">
-		<el-row :gutter="10"  v-for="task in orderTaskList" :key="task.id">
-			    <el-col :span="4">
-					<el-form-item label="订单名称">
-					 {{ task.orderName}}
-					</el-form-item>	
-				</el-col>
-				<el-col :span="4">
-					<el-form-item label="产品" label-width="100px">
-						{{task.bomDesc}}
-					</el-form-item>
-			    </el-col>
-				<el-col :span="5">
-					<el-form-item label="开始时间" label-width="100px">
-						{{task.startTime}}
-					</el-form-item>
-			    </el-col>
-				<el-col :span="5">
-					<el-form-item label="结束时间" label-width="100px">
-						{{task.endTime}}
-					</el-form-item>
-			    </el-col>								
-		   </el-row>
-		</el-form>	  
-	</el-card>
-
-	<el-card class="box-card">
-        <div slot="header" class="clearfix">查询线边库调度任务</div>		
-		<el-form label-width="80px">
-		<el-row :gutter="10"  v-for="task in xbkDyTaskList" :key="task.id">
-			    <el-col :span="4">
-					<el-form-item label="订单名称">
-					 {{ task.orderName}}
-					</el-form-item>	
-				</el-col>
-				<el-col :span="4">
-					<el-form-item label="任务ID">
-					 {{ task.id}}
-					</el-form-item>	
-				</el-col>
-				<el-col :span="4">
-					<el-form-item label="产品" label-width="100px">
-						{{task.bomDesc}}
-					</el-form-item>
-			    </el-col>
-				<el-col :span="5">
-					<el-form-item label="开始时间" label-width="100px">
-						{{task.startTime}}
-					</el-form-item>
-			    </el-col>
-				<el-col :span="6">
-					<el-form-item label="目标设备" label-width="100px">
-						{{task.resourceDesc}}
-					</el-form-item>
-			    </el-col>								
-		   </el-row>
-		</el-form>	  
-	</el-card>
-
-    <el-card class="box-card">
-        <div slot="header" class="clearfix">查询暂存位调度任务</div>		
-		<el-form label-width="80px">
-		<el-row :gutter="10"  v-for="task in zcwDyTaskList" :key="task.id">
-			    <el-col :span="4">
-					<el-form-item label="订单名称">
-					 {{ task.orderName}}
-					</el-form-item>	
-				</el-col>
-				<el-col :span="4">
-					<el-form-item label="产品" label-width="100px">
-						{{task.bomDesc}}
-					</el-form-item>
-			    </el-col>
-				<el-col :span="5">
-					<el-form-item label="开始时间" label-width="100px">
-						{{task.startTime}}
-					</el-form-item>
-			    </el-col>
-				<el-col :span="6">
-					<el-form-item label="目标设备" label-width="100px">
-						{{task.resourceDesc}}
-					</el-form-item>
-			    </el-col>								
-		   </el-row>
-		</el-form>	  
-	</el-card>
+	
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">查询零件流程</div>
@@ -348,7 +179,7 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">查询缓存关键字</div>		
-		<el-form label-width="80px">
+		<el-form label-width="100px">
 		<el-row :gutter="10">
 			    <el-col :span="6">
 					<el-form-item label="是否排产">
@@ -473,24 +304,7 @@
 		},
 		viewClose() {
         	this.tenantViewVisible = false
-        },
-		getZoneRateList(){
-			let query = this.form.zoneCode ? {"zoneCode" : this.form.zoneCode.toString()} : {}	
-			toolQueryApi.getZoneRateList(query).then(response=>{
-						const res = response.data
-						if(res.isSuccess){
-							this.zoneRateList = res.data.data
-							console.log(this.zoneRateList)
-						}else{
-							this.$message({
-              					message: res.msg,
-              					type: 'warning'
-            				})
-						}
-				}).finally(()=>{
-					return true		
-			})
-		},   
+        },		
 	    getBizStatusList () {
 			let query = this.form2.timeSpan ? {"timeSpan" : this.form2.timeSpan.toString()} : {}		
 			toolQueryApi.getBizStatusList(query).then(response=>{
@@ -507,23 +321,7 @@
 				}).finally(()=>{
 					return true		
 			})
-	    },
-	    getAgvLockList () {
-			toolQueryApi.getAgvLockList({}).then(response=>{
-						const res = response.data
-						if(res.isSuccess){
-							this.agvLockList = res.data.data
-							//console.log(this.agvLockList)
-						}else{
-							this.$message({
-              					message: res.msg,
-              					type: 'warning'
-            				})
-						}
-				}).finally(()=>{
-					return true		
-			})	      
-	    },
+	    },	   
 	    getCacheCallbackList () {
 			toolQueryApi.getCacheCallbackList({}).then(response=>{
 						const res = response.data
@@ -631,17 +429,11 @@
 					return true		
 			})
 		},
-	    fetch () {
-			this.getZoneRateList()
+	    fetch () {			
 	      	this.getBizStatusList()
-			this.getAgvLockList()
-			this.getCacheCallbackList()
 			this.getStorgeLockList()
 			this.getCacheKeyList()
-			this.getOfflineList()
-			this.getOrderTaskList()
-			this.getXbkDyTaskList()
-			this.getZcwDyTaskList()
+			this.getOfflineList()				
 	    }
 	  }
 	}

imcs-ui/src/views/zuihou/dispatchMgr/toolQuery/components/View.vue

@@ -11,28 +11,33 @@
         <div class="view-item">  
           <span>NO</span>
         </div>     
+      </el-col>
+      <el-col :xs="24" :sm="3">
+        <div class="view-item">  
+          <span>任务ID</span>
+        </div>     
       </el-col>  
-      <el-col :xs="24" :sm="5">
+      <el-col :xs="24" :sm="4">
         <div class="view-item">  
           <span>名称</span>
         </div>     
       </el-col> 
-      <el-col :xs="24" :sm="3">
+      <el-col :xs="24" :sm="2">
         <div class="view-item">  
           <span>编号</span>
         </div>     
       </el-col> 
-      <el-col :xs="24" :sm="4">
+      <el-col :xs="24" :sm="3">
         <div class="view-item">
           <span>设备</span>  
         </div>     
       </el-col> 
-      <el-col :xs="24" :sm="5">
+      <el-col :xs="24" :sm="4">
         <div class="view-item">  
           <span>开始时间</span>
         </div>     
       </el-col>
-      <el-col :xs="24" :sm="4">
+      <el-col :xs="24" :sm="3">
         <div class="view-item">  
           <span>目标设备</span>
         </div>     
@@ -45,27 +50,32 @@
           <span v-else >{{ taskNode.id }}</span>           
         </div>
       </el-col>
-      <el-col :xs="24" :sm="5">
+      <el-col :xs="24" :sm="3">
+        <div class="view-item">         
+          <span>{{ taskNode.task_id }}</span>
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="4">
         <div class="view-item">         
           <span>{{ taskNode.node_name }}</span>
         </div>
       </el-col>
-      <el-col :xs="24" :sm="3">
+      <el-col :xs="24" :sm="2">
         <div class="view-item">          
           <span>{{ taskNode.procedure_no }}</span>          
         </div>
       </el-col>
-      <el-col :xs="24" :sm="4">
+      <el-col :xs="24" :sm="3">
         <div class="view-item">          
           <span>{{ taskNode.ResourceName }}</span>         
         </div>
       </el-col>
-      <el-col :xs="24" :sm="5">
+      <el-col :xs="24" :sm="4">
         <div class="view-item">          
           <span>{{ taskNode.start_time }}</span>          
         </div>
       </el-col>
-      <el-col :xs="24" :sm="4">
+      <el-col :xs="24" :sm="3">
         <div class="view-item">          
           <span>{{ taskNode.targetResourceName }}</span>         
         </div>
@@ -122,11 +132,11 @@ export default {
       if (this.screenWidth < 550) {
         return '95%'
       } else if (this.screenWidth < 990) {
-        return '580px'
+        return '800px'
       } else if (this.screenWidth < 1400) {
-        return '600px'
+        return '1300px'
       } else {
-        return '1050px'
+        return '1600px'
       }
     },
     setTenant (val) {

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

@@ -257,6 +257,36 @@
 	  </el-form>
 	</el-card>
 
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">更新任务/节点状态</div>
+		<el-form ref="form16" :model="form16" :rules="rules12" label-width="80px">
+			<el-row :gutter="12" >
+				<el-col :xs="6" :sm="6">
+					<el-form-item label="任务ID:" prop="taskId">
+                    	<el-input  v-model="form16.taskId" placeholder="任务ID"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="6">
+					<el-form-item label="节点ID:" prop="taskNodeId">
+                    	<el-input  v-model="form16.taskNodeId" placeholder="节点ID"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="状态:" prop="status">
+                    	<el-select v-model="form16.status" placeholder="选择状态">
+			  			     <el-option label="运行状态" value="2"></el-option>
+							 <el-option label="完成状态" value="3"></el-option>
+							 <el-option label="暂停状态" value="4"></el-option>							 
+						</el-select>
+					</el-form-item>
+				</el-col>											
+			</el-row>
+			<el-form-item>
+    			<el-button type="primary" @click="updateBizStatus" >发送</el-button>    		
+  			</el-form-item>
+	  </el-form>
+	</el-card>
+
 	<el-card class="box-card">
         <div slot="header" class="clearfix">刷新线边库排产</div>
 		<el-form ref="form10" :model="form10" :rules="rules7" label-width="80px">
@@ -385,6 +415,11 @@
 			count:0,
 			msgType:"1"
 		  },
+		  form16:{
+			taskNodeId: "",
+			taskId: "",
+			status:""
+		  },
 		  lineList: [],
 		  typeList: [{"name":"全部","value":"0"},{"name":"FANUC","value":"1"},{"name":"HEIDENHAIN","value":"2"},{"name":"DMG","value":"3"},{"name":"HELLER","value":"4"}],
 	      tenantViewVisible: false,
@@ -471,6 +506,11 @@
 			],
 			count: [
         		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
+		  },
+		  rules12: {
+			status:  [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
         	],
 		  },
 		}
@@ -790,6 +830,38 @@
 				}				
 			});		
 		},
+		updateBizStatus(){
+			let  bool = this.form16.taskId!='' || this.form16.taskNodeId!=''
+			if(!bool) {
+				this.$message({
+              			message: "业务数据二选一不能都为空",
+              			type: 'warning'
+            	})
+				return false;
+			}
+			this.$refs.form16.validate((valid) => {
+				if(valid){
+					toolbarApi.updateBizStatus(this.form16).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
+				}				
+			});
+		},
 		manualXbk(){
             this.$refs.form8.validate((valid) => {
 				if(valid){