add:对烘箱对接位添加允许强制进入功能

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

@@ -137,6 +137,24 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="设备设置" :visible.sync="dialogFormVisible8" 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_force" label-width="120px">
+          <el-radio-group v-model="form.is_force">
+            <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="dialogFormVisible8 = 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">
@@ -212,6 +230,7 @@ export default {
       dialogFormVisible5: false,
       dialogFormVisible6: false,
       dialogFormVisible7: false,
+      dialogFormVisible8: false,
       form: {
         device_code: '',
         hasGoodStatus: null,
@@ -220,6 +239,7 @@ export default {
         suspended: null,
         material_type: '',
         requireSucess: '',
+        is_force: '',
         fullrequireSucess: '',
         is_disable: '',
         applySucess: ''
@@ -362,10 +382,12 @@ export default {
           this.dialogFormVisible7 = true
         } else if (clickObj.data.driver_type === 'siemens_conveyor_ckk') {
           this.dialogFormVisible7 = true
+        } else if (clickObj.data.driver_type === 'standard_inspect_site') {
+          this.dialogFormVisible8 = true
         } else if (clickObj.data.driver_type === 'standard_conveyor_control_with_scanner') {
           this.dialogFormVisible6 = true
         } else {
-          this.dialogFormVisible = true
+          this.dialogFormVisible8 = true
         }
       }
       this.form.angle = clickObj.angle
@@ -374,6 +396,7 @@ export default {
       this.form.hasGoodStatus = clickObj.data.hasGoods
       this.form.material_type = clickObj.data.material_type
       this.form.requireSucess = clickObj.data.requireSucess
+      this.form.is_force = clickObj.data.is_force
       this.form.fullrequireSucess = clickObj.data.fullrequireSucess
       this.form.is_disable = clickObj.data.is_disable1
       this.form.applySucess = clickObj.data.applySucess
@@ -560,6 +583,9 @@ export default {
           } else if (val === 'requireSucess') {
             const obj = { name: '请求成功标记', value: data[val] }
             this.arr.push(obj)
+          } else if (val === 'is_force') {
+            const obj = { name: '是否强制', value: data[val] }
+            this.arr.push(obj)
           } else if (val === 'applySucess') {
             const obj = { name: 'applySucess', value: data[val] }
             this.arr.push(obj)
@@ -657,6 +683,7 @@ export default {
         this.dialogFormVisible5 = false
         this.dialogFormVisible6 = false
         this.dialogFormVisible7 = false
+        this.dialogFormVisible8 = false
         this.initStageData()
       }).catch(err => {
         this.dialogFormVisible = false
@@ -664,6 +691,7 @@ export default {
         this.dialogFormVisible4 = false
         this.dialogFormVisible5 = false
         this.dialogFormVisible7 = false
+        this.dialogFormVisible8 = false
         console.log(err.response.data.message)
       })
     },