refactor(iot): 优化设备管理功能

- 修改设备编辑功能，将"修改"改为"编辑"
- 优化设备搜索功能，支持按产品名称搜索
-完善设备详情页面，显示设备状态
- 调整路由配置，增加设备详情路由

src/api/device.ts

@@ -61,7 +61,7 @@ export function createDevice(data: DeviceCreateRecord) {
   return axios.post(`/api/rest/device`, data);
 }
 
-// 修改
+// 编辑
 export function updateDevice(data: DeviceUpdateRecord) {
   return axios.patch(`/api/rest/device/${data.id}`, data);
 }

src/api/product.ts

@@ -57,7 +57,7 @@ export function createProduct(data: ProductCreateRecord) {
   return axios.post(`/api/rest/product`, data);
 }
 
-// 修改
+// 编辑
 export function updateProduct(data: ProductUpdateRecord) {
   return axios.patch(`/api/rest/product/${data.id}`, data);
 }

src/components/message-box/index.vue

@@ -78,7 +78,7 @@
     }
   }
 
-  // 修改消息状态
+  // 编辑消息状态
   async function readMessage(data: MessageListType) {
     const ids = data.map((item) => item.messageId);
     await useMessageStore.setMessageStatus(ids);
@@ -104,7 +104,7 @@
     const list = getUnreadList(type);
     return list.length ? `(${list.length})` : ``;
   };
-  // 修改已读状态
+  // 编辑已读状态
   const handleItemClick = (items: MessageListType) => {
     if (renderList.value.length) readMessage([...items]);
   };

src/router/routes/modules/iot.ts

@@ -73,6 +73,19 @@ const IOT: AppRouteRecordRaw = {
         permissions: ['iot:device:query'],
       },
     },
+    {
+      path: 'cardDevice/:id',
+      name: 'cardDeviceDetail',
+      component: () =>
+        import('@/views/iot/deviceCard/components/device-detail.vue'),
+      meta: {
+        locale: '设备详情',
+        title: '设备详情',
+        requiresAuth: true,
+        showInMenu: false,
+        permissions: ['iot:device:query'],
+      },
+    },
     {
       path: 'product/tsl/:id',
       name: 'productTsl',

src/views/iot/device/components/device-detail.vue

@@ -41,7 +41,7 @@
         style="padding-top: 20px"
       >
         <a-tab-pane key="1" tab="参数" title="扩展属性">
-          <a-table :columns="columns" :data="renderData.extendParams" />
+          <a-table :columns="columns" :data="renderData.params" />
         </a-tab-pane>
         <a-tab-pane key="2" tab="基本信息" title="基本信息">
           基本信息

src/views/iot/device/components/device-edit.vue

@@ -17,7 +17,7 @@
     @click="handleClick"
   >
     <template #icon><icon-edit /></template>
-    修改
+    编辑
   </a-button>
 
   <a-modal
@@ -32,7 +32,7 @@
       :model="formData"
       :style="{ width: '800px', height: '420px' }"
     >
-      <!-- 产品id -->
+      <!-- 产品名称 -->
       <a-form-item
         field="productName"
         label="产品名称"
@@ -135,8 +135,7 @@
 
     <template #footer>
       <a-button class="editor-button" @click="handleCancel">取消</a-button>
-      <a-button class="editor-button" type="primary" @click="handleSubmit"
+      <a-button class="editor-button" type="primary" @click="handleSubmit">确定</a-button
-        >确定</a-button
       >
     </template>
   </a-modal>
@@ -319,7 +318,7 @@
         const res = await updateDevice(formData.value);
         if (res.status === 200) {
           Message.success({
-            content: '修改成功',
+            content: '编辑成功',
             duration: 5 * 1000,
           });
           emit('refresh');

src/views/iot/device/index.vue

@@ -30,13 +30,20 @@
                 </a-form-item>
               </a-col>
               <a-col :span="9">
-                <a-form-item field="status" label="所属产品">
+                <a-form-item field="productName" label="所属产品">
                   <a-select
                     v-model="formModel.productName"
+                    :loading="loading"
+                    :filter-option="false"
+                    allow-search
                     style="width: 360px"
                     placeholder="请选择所属产品"
-                    :options="productOptions"
+                    @search="handleSearch"
-                  />
+                  >
+                    <a-option v-for="item of options" :key="item.id" :value="item.name">{{
+                        item.name
+                      }}</a-option>
+                  </a-select>
                 </a-form-item>
               </a-col>
               <a-col :span="10">
@@ -163,6 +170,9 @@
         <template #id="{ record }">
           <span>{{ record.id }}</span>
         </template>
+        <template #state="{ record }">
+          {{ record.state == "UNACTIVATED" ? '未激活' : '激活'}}
+        </template>
         <template #online="{ record }">
           {{ record.online == true ? '是' : '否' }}
         </template>
@@ -224,7 +234,7 @@
   import useTableOption from '@/hooks/table-option';
   import { Message } from '@arco-design/web-vue';
   import { useRouter } from 'vue-router';
-  import { deleteDevice, DeviceRecord, queryDeviceList } from '@/api/device';
+  import { deleteDevice, DeviceRecord, queryDeviceByName, queryDeviceList } from '@/api/device';
   import DeviceEdit from '@/views/iot/device/components/device-edit.vue';
 
   const generateFormModel = () => {
@@ -296,14 +306,7 @@
       value: 'false',
     },
   ]);
-  const productOptions = computed(() => {
+  const options = ref<any>([]);
-    return [
-      {
-        label: '全部',
-        value: '',
-      },
-    ];
-  });
 
   // 获取设备列表
   const fetchData = async (params = { size: 10, current: 1 }) => {
@@ -327,6 +330,30 @@
     } as unknown as DeviceRecord);
   };
 
+  // 搜索
+  const handleSearch = (value: any) => {
+    if (value) {
+      loading.value = true;
+      options.value = [];
+      window.setTimeout(async () => {
+        const res = await queryDeviceByName({
+          name: value,
+          page: 1,
+          size: 5,
+        });
+        options.value = res.data.records.map((item: any) => {
+          return {
+            id: item.id,
+            name: item.name,
+          };
+        });
+        loading.value = false;
+      }, 1000);
+    } else {
+      options.value = [];
+    }
+  };
+
   // 分页发生改变
   const onPageChange = (current: number) => {
     pagination.value.page = current;

src/views/iot/deviceCard/components/card-wrap.vue

@@ -81,10 +81,12 @@
       default: '',
     },
   });
+  const emit = defineEmits(['search']);
+
   // 打开详情
   function openDetail(id: number): void {
     const url = router.resolve({
-      name: 'deviceDetail',
+      name: 'cardDeviceDetail',
       params: { id },
     }).href;
     router.push(url);
@@ -97,6 +99,7 @@
         content: '删除成功',
         duration: 5 * 1000,
       });
+      emit('search');
     }
   };
 </script>

src/views/iot/deviceCard/components/device-detail.vue

@@ -40,7 +40,7 @@
         style="padding-top: 20px"
       >
         <a-tab-pane key="1" tab="参数" title="扩展属性">
-          <a-table :columns="columns" :data="renderData.extendParams" />
+          <a-table :columns="columns" :data="renderData.params" />
         </a-tab-pane>
         <a-tab-pane key="2" tab="基本信息" title="基本信息">
           基本信息

src/views/iot/deviceCard/components/device-edit.vue

@@ -35,7 +35,7 @@
     @click="handleClick"
   >
     <!--    <template #icon><icon-edit /></template>-->
-    修改
+    编辑
   </a-button>
 
   <a-modal
@@ -344,7 +344,7 @@
         const res = await updateDevice(formData.value);
         if (res.status === 200) {
           Message.success({
-            content: '修改成功',
+            content: '编辑成功',
             duration: 5 * 1000,
           });
           emit('refresh');

src/views/iot/deviceCard/index.vue

@@ -90,6 +90,7 @@
               :title="item.name"
               :productName="item.productName"
               :createTime="item.createTime"
+              @search="search"
               open-txt="详情"
             >
               <template #skeleton>

src/views/iot/product/components/product-edit.vue

@@ -17,7 +17,7 @@
     @click="handleClick"
   >
     <template #icon><icon-edit /></template>
-    修改
+    编辑
   </a-button>
 
   <a-modal
@@ -328,7 +328,7 @@
         const res = await updateProduct(formData.value);
         if (res.status === 200) {
           Message.success({
-            content: '修改成功',
+            content: '编辑成功',
             duration: 5 * 1000,
           });
           emit('refresh');

src/views/iot/product/components/product-tsl.vue

@@ -41,7 +41,7 @@
         </a-tab-pane>
         <a-tab-pane key="2" title="服务">
           <a-button
-            v-permission="['iot:serve:create']"
+            v-permission="['iot:server:create']"
             type="primary"
             style="margin-bottom: 10px"
             @click="handleClick"
@@ -52,7 +52,7 @@
           <a-table :columns="columns" :data="serveData">
             <template #operation="{ record }">
               <a-button
-                v-permission="['iot:serve:delete']"
+                v-permission="['iot:server:delete']"
                 type="outline"
                 status="danger"
                 size="small"

src/views/notification/bulletin/components/bulletin-edit.vue

@@ -17,7 +17,7 @@
     @click="handleClick"
   >
     <template #icon><icon-edit /></template>
-    修改
+    编辑
   </a-button>
 
   <a-modal
@@ -237,7 +237,7 @@
         const res = await bulletinStore.updateBulletin(formData.value);
         if (res.status === 200) {
           Message.success({
-            content: '修改成功',
+            content: '编辑成功',
             duration: 5 * 1000,
           });
           emit('refresh');

src/views/notification/bulletin/index.vue

@@ -404,12 +404,12 @@
     const res = await bulletinStore.toggleBulletin(record.id);
     if (res.status === 200) {
       Message.success({
-        content: '修改置顶成功',
+        content: '编辑置顶成功',
         duration: 3 * 1000,
       });
     } else {
       Message.error({
-        content: '修改置顶失败',
+        content: '编辑置顶失败',
         duration: 3 * 1000,
       });
     }

src/views/notification/notice/components/message-edit.vue

@@ -17,7 +17,7 @@
     @click="handleClick"
   >
     <template #icon><icon-edit /></template>
-    修改
+    编辑
   </a-button>
 
   <a-modal

src/views/system/authority/components/auth-edit.vue

@@ -11,7 +11,7 @@
     @click="handleClick"
   >
     <template #icon><icon-edit /></template>
-    修改
+    编辑
   </a-button>
   <a-modal
     width="700px"

src/views/system/authority/index.vue

@@ -283,13 +283,13 @@
     const res = await authStore.enabledAuth(record.id);
     if (res.status === 200) {
       Message.success({
-        content: '修改成功',
+        content: '编辑成功',
         duration: 3 * 1000,
       });
       search();
     } else {
       Message.error({
-        content: '修改失败',
+        content: '编辑失败',
         duration: 3 * 1000,
       });
     }

src/views/system/authority/locale/zh-CN.ts

@@ -28,10 +28,10 @@ export default {
 
   'Confirm the deletion of this role': '确认删除此角色?',
 
-  'modify.status.sucess': '修改状态成功',
+  'modify.status.sucess': '编辑状态成功',
-  'modify.status.fail': '修改状态失败',
+  'modify.status.fail': '编辑状态失败',
 
   // modalTitle
   'createRole': '新增角色',
-  'editRole': '修改角色信息',
+  'editRole': '编辑角色信息',
 };

src/views/system/dept/components/dept-edit.vue

@@ -17,7 +17,7 @@
     @click="handleClick"
   >
     <template #icon><icon-edit /></template>
-    修改
+    编辑
   </a-button>
   <a-modal
     width="700px"

src/views/system/dept/locale/zh-CN.ts

@@ -25,5 +25,5 @@ export default {
 
   // modalTitle
   'createDept': '新增部门',
-  'editDept': '修改部门信息',
+  'editDept': '编辑部门信息',
 };

src/views/system/menu/components/menu-edit.vue

@@ -17,7 +17,7 @@
     @click="handleClick"
   >
     <template #icon><icon-edit /></template>
-    修改
+    编辑
   </a-button>
   <a-modal
     width="700px"
@@ -198,7 +198,7 @@
         const res = await updateMenu(formData.value);
         if (res.status === 200) {
           Message.success({
-            content: '修改成功',
+            content: '编辑成功',
             duration: 5 * 1000,
           });
         }

src/views/system/role/components/role-edit.vue

@@ -17,7 +17,7 @@
     @click="handleClick"
   >
     <template #icon><icon-edit /></template>
-    修改
+    编辑
   </a-button>
   <a-modal
     width="700px"

src/views/system/role/index.vue

@@ -301,12 +301,12 @@
     const res = await roleStore.enabledRole(record.id);
     if (res.status === 200) {
       Message.success({
-        content: '修改成功',
+        content: '编辑成功',
         duration: 3 * 1000,
       });
     } else {
       Message.error({
-        content: '修改失败',
+        content: '编辑失败',
         duration: 3 * 1000,
       });
     }

src/views/system/role/locale/zh-CN.ts

@@ -28,10 +28,10 @@ export default {
 
   'Confirm the deletion of this role': '确认删除此角色?',
 
-  'modify.status.sucess': '修改状态成功',
+  'modify.status.sucess': '编辑状态成功',
-  'modify.status.fail': '修改状态失败',
+  'modify.status.fail': '编辑状态失败',
 
   // modalTitle
   'createRole': '新增角色',
-  'editRole': '修改角色信息',
+  'editRole': '编辑角色信息',
 };

src/views/system/user/components/user-edit.vue

@@ -17,7 +17,7 @@
     @click="handleClick"
   >
     <template #icon><icon-edit /></template>
-    修改
+    编辑
   </a-button>
 
   <a-modal
@@ -201,9 +201,9 @@
     setVisible(true);
   };
 
-  // 做出只修改的部分
+  // 做出只编辑的部分
   const diffDataForm = (newData: any, oldData: any) => {
-    const result = {}; // 报错修改的字段内容
+    const result = {}; // 报错编辑的字段内容
     Object.keys(oldData).forEach((key) => {
       if (oldData[key] !== newData[key]) {
         result[key] = newData[key];
@@ -241,7 +241,7 @@
         //   const res = await userStore.updateUser(formData.value);
         //   if (res.status === 200) {
         //     Message.success({
-        //       content: '修改成功',
+        //       content: '编辑成功',
         //       duration: 5 * 1000,
         //     });
         //   }
@@ -249,7 +249,7 @@
         const res = await userStore.updateUser(formData.value);
         if (res.status === 200) {
           Message.success({
-            content: '修改成功',
+            content: '编辑成功',
             duration: 5 * 1000,
           });
         }

src/views/system/user/index.vue

@@ -405,12 +405,12 @@
     const res = await userStore.enabledUser(record.id);
     if (res.status === 200) {
       Message.success({
-        content: '修改状态成功',
+        content: '编辑状态成功',
         duration: 3 * 1000,
       });
     } else {
       Message.error({
-        content: '修改状态失败',
+        content: '编辑状态失败',
         duration: 3 * 1000,
       });
     }

src/views/system/user/locale/zh-CN.ts

@@ -37,8 +37,8 @@ export default {
   'searchTable.actions.columnSetting': '列设置',
 
   // modify
-  'modify.user.info.sucess': '修改成功',
+  'modify.user.info.sucess': '编辑成功',
-  'modify.user.info.fail': '修改失败',
+  'modify.user.info.fail': '编辑失败',
 
   'user.info.username': '用户名',
   'user.info.username.placeholder': '请输入用户名',
@@ -69,5 +69,5 @@ export default {
 
   // modalTitle
   'createUser': '新增用户',
-  'editUser': '修改用户信息',
+  'editUser': '编辑用户信息',
 };

src/views/user/setting/locale/zh-CN.ts

@@ -58,9 +58,9 @@ export default {
   'userSetting.SecuritySettings.placeholder.email':
     '您暂未设置邮箱，绑定邮箱可以用来找回密码、接收通知等。',
   'userSetting.SecuritySettings.button.settings': '设置',
-  'userSetting.SecuritySettings.button.update': '修改',
+  'userSetting.SecuritySettings.button.update': '编辑',
   'userSetting.certification.title.enterprise': '企业实名认证',
-  'userSetting.certification.extra.enterprise': '修改认证主体',
+  'userSetting.certification.extra.enterprise': '编辑认证主体',
   'userSetting.certification.label.accountType': '账号类型',
   'userSetting.certification.label.status': '认证状态',
   'userSetting.certification.label.time': '认证时间',