Merge branch 'master' into huangcb

src/views/equipment-management/device-instance/index.vue

@@ -140,6 +140,16 @@
         label-width="90px"
         :rules="rules"
       >
+        <el-form-item label="设备类型:" prop="deviceTypeId">
+          <el-select v-model="instanceForm.deviceTypeId">
+            <el-option
+              v-for="(deviceType, index) in deviceTypeList"
+              :key="index"
+              :label="deviceType.name"
+              :value="deviceType.id"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item
           label="设备名称:"
           prop="name"
@@ -177,6 +187,7 @@
 
 <script>
 import { getTableData, addDeviceInstance, updateDeviceInstance, deleteDeviceInstance } from '@/api/equipment-management/device-instance'
+import { getAllDeviceModel } from '@/api/equipment-management/equipment-instance'
 import dictionary from '@/utils/dictionary'
 export default {
   name: 'DeviceInstance',
@@ -201,6 +212,7 @@ export default {
       add: true,
       dialogVisible: false,
       tableData: [],
+      deviceTypeList: [],
       addForm: {
         input: null,
         status: null
@@ -213,6 +225,9 @@ export default {
       deviceStatusDialog: false,
       deviceHistoryDialog: false,
       rules: {
+        deviceTypeId: [
+          { required: true, message: '请选择设备类型', trigger: 'blur' }
+        ],
         name: [
           { required: true, message: '请输入设备名称', trigger: 'blur' }
         ],
@@ -226,6 +241,11 @@ export default {
   },
   created() {
     this.getTableData(1)
+    getAllDeviceModel()
+      .then(res => {
+        this.deviceTypeList = res.data
+      })
+      .catch(_ => {})
   },
   mounted() {},
   methods: {