Browse Source

feat 更新路网管控 去掉header

wangqin
qingzhengli 8 months ago
parent
commit
7033ec0a22
  1. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
  2. 12
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue

4
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue

@ -4,9 +4,9 @@
<Form :formList="formList" :dFormData="formData" label-width="100px" /> <Form :formList="formList" :dFormData="formData" label-width="100px" />
<div class="video-pic"> <div class="video-pic">
<Video style="height: 100%; width: 380px;" :showHeader="activeName != '-1'" <Video style="height: 100%; width: 380px;" :showHeader="false"
:url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[0] : ''" videoType="mp4" /> :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[0] : ''" videoType="mp4" />
<Video v-if="activeName != '-1'" style="height: 100%; width: 380px;" <Video v-if="activeName != '-1'" style="height: 100%; width: 380px;" :showHeader="false"
:url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[1] : ''" videoType="mp4" /> :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[1] : ''" videoType="mp4" />
<Carousel v-else style="flex: 1" :pictures="formData.pictures" /> <Carousel v-else style="flex: 1" :pictures="formData.pictures" />

12
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue

@ -65,7 +65,7 @@ import request from "@/utils/request";
import { Message } from "element-ui"; import { Message } from "element-ui";
import { Loading } from 'element-ui'; import { Loading } from 'element-ui';
import { WarningType as warningTypeMapping, WarningSubclass as warningSubclassTypeMapping } from "@screen/utils/enum.js" import { WarningType as warningTypeMapping, WarningSubclass as warningSubclassTypeMapping } from "@screen/utils/enum.js"
import { getNearCameraNew } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
const warningSourceMapping = { const warningSourceMapping = {
1: '视频AI', 1: '视频AI',
@ -261,7 +261,7 @@ export default {
}, },
firstBtnClick(id) { firstBtnClick(id) {
console.log("id", id); console.log("id", id);
if (this.activeName == '-1') { // if (this.activeName == '-1') {
request({ request({
url: `/perceivedEvents/warning/getWarningById`,// url: `/perceivedEvents/warning/getWarningById`,//
method: "post", method: "post",
@ -297,7 +297,7 @@ export default {
}); });
} else { } else {
request({ request({
url: `/dc/system/event/${id}`, url: `/dc/system/event/${id}`,//
method: "get", method: "get",
}).then((result) => { }).then((result) => {
if (result.code != 200) return Message.error(result?.msg); if (result.code != 200) return Message.error(result?.msg);
@ -305,11 +305,15 @@ export default {
data.stringDirection = gzDirectionMapping[data.direction] || data.direction; data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
data.startTime = data?.occurrenceTime || ''; data.startTime = data?.occurrenceTime || '';
data.videoList = []; data.videoList = [];
// const cameraData = (await getNearCameraNew(data.stakeMark));//
// console.log("cameraData", cameraData)
if (data.otherConfig) { if (data.otherConfig) {
let otherConfig = JSON.parse(data.otherConfig); let otherConfig = JSON.parse(data.otherConfig);
// data.pictures = otherConfig.pictures || []; // data.pictures = otherConfig.pictures || [];
data.videoList = otherConfig.videoList || [] 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 || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
} }

Loading…
Cancel
Save