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/images/home-FrameControl/FrameControl.svg b/ruoyi-ui/src/views/JiHeExpressway/images/home-FrameControl/FrameControl.svg index 41d1fec3..36e7160c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/images/home-FrameControl/FrameControl.svg +++ b/ruoyi-ui/src/views/JiHeExpressway/images/home-FrameControl/FrameControl.svg @@ -1,6 +1,3 @@ - - - - - + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/home-FrameControl/FrameControl1.svg b/ruoyi-ui/src/views/JiHeExpressway/images/home-FrameControl/FrameControl1.svg new file mode 100644 index 00000000..41d1fec3 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/home-FrameControl/FrameControl1.svg @@ -0,0 +1,6 @@ + + + + + + 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 9429111d..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 @@ -5,13 +5,24 @@ - +
+ + + +
@@ -179,4 +217,13 @@ export default { } } } + .foote{ + display: flex; + align-items: center; + gap: 9px; + width: 100%; + justify-content: flex-end; + margin:20px 0px -20px 0px; + + } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue index 4ddcde1e..7cc30117 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue @@ -6,31 +6,87 @@ @click.native="handleClick('FrameControl')"> - + + + + +
批量控制
-
- -
- - +
+ + +
+ + +
+
+
+ 暂无数据 + +
+
+ + + + + + + + +
+ + +
+ + + +
-
@@ -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/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index 78100f62..36ee6074 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -28,7 +28,7 @@ + @change="handleCameraChange" @update:visible="handleCameraChange" @traffic-relieve="handleTrafficRelieve" /> @@ -272,7 +272,7 @@ export default { window.infoWindow.close(); }, - // 摄像机 可控 不可控 弹窗 回调 + // 摄像机 可控 不可控 弹窗 回调traffic-relieve handleCameraChange() { this.dialogConfig = { // 0 有 可控（球机）ControlCamera | 1 ⽆ 不可控（枪机）Camera @@ -287,6 +287,17 @@ export default { gridRowStart: Math.floor(index / columns) + 1, gridColumnStart: (index % columns) + 1, } + }, + async handleTrafficRelieve(e){ + await this.handleDeviceImmediate(e._itemData) + setTimeout(async () => { + await this.handleDeviceImmediate(e._itemData) + }, 500); + this.dialogConfig = { + // 0 有 可控（球机）ControlCamera | 1 ⽆ 不可控（枪机）Camera + component: null, + data: null + } } } } 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 ce60eb92..68a48f72 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 @@ -30,7 +30,6 @@ export async function getCameraStream(camId, media = 1) { data.data.liveUrl = "https://10.0.81.202/camera?target=" + data.data.liveUrl.substring(7); }*/ - return data; } 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 + }) + } + } };