fix:修改页面 添加 计划添加页面

This commit is contained in:
zhaohy
2024-08-08 14:33:33 +08:00
parent 3672d6feb3
commit 7758049b28
12 changed files with 71 additions and 36 deletions

View File

@@ -119,6 +119,25 @@ const equipmentControl = {
}, },
], ],
}, },
{
path: 'planToAdd',
name: 'planToAdd',
meta: { title: '计划添加', hideChildren: true, icon: 'shebeiqunkong' },
component: Base,
redirect: { name: 'planToAddIndex' },
children: [
{
path: 'index',
name: 'planToAddIndex',
component: () => import('/@/view/equipmentControl/planToAdd/index.vue'),
meta: {
title: '计划添加',
keepAlive: false,
// backApi: [],
},
},
],
},
], ],
}; };
export default equipmentControl; export default equipmentControl;

View File

@@ -136,21 +136,21 @@
const echartPieOne = ref(null); const echartPieOne = ref(null);
const echartPieTow = ref(null); const echartPieTow = ref(null);
const getGraphChart = async () => { const getGraphChart = async () => {
let dayData = []; let dayData: any = [];
// 能源告警 // 能源告警
let energyAlarm = []; let energyAlarm: any = [];
// 网关告警 // 网关告警
let wgAlarm = []; let wgAlarm: any = [];
// 设备告警 // 设备告警
let equipmentAlarm = []; let equipmentAlarm: any = [];
let total = []; let total: any = [];
await http await http
.post(alarmOverviewApi.getAlarmTrend, { .post(alarmOverviewApi.getAlarmTrend, {
orgId: orgId.value, orgId: orgId.value,
}) })
.then((res) => { .then((res) => {
if (res.msg === 'success') { if (res.msg === 'success') {
res.data.forEach((item: any, index) => { res.data.forEach((item: any) => {
energyAlarm.push(item.alarmEnergyConsumptionNum); energyAlarm.push(item.alarmEnergyConsumptionNum);
wgAlarm.push(item.alarmGatewayNum); wgAlarm.push(item.alarmGatewayNum);
equipmentAlarm.push(item.alarmEquipmentNum); equipmentAlarm.push(item.alarmEquipmentNum);
@@ -180,7 +180,7 @@
axisPointer: { axisPointer: {
type: 'shadow', type: 'shadow',
}, },
formatter: function (params) { formatter: function (params: any) {
let res = let res =
params[0].axisValue + params[0].axisValue +
'<br/>' + '<br/>' +
@@ -238,6 +238,11 @@
show: false, show: false,
}, },
data: dayData, data: dayData,
axisLabel: {
show: true, // 显示所有刻度值
interval: 1, // 显示所有刻度,不跳过
// rotate: 45, // 可选:如果标签过长,可以旋转标签以避免重叠
},
}, },
], ],
yAxis: [ yAxis: [
@@ -330,7 +335,7 @@
color: '#000000', color: '#000000',
position: 'top', position: 'top',
top: '10', top: '10',
formatter: function (value) { formatter: function (value: any) {
return ( return (
Number(energyAlarm[value.dataIndex]) + Number(energyAlarm[value.dataIndex]) +
Number(wgAlarm[value.dataIndex]) + Number(wgAlarm[value.dataIndex]) +
@@ -426,7 +431,7 @@
fontSize: 14, fontSize: 14,
fontWeight: 'bold', fontWeight: 'bold',
}, },
formatter: function (parms) { formatter: function (parms: any) {
return '[ ' + parms.data.name + ' ] : ' + parms.data.value; return '[ ' + parms.data.name + ' ] : ' + parms.data.value;
}, },
}, },
@@ -538,7 +543,7 @@
fontSize: 14, fontSize: 14,
fontWeight: 'bold', fontWeight: 'bold',
}, },
formatter: function (parms) { formatter: function (parms: any) {
return '[ ' + parms.data.name + ' ] : ' + parms.data.value; return '[ ' + parms.data.name + ' ] : ' + parms.data.value;
}, },
}, },

View File

@@ -145,8 +145,8 @@
return data.list.length === 0; return data.list.length === 0;
}, },
handle: (data: any) => { handle: (data: any) => {
let ids = []; let ids: any = [];
data.list.forEach((item) => { data.list.forEach((item: any) => {
ids.push(item.id); ids.push(item.id);
}); });
data.list = []; data.list = [];

View File

@@ -123,8 +123,8 @@
return data.list.length === 0; return data.list.length === 0;
}, },
handle: (data: any) => { handle: (data: any) => {
let ids = []; let ids: any = [];
data.list.forEach((item) => { data.list.forEach((item: any) => {
ids.push(item.id); ids.push(item.id);
}); });
data.list = []; data.list = [];

View File

@@ -180,10 +180,10 @@
//获取 通知方式 //获取 通知方式
const getNotificationMethod = (data: any) => { const getNotificationMethod = (data: any) => {
if (!data) return ''; if (!data) return '';
const methods = []; const methods: any = [];
const notifications = data.split(','); const notifications = data.split(',');
notifications.forEach((notification) => { notifications.forEach((notification: any) => {
if (notification === '1') { if (notification === '1') {
methods.push('站内信息'); methods.push('站内信息');
} else if (notification === '2') { } else if (notification === '2') {

View File

@@ -90,9 +90,10 @@
{ {
title: '姓名', title: '姓名',
dataIndex: 'realName', dataIndex: 'realName',
width: 80, width: 100,
fixed: 'left', fixed: 'left',
key: 'deviceName', key: 'deviceName',
ellipsis: true,
}, },
{ {
title: '性别', title: '性别',
@@ -142,8 +143,8 @@
//点击联系人 //点击联系人
const chengUser = () => { const chengUser = () => {
visibleModel.value = true; visibleModel.value = true;
let ids = []; let ids: any = [];
dataSource.value.forEach((item) => { dataSource.value.forEach((item: any) => {
ids.push(item.userId); ids.push(item.userId);
}); });
// 传到子页面 // 传到子页面
@@ -311,4 +312,3 @@
width: 20%; width: 20%;
} }
</style> </style>
../../../../api/alarmManagement/alarmSettings/notificationManagements

View File

@@ -151,8 +151,8 @@
getList(); getList();
}; };
// 递归处理部门树数据 // 递归处理部门树数据
const processDepartmentTree = (tree) => { const processDepartmentTree = (tree: any) => {
tree.forEach((item) => { tree.forEach((item: any) => {
item.deptInfo = item.deptInfo; item.deptInfo = item.deptInfo;
item.key = item.deptInfo.deptId; item.key = item.deptInfo.deptId;
item.title = item.deptInfo.deptName; item.title = item.deptInfo.deptName;
@@ -162,9 +162,9 @@
}; };
// 获取部门树 // 获取部门树
const getDepartList = (params) => { const getDepartList = (params: any) => {
return http.post(department.queryDeptTree, params).then((res) => { return http.post(department.queryDeptTree, params).then((res) => {
const result = res.data.map((item) => ({ const result = res.data.map((item: any) => ({
key: item.orgInfo.orgId, key: item.orgInfo.orgId,
orgInfo: item.orgInfo, orgInfo: item.orgInfo,
title: item.orgInfo.orgName, title: item.orgInfo.orgName,
@@ -221,8 +221,8 @@
const onSelectChange = (selectedRowKeys: any, selectedRows: any) => { const onSelectChange = (selectedRowKeys: any, selectedRows: any) => {
selectedRowKey.value = selectedRowKeys; selectedRowKey.value = selectedRowKeys;
// 使用 forEach 循环遍历 selectedRows 数组 // 使用 forEach 循环遍历 selectedRows 数组
let newSelectRows = []; let newSelectRows: any = [];
selectedRows.forEach((item, index) => { selectedRows.forEach((item: any) => {
if (item) { if (item) {
newSelectRows.push(item); newSelectRows.push(item);
} }
@@ -244,6 +244,7 @@
{ {
title: '序号', title: '序号',
dataIndex: 'index', dataIndex: 'index',
width: 80,
customRender: (text: any) => { customRender: (text: any) => {
return text.index + 1; return text.index + 1;
}, },
@@ -251,6 +252,8 @@
{ {
title: '姓名', title: '姓名',
dataIndex: 'realName', dataIndex: 'realName',
width: 100,
ellipsis: true,
}, },
{ {
title: '性别', title: '性别',

View File

@@ -101,7 +101,7 @@
}; };
const getChatr = () => { const getChatr = () => {
let dayData = []; let dayData = [];
let energyAlarm = []; let energyAlarm: any = [];
// Extend data for 30 days // Extend data for 30 days
for (let i = 1; i < 30; i++) { for (let i = 1; i < 30; i++) {
@@ -178,7 +178,7 @@
show: true, // 显示 X 轴刻度标签 show: true, // 显示 X 轴刻度标签
color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色 color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色
fontSize: 12, // X 轴刻度标签的字体大小 fontSize: 12, // X 轴刻度标签的字体大小
formatter: function (value) { formatter: function (value: any) {
// 可选:格式化 X 轴刻度标签文本 // 可选:格式化 X 轴刻度标签文本
return value; return value;
}, },
@@ -204,7 +204,7 @@
}, },
axisLabel: { axisLabel: {
show: true, // 显示 show: true, // 显示
formatter: function (value) { formatter: function (value: any) {
return value + ' V'; // 在刻度值后加上单位 return value + ' V'; // 在刻度值后加上单位
}, },
}, },
@@ -236,7 +236,7 @@
color: 'rgb(89, 89, 89)', color: 'rgb(89, 89, 89)',
position: 'top', position: 'top',
top: '10', top: '10',
formatter: function (value) { formatter: function (value: any) {
return Number(energyAlarm[value.dataIndex]) + 'V'; return Number(energyAlarm[value.dataIndex]) + 'V';
}, },
}, },

View File

@@ -100,7 +100,7 @@
}; };
const getChatr = () => { const getChatr = () => {
let dayData = []; let dayData = [];
let energyAlarm = []; let energyAlarm: any = [];
// Extend data for 30 days // Extend data for 30 days
for (let i = 1; i < 30; i++) { for (let i = 1; i < 30; i++) {
@@ -177,7 +177,7 @@
show: true, // 显示 X 轴刻度标签 show: true, // 显示 X 轴刻度标签
color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色 color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色
fontSize: 12, // X 轴刻度标签的字体大小 fontSize: 12, // X 轴刻度标签的字体大小
formatter: function (value) { formatter: function (value: any) {
// 可选:格式化 X 轴刻度标签文本 // 可选:格式化 X 轴刻度标签文本
return value; return value;
}, },
@@ -203,7 +203,7 @@
}, },
axisLabel: { axisLabel: {
show: true, // 显示 show: true, // 显示
formatter: function (value) { formatter: function (value: any) {
return value + ' V'; // 在刻度值后加上单位 return value + ' V'; // 在刻度值后加上单位
}, },
}, },
@@ -235,7 +235,7 @@
color: 'rgb(89, 89, 89)', color: 'rgb(89, 89, 89)',
position: 'top', position: 'top',
top: '10', top: '10',
formatter: function (value) { formatter: function (value: any) {
return Number(energyAlarm[value.dataIndex]) + 'V'; return Number(energyAlarm[value.dataIndex]) + 'V';
}, },
}, },

View File

@@ -164,7 +164,7 @@
color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色 color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色
fontSize: 12, // X 轴刻度标签的字体大小 fontSize: 12, // X 轴刻度标签的字体大小
interval: 0, // 显示所有刻度标签 interval: 0, // 显示所有刻度标签
formatter: function (value) { formatter: function (value: any) {
// 可选:格式化 X 轴刻度标签文本 // 可选:格式化 X 轴刻度标签文本
return value; return value;
}, },
@@ -190,7 +190,7 @@
}, },
axisLabel: { axisLabel: {
show: true, // 显示 show: true, // 显示
formatter: function (value) { formatter: function (value: any) {
return value; return value;
}, },
}, },

View File

@@ -49,6 +49,7 @@
visible.value = false; visible.value = false;
}; };
const toggle = async (data) => { const toggle = async (data) => {
console.log(data, 'xxxxxx');
let states = await getEnum({ params: { enumType: 'AlarmLogStateEnum' } }); let states = await getEnum({ params: { enumType: 'AlarmLogStateEnum' } });
stateOptions.value = states.data; stateOptions.value = states.data;
let stateMap = { let stateMap = {

View File

@@ -0,0 +1,7 @@
<template> xxxxx </template>
<script lang="ts" setup>
import { ref, onMounted, onUnmounted } from 'vue';
onMounted(() => {});
onUnmounted(() => {});
</script>