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

Merge branch '2.0-bugfix' into dev

This commit is contained in:
xieyonghong 2023-04-26 18:08:48 +08:00
parent a01d4d278a ca4c364155
commit c2ad03d526
19 changed files with 170 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/components/Layout/components/Notice.vue
View File

@ -45,47 +45,43 @@ const subscribeNotice = () => {
total.value += 1;
notification.open({
message: resp?.payload?.topicName,
description: () => (
<div
class="ellipsis"
style={{ cursor: 'pointer' }}
onClick={() => {
{
/* changeStatus_api('_read', [resp.id]); */
}
read('', resp);
}}
>
{resp?.payload?.message}
</div>
),
description: () =>
h(
'div',
{
class: "ellipsis",
style: {
cursor: 'pointer'
},
onClick: () => {
read('', resp);
}
},
{
default: () => resp?.payload?.message
}
)
,
onClick: () => {
// changeStatus_api('_read', [resp.id])
read('', resp);
},
key: resp.payload.id,
btn: (
<Button
type="primary"
size="small"
onClick={(e) => {
{
/* changeStatus_api('_read', [resp.id]).then(
(resp: any) => {
if (resp.status === 200) {
notification.close(resp.payload.id);
getList();
}
},
); */
}
e.stopPropagation();
read('_read', resp);
}}
>
标记已读
</Button>
),
btn: () =>
h(
Button,
{
type: "primary",
size: "small",
onClick: (e: Event) => {
e.stopPropagation();
read('_read', resp);
}
},
{
default: () => "标记已读"
}
),
});
});
};

4
src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
View File

@ -62,9 +62,9 @@
/>
</j-form-item>
<p style="color: #616161" v-if="formData.configuration.function">
PLC地址:{{
PLC地址: {{
InitAddress[formData.configuration.function] +
formData.pointKey || 0
Number(formData.pointKey) || 0
}}
</p>
<j-form-item

34
src/views/DataCollect/Collector/Point/index.vue
View File

@ -376,7 +376,8 @@ const defaultParams = ref({
terms: [
{
column: 'collectorId',
value: props.data.id,
termType: 'eq',
value: !props.data?.id ? 'undefined' : (props.data.id === '*' ? undefined : props.data.id),
},
],
},
@ -468,7 +469,7 @@ const columns = [
const subRef = ref();
const propertyValue = ref(new Map());
const cacheIds = ref<string>()
const showBatch = ref(false);
const clickBatch = () => {
@ -628,10 +629,10 @@ const handleSubscribeValue = throttle((payload: any) => {
const subscribeProperty = (value: any) => {
const list = value.map((item: any) => item.id);
const id = `collector-${props.data?.channelId || 'channel'}-${
props.data?.id || 'point'
(props.data?.id || (props.data && props.data.id === '*')) ? 'point' : props.data?.id
}-data-${list.join('-')}`;
const topic = `/collector/${props.data?.channelId || '*'}/${
props.data?.id || '*'
(props.data?.id || (props.data && props.data.id === '*')) ? '*' : props.data?.id
}/data`;
subRef.value = getWebSocket(id, topic, {
pointId: list.join(','),
@ -657,15 +658,18 @@ const onCheckAllChange = (e: any) => {
watch(
() => tableRef?.value?._dataSource,
(value) => {
subRef.value?.unsubscribe();
if (value.length !== 0) {
subscribeProperty(value);
value.forEach((item: any) => {
item?.accessModes?.forEach((i: any) => {
if (i?.value === 'read') {
ReadIdMap.set(item.id, item);
}
});
});
setTimeout(() => {
subscribeProperty(value);
value.forEach((item: any) => {
item?.accessModes?.forEach((i: any) => {
if (i?.value === 'read') {
ReadIdMap.set(item.id, item);
}
});
});
}, 100)
}
cancelSelect();
checkAll.value = false;
@ -691,7 +695,7 @@ watch(
label: '订阅',
value: 'subscribe',
});
defaultParams.value.terms[0].terms[0].value = value.id;
defaultParams.value.terms[0].terms[0].value = !value.id ? 'undefined' : (value.id === '*' ? undefined : value.id);
tableRef?.value?.reload && tableRef?.value?.reload();
cancelSelect();
checkAll.value = false;
@ -701,9 +705,7 @@ watch(
);
onUnmounted(() => {
if (subRef.value) {
subRef.value?.unsubscribe();
}
subRef.value?.unsubscribe();
});
/**

8
src/views/DataCollect/Collector/Tree/Save/index.vue
View File

@ -224,12 +224,12 @@ const handleOk = async () => {
loading.value = true;
const response = !id
? await save(params)
: await update(id, { ...props.data, ...params });
if (response.status === 200) {
? await save(params).catch(() => { success: false })
: await update(id, { ...props.data, ...params }).catch(() => { success: false });
loading.value = false;
if (response.success) {
emit('change', true);
}
loading.value = false;
};
const getTypeTooltip = (value: string) =>

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

@ -25,8 +25,8 @@
v-model:selected-keys="selectedKeys"
:fieldNames="{ key: 'id' }"
v-if="
defualtDataSource.length !== 0 ||
defualtDataSource?.[0]?.children?.length !== 0
!(defualtDataSource.length === 0 ||
defualtDataSource?.[0]?.children?.length === 0)
"
:height="660"
defaultExpandAll
@ -247,7 +247,7 @@ const handleSearch = async (value: any) => {
collectorAll.value = res.result;
if (selectedKeys.value.length === 0) {
selectedKeys.value = ['*'];
selectedKeys.value = res.result.length ? ['*'] : [];
}
//激活change事件
@ -259,8 +259,8 @@ const handleSearch = async (value: any) => {
}
spinning.value = false;
};
const getChannelNoPaging = async () => {
const res = await queryChannelNoPaging();
Store.set('channelListAll', res.result);
};
@ -275,8 +275,14 @@ watch(
(n, p) => {
const key = _.isArray(n) ? n[0] : n;
if (key) {
if (key !== "*") {
const row = collectorAll.value.find((i: any) => i.id === key);
emits('change', row);
} else {
emits('change', {
id: '*'
});
}
} else {
selectedKeys.value = p; // 防止取消
}

2
src/views/DataCollect/Collector/index.vue
View File

@ -19,7 +19,7 @@ import Tree from './Tree/index.vue';
import Point from './Point/index.vue';
const data = ref();
const spinning = ref(true);
const spinning = ref(false);
const changeTree = (row: any) => {
spinning.value = true;

8
src/views/device/Instance/Detail/Info/components/Config/Save.vue
View File

@ -21,9 +21,11 @@
<j-form layout="vertical" ref="formRef" :model="modelRef">
<template v-for="(item, index) in (props.config || [])" :key="index">
<j-form-item
:name="item.property"
v-for="i in item.properties"
:name="i.property"
:key="i.property"
:required='!!i.type.expands?.required'
:rules='!!i.type.expands?.required ? [{ required: true, message: `请输入${i.name}`}] :[]'
>
<template #label>
<span style="margin-right: 5px">{{ i.name }}</span>
@ -90,7 +92,8 @@ const onClose = () => {
};
const saveBtn = () => {
formRef.value.validate().then(async () => {
formRef.value.validate().then(async (res) => {
if (res) {
const values = toRaw(modelRef);
const resp = await modify(instanceStore.current?.id || '', {
id: instanceStore.current?.id,
@ -100,6 +103,7 @@ const saveBtn = () => {
message.success('操作成功！')
emit('save');
}
}
});
};
</script>

8
src/views/device/Instance/Process/index.vue
View File

@ -54,7 +54,7 @@ const handleCancel = () => {
};
const _percent = computed(() => {
return ((errCount.value + count.value) / total.value * 100).toFixed(2)
return total.value ? ((errCount.value + count.value) / total.value * 100).toFixed(2) : 0
})
const getData = (api: string) => {
@ -82,6 +82,12 @@ const getData = (api: string) => {
default:
break;
}
if ((count.value + errCount.value) >= total.value) {
setTimeout(() => {
_source.close();
flag.value = false;
}, 500)
}
};
_source.onerror = () => {
_source.close();

7
src/views/device/Product/Detail/DeviceAccess/accessModal.vue
View File

@ -12,7 +12,7 @@
<pro-search
:columns="columns"
target="deviceModal"
@search="search"
@search="handleSearch"
type="simple"
/>
<JProTable
@ -27,7 +27,7 @@
{ name: 'createTime', order: 'desc' },
] : [{ name: 'createTime', order: 'desc' }],
}"
:params="queryParams"
:params="params"
@cancelSelect="cancelSelect"
:gridColumn="2"
:gridColumns="[2]"
@ -164,6 +164,7 @@ const params = ref<Record<string, any>>({
pageSize: 4,
terms: [],
})
const selectedRowKeys = ref<string[]>(props.accessId ? [props.accessId] : [])
const getDescription = (slotProps: Record<string, any>) =>
@ -289,7 +290,7 @@ const cancel = () => {
};
const handleSearch = (e: any) => {
params.value = e;
params.value.terms = e.terms;
};
const handleClick = (data: any) => {

2
src/views/link/AccessConfig/components/Media/GB28181.vue
View File

@ -655,7 +655,7 @@ const saveData = () => {
if (route.query.save) {
// @ts-ignore
window?.onTabSaveSuccess(resp);
window.close();
setTimeout(() => window.close(), 300);
} else {
history.back();
}

2
src/views/link/AccessConfig/components/Media/index.vue
View File

@ -125,7 +125,7 @@ const onFinish = async (values: any) => {
if (route.query.save) {
// @ts-ignore
window?.onTabSaveSuccess(resp.result);
window.close();
setTimeout(() => window.close(), 300);
} else {
history.back();
}

28
src/views/link/DashBoard/components/Cpu.vue
View File

@ -61,6 +61,13 @@ import {
} from './tool.ts';
import { DataType } from '../typings';
const props = defineProps({
serviceId: {
type: String,
default: undefined
}
})
const chartRef = ref<Record<string, any>>({});
const loading = ref(false);
const data = ref<DataType>({
@ -79,7 +86,8 @@ const getCPUEcharts = async (val: any) => {
const _cpuOptions = {};
const _cpuXAxis = new Set();
if (res.result?.length) {
res.result.forEach((item: any) => {
const filterArray = res.result.filter((item : any) => item.data?.clusterNodeId === props.serviceId)
filterArray.forEach((item: any) => {
const value = item.data.value;
const nodeID = item.data.clusterNodeId;
_cpuXAxis.add(
@ -168,16 +176,14 @@ watch(
},
{ immediate: true, deep: true },
);
watch(
() => data.value,
(val) => {
const { time } = val;
if (time && Array.isArray(time) && time.length === 2 && time[0]) {
getCPUEcharts(val);
}
},
{ immediate: true, deep: true },
);
watchEffect(() => {
const time = data.value.time
if (time && Array.isArray(time) && time.length === 2 && time[0] && props.serviceId) {
getCPUEcharts(data.value);
}
})
</script>
<style lang="less" scoped>

28
src/views/link/DashBoard/components/Jvm.vue
View File

@ -61,6 +61,13 @@ import {
} from './tool.ts';
import { DataType } from '../typings';
const props = defineProps({
serviceId: {
type: String,
default: undefined
}
})
const chartRef = ref<Record<string, any>>({});
const loading = ref(false);
const data = ref<DataType>({
@ -79,7 +86,8 @@ const getJVMEcharts = async (val: any) => {
const _jvmOptions = {};
const _jvmXAxis = new Set();
if (res.result?.length) {
res.result.forEach((item: any) => {
const filterArray = res.result.filter((item : any) => item.data?.clusterNodeId === props.serviceId)
filterArray.forEach((item: any) => {
const value = item.data.value;
const memoryJvmHeapFree = value.memoryJvmHeapFree;
const memoryJvmHeapTotal = value.memoryJvmHeapTotal;
@ -172,16 +180,14 @@ watch(
},
{ immediate: true, deep: true },
);
watch(
() => data.value,
(val) => {
const { time } = val;
if (time && Array.isArray(time) && time.length === 2 && time[0]) {
getJVMEcharts(val);
}
},
{ immediate: true, deep: true },
);
watchEffect(() => {
const time = data.value.time
if (time && Array.isArray(time) && time.length === 2 && time[0] && props.serviceId) {
getJVMEcharts(data.value);
}
})
</script>
<style lang="less" scoped>

30
src/views/link/DashBoard/components/Network.vue
View File

@ -69,6 +69,13 @@ import dayjs from 'dayjs';
import * as echarts from 'echarts';
import { DataType } from '../typings.d';
const props = defineProps({
serviceId: {
type: String,
default: undefined
}
})
const chartRef = ref<Record<string, any>>({});
const loading = ref(false);
const data = ref<DataType>({
@ -90,7 +97,8 @@ const getNetworkEcharts = async (val: any) => {
const _networkOptions = {};
const _networkXAxis = new Set();
if (resp.result.length) {
resp.result.forEach((item: any) => {
const filterArray = resp.result.filter((item : any) => item.data?.clusterNodeId === props.serviceId)
filterArray.forEach((item: any) => {
const value = item.data.value;
const _data: Array<any> = [];
const nodeID = item.data.clusterNodeId;
@ -191,18 +199,14 @@ watch(
},
{ immediate: true, deep: true },
);
watch(
() => data.value,
(value) => {
const {
time: { time },
} = value;
if (time && Array.isArray(time) && time.length === 2 && time[0]) {
getNetworkEcharts(value);
}
},
{ immediate: true, deep: true },
);
watchEffect(() => {
const time = data.value.time.time
if (time && Array.isArray(time) && time.length === 2 && time[0] && props.serviceId) {
getNetworkEcharts(data.value);
}
})
</script>
<style lang="less" scoped>

19
src/views/link/DashBoard/components/TopCard.vue
View File

@ -60,15 +60,26 @@ const topValues = ref({
systemUsage: 0,
systemUsageTotal: 0,
});
const wsRef = ref<any>()
const emit = defineEmits(['serviceChange'])
const serverIdChange = (val: string) => {
serverId.value = val;
};
const unSub = () => {
if (wsRef.value) {
wsRef.value.unsubscribe()
}
}
const getData = () => {
const id = 'operations-statistics-system-info-realTime';
const topic = '/dashboard/systemMonitor/stats/info/realTime';
getWebSocket(id, topic, {
unSub()
wsRef.value = getWebSocket(id, topic, {
type: 'all',
serverNodeId: serverId.value,
interval: '1s',
@ -118,10 +129,16 @@ onMounted(() => {
});
}
});
onUnmounted(() => {
unSub()
})
watch(
() => serverId.value,
(val) => {
val && getData();
emit('serviceChange', val)
},
);
</script>

15
src/views/link/DashBoard/index.vue
View File

@ -2,10 +2,10 @@
<page-container>
<div>
<j-row :gutter="[24, 24]">
<j-col :span="24"><TopCard /> </j-col>
<j-col :span="24"><Network /></j-col>
<j-col :span="12"><Cpu /></j-col>
<j-col :span="12"><Jvm /></j-col>
<j-col :span="24"><TopCard @serviceChange='serviceChange' /> </j-col>
<j-col :span="24"><Network :serviceId='serviceId' /></j-col>
<j-col :span="12"><Cpu :serviceId='serviceId'/></j-col>
<j-col :span="12"><Jvm :serviceId='serviceId'/></j-col>
</j-row>
</div>
</page-container>
@ -16,6 +16,13 @@ import TopCard from './components/TopCard.vue';
import Network from './components/Network.vue';
import Cpu from './components/Cpu.vue';
import Jvm from './components/Jvm.vue';
const serviceId = ref<string | undefined>()
const serviceChange = (id: string) => {
serviceId.value = id
}
</script>
<style lang="less" scoped></style>

2
src/views/system/Department/components/LeftTree.vue
View File

@ -188,7 +188,7 @@ function delDepartment(id: string) {
function refresh(id: string) {
// @ts-ignore
window?.onTabSaveSuccess && window.onTabSaveSuccess(id);
window.close();
setTimeout(() => window.close(), 300);
getTree();
}

2
src/views/system/Role/components/AddDialog.vue
View File

@ -65,7 +65,7 @@ const confirm = () => {
if (route.query.save) {
// @ts-ignore
window?.onTabSaveSuccess(resp.result.id);
window.close();
setTimeout(() => window.close(), 300);
} else jumpPage(`system/Role/Detail`, { id: resp.result.id });
}
})

4
vite.config.ts
View File

@ -95,8 +95,8 @@ export default defineConfig(({ mode}) => {
// target: 'http://192.168.32.226:8844',
// target: 'http://192.168.32.244:8881',
target: 'http://120.77.179.54:8844', // 120测试
// target: 'http://192.168.33.46:8844', // 本地开发环境
ws: 'ws://192.168.33.46:8844',
// target: 'http://192.168.33.46:8844', // 本地开发环境
ws: 'ws://120.77.179.54:8844',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '')
}