From 04a170b9f06db857f1023fa294d143344d29f185 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Fri, 15 Mar 2024 11:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/styles/JiHeExpressway.scss     |    2 +-
 .../components/AddNEditDialog.vue             |   12 +-
 .../pages/control/event/dispatch/data.js      |    2 +
 .../pages/control/event/dispatch/index.vue    |   93 +-
 .../StatsDialogVisible/index.vue              |    1 -
 .../event/plan/addAndEditDialog/index.vue     | 1193 +++++++++--------
 .../statisticalAnalysis/index.vue             |   41 +-
 .../components/flowstate/assets/charts.js     |    2 +-
 .../pages/service/sensitive/index.vue         |    2 +
 ruoyi-ui/src/views/login.vue                  |    4 +-
 ruoyi-ui/vue.config.js                        |    3 +-
 11 files changed, 735 insertions(+), 620 deletions(-)

diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
index 660da6bd..d7e8685d 100644
--- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
+++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
@@ -11,7 +11,7 @@
   }
 
   .el-form-item {
-    margin-bottom: 8px;
+    margin-bottom: 15px;
   }
 
   .el-form-item__label {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
index f832ace3..e18493cd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
@@ -206,12 +206,12 @@ export default {
 
       this.formList[0].options.options = result;
       this.formList[0].default = result[0].key;
-      this.formList[0].options.options.push({
-        disabled: false,
-        key: 0,
-        label: "无",
-      });
-      console.log(this.formList[0].options.options);
+      // this.formList[0].options.options.push({
+      //   disabled: false,
+      //   key: 0,
+      //   label: "无",
+      // });
+      // console.log(this.formList[0].options.options);
     },
     handleSubmit() {
       this.$refs.FormConfigRef.validate().then((data) => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
index d9eeb945..9f2595ab 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
@@ -6,6 +6,7 @@ export const searchFormList = [
     label: "事件状态:",
     key: "eventState",
     type: "RadioGroup",
+    default: "0",
     options: {
       options: [
         {
@@ -29,6 +30,7 @@ export const searchFormList = [
     label: "方向:",
     key: "direction",
     type: "RadioGroup",
+    default: "济南方向",
     options: {
       options: [
         {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
index 2e422e03..f26219e6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class='RoadNetworkMonitoring'>
+  <div class="RoadNetworkMonitoring">
     <!-- 搜索栏 -->
     <div class="filter">
       <ButtonGradient @click="onRefresh" class="refresh-btn">
@@ -9,47 +9,71 @@
         刷新
       </ButtonGradient>
 
-      <InputSearch style="width: 402px;" :formList="searchFormList" :formConfigOptions="{ dFormData: { eventState: 0 } }"
-        @handleSearch="handleSearch" />
+      <InputSearch
+        style="width: 402px"
+        :formList="searchFormList"
+        :formConfigOptions="{ dFormData: { eventState: '0' } }"
+        @handleSearch="handleSearch"
+      />
     </div>
 
     <!-- 内容 -->
     <div class="body">
-      <RoadStateCard v-for="(item, index) in data" :key="index" :cardData="item" @firstBtnClick="firstBtnClick"
-        @lastBtnClick="lastBtnClick" />
+      <RoadStateCard
+        v-for="(item, index) in data"
+        :key="index"
+        :cardData="item"
+        @firstBtnClick="firstBtnClick"
+        @lastBtnClick="lastBtnClick"
+      />
     </div>
 
     <!-- 分页 -->
     <div class="footer">
-      <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'" :page-sizes="[12, 16, 20, 30, 50]"
-        :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum" layout="total, sizes, prev, pager, next"
-        :total="total">
+      <Pagination
+        @current-change="initData"
+        @size-change="onSizeChange"
+        width="'100%'"
+        :page-sizes="[12, 16, 20, 30, 50]"
+        :page-size="searchData.pageSize"
+        :current-page.sync="searchData.pageNum"
+        layout="total, sizes, prev, pager, next"
+        :total="total"
+      >
       </Pagination>
     </div>
 
-    <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" @update:value="handleClose" />
-    <EventDispatchDialog :visible="eventDispatchDialogVisible" @update:value="handleClose" :eventId="eventId" />
+    <EventDetailDialog
+      :visible="eventDetailDialogVisible"
+      :formData="detailDialogFormData"
+      @update:value="handleClose"
+    />
+    <EventDispatchDialog
+      :visible="eventDispatchDialogVisible"
+      @update:value="handleClose"
+      :eventId="eventId"
+    />
   </div>
 </template>
 
 <script>
 import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
-import Pagination from '@screen/components/Pagination.vue';
-import InputSearch from '@screen/components/InputSearch/index.vue';
-import RoadStateCard from '@screen/components/RoadStateCard/index.vue';
+import Pagination from "@screen/components/Pagination.vue";
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import RoadStateCard from "@screen/components/RoadStateCard/index.vue";
 import EventDetailDialog from "./EventDetailDialog/index";
 import EventDispatchDialog from "./EventDispatchDialog/index";
-import { searchFormList } from './data';
+import { searchFormList } from "./data";
 import request from "@/utils/request";
 
 const directionMapping = {
-  '1': '菏泽方向',
-  '2': '双向',
-  '3': '济南方向'
-}
+  1: "菏泽方向",
+  2: "双向",
+  3: "济南方向",
+};
 
 export default {
-  name: 'RoadNetworkMonitoring',
+  name: "RoadNetworkMonitoring",
   components: {
     Pagination,
     RoadStateCard,
@@ -57,7 +81,7 @@ export default {
     EventDispatchDialog,
     EventDetailDialog,
     Pagination,
-    ButtonGradient
+    ButtonGradient,
   },
   data() {
     return {
@@ -67,13 +91,13 @@ export default {
       detailDialogFormData: {},
       total: 0,
       data: [],
-      eventId: '0',
+      eventId: "0",
       searchData: {
         pageSize: 16,
         pageNum: 1,
-        eventState: 0,
+        eventState: "0",
       },
-    }
+    };
   },
   created() {
     this.initData();
@@ -82,15 +106,15 @@ export default {
     initData() {
       request({
         // url: `/dc/system/event/dispatchEventList`,
-        url: '/dc/system/event/list',
+        url: "/dc/system/event/list",
         method: "get",
         params: this.searchData,
       }).then((result) => {
         if (result.code != 200) return Message.error(result?.msg);
         this.total = result.total;
-        result.rows.forEach(it => {
+        result.rows.forEach((it) => {
           it.stringDirection = directionMapping[it.direction] || it.direction;
-        })
+        });
         this.data = result.rows;
       });
     },
@@ -126,7 +150,7 @@ export default {
       });
     },
     lastBtnClick(id) {
-      console.log(id)
+      console.log(id);
       this.eventDispatchDialogVisible = true;
       this.eventId = id;
     },
@@ -137,8 +161,10 @@ export default {
       let dStakeMark = data.stakeMark;
       let dendStakeMark = data.endStakeMark;
 
-      let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : '';
-      let endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0]}+${dendStakeMark[1]}` : '';
+      let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : "";
+      let endStakeMark = dendStakeMark[0]
+        ? `K${dendStakeMark[0]}+${dendStakeMark[1]}`
+        : "";
 
       this.searchData = {
         ...this.searchData,
@@ -155,12 +181,12 @@ export default {
     handleClose() {
       this.eventDetailDialogVisible = false;
       this.eventDispatchDialogVisible = false;
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .RoadNetworkMonitoring {
   padding: 21px;
 
@@ -175,7 +201,6 @@ export default {
     // justify-content: flex-end;
     justify-content: space-between;
     .refresh-btn {
-
     }
   }
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
index 774e4ec3..35cd46b2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
@@ -1,6 +1,5 @@
 <template>
   <Dialog v-model="modelVisible" title="收费站管制统计" style="width: 100%">
-    {{ modelVisible }}
     <div class="search">
       <InputSearch
         :formList="searchFormList"
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
index 95811c77..ea26ce25 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
@@ -1,68 +1,97 @@
 <template>
-    <Dialog v-model="modelVisible" title="新增预案">
-        <div class="EventAddPlanDialog">
-            <ElForm :model="formData" inline :rules="rules" ref="ruleForm">
-                <div class="first">
-                    <el-form-item prop="eventCategory">
-                        <el-radio-group v-model="formData.eventCategory" @input="changeRadio">
-                            <el-radio-button :label="1">交通事件</el-radio-button>
-                            <el-radio-button :label="2">感知事件</el-radio-button>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item required label="预案名称:" prop="planName">
-                        <el-input v-model="formData.planName" placeholder="请输入预案名称"></el-input>
-                    </el-form-item>
-                    <el-form-item required label="事件类型:" prop="eventType">
-                        <el-select v-model="formData.eventType" placeholder="请选择事件类型" @change="changeEventType">
-                            <el-option v-for="item in eventOptions" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item
-                        v-if="(formData.eventCategory == 1 && formData.eventType !== 8) || formData.eventCategory == 2"
-                        label="触发类型:" prop="triggerMechanism">
-
-                        <el-select
-                            v-if="(formData.eventCategory == 1 && formData.eventType !== 6) || formData.eventCategory == 2"
-                            v-model="formData.triggerMechanism" placeholder="请选择触发类型">
-                            <el-option v-for="item in mechanismOptions" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                        <el-select v-if="formData.eventCategory == 1 && formData.eventType == 6"
-                            v-model="formData.triggerMechanism" placeholder="请选择触发类型">
-                            <el-option-group label="主线">
-                                <el-option label="主线封闭" value="1"></el-option>
-                                <el-option label="主线限行" value="2"></el-option>
-                            </el-option-group>
-                            <el-option-group label="收费站">
-                                <el-option label="收费站封闭" value="3"></el-option>
-                                <el-option label="收费站限行" value="4"></el-option>
-                            </el-option-group>
-                            <el-option-group label="匝道立交">
-                                <el-option label="匝道立交封闭" value="5"></el-option>
-                                <el-option label="匝道立交限行" value="6"></el-option>
-                            </el-option-group>
-                            <el-option-group label="服务区">
-                                <el-option label="服务区封闭" value="7"></el-option>
-                                <el-option label="服务区限行" value="8"></el-option>
-                            </el-option-group>
-                        </el-select>
-
-                    </el-form-item>
-                </div>
-                <div class="second">
-                    <el-row>
-                        <el-col :span="2">
-                            <div class="text">执行操作:</div>
-                        </el-col>
-                        <el-col :span="22">
-                            <FormTable ref="secondFormTable"></FormTable>
-                        </el-col>
-                    </el-row>
-                </div>
-                <!-- <div class="third">
+  <Dialog v-model="modelVisible" title="新增预案">
+    <div class="EventAddPlanDialog">
+      <ElForm :model="formData" inline :rules="rules" ref="ruleForm">
+        <div class="first">
+          <el-form-item prop="eventCategory">
+            <el-radio-group
+              v-model="formData.eventCategory"
+              @input="changeRadio"
+            >
+              <el-radio-button :label="1">交通事件</el-radio-button>
+              <el-radio-button :label="2">感知事件</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item required label="预案名称:" prop="planName">
+            <el-input
+              v-model="formData.planName"
+              placeholder="请输入预案名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item required label="事件类型:" prop="eventType">
+            <el-select
+              v-model="formData.eventType"
+              placeholder="请选择事件类型"
+              @change="changeEventType"
+            >
+              <el-option
+                v-for="item in eventOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="
+              (formData.eventCategory == 1 && formData.eventType !== 8) ||
+              formData.eventCategory == 2
+            "
+            label="触发类型:"
+            prop="triggerMechanism"
+          >
+            <el-select
+              v-if="
+                (formData.eventCategory == 1 && formData.eventType !== 6) ||
+                formData.eventCategory == 2
+              "
+              v-model="formData.triggerMechanism"
+              placeholder="请选择触发类型"
+            >
+              <el-option
+                v-for="item in mechanismOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <el-select
+              v-if="formData.eventCategory == 1 && formData.eventType == 6"
+              v-model="formData.triggerMechanism"
+              placeholder="请选择触发类型"
+            >
+              <el-option-group label="主线">
+                <el-option label="主线封闭" value="1"></el-option>
+                <el-option label="主线限行" value="2"></el-option>
+              </el-option-group>
+              <el-option-group label="收费站">
+                <el-option label="收费站封闭" value="3"></el-option>
+                <el-option label="收费站限行" value="4"></el-option>
+              </el-option-group>
+              <el-option-group label="匝道立交">
+                <el-option label="匝道立交封闭" value="5"></el-option>
+                <el-option label="匝道立交限行" value="6"></el-option>
+              </el-option-group>
+              <el-option-group label="服务区">
+                <el-option label="服务区封闭" value="7"></el-option>
+                <el-option label="服务区限行" value="8"></el-option>
+              </el-option-group>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="second">
+          <el-row>
+            <el-col :span="2">
+              <div class="text">执行操作:</div>
+            </el-col>
+            <el-col :span="22">
+              <FormTable ref="secondFormTable"></FormTable>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- <div class="third">
                     <el-row>
                         <el-col :span="2">
                             <div class="text">恢复操作:</div>
@@ -72,546 +101,572 @@
                         </el-col>
                     </el-row>
                 </div> -->
-            </ElForm>
-        </div>
+      </ElForm>
+    </div>
 
-        <template #footer>
-            <Button style="background: #C9C9C9;padding:0 24px;"
-                @click.native="modelVisible = false, submitting = false">取消</Button>
-            <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">保存</Button>
-        </template>
-    </Dialog>
+    <template #footer>
+      <Button
+        style="background: #c9c9c9; padding: 0 24px"
+        @click.native="(modelVisible = false), (submitting = false)"
+        >取消</Button
+      >
+      <Button
+        style="padding: 0 24px"
+        @click.native="handleSubmit"
+        :loading="submitting"
+        >保存</Button
+      >
+    </template>
+  </Dialog>
 </template>
 
 <script>
 import Dialog from "@screen/components/Dialog/index";
-import Form from '@screen/components/FormConfig';
-import FormTable from '../formTable/index';
-import Button from '@screen/components/Buttons/Button.vue';
-import request from '@/utils/request';
+import Form from "@screen/components/FormConfig";
+import FormTable from "../formTable/index";
+import Button from "@screen/components/Buttons/Button.vue";
+import request from "@/utils/request";
 import { Message } from "element-ui";
 
 const optionsMap = {
-    1: {
-        1: [
-            {
-                value: 1,
-                label: '雨'
-            },
-            {
-                value: 2,
-                label: '雪'
-            },
-            {
-                value: 3,
-                label: '雾'
-            },
-            {
-                value: 4,
-                label: '大风'
-            },
-            {
-                value: 5,
-                label: '低温寒潮'
-            },
-            {
-                value: 6,
-                label: '路面积雪'
-            },
-            {
-                value: 7,
-                label: '路面结冰'
-            },
-            {
-                value: 8,
-                label: '路面积水'
-            },
-            {
-                value: 9,
-                label: '其他'
-            }
-        ],
-        2: [
-            {
-                value: 1,
-                label: '侧翻'
-            },
-            {
-                value: 2,
-                label: '撞障碍物'
-            },
-            {
-                value: 3,
-                label: '货物洒落'
-            },
-            {
-                value: 4,
-                label: '撞护栏'
-            },
-            {
-                value: 5,
-                label: '自燃'
-            },
-            {
-                value: 6,
-                label: '追尾'
-            }
-        ],
-        3: [
-            {
-                value: 1,
-                label: '行人'
-            },
-            {
-                value: 2,
-                label: '非机动车'
-            },
-            {
-                value: 3,
-                label: '摩托车'
-            },
-            {
-                value: 4,
-                label: '其他'
-            }
-        ],
-        4: [
-            {
-                value: 1,
-                label: '高速主线'
-            },
-            {
-                value: 2,
-                label: '服务区'
-            },
-            {
-                value: 3,
-                label: '立交桥'
-            },
-            {
-                value: 4,
-                label: '收费站'
-            }
-        ],
-        5: [
-            {
-                value: 1,
-                label: '道路拥堵'
-            },
-            {
-                value: 2,
-                label: '立交拥堵'
-            },
-            {
-                value: 3,
-                label: '收费站拥堵'
-            },
-            {
-                value: 4,
-                label: '收费站服务区拥堵'
-            }
-        ],
-        6: [
-
-        ],
-        7: [
-            {
-                value: 1,
-                label: '封闭、暂停营业'
-            },
-            {
-                value: 2,
-                label: '重要设施停用'
-            },
-            {
-                value: 3,
-                label: '其他异常'
-            }
-        ],
-        8: [],
-        9: [
-            {
-                value: 1,
-                label: '烟雾'
-            },
-            {
-                value: 2,
-                label: '倒伏树木'
-            },
-            {
-                value: 3,
-                label: '洒落物'
-            },
-            {
-                value: 4,
-                label: '动物'
-            },
-            {
-                value: 5,
-                label: '其他'
-            }
-        ]
-    },
-    2: {
-        1: [{
-            value: 1,
-            label: '雾'
-        }],
-        2: [],
-        3: [],
-        4: [],
-        5: [],
-        6: [],
-        7: [],
-    }
+  1: {
+    1: [
+      {
+        value: 1,
+        label: "雨",
+      },
+      {
+        value: 2,
+        label: "雪",
+      },
+      {
+        value: 3,
+        label: "雾",
+      },
+      {
+        value: 4,
+        label: "大风",
+      },
+      {
+        value: 5,
+        label: "低温寒潮",
+      },
+      {
+        value: 6,
+        label: "路面积雪",
+      },
+      {
+        value: 7,
+        label: "路面结冰",
+      },
+      {
+        value: 8,
+        label: "路面积水",
+      },
+      {
+        value: 9,
+        label: "其他",
+      },
+    ],
+    2: [
+      {
+        value: 1,
+        label: "侧翻",
+      },
+      {
+        value: 2,
+        label: "撞障碍物",
+      },
+      {
+        value: 3,
+        label: "货物洒落",
+      },
+      {
+        value: 4,
+        label: "撞护栏",
+      },
+      {
+        value: 5,
+        label: "自燃",
+      },
+      {
+        value: 6,
+        label: "追尾",
+      },
+    ],
+    3: [
+      {
+        value: 1,
+        label: "行人",
+      },
+      {
+        value: 2,
+        label: "非机动车",
+      },
+      {
+        value: 3,
+        label: "摩托车",
+      },
+      {
+        value: 4,
+        label: "其他",
+      },
+    ],
+    4: [
+      {
+        value: 1,
+        label: "高速主线",
+      },
+      {
+        value: 2,
+        label: "服务区",
+      },
+      {
+        value: 3,
+        label: "立交桥",
+      },
+      {
+        value: 4,
+        label: "收费站",
+      },
+    ],
+    5: [
+      {
+        value: 1,
+        label: "道路拥堵",
+      },
+      {
+        value: 2,
+        label: "立交拥堵",
+      },
+      {
+        value: 3,
+        label: "收费站拥堵",
+      },
+      {
+        value: 4,
+        label: "收费站服务区拥堵",
+      },
+    ],
+    6: [],
+    7: [
+      {
+        value: 1,
+        label: "封闭、暂停营业",
+      },
+      {
+        value: 2,
+        label: "重要设施停用",
+      },
+      {
+        value: 3,
+        label: "其他异常",
+      },
+    ],
+    8: [],
+    9: [
+      {
+        value: 1,
+        label: "烟雾",
+      },
+      {
+        value: 2,
+        label: "倒伏树木",
+      },
+      {
+        value: 3,
+        label: "洒落物",
+      },
+      {
+        value: 4,
+        label: "动物",
+      },
+      {
+        value: 5,
+        label: "其他",
+      },
+    ],
+  },
+  2: {
+    1: [
+      {
+        value: 1,
+        label: "雾",
+      },
+    ],
+    2: [],
+    3: [],
+    4: [],
+    5: [],
+    6: [],
+    7: [],
+  },
 };
 
 export default {
-    name: 'addAndEditDialog',
-    components: {
-        Dialog,
-        Form,
-        Button,
-        FormTable
-    },
-    model: {
-        prop: 'visible',
-        event: 'close'
-    },
-    props: {
-        visible: Boolean,
-        detail: {
-            type: Object,
-            default: () => { }
-        }
+  name: "addAndEditDialog",
+  components: {
+    Dialog,
+    Form,
+    Button,
+    FormTable,
+  },
+  model: {
+    prop: "visible",
+    event: "close",
+  },
+  props: {
+    visible: Boolean,
+    detail: {
+      type: Object,
+      default: () => {},
     },
-    data() {
-        return {
-            activeName: "TrafficAccident",
-            submitting: false,
-            formConfig: {},
-            formData: {
-                eventCategory: 1,
-                eventType: 1,
-                triggeringCondition: 0
-            },
-            index: 1,
-            roads: [],
-            direction: [],
-            lwss: [],
-            eventOptions: [
-                {
-                    value: 1,
-                    label: '异常天气'
-                },
-                {
-                    value: 2,
-                    label: '交通事故'
-                },
-                {
-                    value: 3,
-                    label: '非法上路'
-                },
-                {
-                    value: 4,
-                    label: '车辆故障'
-                },
-                {
-                    value: 5,
-                    label: '交通拥堵'
-                },
-                {
-                    value: 6,
-                    label: '交通管制'
-                },
-                {
-                    value: 7,
-                    label: '服务区异常'
-                },
-                {
-                    value: 8,
-                    label: '施工建设'
-                },
-                {
-                    value: 9,
-                    label: '路障清除'
-                }
-            ],
-            mechanismOptions: [{
-                value: 1,
-                label: '雨'
-            },
-            {
-                value: 2,
-                label: '雪'
-            },
-            {
-                value: 3,
-                label: '雾'
-            },
-            {
-                value: 4,
-                label: '大风'
-            },
-            {
-                value: 5,
-                label: '低温寒潮'
-            },
-            {
-                value: 6,
-                label: '路面积雪'
-            },
-            {
-                value: 7,
-                label: '路面结冰'
-            },
-            {
-                value: 8,
-                label: '路面积水'
-            },
-            {
-                value: 9,
-                label: '其他'
-            }],
-            conditionOptions: [
-                // {
-                //     value: 1,
-                //     label: '大于(>)'
-                // },
-                {
-                    value: 1,
-                    label: '小于(<)'
-                },
-            ],
-            rules: {
-                planName: [
-                    { required: true, message: '请输入预案名称', trigger: 'blur' },
-
-                ],
-                eventType: [
-                    { required: true, message: '请选择事件类型', trigger: 'change' }
-                ],
-            }
-        }
-    },
-    created() {
-        // this.formConfig = tabConfigList[0].formConfig;
-        this.initData().then(() => {
-            this.handleChange({ index: 0 })
-        })
-    },
-    computed: {
-        modelVisible: {
-            get() {
-                return this.visible;
-            },
-            set(val) {
-                this.$emit('close', val)
-            }
+  },
+  data() {
+    return {
+      activeName: "TrafficAccident",
+      submitting: false,
+      formConfig: {},
+      formData: {
+        eventCategory: 1,
+        eventType: 1,
+        triggeringCondition: 0,
+      },
+      index: 1,
+      roads: [],
+      direction: [],
+      lwss: [],
+      eventOptions: [
+        {
+          value: 1,
+          label: "异常天气",
         },
-        getFormOptions() {
-            return {
-                column: 3,
-                ...this.formConfig.formOptions
-            }
-        }
-    },
-    methods: {
-        initData() {
-            return Promise.all([
-                //道路 
-                request({
-                    url: `/business/road/query`,
-                    method: "get",
-                }).then((result) => {
-                    if (result.code != 200) return Message.error(result?.msg);
-                    result.data.forEach(it => {
-                        this.roads.push({ key: it.id, label: it.roadName })
-                    })
-                }).catch((err) => {
-                    Message.error("查询失败4", err);
-                }),
-                //方向字典
-                request({
-                    url: `/system/dict/data/type/iot_event_direction`,
-                    method: "get",
-                }).then((result) => {
-                    if (result.code != 200) return Message.error(result?.msg);
-                    result.data.forEach(it => {
-                        this.direction.push({ key: it.dictValue, label: it.dictLabel })
-                    })
-                }).catch((err) => {
-                    Message.error("查询失败5", err);
-                }),
-                //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
-                request({
-                    url: `/business/facility/query`,
-                    method: "get"
-                }).then((result) => {
-                    if (result.code != 200) return Message.error(result?.msg);
-                    result.data.forEach(it => this.lwss.push({ key: it.id, label: it.facilityName, type: it.facilityType }))
-                }).catch((err) => {
-                    console.log('err', err)
-                    Message.error("查询失败6", err);
-                })
-
-            ])
+        {
+          value: 2,
+          label: "交通事故",
         },
-        changeEventType(value = 1) {
-            this.mechanismOptions = optionsMap[this.formData.eventCategory || 1][value];
+        {
+          value: 3,
+          label: "非法上路",
         },
-        changeRadio(value = 1) {
-            const optionsMap = {
-                1: [{
-                    value: 1,
-                    label: '异常天气'
-                },
-                {
-                    value: 2,
-                    label: '交通事故'
-                },
-                {
-                    value: 3,
-                    label: '非法上路'
-                },
-                {
-                    value: 4,
-                    label: '车辆故障'
-                },
-                {
-                    value: 5,
-                    label: '交通拥堵'
-                },
-                {
-                    value: 6,
-                    label: '交通管制'
-                },
-                {
-                    value: 7,
-                    label: '服务区异常'
-                },
-                {
-                    value: 8,
-                    label: '施工建设'
-                },
-                {
-                    value: 9,
-                    label: '路障清除'
-                }],
-                2: [{
-                    value: 1,
-                    label: '异常天气'
-                },
-                {
-                    value: 2,
-                    label: '拥堵'
-                },
-                {
-                    value: 3,
-                    label: '非机动车'
-                },
-                {
-                    value: 4,
-                    label: '行人'
-                },
-                {
-                    value: 5,
-                    label: '烟火'
-                },
-                {
-                    value: 6,
-                    label: '抛洒物'
-                },
-                {
-                    value: 7,
-                    label: '逆行'
-                },
-                ]
-            }
-            this.eventOptions = optionsMap[value];
-            this.changeEventType();
+        {
+          value: 4,
+          label: "车辆故障",
         },
-        handleChange() {
-
+        {
+          value: 5,
+          label: "交通拥堵",
         },
-        handleSubmit() {
-            this.$refs['ruleForm'].validate((valid) => {
-                if (valid) {
-                    this.submitting = true;
-                    console.log('formData', this.formData)
-                    this.modelVisible = false;
-                    this.submitting = false;
-                    // this.$emit('queryData',true)
-                    console.log(this.$refs['secondFormTable'].tableData)
-                    return;
-
-                    request({
-                        url: `/dc/system/event`,
-                        method: "post",
-                        data: {
-                            ...formData,
-                            eventType: Number(this.index) + 1,
-                            eventState: 0,
-                            stakeMark: (stakeMark && stakeMark[0] != null) ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '') : '',
-                        }
-                    }).then((result) => {
-                        if (result.code != 200) return Message.error(result?.msg);
-                        Message.success("提交成功");
-                        this.modelVisible = false;
-                    }).catch(() => {
-                        Message.error("提交失败");
-                    }).finally(() => {
-                        this.submitting = false;
-                        this.$emit('queryData', true);
-                    })
-                }
+        {
+          value: 6,
+          label: "交通管制",
+        },
+        {
+          value: 7,
+          label: "服务区异常",
+        },
+        {
+          value: 8,
+          label: "施工建设",
+        },
+        {
+          value: 9,
+          label: "路障清除",
+        },
+      ],
+      mechanismOptions: [
+        {
+          value: 1,
+          label: "雨",
+        },
+        {
+          value: 2,
+          label: "雪",
+        },
+        {
+          value: 3,
+          label: "雾",
+        },
+        {
+          value: 4,
+          label: "大风",
+        },
+        {
+          value: 5,
+          label: "低温寒潮",
+        },
+        {
+          value: 6,
+          label: "路面积雪",
+        },
+        {
+          value: 7,
+          label: "路面结冰",
+        },
+        {
+          value: 8,
+          label: "路面积水",
+        },
+        {
+          value: 9,
+          label: "其他",
+        },
+      ],
+      conditionOptions: [
+        // {
+        //     value: 1,
+        //     label: '大于(>)'
+        // },
+        {
+          value: 1,
+          label: "小于(<)",
+        },
+      ],
+      rules: {
+        planName: [{ required: true, message: "请输入预案名称" }],
+        eventType: [
+          { required: true, message: "请选择事件类型", trigger: "change" },
+        ],
+      },
+    };
+  },
+  created() {
+    // this.formConfig = tabConfigList[0].formConfig;
+    this.initData().then(() => {
+      this.handleChange({ index: 0 });
+    });
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("close", val);
+      },
+    },
+    getFormOptions() {
+      return {
+        column: 3,
+        ...this.formConfig.formOptions,
+      };
+    },
+  },
+  methods: {
+    initData() {
+      return Promise.all([
+        //道路
+        request({
+          url: `/business/road/query`,
+          method: "get",
+        })
+          .then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            result.data.forEach((it) => {
+              this.roads.push({ key: it.id, label: it.roadName });
+            });
+          })
+          .catch((err) => {
+            Message.error("查询失败4", err);
+          }),
+        //方向字典
+        request({
+          url: `/system/dict/data/type/iot_event_direction`,
+          method: "get",
+        })
+          .then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            result.data.forEach((it) => {
+              this.direction.push({ key: it.dictValue, label: it.dictLabel });
+            });
+          })
+          .catch((err) => {
+            Message.error("查询失败5", err);
+          }),
+        //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+        request({
+          url: `/business/facility/query`,
+          method: "get",
+        })
+          .then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            result.data.forEach((it) =>
+              this.lwss.push({
+                key: it.id,
+                label: it.facilityName,
+                type: it.facilityType,
+              })
+            );
+          })
+          .catch((err) => {
+            console.log("err", err);
+            Message.error("查询失败6", err);
+          }),
+      ]);
+    },
+    changeEventType(value = 1) {
+      this.mechanismOptions =
+        optionsMap[this.formData.eventCategory || 1][value];
+    },
+    changeRadio(value = 1) {
+      const optionsMap = {
+        1: [
+          {
+            value: 1,
+            label: "异常天气",
+          },
+          {
+            value: 2,
+            label: "交通事故",
+          },
+          {
+            value: 3,
+            label: "非法上路",
+          },
+          {
+            value: 4,
+            label: "车辆故障",
+          },
+          {
+            value: 5,
+            label: "交通拥堵",
+          },
+          {
+            value: 6,
+            label: "交通管制",
+          },
+          {
+            value: 7,
+            label: "服务区异常",
+          },
+          {
+            value: 8,
+            label: "施工建设",
+          },
+          {
+            value: 9,
+            label: "路障清除",
+          },
+        ],
+        2: [
+          {
+            value: 1,
+            label: "异常天气",
+          },
+          {
+            value: 2,
+            label: "拥堵",
+          },
+          {
+            value: 3,
+            label: "非机动车",
+          },
+          {
+            value: 4,
+            label: "行人",
+          },
+          {
+            value: 5,
+            label: "烟火",
+          },
+          {
+            value: 6,
+            label: "抛洒物",
+          },
+          {
+            value: 7,
+            label: "逆行",
+          },
+        ],
+      };
+      this.eventOptions = optionsMap[value];
+      this.changeEventType();
+    },
+    handleChange() {},
+    handleSubmit() {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          this.submitting = true;
+          console.log("formData", this.formData);
+          this.modelVisible = false;
+          this.submitting = false;
+          // this.$emit('queryData',true)
+          console.log(this.$refs["secondFormTable"].tableData);
+          return;
 
+          request({
+            url: `/dc/system/event`,
+            method: "post",
+            data: {
+              ...formData,
+              eventType: Number(this.index) + 1,
+              eventState: 0,
+              stakeMark:
+                stakeMark && stakeMark[0] != null
+                  ? stakeMark && stakeMark.length > 0
+                    ? "K" + stakeMark[0] + "+" + stakeMark[1]
+                    : ""
+                  : "",
+            },
+          })
+            .then((result) => {
+              if (result.code != 200) return Message.error(result?.msg);
+              Message.success("提交成功");
+              this.modelVisible = false;
             })
-
+            .catch(() => {
+              Message.error("提交失败");
+            })
+            .finally(() => {
+              this.submitting = false;
+              this.$emit("queryData", true);
+            });
         }
-    }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .fade-enter-active,
 .fade-leave-active {
-    transition: opacity .24s;
+  transition: opacity 0.24s;
 }
 
 .fade-enter,
 .fade-leave-to {
-    opacity: 0;
+  opacity: 0;
 }
 
 .EventAddPlanDialog {
-    gap: 9px;
-    width: 1080px;
-    height: 310px;
-    display: flex;
-    flex-direction: column;
+  gap: 9px;
+  width: 1080px;
+  height: 310px;
+  display: flex;
+  flex-direction: column;
 
-    .first,
-    .second,
-    .third {
-        padding: 5px 10px 8px;
-        background-color: #296887;
-        margin-bottom: 15px;
+  .first,
+  .second,
+  .third {
+    padding: 5px 10px 8px;
+    background-color: #296887;
+    margin-bottom: 15px;
 
-        .text {
-            margin-top: 12px;
-        }
+    .text {
+      margin-top: 12px;
     }
+  }
 
-    .form {
-        flex: 1;
-        overflow-y: auto;
-    }
+  .form {
+    flex: 1;
+    overflow-y: auto;
+  }
 
-    .footer {
-        display: flex;
-        justify-content: end;
-        gap: 15px;
-    }
+  .footer {
+    display: flex;
+    justify-content: end;
+    gap: 15px;
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index 48dba99f..95620ed0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -46,7 +46,7 @@
           ></Empty>
           <div ref="queryChart" class="keep-ratio"></div>
         </div>
-        <div style="position: relative">
+        <div style="position: relative; bottom: 15px">
           <Empty
             v-if="isEmpty02"
             class="floatEmpty"
@@ -55,7 +55,7 @@
           <el-table
             :border="false"
             :data="tableData"
-            height="480"
+            height="420"
             header-align="left"
             empty-text=" "
           >
@@ -112,7 +112,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="foot">
+          <div class="footer">
             <Pagination
               @current-change="changePage"
               width="'100%'"
@@ -327,7 +327,6 @@ export default {
           }
         }
         this.equipments = allList;
-        console.log("Equipments", allList);
       });
     },
     setStatus(id, status) {
@@ -415,6 +414,33 @@ export default {
   },
   async mounted() {
     await this.initData();
+    // let data = [5, 2, 6, 8, 1, 0, 3, 4, 7, 9];
+    // for (var i = 0; i < data.length; i++) {
+    //   for (var j = i + 1; j < data.length; j++) {
+    //     if (data[i] > data[j]) {
+    //       var temp = data[i];
+    //       data[i] = data[j];
+    //       data[j] = temp;
+    //     }
+    //   }
+    // }
+    // data.sort(function (a, b) {
+    //   return a - b;
+    // });
+    // for (var i = 0; i < data.length - 1; i++) {
+    //   var minIndex = i;
+    //   for (var j = i + 1; j < arr.length; j++) {
+    //     if (data[minIndex] > data[j]) {
+    //       minIndex = j;
+    //     }
+    //   }
+    //   if (i != minIndex) {
+    //     var temp = data[i];
+    //     data[minIndex] = data[i];
+    //     data[i] = temp;
+    //   }
+    // }
+    // console.log("排序", data);
   },
 };
 </script>
@@ -630,4 +656,11 @@ export default {
     }
   }
 }
+.footer {
+  margin: 15px 0;
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
index 29d97c08..1ce6f72f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
@@ -106,7 +106,7 @@ var options = {
         "梁山-枢纽",
         "鄄郓-枢纽",
         "嘉祥西-枢纽",
-        "王官中-枢纽",
+        "王官屯-枢纽",
       ],
       position: "top",
       axisLabel: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
index 2cb11ca3..30d4e810 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
@@ -32,6 +32,7 @@
         type="input"
         params="word"
         :disable="true"
+        placeholder="请输入敏感词，回车搜索"
         @handleSearch="handleSearch"
       />
     </div>
@@ -83,6 +84,7 @@
       <Pagination
         :total="numTotal"
         :current-page.sync="currentPage"
+        :page-sizes="[35, 70, 105, 140, 175]"
         :page-size="pageSize"
         layout="total,sizes,prev, pager, next, jumper"
         @size-change="handleSizeChange"
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 1f1ab1c8..ccea820f 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -18,9 +18,7 @@
             <el-input
               v-model="loginForm.username"
               type="text"
-              auto-complete="off"
               placeholder="请输入用户名"
-              class="username"
             >
               <img
                 slot="prefix"
@@ -263,7 +261,7 @@ export default {
   font-weight: 400;
   color: #999999;
   border: 1px solid rgba(0, 145, 67, 0.5);
-  // margin-left: 20px;
+  caret-color: #39adff;
 }
 
 ::v-deep .el-checkbox__label {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 1a83dbf6..70680bb6 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -53,7 +53,8 @@ module.exports = {
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
         // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
-        target: `http://10.168.68.42:8087`, //王思祥 
+        target: `http://10.168.68.42:8087`, //王思祥
+        // target: `http://10.168.65.156:8097`, //孟
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",