Merge branch 'f-dev' into 'main'

fix：修改设备配置，图片编辑后未显示问题 See merge request huang/yun-teng-iot-front!318

Merge branch 'f-dev' into 'main'
fix：修改设备配置，图片编辑后未显示问题 See merge request huang/yun-teng-iot-front!318
xp.Huang
2 parents 28db8b03 3db0309d
Showing 5 changed files with 27 additions and 21 deletions
src/store/modules/user.ts
src/views/camera/streaming/index.vue
src/views/device/profiles/DeviceProfileModal.vue
src/views/report/config/index.vue
src/views/sys/login/Login.vue
--- a/src/store/modules/user.ts
View file @1aa2e4a
+++ b/src/store/modules/user.ts
View file @1aa2e4a
@@ -174,7 +174,9 @@ export const useUserStore = defineStore({
         const data = await smsCodeLoginApi(loginParams, mode);
         return this.process(data, goHome);
       } catch (error) {
-        return Promise.reject(error);
+        const { createMessage } = useMessage();
+        createMessage.error(error?.message || '');
+        // return Promise.reject(error);
       }
     },
     async getMyUserInfoAction(): Promise<UserInfo> {
--- a/src/views/camera/streaming/index.vue
View file @1aa2e4a
+++ b/src/views/camera/streaming/index.vue
View file @1aa2e4a
@@ -96,13 +96,13 @@
           :actions="[
             {
               label: '编辑',
-              auth: 'api:yt:streaming:update',
+              auth: 'api:yt:video:platform:update',
               icon: 'clarity:note-edit-line',
               onClick: handleUpdateStreamingMedia.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:streaming:delete',
+              auth: 'api:yt:video:platform:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {
@@ -114,10 +114,10 @@
         />
       </template>
       <template #toolbar>
-        <Authority value="api:yt:streaming:post">
+        <Authority value="api:yt:video:platform:post">
           <a-button type="primary" @click="handleCreateStreamingMedia">新增流媒体</a-button>
         </Authority>
-        <Authority value="api:yt:streaming:delete">
+        <Authority value="api:yt:video:platform:delete">
           <Popconfirm
             title="您确定要批量删除数据"
             ok-text="确定"
--- a/src/views/device/profiles/DeviceProfileModal.vue
View file @1aa2e4a
+++ b/src/views/device/profiles/DeviceProfileModal.vue
View file @1aa2e4a
@@ -120,17 +120,17 @@
             proxy.$refs.DeviceProfileStep1Ref.editOrAddNameStatus(false);
           }
           noEditObj = {
-            id: editData.value.id,
             name: editData.value?.name,
             createTime: createTime.value,
             transportType: editTransportType.value,
             type: editData.value?.type,
             profileData: editData.value?.profileData,
             defaultQueueName: editData.value.defaultQueueName,
-            image: editData.value.image,
+            id: editData.value.id,
             defaultRuleChainId: editData.value.defaultRuleChainId,
-            description: editData.value.description,
             tenantId: editData.value.tenantId,
+            image: editData.value.image,
+            description: editData.value.description,
             default: editData.value.default,
           };
         } else if (isUpdate.value == 3) {
@@ -171,7 +171,11 @@
             let getPic = null;
             const getStep1Obj = await proxy.$refs.DeviceProfileStep1Ref?.getStep1Func();
             getPic = getStep1Obj.icon;
-            Object.assign(noEditObj, { image: getPic }, getStep1Obj.key);
+            getStepOneData = {
+              ...getStep1Obj.key,
+              ...{ image: getPic },
+            };
+            Object.assign(noEditObj, getStepOneData);
           });
         }
       }
@@ -206,7 +210,7 @@
             ...getStep1Obj.key,
             ...{ image: getPic },
           };
-          Object.assign(noEditObj, { image: getPic }, getStep1Obj.key);
+          Object.assign(noEditObj, getStepOneData);
         }
         const id = isUpdate.value == 1 ? '' : postEditId.value;
         const postDefaultVal =
--- a/src/views/report/config/index.vue
View file @1aa2e4a
+++ b/src/views/report/config/index.vue
View file @1aa2e4a
@@ -2,13 +2,13 @@
   <div>
     <BasicTable :clickToRowSelect="false" @register="registerTable" :searchInfo="searchInfo">
       <template #toolbar>
-        <Authority value="api:yt:report:post">
+        <Authority value="api:yt:report_form:config:post">
           <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增报表 </a-button>
         </Authority>
         <Authority value="api:yt:report:get">
           <a-button type="primary" @click="go('/report/export')"> 下载报表 </a-button>
         </Authority>
-        <Authority value="api:yt:report:delete">
+        <Authority value="api:yt:report_form:config:delete">
           <Popconfirm
             title="您确定要批量删除数据"
             ok-text="确定"
@@ -36,14 +36,14 @@
             {
               label: '编辑',
               icon: 'clarity:note-edit-line',
-              auth: 'api:yt:report:update',
+              auth: 'api:yt:report_form:config:update',
               onClick: handleCreateOrEdit.bind(null, record),
               ifShow: record.status === 0,
             },
             {
               label: '删除',
               icon: 'ant-design:delete-outlined',
-              auth: 'api:yt:report:delete',
+              auth: 'api:yt:report_form:config:delete',
               color: 'error',
               ifShow: record.status === 0,
               popConfirm: {
--- a/src/views/sys/login/Login.vue
View file @1aa2e4a
+++ b/src/views/sys/login/Login.vue
View file @1aa2e4a
@@ -120,12 +120,12 @@
     link.rel = 'shortcut icon';
     link.href = userStore.platInfo?.icon ?? '/favicon.ico';
     document.getElementsByTagName('head')[0].appendChild(link);
-    logoUrl.value = userStore.platInfo?.background;
-    if (logoUrl.value !== undefined) {
-      ifCustom.value = false;
-    } else {
-      logoUrl.value = 'url(' + defaultShowLogoImg + ')';
-    }
+    // logoUrl.value = userStore.platInfo?.background;
+    // if (logoUrl.value !== undefined) {
+    //   ifCustom.value = false;
+    // } else {
+    //   logoUrl.value = 'url(' + defaultShowLogoImg + ')';
+    // }
     return userStore.platInfo?.name ?? title;
   });
   // const globSetting = useGlobSetting();
@@ -146,7 +146,7 @@
       background-color: @dark-bg;
       &::before {
-        background-image: url(/@/assets/svg/login-bg-dark.svg);
+        // background-image: url(/@/assets/svg/login-bg-dark.svg);
       }
       .ant-input,