From 4cf4a1c88e84a2b9577ffa1fda4e1127382df3a5 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Mon, 26 Feb 2024 11:19:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9from=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/InputSearch/index copy.vue     | 192 ++++++++++++++++
 .../components/InputSearch/index.vue          |  78 ++++---
 .../components/postTrendsDay/assets/charts.js |   5 +-
 .../postTrendsMonth/assets/charts2.js         |   4 +-
 .../postTrendsMonth/assets/charts3.js         |   1 +
 .../components/dayTotal/assets/charts.js      |  53 +++--
 .../components/eventQuery/assets/charts.js    |   3 +-
 .../components/eventQuery/assets/charts3.js   |   3 +-
 .../monthStatistics/assets/charts.js          |  15 +-
 .../components/railway/assets/charts.js       | 212 +++++++++---------
 .../components/railwayDay/assets/charts.js    |  26 +--
 11 files changed, 409 insertions(+), 183 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index copy.vue

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index copy.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index copy.vue
new file mode 100644
index 00000000..4bf9d6b3
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index copy.vue	
@@ -0,0 +1,192 @@
+<template>
+  <div class="from-content" style="width: 100%">
+    <div class="InputSearch input" v-if="params && types == 'input'">
+      <ElInput
+        style="width: 100%"
+        v-model="value"
+        :placeholder="placeholder"
+        @change="handleSearch"
+      ></ElInput>
+      <img src="./search.svg" @click="handleFormShow" />
+    </div>
+    <ElPopover
+      v-else
+      ref="PopoverRef"
+      placement="bottom"
+      popper-class="global-input-search-popover"
+      :popperOptions="popperOptions"
+      :visibleArrow="false"
+      :width="this.width"
+      trigger="click"
+      @show="handleShow"
+      style="width: 100%"
+    >
+      <div class="InputSearch" slot="reference" ref="ReferenceInputRef">
+        <span>{{ placeholder }}</span>
+        <img src="./search.svg" @click="handleFormShow" />
+      </div>
+
+      <div style="width: 100%; max-height: 360px">
+        <slot>
+          <Form
+            v-if="formList && formList.length"
+            class="form"
+            ref="FormConfigRef"
+            :formList="formList"
+            v-bind="getFormConfigOptions"
+          />
+          <!-- <ElEmpty v-else description="暂无搜索内容"></ElEmpty> -->
+          <div v-else class="no-data">暂无数据</div>
+        </slot>
+
+        <div class="footer">
+          <Button
+            style="background-color: rgba(0, 179, 204, 0.3)"
+            @click.native="handleResetForm"
+          >
+            重置
+          </Button>
+          <Button @click.native="handleSearch"> 搜索 </Button>
+        </div>
+      </div>
+    </ElPopover>
+  </div>
+</template>
+
+<script>
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+import { cloneDeep } from "lodash";
+
+export default {
+  name: "InputSearch",
+  components: {
+    Button,
+    Form,
+  },
+  props: {
+    type: {
+      type: String,
+      default: "form",
+    },
+    placeholder: {
+      type: String,
+      default: "请点击右侧图标筛选",
+    },
+    valueData: {
+      type: String,
+    },
+    params: {
+      type: String,
+    },
+    queryParams: {
+      type: Array,
+    },
+    formConfigOptions: {
+      type: Object,
+      default: null,
+    },
+    formList: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      types: this.type,
+      value: this.valueData,
+      width: null,
+      popperOptions: {
+        popHideCallBack: () => {
+          // console.log("---")
+        },
+      },
+    };
+  },
+  emit: ["handleSearch"],
+  computed: {
+    getFormConfigOptions() {
+      return {
+        column: "1",
+        labelWidth: "120px",
+        ...this.formConfigOptions,
+      };
+    },
+  },
+  methods: {
+    handleFormShow() {
+      console.log(this.params, this.types);
+      if (this.params) {
+        if (this.types == "form") {
+          this.types = "input";
+        } else {
+          this.types = "form";
+        }
+      } else {
+        this.types = "form";
+      }
+      console.log(this.params, this.types);
+    },
+    handleShow() {
+      if (this.width) return;
+
+      this.width = this.$refs.ReferenceInputRef.getBoundingClientRect().width;
+    },
+    handleResetForm() {
+      this.$refs.FormConfigRef?.reset();
+
+      this.$refs.PopoverRef.doClose();
+
+      this.$emit("handleSearch", cloneDeep(this.$refs.FormConfigRef?.formData));
+    },
+    handleSearch() {
+      if (this.types == "form") {
+        this.$refs.FormConfigRef.validate()
+          .then((result) => {
+            this.$refs.PopoverRef.doClose();
+            this.$emit("handleSearch", result);
+          })
+          .catch((err) => {
+            console.log("catch");
+          });
+      } else {
+        let params = {};
+        params[this.params] = this.value;
+        this.$emit("handleSearch", params);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.InputSearch {
+  width: 100%;
+  height: 26px;
+  background: linear-gradient(180deg, #005c79 0%, #009bcc 100%) !important;
+  color: #fff;
+  border-radius: 2px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 3px 15px;
+  padding-right: 9px;
+  cursor: pointer;
+
+  font-size: 12px;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 14px;
+}
+.input ::v-deep .el-input__inner {
+  background: none;
+  height: auto !important;
+  font-size: 12px;
+  padding: 0px 0;
+  line-height: 14px;
+}
+::v-deep .el-input__inner::placeholder {
+  font-size: 12px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
index 4bf9d6b3..1f70c877 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
@@ -1,32 +1,42 @@
 <template>
   <div class="from-content" style="width: 100%">
-    <div class="InputSearch input" v-if="params && types == 'input'">
-      <ElInput
-        style="width: 100%"
-        v-model="value"
-        :placeholder="placeholder"
-        @change="handleSearch"
-      ></ElInput>
-      <img src="./search.svg" @click="handleFormShow" />
-    </div>
     <ElPopover
-      v-else
       ref="PopoverRef"
       placement="bottom"
       popper-class="global-input-search-popover"
       :popperOptions="popperOptions"
-      :visibleArrow="false"
       :width="this.width"
-      trigger="click"
+      trigger="manual"
+      v-model="visible"
       @show="handleShow"
       style="width: 100%"
     >
-      <div class="InputSearch" slot="reference" ref="ReferenceInputRef">
+      <div
+        class="InputSearch input"
+        v-if="params && types == 'input'"
+        slot="reference"
+        ref="ReferenceInputRef"
+      >
+        <ElInput
+          style="width: 100%"
+          v-model="value"
+          :placeholder="placeholder"
+          @change="handleSearch"
+        ></ElInput>
+        <img src="./search.svg" @click="visible = !visible" />
+      </div>
+      <div
+        class="InputSearch"
+        v-else
+        slot="reference"
+        ref="ReferenceInputRef"
+        @click="visible = !visible"
+      >
         <span>{{ placeholder }}</span>
-        <img src="./search.svg" @click="handleFormShow" />
+        <img src="./search.svg" />
       </div>
 
-      <div style="width: 100%; max-height: 360px">
+      <div style="width: 100%; max-height: 360px" v-show="visible">
         <slot>
           <Form
             v-if="formList && formList.length"
@@ -93,6 +103,7 @@ export default {
   },
   data() {
     return {
+      visible: false,
       types: this.type,
       value: this.valueData,
       width: null,
@@ -113,20 +124,8 @@ export default {
       };
     },
   },
+
   methods: {
-    handleFormShow() {
-      console.log(this.params, this.types);
-      if (this.params) {
-        if (this.types == "form") {
-          this.types = "input";
-        } else {
-          this.types = "form";
-        }
-      } else {
-        this.types = "form";
-      }
-      console.log(this.params, this.types);
-    },
     handleShow() {
       if (this.width) return;
 
@@ -139,8 +138,23 @@ export default {
 
       this.$emit("handleSearch", cloneDeep(this.$refs.FormConfigRef?.formData));
     },
-    handleSearch() {
-      if (this.types == "form") {
+    async handleSearch() {
+      if (this.types === "input") {
+        let params = {};
+        params[this.params] = this.value;
+        let result = {};
+
+        await this.$refs.FormConfigRef.validate()
+          .then((res) => {
+            result = res;
+            this.$refs.PopoverRef.doClose();
+          })
+          .catch((err) => {
+            console.log("catch");
+          });
+        let resultParams = { ...result, ...params };
+        this.$emit("handleSearch", resultParams);
+      } else {
         this.$refs.FormConfigRef.validate()
           .then((result) => {
             this.$refs.PopoverRef.doClose();
@@ -149,10 +163,6 @@ export default {
           .catch((err) => {
             console.log("catch");
           });
-      } else {
-        let params = {};
-        params[this.params] = this.value;
-        this.$emit("handleSearch", params);
       }
     },
   },
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 5ccc5558..bf55ef05 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
@@ -24,7 +24,7 @@ var options = {
   grid: {
     top: "15%", //上边距
     right: "0", //右边距
-    left: "1px", //左边距
+    left: "10px", //左边距
     bottom: "10%", //下边距
     containLabel: true,
   },
@@ -49,10 +49,11 @@ var options = {
   yAxis: [
     {
       type: "value",
-      name: "(起)       ",
+      name: "（起）",
       nameTextStyle: {
         color: "#E5E7E8",
         fomtSize: 10,
+        align: "right",
       },
       // splitNumber: 5,
       // nameTextStyle: {
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 c2cb0821..941d01c6 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
@@ -48,10 +48,10 @@ let options = {
   yAxis: [
     {
       type: "value",
-      name: "(起)     ",
+      name: "（起）",
       nameTextStyle: {
         color: "#E5E7E8",
-        left: 10,
+        align: "right",
         fomtSize: 10,
       },
       axisLabel: {
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 ed1b34c5..dc31896c 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
@@ -138,6 +138,7 @@ var options = {
       // barWidth:'40%',
       itemStyle: {
         color: "#51BFA4",
+        align: "right",
       },
     },
     {
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 338b0b67..edffb3de 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,5 +1,17 @@
+/* 数据 */
+let nameList = [
+  "大学城",
+  "长清",
+  "孝里",
+  "安城",
+  "平阴北",
+  "平阴南",
+  "东平",
+  "梁山东",
+  "嘉祥西",
+];
 const sxnja = [
-  293.67, 493.44, 694.34, 894.5, 697.82, 895.09, 495.79, 497.49, 393.72, 293.52,
+  293.67, 493.44, 694.34, 894.5, 697.82, 895.09, 495.79, 497.49, 393.72,
 ];
 const minNumber = 0;
 const minArray = [];
@@ -35,21 +47,32 @@ var options = {
   },
   xAxis: {
     type: "category",
-    data: xaxisData,
+    data: [
+      "00:00",
+      "01:00",
+      "02:00",
+      "03:00",
+      "04:00",
+      "05:00",
+      "06:00",
+      "07:00",
+      "08:00",
+      "09:00",
+      "10:00",
+      "11:00",
+      "12:00",
+    ],
     axisLine: {
-      show: true,
       lineStyle: {
-        width: 1,
-        color: "#545454",
+        color: "rgba(49, 217, 255, 0.8)",
       },
     },
     axisTick: {
       show: false,
     },
     axisLabel: {
-      color: "#B5C5D4",
+      color: "#fff",
       fontSize: "10px",
-      interval: 0,
     },
   },
   yAxis: [
@@ -58,8 +81,13 @@ var options = {
       // min: function (value) {
       //   return value.min*0.9;
       // },
+      name: "（起）",
+      nameTextStyle: {
+        color: "#fff",
+        fontSize: 10,
+        align: "right",
+      },
       type: "value",
-      // max: yAxisMax,
       axisLine: {
         show: false,
         lineStyle: {
@@ -68,19 +96,16 @@ var options = {
         },
       },
       splitLine: {
-        show: true,
         lineStyle: {
-          color: "#B2C2D3",
-          opacity: 0.3,
-          type: "dotted",
+          color: "rgba(49, 217, 255, 0.5)",
         },
       },
       axisTick: {
         show: false,
       },
       axisLabel: {
-        color: "#B5C5D4",
-        fontSize: "12px",
+        color: "#fff",
+        fontSize: "10px",
         formatter: (value) => {
           return value + minNumber;
         },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts.js
index a6f7a624..2ca3e1f4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts.js
@@ -88,11 +88,12 @@ var options = {
   yAxis: [
     {
       type: "value",
-      name: "(起)       ",
+      name: "（起）",
       splitNumber: 5,
       nameTextStyle: {
         color: "#fff",
         fontSize: 10,
+        align: "right",
         // fontFamily: "Source Han Sans CN-Regular",
         // align: "left",
         // verticalAlign: "center",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js
index a2069848..b18cc633 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js
@@ -51,10 +51,11 @@ let options = {
   },
   yAxis: [
     {
-      name: "(起)       ",
+      name: "（起）",
       nameTextStyle: {
         color: "#fff",
         fomtSize: 10,
+        align: "right",
       },
       min: 0,
       axisLine: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/assets/charts.js
index 4929a73e..4e502d93 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/assets/charts.js
@@ -8,8 +8,8 @@ var options = {
     },
   },
   grid: {
-    left: "0%",
-    right: "5%",
+    left: "1%",
+    right: "0",
     bottom: "30px",
     top: "30px",
     containLabel: true,
@@ -112,7 +112,7 @@ var options = {
     axisLabel: {
       // interval:0,
       color: "#fff",
-      fontSize: 12,
+      fontSize: 10,
     },
     axisTick: {
       show: false,
@@ -145,14 +145,13 @@ var options = {
     ],
   },
   yAxis: {
-    name: "(起)       ",
+    name: "（起）",
     nameTextStyle: {
       color: "#fff",
-      fomtSize: 10,
+      fontSize: 10,
+      align: "right",
     },
     type: "value",
-    min: 0,
-    minInterval: 1,
     splitLine: {
       lineStyle: {
         color: "rgba(255, 255, 255, 0.15)",
@@ -167,7 +166,7 @@ var options = {
       show: false,
     },
     axisLabel: {
-      fontSize: 12,
+      fontSize: 10,
       fontFamily: "Bebas",
       color: "#fff",
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/assets/charts.js
index 2f7545d0..91560bdc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/assets/charts.js
@@ -1,124 +1,124 @@
 let chartIcon = `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAACXBIWXMAAC4jAAAuIwF4pT92AAAFw2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgOS4wLWMwMDAgNzkuMTcxYzI3ZmFiLCAyMDIyLzA4LzE2LTIyOjM1OjQxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjQuMCAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMjMtMTItMjlUMTA6MTM6MTQrMDg6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDIzLTEyLTI5VDEwOjQ2OjE3KzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDIzLTEyLTI5VDEwOjQ2OjE3KzA4OjAwIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDplYzhkN2NkNS01ZjdjLTQ5Y2ItOTgyMy1lOTM4ODViNjRjMmIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6ZjE1ZWVkNDgtNDA3ZS00MDU0LTliNTMtYTllZmQ1ODE5YjVmIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6ZjE1ZWVkNDgtNDA3ZS00MDU0LTliNTMtYTllZmQ1ODE5YjVmIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpmMTVlZWQ0OC00MDdlLTQwNTQtOWI1My1hOWVmZDU4MTliNWYiIHN0RXZ0OndoZW49IjIwMjMtMTItMjlUMTA6MTM6MTQrMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyNC4wIChNYWNpbnRvc2gpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDplYzhkN2NkNS01ZjdjLTQ5Y2ItOTgyMy1lOTM4ODViNjRjMmIiIHN0RXZ0OndoZW49IjIwMjMtMTItMjlUMTA6NDY6MTcrMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyNC4wIChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PibZhN0AAAHBSURBVDiNfdTtThNREAbgZ5sCrRTaRaBqQDTR6AXaq9grJEaiKCJWaAv9ENDUH2fWLkU8yeTkZGbe885nNp/PVU9vIMMGNtHGo1BNMQoZF7k7jlkVqDewji72sI5VrIT6F64xwRecFbnJPaDeQBsv8RSdCpsS6BYzDENOcVTkLv8CBZPX2McOdrEVITYC6BpjnKOP7zjG+yI3yd5dzLNg8jbY7MW9g+2lHJUgpzgJOcRRPX7dj3C6eIaDAO+iGUCzYPERWSXU5+jXIxct5MFgN0AOsLaoi9Ul0HHkaoBOLZg0IoQNPMaTJZAqWDfytylVtol2LdishNFaKBv/AClPI3waISto1UKZoRZ39h8QFZus8laTqvEbNyEzqdQPnZ/hcyMl/BbTmpSsacg43v0wXD43+BE2V+FzjWFdmp1ZKAZheByUt91tyD4+S/00wGWAjerxOJYS2JSSngX4lrsNeREfnUg9dRG+o3JEWniDF1Lpd6U2KEdkHoyuwvkM36TmPCxy4+rQdvDKoss7FhugzM8kIjiPED8UuSH310jLYkRaUl9V18gswD7ha5Ebl77ZA4utLY1MOT4sRmKI0fJi+wM9v6Q1QC+Y6wAAAABJRU5ErkJggg==`;
 let xdata = {
-   value: ['平阴停车区']
+  value: ["平阴停车区"],
 };
 let sdata = {
-   value: [32774]
-}
+  value: [32774],
+};
 
 let dataZoomMove = {
-   start: 0,
-   end: 4
-}
+  start: 0,
+  end: 4,
+};
 var options = {
-   grid: {
-      containLabel: true,
-      // 边距自行修改
-      bottom: '0%',
-      left: '0%',
-      top: '2%',
-      right: '15%',
-   },
-   xAxis: {
-      type: 'value',
+  grid: {
+    containLabel: true,
+    // 边距自行修改
+    bottom: "0%",
+    left: "0%",
+    top: "2%",
+    right: "15%",
+  },
+  xAxis: {
+    type: "value",
+    axisLabel: {
+      show: false,
+    },
+    axisLine: {
+      show: false,
+    },
+    axisTick: {
+      show: false,
+    },
+    splitLine: {
+      show: false,
+    },
+  },
+  yAxis: [
+    {
+      type: "category",
+      data: xdata.value,
+      inverse: true,
       axisLabel: {
-         show: false
+        fontSize: "14px",
+        inside: true,
+        verticalAlign: "bottom",
+        color: "#fff",
+        padding: 10,
+        margin: -5,
+        formatter: function (value, index) {
+          // let index = xdata.value.indexOf(value);
+          return `{a|Top${index + 1}} {b|${value}}`;
+        },
+        rich: {
+          a: {
+            fontSize: "14px",
+          },
+
+          b: {
+            fontSize: "14px",
+            padding: [0, 0, 0, 70],
+          },
+        },
       },
       axisLine: {
-         show: false,
+        show: false,
       },
       axisTick: {
-         show: false,
-      },
-      splitLine: {
-         show: false,
+        show: false,
       },
-   },
-   yAxis: [
-      {
-         type: 'category',
-         data: xdata.value,
-         inverse: true,
-         axisLabel: {
-            fontSize: '14px',
-            inside: true,
-            verticalAlign: 'bottom',
-            color: '#fff',
-            padding: 10,
-            margin: -5,
-            formatter: function (value, index) {
-               // let index = xdata.value.indexOf(value);
-               return `{a|Top${index + 1}} {b|${value}}`
+    },
+  ],
+  series: [
+    {
+      data: sdata.value,
+      type: "bar",
+      barWidth: 8,
+      itemStyle: {
+        borderRadius: 40,
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 1,
+          y2: 0,
+          colorStops: [
+            {
+              offset: 0,
+              color: "#1cd0f000", // 0% 处的颜色
             },
-            rich: {
-               a: {
-                  fontSize: '14px',
-               },
-
-               b: {
-                  fontSize: '14px',
-                  padding: [0, 0, 0, 70],
-               }
+            {
+              offset: 1,
+              color: "#1cd0f0", // 100% 处的颜色
             },
-         },
-         axisLine: {
-            show: false,
-         },
-         axisTick: {
-            show: false,
-         }
-      }
-   ],
-   series: [
-      {
-         data: sdata.value,
-         type: 'bar',
-         barWidth: 8,
-         itemStyle: {
-            borderRadius: 40,
-            color: {
-               type: 'linear',
-               x: 0,
-               y: 0,
-               x2: 1,
-               y2: 0,
-               colorStops: [
-                  {
-                     offset: 0,
-                     color: '#1cd0f000', // 0% 处的颜色
-                  },
-                  {
-                     offset: 1,
-                     color: '#1cd0f0', // 100% 处的颜色
-                  },
-               ],
-               global: false, // 缺省为 false
-            }
-         },
-         label: {
-            show: true,
-            position: 'right',
-            distance: -10,
-            data: sdata,
-            color: '#fff',
-            formatter: (c) => {
-               return `{a|}{b|${c.value}件}`
+          ],
+          global: false, // 缺省为 false
+        },
+      },
+      label: {
+        show: true,
+        position: "right",
+        distance: -10,
+        data: sdata,
+        color: "#fff",
+        formatter: (c) => {
+          return `{a|}{b|${c.value}起}`;
+        },
+        rich: {
+          a: {
+            widht: 20,
+            height: 20,
+            backgroundColor: {
+              image: chartIcon,
             },
-            rich: {
-               a: {
-                  widht: 20,
-                  height: 20,
-                  backgroundColor: {
-                     image: chartIcon
-                  },
-               },
-               b: {
-                  padding: [0, 0, 0, 10]
-               }
-            }
-         }
-      }
-   ]
-}
+          },
+          b: {
+            padding: [0, 0, 0, 10],
+          },
+        },
+      },
+    },
+  ],
+};
 
 export default options;
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 f305a9a9..32496833 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
@@ -56,7 +56,7 @@ nameList.map((item, index) => {
 
 var options = {
   grid: {
-    top: "5%", //上边距
+    top: "15%", //上边距
     right: "0", //右边距
     left: "0", //左边距
     bottom: "0%", //下边距
@@ -69,7 +69,7 @@ var options = {
   },
   xAxis: {
     type: "category",
-    data: [],
+    data: nameList,
     axisTick: {
       show: false, //隐藏X轴刻度
     },
@@ -80,26 +80,22 @@ var options = {
     },
     axisLabel: {
       show: true,
-      color: "#B6E6FF",
-      fontSize: 8,
-      fontFamily: "Source Han Sans CN-Regular",
+      color: "#fff",
+      fontSize: 10,
     },
   },
   yAxis: [
     {
       type: "value",
-      name: "",
-
+      name: "（起）",
       nameTextStyle: {
-        color: "#B6E6FF",
-        fontSize: 13,
-        fontFamily: "Source Han Sans CN-Regular",
-        align: "left",
-        verticalAlign: "center",
+        color: "#fff",
+        fontSize: 10,
+        align: "right",
       },
       axisLabel: {
-        fontSize: 13,
-        color: "#B6E6FF",
+        fontSize: 10,
+        color: "#fff",
         fontFamily: "HarmonyOS Sans-Regular",
         // formatter:function(value,index){
         //    return yList[index]
@@ -121,7 +117,7 @@ var options = {
   series: [
     {
       type: "bar",
-      data: [],
+      data: valueList,
       z: 4,
       itemStyle: {
         color: {