From 3e14b85a8a944ff9f5d58ad81f5cbe175d82a84f Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Fri, 22 Mar 2024 10:56:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/pages/control/event/event/index.vue    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 77a6cb8a..d735a855 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
@@ -225,12 +225,18 @@ export default {
       this.isShowAddNew = true;
     },
     onExport() {
+      let url = '';
+      if (this.activeName == '-1') {
+        url = '/business/warning/export'
+      } else {
+        url = '/dc/system/event/export';
+      }
       let loadingInstance = Loading.service({
         fullscreen: true,
         background: "#00000052",
         text: "文件正在下载...",
       });
-      request.post('/dc/system/event/export', {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' })
+      request.post(url, {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' })
         .then((res) => {
           console.log(res);
           const url = window.URL.createObjectURL(new Blob([res]));

From 3bf8f3ed694ecbaa39613bf49783808803d37507 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Fri, 22 Mar 2024 15:57:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=20=20parseFloat=E4=BF=AE=E5=A4=8Dbug?=
 =?UTF-8?q?=20&=20=E9=9A=90=E8=97=8F=E6=91=84=E5=83=8F=E5=A4=B4=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=92=8C=E5=BD=95=E5=83=8F=E6=9F=A5=E7=9C=8B=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/Dialogs/Camera/index.vue         | 7 +++----
 .../Home/components/RoadAndEvents/utils/buttonEvent.js     | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index a00f4674..206d1ee3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -29,16 +29,15 @@
             <Button style="margin-left: 5px" @click.native="controlClick(48)">关</Button>
           </div>
         </ElTabPane>
-        <ElTabPane label="摄相机参数" name="second">摄相机参数</ElTabPane>
+        <!-- <ElTabPane label="摄相机参数" name="second">摄相机参数</ElTabPane> -->
         <ElTabPane label="在线率统计" name="third">
           <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 180px" />
         </ElTabPane>
       </ElTabs>
 
-      <div class="bottom">
-        <!-- <Button>云台控制</Button> -->
+      <!-- <div class="bottom">
         <Button> 录像查看</Button>
-      </div>
+      </div> -->
     </div>
 
     <CameraControlDialog :deviceId="dialogData.iotDeviceId" v-model="controlDialogVisible" />
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 25b5bb13..bc08da6f 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
@@ -88,7 +88,9 @@ let debounceNoneLngLatMessage = debounce(() => {
 
 function resolveDataOptions(data, config, component, isDefault) {
   let lnglat =
-    data.longitude && data.latitude ? [data.longitude, data.latitude] : null;
+    data.longitude && data.latitude
+      ? [parseFloat(data.longitude), parseFloat(data.latitude)]
+      : null;
 
   if (!lnglat && !isDefault) debounceNoneLngLatMessage();
 

From 47fa075f44ad784738f9a0e2ec57ddfbbe5f1156 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Fri, 22 Mar 2024 16:37:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/styles/JiHeExpressway.scss     |   5 +
 .../JiHeExpressway/components/Adaptation.vue  |   1 +
 .../views/JiHeExpressway/mixins/InfoBoard.js  |   8 +-
 .../Home/components/HomeFilter/index.vue      |  11 +-
 .../pages/Home/components/HomeFrame/index.vue |  10 +-
 .../Home/components/HomeVector/index.vue      |   8 +-
 .../statisticalAnalysis/index.vue             |   6 +-
 .../components/dailyDisposal/index.vue        |   7 +-
 .../components/dayTotal/index.vue             |   8 +-
 .../components/eventQuery/index.vue           | 167 ++++++++----------
 .../components/eventSource/index.vue          |   9 +-
 .../components/monthStatistics/index.vue      |   8 +-
 .../components/railway/index.vue              |   6 +-
 .../components/railwayDay/index.vue           |   8 +-
 .../components/typeAnalysis/index.vue         |   8 +-
 .../pages/perception/eventDetection/index.vue |  96 +++-------
 .../pages/service/sensitive/index.vue         |   2 +
 ruoyi-ui/vue.config.js                        |   6 +-
 18 files changed, 158 insertions(+), 216 deletions(-)

diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
index a955b768..8a6777af 100644
--- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
+++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
@@ -1,9 +1,14 @@
+.fl-col{ display: flex; flex-direction: column;}
+.fl-1{ flex: 1;}
 .theme-jihe {
   $lightBlue: #3de8ff;
   $textColor: #f4f4f4;
   $inputHeight: 26px;
   color: $textColor;
 
+  .is-light{
+    color: #666;
+  }
   .text-center{ text-align: center;}
   .tc-lb{ color: $lightBlue;}
   .el-tabs__item {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue
index 07ace08c..fa1d26e4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue
@@ -53,6 +53,7 @@ export default {
   },
   watch: {
     headerHeight() {
+      this.initScale();
     }
   },
   methods: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
index f168c54d..b72344fa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
@@ -48,6 +48,12 @@ export default{
         },
         // 发布信息
         ____publishInfo() {
+            let deviceIdList = [];
+            if (this.selectedDevice){
+                deviceIdList = [this.selectedDevice.iotDeviceId];
+            }else{
+                deviceIdList = this.checkedDeviceIds;
+            }
             this.$confirm('是否确定发布情报板?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
@@ -78,7 +84,7 @@ export default{
                     })
                 })
 
-                let data = { content: content, deviceIdList: this.checkedDeviceIds }
+                let data = { content: content, deviceIdList }
 
                 if (IS_TESTING) {
                     // this.saveLog(content);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
index bcfc8867..e01a85cb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
@@ -2,9 +2,14 @@
   <div class="HomeFilter">
     <ElPopover trigger="manual" :value="activeIcon === 'filter'" :visibleArrow="false" placement="left"
       popper-class="global-input-search-popover">
-      <Button :class="['btn', { 'btn-active': activeIcon }]" slot="reference" @click.native="handleClick('filter')">
-        <img src="@screen/images/home-filter/filter.svg" />
-      </Button>
+
+      <div slot="reference">
+        <el-tooltip effect="light" content="设备筛选" placement="left">
+          <Button :class="['btn', { 'btn-active': activeIcon }]" @click.native="handleClick('filter')">
+            <img src="@screen/images/home-filter/filter.svg" />
+          </Button>
+        </el-tooltip>
+      </div>
 
       <div class="body">
         <div class="title">设备筛选</div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue
index 6ff92d96..2e8bd5c4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue
@@ -3,9 +3,13 @@
     <ElPopover trigger="manual" :value="activeIcon === 'Frame'" :visibleArrow="false" placement="left"
       popper-class="global-input-search-popover">
 
-      <Button :class="['btn', { 'btn-active': activeIcon }]" slot="reference" @click.native="handleClick('Frame')">
-        <img src="@screen/images/home-Frame/Frame.svg" />
-      </Button>
+      <div slot="reference">
+        <el-tooltip effect="light" content="图标含义" placement="left">
+          <Button :class="['btn', { 'btn-active': activeIcon }]" @click.native="handleClick('Frame')">
+            <img src="@screen/images/home-Frame/Frame.svg" />
+          </Button>
+        </el-tooltip>
+      </div>
 
       <div class="body">
         <div class="title">图标含义</div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue
index 6940b663..6ef928bf 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="HomeVector">
-    <Button :class="['btn', { 'btn-active': activeIcon }]" slot="reference" @click.native="handleClick('Vector')">
-      <img src="@screen/images/home-Vector/Vector.svg" />
-    </Button>
+      <el-tooltip effect="light" content="桩号显隐" placement="left">
+        <Button :class="['btn', { 'btn-active': activeIcon }]" @click.native="handleClick('Vector')">
+          <img src="@screen/images/home-Vector/Vector.svg" />
+        </Button>
+      </el-tooltip>
   </div>
 </template>
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index be88d67d..5b557a6d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -84,7 +84,7 @@
             </el-table-column>
             <el-table-column prop="deviceIp" label="设备IP"> </el-table-column>
             <el-table-column prop="production" label="厂家"> </el-table-column>
-            <el-table-column prop="model" label="型号"> </el-table-column>
+            <!-- <el-table-column prop="model" label="型号"> </el-table-column> -->
             <!-- <el-table-column prop="network" label="网段"> </el-table-column> -->
             <el-table-column prop="time" label="监测时间"> </el-table-column>
             <el-table-column prop="deviceStatus" label="设备状态">
@@ -302,8 +302,8 @@ export default {
             title: key,
             total: val.sum,
             pctOnl: val.sucessRate,
-            pctLose: val.failRate,
-            pctOffl: val.lostRate,
+            pctOffl: val.failRate,
+            pctLose: val.lostRate,
             sumUseState: val.sumUseState
           };
           if (key.includes("全部设备")) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue
index 61dd3fc2..ca1719b6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="congestion">
+  <div class="congestion fl-col">
     <WgtTitle :title="'日事件处置情况占比'"></WgtTitle>
-    <div class="board">
+    <div class="board fl-1">
       <div class="charts keep-ratio" id="dailyDisposal"></div>
     </div>
   </div>
@@ -154,11 +154,8 @@ export default {
 
 <style lang="scss" scoped>
 .congestion {
-  width: 100%;
 
   .board {
-    height: 200px;
-    width: 100%;
     padding: 0px 20px;
     background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
     border-radius: 5px 5px 5px 5px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/index.vue
index 879158ae..f8bb6ede 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="congestion">
+  <div class="congestion fl-col">
     <WgtTitle :title="'日累计感知事件趋势'"></WgtTitle>
-    <div class="board">
+    <div class="board fl-1">
       <Empty
         v-show="!dataList || dataList.length <= 0"
         text="暂无数据..."
@@ -67,11 +67,7 @@ export default {
 
 <style lang="scss" scoped>
 .congestion {
-  width: 100%;
-
   .board {
-    height: 200px;
-    width: 100%;
     // padding: 0px 20px;
     background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
     border-radius: 5px 5px 5px 5px;
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 712ca697..37c7c051 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,6 +1,6 @@
 <template>
   <div class="congestion">
-    <div class="board">
+    <div class="condition">
       <ProgressBar
         class="keep-ratio"
         @selectItem="selectProgress"
@@ -85,38 +85,29 @@
       </div>
     </div>
 
-    <div class="body">
+    <div class="comp_body">
       <div>
         <WgtTitle :title="'感知事件趋势分析'"></WgtTitle>
-        <!-- <Empty v-show="!chart1List || chart1List.length <= 0" text="暂无数据..."></Empty> -->
-        <!-- <div v-show="chart1List || chart1List.length > 0" id="chart1" class="btnChart" />-->
-        <div id="chart1" class="btnChart" />
+        <div class="unit_con">
+          <Empty v-if="!chart1List || chart1List.length <= 0" text="暂无数据..." class="empty"></Empty>
+          <div v-else id="chart1" class="chart_div" ></div>
+        </div>
       </div>
 
       <div>
         <WgtTitle :title="'感知事件类型分析'"></WgtTitle>
-        <Empty
-          v-show="!chart2List || chart2List.length <= 0"
-          text="暂无数据..."
-        ></Empty>
-        <div
-          v-show="chart2List || chart2List.length > 0"
-          id="chart2"
-          class="btnChart"
-        />
+        <div class="unit_con">
+          <Empty v-show="!chart2List || chart2List.length <= 0" text="暂无数据..." class="empty"></Empty>
+          <div id="chart2" class="chart_div" ></div>
+        </div>
       </div>
 
       <div>
         <WgtTitle :title="'桩号范围内事件分析趋势'"></WgtTitle>
-        <Empty
-          v-show="!chart3List || chart3List.length <= 0"
-          text="暂无数据..."
-        ></Empty>
-        <div
-          v-show="chart3List || chart3List.length > 0"
-          id="chart3"
-          class="btnChart"
-        />
+        <div class="unit_con">
+          <Empty v-show="!chart3List || chart3List.length <= 0" text="暂无数据..." class="empty"></Empty>
+          <div id="chart3" class="chart_div" ></div>
+        </div>
       </div>
     </div>
   </div>
@@ -418,7 +409,9 @@ export default {
             chart1.series[0].data = numbers;
           }
         }
-        this.myChart1.setOption(chart1);
+        this.$nextTick(()=>{
+          this.initChart1();
+        })
       });
 
       //类型占比
@@ -505,7 +498,9 @@ export default {
           //   this.myChart2.setOption(chart2);
           // })
         }
-        this.myChart2.setOption(chart2);
+        this.$nextTick(()=>{
+          this.initChart2();
+        })
       });
       //路段范围内桩号分布
       getSectionMarkNumber({
@@ -575,8 +570,9 @@ export default {
           chart3.series[0].data = values1;
           chart3.series[1].data = values2;
         }
-
-        this.myChart3.setOption(chart3);
+        this.$nextTick(()=>{
+           this.initChart3();
+        })
       });
       // if (this.type == "day")
       //   this.type = "date";
@@ -586,43 +582,18 @@ export default {
         this.dateTime = moment(new Date()).format("YYYY-MM-DD");
       }
     },
+    initChart1(){
+    this.myChart1 = echarts.init(document.getElementById("chart1"));
+    this.myChart1.setOption(chart1);
   },
-  mounted() {
-    setTimeout(() => {
-      this.$nextTick(() => {
-        getRoadSectionList().then((res) => {
-          console.log(res);
-          if (res.code == 200) {
-            let rows = res.data;
-            this.dataList = [];
-            rows.forEach((it) => {
-              this.dataList.push({
-                title: it.sectionName.split("-")[0],
-                id: it.id,
-              });
-            });
-            //最后一项取结束点
-            if (rows.length > 1) {
-              this.dataList.push({
-                title: rows[rows.length - 1].sectionName.split("-")[1],
-                id: rows[rows.length - 1].id,
-              });
-            }
-            console.log("dataList", this.dataList);
-          }
-          this.searchQuery();
-        });
-
-        var myChart1 = echarts.init(document.getElementById("chart1"));
-        myChart1.setOption(chart1);
-        var myChart2 = echarts.init(document.getElementById("chart2"));
-        myChart2.setOption(chart2);
-        var myChart3 = echarts.init(document.getElementById("chart3"));
-        myChart3.setOption(chart3);
-
-        this.myChart1 = myChart1;
-        this.myChart2 = myChart2;
-        this.myChart3 = myChart3;
+  initChart3(){
+    this.myChart3 = echarts.init(document.getElementById("chart3"));
+    this.myChart3.setOption(chart3);
+  },
+  initChart2(){
+    
+        this.myChart2 = echarts.init(document.getElementById("chart2"));
+        this.myChart2.setOption(chart2);
 
         const domMap = document.getElementById("chart2");
         let parentDiv = domMap.firstChild;
@@ -688,26 +659,48 @@ export default {
         // gr.addColorStop(1, 'rgba(92,197,255,0)');
         // gr.addColorStop(0, 'rgba(92,197,255,0.5)');
         // drawRoundRect(context, 416, 208, 140, 24, 12, gr);
-      });
-    });
   },
+  },
+  mounted() {
+        getRoadSectionList().then((res) => {
+          console.log(res);
+          if (res.code == 200) {
+            let rows = res.data;
+            this.dataList = [];
+            rows.forEach((it) => {
+              this.dataList.push({
+                title: it.sectionName.split("-")[0],
+                id: it.id,
+              });
+            });
+            //最后一项取结束点
+            if (rows.length > 1) {
+              this.dataList.push({
+                title: rows[rows.length - 1].sectionName.split("-")[1],
+                id: rows[rows.length - 1].id,
+              });
+            }
+            console.log("dataList", this.dataList);
+          }
+          this.searchQuery();
+        });
+        
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 .congestion {
-  width: 100%;
   position: relative;
 
-  .body {
+  .comp_body {
+    width: 100%; height: 100%;
     display: flex;
-    align-items: center;
-    justify-content: space-evenly;
+    align-items: stretch;
     font-size: 14px;
 
     > div {
-      width: 33%;
-      height: 470px;
+      flex: 1;
       background: linear-gradient(
         180deg,
         rgba(6, 66, 88, 0.2) 0%,
@@ -720,29 +713,22 @@ export default {
           rgba(55, 231, 255, 0)
         )
         1 1;
+        display: flex; flex-direction: column; align-items: stretch;
+      margin-right: 14px;
+      &:last-child{ margin-right: 0;}
     }
 
-    :nth-child(1) {
-      margin-right: 6px;
-    }
-
-    :nth-child(2) {
-      margin-left: 6px;
-      margin-right: 6px;
-    }
-
-    :nth-child(3) {
-      margin-left: 6px;
+    .unit_con {
+      flex: 1;
+      margin: 95px 20px 30px; position: relative;
     }
-
-    .btnChart {
-      height: 330px;
-      width: 90%;
-      margin: 95px auto 0;
+    .empty{ position: absolute;}
+    .chart_div{
+      width: 100%; height: 100%;
     }
   }
 
-  .board {
+  .condition {
     height: 100px;
     width: 100%;
     position: absolute;
@@ -827,11 +813,6 @@ export default {
     }
   }
 }
-
-.charts {
-  height: 100px;
-  width: 100%;
-}
 </style>
 
 <style lang="scss">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
index ece16963..e6c18f8c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div @resize="changeReisze" class="congestion">
+  <div @resize="changeReisze" class="congestion fl-col">
     <WgtTitle :title="'感知事件源分析'"></WgtTitle>
-    <div class="board">
+    <div class="board fl-1">
       <div class="charts keep-ratio" id="eventSource"></div>
     </div>
   </div>
@@ -234,12 +234,7 @@ export default {
 
 <style lang="scss" scoped>
 .congestion {
-  width: 100%;
-
   .board {
-    height: 200px;
-    width: 100%;
-    padding: 40px 40px;
     background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
     border-radius: 5px 5px 5px 5px;
     opacity: 1;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/index.vue
index ec5c19d6..ae917381 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="congestion">
+  <div class="congestion fl-col">
     <WgtTitle :title="'近一月感知事件时段分布统计'"></WgtTitle>
-    <div class="board">
+    <div class="board fl-1">
       <Empty
         v-show="!dataList || dataList.length <= 0"
         text="暂无数据..."
@@ -75,11 +75,7 @@ export default {
 
 <style lang="scss" scoped>
 .congestion {
-  width: 100%;
-
   .board {
-    height: 200px;
-    width: 100%;
     // padding: 0px 20px;
     background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
     border-radius: 5px 5px 5px 5px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/index.vue
index 8138e20b..159ad11e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/index.vue
@@ -74,11 +74,9 @@ export default {
 
 <style lang="scss" scoped>
 .situation {
-  width: 100%;
+  width: 100%; height: 100%; display: flex; flex-direction: column;
 
-  .board {
-    height: 455px;
-    width: 100%;
+  .board { flex: 1; height: 0;
     padding: 10px 10px;
     background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
     border-radius: 5px 5px 5px 5px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/index.vue
index dda2144c..8d24a235 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="congestion">
+  <div class="congestion fl-col">
     <WgtTitle :title="'路段日感知事件'"></WgtTitle>
-    <div class="board">
+    <div class="board fl-1">
       <Empty
         v-show="!dataList || dataList.length <= 0"
         text="暂无数据..."
@@ -102,11 +102,7 @@ export default {
 
 <style lang="scss" scoped>
 .congestion {
-  width: 100%;
-
   .board {
-    height: 200px;
-    width: 100%;
     // padding: 0px 20px;
     background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
     border-radius: 5px 5px 5px 5px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue
index 29b3ca3e..6f95dbd8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="congestion">
+  <div class="congestion fl-col">
     <WgtTitle :title="'感知事件类型分析'"></WgtTitle>
-    <div class="board">
+    <div class="board fl-1">
       <div class="charts keep-ratio" id="typeAnalysis"></div>
     </div>
   </div>
@@ -189,11 +189,7 @@ export default {
 
 <style lang="scss" scoped>
 .congestion {
-  width: 100%;
-
   .board {
-    height: 200px;
-    width: 100%;
     padding: 0px 20px;
     background: linear-gradient(
       180deg,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/index.vue
index 4cd1a98d..00b5ffd3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/index.vue
@@ -1,23 +1,21 @@
 <template>
   <div class="TrafficFlow">
-    <section class="content">
+    <section class="row_01">
       <Railway class="content-l" />
-      <div class="content-m">
-        <RailWayDay class="content-m-t" />
-        <DayTotal class="content-m-t" />
+      <div class="content_r_g">
+        <RailWayDay class="content_r_unit" />
+        <DayTotal class="content_r_unit" />
       </div>
-      <div class="content-m">
-        <EventSource class="content-m-t" />
-        <DailyDisposal class="content-m-t" />
+      <div class="content_r_g">
+        <EventSource class="content_r_unit" />
+        <DailyDisposal class="content_r_unit" />
       </div>
-      <div class="content-m" style="margin-right: 0">
-        <MonthStatistice class="content-m-t" />
-        <TypeAnalysis class="content-m-t" />
+      <div class="content_r_g" style="margin-right: 0">
+        <MonthStatistice class="content_r_unit" />
+        <TypeAnalysis class="content_r_unit" />
       </div>
     </section>
-    <section class="foot">
-      <EventQuery class="foot-w" />
-    </section>
+    <EventQuery class="row_02" />
   </div>
 </template>
 
@@ -27,7 +25,7 @@ import RailWayDay from "./components/railwayDay/index.vue";
 import DayTotal from "./components/dayTotal/index.vue";
 import EventSource from "./components/eventSource/index.vue";
 import DailyDisposal from "./components/dailyDisposal/index.vue";
-import TypeAnalysis from "./components/typeAnalysis";
+import TypeAnalysis from "./components/typeAnalysis/index.vue";
 import MonthStatistice from "./components/monthStatistics/index.vue";
 import EventQuery from "./components/eventQuery";
 
@@ -50,80 +48,44 @@ export default {
 .TrafficFlow {
   width: 100%;
   height: 100%;
-  position: relative;
-  z-index: 6;
-  color: white;
-
-  .head {
-    width: 98%;
-    margin: auto;
-    margin-top: 15px;
-  }
-
-  .content {
-    width: 98%;
-    margin: auto;
-    display: flex;
-    flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  padding:8px 16px 16px;
+
+  .row_01 {
+    flex-basis: 55%; margin-bottom: 15px;
+    display: flex; align-items: stretch;
     pointer-events: none;
-    margin-top: 19px;
 
     > div {
       pointer-events: auto;
     }
 
     .content-l {
-      width: calc(100% / 4 - 25px * 3);
-      min-width: 475px;
+      flex-basis: 25%;
       margin-right: 15px;
     }
 
-    .content-m {
-      display: inline-flex;
+    .content_r_g {
+      display: flex;
       flex-direction: column;
-      width: calc(100% / 4);
+      flex-basis: 25%;
       margin-right: 15px;
 
-      .content-m-t {
+      .content_r_unit {
         width: 100%;
-        height: 240px;
+        flex-basis: 50%;
         margin-bottom: 15px;
+        &:last-child{ margin-bottom: 0;}
       }
     }
 
-    .content-r {
-      width: 49.4%;
-    }
   }
 
-  .foot {
-    width: 98%;
-    margin: auto;
-    display: flex;
-    justify-content: space-between;
+  .row_02 {
     flex: 1;
-    pointer-events: none;
-    margin-top: 0px;
-
-    > div {
-      pointer-events: auto;
-    }
-
-    .foot-w {
-      width: 100%;
-    }
-
-    .foot-l {
-      width: 726px;
-    }
-
-    .foot-m {
-      width: 613px;
-    }
-
-    .foot-r {
-      width: 493px;
-    }
+    // pointer-events: none;
   }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
index 6022d668..9db3668f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
@@ -248,6 +248,8 @@ export default {
 
 <style lang="scss" scoped>
 .sensitiveWord {
+  width: 100%;
+  height: 100%;
   padding: 20px;
   display: flex;
   flex-direction: column;
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index fc456c2c..9698abf8 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -53,10 +53,10 @@ module.exports = {
         // 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.65.194:8087`, //赵祥龙
+        target: `http://10.168.65.156:8087`, //王思祥
+        // target: `http://10.168.65.194:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
-        target: `http://10.168.56.165:8087`, //王家宝
+        // target: `http://10.168.56.165:8087`, //王家宝
 
         // target: `http://10.168.65.103:8097`,
         changeOrigin: true,