Merge branch 'device_book' of shuzhihua/pms-iot-vue into master

src/api/pms/device/index.ts

@@ -245,5 +245,9 @@ export const IotDeviceApi = {
   // 获取成套设备参数
   getDeviceSetParams: async (id) => {
     return await request.get({ url: `/rq/iot-device-group/td/${id}` })
+  },
+  // 获取所有设备品牌
+  getDeviceBrand: async () => {
+    return await request.get({ url: `/supplier/base/all` })
   }
 }

src/views/pms/device/index.vue

@@ -426,13 +426,17 @@
                     </div>
                   </template>
                   <div class="flex items-center gap-2">
-                    <el-input
-                      v-model="queryParams.assetClassName"
-                      placeholder="请输入资产类别"
-                      style="width: 180px"
-                      clearable
+                    <el-tree-select
+                      :teleported="false"
+                      v-model="queryParams.assetClass"
+                      :data="productClassifyList"
+                      :props="defaultProps"
+                      check-strictly
+                      node-key="id"
+                      :placeholder="t('deviceForm.categoryHolder')"
+                      filterable
+                      @change="handleQuery"
                     />
-                    <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
                   </div>
                 </el-popover>
               </span>
@@ -472,13 +476,40 @@
                   </div>
                 </template>
                 <div class="flex items-center gap-2">
-                  <el-input
+                  <!-- <el-input
                     v-model="queryParams.manufacturer"
                     placeholder="请输入制造商"
                     style="width: 180px"
                     clearable
                   />
-                  <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button> -->
+                  <!-- <el-tree-select
+                    :teleported="false"
+                    v-model="queryParams.manufacturerId"
+                    :data="brandList"
+                    :props="defaultProps"
+                    check-strictly
+                    node-key="id"
+                    filterable
+                    placeholder="请选择制造商"
+                    @change="handleQuery"
+                    style="width: 220px"
+                  /> -->
+                  <el-select
+                    v-model="queryParams.manufacturerId"
+                    style="width: 220px"
+                    filterable
+                    :teleported="false"
+                    @change="handleQuery"
+                  >
+                    <el-option
+                      v-for="item in brandList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                      style="width: 300px"
+                    />
+                  </el-select>
                 </div>
               </el-popover>
             </template>
@@ -740,7 +771,6 @@ const queryParams = reactive({
   yfDeviceCode: undefined,
   carNo: undefined,
   deviceNo: undefined,
-  assetClassName: undefined,
   manufacturer: undefined,
   chargeName: undefined
 })
@@ -748,6 +778,7 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const contentSpan = ref(20)
 const treeShow = ref(true)
+const brandList = ref([])
 const shou = (tree) => {
   treeShow.value = !tree
   if (tree) {
@@ -808,6 +839,7 @@ const resetQuery = () => {
   queryParams.useProject = undefined
   queryParams.model = undefined
   queryParams.assetOwnership = undefined
+  queryParams.manufacturerId = undefined
   queryFormRef.value.resetFields()
   handleQuery()
 }
@@ -869,6 +901,8 @@ onMounted(async () => {
   productClassifyList.value = handleTree(
     await ProductClassifyApi.IotProductClassifyApi.getSimpleProductClassifyList()
   )
+
+  brandList.value = await IotDeviceApi.getDeviceBrand()
   const sort = {
     field: 'sortColumn',
     order: 'asc'