1.调整设备接入信息dialog内容；2.设备实例增加查询条件：设备类型

src/views/equipment-access-management/equipment-access.vue

@@ -99,11 +99,20 @@
     >
       <div>
         <el-card class="no-bottom">
-          <div slot="header" class="clearfix">
+          <div slot="header">
             <span>基本信息</span>
           </div>
           <el-row>
-            <descriptions-item label="通信ID" :value="accessData.communicationId" />
+            <el-col :span="4"><div class="base-info-label">设备类型</div></el-col>
+            <el-col :span="20"><div>{{ accessData.deviceTypeName }}</div></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4"><div class="base-info-label">设备名称</div></el-col>
+            <el-col :span="20"><div>{{ accessData.instanceName }}</div></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4"><div class="base-info-label">通信ID</div></el-col>
+            <el-col :span="20"><div>{{ accessData.communicationId }}</div></el-col>
           </el-row>
         </el-card>
         <el-card class="margin-top-20">
@@ -132,9 +141,6 @@
           </el-table>
         </el-card>
       </div>
-      <div class="el-dialog__footer">
-        <el-button @click="dialogVisible = false">关闭</el-button>
-      </div>
     </el-dialog>
   </div>
 </template>
@@ -154,6 +160,8 @@ export default {
       },
       deviceTypeList: [],
       accessData: {
+        deviceTypeName: null,
+        instanceName: null,
         communicationId: null,
         mqttTopicInfoVOList: []
       },
@@ -200,6 +208,8 @@ export default {
     },
     showAccessInfoDialog(row) {
       this.accessData = {
+        deviceTypeName: null,
+        instanceName: null,
         communicationId: null,
         mqttTopicInfoVOList: []
       }
@@ -227,5 +237,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.base-info-label {
+  margin-bottom: 23px;
+  padding-right: 35px;
+  text-align: right;
+}
 </style>

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

@@ -7,6 +7,22 @@
         label-width="80px"
         inline
       >
+        <el-form-item
+          label="设备类型:"
+          prop="deviceTypeId"
+        >
+          <el-select
+            v-model="searchForm.deviceTypeId"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in deviceTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item
           label="设备名称:"
           prop="name"
@@ -143,10 +159,10 @@
         <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"
+              v-for="item in deviceTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
@@ -199,6 +215,7 @@ export default {
   data() {
     return {
       searchForm: {
+        deviceTypeId: null,
         name: null,
         onlineState: null
       },
@@ -243,7 +260,12 @@ export default {
     this.getTableData(1)
     getAllDeviceModel()
       .then(res => {
-        this.deviceTypeList = res.data
+        this.deviceTypeList = res.data.map(v => {
+          return {
+            value: v.id,
+            label: v.name
+          }
+        })
       })
       .catch(_ => {})
   },