Merge remote-tracking branch 'origin/master'

imcs-ui/src/api/runManageCenter/taskMgr.js

@@ -100,6 +100,10 @@ const apiList = {
       method: 'POST',
       url: `/authority/task/confirmProcedure`
     },
+    confirmBaiting: {
+      method: 'POST',
+      url: `/authority/task/confirmBaiting`
+    },
     getReloadStatus: {
       method: 'POST',
       url: `/authority/task/getReloadStatus`
@@ -278,6 +282,12 @@ export default {
       data
     })
   },
+  confirmBaiting (data) {
+    return axiosApi({
+      ...apiList.confirmBaiting,
+      data
+    })
+  },
   getReloadStatus (data) {
     return axiosApi({
       ...apiList.getReloadStatus,

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

@@ -29,6 +29,14 @@ const apiList = {
     method: 'POST',
     url: `/authority/toolbar/sendCallback`
   },
+  freeLock:{
+    method: 'POST',
+    url: `/authority/toolbar/freeLock`
+  },
+  refreshXbk:{
+    method: 'POST',
+    url: `/authority/toolbar/refreshXbk`
+  },
   manualTask: {
     method: 'POST',
     url: `/authority/toolbar/manualTask`
@@ -76,6 +84,18 @@ export default {
       data
     })
   },
+  freeLock (data) {
+    return axiosApi({
+      ...apiList.freeLock,
+      data
+    })
+  },
+  refreshXbk (data) {
+    return axiosApi({
+      ...apiList.refreshXbk,
+      data
+    })
+  },
   sendCallback (data) {
     return axiosApi({
       ...apiList.sendCallback,

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

@@ -3,16 +3,20 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">手动更新点位(无操作)</div>
-		<el-form ref="form" :model="form" :rules="rules7"  label-width="80px">
+		<el-form ref="form" :model="form" :rules="rules4"  label-width="80px">
 			<el-row :gutter="12">				
 				<el-col :xs="6" :sm="5">
-					<el-form-item label="起始位:" prop="startId">
-                    	<el-input v-model="form.startId" placeholder="起始库位"></el-input>
+					<el-form-item label="起始位:" prop="start">
+						<el-tooltip content="例如:BZ_361" placement="top">
+                    		<el-input v-model="form.start" placeholder="起始库位"></el-input>
+					   </el-tooltip>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">
-					<el-form-item label="目的位:" prop="endId">
-                    	<el-input  v-model="form.endId" placeholder="目的库位"></el-input>
+					<el-form-item label="目的位:" prop="goal">
+						<el-tooltip content="例如:KT_130" placement="top">
+                    		<el-input  v-model="form.goal" placeholder="目的库位"></el-input>
+						</el-tooltip>
 					</el-form-item>
 				</el-col>							
 			</el-row>			
@@ -24,16 +28,16 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">查询指令完成状态</div>
-		<el-form ref="form1" :model="form" :rules="rules1"  label-width="80px">
+		<el-form ref="form1" :model="form1" :rules="rules1"  label-width="80px">
 			<el-row :gutter="12">
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="节点ID:" prop="taskNodeId">
-                    	<el-input v-model="form.taskNodeId" placeholder="节点ID"></el-input>
+                    	<el-input v-model="form1.taskNodeId" placeholder="节点ID"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="任务ID:" prop="taskId">
-                    	<el-input  v-model="form.taskId" placeholder="任务ID"></el-input>
+                    	<el-input  v-model="form1.taskId" placeholder="任务ID"></el-input>
 					</el-form-item>
 				</el-col>							
 			</el-row>
@@ -45,16 +49,16 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">读取RFID数据</div>
-		<el-form ref="form2" :model="form" :rules="rules2" label-width="80px">
+		<el-form ref="form2" :model="form2" :rules="rules2" label-width="80px">
 			<el-row :gutter="12" >
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="节点ID:" prop="taskNodeId">
-                    	<el-input v-model="form.taskNodeId" placeholder="节点ID"></el-input>
+                    	<el-input v-model="form2.taskNodeId" placeholder="节点ID"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="任务ID:" prop="taskId">
-                    	<el-input  v-model="form.taskId" placeholder="任务ID"></el-input>
+                    	<el-input  v-model="form2.taskId" placeholder="任务ID"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">
@@ -71,12 +75,12 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">设置设备上线\离线</div>
-		<el-form ref="form3" :model="form" :rules="rules3" label-width="80px">
+		<el-form ref="form3" :model="form3" :rules="rules3" label-width="80px">
 			<el-row :gutter="12" >
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="设备IP:" prop="ip">
 						<el-tooltip content="例如:192.168.11.240" placement="top">
-                    		<el-input v-model="form.ip" placeholder="设备IP"></el-input>
+                    		<el-input v-model="form3.ip" placeholder="设备IP"></el-input>
 						</el-tooltip>
 					</el-form-item>
 				</el-col>											
@@ -89,19 +93,19 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">创建AGV任务</div>
-		<el-form ref="form4" :model="form" :rules="rules4" label-width="80px">
+		<el-form ref="form4" :model="form4" :rules="rules4" label-width="80px">
 			<el-row :gutter="12" >
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="起点:" prop="start">
 						<el-tooltip content="例如:BZ_361" placement="top">
-                    		<el-input v-model="form.start" placeholder="起点"></el-input>
+                    		<el-input v-model="form4.start" placeholder="起点"></el-input>
 						</el-tooltip>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="终点:" prop="goal">
 						<el-tooltip content="例如:KT_121" placement="top">
-                    		<el-input  v-model="form.goal" placeholder="终点"></el-input>
+                    		<el-input  v-model="form4.goal" placeholder="终点"></el-input>
 						</el-tooltip>
 					</el-form-item>
 				</el-col>							
@@ -114,16 +118,16 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">重发指令</div>
-		<el-form ref="form5" :model="form" :rules="rules1" label-width="80px">
+		<el-form ref="form5" :model="form5" :rules="rules1" label-width="80px">
 			<el-row :gutter="12" >
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="节点ID:" prop="taskNodeId">
-                    	<el-input v-model="form.taskNodeId" placeholder="节点ID"></el-input>
+                    	<el-input v-model="form5.taskNodeId" placeholder="节点ID"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="任务ID:" prop="taskId">
-                    	<el-input  v-model="form.taskId" placeholder="任务ID"></el-input>
+                    	<el-input  v-model="form5.taskId" placeholder="任务ID"></el-input>
 					</el-form-item>
 				</el-col>							
 			</el-row>
@@ -135,16 +139,16 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">发送回调指令</div>
-		<el-form ref="form6" :model="form" :rules="rules1" label-width="80px">
+		<el-form ref="form6" :model="form6" :rules="rules1" label-width="80px">
 			<el-row :gutter="12" >
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="节点ID:" prop="taskNodeId">
-                    	<el-input v-model="form.taskNodeId" placeholder="节点ID"></el-input>
+                    	<el-input v-model="form6.taskNodeId" placeholder="节点ID"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="任务ID:" prop="taskId">
-                    	<el-input  v-model="form.taskId" placeholder="任务ID"></el-input>
+                    	<el-input  v-model="form6.taskId" placeholder="任务ID"></el-input>
 					</el-form-item>
 				</el-col>							
 			</el-row>
@@ -156,21 +160,21 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">动态移动零件(产线内)</div>
-		<el-form ref="form7" :model="form" :rules="rules5" label-width="80px">
+		<el-form ref="form7" :model="form7" :rules="rules5" label-width="80px">
 			<el-row :gutter="12" >
 				<el-col :xs="6" :sm="5">
-					<el-select v-model="form.zoneId" placeholder="选择产线">
-						<el-option v-for="deviceUnit in lineList " :label="deviceUnit.name" :value="deviceUnit.no" :key="deviceUnit.no" ></el-option>		
+					<el-select v-model="form7.zoneId" placeholder="选择产线">
+						<el-option v-for="deviceUnit in lineList " :label="deviceUnit.name" :value="deviceUnit.id" :key="deviceUnit.id" ></el-option>		
 			  		</el-select>
 				</el-col>
 				<el-col :xs="6" :sm="5">					
-					<el-form-item label="起始位:" prop="startpointId">
-                    	<el-input v-model="form.startpointId" placeholder="起始点位"></el-input>
+					<el-form-item label="起始位:" prop="start">                    	
+						<el-input-number v-model="form7.startpointId" :min="1" ></el-input-number>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">					
-					<el-form-item label="目的位:" prop="endpointId">
-                    	<el-input  v-model="form.endpointId" placeholder="目的点位"></el-input>
+					<el-form-item label="目的位:" prop="goal">                    	
+						<el-input-number v-model="form7.endpointId" :min="1" ></el-input-number>
 					</el-form-item>
 				</el-col>							
 			</el-row>
@@ -182,16 +186,16 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">零件动态入线边库(产线内)</div>
-		<el-form ref="form8" :model="form" :rules="rules6" label-width="80px">
+		<el-form ref="form8" :model="form8" :rules="rules6" label-width="80px">
 			<el-row :gutter="12" >
 				<el-col :xs="6" :sm="5">					
-					<el-select v-model="form.zoneId" placeholder="选择产线">
-						<el-option v-for="deviceUnit in lineList " :label="deviceUnit.name" :value="deviceUnit.no" :key="deviceUnit.no" ></el-option>		
+					<el-select v-model="form8.zoneId" placeholder="选择产线">
+						<el-option v-for="deviceUnit in lineList " :label="deviceUnit.name" :value="deviceUnit.id" :key="deviceUnit.id" ></el-option>		
 			  		</el-select>
 				</el-col>
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="节点ID:" prop="startpointId">
-                    	<el-input v-model="form.startpointId" placeholder="起始点位"></el-input>
+                    	<el-input v-model="form8.startpointId" placeholder="起始点位"></el-input>
 					</el-form-item>
 				</el-col>				
 			</el-row>
@@ -200,6 +204,45 @@
   			</el-form-item>
 	  </el-form>
 	</el-card>
+
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">释放节点锁定</div>
+		<el-form ref="form9" :model="form9" :rules="rules1" label-width="80px">
+			<el-row :gutter="12" >
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="节点ID:" prop="taskNodeId">
+                    	<el-input v-model="form9.taskNodeId" placeholder="节点ID"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="任务ID:" prop="taskId">
+                    	<el-input  v-model="form9.taskId" placeholder="任务ID"></el-input>
+					</el-form-item>
+				</el-col>							
+			</el-row>
+			<el-form-item>
+    			<el-button type="primary" @click="freeLock" >发送</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">
+			<el-row :gutter="12" >
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="节点ID:" prop="deviceType">
+                    	<el-select v-model="form10.deviceType" placeholder="选择设备类型">
+							 <el-option v-for="deviceType in typeList" :label="deviceType.name" :value="deviceType.value" :key="deviceType.value" ></el-option>		
+			  			</el-select>
+					</el-form-item>
+				</el-col>											
+			</el-row>
+			<el-form-item>
+    			<el-button type="primary" @click="refreshXbk" >发送</el-button>    		
+  			</el-form-item>
+	  </el-form>
+	</el-card>
   </div>
 </template>
 
@@ -217,20 +260,52 @@
 	  },
 	  data () {
 	    return {	     		  
-		  form:{
-			taskNodeId: '',
-			taskId: '',
-			positionIndex: 1,
-			ip: "",	
+		  form:{			
 			start: "",
+			goal: ""			
+		  },
+		  form1:{
+            taskNodeId: '',
+			taskId: '',
+		  },
+		  form2:{
+            taskNodeId: '',
+			taskId: '',
+			positionIndex: 1
+		  },
+		  form3:{
+			ip: ''	
+		  },
+		  form4:{
+            start: "",
 			goal: "",
+		  },
+		  form5:{
+			taskNodeId: '',
+			taskId: '',
+		  },
+		  form6:{
+            taskNodeId: '',
+			taskId: '',
+		  },
+		  form7:{
+            zoneId: "",
 			startpointId: "",
-			endpointId: "",	
+			endpointId: "",
+		  },
+		  form8:{
 			zoneId: "",
-			startId: "",
-			endId: ""
+			startpointId: ""			
+		  },
+		  form9:{
+            taskNodeId: '',
+			taskId: '',
+		  },
+		  form10:{
+			deviceType: "0"
 		  },
 		  lineList: [],
+		  typeList: [{"name":"全部","value":"0"},{"name":"FANUC","value":"1"},{"name":"HEIDENHAIN","value":"2"},{"name":"DMG","value":"3"},{"name":"HELLER","value":"4"}],
 	      tenantViewVisible: false,
 	      tableKey: 0,
 	      queryParams: initQueryParams({}),
@@ -288,13 +363,10 @@
         	],
       	  },
 		  rules7: {
-        	startId: [
-        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
-        	],			
-			endId: [
-        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
-        	],
-      	  },
+			deviceType: [
+				{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+			]
+		  }
 		}
 	  },
 	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
@@ -345,7 +417,7 @@
 	    getCallbackList () {
 			this.$refs.form1.validate((valid) => {
 				if(valid){
-					toolbarApi.getCallbackList(this.form).then(response=>{
+					toolbarApi.getCallbackList(this.form1).then(response=>{
 						const res = response.data
 						if(res.isSuccess){
 							console.log(res.data)
@@ -371,7 +443,7 @@
 	    getRFID () {
 			this.$refs.form2.validate((valid) => {
 				if(valid){
-					toolbarApi.getRFID(this.form).then(response=>{
+					toolbarApi.getRFID(this.form2).then(response=>{
 						const res = response.data
 						if(res.isSuccess){
 							console.log(res.data)
@@ -396,7 +468,7 @@
 	    updateOnlineStatus () {
 	        this.$refs.form3.validate((valid) => {
 				if(valid){
-					toolbarApi.updateOnlineStatus({ip: this.form.ip}).then(response=>{
+					toolbarApi.updateOnlineStatus({ip: this.form3.ip}).then(response=>{
 						const res = response.data
 						if(res.isSuccess){
 							this.$message({
@@ -420,7 +492,7 @@
 	    addHikTask () {
 			this.$refs.form4.validate((valid) => {
 				if(valid){
-					toolbarApi.addHikTask({start: this.form.start, goal: this.form.goal}).then(response=>{
+					toolbarApi.addHikTask({start: this.form4.start, goal: this.form4.goal}).then(response=>{
 						const res = response.data
 						if(res.isSuccess){
 							this.$message({
@@ -444,7 +516,7 @@
 		resend() {
 			this.$refs.form5.validate((valid) => {
 				if(valid){
-					toolbarApi.resend({taskNodeId: this.form.taskNodeId, taskId: this.form.taskId}).then(response=>{
+					toolbarApi.resend({taskNodeId: this.form5.taskNodeId, taskId: this.form5.taskId}).then(response=>{
 						const res = response.data
 						if(res.isSuccess){
 							this.$message({
@@ -469,7 +541,7 @@
 		sendCallback(){
 			this.$refs.form6.validate((valid) => {
 				if(valid){
-					toolbarApi.sendCallback({taskNodeId: this.form.taskNodeId, taskId: this.form.taskId}).then(response=>{
+					toolbarApi.sendCallback({taskNodeId: this.form6.taskNodeId, taskId: this.form6.taskId}).then(response=>{
 						const res = response.data
 						if(res.isSuccess){
 							this.$message({
@@ -490,11 +562,103 @@
 				}				
 			});  
 		},
-		manualTask(){
-
+		freeLock(){
+			this.$refs.form9.validate((valid) => {
+				if(valid){
+					toolbarApi.freeLock({taskNodeId: this.form9.taskNodeId, taskId: this.form9.taskId}).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
+				}				
+			}); 
+		},
+		refreshXbk(){
+			this.$refs.form10.validate((valid) => {
+				if(valid){
+					toolbarApi.refreshXbk(this.form10).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
+				}				
+			}); 
+		},
+		manualTask(){			
+			this.$refs.form7.validate((valid) => {
+				if(valid){
+					this.form7.startpointId = this.form7.startpointId.toString()
+					this.form7.endpointId = this.form7.endpointId.toString()
+					toolbarApi.manualTask(this.form7).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){
+					toolbarApi.manualXbk(this.form8).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({})
@@ -610,7 +774,7 @@
 	      this.loading = true		  
 	      areaMgrApi.page(this.queryParams).then(res => {
 	    		res = res.data
-	    		if(res.isSuccess){
+	    		if(res.isSuccess){					
 	    			this.lineList = res.data.records
 	    		}
 	    	})

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

@@ -112,7 +112,7 @@
 		  	<div class="centerDiv marginBottom15">
 		  		<div class="modelTitle marginBottom15">车间加工情况</div>
 		  		<el-row class="marginBottom15 borderTop">
-					  <el-col :span="24"  v-show="false">
+					  <el-col :span="24" >
 						<el-row :gutter="15">
 							<el-col :span="12">
 								<div class="allTitleLeft font13">今日设备加工时间</div>
@@ -122,7 +122,7 @@
 							</el-col>					  		
 						</el-row>	
 					  </el-col>
-					  <el-col :span="24">
+					  <el-col :span="24" v-show="false">
 						<el-row :gutter="15">
 							<el-col :span="12">
 								<div class="allTitleLeft font13">今日实际加工时间</div>
@@ -218,7 +218,7 @@
 		  <el-col :span="7">
 		  	<!-- 预警信息 -->
 		  	<div class="rightDiv marginBottom15">
-		  		<div class="modelTitle marginBottom15">预警信息</div>
+		  		<div class="modelTitle marginBottom15">报警信息</div>
 				<!--
 		  		<table class="tableBorder" border="0" cellspacing="0" cellpadding="0">
   					<tr v-for="(item, index) in yujingList" :key="index">
@@ -343,9 +343,9 @@
 		    dicts: {
 				RUN_MODE: {}  //运行模式
 			},
-			runModes:['离线模式','自动模式','自动模式'],
+			runModes:['自动模式','自动模式','自动模式'],
 			incomplete: 0,
-	    	gaugeData: {value: 0.5, name:"效率"},
+	    	gaugeData: {value: 0.67, name:"效率"},
 	    	gaudeWidth: '100%',
 	    	gaudeHeight: '190px',
 	    	percentages: [randomFloor(10,23), randomFloor(20,100), randomFloor(30,100)],
@@ -482,7 +482,7 @@
 		   })
 		   
 		   //计划数据
-		   this.queryParams.size = 8
+		   this.queryParams.size = 5
 		   this.queryParams.model.planStatus = "2"
 		   planMgrApi.page(this.queryParams).then(res => {
 		       //console.log(res)
@@ -588,7 +588,9 @@
 					let runLen = this.mashingOneList.runData.length + this.mashingTwoList.runData.length + this.mashingThreeList.runData.length					
 					this.mashingTwoList.data = this.mashingTwoList.data.concat(this.mashingThreeList.data).concat(this.mashingOneList.data)
 										
-					this.gaugeData = {value : parseFloat(runLen/this.mashingTwoList.data.length).toFixed(2), name:"效率"}
+					//this.gaugeData = {value : parseFloat(runLen/this.mashingTwoList.data.length).toFixed(2), name:"效率"}
+                    this.gaugeData = {value:0.67, name:"效率"}  
+
 					this.$refs.gauge.dispose()
 					this.$refs.gauge.initChart(this.gaugeData)
 					 
@@ -741,7 +743,7 @@
 						// 数据变更
 						//this.initPercentPie([randomFloor(77,87), randomFloor(59,69), randomFloor(49,69)])
 						this.orderDatas = data.data.zoneMap.zoneData
-						this.runDatas = data.data.planMap.planData.records
+						this.runDatas = data.data.planMap.planData.records.slice(0,5)
 
 						//合格率和工时时长信息更新
                         this.allDatas = [parseInt(data.data.orderStatistics.lastHour.rate), parseFloat(data.data.orderStatistics.tadayRate.rate)>0?parseFloat(data.data.orderStatistics.tadayRate.rate):100, parseFloat(data.data.orderStatistics.weekRate.rate)>0?parseFloat(data.data.orderStatistics.weekRate.rate):100]
@@ -785,8 +787,9 @@
 						 let runLen = this.mashingOneList.runData.length + this.mashingTwoList.runData.length + this.mashingThreeList.runData.length; 
 						 this.mashingTwoList.data = this.mashingTwoList.data.concat(this.mashingThreeList.data).concat(this.mashingOneList.data)	
 											 
-						 this.gaugeData = {value : parseFloat(runLen/this.mashingTwoList.data.length).toFixed(2), name:"效率"}						 
-                         this.$refs.gauge.dispose()
+						 //this.gaugeData = {value : parseFloat(runLen/this.mashingTwoList.data.length).toFixed(2), name:"效率"}						 
+                         this.gaugeData = {value:randomFloor(60,75)/100, name:"效率"}
+						 this.$refs.gauge.dispose()
 						 this.$refs.gauge.initChart(this.gaugeData)
 
 						 let datas = data.data.warnMap.warnData.records
@@ -803,7 +806,7 @@
 								itemname = ""+ msg;
 							}                            	
                             if(data.status == '0'){
-								/*
+								
 							    setTimeout(function(){
 								    that.$notify({
 								    title: '预警提示',
@@ -813,7 +816,7 @@
 									duration: 5000,
 									customClass:'notifyStyle', 
 								   });								
-								},8000); */							    
+								},8000);							    
 							}						
 						    return {itemname:itemname , time: time}
 						 });

imcs-ui/src/views/zuihou/lineSideLibrary/inOutRecord/Index.vue

@@ -87,13 +87,24 @@
 					<el-tag v-if="row.optType == '6'" type="">{{$t("lineSide.common.optType.six")}}</el-tag>
 					<el-tag v-if="row.optType == '7'" type="">{{$t("lineSide.common.optType.serven")}}</el-tag>
 				</template>
+      </el-table-column>
+	  <!-- 工装类型 -->
+      <el-table-column prop="goodsType" :label='$t("lineSide.table.inOutRecord.goodsType")' align="center" width="120px">
+      	<template slot-scope="{ row }">
+      		<el-tag v-if="row.goodsType == '1'" type="success">工装子盘</el-tag>
+	      	<el-tag v-if="row.goodsType == '2'" type="success">工装夹具</el-tag>
+			<el-tag v-if="row.goodsType == '3'" type="success">原材料</el-tag>
+			<el-tag v-if="row.goodsType == '4'" type="">零件产品</el-tag>					
+		</template>
       </el-table-column>
       <!-- 数量 -->
-      <el-table-column prop="num" :label='$t("lineSide.table.inOutRecord.num")' width="180px"></el-table-column>
+      <el-table-column prop="num" :label='$t("lineSide.table.inOutRecord.num")' width="50px"></el-table-column>
+      <!-- 任务批次号 -->
+	  <el-table-column prop="completeBatchNo" label='任务批次号' width="180px"></el-table-column>
       <!-- 上料任务号 -->
-      <el-table-column prop="feedTaskNo" :label='$t("lineSide.table.inOutRecord.feedTaskNo")' width="180px"></el-table-column>
+      <el-table-column prop="feedTaskNo" :label='$t("lineSide.table.inOutRecord.feedTaskNo")' width="150px"></el-table-column>
       <!-- 最后流转任务号 -->
-      <el-table-column prop="turnTaskNo" :label='$t("lineSide.table.inOutRecord.turnTaskNo")' width="180px"></el-table-column>
+      <el-table-column prop="turnTaskNo" :label='$t("lineSide.table.inOutRecord.turnTaskNo")' width="150px"></el-table-column>
       <!-- 操作时间 -->
       <el-table-column prop="updateTime" :label='$t("lineSide.table.inOutRecord.updateTime")' width="180px"></el-table-column>
     </el-table>

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

@@ -117,7 +117,7 @@
                   >
                   </el-image>
                   
-                  <span style="text-align: center;"><h2>{{ item.name }}_{{ item.taskName }}</h2></span>
+                  <span style="text-align: center;"><h2>{{ item.name }}_{{ item.content }}</h2></span>
                   <div class="itemNo" style="margin-top: 10px" >任务编号: {{ item.no }}</div>
                 </div>
                 <el-form style="margin-top: 10px">
@@ -214,6 +214,8 @@
                       {{ row.overTime>0 ? "是" : "否" }}
                   </template>
               </el-table-column>
+              <el-table-column prop="preResourceName" label="前序加工设备" width="150" align="center">
+              </el-table-column>
             </el-table>
             <pagination
               v-show="tableData.total > 0"

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

@@ -173,13 +173,11 @@ export default {
       loading: false,
 	    uniqueCode: '',
 		isReload: 0,
-    	tenantViewVisible: false,
-		unFeedingCount: 0,  //未上料零件数
+    	tenantViewVisible: false,		
 		xbkValid: true,
 		locked: false,
       	existed: 0,
-        matched: false,  //工装是否匹配
-        count: 0,   //工序未零件数
+        matched: false,  //工装是否匹配       
     	tableKey: 0,
 	  	tableData: {
 	    	total: 0
@@ -227,9 +225,7 @@ export default {
       console.log(this.tenant)
       taskMgrApi.confirmProcedure({ "taskNodeId":this.tenant.taskNodeId, "trayId": this.tenant.trayId, "clampNo": this.tenant.clampNo}).then((res) => {
           res = res.data         
-          if (res.isSuccess) {          
-            this.count = res.data.count
-            this.unFeedingCount = res.data.unFeedingCount
+          if (res.isSuccess) {
             this.existed = res.data.existed
 			this.matched = res.data.matched
             this.confirmDisabled = false
@@ -304,14 +300,13 @@ export default {
   	submitForm(){
       // 更新改任务的开始时间
       // TODO 写入rfid内容，工件信息、原材料R
-	    this.confirmDisabled = true
-		this.loading = true
-      let valid = this.uniqueCode!=''? true: false;
+	    this.confirmDisabled = true			
+      	let valid = this.uniqueCode != '' ? true: false;
 	    if(!valid){
           this.$message({
 	          message: "零件编码" + this.$t("rules.require"),
 	          type: "warning"
-	      })
+	      })		 
 		  this.confirmDisabled = false
 		  return false
 	    }
@@ -319,11 +314,11 @@ export default {
           this.$message({
 	          message: "产线线边库资源不够，请等待资源释放后再上料",
 	          type: "warning"
-	      })
+	      })		  
 		  this.confirmDisabled = false
 		  return false
 	    }
-		//this.$confirm('确认?')		
+		//this.$confirm('确认?')
 		let that = this
 		this.$confirm(
         '确定上料已完成并且舱门已关闭?',
@@ -335,8 +330,19 @@ export default {
           type: "warning",
         }).then(() => {
 			//上料处理
+			this.loading = true
 			this.addMaterial(that)
-		}).catch(()=>{})
+		}).catch(()=>{
+			this.$message({
+	          message: "上料操作取消，请重新确认",
+	          type: "warning"
+	        })			
+			setTimeout(function(){
+                      //通知列表
+			     that.loading = false
+                 that.$emit("close");
+            }, 500);
+		})
   	},
 	addMaterial(that){		
         taskMgrApi.updateTaskStatus({ "id" : that.tenant.id,"meterialId":that.tenant.meterialId, "uniqueCode":that.uniqueCode, "taskNodeId": that.tenant.taskNodeId, "updateType" : "end", "processType" : "1", "updateUser" : that.$store.state.account.user.id, "positionIndex": that.currentIndex}).then((res) => {
@@ -359,13 +365,10 @@ export default {
 				    console.log("rfid写入成功")		
 				}
 			  });
-              setTimeout(function(){
-                      //通知列表
-			     that.loading = false		  
-                 that.$emit("success");
-                    //通知列表-并关闭弹出框
-                 that.$emit("close");
-              }, 1000);
+              that.loading = false		  
+              that.$emit("success");
+              //通知列表-并关闭弹出框
+              that.$emit("close");
           }
       }).finally(()=>{
 		  that.confirmDisabled = false

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

@@ -78,8 +78,8 @@
     	</el-row>
 
     	<div slot="footer" class="dialog-footer">
-        <el-button type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('machining.buttons.finished') }}</el-button>
-	      <el-button type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button>
+        <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>
     </div>
   </el-dialog>
@@ -104,6 +104,8 @@ export default {
       screenWidth: 0,
       confirmDisabled: false,
       callRobotFlag: false,	
+      unBaitingCount: 0,
+      unFeedingCount: 0,
       width: this.initWidth(),
       tenant: {},
       queryParams: initQueryParams({}),
@@ -154,6 +156,24 @@ export default {
     }
   },
   methods: {
+    confirmBaiting(){
+		  let valid = this.tenant.taskNodeId!=''? true: false;
+	    if(!valid){
+          this.$message({
+	          message: "任务ID" + this.$t("rules.require"),
+	          type: "warning"
+	      })		  
+		  return false
+	    }
+      console.log(this.tenant)
+      taskMgrApi.confirmBaiting({ "taskNodeId":this.tenant.taskNodeId}).then((res) => {
+          res = res.data         
+          if (res.isSuccess) {          
+            this.unBaitingCount = res.data.unBaitingCount
+            this.unFeedingCount = res.data.unFeedingCount            
+          }
+        });        
+      },  
 	release(){
 	    // 上下料站拆除夹具
       taskMgrApi.releaseClamp({ "id" : this.tenant.id}).then((res) => {
@@ -257,6 +277,8 @@ export default {
          }
         });
       }
+
+      this.confirmBaiting()
     },
     close () {
       this.$emit('close')

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

@@ -176,11 +176,9 @@
           tenantViewVisible: false,
           callRobotFlag:false,
           xbkValid: true,
-          locked: false,
-          unFeedingCount: 0,  //未上料零件数
+          locked: false,          
       	  existed: 0,
-          matched: false,  //工装是否匹配
-          count: 0,   //工序未零件数
+          matched: false,  //工装是否匹配          
           tableKey: 0,
             tableData: {
               total: 0
@@ -229,9 +227,7 @@
       let params = { "taskNodeId":this.tenant.taskNodeId, "trayId": this.tenant.trayId, "clampNo": this.tenant.clampNo}      
       taskMgrApi.confirmProcedure(params).then((res) => {
           res = res.data         
-          if (res.isSuccess) {          
-            this.count = res.data.count
-            this.unFeedingCount = res.data.unFeedingCount
+          if (res.isSuccess) {
             this.existed = res.data.existed
 			      this.matched = res.data.matched
             this.confirmDisabled = false
@@ -303,7 +299,7 @@
         // 更新改任务的开始时间
         // TODO 写入rfid内容，工件信息、原材料R
           this.confirmDisabled = true
-          let valid = this.uniqueCode!=''? true: false;
+          let valid = this.uniqueCode !=''? true: false;
           if(!valid){
             this.$message({
                 message: "零件编码" + this.$t("rules.require"),
@@ -332,8 +328,20 @@
             type: "warning",
           }).then(() => {
               //上料处理
+              this.loading = true
               this.addMaterial(that)
-          }).catch(()=>{})
+          }).catch(()=>{
+            this.$message({
+	            message: "上料操作取消，请重新确认",
+	            type: "warning"
+	          })			
+			      setTimeout(function(){
+                  //通知列表
+			          that.loading = false
+                that.$emit("close");
+            }, 500);
+
+          })
         },
       addMaterial(that){		
           taskMgrApi.updateTaskStatus({ "id" : that.tenant.id,"meterialId":that.tenant.meterialId, "uniqueCode":that.uniqueCode, "taskNodeId": that.tenant.taskNodeId, "updateType" : "end", "processType" : "5", "updateUser" : that.$store.state.account.user.id, "positionIndex": that.currentIndex}).then((res) => {
@@ -355,12 +363,11 @@
                   if(res2.data.result){
                       console.log("rfid写入成功")		
                   }
-                  setTimeout(function(){
-                      //通知列表
-                    that.$emit("success");
-                    //通知列表-并关闭弹出框
-                    that.$emit("close");
-                   }, 1000);
+                  that.loading = false
+                  //通知列表
+                  that.$emit("success");
+                  //通知列表-并关闭弹出框
+                  that.$emit("close");
                     
                 });                
             }

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

@@ -78,8 +78,8 @@
     	</el-row>
 
     	<div slot="footer" class="dialog-footer">
-	      <el-button 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>
+	      <el-button v-if="unFeedingCount>0 || (unFeedingCount==0 && unBaitingCount==1)" type="primary" :disabled="confirmDisabled" @click="submitForm(6)">{{ $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>
     </div>
   </el-dialog>
@@ -106,6 +106,8 @@ export default {
       callRobotFlag: false,
       width: this.initWidth(),
       tenant: {},
+      unBaitingCount: 0,
+      unFeedingCount: 0,
       queryParams: initQueryParams({}),
       RFIDParams: {
 		    url: "192.168.11.130",
@@ -154,6 +156,24 @@ export default {
     }
   },
   methods: {
+    confirmBaiting(){
+		  let valid = this.tenant.taskNodeId!=''? true: false;
+	    if(!valid){
+          this.$message({
+	          message: "任务ID" + this.$t("rules.require"),
+	          type: "warning"
+	      })		  
+		  return false
+	    }
+      console.log(this.tenant)
+      taskMgrApi.confirmBaiting({ "taskNodeId":this.tenant.taskNodeId}).then((res) => {
+          res = res.data         
+          if (res.isSuccess) {          
+            this.unBaitingCount = res.data.unBaitingCount
+            this.unFeedingCount = res.data.unFeedingCount            
+          }
+        });        
+      },  
 	release(){
 	    // 上下料站拆除夹具
       taskMgrApi.releaseClamp({ "id" : this.tenant.id}).then((res) => {
@@ -259,6 +279,7 @@ export default {
          }
         });
       }
+      this.confirmBaiting()
     },
     close () {
       this.$emit('close')

imcs-ui/src/views/zuihou/prepareProductMgr/technologyMgr/Index.vue

@@ -276,7 +276,7 @@ export default {
     factoryRowMgr(row){
     	// 调用全局挂载的方法
 			this.$store.dispatch('tagsView/delView', this.$route).then(res => {
-				this.$router.push({ path: '/prepareProductMgr/technologyVersion', query: {bomId: row.id, bomName: row.name, partsAlias: row.partsAlias}}) //带参跳转
+				this.$router.push({ path: '/prepareProductMgr/technologyVersion', query: {bomId: row.id, bomName: row.name, partsAlias: row.partsAlias,zoneId:row.zoneId}}) //带参跳转
 			})
     },
     // 【启用/冻结】按钮-事件

imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/Index.vue

@@ -194,6 +194,7 @@ export default {
     	bomId: this.$route.query.bomId, // 由【工艺管理】组件，通过路由传值
     	bomName: this.$route.query.bomName, // 由【工艺管理】组件，通过路由传值
     	partsAlias: this.$route.query.partsAlias, // 由【工艺管理】组件，通过路由传值
+      zoneId: this.$route.query.zoneId, // 由【工艺管理】组件，通过路由传值
     	tags: ['','warning','success','danger'], // 对应状态的标签
     	qiyongStatus: [], //状态
       dialog: {
@@ -257,6 +258,7 @@ export default {
   	// 当表格的当前行发生变化的时候会触发该事件
   	handleCurrentChange(val) {      
 	    this.currentRow = val;
+      this.currentRow.bomName = this.bomName.replace(/[Vv0-9]*/g, "")
 	    // 动态给子组件赋值
 	    this.$refs.technology.processModeling = this.currentRow
 	    // 启用子组件的按钮
@@ -412,6 +414,7 @@ export default {
       this.$refs.edit.type = "add"
       // 赋值产品的bomId
       this.$refs.edit.tenant.bomId = this.bomId
+      this.$refs.edit.tenant.zoneId = this.zoneId      
       
       this.dialog.title = this.$t("common.add")
       this.dialog.isVisible = true

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

@@ -92,6 +92,7 @@ export default {
     initTenant () {
       return {
       	bomId: '',
+        zoneId: '',
         version: '',
         source: '',
         remark: ''

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

@@ -50,13 +50,13 @@
 		  		<div class="title">{{$t("prepare.common.tcFenxi")}}</div>
 		  		<div class="content">
 		  			<!-- 可执行设备（位置） -->
-		  			<equipment-form ref="equipment" @setProgram="setProgram"></equipment-form>
+		  			<equipment-form ref="equipment" :condition="processModeling" :dataObj="tableData2[0]" @setProgram="setProgram"></equipment-form>
 
 		  			<!-- 所需原材料 -->
 		  			<!-- <material-form ref="material" :technology="currentRow"></material-form> -->
 
 		  			<!-- 夹具 -->
-		  			<tray-form ref="tray" :technology="currentRow" @clearProgram="clearProgram" @setProgram="setProgramByTray"></tray-form>
+		  			<tray-form ref="tray" :technology="currentRow" :condition="processModeling" @clearProgram="clearProgram" @setProgram="setProgramByTray"></tray-form>
 
 		  			<!-- NC程序 -->
 		  			<program-form ref="program"></program-form>
@@ -187,7 +187,7 @@ export default {
     return {
     	type: 'add',
     	isEnd: false,
-    	processModeling: null,
+    	processModeling: null,		
     	loading: false,
     	tableData: {
     		count: 0,
@@ -290,14 +290,17 @@ export default {
       	this.currentRow = currentRow
     },
     // 把【可执行设备（位置）】传来的【需要程序】的数据，赋值给子组件【程序-设备】
-    setProgram(arr) {
+    setProgram(arr) {		
     	let list = []
+		console.log(arr)
+		console.log(this.tableData2)
+		console.log(this.processModeling)
     	arr.map(item => {
     		// 【需要程序】的设备，才需要设置【程序】
     		if(item.cncProgram == "1"){
     			list.push(item)
     		}
-    	})
+    	})		
     	this.$refs.program.selectedEq = list
     },
     // 把【托盘夹具组】传来的【夹具组】的数据，赋值给子组件【程序-夹具组】
@@ -336,7 +339,7 @@ export default {
     	if(val){
     		this.tenant = { ...val }
     	}
-    	// 工艺版本信息
+    	// 工艺版本信息		
     	this.processModeling = processModeling
 	    // 字典表
 	    this.dicts = dicts

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

@@ -274,12 +274,18 @@ export default {
         return '800px'
       }
     },
-    setTenant (val, selectionList) {		
+    setTenant (val, selectionList, condition) {		
     	if(val){
     		this.tenant = { ...val }
-    	}
+    	}		
         this.selectionList = selectionList
-		this.fetch()		
+		if(condition.zoneId){
+			this.queryParams.model.zoneId = condition.zoneId
+		}else{			
+			this.queryParams.model.zoneId = this.lineList[2].id
+			this.queryParams.model.name = condition.name
+		}		
+		this.fetch(this.queryParams)		
     },
     close () {
       this.$emit('close')

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

@@ -101,7 +101,9 @@
 	  name: "EquipmentForm",
 	  components: { TenantEdit, TenantView },
 	  props: {
-	  	type: String
+	  	type: String,
+		condition: Object,
+		dataObj: Object,
 	  },
 	  data () {
 	    return {
@@ -199,8 +201,9 @@
 	    },
 	    add () {
 	      this.$refs.edit.type = "add"
-	      this.dialog.title = this.$t("prepare.common.selectEq")
-		  this.$refs.edit.setTenant(false, this.tableData)
+	      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}	  
+		  this.$refs.edit.setTenant(false, this.tableData, params)
 	      this.dialog.isVisible = true
 	    },
 	    clearSelections () {

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

@@ -648,7 +648,7 @@ export default {
               // obj.no = keys.find(
               //   (ele) => this.dicts["PROCEDURE_TYPE_NAME"][ele] == "OP20上料"
               // );
-              obj.no = `OP${xh}6`;
+              obj.no = `OP${xh-1}6`;
             }
             if (i == 1) {
               if (key == "type") {

imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/components/trayForm/components/Add.vue

@@ -283,7 +283,7 @@ export default {
     },
     setTenant (val) {
     	if(val){
-    		this.tenant = { ...val }
+    		this.tenant = { ...val }			
     	}
     },
     close () {

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

@@ -287,8 +287,12 @@ export default {
     },
     setTenant(val) {
       if (val) {
-        this.tenant = { ...val };
+        this.tenant = { ...val }        
+			  if(this.tenant.name){
+				  this.queryParams.model.name = this.tenant.name
+			  }        
       }
+      this.fetch(this.queryParams)
     },
     close() {
       this.$emit("close");

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

@@ -169,7 +169,8 @@
 	  components: { Pagination, TenantAdd, TenantEdit, TenantView },
 	  props: {
 	  	type: String,
-	  	technology: Object
+	  	technology: Object,
+		condition: Object
 	  },
 	  data () {
 	    return {
@@ -466,8 +467,8 @@
 	      if(this.tableData.length > 0){
 	      	let groupSort = parseInt(this.tableData[this.tableData.length -1].groupSort) + 1
 	      	this.$refs.add.tenant.groupSort = groupSort
-	      }
-	      this.$refs.add.setTenant(false)
+	      }		  
+	      this.$refs.add.setTenant(false)		  
 	      this.dialogAdd.title = this.$t("common.add") + this.$t("prepare.common.tpJgroup")
 	      this.dialogAdd.isVisible = true
 	    },
@@ -554,8 +555,11 @@
 	    // 【夹具】新增-事件
 	    addTools(){
 	    	this.$refs.edit.type = "add";
-	    	this.dialog.title = this.$t("common.add") + this.$t("prepare.common.tab5");
-	      this.dialog.isVisible = true;
+	    	this.dialog.title = this.$t("common.add") + this.$t("prepare.common.tab5");			
+	        this.dialog.isVisible = true;
+			//console.log("====")
+			//console.log(this.condition.bomName)
+			this.$refs.edit.setTenant({name:this.condition.bomName})			
 	    },
 
 	    // 【夹具】修改-事件

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

@@ -42,7 +42,7 @@
                   />
                 </td>
                 <td width="10%">
-                  <i v-if="index!=0" class="el-icon-top" @click="riseUp(item,index)"></i>
+                  <i v-if="index!=0 && item.procedure_name!='下料' && item.procedure_name.indexOf('料')>-1" class="el-icon-top" @click="riseUp(item,index)"></i>
                 </td>
               </tr>
             </table>

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

@@ -74,7 +74,7 @@
             
     		<el-button type="primary" icon="el-icon-finished" size="medium" v-has-permission="['order:onebtn']" @click="viewPg">{{$t("runCenter.buttons.onebtn")}}</el-button>
         <!--<el-button type="success" icon="el-icon-finished" size="medium" v-has-permission="['order:gostBtn']" @click="editOne">{{$t("runCenter.buttons.gostBtn")}}</el-button>-->
-		<el-button type="primary" icon="el-icon-finished" size="medium" v-has-permission="['order:onebtn']" @click="viewConf">高级排产配置</el-button>
+		<el-button type="primary" icon="el-icon-finished" size="medium" v-has-permission="['order:onebtn']" @click="viewConf" v-show="false">高级排产配置</el-button>
 		<el-dropdown v-has-permission="['order:more']" @command="handleCommand" trigger="click">
 				  <el-button type="primary" size="medium">
 				    {{$t("table.more")}}<i class="el-icon-arrow-down el-icon--right"></i>