diff --git a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png index 76e024e..07599a7 100644 --- a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png +++ b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png Binary files differ diff --git a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png index 76e024e..07599a7 100644 --- a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png +++ b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png Binary files differ diff --git a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png index 9781a5c..ecbff13 100644 --- a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png +++ b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png Binary files differ diff --git a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png index 76e024e..07599a7 100644 --- a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png +++ b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png Binary files differ diff --git a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png index 9781a5c..ecbff13 100644 --- a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png +++ b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png Binary files differ diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 37f47cb..1724eb0 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -112,7 +112,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(4); const showPanel = ref(false); const showLegend = ref(false); diff --git a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png index 76e024e..07599a7 100644 --- a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png +++ b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png Binary files differ diff --git a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png index 9781a5c..ecbff13 100644 --- a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png +++ b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png Binary files differ diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 37f47cb..1724eb0 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -112,7 +112,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(4); const showPanel = ref(false); const showLegend = ref(false); diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue index 11f68e9..10e28da 100644 --- a/src/views/sponeScreen/gisMF/cesiumMap.vue +++ b/src/views/sponeScreen/gisMF/cesiumMap.vue @@ -57,7 +57,8 @@ feature.key == 'combineBengZhan' || feature.key == 'sewageFactory' || feature.key == 'waterLoging' || - feature.key == 'rainStation' + feature.key == 'rainStation' || + feature.key == 'river' ) { let properties = feature.properties.getValue(); console.log('properties--', properties); diff --git a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png index 76e024e..07599a7 100644 --- a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png +++ b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png Binary files differ diff --git a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png index 9781a5c..ecbff13 100644 --- a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png +++ b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png Binary files differ diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 37f47cb..1724eb0 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -112,7 +112,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(4); const showPanel = ref(false); const showLegend = ref(false); diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue index 11f68e9..10e28da 100644 --- a/src/views/sponeScreen/gisMF/cesiumMap.vue +++ b/src/views/sponeScreen/gisMF/cesiumMap.vue @@ -57,7 +57,8 @@ feature.key == 'combineBengZhan' || feature.key == 'sewageFactory' || feature.key == 'waterLoging' || - feature.key == 'rainStation' + feature.key == 'rainStation' || + feature.key == 'river' ) { let properties = feature.properties.getValue(); console.log('properties--', properties); diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 600399f..e0e4bc5 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -41,7 +41,7 @@
地址：
{{ allData.dataList.address }}
- 查看工况图 + 查看工况图 @@ -334,6 +334,7 @@ // 泵站工况图查看 function checkGYT() { + closePopupCES(); //关闭弹窗 bus.emit('checkBZGYT', allData.dataList); } diff --git a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png index 76e024e..07599a7 100644 --- a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png +++ b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png Binary files differ diff --git a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png index 9781a5c..ecbff13 100644 --- a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png +++ b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png Binary files differ diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 37f47cb..1724eb0 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -112,7 +112,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(4); const showPanel = ref(false); const showLegend = ref(false); diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue index 11f68e9..10e28da 100644 --- a/src/views/sponeScreen/gisMF/cesiumMap.vue +++ b/src/views/sponeScreen/gisMF/cesiumMap.vue @@ -57,7 +57,8 @@ feature.key == 'combineBengZhan' || feature.key == 'sewageFactory' || feature.key == 'waterLoging' || - feature.key == 'rainStation' + feature.key == 'rainStation' || + feature.key == 'river' ) { let properties = feature.properties.getValue(); console.log('properties--', properties); diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 600399f..e0e4bc5 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -41,7 +41,7 @@
地址：
{{ allData.dataList.address }}
- 查看工况图 + 查看工况图 @@ -334,6 +334,7 @@ // 泵站工况图查看 function checkGYT() { + closePopupCES(); //关闭弹窗 bus.emit('checkBZGYT', allData.dataList); } diff --git a/src/views/sponeScreen/waterFlood/PsssCount.vue b/src/views/sponeScreen/waterFlood/PsssCount.vue index 38628d4..79fd4fe 100644 --- a/src/views/sponeScreen/waterFlood/PsssCount.vue +++ b/src/views/sponeScreen/waterFlood/PsssCount.vue @@ -1,69 +1,47 @@ @@ -72,29 +50,88 @@ width: 460px; background: #004565; padding: 10px 15px 0px; - display: flex; - flex-wrap: wrap; - .part { - width: 50%; - margin-bottom: 10px; - font-family: Source Han Sans CN; - font-weight: 400; - font-size: 14px; - color: #e4f5ff; - align-items: center; - img { - width: 52px; - height: 48px; - margin-right: 5px; - } - span { - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 20px; - color: #ffffff; - background: linear-gradient(0deg, #d5f6ff 0%, #6ac5ff 100%); - background-clip: text; - -webkit-text-fill-color: transparent; + margin-top: -3px; + .scrolla { + width: 100%; + height: 230px; + overflow: hidden; + display: inline-block; + } + .cenPart { + width: 100%; + // background: red; + display: flex; + .part { + width: 100px; + height: 220px; + margin-bottom: 10px; + margin-right: 10px; + align-items: center; + background: url('@/assets/newImgs/HMScreen/beijing.png') no-repeat; + background-size: 100% 100%; + .top { + height: 140px; + .upper { + height: 81px; + .upImg { + width: 28px; + height: 24px; + position: relative; + top: 44px; + left: 36px; + } + } + .Major { + height: 28px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #ffffff; + display: flex; + align-items: center; + justify-content: center; + } + .lower { + height: 28px; + font-family: YouSheBiaoTiHei; + font-weight: bold; + font-size: 24px; + color: #ffffff; + line-height: 23px; + text-shadow: 0px 3px 7px #002a46; + background: linear-gradient(0deg, #1698f3 0%, #ffffff 100%); + background-clip: text; + -webkit-text-fill-color: transparent; + display: flex; + align-items: center; + justify-content: center; + } + } + .below { + margin-top: 25px; + height: 50px; + // background: red; + .handIn { + height: 25px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #b8ecff; + display: flex; + align-items: center; + justify-content: center; + } + .oflower { + height: 25px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #b8ecff; + display: flex; + align-items: center; + justify-content: center; + } + } } } } diff --git a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png index 76e024e..07599a7 100644 --- a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png +++ b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png Binary files differ diff --git a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png index 9781a5c..ecbff13 100644 --- a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png +++ b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png Binary files differ diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 37f47cb..1724eb0 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -112,7 +112,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(4); const showPanel = ref(false); const showLegend = ref(false); diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue index 11f68e9..10e28da 100644 --- a/src/views/sponeScreen/gisMF/cesiumMap.vue +++ b/src/views/sponeScreen/gisMF/cesiumMap.vue @@ -57,7 +57,8 @@ feature.key == 'combineBengZhan' || feature.key == 'sewageFactory' || feature.key == 'waterLoging' || - feature.key == 'rainStation' + feature.key == 'rainStation' || + feature.key == 'river' ) { let properties = feature.properties.getValue(); console.log('properties--', properties); diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 600399f..e0e4bc5 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -41,7 +41,7 @@
地址：
{{ allData.dataList.address }}
- 查看工况图 + 查看工况图 @@ -334,6 +334,7 @@ // 泵站工况图查看 function checkGYT() { + closePopupCES(); //关闭弹窗 bus.emit('checkBZGYT', allData.dataList); } diff --git a/src/views/sponeScreen/waterFlood/PsssCount.vue b/src/views/sponeScreen/waterFlood/PsssCount.vue index 38628d4..79fd4fe 100644 --- a/src/views/sponeScreen/waterFlood/PsssCount.vue +++ b/src/views/sponeScreen/waterFlood/PsssCount.vue @@ -1,69 +1,47 @@ @@ -72,29 +50,88 @@ width: 460px; background: #004565; padding: 10px 15px 0px; - display: flex; - flex-wrap: wrap; - .part { - width: 50%; - margin-bottom: 10px; - font-family: Source Han Sans CN; - font-weight: 400; - font-size: 14px; - color: #e4f5ff; - align-items: center; - img { - width: 52px; - height: 48px; - margin-right: 5px; - } - span { - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 20px; - color: #ffffff; - background: linear-gradient(0deg, #d5f6ff 0%, #6ac5ff 100%); - background-clip: text; - -webkit-text-fill-color: transparent; + margin-top: -3px; + .scrolla { + width: 100%; + height: 230px; + overflow: hidden; + display: inline-block; + } + .cenPart { + width: 100%; + // background: red; + display: flex; + .part { + width: 100px; + height: 220px; + margin-bottom: 10px; + margin-right: 10px; + align-items: center; + background: url('@/assets/newImgs/HMScreen/beijing.png') no-repeat; + background-size: 100% 100%; + .top { + height: 140px; + .upper { + height: 81px; + .upImg { + width: 28px; + height: 24px; + position: relative; + top: 44px; + left: 36px; + } + } + .Major { + height: 28px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #ffffff; + display: flex; + align-items: center; + justify-content: center; + } + .lower { + height: 28px; + font-family: YouSheBiaoTiHei; + font-weight: bold; + font-size: 24px; + color: #ffffff; + line-height: 23px; + text-shadow: 0px 3px 7px #002a46; + background: linear-gradient(0deg, #1698f3 0%, #ffffff 100%); + background-clip: text; + -webkit-text-fill-color: transparent; + display: flex; + align-items: center; + justify-content: center; + } + } + .below { + margin-top: 25px; + height: 50px; + // background: red; + .handIn { + height: 25px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #b8ecff; + display: flex; + align-items: center; + justify-content: center; + } + .oflower { + height: 25px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #b8ecff; + display: flex; + align-items: center; + justify-content: center; + } + } } } } diff --git a/src/views/sponeScreen/waterFlood/PsssCounta.vue b/src/views/sponeScreen/waterFlood/PsssCounta.vue deleted file mode 100644 index bf34e64..0000000 --- a/src/views/sponeScreen/waterFlood/PsssCounta.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - - - diff --git a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png index 76e024e..07599a7 100644 --- a/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png +++ b/src/assets/cesiumMap/legendIcon/sewageFactory_icon.png Binary files differ diff --git a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png index 9781a5c..ecbff13 100644 --- a/src/assets/cesiumMap/legendIcon/waterCourse_icon.png +++ b/src/assets/cesiumMap/legendIcon/waterCourse_icon.png Binary files differ diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 37f47cb..1724eb0 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -112,7 +112,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(4); const showPanel = ref(false); const showLegend = ref(false); diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue index 11f68e9..10e28da 100644 --- a/src/views/sponeScreen/gisMF/cesiumMap.vue +++ b/src/views/sponeScreen/gisMF/cesiumMap.vue @@ -57,7 +57,8 @@ feature.key == 'combineBengZhan' || feature.key == 'sewageFactory' || feature.key == 'waterLoging' || - feature.key == 'rainStation' + feature.key == 'rainStation' || + feature.key == 'river' ) { let properties = feature.properties.getValue(); console.log('properties--', properties); diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 600399f..e0e4bc5 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -41,7 +41,7 @@
地址：
{{ allData.dataList.address }}
- 查看工况图 + 查看工况图 @@ -334,6 +334,7 @@ // 泵站工况图查看 function checkGYT() { + closePopupCES(); //关闭弹窗 bus.emit('checkBZGYT', allData.dataList); } diff --git a/src/views/sponeScreen/waterFlood/PsssCount.vue b/src/views/sponeScreen/waterFlood/PsssCount.vue index 38628d4..79fd4fe 100644 --- a/src/views/sponeScreen/waterFlood/PsssCount.vue +++ b/src/views/sponeScreen/waterFlood/PsssCount.vue @@ -1,69 +1,47 @@ @@ -72,29 +50,88 @@ width: 460px; background: #004565; padding: 10px 15px 0px; - display: flex; - flex-wrap: wrap; - .part { - width: 50%; - margin-bottom: 10px; - font-family: Source Han Sans CN; - font-weight: 400; - font-size: 14px; - color: #e4f5ff; - align-items: center; - img { - width: 52px; - height: 48px; - margin-right: 5px; - } - span { - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 20px; - color: #ffffff; - background: linear-gradient(0deg, #d5f6ff 0%, #6ac5ff 100%); - background-clip: text; - -webkit-text-fill-color: transparent; + margin-top: -3px; + .scrolla { + width: 100%; + height: 230px; + overflow: hidden; + display: inline-block; + } + .cenPart { + width: 100%; + // background: red; + display: flex; + .part { + width: 100px; + height: 220px; + margin-bottom: 10px; + margin-right: 10px; + align-items: center; + background: url('@/assets/newImgs/HMScreen/beijing.png') no-repeat; + background-size: 100% 100%; + .top { + height: 140px; + .upper { + height: 81px; + .upImg { + width: 28px; + height: 24px; + position: relative; + top: 44px; + left: 36px; + } + } + .Major { + height: 28px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #ffffff; + display: flex; + align-items: center; + justify-content: center; + } + .lower { + height: 28px; + font-family: YouSheBiaoTiHei; + font-weight: bold; + font-size: 24px; + color: #ffffff; + line-height: 23px; + text-shadow: 0px 3px 7px #002a46; + background: linear-gradient(0deg, #1698f3 0%, #ffffff 100%); + background-clip: text; + -webkit-text-fill-color: transparent; + display: flex; + align-items: center; + justify-content: center; + } + } + .below { + margin-top: 25px; + height: 50px; + // background: red; + .handIn { + height: 25px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #b8ecff; + display: flex; + align-items: center; + justify-content: center; + } + .oflower { + height: 25px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #b8ecff; + display: flex; + align-items: center; + justify-content: center; + } + } } } } diff --git a/src/views/sponeScreen/waterFlood/PsssCounta.vue b/src/views/sponeScreen/waterFlood/PsssCounta.vue deleted file mode 100644 index bf34e64..0000000 --- a/src/views/sponeScreen/waterFlood/PsssCounta.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - - - diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index f3f0f35..5efc5d0 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -64,6 +64,7 @@ @@ -72,29 +50,88 @@ width: 460px; background: #004565; padding: 10px 15px 0px; - display: flex; - flex-wrap: wrap; - .part { - width: 50%; - margin-bottom: 10px; - font-family: Source Han Sans CN; - font-weight: 400; - font-size: 14px; - color: #e4f5ff; - align-items: center; - img { - width: 52px; - height: 48px; - margin-right: 5px; - } - span { - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 20px; - color: #ffffff; - background: linear-gradient(0deg, #d5f6ff 0%, #6ac5ff 100%); - background-clip: text; - -webkit-text-fill-color: transparent; + margin-top: -3px; + .scrolla { + width: 100%; + height: 230px; + overflow: hidden; + display: inline-block; + } + .cenPart { + width: 100%; + // background: red; + display: flex; + .part { + width: 100px; + height: 220px; + margin-bottom: 10px; + margin-right: 10px; + align-items: center; + background: url('@/assets/newImgs/HMScreen/beijing.png') no-repeat; + background-size: 100% 100%; + .top { + height: 140px; + .upper { + height: 81px; + .upImg { + width: 28px; + height: 24px; + position: relative; + top: 44px; + left: 36px; + } + } + .Major { + height: 28px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #ffffff; + display: flex; + align-items: center; + justify-content: center; + } + .lower { + height: 28px; + font-family: YouSheBiaoTiHei; + font-weight: bold; + font-size: 24px; + color: #ffffff; + line-height: 23px; + text-shadow: 0px 3px 7px #002a46; + background: linear-gradient(0deg, #1698f3 0%, #ffffff 100%); + background-clip: text; + -webkit-text-fill-color: transparent; + display: flex; + align-items: center; + justify-content: center; + } + } + .below { + margin-top: 25px; + height: 50px; + // background: red; + .handIn { + height: 25px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #b8ecff; + display: flex; + align-items: center; + justify-content: center; + } + .oflower { + height: 25px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #b8ecff; + display: flex; + align-items: center; + justify-content: center; + } + } } } } diff --git a/src/views/sponeScreen/waterFlood/PsssCounta.vue b/src/views/sponeScreen/waterFlood/PsssCounta.vue deleted file mode 100644 index bf34e64..0000000 --- a/src/views/sponeScreen/waterFlood/PsssCounta.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - - - diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index f3f0f35..5efc5d0 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -64,6 +64,7 @@