Merge branch 'dev' into dev-dictionary

# Conflicts:
#	vite.config.ts
This commit is contained in:
XieYongHong 2023-09-20 19:58:46 +08:00
commit f719c99d64
3 changed files with 14 additions and 4 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, deviceId.value,
channelId.value, channelId.value,
params, params,
); ).finally(()=>{
loading.value = false;
})
if (localResp.status === 200 && localResp.result.length) { if (localResp.status === 200 && localResp.result.length) {
const serviceResp = await playBackApi.recordsInServer( const serviceResp = await playBackApi.recordsInServer(
deviceId.value, deviceId.value,
@ -247,10 +249,8 @@ const queryLocalRecords = async (date: Dayjs) => {
includeFiles: false, includeFiles: false,
}, },
); );
loading.value = false;
let newList: recordsItemType[] = serviceResp.result; let newList: recordsItemType[] = serviceResp.result;
// console.log(newList) // console.log(newList)
if (serviceResp.status === 200 && serviceResp.result) { if (serviceResp.status === 200 && serviceResp.result) {
// //
newList = localResp.result.map((item: recordsItemType) => { newList = localResp.result.map((item: recordsItemType) => {

View File

@ -112,6 +112,7 @@
<PermissionButton <PermissionButton
:hasPermission="`${rolePermission}:add`" :hasPermission="`${rolePermission}:add`"
@click="form.clickAddItem('roleIdList', 'Role')" @click="form.clickAddItem('roleIdList', 'Role')"
v-if="!admin"
> >
<AIcon type="PlusOutlined" /> <AIcon type="PlusOutlined" />
</PermissionButton> </PermissionButton>
@ -208,6 +209,15 @@ import { AxiosResponse } from 'axios';
import { passwordRegEx } from '@/utils/validate'; import { passwordRegEx } from '@/utils/validate';
import { filterSelectNode, onlyMessage } from '@/utils/comm'; import { filterSelectNode, onlyMessage } from '@/utils/comm';
import { uniqBy } from 'lodash-es'; 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 deptPermission = 'system/Department';
const rolePermission = 'system/Role'; const rolePermission = 'system/Role';