From 4ab28ad441c6a42f2d362eb154d605b969a5f34e Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Thu, 25 Apr 2024 11:40:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Decorations/BackgroundClip.vue | 32 ++++++++--- .../components/Dialog/index.vue | 8 ++- .../components/HeaderMenu/EarlyWarning.vue | 39 +++++++++++++ .../components/HeaderMenu/UserArea.vue | 2 +- .../components/HeaderMenu/WarningList.vue | 47 ++++++++++++++++ .../components/HeaderMenu/index.vue | 56 +++---------------- .../components/infoBoard/BoardInfoEditor.vue | 1 + .../infoBoard/BoardRecordPreview.vue | 3 +- .../device/strategy/components/TaskItem.vue | 23 ++++++-- .../strategy/components/taskEditDialog.vue | 10 +++- .../views/JiHeExpressway/utils/api/batch.js | 3 +- ruoyi-ui/vue.config.js | 4 +- 12 files changed, 157 insertions(+), 71 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue index 173a00f3..fcac3329 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue @@ -1,14 +1,7 @@ @@ -364,4 +555,105 @@ div.el-popper.global-input-search-popover { background: linear-gradient(180deg, #005c79 0%, #009bcc 100%); } } +.cardPanel{ + display: flex; + flex-wrap: wrap; +} +.cardBox { + flex-basis: percentage(1/4); + padding-right: 10px; + padding-bottom: 10px; +} +.remark { + font-size: 14px; line-height: 20px; height: 40px; overflow: hidden; + color: #00b3cc; +} +.btnResult{ + background-color:#00b3cc; + color: white; + border: none; + padding: 5px 20px; +} + + \ No newline at end of file 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 7158596f..bcf17179 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 @@ -3,14 +3,7 @@
-
- +
@@ -29,7 +22,9 @@ import Pagination from "@screen/components/Pagination.vue"; import InputSearch from "@screen/components/InputSearch/index.vue"; import { searchFormList } from "./data"; import ListItem from "./ListItem.vue"; - +import { method } from "lodash"; +import request from '@/utils/request' +import {DirectionTypes} from '@screen/utils/enum.js'; export default { name: "Auditlists", components: { @@ -38,9 +33,24 @@ export default { Pagination, ListItem, }, + data() { return { searchFormList, + list:{total:0,rows:[]}, + eventType:[ + '交通事故', + '车辆故障', + '交通管制', + '交通拥堵', + '非法上路', + '路障清除', + '施工建设', + '', + '', + '', + '', + ], list1: Array.from({ length: 3 }).map(() => ({ title: "异常天气", content: "2023.12.23 13:00:00 济南方向K100+000 中雪", @@ -64,6 +74,7 @@ export default { }; }, created() { + this.bindList() // axiosIns.get("/business/dcPublishInfo/list") // .then((result) => { // console.log("%c [ result ]-39-「index.vue」", "font-size:15px; background:#4bd543; color:#8fff87;", result); @@ -72,6 +83,23 @@ export default { // }).catch((err) => { // }); }, + methods:{ + bindList(){ + request({ + url: '/business/manage/list', + method: 'get', + data: {} + }).then(res=>{ + res.rows.forEach(e => { + console.log(e) + e.content = `${e.eventTime} ${e.stakeMark} ${DirectionTypes[e.direction]} ${e.contentDetails}` + e.type = e.eventType + e.isverify = e.eventState + }); + this.list = res + }) + } + } }; From f81f9a52c25d928179a1125ecc0acc4ce4f95650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Thu, 25 Apr 2024 15:33:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E8=A7=A3=E9=99=A4=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/plugins/modal.js | 2 +- .../components/Video/videoStream.js | 4 +-- .../components/VideoMulti/videoStream.js | 9 ++++-- .../Dialogs/TrafficIncidents/index.vue | 28 ++++++++++++++++--- .../Home/components/RoadAndEvents/index.vue | 15 ++++++++-- .../RoadAndEvents/utils/httpList.js | 1 - 6 files changed, 46 insertions(+), 13 deletions(-) diff --git a/ruoyi-ui/src/plugins/modal.js b/ruoyi-ui/src/plugins/modal.js index 7ad9d297..df2d20b3 100644 --- a/ruoyi-ui/src/plugins/modal.js +++ b/ruoyi-ui/src/plugins/modal.js @@ -9,7 +9,7 @@ export default { }, // 错误消息 msgError(content) { - Message.error(content) + Message.error('commerror：'+content) }, // 成功消息 msgSuccess(content) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js index 03447f1a..ffdc31d6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js @@ -93,7 +93,7 @@ async function getUrl({ camId, url, pileNum, rangeIndex } = {}) { if (camId) { const { code, data } = await getCameraStream(camId).catch(() => ({})); if (code != 200) { - Message.warning("未获取到当前相机的播放地址"); + // Message.warning("未获取到当前相机的播放地址"); return; } @@ -101,7 +101,7 @@ async function getUrl({ camId, url, pileNum, rangeIndex } = {}) { } if (!url) { - Message.warning("未获取到当前相机的播放地址"); + // Message.warning("未获取到当前相机的播放地址"); return Promise.reject("获取 url 失败!"); } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js index 4584c73e..0dd0e8da 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js +++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js @@ -34,6 +34,7 @@ const testFlvUrl = * @returns */ export async function openVideoStream(container, { camId, url } = {}) { + console.log(camId,333) if (camId) { const { code, data } = await getCameraStream(camId).catch(() => ({})); @@ -65,16 +66,18 @@ export async function openVideoStream(container, { camId, url } = {}) { } async function getUrl({ camId} = {}) { - + if(!camId){ + return + } const { code, data } = await getCameraStream(camId).catch(() => ({})); if (code != 200) { - Message.warning("未获取到当前相机的播放地址"); + // Message.warning("未获取到当前相机的播放地址"); return; } let url = data.liveUrl; if (!url) { - Message.warning("未获取到当前相机的播放地址"); + // Message.warning("未获取到当前相机的播放地址"); return Promise.reject("获取 url 失败!"); } 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 256e5633..60edfa4f 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 @@ -8,7 +8,7 @@
-
+ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue index 96827802..cb673be8 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue @@ -3,16 +3,17 @@
- 设备类型:{{ deviceTypeDic[editData.deviceType].label }} + 设备类型: + {{ deviceTypeDic[editData.deviceType].label }}
设备: - - - {{ deviceDic[item.id].deviceName }} - 等{{ editData.devices.length }}个设备 +
-