Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue

@@ -1,9 +1,9 @@
 <template>
-  <Dialog v-model="modelVisible" title="事件详情" width="890px" top="15%">
+  <Dialog v-model="modelVisible" title="事件详情" width="890px" top="11%">
     <div
       class="EventDetail"
       :style="{
-        height: activeName == '-1' || activeName == '0' ? '380px' : '768px',
+        height: activeName == '-1' || activeName == '0' ? '380px' : '598px',
       }"
     >
       <Form :formList="formList" :dFormData="formData" label-width="100px" />

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js

@@ -18,20 +18,24 @@ let data3 = [200, 530, 920, 400, 600, 700, 300, 800];
 let options = {
   tooltip: {
     show: true,
-    trigger: "axis",
+    // trigger: "axis",
     axisPointer: {
       // 坐标轴指示器，坐标轴触发有效
       type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
     },
-    valueFormatter: function (value) {
-      return value + " 起";
+    formatter: function (params) {
+      if (params.seriesName == "路段里程数") {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 公里</span></div>`;
+      } else {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 起</span></div>`;
+      }
     },
   },
   grid: {
     left: "0",
     right: "0",
     top: "90px",
-    bottom: "20px",
+    bottom: "-10px",
     containLabel: true,
   },
   xAxis: {
@@ -52,11 +56,14 @@ let options = {
       interval: 1,
       align: "center",
       rotate: "1",
-      margin: "20",
+      margin: 30,
       textStyle: {
         fontSize: 10,
         color: "#E5E7E8",
       },
+      formatter: (value) => {
+        return value.split("-").join("\n\n");
+      },
     },
   },
   yAxis: [
@@ -262,7 +269,6 @@ let options = {
         opacity: 1,
         color: function (params) {
           var a = params.name;
-          // console.log("==========a=============", a);
           return new echarts.graphic.LinearGradient(
             0,
             0,
@@ -322,7 +328,6 @@ let options = {
         opacity: 1,
         color: function (params) {
           var a = params.name;
-          // console.log("==========a=============", a);
           return new echarts.graphic.LinearGradient(
             0,
             0,

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js

@@ -4,15 +4,30 @@ let lc2 = [400, 550, 200, 140, 400, 550];
 let options = {
   tooltip: {
     show: true,
-    trigger: "axis",
-    valueFormatter: function (value) {
-      return value + " 起";
+    trigger: "item",
+    formatter: function (params) {
+      console.log(77, params.seriesName);
+      // params.forEach((item) => {
+      //   console.log(item);
+      //   if (item.seriesName == "平均处置时长") {
+      //     console.log(77, item.seriesName);
+      //     return `<div>${item.marker} ${item.name} <span style="font-weight: bold;">${item.value} 分钟</span></div>`;
+      //   }
+      // });
+      if (params.seriesName == "平均处置时长") {
+        console.log(77, params.seriesName);
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 分钟</span></div>`;
+      } else if (params.seriesName == "去年同期平均处置时长") {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 分钟</span></div>`;
+      } else {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 起</span></div>`;
+      }
     },
   },
   grid: {
     right: "4%",
     top: "90px",
-    left: "2%",
+    left: "30px",
     bottom: "0%",
     containLabel: true,
   },
@@ -86,12 +101,12 @@ let options = {
           // formatter: "{value} °C",
         },
       },
-      // axisLine: {
-      //   show: false,
-      // },
-      // axisTick: {
-      //   show: false,
-      // },
+      axisLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
       splitLine: {
         show: false,
         lineStyle: {
@@ -227,14 +242,14 @@ let options = {
       yAxisIndex: 1,
       data: lc2,
       type: "line",
-      symbol: "none",
-      symbolSize: 20,
+      // symbol: "none",
+      symbolSize: 5,
       smooth: true,
       color: "#E2BA74",
       lineStyle: {
         color: "#E2BA74",
         width: 1,
-        type: "dashed",
+        // type: "dashed",
         // dashOffset:50
       },
     },
@@ -243,14 +258,14 @@ let options = {
       yAxisIndex: 1,
       data: lc,
       type: "line",
-      symbol: "none",
-      symbolSize: 20,
+      // symbol: "none",
+      symbolSize: 5,
       smooth: true,
       color: "#FB6D07",
       lineStyle: {
         color: "#FB6D07",
         width: 1,
-        type: "dashed",
+        // type: "dashed",
         // dashOffset:50
       },
     },

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js

@@ -23,8 +23,14 @@ var options = {
   },
   tooltip: {
     show: true,
-    valueFormatter: function (value) {
-      return value + " 起";
+    trigger: "item",
+    formatter: function (params) {
+      if (params.seriesName == "事件数量（起）") {
+        console.log(77, params.seriesName);
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 起</span></div>`;
+      } else {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 分钟</span></div>`;
+      }
     },
   },
   legend: {
@@ -33,6 +39,7 @@ var options = {
     itemHeight: 8,
     itemWidth: 8,
     top: "5%",
+
     right: "0%",
     textStyle: {
       // fontSize: 12,

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

@@ -324,7 +324,7 @@ export default {
       margin-bottom: 10px;
       left: 20px;
       top: 10px;
-      z-index: 0;
+      z-index: 1;
 
       div {
         white-space: nowrap;

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/daylyAnalysis/assets/charts.js

@@ -5,7 +5,7 @@ var data2 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15];
 var options = {
   tooltip: {
     formatter: function (params) {
-      console.log("params", params);
+      // console.log("params", params);
       if (params.seriesName == "增收金额") {
         return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 万元</span></div>`;
       } else {

ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue

@@ -18,7 +18,7 @@
       </div>
 
       <InputSearch
-        style="width: 402px"
+        style="width: 480px"
         :formList="searchFormList"
         @handleSearch="handleSearch"
       />