更改

ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue

@@ -138,7 +138,11 @@ export default {
       this.$refs.FormConfigRef.$refs.ElFormRef.resetFields();
       // this.$refs.PopoverRef.doClose();
 
-      this.$emit("handleSearch", cloneDeep(this.$refs.FormConfigRef?.formData));
+      this.$emit(
+        "handleSearch",
+        cloneDeep(this.$refs.FormConfigRef?.formData),
+        "reset"
+      );
     },
     async handleSearch() {
       if (this.types === "input") {
@@ -157,12 +161,12 @@ export default {
         }
 
         let resultParams = { ...result, ...params };
-        this.$emit("handleSearch", resultParams);
+        this.$emit("handleSearch", resultParams, "search");
       } else {
         this.$refs.FormConfigRef.validate()
           .then((result) => {
             this.$refs.PopoverRef.doClose();
-            this.$emit("handleSearch", result);
+            this.$emit("handleSearch", result, "search");
           })
           .catch((err) => {
             console.log("catch");

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue

@@ -314,6 +314,7 @@ export default {
             multiple: true,
             options: [],
           },
+          default: [],
           visible: (data) => {
             if (data.searchType == 1) {
               return true;
@@ -325,6 +326,7 @@ export default {
           key: "date",
           required: true,
           type: "datePicker",
+          default: "",
           options: {
             pickerOptions: {
               disabledDate(time) {
@@ -336,6 +338,7 @@ export default {
           },
         },
       ],
+      queryParams: {},
     };
   },
   computed: {
@@ -376,19 +379,30 @@ export default {
           });
           this.searchFormList[2].options.options = dataList;
           this.facilityIds = res[0].value.data.map((item) => item.id);
-          // this.searchFormList[2].default = res[0].value.data.map(item => item.id)
+          this.searchFormList[2].default = res[0].value.data.map(
+            (item) => item.id
+          );
+          console.log(56, this.searchFormList[2].default);
           let currentMonth = moment().format("YYYY-MM");
           let currentDate = moment().format("YYYY-MM-DD");
-          let data = {
+          this.queryParams = {
             searchType: 1,
             facilityId: this.facilityIds,
             date: [currentMonth + "-01", currentDate],
           };
-          this.getSelectTollStation(data);
+          this.searchFormList[3].default = [currentMonth + "-01", currentDate];
+          this.getSelectTollStation(this.queryParams);
         }
       });
     },
-    handleSearch(data) {
+    // handleResetForm(data) {
+    //   this.getSelectTollStation(data);
+    // },
+    handleSearch(data, value) {
+      console.log(888, data, value);
+      if (value == "reset") {
+        data = this.queryParams;
+      }
       this.getSelectTollStation(data);
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js

@@ -31,16 +31,17 @@ var options = {
           width: 50,
         },
         bst: {
+          width: 35,
           align: "left",
           fontSize: 12,
-          marginLeft: 10,
           color: "#37E7FF",
+          marginLeft: 10,
         },
         cst: {
           align: "left",
           fontSize: 12,
-          marginLeft: 10,
           color: "#37E7FF",
+          marginLeft: 10,
         },
       },
     },

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js

@@ -90,13 +90,13 @@ var options = {
   },
   color: ["#5973FF", "#14d8b4", "#FFC30D", "#61D8FF", "#1DA7FF", "#2967EA"],
   legend: {
-    top: "8%",
+    top: "5%",
     right: 0,
     orient: "vertical", //改变排列方式
     icon: "circle", //改变legend小图标形状
-    itemGap: 10, // 设置legend的间距
+    itemGap: 12, // 设置legend的间距
     itemWidth: 8, // 设置宽度
-    // itemHeight: 15, // 设置高度
+    itemHeight: 9, // 设置高度
 
     itemStyle: {
       borderColor: "transparent",
@@ -130,15 +130,16 @@ var options = {
           width: 65,
         },
         bst: {
+          width: 35,
           align: "left",
           fontSize: 12,
-          marginLeft: 20,
+          marginLeft: 10,
           color: "#37E7FF",
         },
         cst: {
           align: "left",
           fontSize: 12,
-          marginLeft: 30,
+          marginLeft: 10,
           width: 60,
           color: "#37E7FF",
         },

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue

@@ -215,16 +215,15 @@ export default {
         // 填充渐变颜色
         let gr = context.createLinearGradient(230, 0, 360, 0);
         gr.addColorStop(1, "rgba(92,197,255,0)");
-        gr.addColorStop(0, "rgba(92,197,255,0.3)");
-        drawRoundRect(context, 202, 16, 134, 18, 10, gr);
-        drawRoundRect(context, 202, 39, 134, 18, 10, gr);
-        drawRoundRect(context, 202, 61, 134, 18, 10, gr);
-        drawRoundRect(context, 202, 83, 134, 18, 10, gr);
-        drawRoundRect(context, 202, 105, 134, 18, 10, gr);
-        drawRoundRect(context, 202, 127, 134, 18, 10, gr);
-        drawRoundRect(context, 202, 149, 134, 18, 10, gr);
-
+        gr.addColorStop(0, "rgba(92,197,255,0.5)");
         context.lineWidth = 1; // 设置线段宽度
+        drawRoundRect(context, 202, 8, 280, 20, 12, gr);
+        drawRoundRect(context, 202, 32, 280, 20, 10, gr);
+        drawRoundRect(context, 202, 56, 280, 20, 10, gr);
+        drawRoundRect(context, 202, 80, 280, 20, 10, gr);
+        drawRoundRect(context, 202, 104, 280, 20, 10, gr);
+        drawRoundRect(context, 202, 128, 280, 20, 10, gr);
+        drawRoundRect(context, 202, 152, 280, 20, 10, gr);
 
         this.myChart = myChart;
       });

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/assets/charts.js

@@ -37,19 +37,20 @@ var options = {
         ast: {
           marginLeft: 0,
           fontSize: 12,
-          width: 40,
+          width: 60,
         },
         bst: {
           align: "left",
           fontSize: 12,
           color: "#37E7FF",
-          width: 30,
+          width: 35,
+          marginLeft: 10,
         },
         cst: {
           align: "right",
           fontSize: 12,
-          width: 40,
-          // marginLeft: 20,
+          width: 45,
+          marginLeft: 10,
           color: "#37E7FF",
         },
       },

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue

@@ -49,7 +49,7 @@ export default {
   data() {
     return {};
   },
-  created() { },
+  created() {},
   methods: {},
   mounted() {
     setTimeout(() => {
@@ -176,11 +176,11 @@ export default {
         context.lineWidth = 1; // 设置线段宽度
 
         // 绘制圆角矩形
-        drawRoundRect(context, 258, 8, 120, 24, 12, gr);
-        drawRoundRect(context, 258, 36, 120, 24, 12, gr);
-        drawRoundRect(context, 258, 64, 120, 24, 12, gr);
-        drawRoundRect(context, 258, 92, 120, 24, 12, gr);
-        drawRoundRect(context, 258, 120, 120, 24, 12, gr);
+        drawRoundRect(context, 228, 8, 280, 24, 12, gr);
+        drawRoundRect(context, 228, 36, 280, 24, 12, gr);
+        drawRoundRect(context, 228, 64, 280, 24, 12, gr);
+        drawRoundRect(context, 228, 92, 280, 24, 12, gr);
+        drawRoundRect(context, 228, 120, 280, 24, 12, gr);
       });
     });
   },
@@ -195,15 +195,20 @@ export default {
     height: 200px;
     width: 100%;
     padding: 0px 20px;
-    background: linear-gradient(180deg,
+    background: linear-gradient(
+      180deg,
       rgba(6, 66, 88, 0.2) 0%,
-        #06425888 100%);
+      #06425888 100%
+    );
     border-radius: 5px 5px 5px 5px;
     opacity: 1;
     border: 1px solid;
-    border-image: linear-gradient(360deg,
+    border-image: linear-gradient(
+        360deg,
         rgba(55, 231, 255, 0.1),
-        rgba(55, 231, 255, 0)) 1 1;
+        rgba(55, 231, 255, 0)
+      )
+      1 1;
     display: flex;
     justify-content: space-between;
     align-items: center;