From 9b53da53715a0e46b2b95cf2ee3d6dcc7d9a56a7 Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Fri, 26 Apr 2024 18:24:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/perception/topology/index.vue | 56 +++++++++++++------ ruoyi-ui/vue.config.js | 4 +- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue index 48dc6739..2f88f843 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue @@ -54,11 +54,11 @@ > -
+ > -->
桩号：{{ item.stakeMark }}
IP：{{ item.switchIp }}
@@ -137,13 +137,20 @@ src="./switch1.png" /> -
+ {{ itm.switchName }}({{ index + 1 }}) +
- {{ itm.switchName }}({{ index + 1 }}) -
+
-
{{ idv.deviceName }}
+
+ {{ idv.deviceName }} +
@@ -479,10 +494,15 @@ export default { border: 1px solid #34d3eb; } .c-namesw { - padding: 0px 50px; + width: 180px; + text-align: center; + // padding: 0px 50px; margin-top: -5px; font-size: 14px; border: 0px !important; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .c-namer { background: linear-gradient( @@ -517,26 +537,26 @@ export default { } .device-list { border: 1px dashed #34d3eb; - min-height: 110px; + height: 112px; min-width: 160px; margin-top: 10px; overflow: auto; + display: grid; + grid-template-rows: repeat(2, minmax(45px, auto)); + grid-auto-columns: 1fr; + grid-gap: 0px; + grid-template-columns: repeat(auto-fill, minmax(40px, 1fr)); + padding: 10px; } .device-list-r { border-color: #ff5935; // display: flex; // flex-wrap: wrap; // justify-content: space-around; - display: grid; - grid-template-rows: repeat(2, minmax(30px, auto)); - grid-auto-columns: 1fr; - grid-gap: 0px; - grid-template-columns: repeat(auto-fill, minmax(40px, 1fr)); // overflow: hidden; - padding: 10px; } .device-item { - overflow: hidden; + // overflow: hidden; img { margin: 0; width: 25px; diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index e2a767f5..77f27227 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -44,7 +44,7 @@ module.exports = { // target: `http://10.0.81.201:8080`, // target: `http://10.168.73.36:8080`, // 周乐 // target: `http://10.168.77.209:8087`, // 刘朋 - target: `http://10.168.66.196:8087`, //刘文阁 + // target: `http://10.168.66.196:8087`, //刘文阁 // target: `http://10.168.56.206:8087`, //孟 // target: `http://10.168.78.135:8087`, //孟 // target: `http://10.168.78.135:8087`, @@ -52,7 +52,7 @@ module.exports = { // target: `http://10.0.81.204:8087`, //现场后台 刘文阁 // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁 // target: `http://10.168.78.135:8087`, //王钦 - // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 + target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 // target: `http://10.168.68.42:8087`, //王思祥 // target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟 From cbd8454d8bb08046e65248955e4666cef1534faa Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Fri, 26 Apr 2024 19:23:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/sortFaceForecast/index.vue | 71 ++++++++++--------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue index e10a7355..d51f9de1 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue @@ -504,23 +504,23 @@ export default { let obj = response.data; let data = []; for (let key in obj) { - if (key === "weatherFacts1") { - obj[key].name = "长清区"; - } else if (key === "weatherFacts2") { - obj[key].name = "平阴县"; - } else if (key === "weatherFacts3") { - obj[key].name = "东平县"; - } else if (key === "weatherFacts4") { - obj[key].name = "汶上县"; - } else if (key === "weatherFacts5") { - obj[key].name = "梁山县"; - } else if (key === "weatherFacts6") { - obj[key].name = "嘉祥县"; - } else if (key === "weatherFacts7") { - obj[key].name = "巨野县"; - } else if (key === "weatherFacts8") { - obj[key].name = "郓城县"; - } + // if (key === "weatherFacts1") { + // obj[key].name = "长清区"; + // } else if (key === "weatherFacts2") { + // obj[key].name = "平阴县"; + // } else if (key === "weatherFacts3") { + // obj[key].name = "东平县"; + // } else if (key === "weatherFacts4") { + // obj[key].name = "汶上县"; + // } else if (key === "weatherFacts5") { + // obj[key].name = "梁山县"; + // } else if (key === "weatherFacts6") { + // obj[key].name = "嘉祥县"; + // } else if (key === "weatherFacts7") { + // obj[key].name = "巨野县"; + // } else if (key === "weatherFacts8") { + // obj[key].name = "郓城县"; + // } data.push(obj[key]); } this.weatherList = data; @@ -534,26 +534,27 @@ export default { console.log("this.selectIndex", this.selectIndex); let obj = response.data; + console.log("obj", obj); let data = []; for (let key in obj) { - if (key === "hourlyWeather1") { - console.log("obj[key]", obj[key][id - 1]); - obj[key][id - 1].name = "长清区"; - } else if (key === "hourlyWeather2") { - obj[key][id - 1].name = "平阴县"; - } else if (key === "hourlyWeather3") { - obj[key][id - 1].name = "东平县"; - } else if (key === "hourlyWeather4") { - obj[key][id - 1].name = "汶上县"; - } else if (key === "hourlyWeather5") { - obj[key][id - 1].name = "梁山县"; - } else if (key === "hourlyWeather6") { - obj[key][id - 1].name = "嘉祥县"; - } else if (key === "hourlyWeather7") { - obj[key][id - 1].name = "巨野县"; - } else if (key === "hourlyWeather8") { - obj[key][id - 1].name = "郓城县"; - } + // if (key === "hourlyWeather1") { + // console.log("obj[key]", obj[key][id - 1]); + // obj[key][id - 1].name = "长清区"; + // } else if (key === "hourlyWeather2") { + // obj[key][id - 1].name = "平阴县"; + // } else if (key === "hourlyWeather3") { + // obj[key][id - 1].name = "东平县"; + // } else if (key === "hourlyWeather4") { + // obj[key][id - 1].name = "汶上县"; + // } else if (key === "hourlyWeather5") { + // obj[key][id - 1].name = "梁山县"; + // } else if (key === "hourlyWeather6") { + // obj[key][id - 1].name = "嘉祥县"; + // } else if (key === "hourlyWeather7") { + // obj[key][id - 1].name = "巨野县"; + // } else if (key === "hourlyWeather8") { + // obj[key][id - 1].name = "郓城县"; + // } data.push(obj[key]); } let newData = []; From 921735d0f84e81bd78968a71601d1e0114f34e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Fri, 26 Apr 2024 19:43:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialogs/PerceiveEvent/index.vue | 8 +++- .../pages/perception/topology/index.vue | 18 ++------ .../pages/perception/topology/t01-1.svg | 7 +++ .../pages/perception/topology/t01-2.svg | 14 ++++++ .../pages/perception/topology/t01-4.svg | 11 +++++ .../pages/perception/topology/t01-5.svg | 9 ++++ .../pages/perception/topology/t02-1.svg | 7 +++ .../pages/perception/topology/t10.png | Bin 699 -> 0 bytes .../pages/perception/topology/t11-1.svg | 7 +++ .../pages/perception/topology/t11-2.svg | 14 ++++++ .../pages/perception/topology/t11-4.svg | 11 +++++ .../pages/perception/topology/t11-5.svg | 9 ++++ .../pages/perception/topology/t11.png | Bin 710 -> 0 bytes .../pages/perception/topology/t12-1.svg | 14 ++++++ .../Cards/AuditDetails/DetailCard.vue | 37 ++++++++++------ .../Cards/AuditDetails/index.vue | 10 +++-- .../Cards/AuditLists/index.vue | 6 +-- .../src/views/JiHeExpressway/utils/enum.js | 41 ++++++++++++++++++ ruoyi-ui/vue.config.js | 6 +-- 19 files changed, 188 insertions(+), 41 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-1.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-2.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-4.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-5.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t02-1.svg delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t10.png create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-1.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-2.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-4.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-5.svg delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11.png create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t12-1.svg diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue index 2a9c0d0f..a0efe10c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue @@ -295,12 +295,16 @@ export default { lane: data.lane?.split(",") || [], }; - this.formList[5].options.options = - WarningSubclassList[data.warningType] || []; + this.formList[5].options = { options: + WarningSubclassList[data.warningType] || []}; setTimeout(() => { this.$refs.FormConfigRef.reset(true); }); + setTimeout(() => { + this.formList[5].options = { options: + WarningSubclassList[data.warningType] || []}; + }, 100); this.data.direction = DirectionTypes[this.data.direction]; this.data.duration = getDuration(this.data.warningTime); this.interval = setInterval(() => { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue index 2f88f843..e14eee93 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue @@ -40,7 +40,7 @@
-
+
@@ -54,11 +54,6 @@ >
-
桩号：{{ item.stakeMark }}
IP：{{ item.switchIp }}
@@ -78,7 +73,7 @@
-
+
@@ -168,7 +163,7 @@ v-for="(idv, idvx) in itm.dcDeviceList" class="device-item" > - + { - console.log(res); - }); }, methods: { bind() { @@ -261,7 +250,6 @@ export default { let cards = []; let topo = []; const list = this.map.children[e - 1].children; - const list1 = list.filter((x) => x.ringNetWork === 1); if (list1) { cards.push({ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-1.svg new file mode 100644 index 00000000..c7ed2a67 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-1.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-2.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-2.svg new file mode 100644 index 00000000..444d7ef8 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-2.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-4.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-4.svg new file mode 100644 index 00000000..61dbf2da --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-4.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-5.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-5.svg new file mode 100644 index 00000000..71511248 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-5.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t02-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t02-1.svg new file mode 100644 index 00000000..7d387119 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t02-1.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t10.png b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t10.png deleted file mode 100644 index d11e783a3d3ec60580ced2e04cc37a480b18ce91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 699 zcmV;s0!00ZP)Px%bxA})R9Hvtl|e{UQ51&1bH^FW2nvK~5h~%bXyGDTDG{y0T3A_)^Ng59ix48h zMKFsXa8)b8gg0Yg!DOYi2-}3T3&K^)Y|$c!C~JhA8Rs;29K~XqcO3-@=B?g?bN}<* z|NiGbVVfV>=KjJI!L4rnymMkw^OJTZfkOupW#=?Qc|ySf@^X?X>7t!wI|dPBy? zzit*J7@)uZ3L^I_H2R5%$Kv9Yq|?i_f>Z_2zP@H6kq^M`Dh;N|*47zGBnl4oYbDhIVzGmOJ^waG(HR;W&&ufNf@6K~Rji)ZPN8rfks)BG zld$S(QmJVX(V+V34#ea8Sz59g0FjHpbyPd;SCBBOZ!qSBB$L0Y)dmWw=S9mo2m!Mg zGsN=p6e7)m5VkhdasThJpUIM#kJClNpwD z+JaVm+yEe7UTuSD*Yrp#HLZz+VSc{5cmz*?NNH3)yJw?E0gu_cRHukCJDbQGK z)qy!wS9W2{bMgJ#>qRvlZz7w$hUy*QGpbh+xr;F!;`?8=0-%(EprGl%zyS&c>qbX0 zHx)y-sSpMMl*YcdH$)_|i}v=6%YVTo16f4&xj5hgxKRg=)711%Mn-D-)w%#V--Iq= hwbaxB>JHQ$_zh6F-6CKbSNZ?|002ovPDHLkV1ifaI|={* diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-1.svg new file mode 100644 index 00000000..ac614f17 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-1.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-2.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-2.svg new file mode 100644 index 00000000..dfa9edce --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-2.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-4.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-4.svg new file mode 100644 index 00000000..3f984927 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-4.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-5.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-5.svg new file mode 100644 index 00000000..1edf750d --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-5.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11.png b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11.png deleted file mode 100644 index 2992fb95be58a7317e0dd005198e59c53a0ef09d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 710 zcmV;%0y+JOP)Px%fJsC_R9Hvtl|5)vQ5c4w@1|B`tw~En6huNPVt*AnSSO2!lT-(P@Q)%+4pI=2 z41$9obkbFa4h}llYO6zO2c@`(BE_UZm*U_ci0w_q)%MsEc&=5UEsOyN7KaM`#^LJh zZuz=e5Gz0^p%;OB%M6+orN?by2$5X5Af5oVA2i}DFa^|>8Xz#NhMrWL%#;J+2@syt z9##6S#zI=*WV(q_M2uCxMBoV!ifaQfh7k2>I_d;DG1DL^pL+XMyg8|j7*07tOqHM? zVDQa2YuqQ^P*snlA{LkQ%z&sJMUXy-S!- zgJL90#N8`y-8*eH4&y)=c&)-|$1tEmn+-&iJ8rA=t`wk9B3YoW0Fcll2JVXCp*rNv zGAdjM7+mA<2xY@xAWACWuz$K)lFLEb68H@u9M}6QoJE;&9QLU4pioNTV>U?Vx_SCk zIA0tjaNQO9XqJq}MOHezP(q7ql>Ma&lovWd5; so#j2Xepr0pgnrD*(Nq8`2~-mJ2{Ov + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue index a35b6761..3a6d21ed 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue @@ -16,25 +16,25 @@
{{ data.desc }}
- + 发布人: {{ data.publisher }} +
- 当前管制: {{data.posts}} + 当前管制: {{data.facilityName}}
分享至 - +
-
+
@@ -64,19 +64,28 @@ export default { }, data() { return { - shareWithData: shareWith.keys().map(item => item.match(/[^./]+/)[0]), + shareWithData: [ + 'message', + 'weChat', + 'weibo', + 'website' + ],//shareWith.keys().map(item => item.match(/[^./]+/)[0]), status: { 0: { - text: "进行中", - color: '#00B1A0' + color: "#00B1A0", + text: "待确认", + icon: 'ToBeReviewed' }, + 1: { - text: "待审核", - color: '#C55253' + color: "#057DD3", + text: "处理中", + icon: 'Reviewed' }, 2: { - text: "已审核", - color: '#057DD3' + color: "#C55253", + text: "已完成", + icon: 'Failed' }, } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue index b698cc35..1e0fe925 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue @@ -35,16 +35,18 @@ export default { console.log(id, res) let list = [] res.data.forEach(e => { + console.log(e,'---') list.push({ source: "1", onlyright:true, - time: e.eventTime, + time: e.createTime, name: e.createBy, descTitle: "事件详情", desc: e.contentDetails, - posts: e.facilityName, - channel:e.publishChannels, - state: 0, + facilityName: e.facilityName, + publisher:e.publisher, + channel:e.publishChannels.toString(), + state: e.eventState, }) }); this.timeLine2List = list; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue index 4238988d..ba4fd1e8 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue @@ -1,5 +1,5 @@