设备类型

src/views/modules/equipmentAdmin/equipmentAccount/add.vue

@@ -25,11 +25,17 @@
         <el-input v-model="formData.groupName" placeholder="分组"></el-input>
       </el-form-item>
       <el-form-item label="工作地图：" prop="mapId">
-        <el-select v-model="formData.mapId" placeholder="请选择工作地图">
+        <el-select v-model="formData.mapId" placeholder="请选择工作地图" @change="(value) => { getPointType(value, formData) }">
           <el-option v-for="item in mapOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="点位：" prop="pointId">
+        <el-select v-model="formData.pointId" filterable placeholder="点位">
+          <el-option v-for="item in formData.pointOptions" :key="item.id" :label="item.name" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注：">
         <el-input type="textarea" v-model="formData.remark" :rows="3"></el-input>
       </el-form-item>
@@ -55,9 +61,11 @@
 <script>
 import MapAdmin from '@/api/siteAdmin/MapAdmin'
 import EquipmentAccount from '@/api/equipmentAdmin/EquipmentAccount'
+import PositionAdmin from '@/api/siteAdmin/PositionAdmin'
 
 export default {
   MapAdmin: null,
+  PositionAdmin: null,
   EquipmentAccount: null,
   name: '',
   components: {},
@@ -104,6 +112,14 @@ export default {
 
   },
   methods: {
+    // 获取点位下拉
+    getPointType (value, formData) {
+      if (formData.mapId) {
+        this.PositionAdmin.getPointList({ mapId: formData.mapId }).then(({ data }) => {
+          this.$set(formData, 'pointOptions', data)
+        })
+      }
+    },
     // 打开弹窗
     open () {
       this.dialogVisible = !this.dialogVisible
@@ -159,6 +175,7 @@ export default {
   created () {
     this.MapAdmin = new MapAdmin()
     this.EquipmentAccount = new EquipmentAccount()
+    this.PositionAdmin = new PositionAdmin()
   },
   mounted () {
     this.getMapList()
@@ -166,4 +183,4 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-</style>
\ No newline at end of file
+</style>

src/views/modules/siteAdmin/siteTaskType/add.vue

@@ -25,7 +25,7 @@
       </el-form-item>
       <el-form-item label="任务排队：" prop="needQueue">
         <el-radio-group v-model="formData.needQueue">
-          <el-radio label="0">否</el-radio>
+          <el-radio label="'0">否</el-radio>
           <el-radio label="1">是</el-radio>
         </el-radio-group>
       </el-form-item>
@@ -158,6 +158,7 @@ export default {
     async getInfo (id) {
       this.SiteTaskType.getTaskTypeInfo(id).then(({ data }) => {
         this.formData = data
+        console.log(this.formData)
         this.open()
       })
     },

src/views/modules/taskPlan/taskPlanTemplate/add.vue

@@ -21,6 +21,14 @@
       <el-form-item label="设备分组：" prop="deviceGroup">
         <el-input v-model="formData.deviceGroup"></el-input>
       </el-form-item>
+        <el-form-item label="交互硬件类型：" prop="hardware">
+          <el-select v-model="formData.hardware" placeholder="请选择硬件类型">
+            <el-option v-for="item in $dictUtils.getDictList('tms_hardware_type')" :key="item.value"
+                       :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
       <el-form-item label="是/否包含变量：" prop="variableStatus">
         <el-radio-group v-model="formData.variableStatus" @change="changeStatus">
           <el-radio label="0">否</el-radio>
@@ -178,7 +186,7 @@ export default {
         }
       });
     },
-    // 选中是否包含变量 
+    // 选中是否包含变量
     changeStatus (value) {
       if (value == '0') {
         this.$set(this.formData, 'taskVariableList', [])
@@ -195,4 +203,4 @@ export default {
 </script>
 <style lang="less" scoped>
 
-</style>
\ No newline at end of file
+</style>