前端页面功能处理

imcs-ui/src/api/resourceProductMgr/areaMgr.js

@@ -64,6 +64,10 @@ const apiList = {
   getTimeSpanList: {
     method: 'POST',
     url: `/authority/zZone/getTimeSpanList`
+  },
+  robotList: {
+    method: 'POST',
+    url: `/authority/productionresourceBiz/robotMonitor`
   }
 }
 
@@ -184,5 +188,11 @@ export default {
       ...apiList.getTimeSpanList,
       data
     })
+  },
+  robotList (data) {
+    return axiosApi({
+      ...apiList.robotList,
+      data
+    })
   }
 }

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

@@ -187,7 +187,8 @@ export default {
 				name7: '上料任务号',
 				name8: '最后流转任务号',
 				name9: '入库时间',
-				name10: '是否锁定'
+				name10: '是否锁定',
+				name11: '目标位置'
 			}
 		},
 		// 表单数据名称

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

@@ -137,7 +137,8 @@ export default {
 			yujStatus: '预警状态',
 			taskFinished: '任务要求完成时间',
 			planTime: '计划时间',
-			shuoming: '可按照多维度查看排产结果'
+			shuoming: '可按照多维度查看排产结果',
+			robotMonitor: '机器人监控'
 		},
 		// 按钮的名称--特殊点的按钮信息
 	  	buttons: {

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

@@ -198,7 +198,8 @@ export default {
         name7: '上料任务号',
         name8: '最后流转任务号',
         name9: '入库时间',
-        name10: '是否锁定'
+        name10: '是否锁定',
+        name11: '目标位置'
       }
     },
     //表单数据名称

imcs-ui/src/views/zuihou/lineSideLibrary/lineSideEmulate/components/Edit.vue

@@ -40,17 +40,24 @@
 	      <!-- 库存编码 -->
 	      <el-table-column prop="storgeNo" label='库存编码' width="180px"></el-table-column>
 	      <!-- 数量 -->
-	      <el-table-column prop="num" :label='$t("lineSide.table.emulateProd.name6")' width="180px"></el-table-column>
+	      <el-table-column prop="num" :label='$t("lineSide.table.emulateProd.name6")' width="80px"></el-table-column>
 	      <!-- 入库时间 -->
 	     	<el-table-column prop="createTime" :label='$t("lineSide.table.emulateProd.name9")' width="180px"></el-table-column>
 	      <!-- 是否锁定 -->
 	      <el-table-column prop="lockStatus" :label='$t("lineSide.table.emulateProd.name10")' align="center" width="90px">
 	      	<template slot-scope="{ row }">
-	          <el-tag :type="row.status=='1' ? 'success' : 'danger'">
-	          	{{ row.status=='1' ? $t("common.yes") : $t("common.no") }}
+	          <el-tag :type="row.lockStatus=='0' ? 'danger':'success'">
+	          	{{ row.lockStatus=='0' ? $t("common.yes") : $t("common.no") }}
 	          </el-tag>
 	        </template>
 	      </el-table-column>
+        <el-table-column  prop="targetName" :label='$t("lineSide.table.emulateProd.name11")' align="center" width="180px">
+          <template slot-scope="{ row }">
+            <el-tag :type="row.targetName ? 'success' : 'danger'">
+	            {{ row.targetName? row.targetName:'无'}}
+            </el-tag>  
+	        </template>
+        </el-table-column>
 	    </el-table>
 	    <!--<pagination
 	      v-show="tableData.total > 0"

imcs-ui/src/views/zuihou/machiningClient/touchScreen/Index.vue

@@ -209,6 +209,8 @@
               </el-table-column>
               <el-table-column prop="endTime" label="结束时间" width="150" align="center">
               </el-table-column>
+              <el-table-column prop="completeBatchNo" label="零件批次" width="120" align="center">
+              </el-table-column>
               <el-table-column prop="overTime" label="是否超时" width="100" align="center">
 				          <template slot-scope="{ row }">                      
                       {{ row.overTime>0 ? "是" : "否" }}
@@ -553,8 +555,10 @@ export default {
 
       this.queryParams.current = params.current ? params.current : this.queryParams.current
       this.queryParams.size = params.size ? params.size : this.queryParams.size
-      console.log(this.$store.state.account.user.id)
+      
       this.queryParams.model.updateUser = this.$store.state.account.user.id
+      this.queryParams.model.resourceId = this.currentStationId
+      console.log(this.queryParams)
       taskMgrApi.getFinishList(this.queryParams).then(response => {
         const res = response.data
         if (res.isSuccess) {

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

@@ -128,10 +128,10 @@
 	    </el-row>
 
     	<div slot="footer" class="dialog-footer">
-		  <el-button v-show="this.active==1 && this.existed==0" size="medium" type="primary" :disabled="callRobotFlag" @click="callRobot" round>呼叫托盘工装</el-button>	
+		  <el-button v-show="this.active==1 && this.existed==0 && !this.locked" size="medium" type="primary" :disabled="callRobotFlag" @click="callRobot" round>呼叫托盘工装</el-button>	
 		  <el-button plain type="info" @click.native="prev" v-show="this.active>1"  >返回上一步</el-button>
-	      <el-button type="primary" :disabled="confirmDisabled" @click.native="next" v-show="this.active==1 && this.existed==2 && this.matched ">已完成,下一步</el-button>
-		  <el-button type="primary" :disabled="confirmDisabled" @click.native="submitForm"  v-loading.fullscreen.lock="loading" v-show="this.active>1">上料完成</el-button>
+	      <el-button type="primary" :disabled="confirmDisabled" @click.native="next" v-show="this.active==1 && this.existed==2 && this.matched && !this.locked ">已完成,下一步</el-button>
+		  <el-button type="primary" :disabled="confirmDisabled" @click.native="submitForm"  v-loading.fullscreen.lock="loading" v-show="this.active>1 && !this.locked">上料完成</el-button>
 	    </div>
     </div>
   </el-dialog>

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

@@ -79,8 +79,10 @@
 
     	<div slot="footer" class="dialog-footer">
         <el-button v-if="unFeedingCount>0 || (unFeedingCount==0 && unBaitingCount==1)" type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('machining.buttons.finished') }}</el-button>
-	      <el-button v-if="unFeedingCount==0 && unBaitingCount>0" type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button>
-	    </div>
+	      <!--<el-button v-if="unFeedingCount==0 && unBaitingCount>0" type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button>-->
+        <el-button type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button>
+
+      </div>
     </div>
   </el-dialog>
 </template>

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

@@ -281,6 +281,9 @@ export default {
         this.selectionList = selectionList
 		if(condition.zoneId){
 			this.queryParams.model.zoneId = condition.zoneId
+			if(condition.name){
+			   this.queryParams.model.name = condition.name	
+			}			
 		}else{			
 			this.queryParams.model.zoneId = this.lineList[2].id
 			this.queryParams.model.name = condition.name

imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/components/equipmentForm/index.vue

@@ -203,6 +203,9 @@
 	      this.$refs.edit.type = "add"
 	      this.dialog.title = this.$t("prepare.common.selectEq")		  
 		  let params = this.dataObj.type.indexOf("上料")>-1 || this.dataObj.type.indexOf("下料")>-1 ? {name:"上下料站"} : {zoneId: this.condition.zoneId}	  
+		  if(this.dataObj.name.indexOf("清洗")>-1){
+			params['name'] = '清洗'
+		  }		  
 		  this.$refs.edit.setTenant(false, this.tableData, params)
 	      this.dialog.isVisible = true
 	    },

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/dyPriority.vue

@@ -144,9 +144,8 @@ export default {
     close() {
       this.$emit("close");
     },
-    riseUp(item, index){      
-      let preId = this.procedureTable[index-1]["id"]      
-      indexApi.riseUp({'preId': preId, 'currentId': item.id,'orderId':this.tenant.orderId}).then((response) => {
+    riseUp(item){
+      indexApi.riseUp({'sort': item.procedure_sort, 'currentId': item.id,'orderId':this.tenant.orderId}).then((response) => {
           const res = response.data
           if (res.isSuccess) {
             this.getRunningProcedureData()