fix: bug#视频回放加载bug

* fix: bug#18502

* fix: bug#视频回放加载bug
This commit is contained in:
qiaochuLei 2023-09-20 19:53:42 +08:00 committed by GitHub
parent 566df47ce8
commit 41ea25f927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions

View File

@ -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)
/**
*

View File

@ -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) => {

View File

@ -111,6 +111,7 @@
<PermissionButton
:hasPermission="`${rolePermission}:add`"
@click="form.clickAddItem('roleIdList', 'Role')"
v-if="!admin"
>
<AIcon type="PlusOutlined" />
</PermissionButton>
@ -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';

View File

@ -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/, '')