0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#11008、11180、11184、11198、11097

This commit is contained in:
jackhoo_98 2023-03-29 19:15:48 +08:00
parent 6d4a442ee8
commit 2c46649750
9 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/DataCollect/Collector/Point/Scan/Table.vue
View File

@ -26,6 +26,10 @@
required: true,
message: '请输入',
},
{
validator: checkLength,
trigger: 'change',
},
]"
>
<j-input

12
src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
View File

@ -88,7 +88,7 @@
import type { FormInstance } from 'ant-design-vue';
import { savePointBatch } from '@/api/data-collect/collector';
import { Rule } from 'ant-design-vue/lib/form';
import { cloneDeep } from 'lodash';
import { cloneDeep, isObject } from 'lodash';
import { regOnlyNumber } from '../../../data';
const props = defineProps({
@ -125,7 +125,15 @@ const handleOk = async () => {
if (ischange) {
const params = cloneDeep(props.data);
params.forEach((i: any) => {
accessModes.length !== 0 && (i.accessModes = data.accessModes);
if (accessModes.length !== 0) {
i.accessModes = data.accessModes;
} else {
if (isObject(i.accessModes)) {
i.accessModes = i.accessModes.map(
(item: any) => item.value,
);
}
}
features.length !== 0 && (i.features = data.features);
if (!!interval) {
i.interval = data.interval;

6
src/views/DataCollect/Collector/Tree/index.vue
View File

@ -28,7 +28,7 @@
defualtDataSource.length !== 0 ||
defualtDataSource?.[0]?.children?.length !== 0
"
:height="600"
:height="660"
defaultExpandAll
>
<template #title="{ name, data }">
@ -302,6 +302,10 @@ watch(
}
}
:deep(.ant-tree-list-holder-inner) {
width: 90%;
}
:deep(.ant-tree-treenode) {
width: 100%;
.ant-tree-node-content-wrapper {

16
src/views/DataCollect/Dashboard/tool.ts
View File

@ -6,19 +6,19 @@ const getParams = (dt: any) => {
return {
limit: 24,
interval: '1h',
format: 'HH:mm',
format: 'YYYY-MM-dd HH:mm',
};
case 'week':
return {
limit: 7,
interval: '1d',
format: 'MM-dd',
format: 'YYYY-MM-dd HH:mm',
};
case 'hour':
return {
limit: 60,
interval: '1m',
format: 'HH:mm',
format: 'YYYY-MM-dd HH:mm',
};
default:
const time = dt.time[1] - dt.time[0];
@ -29,31 +29,31 @@ const getParams = (dt: any) => {
return {
limit: Math.abs(Math.ceil(time / (60 * 60))),
interval: '1m',
format: 'HH:mm',
format: 'YYYY-MM-dd HH:mm',
};
} else if (time > hour && time <= days) {
return {
limit: Math.abs(Math.ceil(time / hour)),
interval: '1h',
format: 'HH:mm',
format: 'YYYY-MM-dd HH:mm',
};
} else if (time > days && time <= days * 7) {
return {
limit: Math.abs(Math.ceil(time / days / 7)) + 1,
interval: '1d',
format: 'YYYY-MM-DD',
format: 'YYYY-MM-dd HH:mm',
};
} else if (time >= year) {
return {
limit: Math.abs(Math.ceil(time / days / 31)) + 1,
interval: '1M',
format: 'yyyy年-M月',
format: 'YYYY-MM-dd HH:mm',
};
} else {
return {
limit: Math.abs(Math.ceil(time / days)) + 1,
interval: '1d',
format: 'MM-dd',
format: 'YYYY-MM-dd HH:mm',
};
}
}

10
src/views/link/AccessConfig/index.vue
View File

@ -188,7 +188,7 @@ import {
} from '@/api/link/accessConfig';
import { onlyMessage } from '@/utils/comm';
import { useMenuStore } from 'store/menu';
import { accessConfigTypeFilter } from '@/utils/setting'
import { accessConfigTypeFilter } from '@/utils/setting';
const menuStory = useMenuStore();
const tableRef = ref<Record<string, any>>({});
@ -304,10 +304,12 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
popConfirm: {
title: '确认删除?',
onConfirm: async () => {
const res = await remove(data.id);
if (res.success) {
const res: any = await remove(data.id);
if (res.status === 200) {
onlyMessage('操作成功', 'success');
tableRef.value.reload();
} else {
onlyMessage(res?.message, 'error');
}
},
},
@ -319,7 +321,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
const getProvidersList = async () => {
const res: any = await getProviders();
providersList.value = res.result;
providersOptions.value = accessConfigTypeFilter(res.result || [])
providersOptions.value = accessConfigTypeFilter(res.result || []);
};
getProvidersList();

2
src/views/link/Certificate/index.vue
View File

@ -80,7 +80,7 @@ const columns = [
type: 'select',
options: [
{
label: '证书标准',
label: '国际标准',
value: 'common',
},
],

1
src/views/link/DashBoard/components/tool.ts
View File

@ -99,6 +99,7 @@ export const networkParams = (val: any) => {
from: Number(val.time.time[0]),
to: Number(val.time.time[1]),
limit: _limit,
format: 'YYYY-MM-dd HH:mm',
},
},
];

6
src/views/link/Protocol/index.vue
View File

@ -238,10 +238,12 @@ const getActions = (
popConfirm: {
title: '确认删除?',
onConfirm: async () => {
const res = await remove(data.id);
if (res.success) {
const res: any = await remove(data.id);
if (res.status === 200) {
onlyMessage('操作成功', 'success');
tableRef.value.reload();
} else {
onlyMessage(res?.message, 'error');
}
},
},

6
src/views/link/Type/index.vue
View File

@ -327,10 +327,12 @@ const getActions = (
popConfirm: {
title: '确认删除?',
onConfirm: async () => {
const res = await remove(data.id);
if (res.success) {
const res: any = await remove(data.id);
if (res.status === 200) {
onlyMessage('操作成功', 'success');
tableRef.value.reload();
} else {
onlyMessage(res?.message, 'error');
}
},
},