From 6c1e83bc44a0c1b6d3c57860680b9ba4521efdc0 Mon Sep 17 00:00:00 2001 From: zhoule Date: Tue, 5 Mar 2024 15:16:47 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=8F=AA=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=A4=A7=E5=B0=8F=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=8A=A8=E6=80=81=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/JiHeExpressway/components/Adaptation.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue index ff5a269d..8d34a74d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue @@ -101,10 +101,10 @@ export default { mounted() { this.initScale(); - window.addEventListener( - "resize", - _.debounce(this.initScale.bind(this), 360) - ); + // window.addEventListener( + // "resize", + // _.debounce(this.initScale.bind(this), 360) + // ); }, }; From 08bc6b793c83a68dd0b60b75e5d4586793b0c530 Mon Sep 17 00:00:00 2001 From: zhoule Date: Tue, 5 Mar 2024 15:17:02 +0800 Subject: [PATCH 02/16] bug --- .../components/RoadStateCard/index.vue | 19 +++++++++++++++++-- .../Dialogs/TrafficIncidents/index.vue | 2 +- .../pages/control/event/event/index.vue | 6 +++--- .../src/views/JiHeExpressway/utils/enum.js | 4 ++-- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue index c2db7f75..bdbee4b9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue @@ -2,8 +2,14 @@
- + + +
+ +
+
@@ -23,7 +29,7 @@
- + @@ -135,6 +141,15 @@ export default { width: 212px; height: 159px; } + + .icon { + display:inline-block; + width: 212px; + height: 159px; + line-height: 157px; + text-align: center; + border: 1px solid #fff; + } } .right { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue index 944d0c5f..6985b889 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue @@ -132,7 +132,7 @@ export default { if (code != 200) return; this.data = { ...data, ...this.data }; - console.log(data); + console.log('trafficIncidents',data); }) .catch((err) => {}); }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index 8e53283c..5cbe6744 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -359,8 +359,8 @@ export default { data.visibility = otherConfig.visibility; data.pictures = otherConfig.pictures || []; - // data.videoList = otherConfig.videoList || [] - data.videoList = otherConfig.videoList || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4'] + data.videoList = otherConfig.videoList || [] + // data.videoList = otherConfig.videoList || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4'] } this.detailDialogFormData = data; @@ -377,7 +377,7 @@ export default { let data = result.data; data.stringDirection = gzDirectionMapping[data.direction] || data.direction; - data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']; + data.videoList = []; if (data.otherConfig) { let otherConfig = JSON.parse(data.otherConfig); // data.pictures = otherConfig.pictures || []; diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js index cad7cfc3..208678ee 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js @@ -40,13 +40,13 @@ export const CameraDirectionEnum = { // text: "上下行 (双向)", // }, 1: { - text: "上行(菏泽方向)", + text: "菏泽方向", }, 2: { text: "中", }, 3: { - text: "下行(济南方向)", + text: "济南方向", }, }; From f25e3c4bb44b93a60f417a16458e155f750a50c2 Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Wed, 6 Mar 2024 10:53:16 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/utils/request.js | 8 +++ .../components/infoBoard/BoardInfoEditor.vue | 54 +++++++++++++++---- .../components/infoBoard/BoardPreview.vue | 4 +- .../components/infoBoard/BoardTplPreview.vue | 2 + .../views/JiHeExpressway/mixins/InfoBoard.js | 3 +- .../pages/service/board/index.vue | 19 ++++--- ruoyi-ui/vue.config.js | 4 +- 7 files changed, 72 insertions(+), 22 deletions(-) diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index d31b22f7..1acab51b 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -141,6 +141,14 @@ service.interceptors.response.use(res => { else if (message.includes("Request failed with status code")) { message = "系统接口" + message.substr(message.length - 3) + "异常"; } + else if (message.includes("client_offline")) + { + message = "设备离线" + } + else if (message.includes("time_out")) + { + message = "连接超时" + } Message({ message: message, type: 'error', diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue index 5a34ea16..54ba5735 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue @@ -101,6 +101,7 @@ :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue" + v-if="+(item.dictValue.replace('px',''))<=maxFontSize" > @@ -191,6 +192,7 @@ import { debounce } from "lodash"; export default { data() { return { + maxFontSize:100, alignmentNum: 2, content: "", boardWidth: "", @@ -316,6 +318,17 @@ export default { speechSpeed: "0", font: "3", }, + templateDefault: { + category: "", + formatStyle: "2", + content: "", + fontColor: "", + fontSize: "", + fontType: "", + stopTime: 50, + inScreenMode: "", + screenSize: "", + }, isLocked: false, }; }, @@ -361,6 +374,26 @@ export default { }, }, watch: { + screenSize(newV){ + + if(newV){ + let boardH = newV.split("*")[1]; + let fontSize = "20"; + if (['64', '48'].includes(boardH)) { + this.maxFontSize = +boardH + fontSize = boardH + "" + } else if (['80'].includes(boardH)) { + this.maxFontSize = +boardH / 2 + fontSize = +boardH / 2 + "" + } else if (['160'].includes(boardH)) { + this.maxFontSize = +boardH / 2 + fontSize = +boardH / 4 + "" + } + this.deviceCttDefault.fontSize = fontSize + this.templateDefault.screenSize = newV; + this.templateDefault.fontSize = fontSize; + } + }, visible: { handler(newV) { this.dialogVisible = newV; @@ -400,21 +433,30 @@ export default { }, mounted() {}, created() { + this.templateDefault.fontType = this.fontTypeList[0].dictValue //设置模板的默认值 this.getDicts("iot_devices_font_color").then((res) => { this.colorList = res.data; + this.templateDefault.fontColor = this.colorList[0].dictValue // console.log(this.colorList, "字体颜色"); }); this.getDicts("iot_device_font_inScreen_mode").then((res) => { this.inScreenModeList = res.data; + this.templateDefault.inScreenMode = this.inScreenModeList[0].dictValue // console.log(this.inScreenModeList, "入屏方式"); }); this.getDicts("iot_template_category").then((res) => { this.templateCategoryList = res.data; + this.templateDefault.category = this.templateCategoryList[0].dictValue }); this.getDicts("iot_device_font_size").then((res) => { this.fontSizeList = res.data; + // this.templateDefault.fontSize = this.fontSizeList[0].dictValue // this.dataForm.FONT_SIZE = res.data[1].dictValue }); + + + + }, methods: { initData() { @@ -433,17 +475,7 @@ export default { if (this.mode == "add") { let tempTpl = null; if (this.type == "template") { - tempTpl = { - category: this.templateCategoryList[0].dictValue, - formatStyle: 0, - content: "", - fontColor: this.colorList[0].dictValue, - fontSize: this.fontSizeList[0].dictValue, - fontType: this.fontTypeList[0].dictValue, - stopTime: 50, - inScreenMode: this.inScreenModeList[0].dictValue, - screenSize: this.screenSize, - }; + tempTpl = _.merge({}, this.templateDefault, this.tpl); } else { tempTpl = _.merge({}, this.deviceCttDefault, this.tpl.origin); //首页弹窗，新增设备项时，需要传设备尺寸过来 } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue index 005fa7d5..51c3e6da 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue @@ -40,7 +40,7 @@ export default { }, tpl:{ handler(newV){ - this.contentArr = this.tpl.textContent.replaceAll(/\\\\n/g, '\n').replaceAll(/ /g, ' ').split('\n'); + this.contentArr = this.tpl.textContent.replaceAll(/\\\\n/g, '\n').replaceAll(/\\=/g, '=').replaceAll(/\\,/g, ',').replaceAll(/ /g, ' ').split('\n'); this.setStyle(); }, deep:true, @@ -113,6 +113,8 @@ export default { color: #f00; line-height: 1; margin-bottom: 0; + word-break: keep-all; + white-space: nowrap; } } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue index 71f8144c..473dbb38 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue @@ -110,6 +110,8 @@ export default { color: #f00; line-height: 1; margin-bottom: 0; + word-break: keep-all; + white-space: nowrap; } } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js index 0dcc45a8..5d9b420e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js +++ b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js @@ -11,13 +11,14 @@ export default{ // 新增待下发 ____onAddDeviceItem() { let arr = this.selectedSize.split("*"); + this.editDialog = { visible: true, mode: "add", type: "device", tpl: { "textContent": "", - origin: { + "origin": { displayAreaWidth: +arr[0], displayAreaHeight: +arr[1] } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue index 516e4897..14477d93 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -57,8 +57,8 @@ :key="index" >
{{ itm.deviceName }}
- - + + @@ -455,7 +455,7 @@ export default { res.data.forEach((item) => { this.boardSizeDic[item.dictValue] = { label: item.dictLabel, - list: [], + list: [] }; }); }); @@ -533,6 +533,7 @@ export default { if (_.isString(item.otherConfig)) { item.otherConfig = JSON.parse(item.otherConfig); } + item.iotDeviceId = item.iotDeviceId || "null_" + item.id; this.boardSizeDic[item.otherConfig.screenSize].list.push(item); if (!this.selectedSize) { this.selectedSize = item.otherConfig.screenSize; @@ -569,7 +570,7 @@ export default { this.selectedBdMsg = []; this.selectedBdMsg = _.cloneDeep(testDeviceInfo.data["3A"].content); } else { - if (!deviceFrom.iotDeviceId) { + if (!deviceFrom.iotDeviceId || deviceFrom.iotDeviceId.includes("null_")) { this.$message.warning("设备未接入！"); return; } @@ -586,12 +587,16 @@ export default { } }, ____onAddTemplate() { + + // if(selectedSize){ + // fontSize = "64px" + // } this.editDialog = { visible: true, mode: "add", type: "template", tpl: { - content: "", + content: "" }, }; }, @@ -783,8 +788,8 @@ export default { return; } this.checkedDeviceIds = [arr.pop()]; - if (!this.checkedDeviceIds[0]) { - this.$message.warning("该设备缺少iotDeviceId参数!"); + if (!this.checkedDeviceIds[0] || this.checkedDeviceIds[0].includes("null_")) { + this.$message.warning("设备未接入！"); } this.selectedDevice = _.find(this.boardSizeDic[this.selectedSize].list, { iotDeviceId: this.checkedDeviceIds[0], diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 25f5969a..388187f1 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -51,8 +51,8 @@ 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.68.42:8087`, //王思祥 + target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 + // target: `http://10.168.68.42:8087`, //王思祥 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "", From 370efd877e5bb3f6c8b9f0ccbdf56eaf59e7ccb1 Mon Sep 17 00:00:00 2001 From: zhoule Date: Wed, 6 Mar 2024 10:54:00 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=B7=AF=E6=AE=B5=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AE=9A=E4=BD=8D=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/eventQuery/index.vue | 34 +++++++++++-------- .../components/eventQuery/progressBar.vue | 27 +++++++++++---- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue index 565ad9d8..f952b135 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue @@ -1,12 +1,13 @@ - + - + - \ No newline at end of file + \ No newline at end of file From 8b8fae0784649a9c158dec5d094e72582cb3d5a3 Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Wed, 6 Mar 2024 15:56:31 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/perception/meteorologyCheck.js | 32 + .../components/roadNetwork/index.vue | 321 ++-- .../components/sortFaceForecast/index.vue | 1304 +++++++++-------- .../components/weatherForecast/index.vue | 525 +++---- .../components/infoWarning/index.vue | 755 +++++----- .../perception/meteorologyCheck/index.vue | 277 ++-- ruoyi-ui/src/views/event/event/dispatch.vue | 1108 ++++++++------ 7 files changed, 2384 insertions(+), 1938 deletions(-) create mode 100644 ruoyi-ui/src/api/perception/meteorologyCheck.js diff --git a/ruoyi-ui/src/api/perception/meteorologyCheck.js b/ruoyi-ui/src/api/perception/meteorologyCheck.js new file mode 100644 index 00000000..f179d38f --- /dev/null +++ b/ruoyi-ui/src/api/perception/meteorologyCheck.js @@ -0,0 +1,32 @@ +import request from "@/utils/request"; + +// 查询天气状况 +export function getWeatherFacts() { + return request({ + url: "/weatherForecast/weatherFacts", + method: "post", + }); +} + +// 按小时查询天气状况 +export function getHourlyWeather() { + return request({ + url: "/weatherForecast/hourlyWeather", + method: "post", + }); +} + +// 查询气象预警 +export function getMeteorologicalEarlyWarning() { + return request({ + url: "/weatherForecast/meteorologicalEarlyWarning", + method: "post", + }); +} +// 查询气象预警数量 +export function getQueryTheNumberOfMeteorologicalWarning() { + return request({ + url: "/weatherForecast/queryTheNumberOfMeteorologicalWarning", + method: "post", + }); +} diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue index 66def1ff..28a61516 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue @@ -1,177 +1,186 @@ - - - - - \ No newline at end of file +} +.charts { + height: 180px; + width: 100%; +} + 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 4518ed0b..e10a7355 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 @@ -1,614 +1,768 @@ - - - - - \ No newline at end of file +} +.charts { + height: 180px; + width: 100%; +} + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue index acb1a211..c80496fb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue @@ -1,296 +1,297 @@ - - - - - \ No newline at end of file +} +.charts { + height: 180px; + width: 100%; +} + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue index 0dc3b8da..0ec49e7b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue @@ -1,393 +1,464 @@ - + - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue index 308886e9..efed36e1 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue @@ -1,160 +1,153 @@ - - - - - \ No newline at end of file +} + diff --git a/ruoyi-ui/src/views/event/event/dispatch.vue b/ruoyi-ui/src/views/event/event/dispatch.vue index 8d292b23..433096b4 100644 --- a/ruoyi-ui/src/views/event/event/dispatch.vue +++ b/ruoyi-ui/src/views/event/event/dispatch.vue @@ -26,7 +26,7 @@ @click="openWorkBench()" /> -
+
处置记录 @@ -39,20 +39,21 @@ :before-close="drawerHandleClose" append-to-body :modal="false" - style="left:26%;"> + style="left: 26%" + > + > -

{{activity.flowDescription}}

-

用户:{{activity.nickName}}

+

{{ activity.flowDescription }}

+

用户:{{ activity.nickName }}

 @@ -60,51 +61,51 @@
-
-
- - 实时视频 - VIDEO MONITORING -
投屏
+
+
+ + 实时视频 + VIDEO MONITORING +
投屏
+
+
+
+ +
{{ videoForm1.title }}
-
-
- -
{{ videoForm1.title }}
-
-
- -
{{ videoForm2.title }}
-
-
- -
{{ videoForm3.title }}
-
-
- -
{{ videoForm4.title }}
-
- -
-
-
- - 事件信息 - EVENT INFORMATION -
-
-
-
-
事件来源：
-
{{ getFrom(eventForm.eventSource) }}
-
-
-
事件类型：
-
{{ eventForm.simplifyName }}
-
-
-
所属隧道：
-
{{ eventForm.tunnelName }}
-
-
-
方向：
-
{{ getDirection(eventForm.direction,eventForm) }}
-
-
-
影响车道：
-
{{ eventForm.laneNoName }}
-
-
-
桩号：
-
{{ eventForm.stakeNum }}
-
+
+
+
+ + 事件信息 + EVENT INFORMATION +
+
+
+
+
事件来源：
+
{{ getFrom(eventForm.eventSource) }}
-
-
- -
-
- +
+
事件类型：
+
{{ eventForm.simplifyName }}
+
+
+
所属隧道：
+
{{ eventForm.tunnelName }}
+
+
+
方向：
+
{{ getDirection(eventForm.direction, eventForm) }}
+
+
+
+ 影响车道：
+
{{ eventForm.laneNoName }}
+
+
+
桩号：
+
{{ eventForm.stakeNum }}
-
-
-
- - 调度联络 - DISPATCHING LIAISON +
+
+ +
+
+ +
-
- - - - - - - - - - -
-
-
-
-
-
-
- - 事件处置 - EVENT HANDLING -
-
-
-
-

{{eventInfo.planName}}

- {{eventInfo.eventGrade}} -
-
- -

{{deadline4}}

-
+
+
+ + 调度联络 + DISPATCHING LIAISON
-
-
-
+ + -
-
-

-

- -
-
- + + + + + + + + + +
+
+
+
+
+
+
+
+ + 事件处置 + EVENT HANDLING +
+
+
+
+

{{ eventInfo.planName }}

+ {{ eventInfo.eventGrade }} +
+
+ +

{{ deadline4 }}

+
+
+
+
+
+
+
+

+ +
+
+ +
+ {{ item.flowContent }} +
+
+ 一键 +
+ +
- {{ item.flowContent }} + 详情
- +
- 一键 + class="dashed" + :style="{ top: index == 0 ? '55px' : '76px' }" + v-show="index != incHandList.length - 1" + > + +

- -
- 详情 -
-
- -

-
-
-
-
-
+
-
{{ itm.flowContent }}
- - - 完成 - - - - 完成 - - - 打开 - - + + 完成 + + + + 完成 + + + 打开 + + - -
- 处置 - +
+ 处置 + +
-
- -
- 立即完结 - 警情升级 + +
+ 立即完结 + 警情升级 +
-
- - - - - - - + + + + + + + -

{{boxName}}:

+

{{ boxName }}:

-
-
- +
+ > +
- -

{{boxName}}:

- -
- +

{{ boxName }}:

+ +
+ -

{{ GDeviceData.deviceState }}

+

{{ GDeviceData.deviceState }}
- 执 行 - 取 消 + 执 行 + 取 消
@@ -856,94 +975,146 @@ :before-close="oneKeyHandleClose" :append-to-body="true" :close-on-click-modal="false" - > + >
-
+

暂无匹配设备

-
- -

{{item.processName}}

+
+ +

{{ item.processName }}

+ style="width: 100%" + class="phoneTable" + > + + + + + v-if="item.deviceType == '16' || item.deviceType == '36'" + > + {{ item.vmsData["content"] }} - - - {{item.vmsData['content']}} - - - {{item.deviceState}} + v-if=" + item.deviceType != '22' && + item.deviceType != '16' && + item.deviceType != '36' + " + > + {{ item.deviceState }} - - {{item.lsData}} + + {{ item.lsData }} - {{item.handleState == '0' ? '未执行':'已执行'}} + {{ item.handleState == "0" ? "未执行" : "已执行" }} - + -

执行模板:

-
+

+ 执行模板: +

+
-
-
- +
+ > +
-

执行文件:

+

+ 执行文件: +

-

{{item.deviceState}}

+

{{ item.deviceState }}
-

执行状态:

-
+

+ 执行状态: +

+
- -

{{item.deviceState}}

+

{{ item.deviceState }}
@@ -953,29 +1124,40 @@ + @click="oneKeyExecute()" + > 执 行 - 取 消 + 取 消 - - + - - - - - - + > + + + + + +
@@ -984,8 +1166,12 @@ import robot from "@/views/workbench/config/components/robotManagement"; import { intervalTime } from "../../../utils/index.js"; import { mapState } from "vuex"; -import { getTunnels,getWorkStagingRobot,listTunnels1 } from "@/api/equipment/tunnel/api.js"; -import { laneImage,laneImage2 } from "../../../utils/configData.js"; +import { + getTunnels, + getWorkStagingRobot, + listTunnels1, +} from "@/api/equipment/tunnel/api.js"; +import { laneImage, laneImage2 } from "../../../utils/configData.js"; import { listType } from "@/api/equipment/type/api.js"; import { getDeviceData } from "@/api/workbench/config.js"; import { getEventCamera, getEntranceExitVideo } from "@/api/eventDialog/api.js"; @@ -1058,10 +1244,10 @@ export default { }, data() { return { - robotTimer:null, - tunnelLang:0, - robotPositon:99, - workBenchProp:{}, + robotTimer: null, + tunnelLang: 0, + robotPositon: 99, + workBenchProp: {}, robotDialogVisible: false, clickEqType: "", yjShow: true, @@ -1123,7 +1309,8 @@ export default { directionList: [], eventForm: {}, timer: null, - laneUrlList: this.$cache.local.get("navigationBar") == '0'?laneImage:laneImage2, + laneUrlList: + this.$cache.local.get("navigationBar") == "0" ? laneImage : laneImage2, eqTypeStateList: null, // selectedIconList: [], backImg: "", @@ -1189,11 +1376,11 @@ export default { }, async created() { const loading = this.$loading({ - lock: true, - text: "Loading", - spinner: "el-icon-loading", - background: "rgba(0, 0, 0, 0.7)", - }); + lock: true, + text: "Loading", + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.7)", + }); await this.getEqTypeStateIcon(); // await this.getTunnelData(); await this.getDispatchExecuted(); @@ -1235,13 +1422,13 @@ export default { // setTimeout(this.getLiPowerDevice, 0) }, 1000 * 5); }, - beforeDestroy(){ + beforeDestroy() { window.clearInterval(this.robotTimer); this.robotTimer = null; }, methods: { - openWorkBench(){ - this.$refs.workBenchRef.init(this.workBenchProp) + openWorkBench() { + this.$refs.workBenchRef.init(this.workBenchProp); }, handleTouping() { this.$confirm("即将投屏, 是否继续?", "提示", { @@ -1340,13 +1527,13 @@ export default { }, getManagementDevice(item) { console.log(item); - console.log(this.$route.query.id,"aaaaa") + console.log(this.$route.query.id, "aaaaa"); if (item.eqTypeId == 29) { this.robotDialogVisible = true; - if(item.eventState == "0"){ - roBotDong(this.$route.query.id,item.id).then((res) => { + if (item.eventState == "0") { + roBotDong(this.$route.query.id, item.id).then((res) => { this.evtHandle(); - }) + }); } return; } @@ -1719,17 +1906,17 @@ export default { }); this.$nextTick(() => { let heightBox = document.querySelectorAll(".heightBox > *"); - let arr = [] - - for( let i = 0;i { - console.log(response.rows,"事件详情") + console.log(response.rows, "事件详情"); this.workBenchProp = { - tunnelStationName:response.rows[0].tunnelStationName, - tunnelName:response.rows[0].tunnelName, - tunnelId:response.rows[0].tunnelId - } - if(response.rows[0].tunnelId == "JQ-JiNan-WenZuBei-MJY"){ - listTunnels1().then((res)=>{ - for(let item of res.rows){ - if(item.tunnelId == "JQ-JiNan-WenZuBei-MJY"){ - this.tunnelLang = - Number(item.endPileNum) - Number(item.startPileNum) + 10; + tunnelStationName: response.rows[0].tunnelStationName, + tunnelName: response.rows[0].tunnelName, + tunnelId: response.rows[0].tunnelId, + }; + if (response.rows[0].tunnelId == "JQ-JiNan-WenZuBei-MJY") { + listTunnels1().then((res) => { + for (let item of res.rows) { + if (item.tunnelId == "JQ-JiNan-WenZuBei-MJY") { + this.tunnelLang = + Number(item.endPileNum) - Number(item.startPileNum) + 10; } } - }) + }); this.robotTimer = setInterval(() => { setTimeout(this.getRobot, 0); }, 1000 * 5); @@ -1806,16 +1994,14 @@ export default { }); } }, - async getRobot(){ + async getRobot() { const param = { deviceId: 7, }; await getWorkStagingRobot(param).then((res) => { // console.log(res, "机器人"); - this.robotPositon = ( - (Number(res.data.position) / this.tunnelLang) * - 100 - ).toFixed(2) - 1; + this.robotPositon = + ((Number(res.data.position) / this.tunnelLang) * 100).toFixed(2) - 1; }); }, // 左上角视频 @@ -2299,14 +2485,14 @@ export default { height: 100%; } } - .workBenchButton{ + .workBenchButton { position: fixed; top: calc(15% + 6px); right: 34%; // right: 22%; cursor: pointer; - >img{ + > img { width: 47px; height: 46px; } From 64425abbf2c41ba056ea67871e2ace855df48bec Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Wed, 6 Mar 2024 16:37:32 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E6=9B=B4=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/main.js | 184 +++++++++--------- .../components/InputSearch/index.vue | 6 +- 2 files changed, 101 insertions(+), 89 deletions(-) diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index cdf37ddc..ec0e4a26 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -1,83 +1,91 @@ -import Vue from 'vue' -import CollapseTransition from 'element-ui/lib/transitions/collapse-transition'; -import Cookies from 'js-cookie' - -import Element from 'element-ui' -import './assets/styles/element-variables.scss' -import './views/iot/css/iot.css' -import '@/assets/styles/index.scss' // global css -import '@/assets/styles/ruoyi.scss' // ruoyi css -import App from './App' -import store from './store' -import router from './router/routerCreater' -import directive from './directive' //directive -import plugins from './plugins' // plugins -import './assets/icon/iconfont.css' // 阿里巴巴icon -import './assets/icons' // icon -import './permission' // permission control -import { Socket } from './utils/socket' +import Vue from "vue"; +import CollapseTransition from "element-ui/lib/transitions/collapse-transition"; +import Cookies from "js-cookie"; + +import Element from "element-ui"; +import clickoutside from "element-ui/src/utils/clickoutside"; +import "./assets/styles/element-variables.scss"; +import "./views/iot/css/iot.css"; +import "@/assets/styles/index.scss"; // global css +import "@/assets/styles/ruoyi.scss"; // ruoyi css +import App from "./App"; +import store from "./store"; +import router from "./router/routerCreater"; +import directive from "./directive"; //directive +import plugins from "./plugins"; // plugins +import "./assets/icon/iconfont.css"; // 阿里巴巴icon +import "./assets/icons"; // icon +import "./permission"; // permission control +import { Socket } from "./utils/socket"; import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree, numberMul } from "@/utils/ruoyi"; +import { + parseTime, + resetForm, + addDateRange, + selectDictLabel, + selectDictLabels, + handleTree, + numberMul, +} from "@/utils/ruoyi"; // 分页组件 import Pagination from "@/components/Pagination"; // 自定义表格工具组件 -import RightToolbar from "@/components/RightToolbar" +import RightToolbar from "@/components/RightToolbar"; // 富文本组件 -import Editor from "@/components/Editor" +import Editor from "@/components/Editor"; // 文件上传组件 -import FileUpload from "@/components/FileUpload" +import FileUpload from "@/components/FileUpload"; // 图片上传组件 -import ImageUpload from "@/components/ImageUpload" +import ImageUpload from "@/components/ImageUpload"; // 字典标签组件 -import DictTag from '@/components/DictTag' +import DictTag from "@/components/DictTag"; // 头部标签组件 -import VueMeta from 'vue-meta' +import VueMeta from "vue-meta"; // 字典数据组件 -import DictData from '@/components/DictData' +import DictData from "@/components/DictData"; // 无缝滚动组件 -import VueSeamlessScroll from 'vue-seamless-scroll' -import VueAwesomeSwiper from 'vue-awesome-swiper' -import 'swiper/css/swiper.css' +import VueSeamlessScroll from "vue-seamless-scroll"; +import VueAwesomeSwiper from "vue-awesome-swiper"; +import "swiper/css/swiper.css"; //el-table无线滚动 // 事件弹窗组件 -import eventDialog from '@/components/eventDialogTable/eventDialog.vue' -import eventDialogTable from '@/components/eventDialogTable' -import evtDialogOneThing from '@/components/eventDialogTable/evtDialogOneThing.vue' -import evtDialogVideo from '@/components/eventDialogTable/video.vue' +import eventDialog from "@/components/eventDialogTable/eventDialog.vue"; +import eventDialogTable from "@/components/eventDialogTable"; +import evtDialogOneThing from "@/components/eventDialogTable/evtDialogOneThing.vue"; +import evtDialogVideo from "@/components/eventDialogTable/video.vue"; // 大屏适配 -import dataV from '@jiaminghi/data-view' - +import dataV from "@jiaminghi/data-view"; // 字典标签组件 // import reproductionImage from '@/components/reproductionImage' // jQuery -import $ from 'jquery' -import preventClick from './api/clickOnceAtime' +import $ from "jquery"; +import preventClick from "./api/clickOnceAtime"; // gisMap // import gisMap from 'gis-map-tunnel' // import gisMap from 'gis-map-admin' -import config from '../public/config' +import config from "../public/config"; -import request from '../public/config' -import moment from 'moment' -window.moment = moment -import dayjs from "dayjs" +import request from "../public/config"; +import moment from "moment"; +window.moment = moment; +import dayjs from "dayjs"; //定义全局过滤器 -Vue.filter('dateformat', function (dataStr, pattern = 'YYY-MM-DD HH:mm:ss') { +Vue.filter("dateformat", function (dataStr, pattern = "YYY-MM-DD HH:mm:ss") { if (dataStr === null || dataStr === "") { return ""; } - return moment(dataStr).format(pattern) + return moment(dataStr).format(pattern); //filter两个参数 第一个是函数名，第二个是时间格式化处理的函数 //(函数里面的参数 第一个是传递的数据，第二个是需要转换的时间格式) -}) +}); window.IS_TESTING = false; -if (process.env.NODE_ENV == 'development'){ +if (process.env.NODE_ENV == "development") { window.IS_TESTING = false; } @@ -86,47 +94,47 @@ Vue.component("Empty", Empty); // 全局方法挂载 Vue.prototype.dayjs = dayjs; -Vue.prototype.getDicts = getDicts -Vue.prototype.getConfigKey = getConfigKey -Vue.prototype.parseTime = parseTime -Vue.prototype.resetForm = resetForm -Vue.prototype.addDateRange = addDateRange -Vue.prototype.selectDictLabel = selectDictLabel -Vue.prototype.selectDictLabels = selectDictLabels -Vue.prototype.handleTree = handleTree -Vue.prototype.socket = Socket -Vue.prototype.numberMul = numberMul - -// gis -Vue.prototype.$GlobalConfig = config.GlobalConfig - -Vue.use(preventClick) -Vue.use(VueAwesomeSwiper) -Vue.use(dataV) +Vue.prototype.getDicts = getDicts; +Vue.prototype.getConfigKey = getConfigKey; +Vue.prototype.parseTime = parseTime; +Vue.prototype.resetForm = resetForm; +Vue.prototype.addDateRange = addDateRange; +Vue.prototype.selectDictLabel = selectDictLabel; +Vue.prototype.selectDictLabels = selectDictLabels; +Vue.prototype.handleTree = handleTree; +Vue.prototype.socket = Socket; +Vue.prototype.numberMul = numberMul; + +// gis +Vue.prototype.$GlobalConfig = config.GlobalConfig; + +Vue.use(preventClick); +Vue.use(VueAwesomeSwiper); +Vue.use(dataV); // 全局组件挂载 -Vue.component('DictTag', DictTag) -Vue.component('Pagination', Pagination) -Vue.component('RightToolbar', RightToolbar) -Vue.component('Editor', Editor) -Vue.component('FileUpload', FileUpload) -Vue.component('ImageUpload', ImageUpload) -Vue.component('VueSeamlessScroll', VueSeamlessScroll) -Vue.component('eventDialog', eventDialog) -Vue.component('eventDialogTable', eventDialogTable) -Vue.component('evtDialogOneThing', evtDialogOneThing) -Vue.component('evtDialogVideo', evtDialogVideo) - - - -Vue.component(CollapseTransition.name, CollapseTransition) +Vue.component("DictTag", DictTag); +Vue.component("Pagination", Pagination); +Vue.component("RightToolbar", RightToolbar); +Vue.component("Editor", Editor); +Vue.component("FileUpload", FileUpload); +Vue.component("ImageUpload", ImageUpload); +Vue.component("VueSeamlessScroll", VueSeamlessScroll); +Vue.component("eventDialog", eventDialog); +Vue.component("eventDialogTable", eventDialogTable); +Vue.component("evtDialogOneThing", evtDialogOneThing); +Vue.component("evtDialogVideo", evtDialogVideo); + +Vue.component(CollapseTransition.name, CollapseTransition); // Vue.component('reproductionImage', reproductionImage) -Vue.use(directive) -Vue.use(plugins) +Vue.directive("clickoutside", clickoutside); + +Vue.use(directive); +Vue.use(plugins); // Vue.use(gisMap) -Vue.use(VueMeta) -DictData.install() +Vue.use(VueMeta); +DictData.install(); /** * If you don't want to use mock-server * you want to use MockJs for mock api @@ -137,14 +145,14 @@ DictData.install() */ Vue.use(Element, { - size: Cookies.get('size') || 'medium' // set element-ui default size -}) + size: Cookies.get("size") || "medium", // set element-ui default size +}); -Vue.config.productionTip = false +Vue.config.productionTip = false; new Vue({ - el: '#app', + el: "#app", router, store, - render: h => h(App) -}) \ No newline at end of file + render: (h) => h(App), +}); diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue index afbe249e..7ddef15d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue @@ -10,6 +10,7 @@ v-model="visible" @show="handleShow" style="width: 100%" + v-clickoutside="handlerClose" >
From 54a2bc2ef35e7c103da614618f83b4b522b9ce6b Mon Sep 17 00:00:00 2001 From: zhoule Date: Wed, 6 Mar 2024 16:42:07 +0800 Subject: [PATCH 07/16] bug --- .../JiHeExpressway/components/Dialog/index.vue | 2 +- .../RoadAndEvents/utils/buttonEvent.js | 2 +- .../components/RoadAndEvents/utils/httpList.js | 4 ++-- .../commonPhrases/index.vue | 5 +++-- .../disposalProcess/index.vue | 5 +++-- .../control/event/event/FormEvent/index.vue | 16 ++++++++-------- .../components/eventQuery/index.vue | 8 ++++---- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index d96d1c7e..5c086f66 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -165,7 +165,7 @@ export default { .dialog-content { padding: 9px 21px 27px 21px; - max-height: 90vh; + max-height: 75vh; overflow-y: auto; } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js index eaab0514..be21983a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js @@ -230,7 +230,7 @@ export const eventMap = { iconClass: "el-icon-loading", }); } - const data = await getPerceiveEventList() + const data = await getPerceiveEventList({warningState: 1}) .then(async (data) => { await delay(600); return data; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js index 16dc309f..0001db2e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js @@ -297,12 +297,12 @@ export function getEventTopicList(eventType) { * 感知事件根据类型获取 * @param {number} eventType */ -export function getPerceiveEventList() { +export function getPerceiveEventList(data = {}) { return new Promise((resolve, reject) => { request({ url: `/perceivedEvents/warning/perceivedEventsList`, method: "POST", - data: {}, + data: {...data}, }) .then(({ code, rows }) => { if (code != 200) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue index f9a39d87..80265e13 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue @@ -39,9 +39,9 @@
@@ -235,7 +235,8 @@ export default { display: flex; gap: 9px; width: 836px; - height: 768px; + // height: 768px; + min-height: 500px; margin-top: 20px; flex-direction: column; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue index 8ac44053..2af67d2d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue @@ -47,9 +47,9 @@
@@ -276,7 +276,8 @@ export default { display: flex; gap: 9px; width: 836px; - height: 768px; + min-height: 500px; + // height: 768px; flex-direction: column; .video-pic { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue index aeca27f2..7075db0e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue @@ -8,13 +8,13 @@
- -
- - -
+ + @@ -195,7 +195,7 @@ export default { Message.error("提交失败"); }).finally(() => { this.submitting = false; - this.$emit('queryData',true); + this.$emit('queryData', true); }) }) @@ -219,7 +219,7 @@ export default { .EventDetailDialog { gap: 9px; width: 1050px; - height: 810px; + // height: 810px; display: flex; flex-direction: column; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue index f952b135..2a359adb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue @@ -151,8 +151,8 @@ export default { dateTime: "2024", direction: "1", dataList: [], - selectIndex: 2, - selectId: 2, + selectIndex: 1, + selectId: 1, reset: false, type: "year", chart1List: [], @@ -216,8 +216,8 @@ export default { this.direction = "1"; this.type = "year"; this.dateTime = "2024"; - this.selectId = 2; - this.selectIndex = 2; + this.selectId = 1; + this.selectIndex = 1; this.reset = true; this.searchQuery(); }, From 944f14f8f8131d17255551cdaa9df4a9d20ec3d7 Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Thu, 7 Mar 2024 14:34:57 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/main.js | 3 -- .../components/InputSearch/index.vue | 39 +++++++++++++------ .../SmartDevice/components/DeviceParams.vue | 4 +- .../pages/service/sensitive/index.vue | 5 --- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index ec0e4a26..937504c4 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -3,7 +3,6 @@ import CollapseTransition from "element-ui/lib/transitions/collapse-transition"; import Cookies from "js-cookie"; import Element from "element-ui"; -import clickoutside from "element-ui/src/utils/clickoutside"; import "./assets/styles/element-variables.scss"; import "./views/iot/css/iot.css"; import "@/assets/styles/index.scss"; // global css @@ -128,8 +127,6 @@ Vue.component("evtDialogVideo", evtDialogVideo); Vue.component(CollapseTransition.name, CollapseTransition); // Vue.component('reproductionImage', reproductionImage) -Vue.directive("clickoutside", clickoutside); - Vue.use(directive); Vue.use(plugins); // Vue.use(gisMap) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue index 7ddef15d..52426051 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue @@ -1,5 +1,6 @@