fix: bug#29904 设备运行状态详情，切换今日、近一周、近一月时，界面展示数据错误（请查看附件）
* fix: bug#菜单管理新增菜单时，排序需优化（默认为10000开始） * fix: bug#29241当前账号无权限时，点击后打开了选择弹窗 * fix: bug#29281 告警记录>>>设备>>>选择筛选条件为产品名称后，可筛选下拉值错误 * fix: bug#29291 物联卡点击详情查看平台类型时，平台类型展示错误 * fix: bug#30018 * fix: bug#29637 OneNet网关目前只使用最新的这一个，原有的需屏蔽 * fix: bug#30403 默认日历标签拖动进日历中，查看颜色展示错误，同实际颜色不一致 * fix: bug#29904 设备运行状态详情，切换今日、近一周、近一月时，界面展示数据错误（请查看附件）
This commit is contained in:
qiaochuLei
GitHub
parent
29930066d5
commit
08c8eda133
File diff suppressed because one or more lines are too long
|
|
@ -44,7 +44,7 @@ export const useSystem = defineStore('system', {
|
|||
collapsed: false,
|
||||
pure: false
|
||||
},
|
||||
calendarTagColor:new Map(),
|
||||
calendarTagColor:new Map([['holiday','rgb(161, 180, 204)'],['weekend','rgb(149, 222, 100)'],['workday', 'rgba(105,177,255)']]),
|
||||
showThreshold: true
|
||||
}),
|
||||
actions: {
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ watch(
|
|||
);
|
||||
|
||||
watch(
|
||||
() => [cycle.value, agg.value, prop.time],
|
||||
() => [cycle.value, agg.value],
|
||||
([newCycle]) => {
|
||||
if (newCycle === '*' && _type.value) {
|
||||
queryChartsList();
|
||||
|
|
@ -315,7 +315,7 @@ watch(
|
|||
queryChartsAggList();
|
||||
}
|
||||
},
|
||||
{ deep: true, immediate: true },
|
||||
{ deep: true},
|
||||
);
|
||||
|
||||
watchEffect(() => {
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ const unbind = (id: string) => {
|
|||
handleSearch();
|
||||
}
|
||||
});
|
||||
return response
|
||||
return response;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -292,9 +292,14 @@ const onSave = () => {
|
|||
formRef.value
|
||||
.validate()
|
||||
.then(async () => {
|
||||
const arr = toRaw(modelRef).dataSource.filter(
|
||||
(i: any) => i.channelId,
|
||||
);
|
||||
const arr = toRaw(modelRef)
|
||||
.dataSource.filter((i: any) => i.channelId)
|
||||
.map((item) => {
|
||||
if (instanceStore.current.state?.value === 'notActive') {
|
||||
item.state = 'disabled';
|
||||
}
|
||||
return item;
|
||||
});
|
||||
if (arr && arr.length !== 0) {
|
||||
console.log(arr);
|
||||
const resp = await saveMapping(
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@
|
|||
platformTypeList.find(
|
||||
(item) =>
|
||||
item.value ===
|
||||
detail.operatorPlatformType?.text,
|
||||
)?.label || detail.operatorPlatformType?.text
|
||||
detail.operatorName,
|
||||
)?.label || detail.operatorName
|
||||
}}</j-descriptions-item>
|
||||
<j-descriptions-item label="平台名称">{{
|
||||
detail.platformConfigName
|
||||
|
|
@ -274,8 +274,8 @@
|
|||
platformTypeList.find(
|
||||
(item) =>
|
||||
item.value ===
|
||||
detail.operatorPlatformType?.text,
|
||||
)?.label || detail.operatorPlatformType?.text
|
||||
detail.operatorName,
|
||||
)?.label || detail.operatorName
|
||||
}}</j-descriptions-item>
|
||||
<j-descriptions-item label="平台名称">{{
|
||||
detail.platformConfigName
|
||||
|
|
|
|||
|
|
@ -139,8 +139,17 @@ const getTypeList = (result: Record<string, any>) => {
|
|||
const cloud: any[] = [];
|
||||
const channel: any[] = [];
|
||||
const edge: any[] = [];
|
||||
result.map((item: any) => {
|
||||
if (item.id === 'fixed-media' || item.id === 'gb28181-2016' || item.id ==='onvif' || item.id === 'media-plugin') {
|
||||
result
|
||||
.filter((i:any) => {
|
||||
return i.id !== 'OneNet';
|
||||
})
|
||||
.forEach((item: any) => {
|
||||
if (
|
||||
item.id === 'fixed-media' ||
|
||||
item.id === 'gb28181-2016' ||
|
||||
item.id === 'onvif' ||
|
||||
item.id === 'media-plugin'
|
||||
) {
|
||||
item.type = 'media';
|
||||
media.push(item);
|
||||
} else if (item.id === 'OneNet' || item.id === 'Ctwing' || item.id === 'OneNet-platform') {
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
accept=".json"
|
||||
:showUploadList="false"
|
||||
:before-upload="beforeUpload"
|
||||
:disabled="!permission"
|
||||
>
|
||||
<PermissionButton
|
||||
hasPermission="notice/Config:import"
|
||||
|
|
@ -220,6 +221,8 @@ Object.keys(MSG_TYPE).forEach((key) => {
|
|||
const configRef = ref<Record<string, any>>({});
|
||||
const params = ref<Record<string, any>>({});
|
||||
|
||||
const permission = usePermissionStore().hasPermission(`notice/Config:import`);
|
||||
|
||||
const columns = [
|
||||
{
|
||||
title: '配置名称',
|
||||
|
|
|
|||
|
|
@ -339,13 +339,14 @@ const newColumns = computed(() => {
|
|||
},
|
||||
];
|
||||
const resp: any = await getAlarmProduct({
|
||||
paging:false,
|
||||
sorts: [{ name: 'alarmTime', order: 'desc' }],
|
||||
terms: termType,
|
||||
});
|
||||
const listMap: Map<string, any> = new Map();
|
||||
|
||||
if (resp.status === 200) {
|
||||
resp.result.data.forEach((item) => {
|
||||
resp.result.forEach((item) => {
|
||||
if (item.productId) {
|
||||
listMap.set(item.productId, {
|
||||
label: item.productName,
|
||||
|
|
|
|||
|
|
@ -229,8 +229,10 @@ const table = reactive({
|
|||
paging: false,
|
||||
};
|
||||
const resp: any = await getMenuTree_api(params);
|
||||
const lastItem = resp.result[resp.result.length - 1];
|
||||
table.total = lastItem ? lastItem.sortIndex + 1 : 1;
|
||||
const menuArr = resp.result.filter((i:any)=>i.code!=='account-center')
|
||||
const lastItem = menuArr[menuArr.length - 1];
|
||||
//个人中心排序为9999需要做过滤特殊处理
|
||||
table.total = lastItem ? lastItem.sortIndex + 1 === 9999 ? 10000 : lastItem.sortIndex + 1 : 1;
|
||||
|
||||
return {
|
||||
code: resp.message,
|
||||
|
|
|
|||
Loading…
Reference in New Issue