From e5cb35e35ba71d6c14610a55bfe27092b464be18 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Tue, 6 Feb 2024 16:46:24 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=8F=E6=84=9F?=
 =?UTF-8?q?=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/common/menuData.js               |  20 +-
 .../maintainQuery/assets/online_bj.jpg        | Bin
 .../maintainQuery/index.vue                   |   0
 .../pages/service/board/index.vue             |   2 +-
 .../sensitive/components/AddNEditDialog.vue   | 118 ++++++++++
 .../pages/service/sensitive/data.js           |  17 ++
 .../pages/service/sensitive/index.vue         | 205 ++++++++++++++++++
 ruoyi-ui/vue.config.js                        |   4 +-
 8 files changed, 356 insertions(+), 10 deletions(-)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{maintenanceOperations => datav}/maintainQuery/assets/online_bj.jpg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{maintenanceOperations => datav}/maintainQuery/index.vue (100%)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/data.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue

diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index ebeccf37..0497590c 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -59,7 +59,7 @@ export default [
             component: "control/event/dispatch/index.vue",
           },
           {
-            title: "感知事件",
+            title: "事件列表",
             path: "/control/event/event",
             name: "controlEventEvent",
             component: "control/event/event/index.vue",
@@ -115,12 +115,6 @@ export default [
       name: "statisticalAnalysis",
       path: "/maintain/statisticalAnalysis",
       component: "maintenanceOperations/statisticalAnalysis/index.vue", 
-     },
-     {
-      title: "设备查询",
-      name: "maintainQuery",
-      path: "/maintain/maintainQuery",
-      component: "maintenanceOperations/maintainQuery/index.vue", 
      }
     ]
   },
@@ -137,6 +131,12 @@ export default [
         path: "/service/board",
         component: "service/board/index.vue",
       },
+      {
+        title: "情报板敏感词",
+        name: "sensitive",
+        path: "/service/sensitive",
+        component: "service/sensitive/index.vue",
+      },
       {
         title: "发布渠道管理",
         name: "PublishingChannelManagement",
@@ -182,6 +182,12 @@ export default [
         path: "/datav/gisAndBim",
         component: "datav/gisAndBim/index.vue",
       },
+      {
+        title: "数字路网",
+        name: "maintainQuery",
+        path: "/datav/maintainQuery",
+        component: "datav/maintainQuery/index.vue",
+      }
     ],
   },
   {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/maintainQuery/assets/online_bj.jpg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/maintainQuery/assets/online_bj.jpg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/maintainQuery/assets/online_bj.jpg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/datav/maintainQuery/assets/online_bj.jpg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/maintainQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/maintainQuery/index.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/maintainQuery/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/datav/maintainQuery/index.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
index 702296e0..b3e594ed 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -621,7 +621,7 @@ export default {
     ____onDeleteBoardItem(index) {
       if (index > -1) {
         this.selectedBdMsg.splice(index, 1)
-        this.$message.success('删除成功,发布后生效。')
+        this.$message.success('删除成功。')
       }
     },
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue
new file mode 100644
index 00000000..3cc86f02
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue
@@ -0,0 +1,118 @@
+<template>
+  <Dialog v-model="modelVisible" :title="data ? '修改' : '新增'">
+    <div class='AddNEditDialog'>
+      <Form :value="formData" class="form" ref="FormConfigRef" :formList="formList" column="1" labelWidth="120px" />
+    </div>
+
+    <template #footer>
+      <Button style="background-color: rgba(0, 179, 204, .3);" @click.native="modelVisible = false, submitting = false">
+        取消
+      </Button>
+      <Button @click.native="handleSubmit" :loading="submitting">
+        确定
+      </Button>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue"
+import Form from '@screen/components/FormConfig';
+
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import { addEditFormList } from "./../data"
+import { stakeMarkToArray, findPathIdByTreeId } from "@screen/utils/index.js"
+
+export default {
+  name: 'AddNEditDialog',
+  components: {
+    Dialog,
+    Button,
+    Form
+  },
+  model: {
+    prop: 'visible',
+    event: "update:value"
+  },
+  props: {
+    visible: Boolean,
+    data: Object
+  },
+  data() {
+    return {
+      submitting: false,
+      formData: {},
+      formList: addEditFormList
+    }
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:value', val)
+      }
+    }
+  },
+  watch: {
+    modelVisible: {
+      immediate: true,
+      handler(bool) {
+        if (!bool) return;
+
+        this.formData = !this.data ? {} : {
+          ...this.data
+        }
+      }
+    }
+  },
+  methods: {
+    handleSubmit() {
+      this.$refs.FormConfigRef.validate()
+        .then((data) => {
+          this.submitting = true;
+
+          if (this.data) data.id = this.data.id;
+
+          request({
+            url: `/business/dcInfoBoardVocabulary`,
+            method: this.data ? 'PUT' : 'POST',
+            data
+          })
+            .then(result => {
+              if (result.code != 200) return Message.error(`提交失败!`);
+
+              Message.success(`提交成功!`);
+              this.$emit("afterSubmit");
+
+              this.modelVisible = false;
+
+            })
+            .catch((err) => {
+              console.log("%c [ err ]-110-「DeviceControlDialog.vue」", "font-size:15px; background:#547bf2; color:#98bfff;", err);
+              Message.error(`提交失败!`);
+            })
+            .finally(() => {
+              this.submitting = false;
+            })
+        })
+    }
+  },
+}
+</script>
+
+<style lang='scss' scoped>
+.AddNEditDialog {
+  width: 450px;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+
+  .tips {
+    font-size: 12px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/data.js
new file mode 100644
index 00000000..0825d426
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/data.js
@@ -0,0 +1,17 @@
+import { cloneDeep, merge } from "lodash";
+import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+
+export const searchFormList = [
+  {
+    label: "关键词:",
+    key: "word",
+  }
+];
+
+export const addEditFormList = [
+  {
+    label: "关键词:",
+    key: "word",
+    required: true,
+  }
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
new file mode 100644
index 00000000..8632fc7a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
@@ -0,0 +1,205 @@
+<template>
+  <div class='sensitiveWord'>
+    <div class="filter">
+      <div>
+        <ButtonGradient @click.native="handleAddEdit(true)">
+          <template #prefix>
+            <img src="@screen/images/insert.svg" />
+          </template>
+          新增
+        </ButtonGradient>
+        <ButtonGradient @click.native="handleExport">
+          <template #prefix>
+            <img src="@screen/images/export.svg" />
+          </template>
+          导出
+        </ButtonGradient>
+        <ButtonGradient @click.native="getData">
+          <template #prefix>
+            <img src="@screen/images/refresh.svg" />
+          </template>
+          刷新
+        </ButtonGradient>
+      </div>
+
+      <InputSearch style="width: 402px;" :formList="searchFormList" :formConfigOptions="{ labelWidth: '90px' }"
+        @handleSearch="handleSearch" />
+    </div>
+
+
+    <div class="body">
+      <Empty v-if="!data.length && !isFirst" class="no-data" style="position: absolute">暂无数据</Empty>
+      <template v-else>
+        <div class="cardBox" v-for="(item, index) in data" :key="index">
+          <Card :buttonIcon="null" :keyMap="keyMap" :cardData="item" class="card"
+          buttonText="详情">
+          <template #form-word="{ data }">
+            <div class="keyword">
+              {{ data.word }}
+            </div>
+          </template>
+          <template #button>
+            <Button @click.native="() => handleAddEdit(true, item)">
+              修改
+            </Button>
+            <Button style="background-color: #FF5F5F;" @click.native="handleDelete(item)">
+              删除
+            </Button>
+          </template>
+        </Card>
+      </div>
+      </template>
+    </div>
+    <AddNEditDialog v-model="isShowDialog" :data="dialogData" @afterSubmit = "getData" />;
+  </div>
+</template>
+
+<script>
+import Card from "@screen/components/Card1/index.vue"
+import AddNEditDialog from "./components/AddNEditDialog.vue"
+import InputSearch from '@screen/components/InputSearch/index.vue';
+import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
+import Button from '@screen/components/Buttons/Button.vue';
+
+import { searchFormList } from "./data";
+import request from "@/utils/request";
+import { setLoading } from "@screen/utils/index.js"
+import { delay, exportFile, confirm } from "@screen/utils/common";
+import { Message } from "element-ui";
+
+// 辖段管理
+export default {
+  name: 'sensitiveWord',
+  components: {
+    Card,
+    ButtonGradient,
+    InputSearch,
+    AddNEditDialog,
+    Button
+  },
+  data() {
+    return {
+      searchFormList,
+      keyMap: [
+        {
+          key: "word",
+          label: "关键词"
+        },
+        {
+          key: "location",
+          label: "id"
+        },
+        {
+          key: "createTime",
+          label: "创建时间"
+        }
+      ],
+      data: [],
+      dialogData: null,
+      isShowDialog: false,
+      isFirst: true
+    }
+  },
+  created() {
+    this.getData();
+    // this.getSearchOptions();
+  },
+  methods: {
+    getSearchData() {
+      let result = {
+        ...this.searchData,
+      };
+      if(!result.word){
+        result = {};
+      }
+      return result
+    },
+    async handleDelete(data) {
+      await confirm({ message: "是否要删除该辖段信息?" });
+
+      request({
+        url: `/business/roadSection/${data.id}`,
+        method: "DELETE",
+        data: {}
+      })
+        .then(result => {
+          if (result.code != 200) return Message.error("删除失败");
+
+          Message.success("删除成功")
+        })
+        .catch(() => {
+          Message.error("删除失败")
+        })
+    },
+    handleAddEdit(bool, data) {
+      this.isShowDialog = bool;
+      this.dialogData = data;
+    },
+    handleExport() {
+      exportFile({
+        url: "/business/roadSection/export",
+        filename: "管辖路段",
+        data: this.getSearchData()
+      });
+    },
+    handleSearch(data) {
+      this.searchData = data;
+      this.getData();
+    },
+    async getData() {
+      const closeLoading = setLoading();
+
+      await delay(150);
+
+      request({
+        url: `/business/dcInfoBoardVocabulary/list`,
+        method: "get",
+        params: this.getSearchData()
+      }).then(result => {
+        if (result.code != 200) return;
+        this.data = result.rows;
+        // this.data = [
+        //   ...result.rows,...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows
+        //   , ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows
+        // ];
+        Array.from(result.rows);
+      }).finally(() => {
+        this.isFirst = false;
+        closeLoading();
+      })
+    }
+  }
+
+}
+</script>
+
+<style lang='scss' scoped>
+.sensitiveWord {
+  padding: 20px;
+  display: flex; flex-direction: column;
+  .filter {
+      height: 60px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      div {
+        display: flex;
+        gap: 6px;
+      }
+    }
+
+  .body {
+    height: 0; flex: 1; overflow-y: scroll;
+    display: flex; flex-wrap: wrap; align-items: flex-start;
+    .cardBox{
+      flex-basis: percentage(1/7); width: 0; padding-right: 10px; padding-bottom: 10px;
+    }
+    .keyword {
+      font-size: 14px;
+      font-weight: bold;
+      color: #00B3CC;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 435592ca..7b307e3c 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -49,9 +49,9 @@ module.exports = {
         // target: `http://10.0.81.202:8087`, //现场后台
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
-        // target: `http://10.168.78.135: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.68.42:8087`, //王思祥
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From e3d9fce6783fe44cded77528d9190b96c15775f6 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Tue, 6 Feb 2024 16:47:07 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=88=86=E6=9E=90bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/control/event/dispatch/data.js      | 106 +--
 .../StatsDialogVisible/index.vue              |  83 ++-
 .../channelAnalytics/assets/charts copy.js    | 339 ++++++++++
 .../channelAnalytics/assets/charts.js         | 176 ++---
 .../components/channelAnalytics/index.vue     |   7 +-
 .../eventTypeAnalysis/assets/charts.js        | 227 ++-----
 .../components/eventTypeAnalysis/index.vue    |   6 +-
 .../components/postTrendsDay/assets/charts.js |  40 +-
 .../postTrendsMonth/assets/charts.js          |  33 +-
 .../postTrendsMonth/assets/charts2.js         |  76 +--
 .../postTrendsMonth/assets/charts3.js         |  35 +-
 .../components/trafficIndicators/index.vue    | 608 +++++++++---------
 .../views/JiHeExpressway/scss/el-reset.scss   |   8 +
 13 files changed, 994 insertions(+), 750 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts copy.js

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
index f20165c4..d9eeb945 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
@@ -1,7 +1,8 @@
 import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
 import { merge, cloneDeep } from "lodash";
 
-export const searchFormList = [{
+export const searchFormList = [
+  {
     label: "事件状态:",
     key: "eventState",
     type: "RadioGroup",
@@ -22,58 +23,57 @@ export const searchFormList = [{
       ],
     },
   },
-    PresetFormItems.eventSources,
-    PresetFormItems.eventType,
-    {
-      label: "方向:",
-      key: "direction",
-      type: "RadioGroup",
-      options: {
-        options: [
-          {
-            key: "济南方向",
-            label: "济南方向",
-          },
-          {
-            key: "菏泽方向",
-            label: "菏泽方向",
-          },
-          {
-            key: "双向",
-            label: "双向",
-          },
-        ],
-      },
+  PresetFormItems.eventSources,
+  PresetFormItems.eventType,
+  {
+    label: "方向:",
+    key: "direction",
+    type: "RadioGroup",
+    options: {
+      options: [
+        {
+          key: "济南方向",
+          label: "济南方向",
+        },
+        {
+          key: "菏泽方向",
+          label: "菏泽方向",
+        },
+        {
+          key: "双向",
+          label: "双向",
+        },
+      ],
     },
-    {
-      label: "时间范围:",
-      key: "daterange",
-      required: false,
-      type: "datePicker",
-      options: {
-        type: "daterange",
-        format: 'yyyy-MM-dd HH:mm:ss',
-        valueFormat: 'yyyy-MM-dd HH:mm:ss'
-      },
+  },
+  {
+    label: "时间范围:",
+    key: "daterange",
+    required: false,
+    type: "datePicker",
+    options: {
+      type: "daterange",
+      format: "yyyy-MM-dd HH:mm:ss",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
-    {
-      ...PresetFormItems.station,
-      label: "开始桩号:",
-      required: false,
+  },
+  {
+    ...PresetFormItems.station,
+    label: "开始桩号:",
+    required: false,
+  },
+  merge(cloneDeep(PresetFormItems.station), {
+    options: {
+      options: [
+        {
+          key: "endStakeMark[0]",
+        },
+        {
+          key: "endStakeMark[1]",
+        },
+      ],
     },
-    merge(cloneDeep(PresetFormItems.station), {
-      options: {
-        options: [
-          {
-            key: "endStakeMark[0]",
-          },
-          {
-            key: "endStakeMark[1]",
-          },
-        ],
-      },
-      label: "结束桩号:",
-      required: false,
-    }
-    )
-  ];
\ No newline at end of file
+    label: "结束桩号:",
+    required: false,
+  }),
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
index 5d558a9e..cc9567f7 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
@@ -51,6 +51,7 @@ import Dialog from "@screen/components/Dialog/index";
 import InputSearch from '@screen/components/InputSearch/index.vue';
 import Table from "@screen/components/Table.vue";
 import { selectTollStation } from "@/api/event/governanceAnalysis"
+import options from "../assets/charts";
 export default {
     name: 'StatsDetail',
     components: {
@@ -67,17 +68,82 @@ export default {
     },
     data() {
         return {
+            num: 0,
             tableData: [],
             weatherNum: [],
             startTime: "",
             endTime: "",
+            pickerOptions: {
+                disabledDate(time) {
+                    return time.getTime() > Date.now();
+                },
+            },
             searchFormList: [
+                {
+                    label: "查询条件:",
+                    key: "a",
+                    required: true,
+                    isAlone: true,
+                    type: "RadioGroup",
+                    options: {
+                        type: 'circle',
+                        options: [
+                            {
+                                key: "0",
+                                label: "站点",
+                            },
+                            {
+                                key: "1",
+                                label: "原因",
+                            }
+                        ],
+                    }
+                },
+                {
+                    label: "事件类型:",
+                    key: "b",
+                    required: true,
+                    type: "RadioGroup",
+                    options: {
+                        type: 'circle',
+                        options: [{
+                            key: 1,
+                            label: "收费站封闭",
+                        },
+                        {
+                            key: 2,
+                            label: "收费站限行",
+                        }]
+                    }
+                },
+                {
+                    label: "选择站点:",
+                    key: "c",
+                    required: true,
+                    type: "RadioGroup",
+                    options: {
+                        type: 'circle',
+                        options: [{
+                            key: 1,
+                            label: "收费站封闭",
+                        },
+                        {
+                            key: 2,
+                            label: "收费站限行",
+                        }]
+                    }
+                },
                 {
                     label: "日期:",
                     key: "date",
                     required: true,
                     type: "datePicker",
                     options: {
+                        pickerOptions: {
+                            disabledDate(time) {
+                                return time.getTime() > Date.now();
+                            },
+                        },
                         valueFormat: "yyyy-MM-dd",
                         type: "daterange"
                     }
@@ -99,11 +165,15 @@ export default {
 
     methods: {
         handleSearch(data) {
+            console.log("data", data)
             this.getSelectTollStation(data)
         },
         arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-            // console.log("+++++++", row, column, rowIndex, columnIndex)
+            console.log("+++++++", row, column, rowIndex, columnIndex)
+
+
             if (!row.causeTypeName) {
+                console.log("11111111111")
                 if (columnIndex === 0) {
                     return [1, 2];
                 }
@@ -112,6 +182,7 @@ export default {
                 }
             };
             if (row.controlCauseName === '恶劣天气') {
+                console.log("222222222222")
                 if (columnIndex === 0) {
                     console.log(this.weatherNum.length)
                     if (rowIndex === 0) {
@@ -141,9 +212,10 @@ export default {
                     // }
 
                 }
-
+                // this.weatherNum = 0
             }
 
+
         },
         getSelectTollStation(data) {
             console.log(45, data)
@@ -164,6 +236,7 @@ export default {
             let weatherData = []
             let otherData = []
             selectTollStation(formData).then((res) => {
+                this.weatherNum = []
                 res.data.forEach(item => {
                     if (item.causeTypeName) {
                         this.weatherNum.push(item.causeTypeName)
@@ -178,7 +251,11 @@ export default {
         }
     },
     mounted() {
-        this.getSelectTollStation()
+        let date = moment().format('YYYY-MM-DD')
+        let data = {
+            date: [date + " 00:00:00", date + " 23:59:59"]
+        }
+        this.getSelectTollStation(data)
     }
 }
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts copy.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts copy.js
new file mode 100644
index 00000000..a37e9059
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts copy.js	
@@ -0,0 +1,339 @@
+var res = [
+  { value: 20, name: "交通事故" },
+  { value: 1, name: "" },
+  { value: 20, name: "车辆故障" },
+  { value: 1, name: "" },
+  { value: 15, name: "路障清除" },
+  { value: 1, name: "" },
+  { value: 10, name: "交通管制" },
+  { value: 1, name: "" },
+  { value: 5, name: "道路拥堵" },
+  { value: 1, name: "" },
+  { value: 5, name: "异常天气" },
+];
+let angle = 0; //角度，用来做简单的动画效果的
+
+//获取圆上面某点的坐标(x0,y0表示坐标，r半径，angle角度)
+function getCirlPoint(x0, y0, r, angle) {
+  let x1 = x0 + r * Math.cos((angle * Math.PI) / 180);
+  let y1 = y0 + r * Math.sin((angle * Math.PI) / 180);
+  return {
+    x: x1,
+    y: y1,
+  };
+}
+
+let color = [
+  "#4278F8F9",
+  "transparent",
+  "#5372C4",
+  "transparent",
+  "#0046FFF9",
+  "transparent",
+  "#FB9434F9",
+  "transparent",
+  "#854101F9",
+  "transparent",
+  "#05E599F9",
+  "transparent",
+  "#219F73F9",
+  "transparent",
+  "#7CEDD5F9",
+  "transparent",
+];
+let colorend = [
+  "#4278F800",
+  "transparent",
+  "#5372C400",
+  "transparent",
+  "#0046FF00",
+  "transparent",
+  "#FB943400",
+  "transparent",
+  "#85410100",
+  "transparent",
+  "#05E59900",
+  "transparent",
+  "#219F7300",
+  "transparent",
+  "#7CEDD500",
+  "transparent",
+];
+
+//  var res = this.evaluatedCountList;
+var data1 = [],
+  data2 = [],
+  data3 = [],
+  legendData = [];
+var curIndex = 0;
+var index = 0;
+
+for (var i = 0; i < res.length; i++) {
+  // data1.push({
+  //   value: res[i].value,
+  //   name: res[i].name,
+  // });
+  // data2.push({
+  //   value: res[i].value,
+  //   name: res[i].name,
+  //   itemStyle: {
+  //     opacity: 0.4,
+  //   },
+  // });
+
+  // data3.push({
+  //   value: res[i].value,
+  //   name: res[i].name,
+  //   itemStyle: {
+  //     opacity: 0.1,
+  //   },
+  // });
+  if (res[i].name != "") legendData.push(res[i].name);
+}
+
+var options = {
+  color: [
+    "#2867FF",
+    "transparent",
+    "#58C3FF",
+    "transparent",
+    "#FF6A3B",
+    "transparent",
+    "#FDA474",
+    "transparent",
+    "#FEE58F",
+    "transparent",
+    "#8DFEBF",
+    "transparent",
+    "#66F4DC",
+    "transparent",
+    "#33E27D",
+    "transparent",
+    "#5D8CFE",
+    "transparent",
+  ],
+  title: [
+    {
+      text: "999",
+      top: "25%",
+      textAlign: "center",
+      left: "48%",
+      textStyle: {
+        color: "#ffffff",
+        fontSize: 30,
+        fontFamily: "SourceHanSansCN",
+      },
+    },
+    {
+      text: "总数",
+      top: "38%",
+      textAlign: "center",
+      left: "48%",
+      textStyle: {
+        color: "rgba(242, 252, 253, 0.84)",
+        fontSize: 16,
+        fontFamily: "SourceHanSansCN",
+      },
+    },
+  ],
+  grid: {
+    top: "38%",
+    left: "6%",
+    right: "6%",
+    bottom: "3%",
+    containLabel: true,
+  },
+  tooltip: {
+    show: false,
+    trigger: "item",
+    formatter: "{b} : {c}:{d}",
+  },
+  legend: {
+    orient: "",
+    left: "10%",
+    top: "68%",
+    itemWidth: 10,
+    itemHeight: 10,
+    icon: "circle",
+    textStyle: {
+      color: "#ffffff",
+      fontSize: 14,
+      lineHeight: 22,
+      rich: {
+        text: {
+          marginLeft: 32,
+          fontSize: 14,
+        },
+        number: {
+          fontSize: 14,
+          color: "#37E7FF",
+          marginLeft: 32,
+          fontWeight: "bold",
+        },
+        unit: {
+          fontSize: 14,
+        },
+      },
+    },
+    data: legendData,
+    // formatter(name) {
+    //   const newData = res;
+    //   let tarValue = 0;
+    //   let total = 0;
+    //   for (let i = 0; i < newData.length; i++) {
+    //     total += newData[i].value;
+    //     if (newData[i].name === name) {
+    //       tarValue = newData[i].value;
+    //     }
+    //   }
+    //   var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
+    //   const arr = name + "  " + tarValue;
+    //   return `{text|${name}} {number|${percert}%}`;
+    // },
+  },
+  series: [
+    /** 饼图上刻度 */
+    {
+      type: "gauge",
+      center: ["50%", "35%"],
+      radius: "46%", // 错位调整此处
+      startAngle: 0,
+      endAngle: 360,
+      splitNumber: 52,
+      axisLine: { show: false },
+      splitLine: {
+        // length: 39,
+        length: "2",
+        lineStyle: {
+          width: 5,
+          color: "#5CC5FF",
+        },
+      },
+      axisTick: { show: false },
+      axisLabel: { show: false },
+    },
+    {
+      name: "中心效果圆",
+      type: "gauge",
+      radius: "30%",
+      center: ["50%", "35%"],
+      startAngle: 0,
+      endAngle: 360,
+      axisLine: {
+        lineStyle: {
+          color: [[1, "#0AFFE950"]],
+          width: 1,
+        },
+      },
+      axisTick: {
+        show: false,
+      },
+      splitLine: {
+        show: false,
+      },
+      axisLabel: {
+        show: false,
+      },
+      detail: {
+        show: false,
+      },
+      pointer: {
+        show: false,
+      },
+      progress: {
+        show: true,
+        width: 80,
+        itemStyle: {
+          color: {
+            type: "radial",
+            x: 0.5,
+            y: 0.5,
+            r: 0.5,
+            colorStops: [
+              {
+                offset: 0,
+                color: "rgb(0, 224, 205, 0)",
+              },
+              {
+                offset: 0.7,
+                color: "rgba(0, 224, 205, 0)",
+              },
+              {
+                offset: 1,
+                color: "rgba(10, 255, 233, 0.5)",
+              },
+            ],
+          },
+        },
+      },
+      data: [
+        {
+          value: 100,
+        },
+      ],
+    },
+    {
+      type: "pie",
+      radius: ["50%", "40%"],
+      center: ["50%", "35%"],
+      z: 10,
+      label: {
+        show: false,
+        position: "center",
+        formatter: (params) => {
+          return params.name + "\r\n" + params.value;
+        },
+        rich: {
+          total: {
+            fontSize: 16,
+            color: "#04F5FE",
+          },
+          efficiency: {
+            fontSize: 12,
+            color: "#00FD6D",
+          },
+        },
+        color: "#FFFFFF",
+        fontSize: 12,
+        lineHeight: 16,
+      },
+      data: res,
+      labelLine: {
+        show: false,
+      },
+      itemStyle: {
+        normal: {
+          borderRadius: "5",
+          borderWidth: 0,
+          borderType: "solid",
+          borderCap: "round",
+          borderJoin: "round",
+          borderColor: "#064258",
+          borderMiterLimit: "20",
+          color: function (params) {
+            return {
+              type: "linear",
+              x: 0,
+              y: 0,
+              x2: 1,
+              y2: 1,
+              colorStops: [
+                {
+                  offset: 0,
+                  color: color[params.dataIndex], // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: colorend[params.dataIndex], // 100% 处的颜色
+                },
+              ],
+              globalCoord: false, // 缺省为 false
+            };
+          },
+        },
+      },
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js
index a37e9059..ea9dad7b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js
@@ -1,116 +1,36 @@
-var res = [
-  { value: 20, name: "交通事故" },
-  { value: 1, name: "" },
-  { value: 20, name: "车辆故障" },
-  { value: 1, name: "" },
-  { value: 15, name: "路障清除" },
-  { value: 1, name: "" },
-  { value: 10, name: "交通管制" },
-  { value: 1, name: "" },
-  { value: 5, name: "道路拥堵" },
-  { value: 1, name: "" },
-  { value: 5, name: "异常天气" },
-];
-let angle = 0; //角度，用来做简单的动画效果的
-
-//获取圆上面某点的坐标(x0,y0表示坐标，r半径，angle角度)
-function getCirlPoint(x0, y0, r, angle) {
-  let x1 = x0 + r * Math.cos((angle * Math.PI) / 180);
-  let y1 = y0 + r * Math.sin((angle * Math.PI) / 180);
-  return {
-    x: x1,
-    y: y1,
-  };
-}
-
-let color = [
-  "#4278F8F9",
-  "transparent",
-  "#5372C4",
-  "transparent",
-  "#0046FFF9",
-  "transparent",
-  "#FB9434F9",
-  "transparent",
-  "#854101F9",
-  "transparent",
-  "#05E599F9",
-  "transparent",
-  "#219F73F9",
-  "transparent",
-  "#7CEDD5F9",
-  "transparent",
+let colors = [
+  "#68F4DD",
+  "#1785C0",
+  "#476DBC",
+  "#B55233",
+  "#B0862C",
+  "#35AD6B",
+  "#219F73",
+  "#7CEDD5",
 ];
 let colorend = [
-  "#4278F800",
-  "transparent",
-  "#5372C400",
-  "transparent",
-  "#0046FF00",
-  "transparent",
-  "#FB943400",
-  "transparent",
-  "#85410100",
-  "transparent",
-  "#05E59900",
-  "transparent",
-  "#219F7300",
-  "transparent",
-  "#7CEDD500",
-  "transparent",
+  "#4278F8",
+  "#5372C4",
+  "#0046FF",
+  "#FB9434",
+  "#854101",
+  "#05E599",
+  "#219F73",
+  "#7CEDD5",
 ];
-
-//  var res = this.evaluatedCountList;
-var data1 = [],
-  data2 = [],
-  data3 = [],
-  legendData = [];
-var curIndex = 0;
-var index = 0;
-
-for (var i = 0; i < res.length; i++) {
-  // data1.push({
-  //   value: res[i].value,
-  //   name: res[i].name,
-  // });
-  // data2.push({
-  //   value: res[i].value,
-  //   name: res[i].name,
-  //   itemStyle: {
-  //     opacity: 0.4,
-  //   },
-  // });
-
-  // data3.push({
-  //   value: res[i].value,
-  //   name: res[i].name,
-  //   itemStyle: {
-  //     opacity: 0.1,
-  //   },
-  // });
-  if (res[i].name != "") legendData.push(res[i].name);
-}
+var legendData = [];
 
 var options = {
   color: [
     "#2867FF",
-    "transparent",
     "#58C3FF",
-    "transparent",
     "#FF6A3B",
-    "transparent",
     "#FDA474",
-    "transparent",
     "#FEE58F",
-    "transparent",
     "#8DFEBF",
-    "transparent",
     "#66F4DC",
-    "transparent",
     "#33E27D",
-    "transparent",
     "#5D8CFE",
-    "transparent",
   ],
   title: [
     {
@@ -144,23 +64,24 @@ var options = {
     containLabel: true,
   },
   tooltip: {
-    show: false,
+    show: true,
     trigger: "item",
-    formatter: "{b} : {c}:{d}",
+    // formatter: "{b} : {c}",
   },
   legend: {
-    orient: "",
-    left: "10%",
-    top: "68%",
+    width: "300px",
+    height: "120px",
+    orient: "vertical",
+    top: "60%",
     itemWidth: 10,
     itemHeight: 10,
-    icon: "circle",
     textStyle: {
       color: "#ffffff",
       fontSize: 14,
       lineHeight: 22,
       rich: {
         text: {
+          width: 100,
           marginLeft: 32,
           fontSize: 14,
         },
@@ -176,20 +97,13 @@ var options = {
       },
     },
     data: legendData,
-    // formatter(name) {
-    //   const newData = res;
-    //   let tarValue = 0;
-    //   let total = 0;
-    //   for (let i = 0; i < newData.length; i++) {
-    //     total += newData[i].value;
-    //     if (newData[i].name === name) {
-    //       tarValue = newData[i].value;
-    //     }
-    //   }
-    //   var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
-    //   const arr = name + "  " + tarValue;
-    //   return `{text|${name}} {number|${percert}%}`;
-    // },
+    pageIconColor: "#fff",
+    pageIconSize: 10,
+    pageTextStyle: {
+      color: "#fff",
+    },
+    type: "scroll",
+    pageButtonPosition: "end",
   },
   series: [
     /** 饼图上刻度 */
@@ -213,7 +127,7 @@ var options = {
       axisLabel: { show: false },
     },
     {
-      name: "中心效果圆",
+      name: "总数",
       type: "gauge",
       radius: "30%",
       center: ["50%", "35%"],
@@ -271,6 +185,7 @@ var options = {
           value: 100,
         },
       ],
+      // tooltip: false,
     },
     {
       type: "pie",
@@ -279,25 +194,8 @@ var options = {
       z: 10,
       label: {
         show: false,
-        position: "center",
-        formatter: (params) => {
-          return params.name + "\r\n" + params.value;
-        },
-        rich: {
-          total: {
-            fontSize: 16,
-            color: "#04F5FE",
-          },
-          efficiency: {
-            fontSize: 12,
-            color: "#00FD6D",
-          },
-        },
-        color: "#FFFFFF",
-        fontSize: 12,
-        lineHeight: 16,
       },
-      data: res,
+      data: [],
       labelLine: {
         show: false,
       },
@@ -320,11 +218,11 @@ var options = {
               colorStops: [
                 {
                   offset: 0,
-                  color: color[params.dataIndex], // 0% 处的颜色
+                  color: "transparent", // 0% 处的颜色
                 },
                 {
                   offset: 1,
-                  color: colorend[params.dataIndex], // 100% 处的颜色
+                  color: colors[params.dataIndex], // 100% 处的颜色
                 },
               ],
               globalCoord: false, // 缺省为 false
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/index.vue
index dba247d0..691b709a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/index.vue
@@ -43,9 +43,9 @@ export default {
         }
         console.log("total", total)
         for (let i = 0; i < data.length; i++) {
-          if (i % 2 === 0) {
-            data.splice(i + 1, 0, newObj)
-          }
+          //   if (i % 2 === 0) {
+          //     data.splice(i + 1, 0, newObj)
+          //   }
           if (data[i].name != "") {
             nameData.push(data[i].name)
           }
@@ -63,6 +63,7 @@ export default {
         };
         chartsStatistics.legend.data = nameData;
         chartsStatistics.title[0].text = total;
+        // chartsStatistics.series[1].data[0].value = total;
         chartsStatistics.series[2].data = data;
       })
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js
index 1d2fd244..2ba09d97 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js
@@ -1,146 +1,52 @@
-var res = [
-  { value: 20, name: "交通事故" },
-  { value: 1, name: "" },
-  { value: 20, name: "车辆故障" },
-  { value: 1, name: "" },
-  { value: 15, name: "路障清除" },
-  { value: 1, name: "" },
-  { value: 10, name: "交通管制" },
-  { value: 1, name: "" },
-  { value: 5, name: "道路拥堵" },
-  { value: 1, name: "" },
-  { value: 5, name: "异常天气" },
-  { value: 1, name: "" },
-  { value: 20, name: "交通事故2" },
-  { value: 1, name: "" },
-  { value: 20, name: "车辆故障2" },
-  { value: 1, name: "" },
-  { value: 15, name: "路障清除2" },
-  { value: 1, name: "" },
-  { value: 10, name: "交通管制2" },
-  { value: 1, name: "" },
-  { value: 5, name: "道路拥堵2" },
-  { value: 1, name: "" },
-  { value: 5, name: "异常天气2" },
-  { value: 1, name: "" },
-];
-let angle = 0; //角度，用来做简单的动画效果的
-
-//获取圆上面某点的坐标(x0,y0表示坐标，r半径，angle角度)
-function getCirlPoint(x0, y0, r, angle) {
-  let x1 = x0 + r * Math.cos((angle * Math.PI) / 180);
-  let y1 = y0 + r * Math.sin((angle * Math.PI) / 180);
-  return {
-    x: x1,
-    y: y1,
-  };
-}
-
-let color = [
-  "#4278F8F9",
-  "transparent",
+let colors = [
+  "#4278F8",
   "#5372C4",
-  "transparent",
-  "#0046FFF9",
-  "transparent",
-  "#FB9434F9",
-  "transparent",
-  "#854101F9",
-  "transparent",
-  "#05E599F9",
-  "transparent",
-  "#219F73F9",
-  "transparent",
-  "#7CEDD5F9",
-  "transparent",
-  "#854101F9",
-  "transparent",
-  "#05E599F9",
-  "transparent",
-  "#219F73F9",
-  "transparent",
-  "#7CEDD5F9",
-  "transparent",
+  "#0046FF",
+  "#FB9434",
+  "#854101",
+  "#05E599",
+  "#219F73",
+  "#7CEDD5",
+  "#854101",
+  "#05E599",
+  "#219F73",
+  "#7CEDD5",
 ];
 let colorend = [
-  "#4278F800",
-  "transparent",
-  "#5372C400",
-  "transparent",
-  "#0046FF00",
-  "transparent",
-  "#FB943400",
-  "transparent",
-  "#85410100",
-  "transparent",
-  "#05E59900",
-  "transparent",
-  "#219F7300",
-  "transparent",
-  "#7CEDD500",
-  "transparent",
-  "#854101F9",
-  "transparent",
-  "#05E599F9",
-  "transparent",
-  "#219F73F9",
-  "transparent",
-  "#7CEDD5F9",
-  "transparent",
+  "#4278F8",
+  "#5372C4",
+  "#0046FF",
+  "#FB9434",
+  "#854101",
+  "#05E599",
+  "#219F73",
+  "#7CEDD5",
+  "#854101",
+  "#05E599",
+  "#219F73",
+  "#7CEDD5",
 ];
 
-//  var res = this.evaluatedCountList;
-var data1 = [],
-  data2 = [],
-  data3 = [],
-  legendData = [];
-var curIndex = 0;
-var index = 0;
-
-for (var i = 0; i < res.length; i++) {
-  data1.push({
-    value: res[i].value,
-    name: res[i].name,
-  });
-  // data2.push({
-  //   value: res[i].value,
-  //   name: res[i].name,
-  //   itemStyle: {
-  //     opacity: 0.4,
-  //   },
-  // })
-
-  // data3.push({
-  //   value: res[i].value,
-  //   name: res[i].name,
-  //   itemStyle: {
-  //     opacity: 0.1,
-  //   },
-  // })
-  if (res[i].name != "") legendData.push(res[i].name);
-}
+let legendData = [];
 
 var options = {
-  color: [
-    "#2867FF",
-    "transparent",
-    "#58C3FF",
-    "transparent",
-    "#FF6A3B",
-    "transparent",
-    "#FDA474",
-    "transparent",
-    "#FEE58F",
-    "transparent",
-    "#8DFEBF",
-    "transparent",
-    "#66F4DC",
-    "transparent",
-    "#33E27D",
-    "transparent",
-    "#5D8CFE",
-    "transparent",
-  ],
+  // color: [
+  //   "#2867FF",
+  //   "#58C3FF",
+  //   "#FF6A3B",
+  //   "#FDA474",
+  //   "#FEE58F",
+  //   "#8DFEBF",
+  //   "#66F4DC",
+  //   "#33E27D",
+  //   "#5D8CFE",
+  //   "#FDA474",
+  //   "#FEE58F",
+  //   "#8DFEBF",
+  //   "#66F4DC",
+  //   "#33E27D",
+  //   "#5D8CFE",
+  // ],
   title: [
     {
       text: "999",
@@ -173,28 +79,24 @@ var options = {
     containLabel: true,
   },
   tooltip: {
-    show: false,
+    show: true,
     trigger: "item",
-    formatter: "{b} : {c}:{d}",
+    // formatter: "{b} : {c}:{d}",
   },
   legend: {
-    type: "scroll",
-    show: true,
-    // width: 200,
-    orient: "",
-    left: "10%",
-    top: "68%",
-    // right: "30%",
+    width: "300px",
+    height: "120px",
+    orient: "vertical",
+    top: "60%",
     itemWidth: 10,
     itemHeight: 10,
-    icon: "circle",
     textStyle: {
       color: "#ffffff",
       fontSize: 14,
       lineHeight: 22,
-      overflow: "auto",
       rich: {
         text: {
+          width: 100,
           marginLeft: 32,
           fontSize: 14,
         },
@@ -210,7 +112,13 @@ var options = {
       },
     },
     data: legendData,
-    formatter(params) {},
+    pageIconColor: "#fff",
+    pageIconSize: 10,
+    pageTextStyle: {
+      color: "#fff",
+    },
+    type: "scroll",
+    pageButtonPosition: "end",
   },
   series: [
     /** 饼图上刻度 */
@@ -300,25 +208,8 @@ var options = {
       z: 10,
       label: {
         show: false,
-        position: "center",
-        formatter: (params) => {
-          return params.name + "\r\n" + params.value;
-        },
-        rich: {
-          total: {
-            fontSize: 16,
-            color: "#04F5FE",
-          },
-          efficiency: {
-            fontSize: 12,
-            color: "#00FD6D",
-          },
-        },
-        color: "#FFFFFF",
-        fontSize: 12,
-        lineHeight: 16,
       },
-      data: res,
+      data: [],
       labelLine: {
         show: false,
       },
@@ -341,11 +232,11 @@ var options = {
               colorStops: [
                 {
                   offset: 0,
-                  color: color[params.dataIndex], // 0% 处的颜色
+                  color: "transparent", // 0% 处的颜色
                 },
                 {
                   offset: 1,
-                  color: colorend[params.dataIndex], // 100% 处的颜色
+                  color: colors[params.dataIndex], // 100% 处的颜色
                 },
               ],
               globalCoord: false, // 缺省为 false
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/index.vue
index 8e9a8c1d..1e9dc408 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/index.vue
@@ -43,9 +43,9 @@ export default {
         }
         console.log("total88", total)
         for (let i = 0; i < data.length; i++) {
-          if (i % 2 === 0) {
-            data.splice(i + 1, 0, newObj)
-          }
+          // if (i % 2 === 0) {
+          //   data.splice(i + 1, 0, newObj)
+          // }
           if (data[i].name != "") {
             nameData.push(data[i].name)
           }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js
index b36caa20..44e0963a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js
@@ -1,7 +1,15 @@
 /* 数据 */
 var options = {
+  tooltip: {
+    show: true,
+    trigger: "axis",
+    textStyle: {
+      // color: "#fff",
+      fontSize: 10,
+    },
+    // formatter: "{b}：{c}人",
+  },
   legend: {
-    // orient: 'vertical',
     icon: "circle",
     itemHeight: 8,
     itemWidth: 8,
@@ -16,7 +24,7 @@ var options = {
   grid: {
     top: "15%", //上边距
     right: "0", //右边距
-    left: "0", //左边距
+    left: "1px", //左边距
     bottom: "10%", //下边距
     containLabel: true,
   },
@@ -28,7 +36,7 @@ var options = {
     },
     axisLine: {
       lineStyle: {
-        color: "rgba(49, 217, 255, 0.8)",
+        color: "#2A6278",
       },
     },
     axisLabel: {
@@ -41,17 +49,19 @@ var options = {
   yAxis: [
     {
       type: "value",
-      name: "",
-      max: 1200,
-      min: 0,
-      splitNumber: 5,
+      name: "（件）",
       nameTextStyle: {
-        color: "#BDC4C7",
-        fontSize: 10,
-        fontFamily: "Source Han Sans CN-Regular",
-        align: "left",
-        verticalAlign: "center",
+        color: "#E5E7E8",
+        fomtSize: 10,
       },
+      // splitNumber: 5,
+      // nameTextStyle: {
+      //   color: "#BDC4C7",
+      //   fontSize: 10,
+      //   fontFamily: "Source Han Sans CN-Regular",
+      //   align: "left",
+      //   verticalAlign: "center",
+      // },
       axisLabel: {
         fontSize: 10,
         color: "#E5E7E8",
@@ -65,7 +75,7 @@ var options = {
       },
       splitLine: {
         lineStyle: {
-          color: "rgba(49, 217, 255, 0.5)",
+          color: "#2A6278",
         },
       },
     },
@@ -101,7 +111,7 @@ var options = {
         width: 2,
       },
 
-      data: [], // 折线图的数据
+      data: [5, 20, 40, 15, 20], // 折线图的数据
     },
     {
       name: "交通事件",
@@ -133,7 +143,7 @@ var options = {
           global: false,
         },
       },
-      data: [], // 折线图的数据
+      data: [5, 20, 30, 15, 20], // 折线图的数据
     },
   ],
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
index 4d63e316..7abcecd8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
@@ -17,19 +17,19 @@ let data2 = [120, 340, 750, 600, 400, 700, 900, 200];
 let data3 = [200, 530, 920, 400, 600, 700, 300, 800];
 let options = {
   tooltip: {
-    show: false,
+    show: true,
     trigger: "axis",
     axisPointer: {
       // 坐标轴指示器，坐标轴触发有效
       type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
     },
     textStyle: {
-      color: "#fff",
-      fontSize: 12,
+      // color: "#fff",
+      fontSize: 10,
     },
-    backgroundColor: "rgba(3, 31, 71, .0)", //设置背景颜色
-    borderColor: "rgba(3, 31, 71, .0)",
-    formatter: "健康监测<br>{b1}：{c1}人",
+    // backgroundColor: "rgba(3, 31, 71, .0)", //设置背景颜色
+    // borderColor: "rgba(3, 31, 71, .0)",
+    // formatter: "健康监测<br>{b}：{c}人",
   },
   grid: {
     left: "0",
@@ -65,9 +65,9 @@ let options = {
   },
   yAxis: [
     {
-      max: 900,
-      min: 0,
-      interval: 100,
+      // max: 900,
+      // min: 0,
+      // interval: 100,
       axisLine: {
         lineStyle: {
           color: "#1C82C5",
@@ -91,16 +91,17 @@ let options = {
       },
     },
     {
-      max: 90,
-      min: 0,
-      interval: 10,
+      // max: 90,
+      // min: 60,
+      // interval: 10,
       axisLine: {
-        lineStyle: {
-          color: "#1C82C5",
-        },
+        show: false,
+        // lineStyle: {
+        //   color: "#1C82C5",
+        // },
       },
       splitLine: {
-        show: true,
+        show: false,
         lineStyle: {
           color: "#2A6278",
           type: "solid",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
index 157adb35..c2cb0821 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
@@ -3,13 +3,13 @@ let lc = [450, 500, 250, 340, 450, 500];
 let lc2 = [400, 550, 200, 140, 400, 550];
 let options = {
   tooltip: {
-    show: false,
+    show: true,
     trigger: "axis",
-    backgroundColor: "rgba(17,95,182,0.5)", //设置背景颜色
+    // backgroundColor: "rgba(17,95,182,0.5)", //设置背景颜色
     textStyle: {
-      color: "#fff",
+      // color: "#fff",
+      fontSize: 10,
     },
-    fontSize: 12,
     // formatter: "{b}：{c}人",
   },
   grid: {
@@ -22,7 +22,7 @@ let options = {
   xAxis: {
     type: "category",
     boundaryGap: true,
-    data: [],
+    data: zData,
     axisLabel: {
       interval: 0,
       textStyle: {
@@ -48,16 +48,12 @@ let options = {
   yAxis: [
     {
       type: "value",
-      // splitNumber: 6,
       name: "(起)     ",
       nameTextStyle: {
         color: "#E5E7E8",
         left: 10,
         fomtSize: 10,
       },
-      min: 0,
-      max: 900,
-      interval: 100,
       axisLabel: {
         show: true,
         textStyle: {
@@ -80,21 +76,17 @@ let options = {
     },
     {
       type: "value",
-      // splitNumber: 6,
       name: "    (分钟)",
       nameTextStyle: {
         color: "#E5E7E8",
         fomtSize: 10,
       },
-      min: 0,
-      max: 90,
-      interval: 10,
       axisLabel: {
         show: true,
         textStyle: {
           color: "#fff",
           fontSize: 10,
-          formatter: "{value} °C",
+          // formatter: "{value} °C",
         },
       },
       // axisLine: {
@@ -104,7 +96,7 @@ let options = {
       //   show: false,
       // },
       splitLine: {
-        show: true,
+        show: false,
         lineStyle: {
           color: "#2A6278",
         },
@@ -155,16 +147,16 @@ let options = {
       name: "事件数量",
       type: "pictorialBar",
       stack: "数量",
-      label: {
-        normal: {
-          show: false,
-          position: "top",
-          textStyle: {
-            color: "#FFFFFF",
-            fontSize: 16,
-          },
-        },
-      },
+      // label: {
+      //   normal: {
+      //     show: false,
+      //     position: "top",
+      //     textStyle: {
+      //       color: "#FFFFFF",
+      //       fontSize: 16,
+      //     },
+      //   },
+      // },
       itemStyle: {
         normal: {
           color: {
@@ -189,7 +181,7 @@ let options = {
       },
       symbol:
         "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
-      data: [],
+      data: lc,
     },
     {
       name: "去年同期数量",
@@ -197,16 +189,16 @@ let options = {
       stack: "else",
       barGap: "10%",
       boundaryGap: "100%",
-      label: {
-        normal: {
-          show: false,
-          position: "top",
-          textStyle: {
-            color: "#FFFFFF",
-            fontSize: 16,
-          },
-        },
-      },
+      // label: {
+      //   normal: {
+      //     show: false,
+      //     position: "top",
+      //     textStyle: {
+      //       color: "#FFFFFF",
+      //       fontSize: 16,
+      //     },
+      //   },
+      // },
       itemStyle: {
         normal: {
           color: {
@@ -231,18 +223,19 @@ let options = {
       },
       symbol:
         "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
-      data: [],
+      data: lc2,
     },
     {
       name: "平均处置时长",
       yAxisIndex: 1,
-      data: [],
+      data: lc2,
       type: "line",
       symbol: "none",
       symbolSize: 20,
       smooth: true,
+      color: "#E2BA74",
       lineStyle: {
-        color: "#FB6D07",
+        color: "#E2BA74",
         width: 1,
         type: "dashed",
         // dashOffset:50
@@ -251,13 +244,14 @@ let options = {
     {
       name: "去年同期平均处置时长",
       yAxisIndex: 1,
-      data: [],
+      data: lc,
       type: "line",
       symbol: "none",
       symbolSize: 20,
       smooth: true,
+      color: "#FB6D07",
       lineStyle: {
-        color: "#E2BA74",
+        color: "#FB6D07",
         width: 1,
         type: "dashed",
         // dashOffset:50
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
index a7ddfb83..ed1b34c5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
@@ -1,5 +1,5 @@
-// const sxnja = [400, 400, 400];
-// const sxnja2 = [700, 700, 700];
+const sxnja = [400, 400, 400];
+const sxnja2 = [700, 700, 700];
 
 // const minNumber = 90;
 // const minArray = [];
@@ -22,10 +22,15 @@ var options = {
     },
   },
   tooltip: {
-    valueFormatter: function (value) {
-      return value;
-      // return (value + minNumber).toFixed(2) + " %";
+    show: true,
+    textStyle: {
+      // color: "#fff",
+      fontSize: 10,
     },
+    // valueFormatter: function (value) {
+    //   return value;
+    //   // return (value + minNumber).toFixed(2) + " %";
+    // },
   },
   legend: {
     // orient: 'vertical',
@@ -68,11 +73,6 @@ var options = {
   yAxis: [
     {
       type: "value",
-      min: 0,
-      max: 900,
-      interval: 100,
-      splitNumber: 9,
-      // max: yAxisMax,
       axisLine: {
         show: false,
         lineStyle: {
@@ -101,21 +101,12 @@ var options = {
       },
     },
     {
-      // type: 'value',
-      // min: function (value) {
-      //   return value.min*0.9;
-      // },
       type: "value",
-      min: 0,
-      max: 90,
-      interval: 10,
-      splitNumber: 9,
-      // max: yAxisMax,
       axisLine: {
         show: false,
       },
       splitLine: {
-        show: true,
+        show: false,
         lineStyle: {
           color: "#2A6278",
           opacity: 0.3,
@@ -138,7 +129,7 @@ var options = {
   series: [
     {
       name: "事件数量（起）",
-      data: [],
+      data: sxnja2,
       type: "pictorialBar",
       symbol: "roundRect",
       symbolRepeat: true,
@@ -153,7 +144,7 @@ var options = {
       barGap: "10%",
       name: "平均处置时长（分钟）",
       yAxisIndex: 1,
-      data: [],
+      data: sxnja,
       type: "pictorialBar",
       symbol: "roundRect",
       symbolRepeat: true,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
index a9d7fb67..0e86d8aa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class='congestion'>
-      <WgtTitle :title="'交通指标分析'" ></WgtTitle>
-      <div class="board">
-        <!-- <div class="searchPanel">
+  <div class='congestion'>
+    <WgtTitle :title="'交通指标分析'"></WgtTitle>
+    <div class="board">
+      <!-- <div class="searchPanel">
           <el-select v-model="area" size="mini" class="selectRoad" placeholder="请选择">
             <el-option
               v-for="item in areaOptions"
@@ -33,398 +33,432 @@
           <el-button type="primary" size="mini" class="btnSearch"  icon="el-icon-search">查询</el-button>
           <el-button class="btnReset"  size="mini" icon="el-icon-refresh-left" >重置</el-button>
         </div> -->
-        <ProgressBar  :dataList="dataList"  class="keep-ratio progressbar" :selectIndex="7" />
-        <div class="body" >
-          <div  style="width:70%" >
-            <div class="searchPanel_1" >
+      <ProgressBar :dataList="dataList" class="keep-ratio progressbar" :selectIndex="7" />
+      <div class="body">
+        <div style="width:70%">
+          <div class="searchPanel_1">
+            <!-- <el-from ref="form"> -->
+            <RadioGroup :options="[{ key: '1', label: '菏泽' }, { key: '3', label: '济南' }]" v-model="direction"
+              type="button" />
+            <el-select v-model="type" size="mini" class="selectRoad" placeholder="请选择">
+              <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select v-model="quarter" size="medium" v-if="type == '3'" class="selectRoad-medium" placeholder="请选择">
+              <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+            <!-- <el-quarter-picker size="mini" class="selectRoad" style="width:180px;" v-if="type == '3'" v-model="dateTime"
+            aria-placeholder="请选季度" /> -->
+            <el-date-picker size="mini" v-if="type != '3'" class="selectRoad" v-model="dateTime" style="width:140px;"
+              :type="type == 1 ? 'date' : type == 2 ? 'month' : type == 4 ? 'year' : ''" placeholder="请选择" />
+
+
+            <el-button type="primary" size="mini" class="btnSearch" @click="searchQuery"
+              icon="el-icon-search">查询</el-button>
+            <el-button class="btnReset" size="mini" icon="el-icon-refresh-left" @click="handleClear">重置</el-button>
+            <!-- </el-from> -->
+
+          </div>
+          <!-- <div class="searchPanel_1">
             <el-select v-model="area" size="mini" class="selectRoad" placeholder="请选择">
-            <el-option
-              v-for="item in areaOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-          <el-select v-model="year" size="mini" class="selectRoad" placeholder="请选择">
-            <el-option
-              v-for="item in yearOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-          <el-date-picker
-          size="mini"
-          v-if="year != 'quarter'"
-          class="selectRoad"
-            v-model="dateTime"
-            style="width:140px;"
-            :type="year"
-            placeholder="请选择"
-        />
-        <el-quarter-picker  size="mini" class="selectRoad" style="width:180px;" v-if="year == 'quarter'" v-model="quarter" aria-placeholder="请选季度" />
+              <el-option v-for="item in areaOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select v-model="year" size="mini" class="selectRoad" placeholder="请选择">
+              <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+            <el-date-picker size="mini" v-if="year != 'quarter'" class="selectRoad" v-model="dateTime"
+              style="width:140px;" :type="year" placeholder="请选择" />
+            <el-quarter-picker size="mini" class="selectRoad" style="width:180px;" v-if="year == 'quarter'"
+              v-model="quarter" aria-placeholder="请选季度" />
 
-          <el-button type="primary" size="mini" class="btnSearch"  icon="el-icon-search">查询</el-button>
-          <el-button class="btnReset"  size="mini" icon="el-icon-refresh-left" >重置</el-button>
+            <el-button type="primary" size="mini" class="btnSearch" icon="el-icon-search">查询</el-button>
+            <el-button class="btnReset" size="mini" icon="el-icon-refresh-left">重置</el-button>
+          </div> -->
+          <div id="chart1" class="keep-ratio"></div>
         </div>
-           <div  id="chart1" class="keep-ratio" ></div>
+        <div class="chartOrg">
+          <div class="itemChart">
+            <div class="title">上月指标</div>
+            <div id="chart2" class="keep-ratio"></div>
           </div>
-          <div  class="chartOrg" >
-              <div  class="itemChart"   >
-                <div  class="title">上月指标</div>
-                <div id="chart2" class="keep-ratio" ></div>
-              </div>
-              <div  class="itemChart"   >
-                <div  class="title">上月指标</div>
-                <div id="chart3" class="keep-ratio" ></div>
-              </div>
+          <div class="itemChart">
+            <div class="title">上月指标</div>
+            <div id="chart3" class="keep-ratio"></div>
           </div>
         </div>
-
-      </div>  
+      </div>
 
     </div>
-  </template>
-  
-  <script>
+
+  </div>
+</template>
   
-  import WgtTitle from '../../../../../widgets/title'
-  import ProgressBar from './progressBar.vue';
-  import * as echarts from "echarts";
-  import chart1 from "./assets/charts";
-  import chart2 from "./assets/charts2";
-  import chart3 from "./assets/charts3";
-  import ElQuarterPicker from './ElQuarterPicker'
-
-  const drawRoundRect = ( ctx, x, y, width, height, radius ,gr) => {   
+<script>
+import RadioGroup from '@screen/components/FormConfig/components/RadioGroup/index.vue';
+import WgtTitle from '../../../../../widgets/title'
+import ProgressBar from './progressBar.vue';
+import * as echarts from "echarts";
+import chart1 from "./assets/charts";
+import chart2 from "./assets/charts2";
+import chart3 from "./assets/charts3";
+import ElQuarterPicker from './ElQuarterPicker'
+
+const drawRoundRect = (ctx, x, y, width, height, radius, gr) => {
   // ctx, 矩形距离x坐标位置, 矩形距离y坐标的位置, 矩形的宽, 矩形的长,圆角角度 
-	ctx.beginPath();    
+  ctx.beginPath();
   ctx.fillStyle = gr;
-	ctx.arc(x + radius, y + radius, radius, Math.PI, Math.PI * 3 / 2);    
-	ctx.lineTo(width - radius + x, y);    
-	ctx.arc(width - radius + x, radius + y, radius, Math.PI * 3 / 2, Math.PI * 2);    
-	ctx.lineTo(width + x, height + y - radius);    
-	ctx.arc(width - radius + x, height - radius + y, radius, 0, Math.PI * 1 / 2);    
-	ctx.lineTo(radius + x, height +y);    
-	ctx.arc(radius + x, height - radius + y, radius, Math.PI * 1 / 2, Math.PI);    
-	ctx.closePath();    
+  ctx.arc(x + radius, y + radius, radius, Math.PI, Math.PI * 3 / 2);
+  ctx.lineTo(width - radius + x, y);
+  ctx.arc(width - radius + x, radius + y, radius, Math.PI * 3 / 2, Math.PI * 2);
+  ctx.lineTo(width + x, height + y - radius);
+  ctx.arc(width - radius + x, height - radius + y, radius, 0, Math.PI * 1 / 2);
+  ctx.lineTo(radius + x, height + y);
+  ctx.arc(radius + x, height - radius + y, radius, Math.PI * 1 / 2, Math.PI);
+  ctx.closePath();
   //ctx.stroke();
   ctx.fill()
 }
 
-  export default {
-    name: 'EventQuery',
-    components: {
-      WgtTitle,
-      ProgressBar,
-      ElQuarterPicker
-    },
-    data() {
-      return {
-        yearOptions:[
+export default {
+  name: 'EventQuery',
+  components: {
+    RadioGroup,
+    WgtTitle,
+    ProgressBar,
+    ElQuarterPicker
+  },
+  data() {
+    return {
+      direction: "1",
+      type: "1",
+      typeOptions: [
+        {
+          label: '年',
+          value: '4'
+        },
+        {
+          label: '月',
+          value: '2'
+        },
+        {
+          label: '日',
+          value: '1'
+        },
+        {
+          label: '季',
+          value: '3'
+        }
+      ],
+      quarter: '1',
+      quarterOptions: [
+        {
+          label: "第一季度",
+          value: "1"
+        },
         {
-            value: 'year',
-           label: '年'
-        },{
-            value: 'month',
-           label: '月'
+          label: "第二季度",
+          value: "2"
         },
         {
-            value: 'date',
-           label: '日'
+          label: "第三季度",
+          value: "3"
         },
         {
-            value: 'quarter',
-           label: '季'
-        },],
-        areaOptions: [{
-          value: '济南',
-          label: '济南'
-        }, {
-          value: '菏泽',
-          label: '菏泽'
-      }],
-      dateTime:"",
-      area: '济南',
-      dataList:[
+          label: "第四季度",
+          value: "4"
+        }
+      ],
+      dateTime: "2024-01-01 00:00:00",
+      dataList: [
         {
-          title:"殷家林枢纽"
+          title: "殷家林枢纽"
         },
         {
-          title:"大学城立交"
+          title: "大学城立交"
         },
         {
-          title:"长清立交"
+          title: "长清立交"
         },
         {
-          title:"松竹枢纽"
+          title: "松竹枢纽"
         },
         {
-          title:"孝里立交"
+          title: "孝里立交"
         },
         {
-          title:"平阴立交"
+          title: "平阴立交"
         },
         {
-          title:"孔村枢纽"
+          title: "孔村枢纽"
         },
         {
-          title:"平阴南立交"
+          title: "平阴南立交"
         },
         {
-          title:"魏雪枢纽"
+          title: "魏雪枢纽"
         },
         {
-          title:"东平立交"
+          title: "东平立交"
         },
         {
-          title:"东平湖枢纽"
+          title: "东平湖枢纽"
         },
         {
-          title:"韩岗立交"
+          title: "韩岗立交"
         },
         {
-          title:"梁山立交"
+          title: "梁山立交"
         },
         {
-          title:"鄄郓枢纽"
+          title: "鄄郓枢纽"
         },
         {
-          title:"嘉祥西立交"
+          title: "嘉祥西立交"
         },
         {
-          title:"王官屯枢纽"
+          title: "王官屯枢纽"
         }
       ],
-      quarter:"",
-      year:"",
-        list:[
-          {name:'大学城-长清', direction:'济南方向', state:"正常",speed:'108.14km/h', follow:'161'},
-          {name:'大学城-长清', direction:'济南方向', state:"正常",speed:'108.14km/h', follow:'161'},
-          {name:'大学城-长清', direction:'济南方向', state:"正常",speed:'108.14km/h', follow:'161'},
-          {name:'大学城-长清', direction:'济南方向', state:"正常",speed:'108.14km/h', follow:'161'},
-          {name:'大学城-长清', direction:'济南方向', state:"正常",speed:'108.14km/h', follow:'161'},
-          {name:'大学城-长清', direction:'济南方向', state:"正常",speed:'108.14km/h', follow:'161'}
-        ]
-      }
-    },
-  
-    created() {
-      
-    },
-    methods: {
-  
-    },
-    mounted() {
-      setTimeout(() => {
-        this.$nextTick(() => {
-            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(chart2);
-
-             
+      quarter: "",
+      year: "",
+      list: [
+        { name: '大学城-长清', direction: '济南方向', state: "正常", speed: '108.14km/h', follow: '161' },
+        { name: '大学城-长清', direction: '济南方向', state: "正常", speed: '108.14km/h', follow: '161' },
+        { name: '大学城-长清', direction: '济南方向', state: "正常", speed: '108.14km/h', follow: '161' },
+        { name: '大学城-长清', direction: '济南方向', state: "正常", speed: '108.14km/h', follow: '161' },
+        { name: '大学城-长清', direction: '济南方向', state: "正常", speed: '108.14km/h', follow: '161' },
+        { name: '大学城-长清', direction: '济南方向', state: "正常", speed: '108.14km/h', follow: '161' }
+      ]
+    }
+  },
+
+  created() {
+
+  },
+  methods: {
+
+  },
+  mounted() {
+    setTimeout(() => {
+      this.$nextTick(() => {
+        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(chart2);
+
+
         const domMap = document.getElementById("chart2");
-        let parentDiv = domMap.firstChild; 
+        let parentDiv = domMap.firstChild;
         // 创建canvas
         let canvas = document.createElement('canvas');
         canvas.width = parentDiv.offsetWidth;
-        canvas.height =parentDiv.offsetHeight;
+        canvas.height = parentDiv.offsetHeight;
         parentDiv.appendChild(canvas);
-        const context = canvas.getContext('2d'); 
-        
+        const context = canvas.getContext('2d');
+
         // 填充渐变颜色
         var gr = context.createLinearGradient(247, 63, 450, 0);
         // 颜色断点
         gr.addColorStop(1, 'rgba(92,197,255,0)');
         gr.addColorStop(0, 'rgba(92,197,255,0.5)');
-       
-      
+
+
         context.lineWidth = 1; // 设置线段宽度
-      
+
         // 绘制圆角矩形
-        drawRoundRect(context, 300, 78, 160, 24, 12,gr)
-         
+        drawRoundRect(context, 300, 78, 160, 24, 12, gr)
+
         var gr = context.createLinearGradient(240, 63, 450, 0);
         // 颜色断点
         gr.addColorStop(1, 'rgba(92,197,255,0)');
         gr.addColorStop(0, 'rgba(92,197,255,0.5)');
-        drawRoundRect(context, 300, 148, 160, 24, 12,gr)
-         
+        drawRoundRect(context, 300, 148, 160, 24, 12, gr)
+
         var gr = context.createLinearGradient(240, 63, 450, 0);
         // 颜色断点
         gr.addColorStop(1, 'rgba(92,197,255,0)');
         gr.addColorStop(0, 'rgba(92,197,255,0.5)');
-        drawRoundRect(context, 300, 218, 160, 24, 12,gr)
-        
+        drawRoundRect(context, 300, 218, 160, 24, 12, gr)
+
         var gr = context.createLinearGradient(400, 63, 450, 0);
         // 颜色断点
         gr.addColorStop(1, 'rgba(92,197,255,0)');
         gr.addColorStop(0, 'rgba(92,197,255,0.5)');
-        
 
-        drawRoundRect(context, 460, 78, 160, 24, 12,gr)
+
+        drawRoundRect(context, 460, 78, 160, 24, 12, gr)
         var gr = context.createLinearGradient(350, 63, 450, 0);
         // 颜色断点
         gr.addColorStop(1, 'rgba(92,197,255,0)');
         gr.addColorStop(0, 'rgba(92,197,255,0.5)');
-        drawRoundRect(context, 460, 148, 160, 24, 12,gr)
+        drawRoundRect(context, 460, 148, 160, 24, 12, gr)
         var gr = context.createLinearGradient(300, 63, 450, 0);
         // 颜色断点
         gr.addColorStop(1, 'rgba(92,197,255,0)');
         gr.addColorStop(0, 'rgba(92,197,255,0.5)');
-        drawRoundRect(context, 460, 218, 160, 24, 12,gr)
-        });
+        drawRoundRect(context, 460, 218, 160, 24, 12, gr)
       });
-    },
-  }
-  </script>
+    });
+  },
+}
+</script>
   
-  <style lang='scss' scoped>
-
+<style lang='scss' scoped>
 .progressbar {
-    margin:10px;
-              
- }
+  margin: 10px;
 
-  .congestion {
+}
+
+.congestion {
+  width: 100%;
+
+  .body {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    height: 395px;
     width: 100%;
-    .body {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        height: 395px;
-        width:100%;
-        font-size: 14px;
-
-     
-        
-        > div {
-            display: inline-flex;
-            flex-direction: column;
-            height:100%;
-            width:33%;
-            margin-right:20px;
-            border: 1px solid;
-             border-image: linear-gradient(360deg, rgba(55, 231, 255,0.1), rgba(55, 231, 255, 0)) 1 1;
-            background: linear-gradient(180deg, rgba(6,66,88,0) 0%, #064258 100%);
-            padding: 10px;
-        }
+    font-size: 14px;
 
-        .chartOrg {
-          flex-direction: row !important;
 
-          >div {
-            display: inline-flex;
-            flex-direction: column;
-            width:50%;
-            height:100%;
-          }
 
-          .itemChart {
-
-            >.title {
-              display: inline-flex;
-              width:100%;
-              height:30px;
-              font-size: 16px;
-              font-family: PingFang SC, PingFang SC;
-              font-weight: 500;
-              color: #30BFEC;
-            }
-
-            #chart2 {
-              display: inline-flex;
-              width:100%;
-              height:100%;
-            }
-
-            #chart3 {
-              display: inline-flex;
-              width:100%;
-              height:100%;
-            }
-          }
+    >div {
+      display: inline-flex;
+      flex-direction: column;
+      height: 100%;
+      width: 33%;
+      margin-right: 20px;
+      border: 1px solid;
+      border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.1), rgba(55, 231, 255, 0)) 1 1;
+      background: linear-gradient(180deg, rgba(6, 66, 88, 0) 0%, #064258 100%);
+      padding: 10px;
+    }
+
+    .chartOrg {
+      flex-direction: row !important;
+
+      >div {
+        display: inline-flex;
+        flex-direction: column;
+        width: 50%;
+        height: 100%;
+      }
+
+      .itemChart {
+
+        >.title {
+          display: inline-flex;
+          width: 100%;
+          height: 30px;
+          font-size: 16px;
+          font-family: PingFang SC, PingFang SC;
+          font-weight: 500;
+          color: #30BFEC;
         }
 
-        #chart1 {
+        #chart2 {
           display: inline-flex;
-            height:100%;
-            width:100%;
+          width: 100%;
+          height: 100%;
+        }
+
+        #chart3 {
+          display: inline-flex;
+          width: 100%;
+          height: 100%;
         }
       }
+    }
 
-    .board{
-      height:320px;
+    #chart1 {
+      display: inline-flex;
+      height: 100%;
       width: 100%;
-      padding:10px 0px;
-    
-      border-radius: 5px 5px 5px 5px;
-      opacity: 1;
-     
+    }
+  }
+
+  .board {
+    height: 320px;
+    width: 100%;
+    padding: 10px 0px;
+
+    border-radius: 5px 5px 5px 5px;
+    opacity: 1;
+
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-direction: column;
+
+
+    .searchPanel_1 {
+      position: absolute;
       display: flex;
-      justify-content: space-between;
       align-items: center;
-      flex-direction: column;
+      height: 40px;
+      width: 100%;
+      font-size: 14px;
+      margin-bottom: 10px;
+      z-index: 1000;
 
-  
-      .searchPanel_1{
-        position:absolute;
-        display: flex;
-        align-items: center;
-        height: 40px;
-        width:100%;
-        font-size: 14px;
-        margin-bottom: 10px;
-        z-index: 1000;
-        
-    div{
-      white-space: nowrap;
-      margin-right: 4px;
-    }
-    .inputZh{
-      width: 47px;
-      ::v-deep{
-        .el-input__inner{
-          background-color: #064258 !important;
-          border-width: 0px !important;
+      div {
+        white-space: nowrap;
+        margin-right: 4px;
+      }
+
+      .inputZh {
+        width: 47px;
+
+        ::v-deep {
+          .el-input__inner {
+            background-color: #064258 !important;
+            border-width: 0px !important;
+          }
         }
       }
-    }
-    .inputJl{
-      margin-left: 5px;
-      margin-right: 10px;
-    }
-    .selectRoad{
-      width:89px;
-      border:1px solid #00B3CC;
-      ::v-deep{
-        .el-input__inner{
-          background-color: #064258 !important;
-          border-width: 0px !important;
+
+      .inputJl {
+        margin-left: 5px;
+        margin-right: 10px;
+      }
+
+      .selectRoad {
+        width: 89px;
+        border: 1px solid #00B3CC;
+
+        ::v-deep {
+          .el-input__inner {
+            background-color: #064258 !important;
+            border-width: 0px !important;
+          }
         }
       }
-    }
-    .btnSearch{
-      background: linear-gradient(180deg, #005C79 0%, #009BCC 100%);
-      margin-left: 10px;
-      border-color: transparent;
-    }
-    .btnReset{
-      background: linear-gradient(180deg, #005C79 0%, #009BCC 100%);;
-      border-color: transparent;
-      color: white;
-    }
-   }
 
+      .btnSearch {
+        background: linear-gradient(180deg, #005C79 0%, #009BCC 100%);
+        margin-left: 10px;
+        border-color: transparent;
+      }
+
+      .btnReset {
+        background: linear-gradient(180deg, #005C79 0%, #009BCC 100%);
+        ;
+        border-color: transparent;
+        color: white;
+      }
     }
+
   }
-      .charts {
-        height:100px;
-        width: 100%;
-      }
-  
-  </style>
+}
+
+.charts {
+  height: 100px;
+  width: 100%;
+}
+</style>
   
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
index 326da612..02407bd0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
+++ b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
@@ -167,6 +167,14 @@ div.el-date-editor {
 div.el-popover:has(> .el-date-picker),
 div.el-picker-panel.el-date-picker.el-popper,
 div.el-picker-panel.el-date-range-picker.el-popper {
+  .disabled{
+    div{
+      span{
+        color: #5E8998!important;
+      }background: #1B586D;
+    }
+    
+  }
   .next-month,
   .prev-month {
     span {

From 3574ecb4180bb445a6487821d87111e1e5cec07d Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Tue, 6 Feb 2024 17:07:09 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/pages/service/sensitive/index.vue   | 10 +++++-----
 ruoyi-ui/vue.config.js                                 |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

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 8632fc7a..505e8bd5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
@@ -86,7 +86,7 @@ export default {
           label: "关键词"
         },
         {
-          key: "location",
+          key: "id",
           label: "id"
         },
         {
@@ -118,14 +118,14 @@ export default {
       await confirm({ message: "是否要删除该辖段信息?" });
 
       request({
-        url: `/business/roadSection/${data.id}`,
+        url: `/business/dcInfoBoardVocabulary/${data.id}`,
         method: "DELETE",
         data: {}
       })
         .then(result => {
           if (result.code != 200) return Message.error("删除失败");
-
           Message.success("删除成功")
+          this.getData();
         })
         .catch(() => {
           Message.error("删除失败")
@@ -137,7 +137,7 @@ export default {
     },
     handleExport() {
       exportFile({
-        url: "/business/roadSection/export",
+        url: "/business/dcInfoBoardVocabulary/export",
         filename: "管辖路段",
         data: this.getSearchData()
       });
@@ -191,7 +191,7 @@ export default {
 
   .body {
     height: 0; flex: 1; overflow-y: scroll;
-    display: flex; flex-wrap: wrap; align-items: flex-start;
+    display: flex; flex-wrap: wrap; align-content: flex-start;
     .cardBox{
       flex-basis: percentage(1/7); width: 0; padding-right: 10px; padding-bottom: 10px;
     }
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 7b307e3c..435592ca 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -49,9 +49,9 @@ module.exports = {
         // target: `http://10.0.81.202:8087`, //现场后台
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
-        target: `http://10.168.78.135: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.68.42:8087`, //王思祥
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From 4b0730b835e44fabf3891a65eb95bde8b97ac43c Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Tue, 6 Feb 2024 17:16:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../channelAnalytics/assets/charts.js         |  10 +-
 .../components/channelAnalytics/index.vue     |   1 +
 .../eventTypeAnalysis/assets/charts.js        |   8 +
 .../components/dayTotal/assets/charts.js      | 207 ++++++++--------
 .../components/eventQuery/index.vue           |   1 +
 .../components/railwayDay/assets/charts.js    | 224 ++++++++++--------
 6 files changed, 245 insertions(+), 206 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js
index ea9dad7b..73dcbcf2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js
@@ -128,6 +128,7 @@ var options = {
     },
     {
       name: "总数",
+      tooltip: false,
       type: "gauge",
       radius: "30%",
       center: ["50%", "35%"],
@@ -185,7 +186,14 @@ var options = {
           value: 100,
         },
       ],
-      // tooltip: false,
+      tooltip: {
+        backgroundColor: "rgba(50,50,50,0)",
+        formatter: " ",
+        borderWidth: 0,
+        textStyle: {
+          textShadowColor: "rgba(50,50,50,0)",
+        },
+      },
     },
     {
       type: "pie",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/index.vue
index 691b709a..c328c6bb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/index.vue
@@ -63,6 +63,7 @@ export default {
         };
         chartsStatistics.legend.data = nameData;
         chartsStatistics.title[0].text = total;
+        // chartsStatistics.tooltip.show = false;
         // chartsStatistics.series[1].data[0].value = total;
         chartsStatistics.series[2].data = data;
       })
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js
index 2ba09d97..ea705ef2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js
@@ -154,6 +154,14 @@ var options = {
           width: 1,
         },
       },
+      tooltip: {
+        backgroundColor: "rgba(50,50,50,0)",
+        formatter: " ",
+        borderWidth: 0,
+        textStyle: {
+          textShadowColor: "rgba(50,50,50,0)",
+        },
+      },
       axisTick: {
         show: false,
       },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/assets/charts.js
index f458cd48..338b0b67 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/assets/charts.js
@@ -1,108 +1,107 @@
 const sxnja = [
-   293.67, 493.44, 694.34, 894.5, 697.82, 895.09, 495.79, 497.49, 393.72, 293.52
- ];
- const minNumber = 0;
- const minArray = [];
- sxnja.map((value) => {
-   minArray.push(parseFloat((value - minNumber).toFixed(2)))
- })
- console.log(minArray)
- let xaxisData = [
- ];
- 
- var options = {
-   title: {
+  293.67, 493.44, 694.34, 894.5, 697.82, 895.09, 495.79, 497.49, 393.72, 293.52,
+];
+const minNumber = 0;
+const minArray = [];
+sxnja.map((value) => {
+  minArray.push(parseFloat((value - minNumber).toFixed(2)));
+});
+console.log(minArray);
+let xaxisData = [];
+
+var options = {
+  title: {
     //  text: '单位/%',
-     top: '0%',
-     left: '0%',
-     textStyle: {
-       fontSize: '10px',
-       fontWeight: 300,
-       color: '#B5C5D4',
-       opacity: 0.8
-     }
-   },
-   tooltip: {
-     valueFormatter: function (value) {
-       return (value + minNumber).toFixed(2);
-     }
-   },
-   grid: {
-     left: '1%',
-     right: '0%',
-     top: '16%',
-     bottom: '5%',
-     containLabel: true
-   },
-   xAxis: {
-     type: 'category',
-     data: xaxisData,
-     axisLine: {
-       show: true,
-       lineStyle: {
-         width: 1,
-         color: '#545454'
-       }
-     },
-     axisTick: {
-       show: false
-     },
-     axisLabel: {
-       color: '#B5C5D4',
-       fontSize: '10px',
-       interval: 0
-     }
-   },
-   yAxis: [
-     {
-       // type: 'value',
-       // min: function (value) {
-       //   return value.min*0.9;
-       // },
-       type: 'value',
-       // max: yAxisMax,
-       axisLine: {
-         show: false,
-         lineStyle: {
-           width: 1,
-           color: '#545454'
-         }
-       },
-       splitLine: {
-         show: true,
-         lineStyle: {
-           color: '#B2C2D3',
-           opacity: 0.3,
-           type: 'dotted'
-         }
-       },
-       axisTick: {
-         show: false
-       },
-       axisLabel: {
-         color: '#B5C5D4',
-         fontSize: '12px',
-         formatter: (value) => {
-           return value + minNumber
-         }
-       }
-     }
-   ],
-   series: [
-     {
+    top: "0%",
+    left: "0%",
+    textStyle: {
+      fontSize: "10px",
+      fontWeight: 300,
+      color: "#B5C5D4",
+      opacity: 0.8,
+    },
+  },
+  tooltip: {
+    valueFormatter: function (value) {
+      return value + minNumber;
+    },
+  },
+  grid: {
+    left: "1%",
+    right: "0%",
+    top: "16%",
+    bottom: "5%",
+    containLabel: true,
+  },
+  xAxis: {
+    type: "category",
+    data: xaxisData,
+    axisLine: {
+      show: true,
+      lineStyle: {
+        width: 1,
+        color: "#545454",
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: "#B5C5D4",
+      fontSize: "10px",
+      interval: 0,
+    },
+  },
+  yAxis: [
+    {
+      // type: 'value',
+      // min: function (value) {
+      //   return value.min*0.9;
+      // },
+      type: "value",
+      // max: yAxisMax,
+      axisLine: {
+        show: false,
+        lineStyle: {
+          width: 1,
+          color: "#545454",
+        },
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: "#B2C2D3",
+          opacity: 0.3,
+          type: "dotted",
+        },
+      },
+      axisTick: {
+        show: false,
+      },
+      axisLabel: {
+        color: "#B5C5D4",
+        fontSize: "12px",
+        formatter: (value) => {
+          return value + minNumber;
+        },
+      },
+    },
+  ],
+  series: [
+    {
       //  name: '审限内结案率',
-       data: minArray,
-       type: 'pictorialBar',
-       symbol: 'roundRect',
-       symbolRepeat: true,
-       symbolSize: [13, 4],
-       // symbolOffset: symbolOffset,
-       // barWidth:'40%',
-       itemStyle: {
-         color: '#20E7FF'
-       }
-     }
-   ]
- };
+      data: minArray,
+      type: "pictorialBar",
+      symbol: "roundRect",
+      symbolRepeat: true,
+      symbolSize: [13, 4],
+      // symbolOffset: symbolOffset,
+      // barWidth:'40%',
+      itemStyle: {
+        color: "#20E7FF",
+      },
+    },
+  ],
+};
 
- export default options;
\ No newline at end of file
+export default options;
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 c7fe9881..e90bdd18 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
@@ -171,6 +171,7 @@ export default {
   methods: {
     selectProgress(item, index) {
       this.selectId = index;
+      this.searchQuery()
     },
     onReset() {
       this.area = '1';
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js
index 95ace8f2..d7f83e96 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js
@@ -1,133 +1,155 @@
-
 /* 数据 */
-let nameList = ["大学城", "长清", "孝里", "安城", "平阴北", "平阴南", "东平", "梁山东", "嘉祥西"]; // 类别
+let nameList = [
+  "大学城",
+  "长清",
+  "孝里",
+  "安城",
+  "平阴北",
+  "平阴南",
+  "东平",
+  "梁山东",
+  "嘉祥西",
+]; // 类别
 let valueList = [800, 520, 650, 950, 420, 600, 450, 720, 303]; // 人数
 // var yList = [ "1000","800","轻度拥堵","基本畅通","畅通"]
 /* 数据整合 */
 const minNumber = 0;
 let dataList = [];
 nameList.map((item, index) => {
-   if (index === 3) {
-      dataList.push({
-         name: item,
-         value: valueList[index],
-         itemStyle: {
-            color: {
-               type: 'linear',
-               x: 0,
-               y: 0,
-               x2: 0,
-               y2: 1,
-               colorStops: [{
-                  offset: 0, color: '#0469FF' // 0% 处的颜色
-               }, {
-                  offset: 1, color: '#699CFF' // 100% 处的颜色
-               }],
-               global: false // 缺省为 false
+  if (index === 3) {
+    dataList.push({
+      name: item,
+      value: valueList[index],
+      itemStyle: {
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            {
+              offset: 0,
+              color: "#0469FF", // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: "#699CFF", // 100% 处的颜色
             },
-            borderRadius: 6
-         },
-         label: { show: false }
-      })
-   } else {
-      dataList.push({
-         name: item,
-         value: valueList[index],
-         itemStyle: {
-            borderRadius: 6
-         }
-      })
-   }
-})
+          ],
+          global: false, // 缺省为 false
+        },
+        borderRadius: 6,
+      },
+      label: { show: false },
+    });
+  } else {
+    dataList.push({
+      name: item,
+      value: valueList[index],
+      itemStyle: {
+        borderRadius: 6,
+      },
+    });
+  }
+});
 
 var options = {
-   grid: {
-      top: '5%',//上边距
-      right: '0',//右边距
-      left: '0',//左边距
-      bottom: "0%",//下边距
-      containLabel: true,
-   },
-   tooltip: {
-      valueFormatter: function (value) {
-        return (value + minNumber).toFixed(2);
-      }
+  grid: {
+    top: "5%", //上边距
+    right: "0", //右边距
+    left: "0", //左边距
+    bottom: "0%", //下边距
+    containLabel: true,
+  },
+  tooltip: {
+    valueFormatter: function (value) {
+      return value + minNumber;
     },
-   xAxis: {
-      type: 'category',
-      data: nameList,
-      axisTick: {
-         show: false //隐藏X轴刻度
-      },
-      axisLine: {
-         lineStyle: {
-            color: "rgba(49, 217, 255, 0.8)"
-         }
-      },
-      axisLabel: {
-         show: true,
-         color: '#B6E6FF',
-         fontSize: 8,
-         fontFamily: 'Source Han Sans CN-Regular',
+  },
+  xAxis: {
+    type: "category",
+    data: nameList,
+    axisTick: {
+      show: false, //隐藏X轴刻度
+    },
+    axisLine: {
+      lineStyle: {
+        color: "rgba(49, 217, 255, 0.8)",
       },
-   },
-   yAxis: [{
-      type: 'value',
+    },
+    axisLabel: {
+      show: true,
+      color: "#B6E6FF",
+      fontSize: 8,
+      fontFamily: "Source Han Sans CN-Regular",
+    },
+  },
+  yAxis: [
+    {
+      type: "value",
       name: "",
 
       nameTextStyle: {
-         color: '#B6E6FF',
-         fontSize: 13,
-         fontFamily: 'Source Han Sans CN-Regular',
-         align: "left",
-         verticalAlign: "center",
+        color: "#B6E6FF",
+        fontSize: 13,
+        fontFamily: "Source Han Sans CN-Regular",
+        align: "left",
+        verticalAlign: "center",
       },
       axisLabel: {
-         fontSize: 13,
-         color: '#B6E6FF',
-         fontFamily: 'HarmonyOS Sans-Regular',
-         // formatter:function(value,index){
-         //    return yList[index]
-         // }
+        fontSize: 13,
+        color: "#B6E6FF",
+        fontFamily: "HarmonyOS Sans-Regular",
+        // formatter:function(value,index){
+        //    return yList[index]
+        // }
       },
       axisLine: {
-         show: false,
+        show: false,
       },
       axisTick: {
-         show: false
+        show: false,
       },
       splitLine: {
-         lineStyle: {
-            color: 'rgba(49, 217, 255, 0.5)',
-         }
+        lineStyle: {
+          color: "rgba(49, 217, 255, 0.5)",
+        },
       },
-   }],
-   series: [{
-      type: 'bar',
+    },
+  ],
+  series: [
+    {
+      type: "bar",
       data: dataList,
       z: 4,
       itemStyle: {
-         color: {
-            type: 'linear',
-            x: 0,
-            y: 0,
-            x2: 0,
-            y2: 1,
-            colorStops: [{
-               offset: 0, color: '#0BA7DA' // 0% 处的颜色
-            }, {
-               offset: 1, color: '#61D8FF' // 100% 处的颜色
-            }],
-            global: false // 缺省为 false
-         },
-         borderRadius: [4, 4, 0, 0]
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            {
+              offset: 0,
+              color: "#0BA7DA", // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: "#61D8FF", // 100% 处的颜色
+            },
+          ],
+          global: false, // 缺省为 false
+        },
+        borderRadius: [4, 4, 0, 0],
       },
       barWidth: 10,
       label: {
-         show: false,
-      }
-   },
-   ]
-}
+        show: false,
+      },
+    },
+  ],
+};
 
 export default options;