更新

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

@@ -85,6 +85,12 @@
             <el-radio-button :label="1">禁用</el-radio-button>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="请求标记" prop="requireSucess" 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="dialogFormVisible4 = false">取 消</el-button>
@@ -103,7 +109,25 @@
             <el-radio-button :label="1">是</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="apply标记" prop="applySucess" label-width="120px">
+      </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="dialogFormVisible6" 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="requireSucess" 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-item label="请求任务标记" prop="applySucess" label-width="120px">
           <el-radio-group v-model="form.applySucess">
             <el-radio-button :label="0">否</el-radio-button>
             <el-radio-button :label="1">是</el-radio-button>
@@ -165,6 +189,7 @@ export default {
       dialogFormVisible3: false,
       dialogFormVisible4: false,
       dialogFormVisible5: false,
+      dialogFormVisible6: false,
       form: {
         device_code: '',
         hasGoodStatus: null,
@@ -308,7 +333,7 @@ export default {
         } else if (clickObj.data.driver_type === 'siemens_conveyor') {
           this.dialogFormVisible5 = true
         } else if (clickObj.data.driver_type === 'standard_conveyor_control_with_scanner') {
-          this.dialogFormVisible5 = true
+          this.dialogFormVisible6 = true
         } else {
           this.dialogFormVisible = true
         }
@@ -538,6 +563,7 @@ export default {
         this.dialogFormVisible3 = false
         this.dialogFormVisible4 = false
         this.dialogFormVisible5 = false
+        this.dialogFormVisible6 = false
         this.initStageData()
       }).catch(err => {
         this.dialogFormVisible = false