diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index f4e243a..65904d9 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -375,9 +375,9 @@ // }, // `wenjian${new Date().getTime()}.pdf` // ); - // const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/download?id='; - // const fileUrl = `${baseURL}${data.id}`; - // window.open(String(fileUrl)); + const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/downloadPDFNew?id='; + const fileUrl = `${baseURL}${data.id}`; + window.open(String(fileUrl)); } onMounted(() => { diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index f4e243a..65904d9 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -375,9 +375,9 @@ // }, // `wenjian${new Date().getTime()}.pdf` // ); - // const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/download?id='; - // const fileUrl = `${baseURL}${data.id}`; - // window.open(String(fileUrl)); + const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/downloadPDFNew?id='; + const fileUrl = `${baseURL}${data.id}`; + window.open(String(fileUrl)); } onMounted(() => { diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue index decd242..6f5684e 100644 --- a/src/views/oneMap/components/FHPL.vue +++ b/src/views/oneMap/components/FHPL.vue @@ -9,10 +9,16 @@
-
+
汛情回顾
+
-
+
汛情回顾
+
@@ -29,6 +30,20 @@ }, { immediate: true } ); + +// 发布预警 +const WarningClick = item => { + let data = { + title: '发布预警', + comIDs: ['RQ_Warning'], + }; + bus.emit('publicDialog', data); + + setTimeout(() => { + bus.emit('RQ_PrimaryType', 2); + }); +}; + onMounted(() => { // let initePSTimer = setInterval(() => { // if (!newfiberMapbox) return; @@ -76,5 +91,32 @@ border: 1px solid #47eef3; box-shadow: inset 0 0 5px 5px #47eef38a; } + .IssueWarning { + width: 40px; + height: 60px; + position: absolute; + top: 100px; + left: 480px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 13px; + color: #ffffff; + text-align: center; + background: #003756; + border-radius: 28px; + border: 1px solid #53c6c9; + display: flex; + align-items: center; + cursor: pointer; + box-shadow: inset 0 0 5px 2px #47eef38a; + } + .TuChengImgTrue { + transform: translateX(-460px); + transition: all 1s ease; + } + .TuChengImgFalse { + transform: translateX(0px); + transition: all 1s ease; + } } diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index f4e243a..65904d9 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -375,9 +375,9 @@ // }, // `wenjian${new Date().getTime()}.pdf` // ); - // const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/download?id='; - // const fileUrl = `${baseURL}${data.id}`; - // window.open(String(fileUrl)); + const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/downloadPDFNew?id='; + const fileUrl = `${baseURL}${data.id}`; + window.open(String(fileUrl)); } onMounted(() => { diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue index decd242..6f5684e 100644 --- a/src/views/oneMap/components/FHPL.vue +++ b/src/views/oneMap/components/FHPL.vue @@ -9,10 +9,16 @@
-
+
汛情回顾
+
@@ -29,6 +30,20 @@ }, { immediate: true } ); + +// 发布预警 +const WarningClick = item => { + let data = { + title: '发布预警', + comIDs: ['RQ_Warning'], + }; + bus.emit('publicDialog', data); + + setTimeout(() => { + bus.emit('RQ_PrimaryType', 2); + }); +}; + onMounted(() => { // let initePSTimer = setInterval(() => { // if (!newfiberMapbox) return; @@ -76,5 +91,32 @@ border: 1px solid #47eef3; box-shadow: inset 0 0 5px 5px #47eef38a; } + .IssueWarning { + width: 40px; + height: 60px; + position: absolute; + top: 100px; + left: 480px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 13px; + color: #ffffff; + text-align: center; + background: #003756; + border-radius: 28px; + border: 1px solid #53c6c9; + display: flex; + align-items: center; + cursor: pointer; + box-shadow: inset 0 0 5px 2px #47eef38a; + } + .TuChengImgTrue { + transform: translateX(-460px); + transition: all 1s ease; + } + .TuChengImgFalse { + transform: translateX(0px); + transition: all 1s ease; + } } diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index 68d6fe5..9b0373c 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -589,6 +589,7 @@ margin-left: 10px; } .titleNamePP { + width: 450px; height: 22px; font-size: 16px; font-family: PingFang SC; @@ -596,7 +597,9 @@ color: #b8ecff; line-height: 22px; margin: 5px; - + overflow: hidden; + text-overflow: ellipsis; /* 超出宽度后显示省略号 */ + white-space: nowrap; /* 限制不允许换行 */ &:before { // display: block; // content: ''; diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index f4e243a..65904d9 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -375,9 +375,9 @@ // }, // `wenjian${new Date().getTime()}.pdf` // ); - // const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/download?id='; - // const fileUrl = `${baseURL}${data.id}`; - // window.open(String(fileUrl)); + const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/downloadPDFNew?id='; + const fileUrl = `${baseURL}${data.id}`; + window.open(String(fileUrl)); } onMounted(() => { diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue index decd242..6f5684e 100644 --- a/src/views/oneMap/components/FHPL.vue +++ b/src/views/oneMap/components/FHPL.vue @@ -9,10 +9,16 @@
-
+
汛情回顾
+
@@ -29,6 +30,20 @@ }, { immediate: true } ); + +// 发布预警 +const WarningClick = item => { + let data = { + title: '发布预警', + comIDs: ['RQ_Warning'], + }; + bus.emit('publicDialog', data); + + setTimeout(() => { + bus.emit('RQ_PrimaryType', 2); + }); +}; + onMounted(() => { // let initePSTimer = setInterval(() => { // if (!newfiberMapbox) return; @@ -76,5 +91,32 @@ border: 1px solid #47eef3; box-shadow: inset 0 0 5px 5px #47eef38a; } + .IssueWarning { + width: 40px; + height: 60px; + position: absolute; + top: 100px; + left: 480px; + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 13px; + color: #ffffff; + text-align: center; + background: #003756; + border-radius: 28px; + border: 1px solid #53c6c9; + display: flex; + align-items: center; + cursor: pointer; + box-shadow: inset 0 0 5px 2px #47eef38a; + } + .TuChengImgTrue { + transform: translateX(-460px); + transition: all 1s ease; + } + .TuChengImgFalse { + transform: translateX(0px); + transition: all 1s ease; + } } diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index 68d6fe5..9b0373c 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -589,6 +589,7 @@ margin-left: 10px; } .titleNamePP { + width: 450px; height: 22px; font-size: 16px; font-family: PingFang SC; @@ -596,7 +597,9 @@ color: #b8ecff; line-height: 22px; margin: 5px; - + overflow: hidden; + text-overflow: ellipsis; /* 超出宽度后显示省略号 */ + white-space: nowrap; /* 限制不允许换行 */ &:before { // display: block; // content: ''; diff --git a/src/views/oneMap/smartBridge/LeftBox.vue b/src/views/oneMap/smartBridge/LeftBox.vue index 2d71bd4..f6b9086 100644 --- a/src/views/oneMap/smartBridge/LeftBox.vue +++ b/src/views/oneMap/smartBridge/LeftBox.vue @@ -16,12 +16,7 @@
感知设备
-
+
{{ t }} @@ -44,7 +39,7 @@
- +
@@ -52,57 +47,70 @@