From 6a0dfaed67751f761f43a5a8d0bcc510588e1093 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Thu, 19 Dec 2024 18:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6=E5=BD=95?=
 =?UTF-8?q?=E5=83=8F=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/store/modules/tagsView.js        |   1 -
 .../JiHeExpressway/components/Video/Video.vue |   1 -
 .../event/event/EventDetailDialog/index.vue   | 116 +++++++++++++-----
 .../perception/trafficFlow/survey/index.vue   |   2 -
 .../projectionScreen/DecodingStateModal.vue   |   1 -
 .../projectionScreen/dynamicDecodeModal.vue   |   1 -
 .../config/components/lightCurveModal.vue     |   3 -
 7 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/ruoyi-ui/src/store/modules/tagsView.js b/ruoyi-ui/src/store/modules/tagsView.js
index af44e0e3..d282c38b 100644
--- a/ruoyi-ui/src/store/modules/tagsView.js
+++ b/ruoyi-ui/src/store/modules/tagsView.js
@@ -103,7 +103,6 @@ const mutations = {
 
 const actions = {
   addView({ dispatch }, view) {
-    debugger
     dispatch('addVisitedView', view)
     dispatch('addCachedView', view)
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue
index 756a9150..b6ff852c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue
@@ -54,7 +54,6 @@ export default {
   methods: {
     playVideo() {
       this.player?.destroy();
-      debugger
       if (this.videoType == 'flv') {
         // const player = await openLiveVideo(this.$refs.videoContainerRef, { camId: this.camId, url: this.url, pileNum: this.pileNum })
         this.player = new HttpLivePlayer(this.$refs.videoContainerRef, { camId: this.camId, url: this.url, pileNum: this.pileNum, rangeIndex: this.rangeIndex });
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
index 1be33ef8..19ebd7a0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
@@ -1,30 +1,38 @@
 <template>
   <!-- 事件弹窗 - 通用 -->
+<div>
+  <Dialog title="视频录像" width="477px"  style="z-index: 2051;" v-model="videoModelVisible">
+    <div style="flex: 1; height: 245px;width:100%;position: relative;">
+      <div class="radio" v-if="[2,4,7].indexOf(formData.warningSource) === -1">
+        <span @click="realType = 'video'" :class="{ active: realType === 'video' }">视频</span>
+        <span @click="realType = 'picture'" :class="{ active: realType === 'picture' }">图像</span>
+      </div>
+      <Carousel ref="carousel" style="height: 100%;" :list="realType === 'video'?(videoList || []):formData.pictures || []"  :type="realType" />
+    </div>
+  </Dialog>
   <Dialog v-model="modelVisible" style="z-index: 2050;"  title="事件详情" width="950px" :top="(activeName == '1' || activeName == '2')?'1%':'8%'">
     <div class="EventDetail" >
-
       <Form ref="FormConfigRef" :formList="formList" v-model="data" label-width="110px" />
-
       <!-- 视频组件 -->
       <div class="video-pic" v-if="['-1','-2'].indexOf(activeName) !== -1 && [1,2,5].indexOf(data.warningSource) !== -1">
-        <div style="flex: 1; height: 100%;position: relative;">
-          <div class="radio">
-            <span @click="videoClick('upCamera')" :class="{ active: realVideo === 'upCamera' }">菏泽</span>
-            <span @click="videoClick('downCamera') " :class="{ active: realVideo === 'downCamera' }">济南</span>
-          </div>
-          <Video v-if="realVideo"
-              class="item-video"
-              :pileNum="data.stakeMark"
-              :rangeIndex="realVideo"
-              :showHeader="false"
-            />
-        </div>
-        <div style="flex: 1; height: 100%;width:0px;position: relative;">
-          <div class="radio" v-if="[2,4,7].indexOf(formData.warningSource) === -1">
-            <span @click="realType = 'video'" :class="{ active: realType === 'video' }">视频</span>
-            <span @click="realType = 'picture'" :class="{ active: realType === 'picture' }">图像</span>
-          </div>
-          <Carousel style="height: 100%;" :list="realType === 'video'?(videoList || []):formData.pictures || []"  :type="realType" />
+        <div style="display:flex;justify-content: space-between;align-items: center;position:relative;">
+          <!-- 选择按钮-->
+<!--          <div class="radio">-->
+<!--            <span @click="videoClick('upCamera')" :class="{ active: realVideo === 'upCamera' }">菏泽</span>-->
+<!--            <span @click="videoClick('downCamera') " :class="{ active: realVideo === 'downCamera' }">济南</span>-->
+<!--          </div>-->
+          <Video
+           class="item-video"
+           :pileNum="data.stakeMark"
+           :rangeIndex="realVideo1"
+           :showHeader="false"
+          />
+          <Video
+           class="item-video"
+           :pileNum="data.stakeMark"
+           :rangeIndex="realVideo"
+           :showHeader="false"
+          />
         </div>
       </div>
       <!-- 组件 -->
@@ -35,14 +43,16 @@
             :pileNum="data.stakeMark"
             rangeIndex="upCamera"
             :showHeader="false"
+            style="width: 49%;margin-right: 2%"
           />
           <span>济南方向</span></div>
-         <div class="item">
+        <div class="item">
           <Video
             class="item-video"
             :pileNum="data.stakeMark"
-             rangeIndex="downCamera"
+            rangeIndex="downCamera"
             :showHeader="false"
+            style="width: 49%;"
           />
           <span>菏泽方向</span></div>
       </div>
@@ -52,31 +62,34 @@
 
     <!-- 确认弹窗 -->
     <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="data" :activeName="activeName"
-      @reInitData="() => {
+                     @reInitData="() => {
     this.$emit('update:value', false);
     this.$emit('queryData', true);
   }
     " @close="onCloseAddNew" />
 
     <template #footer>
+      <Button @click.native="onOpen" :style="{ marginTop: '30px', padding: '0 24px' }">视频录像</Button>
       <Button :loading="submitLoading"  v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent','home:notice:closeEvent']) && activeName == '1'" style="margin-top: 30px;padding: 0 24px"
-        @click.native="onEnd">终止</Button>
+              @click.native="onEnd">终止</Button>
       <Button :loading="submitLoading"  v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent']) && (activeName == '-1' || activeName == '0')" style="margin-top: 30px;padding: 0 24px"
-        @click.native="onDelete">解除</Button>
+              @click.native="onDelete">解除</Button>
       <Button :style="{ marginTop: '30px', backgroundColor: '#0e708b', padding: '0 24px' }"  v-if="(activeName =='-2') && (data.auditFlags =='未审核') && check(['perception:eventDetection:review'])"
               @click.native="onAudit">复核</Button>
       <Button :style="{ marginTop: '30px', backgroundColor: '#0e708b', padding: '0 24px' }"
-        @click.native="modelVisible = false">取消</Button>
+              @click.native="modelVisible = false">取消</Button>
       <template v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent','home:notice:disposeEvent'])">
-      <Button :loading="submitLoading" v-if="!isError && (activeName == '-1')" style="margin-top: 30px;padding: 0 24px"
-        @click.native="updateEvent">处置</Button>
-      <Button :loading="submitLoading" v-if="!isError && ( activeName == '0')" style="margin-top: 30px;padding: 0 24px"
-        @click.native="onSubmit">处置</Button>
-      <Button :loading="submitLoading"  v-if="!isError && activeName == '1'" style="margin-top: 30px;padding: 0 24px"
-        @click.native="goDispatch">处置</Button>
+        <Button :loading="submitLoading" v-if="!isError && (activeName == '-1')" style="margin-top: 30px;padding: 0 24px"
+                @click.native="updateEvent">处置</Button>
+        <Button :loading="submitLoading" v-if="!isError && ( activeName == '0')" style="margin-top: 30px;padding: 0 24px"
+                @click.native="onSubmit">处置</Button>
+        <Button :loading="submitLoading"  v-if="!isError && activeName == '1'" style="margin-top: 30px;padding: 0 24px"
+                @click.native="goDispatch">处置</Button>
       </template>
     </template>
   </Dialog>
+</div>
+
 </template>
 
 <script>
@@ -161,6 +174,7 @@ export default {
 
   data() {
     return {
+      videoModelVisible:false,
       data: {},
       formList: [],
       isShowDialog: false,
@@ -187,6 +201,7 @@ export default {
       videoList: [],
       realType: 'video',
       realVideo: 'downCamera',
+      realVideo1: 'upCamera',
     };
   },
   computed: {
@@ -194,6 +209,7 @@ export default {
       get() {
         if (this.visible) {
           this.isError = false
+
           this.getProcess();
           if(this.activeName === '-1' || this.activeName === '-2' ){
             _formListGz[4].options.options = WarningSubclassOptions[this.formData.warningType];
@@ -201,7 +217,7 @@ export default {
             this.formList = [..._formListGz]
             let _data = _.cloneDeep(this.formData)
             _data.direction=DirectionTypes[_data.direction]
-            _data.roadName = '济菏高速'
+            _data.roadName = '济菏高速';
             if(_data.warningState==4&&_data.endTime!=null&&_data.endTime!=''&&_data.warningTime!=null){
               _data.duration =getDurationEndTime(_data.warningTime,_data.endTime)
             }else{
@@ -213,7 +229,6 @@ export default {
               _data.lane =_data.lang.toString().split(",") || []
             }
             if(_data.warningSource === 2){
-
               request({
                 url: `/business/warning/video/${_data.id}`,
                 method:'get'
@@ -250,15 +265,44 @@ export default {
     },
   },
   methods: {
+    onOpen(){
+      this.videoModelVisible = !this.videoModelVisible;
+
+      this.$nextTick(()=>{
+        let _data = _.cloneDeep(this.formData);
+        if(_data.warningSource === 2){
+          request({
+            url: `/business/warning/video/${_data.id}`,
+            method:'get'
+          }).then(res=>{
+            if(res.code === 200 && res.msg && res.msg !== ''){
+              this.videoList = [res.msg]
+            } else {
+              this.videoList = []
+            }
+          })
+        } else {
+          this.videoList = _data.videoList;
+        }
+        console.log(this.formData.warningSource,'formData.warningSource')
+        this.videoList = _data.videoList;
+      })
 
+    },
     check(arr){
       return checkPermi(arr);
     },
     videoClick(type){
+      console.log(type)
       this.realVideo = '';
       setTimeout(() => {
         this.realVideo = type
       }, 300);
+
+      this.realVideo1 = '';
+      setTimeout(() => {
+        this.realVideo1 = type
+      }, 300);
     },
     goDispatch() {
       this.$router.push(`/control/event/commandDispatch?id=${this.formData.id}`);
@@ -653,6 +697,10 @@ export default {
     }
   }
 }
+::v-deep .item-video {
+  width: 49%;
+  height: 100%;
+}
 .radio {
       position: absolute;
       right: 10px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/survey/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/survey/index.vue
index f65e0252..f64cec7e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/survey/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/survey/index.vue
@@ -203,7 +203,6 @@ export default {
           data.columnList.forEach(x =>{
             seriesData.push(stakeMarkData[x.key])
           })
-          debugger
 
           if (stakeMarkData.direction == '3'){
             series.push({
@@ -276,7 +275,6 @@ export default {
         })
 
       })
-      debugger
       chartOptions.series = series
       chartOptions.legend.data = legendData
       this.myChart.setOption(chartOptions);
diff --git a/ruoyi-ui/src/views/event/event/projectionScreen/DecodingStateModal.vue b/ruoyi-ui/src/views/event/event/projectionScreen/DecodingStateModal.vue
index 9d69d4ce..c0e1d39b 100644
--- a/ruoyi-ui/src/views/event/event/projectionScreen/DecodingStateModal.vue
+++ b/ruoyi-ui/src/views/event/event/projectionScreen/DecodingStateModal.vue
@@ -94,7 +94,6 @@ export default {
   watch:{
     show:{
       handler(newValue, oldValue){
-        debugger
         this.visibleSync = !this.visibleSync
       }
     }
diff --git a/ruoyi-ui/src/views/event/event/projectionScreen/dynamicDecodeModal.vue b/ruoyi-ui/src/views/event/event/projectionScreen/dynamicDecodeModal.vue
index 2daf48f0..1c9a2169 100644
--- a/ruoyi-ui/src/views/event/event/projectionScreen/dynamicDecodeModal.vue
+++ b/ruoyi-ui/src/views/event/event/projectionScreen/dynamicDecodeModal.vue
@@ -88,7 +88,6 @@ export default {
   watch:{
     show:{
       handler(newValue, oldValue){
-        debugger
         this.visibleSync = !this.visibleSync
       }
     }
diff --git a/ruoyi-ui/src/views/workbench/config/components/lightCurveModal.vue b/ruoyi-ui/src/views/workbench/config/components/lightCurveModal.vue
index f3a009e8..4fdec84d 100644
--- a/ruoyi-ui/src/views/workbench/config/components/lightCurveModal.vue
+++ b/ruoyi-ui/src/views/workbench/config/components/lightCurveModal.vue
@@ -686,7 +686,6 @@
       },
       //获取光亮的数据
       getEchartsData(row, type) {
-        debugger
         //清空上次数据
         this.XDataLight = []
         this.yDataLight = []
@@ -976,7 +975,6 @@
       },
       //光强 修改隧道名称查看不同隧道 光强照明配置
       lightChangeEvent(indextabs) {
-        debugger
 
         console.log(this.lightFilesModel.tunnelId,this.lightFilesModel.direction,"indextabs")
         if (!!this.lightFilesModel.tunnelId && !!this.lightFilesModel.direction) {
@@ -1031,7 +1029,6 @@
           this.paramsData.tunnelId = this.$cache.local.get("manageStationSelect");
         }
         console.log(this.paramsData)
-        debugger
         await listDepId(this.paramsData).then((response) => {
           this.tunnelData = response.rows;
           console.log(this.tunnelData, "隧道列表");