diff --git a/src/views/jcxx/MonitoringInformation.vue b/src/views/jcxx/MonitoringInformation.vue
index 0fbda7a..a9c376e 100644
--- a/src/views/jcxx/MonitoringInformation.vue
+++ b/src/views/jcxx/MonitoringInformation.vue
@@ -40,12 +40,11 @@
-
站点名称: {{ item.zdd }}
-
管网类型: {{ item.sw }}
-
水位(m): {{ item.ls }}
-
流速(m/s): {{ item.zd }}
-
浊度: {{ item.zd }}
-
时间: {{ item.sj }}
+
站点名称: {{ item.stName }}
+
水位(m): {{ item.z }}
+
流速(m/s): {{ item.va || '--' }}
+
浊度: {{ item.turb || '--' }}
+
时间: {{ item.tt }}
@@ -90,10 +89,10 @@
TopTabsData: [
{ status: '2', statusName: '雨量站' },
{ status: '6', statusName: '河道监测' },
- { status: '1', statusName: '源头地块' },
{ status: '3', statusName: '管网监测' },
+ { status: '1', statusName: '源头地块' },
{ status: '4', statusName: '渍水点' },
- { status: '7', statusName: '泵站监测' },
+ // { status: '7', statusName: '泵站监测' },
],
// 顶部tab选取项
ActiveID: '2',
@@ -111,11 +110,11 @@
} else if (AllData.ActiveID == '2') {
getRealtimeRain();
} else if (AllData.ActiveID == '3') {
- AllData.dataList = [];
+ getRealtimedRiver('pipeline');
} else if (AllData.ActiveID == '4') {
AllData.dataList = [];
} else if (AllData.ActiveID == '6') {
- getRealtimedRiver();
+ getRealtimedRiver('river');
} else {
AllData.dataList = [];
}
@@ -142,11 +141,10 @@
}
};
//河道监测信息
-const getRealtimedRiver = async (id) => {
+const getRealtimedRiver = async (type) => {
pinias.showLoading();
let params = {
- monitorTargetType: 'river',
- belongType: 'river',
+ monitorTargetType: type,
belongId: '',
};
let res = await realtimeDataListByType(params);
@@ -166,7 +164,6 @@
// 跳转详情
const gotoDetail = (item) => {
- console.log(item, '11111');
router.push({
path: '/homeTrendDetail',
query: {
@@ -197,12 +194,7 @@
border-radius: 0px 0px 0px 0px;
opacity: 1;
display: flex;
- // flex-wrap: wrap;
- // justify-content: flex-start;
- // align-content: flex-end;
- // flex-direction: row;
- overflow-x: auto;
- // background: red;
+ justify-content: space-around;
.tabsList {
font-weight: 500;
color: #585858;
@@ -251,7 +243,7 @@
display: flex;
position: relative;
box-sizing: border-box;
- padding: 11px 30px 30px 10px;
+ padding: 11px 30px 30px 20px;
font-size: 22px;
}
}
diff --git a/src/views/jcxx/MonitoringInformation.vue b/src/views/jcxx/MonitoringInformation.vue
index 0fbda7a..a9c376e 100644
--- a/src/views/jcxx/MonitoringInformation.vue
+++ b/src/views/jcxx/MonitoringInformation.vue
@@ -40,12 +40,11 @@
-
站点名称: {{ item.zdd }}
-
管网类型: {{ item.sw }}
-
水位(m): {{ item.ls }}
-
流速(m/s): {{ item.zd }}
-
浊度: {{ item.zd }}
-
时间: {{ item.sj }}
+
站点名称: {{ item.stName }}
+
水位(m): {{ item.z }}
+
流速(m/s): {{ item.va || '--' }}
+
浊度: {{ item.turb || '--' }}
+
时间: {{ item.tt }}
@@ -90,10 +89,10 @@
TopTabsData: [
{ status: '2', statusName: '雨量站' },
{ status: '6', statusName: '河道监测' },
- { status: '1', statusName: '源头地块' },
{ status: '3', statusName: '管网监测' },
+ { status: '1', statusName: '源头地块' },
{ status: '4', statusName: '渍水点' },
- { status: '7', statusName: '泵站监测' },
+ // { status: '7', statusName: '泵站监测' },
],
// 顶部tab选取项
ActiveID: '2',
@@ -111,11 +110,11 @@
} else if (AllData.ActiveID == '2') {
getRealtimeRain();
} else if (AllData.ActiveID == '3') {
- AllData.dataList = [];
+ getRealtimedRiver('pipeline');
} else if (AllData.ActiveID == '4') {
AllData.dataList = [];
} else if (AllData.ActiveID == '6') {
- getRealtimedRiver();
+ getRealtimedRiver('river');
} else {
AllData.dataList = [];
}
@@ -142,11 +141,10 @@
}
};
//河道监测信息
-const getRealtimedRiver = async (id) => {
+const getRealtimedRiver = async (type) => {
pinias.showLoading();
let params = {
- monitorTargetType: 'river',
- belongType: 'river',
+ monitorTargetType: type,
belongId: '',
};
let res = await realtimeDataListByType(params);
@@ -166,7 +164,6 @@
// 跳转详情
const gotoDetail = (item) => {
- console.log(item, '11111');
router.push({
path: '/homeTrendDetail',
query: {
@@ -197,12 +194,7 @@
border-radius: 0px 0px 0px 0px;
opacity: 1;
display: flex;
- // flex-wrap: wrap;
- // justify-content: flex-start;
- // align-content: flex-end;
- // flex-direction: row;
- overflow-x: auto;
- // background: red;
+ justify-content: space-around;
.tabsList {
font-weight: 500;
color: #585858;
@@ -251,7 +243,7 @@
display: flex;
position: relative;
box-sizing: border-box;
- padding: 11px 30px 30px 10px;
+ padding: 11px 30px 30px 20px;
font-size: 22px;
}
}
diff --git a/src/views/zhxxgl/informationManagement.vue b/src/views/zhxxgl/informationManagement.vue
index dbdfc4c..5323385 100644
--- a/src/views/zhxxgl/informationManagement.vue
+++ b/src/views/zhxxgl/informationManagement.vue
@@ -446,7 +446,6 @@
problemDetail.value = {};
showProblem.value = true;
problemDetail.value = feature.properties;
- console.log('feature---111', feature.properties);
if (
feature.properties.type == 'YSBZ' ||
feature.properties.type == 'WSBZ' ||
@@ -467,11 +466,9 @@
position: relative;
width: 100%;
height: 100%;
- // background: #c6c6c6;
.searchBoxA {
width: 100%;
height: 80px;
- // background: red;
position: absolute;
z-index: 99;
.searchInputA {
@@ -479,7 +476,6 @@
box-sizing: border-box;
padding: 13px 36px 0 20px;
height: 73px;
- background: #f3f3f3b3;
}
.SearchIconA {
width: 45px;