fks-xuxinyue 3 months ago
parent
commit
0cb7edaa7e
  1. 4
      hx-ai-intelligent/src/view/equipmentManage/group/config.ts
  2. 13
      hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
  3. 19
      hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
  4. 3
      hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
  5. 47
      hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue
  6. 86
      hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue
  7. 11
      hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue

4
hx-ai-intelligent/src/view/equipmentManage/group/config.ts

@ -78,7 +78,7 @@ const tableCarbonKeyMap = [
{
title: '分组名称',
textNumber: 10,
dataIndex: 'pointName',
dataIndex: 'groupName',
},
{
textNumber: 5,
@ -659,7 +659,7 @@ export const tableConfigCal = (
},
},
{
field: 'provider',
field: 'groupName',
component: 'NsInput',
componentProps: {
placeholder: '请输入分组名称',

13
hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue

@ -36,7 +36,7 @@
:style="{
top: '50px',
left: `${divWidth + 55}px`,
zIndex: 9,
zIndex: 4,
position: 'absolute',
width: `${divWidth}px`,
}"
@ -47,7 +47,7 @@
:style="{
top: '50px',
left: `${divWidth * 2 + 65}px`,
zIndex: 9,
zIndex: 4,
position: 'absolute',
width: `${divWidth}px`,
}"
@ -61,7 +61,7 @@
:style="{
top: '50px',
left: `${divWidth * 3 + 75}px`,
zIndex: 9,
zIndex: 4,
position: 'absolute',
width: `${divWidth}px`,
}"
@ -71,7 +71,7 @@
:style="{
top: '50px',
left: `${divWidth * 4 + 85}px`,
zIndex: 9,
zIndex: 4,
position: 'absolute',
}"
@click="getSelect"
@ -228,8 +228,9 @@
const getDianWeiList = () => {
let deviceIds: any[] = [];
if (checkedKeys.value && checkedKeys.value.length > 0) {
debugger;
checkedKeys.value.forEach((element) => {
if (value.value != element) {
if (value.value != element && value.value != '999999999') {
deviceIds.push(element);
}
});
@ -287,7 +288,7 @@
let deviceIds: any[] = [];
if (checkedKeys.value && checkedKeys.value.length > 0) {
checkedKeys.value.forEach((element) => {
if (value.value != element) {
if (value.value != element && value.value != '999999999') {
deviceIds.push(element);
}
});

19
hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue

@ -40,6 +40,7 @@
v-model:expandedKeys="expandedKeys"
v-model:selectedKeys="selectedKeys"
v-model:checkedKeys="checkedKeys"
:checkStrictly="mode == '0' ? false : true"
:show-line="{ showLeafIcon: false }"
checkable
:height="500"
@ -71,7 +72,7 @@
:style="{
top: '100px',
left: `${divWidth + 55}px`,
zIndex: 9,
zIndex: 4,
position: 'absolute',
width: `${divWidth}px`,
}"
@ -81,7 +82,7 @@
:style="{
top: '100px',
left: `${divWidth * 2 + 65}px`,
zIndex: 9,
zIndex: 4,
position: 'absolute',
width: `${divWidth}px`,
}"
@ -94,7 +95,7 @@
:style="{
top: '100px',
left: `${divWidth * 2 + 65}px`,
zIndex: 9,
zIndex: 4,
position: 'absolute',
width: `${divWidth}px`,
}"
@ -107,7 +108,7 @@
:style="{
top: '100px',
left: `${divWidth * 3 + 75}px`,
zIndex: 9,
zIndex: 4,
position: 'absolute',
}"
@click="getSelect(null)"
@ -276,6 +277,16 @@
if (key) {
keyV = key;
}
if (checkedKeys.value.length > 0) {
let keys = [];
for (let i = 0; i < checkedKeys.value.length; i++) {
if (checkedKeys.value[i] !== '999999999') {
keys.push(checkedKeys.value[i]);
}
}
checkedKeys.value = keys;
}
if (activeKey.value == '1') {
if (checkedKeys.value.length == 0) {
message.warning(mode.value == '0' ? '请先选择设备!' : '请先选择节点!');

3
hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue

@ -53,6 +53,7 @@
<div v-for="(item, index) in ringData" :key="index">
{{ item.name }} : {{ item.value }} {{ item.unit }}
<a-progress
:stroke-color="index == 0 ? '#4388FB' : '#55C3BB'"
:percent="(100 * item.value) / sum"
:show-info="false"
:strokeWidth="15" />
@ -785,7 +786,7 @@
grid: {
height: '80%',
width: '85%',
top: '10%',
top: '5%',
},
xAxis: {
type: 'category',

47
hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue

@ -8,8 +8,7 @@
:data-source="pageData"
bordered
:pagination="false"
style="height: 75%"
:scroll="{ x: x, y: 450 }">
:scroll="{ x: x }">
<template #title>
<div
style="display: flex; align-items: center; justify-content: space-between; width: 100%">
@ -47,24 +46,30 @@
</div>
</template>
</a-table>
<!-- <a-pagination
:current="queryParams.pageNum"
:total="total"
:show-total="(total, range) => ` 共 ${total} 条`"
:page-size="queryParams.pageSize"
style="display: flex; justify-content: right; margin-top: 16px; margin-right: 30px"
:show-size-changer="true"
:show-quick-jumper="true"
@change="onChange" /> -->
<a-pagination
:total="total"
size="small"
:show-total="(total, range) => `显示第${range[0]}到${range[1]}条记录 ,共${total} 条记录`"
show-size-changer
show-quick-jumper
@change="onChange"
style="
display: flex;
justify-content: right;
margin-top: 10px;
margin-right: 30px;
padding-bottom: 10px;
" />
</a-spin>
<a-pagination
:current="queryParams.pageNum"
:total="total"
:show-total="(total, range) => ` 共 ${total} 条`"
:page-size="queryParams.pageSize"
style="
display: flex;
position: absolute;
bottom: 20px;
right: 30px;
justify-content: right;
margin-top: 16px;
margin-right: 30px;
"
:show-size-changer="true"
:show-quick-jumper="true"
@change="onChange" />
</div>
<!-- </a-spin> -->
</template>
@ -245,7 +250,7 @@
::v-deep .ant-table.ant-table-bordered > .ant-table-title {
border: none !important;
}
::v-deep .ant-table-title + .ant-table-container table > thead > tr:first-child th:last-child {
/* ::v-deep .ant-table-title + .ant-table-container table > thead > tr:first-child th:last-child {
display: none !important;
}
} */
</style>

86
hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue

@ -1,6 +1,6 @@
<!-- eslint-disable vue/multi-word-component-names -->
<template>
<div style="background: #ffffff; height: 95%; position: relative">
<div style="background: #ffffff; height: 95%; position: relative; overflow-y: auto">
<a-spin :spinning="loading" style="height: 100%">
<a-table
:columns="tableColumns"
@ -8,7 +8,7 @@
bordered
:pagination="false"
:height="500"
:scroll="{ x: x, y: 440 }">
:scroll="{ x: x }">
<template #title>
<div
style="
@ -68,22 +68,15 @@
</div>
</template>
</a-table>
<a-pagination
:total="total"
size="small"
:show-total="(total, range) => `显示第${range[0]}到${range[1]}条记录 ,共${total} 条记录`"
show-size-changer
show-quick-jumper
@change="onChange"
style="display: flex; justify-content: right; margin-top: 10px; margin-right: 30px" />
</a-spin>
<a-pagination
:total="total"
:show-total="(total, range) => ` 共 ${total} 条`"
show-size-changer
show-quick-jumper
@change="onChange"
style="
display: flex;
position: absolute;
bottom: 20px;
right: 30px;
justify-content: right;
margin-top: 10px;
margin-right: 30px;
" />
</div>
</template>
<script lang="ts" setup>
@ -288,7 +281,7 @@
//
const getTableList = () => {
loading.value = true;
tableColumns.value = [];
tableColumns.value = tableColumnsA;
data.value = [];
total.value = 0;
pageData.value = [];
@ -318,26 +311,31 @@
timeRate: frequencyValue.value, //
})
.then((res) => {
//
let headerList = res.data.headerList;
let tableColumnsB = [];
for (let i = 0; i < headerList.length; i++) {
tableColumnsB.push({
title: headerList[i],
dataIndex: headerList[i],
width: 60,
align: 'center',
});
}
x.value = 360 + headerList.length * 60;
let columnA: any[] = [...tableColumnsA];
columnA.push(...tableColumnsB);
tableColumns.value = columnA;
if (res.retcode == 0) {
//
let headerList = res.data.headerList;
let tableColumnsB = [];
for (let i = 0; i < headerList.length; i++) {
tableColumnsB.push({
title: headerList[i],
dataIndex: headerList[i],
width: 60,
align: 'center',
});
}
x.value = 360 + headerList.length * 60;
debugger;
let columnA: any[] = [...tableColumnsA];
columnA.push(...tableColumnsB);
tableColumns.value = columnA;
//
data.value = res.data.data;
total.value = res.data.data.length;
onChange(1, 10);
//
data.value = res.data.data;
total.value = res.data.data.length;
onChange(1, 10);
} else {
x.value = 360;
}
})
.finally(() => {
loading.value = false;
@ -349,10 +347,10 @@
.get(environmentMonitor.queryDeviceArea, { orgId: orgId.value, point: typeValue.value })
.then((res) => {
treeData2.value = res.data;
if (treeData2.value && treeData2.value.length > 0) {
quyuvalue.value = [treeData2.value[0].childList[0].id];
getTableList();
}
// if (treeData2.value && treeData2.value.length > 0) {
// quyuvalue.value = [treeData2.value[0].childList[0].id];
// getTableList();
// }
});
};
// excel
@ -360,6 +358,7 @@
exportExcel(tableColumns.value, data.value, '历史数据导出', true, 'location', 1, 3);
};
onMounted(async () => {
tableColumns.value = tableColumnsA;
//
let frequency = await getEnum({ params: { enumType: 'TimeFlagEnum' } });
frequencyOptions.value = frequency.data;
@ -378,6 +377,7 @@
}
//
await queryDeviceArea();
getTableList();
});
//
@ -403,7 +403,7 @@
::v-deep .ant-table.ant-table-bordered > .ant-table-title {
border: none !important;
}
::v-deep .ant-table-title + .ant-table-container table > thead > tr:first-child th:last-child {
/* ::v-deep .ant-table-title + .ant-table-container table > thead > tr:first-child th:last-child {
display: none !important;
}
} */
</style>

11
hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue

@ -9,11 +9,8 @@
margin-top: 0.5%;
padding-left: 1.5%;
background: #ffffff;
font-family: 'PingFang SC';
font-size: 16px;
font-weight: 700;
letter-spacing: 1.33px;
line-height: 21px;
">
<a-tab-pane key="1" tab="综合数据" />
<a-tab-pane key="2" tab="历史数据" />
@ -29,8 +26,8 @@
</div>
<aggregate-data ref="aggregateDataRef" v-if="activeKey == '1'" style="height: 85%" />
<history-data ref="historyDataRef" v-if="activeKey == '2'" />
<average-data ref="averageDataRef" v-if="activeKey == '3'" />
<history-data ref="historyDataRef" v-if="activeKey == '2'" style="height: 90%" />
<average-data ref="averageDataRef" v-if="activeKey == '3'" style="height: 85%" />
</div>
<a-modal
@ -451,8 +448,6 @@
<style lang="less" scoped>
::v-deep .ant-tabs-tab {
font-weight: 700; /* 选中标签的加粗 */
// font-size: 16px;
// letter-spacing: 1.33px;
color: #666666 !important;
}
::v-deep .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {

Loading…
Cancel
Save