fix: 优化界面功能

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

@@ -27,20 +27,21 @@
             <el-table-column prop="exeStatus" label='执行状态' width="80px">
               <template slot-scope="{ row }">
                 <el-tag v-if="row.exeStatus == '1'" type="info">待执行</el-tag>
-                <el-tag v-if="row.exeStatus == '2'" type="success">执行中</el-tag>
-                <el-tag v-else >已完成</el-tag>
+                <el-tag v-if="row.exeStatus == '2'" type="primary">执行中</el-tag>
+                <el-tag v-else type="success">已完成</el-tag>
               </template>
             </el-table-column>
             <el-table-column prop="sendStatus" label='是否下发' width="80px">
               <template slot-scope="{ row }">
-                <el-tag v-if="row.sendStatus == '1'">已下发</el-tag>
                 <el-tag v-if="row.sendStatus == '0'" type="info">未下发</el-tag>
+                <el-tag v-if="row.sendStatus == '1'"  type="primary">已下发</el-tag>
+                <el-tag v-if="row.sendStatus == '2'" type="success">已返回</el-tag>
               </template>
             </el-table-column>
             <el-table-column prop="exeResult" label='执行结果' width="80px">
               <template slot-scope="{ row }">
-                <el-tag v-if="row.exeResult == '1'" >成功</el-tag>
-                <el-tag v-if="row.exeResult == '0'" >失败</el-tag>
+                <el-tag v-if="row.exeResult == '1'" type="success">成功</el-tag>
+                <el-tag v-if="row.exeResult == '0'" type="danger">失败</el-tag>
               </template>
             </el-table-column>
             <el-table-column prop="feedback" label='运行时信息' width="160px" show-tooltip-when-overflow></el-table-column>
@@ -55,7 +56,7 @@
                 <el-button v-if="(row.taskNodeName ==='人工上料' || row.taskNodeName ==='人工下料') && row.exeStatus === '2' && row.sendStatus == 0" size="mini" type="info" >需要人工操作物料</el-button>
                 <el-button v-if="row.taskNodeName !='人工上料' && row.taskNodeName !='人工下料' && row.exeStatus === '2' && row.sendStatus == 0" size="mini" type="danger" @click="resendCommand(row)">指令重发</el-button>
                 <!-- <el-button v-if="row.exeStatus === '1'" type="primary" size="mini"  @click="cancelTaskNodeLog(row)">取消任务</el-button> -->
-                <el-button v-if="row.exeStatus === '2' && row.sendStatus == 1 && row.exeResult != 1" type="warning" size="mini"  @click="taskNodeCallback(row)">模拟回调</el-button>
+                <el-button v-if="(row.exeStatus === '2' && row.sendStatus == 1 && row.exeResult != 1)  || (row.exeStatus === '2' && row.sendStatus == 2 && row.exeResult != 1)" type="warning" size="mini"  @click="taskNodeCallback(row)">模拟回调</el-button>
 
                 <el-tooltip
                   class="item"
@@ -453,6 +454,7 @@ export default {
               this.getLog();
             }, 2000);
           }else{
+            this.getLog();
             this.$message({
               message:'模拟回调失败：' + res.msg,
               type: "error"
@@ -460,8 +462,9 @@ export default {
           }
         }).catch(e=>{
           this.loading = false;
+          this.getLog();
           this.$message({
-            message:'取消指令失败：' + e.message,
+            message:'错误：' + e.message,
             type: "error"
           });
         })
@@ -570,10 +573,6 @@ export default {
         this.loading = false
         if(res.isSuccess){
           this.tableData = res.data
-          this.$message({
-            message:'成功',
-            type: "success"
-          });
         }else{
           this.$message({
             message:'查询失败',

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

@@ -300,12 +300,12 @@
 				</el-col>
 				<el-col :xs="3" :sm="4">
 					<el-form-item label="起始刀位号:" prop="cutStartNo">
-                    	<el-input-number v-model="form11.cutStartNo" :min="0" :max="40"></el-input-number>
+                    	<el-input-number v-model="form11.cutStartNo" :precision="2" :step="0.1" :min="0" :max="40"></el-input-number>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="4" :sm="4">
 					<el-form-item label="目的刀位号:" prop="cutGoalNo">
-                    	<el-input-number v-model="form11.cutGoalNo" :min="0" :max="40"></el-input-number>
+                    	<el-input-number v-model="form11.cutGoalNo"   :precision="2"  :step="0.1" :min="0" :max="40"></el-input-number>
 					</el-form-item>
 				</el-col>															
 			</el-row>
@@ -773,7 +773,15 @@
 				//判断起始设备和目的设备是否一致
 				let params = {"pointId": this.form11.start.replace("CT_","")}
                 toolbarApi.getCutToolDevice(qs.stringify(params)).then(response=>{
-				  const res = response.data
+				const res = response.data
+				if(res.data == null){
+					this.$message({
+              					message: "没有查询到设备",
+              					type: 'warning'
+            			})
+						return false
+				}
+
 				if(res.isSuccess){
 					let item = this.cutToolDeviceList.filter(item=>item.code==val); 
 					let resourceId = res.data.resourceId					

imcs-ui/src/views/zuihou/prepareProductMgr/cuttingToolMgr/components/machineCuttingTool/index.vue

@@ -68,8 +68,14 @@
       <!-- 刀具数量 -->
       <el-table-column align="center" prop="toolNum" :label='$t("cuttingTool.table.machineCuttingtool.cuttingToolNum")' :show-overflow-tooltip="true">
         <template slot-scope="{ row }">
-          <a style="color: #2db7f5;" @click="queryMachineCuttingTools(row)" >{{row.toolNum}}</a>
+          <el-tag :type="success" @click="queryMachineCuttingTools(row)">
+            {{row.toolNum}}
+          </el-tag>
         </template>
+
+        <!-- <template slot-scope="{ row }">
+          <a style="color: #2db7f5;" @click="queryMachineCuttingTools(row)" >{{row.toolNum}}</a>
+        </template> -->
       </el-table-column>
       <!-- 操作 -->
       <el-table-column
@@ -214,6 +220,7 @@
       // 加载【字典】
       initDicts(['LINK_STATUS'], this.dicts);
 	  	// 加载列表数据
+      
 	  	this.fetch()
 		},
 	  computed: {