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

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

@@ -5,7 +5,7 @@
     <!-- 搜索栏 -->
     <div class="filter">
       <div>
-        <ButtonGradient @click="onAddNew">
+        <ButtonGradient @click="onAddNew" v-if="activeName != '1' && activeName != '2'">
           <template #prefix>
             <img src="./images/insert.svg" />
           </template>
@@ -59,6 +59,7 @@ import EventDetailDialog from "./EventDetailDialog/index";
 import FormEvent from "./FormEvent/index";
 import { tabMap, gjSearchFormList, gzSearchFormList } from "./data";
 import request from "@/utils/request";
+import { Message } from "element-ui";
 import { Loading } from 'element-ui';
 
 function getRandomData(min = 1, max = 15) {

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js

@@ -27,7 +27,7 @@ export const searchFormList = [
   {
     label: "时间范围:",
     key: "time",
-    required: true,
+    // required: true,
     type: "datePicker",
     options: {
       format:"yyyy-MM-dd",
@@ -35,9 +35,9 @@ export const searchFormList = [
     },
   },
   {
-    label: "型号类型:",
+    label: "设备类型:",
     key: "type",
-    required: true,
+    // required: true,
     type: "select",
     options: {
       options: [

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/data.js

@@ -0,0 +1,43 @@
+export const searchFormList = [
+  {
+    label: "路段名称:",
+    key: "ld",
+    // required: true,
+    type: "select",
+    options: {
+      options: [],
+    },
+  },
+  {
+    label: "指标名称:",
+    key: "type",
+    // required: true,
+    type: "select",
+    options: {
+      options: [
+        {
+          value: "1",
+          label: "拥挤度",
+        },
+        {
+          value: "2",
+          label: "饱和度",
+        },
+        {
+          value: "3",
+          label: "交通组成特征指数",
+        },
+      ],
+    },
+  },
+  {
+    label: "时间范围:",
+    key: "time",
+    // required: true,
+    type: "datePicker",
+    options: {
+      format: "yyyy-MM-dd",
+      type: "daterange",
+    },
+  },
+];

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

@@ -1,12 +1,19 @@
 <template>
   <div class='congestion'>
     <div class="buttonbar">
-      <div class="button">
-        <i class="el-icon-refresh-right"></i>刷新
-      </div>
-      <div class="button">
-        <i class="el-icon-upload2"></i>导出Excal
-      </div>
+      <ButtonGradient class="button">
+        <template #prefix>
+          <i class="el-icon-refresh-right"></i>
+        </template>
+        刷新
+      </ButtonGradient>
+      <ButtonGradient class="button">
+        <template #prefix>
+          <i class="el-icon-upload2"></i>
+        </template>
+        导出
+      </ButtonGradient>
+      <InputSearch style="width: 402px;margin-left: 1300px;" :formList="formList" @handleSearch="handleSearch" />
     </div>
     <div class="board">
 
@@ -29,8 +36,7 @@
     <!-- 分页 -->
     <div class="footer">
       <Pagination @current-change="getData" @size-change="onSizeChange" width="'100%'" :page-sizes="[10, 20, 30, 40, 50]"
-        :page-size="pageSize" :current-page.sync="pageNum" layout="total, sizes, prev, pager, next"
-        :total="50">
+        :page-size="pageSize" :current-page.sync="pageNum" layout="total, sizes, prev, pager, next" :total="50">
       </Pagination>
     </div>
   </div>
@@ -38,11 +44,18 @@
   
 <script>
 import Pagination from "@screen/components/Pagination.vue";
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import { searchFormList } from './data.js'
 
 export default {
   name: 'IndicatorQuery',
   components: {
-    Pagination
+    Pagination,
+    ButtonGradient,
+    InputSearch
   },
   data() {
     return {
@@ -208,13 +221,14 @@ export default {
         address: 'K100+000-K110+000'
       },
       ],
+      formList: [],
       pageSize: 10,
       pageNum: 1
     }
   },
-
   created() {
-
+    // this.formList = searchFormList;
+    this.queryLdAll();
   },
   methods: {
     selectItem(index) {
@@ -225,6 +239,26 @@ export default {
     },
     onSizeChange() {
 
+    },
+    handleSearch() {
+
+    },
+    queryLdAll() {
+      request({
+        url: `/business/roadSection/listAll`,
+        method: "get",
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        let lds = [];
+        result.data.forEach(it => {
+          lds.push({
+            value: it.id,
+            label: it.sectionName
+          })
+        })
+        searchFormList[0].options.options = lds;
+        this.formList = searchFormList;
+      });
     }
   },
   mounted() {
@@ -319,7 +353,7 @@ export default {
   }
 
   .board {
-    height: 880px;
+    height: 829px;
     width: 100%;
     padding: 0px 0px;
     border-radius: 5px 5px 5px 5px;
@@ -329,7 +363,7 @@ export default {
     align-items: center;
     flex-direction: column;
     margin-top: 20px;
-
+    overflow-y: auto;
 
 
     .warningList {
@@ -512,6 +546,7 @@ export default {
     }
 
   }
+
   .footer {
     margin-top: 15px;
     height: 36px;