瀏覽代碼

feat:优化产品搜索

microrain 1 年之前
父節點
當前提交
2d312c3de9
共有 2 個文件被更改,包括 14 次插入5 次删除
  1. 5 1
      src/views/iot/device/instance/index.vue
  2. 9 4
      src/views/iot/device/product/index.vue

+ 5 - 1
src/views/iot/device/instance/index.vue

@@ -143,6 +143,7 @@ import EditDic from './component/edit.vue';
 import ExcelDic from './component/excel.vue';
 import api from '/@/api/device';
 import { ArrowDown } from '@element-plus/icons-vue'
+import { useRoute } from 'vue-router'
 
 
 // 定义接口来定义对象的类型
@@ -177,6 +178,8 @@ export default defineComponent({
   name: 'deviceInstance',
   components: { EditDic, ExcelDic, ArrowDown },
   setup() {
+    const route = useRoute()
+    const productKey = route.query.productKey
     const addDicRef = ref();
     const editDicRef = ref();
     const excelDicRef = ref();
@@ -215,7 +218,8 @@ export default defineComponent({
       }).finally(() => (state.tableData.loading = false));
     };
     const getProductList = () => {
-      api.product.getLists().then((res: any) => {
+      const query = { productKey }
+      api.product.getLists(query).then((res: any) => {
         state.productData = res.product
       })
     }

+ 9 - 4
src/views/iot/device/product/index.vue

@@ -5,8 +5,12 @@
         <el-form-item label="名称" prop="name">
           <el-input v-model="tableData.param.name" placeholder="输入名称或标识" clearable style="width: 150px" @keyup.enter.native="typeList" />
         </el-form-item>
-        <el-form-item label="类型" prop="deviceType">
-          <el-input v-model="tableData.param.deviceType" placeholder="请输入设备类型" clearable style="width: 150px" @keyup.enter.native="typeList" />
+        <el-form-item label="类型" prop="deviceType" style="width: 180px;">
+          <el-select v-model="tableData.param.deviceType" placeholder="类型" clearable style="width: 240px" @keyup.enter.native="typeList" >
+            <el-option label="直连设备" :value="'设备'" />
+            <el-option label="网关设备" :value="'网关'" />
+            <el-option label="网关子设备" :value="'子设备'" />
+          </el-select>
         </el-form-item>
         <el-form-item label="发布状态" prop="status" style="width: 180px;">
           <el-select v-model="tableData.param.status" placeholder="发布状态" clearable style="width: 240px">
@@ -60,12 +64,13 @@
             <el-tag type="info" size="small" v-else>未发布</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="130" align="center" fixed="right">
+        <el-table-column label="操作" width="150" align="center" fixed="right">
           <template #default="scope">
             <router-link :to="'/iotmanager/device/product/detail/' + scope.row.key" class="link-type" style="padding-right: 12px;font-size: 12px;color: #409eff;">
               <span>详情</span>
             </router-link>
-            <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>
+            <router-link :to="{path: '/iotmanager/device/instance', query: { productKey: scope.row.key }}"  class="link-type" style="padding-right: 12px;font-size: 12px;color: #409eff;">设备管理</router-link>
+            <!--            <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>-->
             <el-button size="small" text type="info" @click="onRowDel(scope.row)" v-auth="'del'">删除</el-button>
           </template>
         </el-table-column>