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

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js

@@ -68,7 +68,7 @@ let data = [{
     tooltip: {
        confine: true,
        textStyle: {
-          fontSize: 10 // 字体大小
+          fontSize: 14 // 字体大小
        },
     },
     title:{   //圆环中间内容
@@ -108,11 +108,13 @@ let data = [{
           color: "#fff",
            rich:{
               a:{
+                  width:45,
                   fontSize: 12,
               },
                  b:{
                      fontSize:14,
                      color:"#37E7FF",
+                     marginLeft:-0,
                    }
        },
        },

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

@@ -160,7 +160,7 @@
         }
       ],
       quarter:"",
-      year:"2024",
+      year:"year",
         list:[
           {name:'大学城-长清', direction:'济南方向', state:"正常",speed:'108.14km/h', follow:'161'},
           {name:'大学城-长清', direction:'济南方向', state:"正常",speed:'108.14km/h', follow:'161'},

ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue

@@ -190,13 +190,13 @@
                 justify-content: center;
                 align-items: center;
                 margin-top:23px;
-                width: 47px;
+                width: 67px;
-                height: 16px;
+                height: 18px;
                 background: rgba(245,80,80,0.4);
                 border-radius: 2px 2px 2px 2px;
                 opacity: 1;
                 border: 1px solid #F55050;
-                font-size: 10px;
+                font-size: 12px;
                 font-family: Source Han Sans SC, Source Han Sans SC;
                 font-weight: 400;
                 color: #F55050;

ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue

@@ -2,7 +2,7 @@
     <div class='congestion'>
       <div class="board">
          <div class="queryList" >
-            <Card v-for="(item, index) in data" :cardData="item" :keyMap="keyMap" :gap="'10px'" :key="index">
+            <Card v-for="(item, index) in data" :cardData="item" :keyMap="keyMap" :hasBtn="false" :gap="'10px'" :key="index">
               <template #form-start="{ data }">
                   <div class="endSpecial">
                     {{ data.start }} <img  src="./assets/weater.png"  />

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js

@@ -54,6 +54,7 @@ var options = {
          name: '车流量',
          type: 'value',
          max: 300,
+         interval:100,
          axisLabel: {
             color: '#FFF'
          },
@@ -68,11 +69,12 @@ var options = {
          }
       },
       {
+         interval:100,
          gridIndex: 1,
          name: '',
          type: 'value',
          inverse: true,
-         max: 250,
+         max: 300,
          axisLabel: {
             color: '#FFF'
          },

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/heightway/index.vue

@@ -5,10 +5,10 @@
         <div class="searchPanel">
           <div >起始桩号：k</div>
           <el-input class="inputZh" v-model="start"></el-input>
-          <el-input class="inputZh inputJl" v-model="start"></el-input>
+          <el-input class="inputZh inputJl" v-model="start1"></el-input>
           <div >结束桩号：k</div>
-          <el-input class="inputZh" v-model="start"></el-input>
+          <el-input class="inputZh" v-model="start2"></el-input>
-          <el-input class="inputZh inputJl" v-model="start"></el-input>
+          <el-input class="inputZh inputJl" v-model="start3"></el-input>
           <div >路段方向：</div>
           <el-select v-model="area" class="selectRoad" placeholder="请选择">
             <el-option
@@ -52,6 +52,9 @@ export default {
   data() {
     return {
      start:'',
+     start1:'',
+     start2:'',
+     start3:'',
      areaOptions: [{
           value: '济南',
           label: '济南'

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue

@@ -14,7 +14,7 @@
             <el-table
                 :border="false"
                 :data="tableData"
-                height="670"
+                height="790"
                 style="width: 100%">
                 <el-table-column
                 prop="nem"

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue

@@ -5,7 +5,6 @@
         <div class="searchPanel_1" >
           <el-date-picker
           size="mini"
-          v-if="year != 'quarter'"
           class="selectRoad"
             v-model="dateTime"
             style="width:140px;"
@@ -33,7 +32,7 @@
     },
     data() {
       return {
-       
+        dateTime:"",
       }
     },
   
@@ -82,7 +81,8 @@
         margin-bottom: 10px;
         left:20px;
         top:2px;
-        z-index: 10000;
+        z-index:100000;
+        
     div{
       white-space: nowrap;
       margin-right: 4px;

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class='congestion'>
-      <WgtTitle :title="'今日发布趋势分析'"></WgtTitle>
+      <WgtTitle :title="'月发布渠道趋势分析'"></WgtTitle>
       <div class="board">
         <div class="searchPanel_1" >
           <el-date-picker

ruoyi-ui/vue.config.js

@@ -44,7 +44,7 @@ module.exports = {
         // target: `http://10.168.77.209:8080`, // 刘朋
         // target: `http://10.168.66.196:8080`, //刘文阁 
         // target: `http://10.168.56.206:8087`, //孟
-        target: `http://10.168.73.36:8087`,
+        target: `http://10.168.78.135:8087`,
         // target: `http://10.0.81.202:8087`, //现场后台
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁 
         changeOrigin: true,