diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss
index f751dcd..a1bb068 100644
--- a/src/assets/styles/publicXG.scss
+++ b/src/assets/styles/publicXG.scss
@@ -260,7 +260,6 @@
padding: 10px;
border-radius: 8px;
p {
- line-height: 25px;
span {
display: inline-block;
width: 20px;
diff --git a/src/views/dataAnalysis/syntheticData/equipRight.vue b/src/views/dataAnalysis/syntheticData/equipRight.vue
index 84ddf3a..40d03ff 100644
--- a/src/views/dataAnalysis/syntheticData/equipRight.vue
+++ b/src/views/dataAnalysis/syntheticData/equipRight.vue
@@ -3,16 +3,16 @@
-
+
站点名称:{{ baseInfo.stName || '--' }}
-
-
+
+
站点编号:{{ baseInfo.stCode || '--' }}
-
-
+
+
安装地址:{{ baseInfo.address || '--' }}
-
-
+
+
站点类型:
{{
@@ -27,11 +27,11 @@
: '--'
}}
-
-
+
+
安装时间:{{ baseInfo.installDate || '--' }}
-
-
+
+
建设方式:
{{
@@ -44,11 +44,11 @@
: '--'
}}
-
-
+
+
定位:{{ baseInfo.lonLat || '--' }}
-
-
+
+
高程:
{{
@@ -61,15 +61,15 @@
: '--'
}}
-
-
+
+
关联对象:{{ baseInfo.belongName || '--' }}
-
-
查看更多>>
+
+
-
+
-
+
{{
@@ -101,7 +101,7 @@
-
+
{{ scope.row.onlineStatus == 'online' ? '在线' : scope.row.faultStatus == 'offline' ? '离线' : '--' }}
@@ -342,7 +342,7 @@
background: $mainColor1;
box-shadow: 0px 2px 6px 0px rgba(28, 52, 92, 0.1);
overflow: auto;
- p {
+ .infoC {
width: 20%;
display: flex;
justify-content: space-between;
@@ -366,6 +366,7 @@
.check {
color: #24de8d;
cursor: pointer;
+ padding-left: 10px;
}
}
.el-table {
diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index c822b69..627d5cd 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -66,9 +66,9 @@
五、内涝点现场照片
-
-
长兴工业园内涝积水点
-
2023-10-12 13:00:10
+
+
十四大街马家河西支桥东西两侧积水点
+
2024-07-08 13:00:10
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index 3e26f3b..04ade75 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -140,7 +140,7 @@
// 获取数据
function getData() {
let params = {
- stationCode: props.pumpObj.pumpCode, //'BZKFDJG'
+ stationCode: pumpObj.value.pumpCode, //'BZKFDJG'
};
realtimeDataList(params).then(res => {
let datas = res.data || {};
@@ -175,11 +175,26 @@
}
onMounted(() => {
- getData();
- // 定时刷新
- timer.value = setInterval(() => {
+ if (pumpObj.value.pumpCode == 'hdbz') {
+ // 假数据,演示用
+ realYW.value = 5.19;
+ pumpList.value = [
+ { status: '运行', dl: '88.1A', hour: '33:32:20' },
+ { status: '运行', dl: '78.1A', hour: '33:32:20' },
+ { status: '运行', dl: '79.1A', hour: '51:30:20' },
+ { status: '运行', dl: '45.1A', hour: '04:32:20' },
+ { status: '停止', dl: '', hour: '' },
+ ];
+ mainWater.value = true;
+ pumpObj.value.rainpump = JSON.stringify({ collectionOut: '东护城河' });
+ detailObj.value.tt = '2024-08-20 12:20:32';
+ } else {
getData();
- }, 5 * 60 * 1000);
+ // 定时刷新
+ timer.value = setInterval(() => {
+ getData();
+ }, 5 * 60 * 1000);
+ }
});
onBeforeUnmount(() => {
diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss
index f751dcd..a1bb068 100644
--- a/src/assets/styles/publicXG.scss
+++ b/src/assets/styles/publicXG.scss
@@ -260,7 +260,6 @@
padding: 10px;
border-radius: 8px;
p {
- line-height: 25px;
span {
display: inline-block;
width: 20px;
diff --git a/src/views/dataAnalysis/syntheticData/equipRight.vue b/src/views/dataAnalysis/syntheticData/equipRight.vue
index 84ddf3a..40d03ff 100644
--- a/src/views/dataAnalysis/syntheticData/equipRight.vue
+++ b/src/views/dataAnalysis/syntheticData/equipRight.vue
@@ -3,16 +3,16 @@
-
+
站点名称:{{ baseInfo.stName || '--' }}
-
-
+
+
站点编号:{{ baseInfo.stCode || '--' }}
-
-
+
+
安装地址:{{ baseInfo.address || '--' }}
-
-
+
+
站点类型:
{{
@@ -27,11 +27,11 @@
: '--'
}}
-
-
+
+
安装时间:{{ baseInfo.installDate || '--' }}
-
-
+
+
建设方式:
{{
@@ -44,11 +44,11 @@
: '--'
}}
-
-
+
+
定位:{{ baseInfo.lonLat || '--' }}
-
-
+
+
高程:
{{
@@ -61,15 +61,15 @@
: '--'
}}
-
-
+
+
关联对象:{{ baseInfo.belongName || '--' }}
-
-
查看更多>>
+
+
-
+
-
+
{{
@@ -101,7 +101,7 @@
-
+
{{ scope.row.onlineStatus == 'online' ? '在线' : scope.row.faultStatus == 'offline' ? '离线' : '--' }}
@@ -342,7 +342,7 @@
background: $mainColor1;
box-shadow: 0px 2px 6px 0px rgba(28, 52, 92, 0.1);
overflow: auto;
- p {
+ .infoC {
width: 20%;
display: flex;
justify-content: space-between;
@@ -366,6 +366,7 @@
.check {
color: #24de8d;
cursor: pointer;
+ padding-left: 10px;
}
}
.el-table {
diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index c822b69..627d5cd 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -66,9 +66,9 @@
五、内涝点现场照片
-
-
长兴工业园内涝积水点
-
2023-10-12 13:00:10
+
+
十四大街马家河西支桥东西两侧积水点
+
2024-07-08 13:00:10
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index 3e26f3b..04ade75 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -140,7 +140,7 @@
// 获取数据
function getData() {
let params = {
- stationCode: props.pumpObj.pumpCode, //'BZKFDJG'
+ stationCode: pumpObj.value.pumpCode, //'BZKFDJG'
};
realtimeDataList(params).then(res => {
let datas = res.data || {};
@@ -175,11 +175,26 @@
}
onMounted(() => {
- getData();
- // 定时刷新
- timer.value = setInterval(() => {
+ if (pumpObj.value.pumpCode == 'hdbz') {
+ // 假数据,演示用
+ realYW.value = 5.19;
+ pumpList.value = [
+ { status: '运行', dl: '88.1A', hour: '33:32:20' },
+ { status: '运行', dl: '78.1A', hour: '33:32:20' },
+ { status: '运行', dl: '79.1A', hour: '51:30:20' },
+ { status: '运行', dl: '45.1A', hour: '04:32:20' },
+ { status: '停止', dl: '', hour: '' },
+ ];
+ mainWater.value = true;
+ pumpObj.value.rainpump = JSON.stringify({ collectionOut: '东护城河' });
+ detailObj.value.tt = '2024-08-20 12:20:32';
+ } else {
getData();
- }, 5 * 60 * 1000);
+ // 定时刷新
+ timer.value = setInterval(() => {
+ getData();
+ }, 5 * 60 * 1000);
+ }
});
onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/waterFlood/rainReport.vue b/src/views/sponeScreen/waterFlood/rainReport.vue
index c9a76ab..4897ac9 100644
--- a/src/views/sponeScreen/waterFlood/rainReport.vue
+++ b/src/views/sponeScreen/waterFlood/rainReport.vue
@@ -34,7 +34,7 @@
-
+
diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss
index f751dcd..a1bb068 100644
--- a/src/assets/styles/publicXG.scss
+++ b/src/assets/styles/publicXG.scss
@@ -260,7 +260,6 @@
padding: 10px;
border-radius: 8px;
p {
- line-height: 25px;
span {
display: inline-block;
width: 20px;
diff --git a/src/views/dataAnalysis/syntheticData/equipRight.vue b/src/views/dataAnalysis/syntheticData/equipRight.vue
index 84ddf3a..40d03ff 100644
--- a/src/views/dataAnalysis/syntheticData/equipRight.vue
+++ b/src/views/dataAnalysis/syntheticData/equipRight.vue
@@ -3,16 +3,16 @@
-
+
站点名称:{{ baseInfo.stName || '--' }}
-
-
+
+
站点编号:{{ baseInfo.stCode || '--' }}
-
-
+
+
安装地址:{{ baseInfo.address || '--' }}
-
-
+
+
站点类型:
{{
@@ -27,11 +27,11 @@
: '--'
}}
-
-
+
+
安装时间:{{ baseInfo.installDate || '--' }}
-
-
+
+
建设方式:
{{
@@ -44,11 +44,11 @@
: '--'
}}
-
-
+
+
定位:{{ baseInfo.lonLat || '--' }}
-
-
+
+
高程:
{{
@@ -61,15 +61,15 @@
: '--'
}}
-
-
+
+
关联对象:{{ baseInfo.belongName || '--' }}
-
-
查看更多>>
+
+
-
+
-
+
{{
@@ -101,7 +101,7 @@
-
+
{{ scope.row.onlineStatus == 'online' ? '在线' : scope.row.faultStatus == 'offline' ? '离线' : '--' }}
@@ -342,7 +342,7 @@
background: $mainColor1;
box-shadow: 0px 2px 6px 0px rgba(28, 52, 92, 0.1);
overflow: auto;
- p {
+ .infoC {
width: 20%;
display: flex;
justify-content: space-between;
@@ -366,6 +366,7 @@
.check {
color: #24de8d;
cursor: pointer;
+ padding-left: 10px;
}
}
.el-table {
diff --git a/src/views/floodSys/floodYP/historyEventDetail.vue b/src/views/floodSys/floodYP/historyEventDetail.vue
index c822b69..627d5cd 100644
--- a/src/views/floodSys/floodYP/historyEventDetail.vue
+++ b/src/views/floodSys/floodYP/historyEventDetail.vue
@@ -66,9 +66,9 @@
五、内涝点现场照片
-
-
长兴工业园内涝积水点
-
2023-10-12 13:00:10
+
+
十四大街马家河西支桥东西两侧积水点
+
2024-07-08 13:00:10
diff --git a/src/views/sponeScreen/waterFlood/pumpProcess.vue b/src/views/sponeScreen/waterFlood/pumpProcess.vue
index 3e26f3b..04ade75 100644
--- a/src/views/sponeScreen/waterFlood/pumpProcess.vue
+++ b/src/views/sponeScreen/waterFlood/pumpProcess.vue
@@ -140,7 +140,7 @@
// 获取数据
function getData() {
let params = {
- stationCode: props.pumpObj.pumpCode, //'BZKFDJG'
+ stationCode: pumpObj.value.pumpCode, //'BZKFDJG'
};
realtimeDataList(params).then(res => {
let datas = res.data || {};
@@ -175,11 +175,26 @@
}
onMounted(() => {
- getData();
- // 定时刷新
- timer.value = setInterval(() => {
+ if (pumpObj.value.pumpCode == 'hdbz') {
+ // 假数据,演示用
+ realYW.value = 5.19;
+ pumpList.value = [
+ { status: '运行', dl: '88.1A', hour: '33:32:20' },
+ { status: '运行', dl: '78.1A', hour: '33:32:20' },
+ { status: '运行', dl: '79.1A', hour: '51:30:20' },
+ { status: '运行', dl: '45.1A', hour: '04:32:20' },
+ { status: '停止', dl: '', hour: '' },
+ ];
+ mainWater.value = true;
+ pumpObj.value.rainpump = JSON.stringify({ collectionOut: '东护城河' });
+ detailObj.value.tt = '2024-08-20 12:20:32';
+ } else {
getData();
- }, 5 * 60 * 1000);
+ // 定时刷新
+ timer.value = setInterval(() => {
+ getData();
+ }, 5 * 60 * 1000);
+ }
});
onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/waterFlood/rainReport.vue b/src/views/sponeScreen/waterFlood/rainReport.vue
index c9a76ab..4897ac9 100644
--- a/src/views/sponeScreen/waterFlood/rainReport.vue
+++ b/src/views/sponeScreen/waterFlood/rainReport.vue
@@ -34,7 +34,7 @@
-
+
diff --git a/vite.config.js b/vite.config.js
index 24dcf41..ea36ec6 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,8 +7,8 @@
const Timestamp = new Date().getTime(); //随机时间戳
// const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
-const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+// const targetUrl = 'http://192.168.20.52:7300'; //杨辉
+const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
// https://vitejs.dev/config/
export default defineConfig(({ mode, command }) => {