diff --git a/hx-ai-intelligent/src/icon/biaoge1.svg b/hx-ai-intelligent/src/icon/biaoge1.svg
new file mode 100644
index 0000000..d2840f4
--- /dev/null
+++ b/hx-ai-intelligent/src/icon/biaoge1.svg
@@ -0,0 +1,8 @@
+
diff --git a/hx-ai-intelligent/src/icon/zhexiantu.svg b/hx-ai-intelligent/src/icon/zhexiantu.svg
new file mode 100644
index 0000000..1beacba
--- /dev/null
+++ b/hx-ai-intelligent/src/icon/zhexiantu.svg
@@ -0,0 +1,8 @@
+
diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/graph/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/graph/index.vue
index 6b1b1fb..bce40be 100644
--- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/graph/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/graph/index.vue
@@ -1,5 +1,26 @@
+
+
diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue
index e11c3c7..280a377 100644
--- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue
@@ -96,6 +96,7 @@
const column: TableColumnType[] = [
{
title: '序号',
+ width: 50,
customRender: ({ record, index }) => {
// 自定义单元格内容,这里返回序号
if (index == 0) {
diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
index c20cf67..617334e 100644
--- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
@@ -7,6 +7,7 @@
{
treeData1.value = formatTreeData(res.data);
- if (treeData1.value && treeData1.value.length > 0) {
- if (treeData1.value[0].children) {
- value.value = treeData1.value[0].children[0].value;
- changeDeviceType(treeData1.value[0].children[0].value, [
- treeData1.value[0].children[0].title,
- ]);
- } else {
- value.value = treeData1.value[0].value;
- changeDeviceType(treeData1.value[0].value, [treeData1.value[0].title]);
- }
- }
+ // if (treeData1.value && treeData1.value.length > 0) {
+ // if (treeData1.value[0].children) {
+ // value.value = treeData1.value[0].children[0].value;
+ // changeDeviceType(treeData1.value[0].children[0].value, [
+ // treeData1.value[0].children[0].title,
+ // ]);
+ // } else {
+ // value.value = treeData1.value[0].value;
+ // changeDeviceType(treeData1.value[0].value, [treeData1.value[0].title]);
+ // }
+ // }
});
const formatTreeData = (data: any) => {
return data.map((item: any) => ({
title: item.code + '.' + item.deviceType,
value: item.code,
+ disabled: item.children.length != 0 ? true : false,
children: item.children ? formatTreeData(item.children) : [],
}));
};
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue
index 13dc5ca..bdbe466 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue
@@ -1,5 +1,21 @@
+
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
index 7f77d44..c6ff223 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
@@ -6,11 +6,17 @@
数据点位
+
+ style="margin-bottom: 10px; width: 100%">
-->
-
+
{
treeData2.value = [];
- treeData2.value = formatTreeData(pointName.value ? res.data[0].searchList : res.data);
+ treeData2.value = formatTreeData(res.data);
expandedKeys.value = getAllKeys(treeData2.value);
- checkedKeys.value.push(treeData2.value[0].key, treeData2.value[1].key);
+ if (treeData2.value?.length >= 2) {
+ checkedKeys.value.push(treeData2.value[0].key, treeData2.value[1].key);
+ }
getSelect(null);
})
.finally(() => {
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
index 2d17fd6..48e0063 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
@@ -326,10 +326,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];
- getDeviceHotMap();
- }
+ // if (treeData2.value && treeData2.value.length > 0) {
+ // quyuvalue.value = [treeData2.value[0].childList[0].id];
+ // getDeviceHotMap();
+ // }
});
};
@@ -342,12 +342,13 @@
break;
}
}
+ let time = timeValue.value.format('YYYY-MM-DD');
http
.post(environmentMonitor.getDeviceHotMap, {
orgId: orgId.value,
environmentType: environmentType,
location: quyuvalue.value, // 区域id或者name
- time: '2024-07-01',
+ time: time,
timeRate: frequencyValue.value, // 频率
})
@@ -383,7 +384,7 @@
// 获取区域数据
await queryDeviceArea();
- // await getDeviceHotMap();
+ getDeviceHotMap();
// let hotData = {
// timeList: [
@@ -749,6 +750,33 @@
hotChar.dispose();
}
hotChar = echarts.init(hotChartRef.value);
+ let min = 0;
+ let max = 100;
+ if (typeValue.value == 'MFStem') {
+ // 温度
+ min = -20;
+ max = 40;
+ } else if (typeValue.value == 'MFSCORAr') {
+ // CO2浓度
+ min = 350;
+ max = 2000;
+ } else if (typeValue.value == 'MFSPM') {
+ // PM2.5
+ min = 0;
+ max = 500;
+ } else if (typeValue.value == 'MFSwf') {
+ // 光照度
+ min = 0;
+ max = 10000;
+ } else if (typeValue.value == 'MFSvf') {
+ // TVOC
+ min = 0;
+ max = 1;
+ } else if (typeValue.value == 'MFShum') {
+ //湿度
+ min = 0;
+ max = 100;
+ }
const option = {
tooltip: {
@@ -772,11 +800,21 @@
splitArea: {
show: true,
},
+ axisLabel: {
+ formatter: function (value) {
+ // 每五个字符插入一个换行符
+ if (value.length > 5) {
+ return value.match(/.{1,5}/g).join('\n');
+ }
+ return value;
+ },
+ lineHeight: 20,
+ },
},
visualMap: {
show: false,
- min: 0,
- max: 30,
+ min: min,
+ max: max,
// calculable: true,
// orient: 'horizontal',
// left: 'center',
@@ -803,7 +841,7 @@
],
};
- hotChar = echarts.init(hotChartRef.value);
+ // hotChar = echarts.init(hotChartRef.value);
hotChar.setOption(option);
}
};
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
index 805ab8e..9c93cf9 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
@@ -9,7 +9,11 @@
margin-top: 0.5%;
padding-left: 1.5%;
background: #ffffff;
- font-family: 'PingFangSC-Regular', sans-serif;
+ font-family: 'PingFang SC';
+ font-size: 16px;
+ font-weight: 700;
+ letter-spacing: 1.33px;
+ line-height: 21px;
">