Merge branch 'ww' into 'main'

fix: BUG in teambition See merge request huang/yun-teng-iot-front!422

Merge branch 'ww' into 'main'
fix: BUG in teambition See merge request huang/yun-teng-iot-front!422
xp.Huang
2 parents 024871c3 7a0b4310
Showing 7 changed files with 20 additions and 11 deletions
src/api/system/system.ts
src/views/device/list/config/detail.config.ts
src/views/device/list/cpns/modal/DeviceDetailDrawer.vue
src/views/device/list/cpns/modal/DeviceModal.vue
src/views/device/list/cpns/tabs/ChildDevice.vue
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/tenant/role/index.vue
--- a/src/api/system/system.ts
View file @09f9248
+++ b/src/api/system/system.ts
View file @09f9248
@@ -28,6 +28,7 @@ enum Api {
   setRoleStatus = '/role/update_status/',
   MenuList = '/system/getMenuList',
   RolePageList = '/role',
+  TenantRolePageList = '/role/tenant',
   SaveOrUpdateRoleInfoWithMenu = '/role/save_with_menu',
   DeleteRole = '/role',
   GetAllRoleList = '/role/find/list',
@@ -80,6 +81,10 @@ export const getMenuList = (params?: MenuParams) =>
 export const getRoleListByPage = (params?: RolePageParams) =>
   defHttp.get<RolePageListGetResultModel>({ url: Api.RolePageList, params });
+
+export const getTenantRoleRoleListByPage = (params?: RolePageParams) =>
+  defHttp.get<RolePageListGetResultModel>({ url: Api.TenantRolePageList, params });
+
 export const getTenantRoleListByPage = (params?: RolePageParams) =>
   defHttp.get<RolePageListGetResultModel>({ url: Api.RolePageList, params });
--- a/src/views/device/list/config/detail.config.ts
View file @09f9248
+++ b/src/views/device/list/config/detail.config.ts
View file @09f9248
@@ -21,6 +21,9 @@ export const descSchema = (emit: EmitType): DescItem[] => {
     {
       field: 'name',
       label: '设备名称',
+      render(val, data: Record<'alias' | 'name', string>) {
+        return h('span', {}, data.alias || val);
+      },
     },
     {
       field: 'label',
@@ -51,7 +54,7 @@ export const descSchema = (emit: EmitType): DescItem[] => {
         return h(
           Button,
           { type: 'link', style: { padding: 0 }, onClick: () => emit('open-gateway-device', data) },
-          { default: () => val }
+          { default: () => data.gatewayAlias || val }
         );
       },
     },
--- a/src/views/device/list/cpns/modal/DeviceDetailDrawer.vue
View file @09f9248
+++ b/src/views/device/list/cpns/modal/DeviceDetailDrawer.vue
View file @09f9248
@@ -5,7 +5,7 @@
     @register="register"
     destroyOnClose
     @close="closeDrawer"
-    :title="deviceDetail.name"
+    :title="deviceDetail.alias || deviceDetail.name"
     width="80%"
   >
     <Tabs v-model:activeKey="activeKey" :size="size">
--- a/src/views/device/list/cpns/modal/DeviceModal.vue
View file @09f9248
+++ b/src/views/device/list/cpns/modal/DeviceModal.vue
View file @09f9248
@@ -62,6 +62,7 @@
       const current = ref(0);
       const isUpdate = ref<Boolean>(false);
       const deviceInfo = ref({});
+      let currentDeviceData = {} as Recordable;
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备' : '编辑设备'));
       // 所有参数
       let stepState = ref();
@@ -71,6 +72,7 @@
         isUpdate.value = data?.isUpdate;
         if (unref(isUpdate)) {
           const { record } = data;
+          currentDeviceData = record;
           unref(DeviceStep1Ref)?.parentSetFieldsValue({
             ...record,
             profile: record.deviceProfile.name,
@@ -138,8 +140,10 @@
             confirmLoading: true,
           });
           if (unref(isUpdate)) {
+            console.log(currentDeviceData);
             const editData = {
               ...unref(stepState),
+              customerId: currentDeviceData.customerId,
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
                 ...DeviceStep1Ref.value?.positionState,
--- a/src/views/device/list/cpns/tabs/ChildDevice.vue
View file @09f9248
+++ b/src/views/device/list/cpns/tabs/ChildDevice.vue
View file @09f9248
@@ -2,9 +2,9 @@
   <div style="background-color: #f0f2f5">
     <BasicTable @register="registerTable">
       <template #tbDeviceName="{ record }">
-        <div style="color: #619eff" class="cursor-pointer" @click="handleGetTbDeviceId(record)">{{
-          record.tbDeviceName
-        }}</div>
+        <div style="color: #619eff" class="cursor-pointer" @click="handleGetTbDeviceId(record)">
+          {{ record.alias || record.tbDeviceName }}
+        </div>
       </template>
       <template #deviceState="{ record }">
         <Tag
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @09f9248
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @09f9248
@@ -4,6 +4,7 @@
       v-bind="$attrs"
       @register="registerDrawer"
       @ok="handleSubmit"
+      destroy-on-close
       width="50%"
       showFooter
       @close="handleClose"
@@ -245,7 +246,6 @@
             operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: trigger?.triggerCondition?.alarmDetails,
             entityId: trigger?.entityId,
-            deviceType: trigger?.deviceType,
             deviceProfileId: trigger?.deviceProfileId,
             replaceValue: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
@@ -326,7 +326,6 @@
             operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: condition?.triggerCondition?.alarmDetails,
             entityId: condition?.entityId,
-            deviceType: condition?.deviceType,
             deviceProfileId: condition?.deviceProfileId,
             replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
@@ -399,7 +398,6 @@
             deviceId: action.deviceId,
             alarm_config: action.alarmProfileId,
             alarm_level: action.doContext.alarmLevel,
-            deviceType: action.deviceType,
           });
           // 如果是设备输出设置脚本值
           if (action.outTarget === 'DEVICE_OUT') {
@@ -439,7 +437,6 @@
                         .valueType,
                     detail: action.doContext.clearRule[index].triggerCondition.alarmDetails,
                     entityId: action.doContext.clearRule[index].entityId,
-                    deviceType: action.doContext.clearRule[index].entityId?.deviceType,
                     deviceProfileId: action.doContext.clearRule[index]?.deviceProfileId,
                     replaceValue:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.predicate
--- a/src/views/tenant/role/index.vue
View file @09f9248
+++ b/src/views/tenant/role/index.vue
View file @09f9248
@@ -58,7 +58,7 @@
 <script lang="ts">
   import { defineComponent, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { delRole, getRoleListByPage, setRoleStatus } from '/@/api/system/system';
+  import { delRole, getTenantRoleRoleListByPage, setRoleStatus } from '/@/api/system/system';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useDrawer } from '/@/components/Drawer';
   import RoleDrawer from './RoleDrawer.vue';
@@ -78,7 +78,7 @@
       }
       const [registerTable, { reload, setProps, setSelectedRowKeys }] = useTable({
         title: '租户角色列表',
-        api: getRoleListByPage,
+        api: getTenantRoleRoleListByPage,
         columns,
         formConfig: {
           labelWidth: 120,