更新

acs/nladmin-ui/src/views/system/monitor/device/index.vue

@@ -92,6 +92,24 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="设备设置" :visible.sync="dialogFormVisible5" width="35%">
+      <el-form :model="form" size="small">
+        <el-form-item label="设备编号" prop="device_code" label-width="120px">
+          <el-input v-model="form.device_code" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="请求标记" prop="is_disable" label-width="120px">
+          <el-radio-group v-model="form.requireSucess">
+            <el-radio-button :label="0">否</el-radio-button>
+            <el-radio-button :label="1">是</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible5 = false">取 消</el-button>
+        <el-button type="primary" @click="dialogSave">确 定</el-button>
+      </div>
+    </el-dialog>
+
     <!--弹窗设置设备与图标绑定与角度-->
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible1" width="35%">
       <el-form :model="form" size="small">
@@ -140,6 +158,7 @@ export default {
       dialogFormVisible2: false,
       dialogFormVisible3: false,
       dialogFormVisible4: false,
+      dialogFormVisible5: false,
       form: {
         device_code: '',
         hasGoodStatus: null,
@@ -278,6 +297,8 @@ export default {
           this.$refs.child1.setForm(clickObj)
         } else if (clickObj.data.driver_type === 'slit_two_manipulator') {
           this.dialogFormVisible4 = true
+        } else if (clickObj.data.driver_type === 'siemens_conveyor') {
+          this.dialogFormVisible5 = true
         } else {
           this.dialogFormVisible = true
         }
@@ -474,6 +495,9 @@ export default {
           } else if (val === 'task2') {
             const obj = { name: '后工位任务号', value: data[val] }
             this.arr.push(obj)
+          } else if (val === 'task') {
+            const obj = { name: '任务号', value: data[val] }
+            this.arr.push(obj)
           } else if (val === 'labeling_qty') {
             const obj = { name: '贴标数量', value: data[val] }
             this.arr.push(obj)
@@ -516,6 +540,9 @@ export default {
           } else if (val === 'feedMessage') {
             const obj = { name: '未反馈电气信号原因', value: data[val] }
             this.arr.push(obj)
+          } else if (val === 'requireSucess') {
+            const obj = { name: '请求成功标记', value: data[val] }
+            this.arr.push(obj)
           }
         }
       }
@@ -562,11 +589,13 @@ export default {
         this.dialogFormVisible = false
         this.dialogFormVisible3 = false
         this.dialogFormVisible4 = false
+        this.dialogFormVisible5 = false
         this.initStageData()
       }).catch(err => {
         this.dialogFormVisible = false
         this.dialogFormVisible3 = false
         this.dialogFormVisible4 = false
+        this.dialogFormVisible5 = false
         console.log(err.response.data.message)
       })
     },