From 41ea25f9279c7179ebef7192fb0a886d29db6f3d Mon Sep 17 00:00:00 2001 From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com> Date: Wed, 20 Sep 2023 19:53:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bug#=E8=A7=86=E9=A2=91=E5=9B=9E=E6=94=BE?= =?UTF-8?q?=E5=8A=A0=E8=BD=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: bug#18502 * fix: bug#视频回放加载bug --- src/api/device/instance.ts | 2 +- src/views/media/Device/Playback/index.vue | 6 +++--- src/views/system/User/components/EditUserDialog.vue | 10 ++++++++++ vite.config.ts | 3 +-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/api/device/instance.ts b/src/api/device/instance.ts index f45325d3..a9480b40 100644 --- a/src/api/device/instance.ts +++ b/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) /** * 获取产品列表 diff --git a/src/views/media/Device/Playback/index.vue b/src/views/media/Device/Playback/index.vue index cf6d0953..53ab3432 100644 --- a/src/views/media/Device/Playback/index.vue +++ b/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) => { diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue index bad17f77..4a3bd3df 100644 --- a/src/views/system/User/components/EditUserDialog.vue +++ b/src/views/system/User/components/EditUserDialog.vue @@ -111,6 +111,7 @@ @@ -206,6 +207,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'; diff --git a/vite.config.ts b/vite.config.ts index 2c89d95c..f58bbf87 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -96,9 +96,8 @@ export default defineConfig(({ mode}) => { // target: 'http://192.168.32.244:8881', // target: 'http://192.168.32.163:8844', //张季本地 // target: 'http://120.77.179.54:8844', // 120测试 - // target: 'http://192.168.33.46:8844', // 本地开发环境 + target: 'http://192.168.33.46:8844', // 本地开发环境 // target: 'http://192.168.32.5:8848', // 刘本地 - target: 'http://192.168.32.187:8844', // 刘本地 ws: 'ws://192.168.33.46:8844', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '')