Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary

src/api/device/instance.ts

@@ -273,7 +273,7 @@ export const saveDeviceMapping = (deviceId: string, data: any) => server.post(`/
 /**
  *批量删除云端映射设备 
  */
-export const deleteDeviceMapping = (deviceId: string, data:any) => server.post(`/edge/operations/${deviceId}/device-mapping-delete/invoke`, data)
+export const deleteDeviceMapping = (deviceId: string, data:any) => server.post(`/edge/operations/${deviceId}/device-mapping-delete-by-deviceid/invoke`, data)
 
 /**
  * 获取产品列表

src/views/media/Device/Playback/index.vue

@@ -237,7 +237,9 @@ const queryLocalRecords = async (date: Dayjs) => {
             deviceId.value,
             channelId.value,
             params,
-        );
+        ).finally(()=>{
+            loading.value = false;
+        })
         if (localResp.status === 200 && localResp.result.length) {
             const serviceResp = await playBackApi.recordsInServer(
                 deviceId.value,
@@ -247,10 +249,8 @@ const queryLocalRecords = async (date: Dayjs) => {
                     includeFiles: false,
                 },
             );
-            loading.value = false;
             let newList: recordsItemType[] = serviceResp.result;
             // console.log(newList)
-
             if (serviceResp.status === 200 && serviceResp.result) {
                 // 判断是否已下载云端视频
                 newList = localResp.result.map((item: recordsItemType) => {

src/views/system/User/components/EditUserDialog.vue

@@ -112,6 +112,7 @@
                         <PermissionButton
                             :hasPermission="`${rolePermission}:add`"
                             @click="form.clickAddItem('roleIdList', 'Role')"
+                            v-if="!admin"
                         >
                             <AIcon type="PlusOutlined" />
                         </PermissionButton>
@@ -208,6 +209,15 @@ import { AxiosResponse } from 'axios';
 import { passwordRegEx } from '@/utils/validate';
 import { filterSelectNode, onlyMessage } from '@/utils/comm';
 import { uniqBy } from 'lodash-es';
+import { useUserInfo } from '@/store/userInfo';
+import { storeToRefs } from 'pinia';
+
+const userInfoStore = useUserInfo()
+const { userInfos } = storeToRefs(userInfoStore)
+
+const admin = computed(() => {
+  return userInfos.value?.username === 'admin';
+})
 
 const deptPermission = 'system/Department';
 const rolePermission = 'system/Role';