From 29f64ddebc6ca8d5bd6cd03dc791fedd430c0df3 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Tue, 12 Mar 2024 15:52:55 +0800
Subject: [PATCH 1/6] =?UTF-8?q?bug=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/RoadStateCard/index.vue        | 104 ++++++++++--------
 .../components/AddNEditDialog.vue             |  74 +++++++------
 2 files changed, 98 insertions(+), 80 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
index bdbee4b9..67d4a0be 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
@@ -1,11 +1,18 @@
 <template>
-  <BorderRadiusImage class='RoadStateCard' borderRadius="2px"
-    borderColor="linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0))" borderWidth="2px">
+  <BorderRadiusImage
+    class="RoadStateCard"
+    borderRadius="2px"
+    borderColor="linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0))"
+    borderWidth="2px"
+  >
     <div class="left">
       <!-- <img :src="(cardData.pictures ? cardData.pictures[0] : null) || require(`./test.png`)"> -->
       <!-- <img :src="require(`./test.png`)"> -->
-      <ElImage style="width: 212px; height: 159px;" :src="cardData.pictures ? cardData.pictures[0] : null"
-        :preview-src-list="cardData.pictures || []">
+      <ElImage
+        style="width: 212px; height: 159px"
+        :src="cardData.pictures ? cardData.pictures[0] : null"
+        :preview-src-list="cardData.pictures || []"
+      >
         <div slot="error">
           <i class="el-icon-picture-outline icon"></i>
         </div>
@@ -19,27 +26,35 @@
         </p>
       </div>
       <div class="controls">
-        <Button :style="{ background: firstBtnColor, width: '50%' }"
-          @click.native="$emit('firstBtnClick', cardData.id)">{{
-        getFirstBtnText(cardData.state)
-      }}</Button>
-        <Button v-if="cardData.state == 4" :style="{ background: lastBtnColor, width: '50%' }"
-          @click.native="$emit('lastBtnClick', cardData.id)">{{ getLastBtnText(cardData.state)
-          }}</Button>
+        <Button
+          :style="{ background: firstBtnColor, width: '50%' }"
+          @click.native="$emit('firstBtnClick', cardData.id)"
+          >{{ getFirstBtnText(cardData.state) }}</Button
+        >
+        <Button
+          v-if="cardData.state == 4"
+          :style="{ background: lastBtnColor, width: '50%' }"
+          @click.native="$emit('lastBtnClick', cardData.id)"
+          >{{ getLastBtnText(cardData.state) }}</Button
+        >
       </div>
     </div>
 
-    <img v-if="cardData.state" class="status" :src="require(`./images/${statusMap[cardData.state]}.svg`) " />
+    <img
+      v-if="cardData.state"
+      class="status"
+      :src="require(`./images/${statusMap[cardData.state]}.svg`)"
+    />
   </BorderRadiusImage>
 </template>
 
 <script>
 import Button from "@screen/components/Buttons/Button.vue";
 import BorderRadiusImage from "@screen/components/BorderRadiusImage.vue";
-import { statusMap } from "./data.js"
+import { statusMap } from "./data.js";
 
 export default {
-  name: 'RoadStateCard',
+  name: "RoadStateCard",
   props: {
     cardData: {
       type: Object,
@@ -48,80 +63,80 @@ export default {
         source: "视频智能识别",
         location: "k100+000",
         direction: "济南方向",
-      })
+      }),
     },
     firstBtnText: {
       type: String,
-      default: "详情"
+      default: "详情",
     },
     lastBtnText: {
       type: String,
-      default: "调度记录"
+      default: "调度记录",
     },
     firstBtnColor: {
       type: String,
-      default: "#00B3CC"
+      default: "#00B3CC",
     },
     lastBtnColor: {
       type: String,
-      default: "#CB7A00"
+      default: "#CB7A00",
     },
     keyMap: {
       type: Array,
-      default: () => ([
+      default: () => [
         {
           key: "stringEventType",
-          label: "事件"
+          label: "事件",
         },
         {
           key: "stringEventSource",
-          label: "来源"
+          label: "来源",
         },
         {
           key: "stakeMark",
-          label: "位置"
+          label: "位置",
         },
         {
           key: "stringDirection",
-          label: "方向"
+          label: "方向",
         },
         {
           key: "startTime",
-          label: "时间"
+          label: "时间",
         },
-      ])
-    }
+      ],
+    },
   },
   data() {
     return {
-      picUrl: './test.png'
-    }
+      picUrl: "./test.png",
+    };
   },
-  emit: ['firstBtnClick', "lastBtnClick"],
+  emit: ["firstBtnClick", "lastBtnClick"],
   components: {
     Button,
-    BorderRadiusImage
+    BorderRadiusImage,
   },
   created() {
     this.statusMap = statusMap;
   },
   methods: {
     getFirstBtnText(state) {
-      let text = '详情';
-      if (state == 5) text = '去确认'
-      if (state == 4) text = '详情'
-      if (state == 3) text = '处置记录'
+      let text = "详情";
+      if (state == 5) text = "去确认";
+      if (state == 4) text = "详情";
+      if (state == 3) text = "处置记录";
       return text;
     },
     getLastBtnText(state) {
-      let text = '去处置';
+      let text = "去处置";
       return text;
     },
-  }
-}
+  },
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .RoadStateCard {
   color: #fff;
   display: flex;
@@ -143,7 +158,7 @@ export default {
     }
 
     .icon {
-      display:inline-block;
+      display: inline-block;
       width: 212px;
       height: 159px;
       line-height: 157px;
@@ -165,13 +180,13 @@ export default {
       display: flex;
       flex-direction: column;
 
-      >p {
+      > p {
         font-size: 12px;
         color: #f4f4f4;
         line-height: 24px;
 
-        &:nth-child(-n+2) {
-          color: #37E7FF;
+        &:nth-child(-n + 2) {
+          color: #37e7ff;
           font-size: 16px;
           font-weight: bold;
         }
@@ -179,7 +194,6 @@ export default {
         &:nth-child(2) {
           margin-bottom: 3px;
         }
-
       }
 
       .linText {
@@ -198,7 +212,7 @@ export default {
       display: flex;
       gap: 9px;
 
-      >div {
+      > div {
         // flex: 1;
       }
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
index ac61a401..7f75001e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
@@ -1,24 +1,32 @@
 <template>
   <Dialog v-model="modelVisible" :title="data ? '修改' : '新增'">
-    <div class='AddNEditDialog'>
-      <Form v-model="formData" class="form" ref="FormConfigRef" :formList="formList" column="1" labelWidth="90px" />
+    <div class="AddNEditDialog">
+      <Form
+        v-model="formData"
+        class="form"
+        ref="FormConfigRef"
+        :formList="formList"
+        column="1"
+        labelWidth="90px"
+      />
     </div>
 
     <template #footer>
-      <Button style="background-color: rgba(0, 179, 204, .3);" @click.native="modelVisible = false, submitting = false">
+      <Button
+        style="background-color: rgba(0, 179, 204, 0.3)"
+        @click.native="(modelVisible = false), (submitting = false)"
+      >
         取消
       </Button>
-      <Button @click.native="handleSubmit" :loading="submitting">
-        确定
-      </Button>
+      <Button @click.native="handleSubmit" :loading="submitting"> 确定 </Button>
     </template>
   </Dialog>
 </template>
 
 <script>
 import Dialog from "@screen/components/Dialog/index.vue";
-import Button from "@screen/components/Buttons/Button.vue"
-import Form from '@screen/components/FormConfig';
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
 
 import request from "@/utils/request";
 import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
@@ -26,21 +34,21 @@ import { Message } from "element-ui";
 import * as PresetFormItems from "@screen/common/PresetFormItems.js";
 
 export default {
-  name: 'AddNEditDialog',
+  name: "AddNEditDialog",
   components: {
     Dialog,
     Button,
-    Form
+    Form,
   },
   model: {
-    prop: 'visible',
-    event: "update:value"
+    prop: "visible",
+    event: "update:value",
   },
   props: {
     visible: Boolean,
-    data: Object
+    data: Object,
   },
-  inject: ['setCurrentPage'],
+  inject: ["setCurrentPage"],
   data() {
     return {
       submitting: false,
@@ -68,7 +76,7 @@ export default {
         PresetFormItems.releaseChannel,
         {
           label: "审核方式:",
-          key: "level",
+          key: "process",
           type: "RadioGroup",
           isAlone: true,
           options: {
@@ -89,21 +97,20 @@ export default {
           label: "启用日期:",
           key: "startDate",
           type: "DatePicker",
-          required: true
-        }
-
-      ]
-    }
+          required: true,
+        },
+      ],
+    };
   },
   computed: {
     modelVisible: {
       get() {
-        return this.visible
+        return this.visible;
       },
       set(val) {
-        this.$emit('update:value', val)
-      }
-    }
+        this.$emit("update:value", val);
+      },
+    },
   },
   watch: {
     modelVisible: {
@@ -112,24 +119,21 @@ export default {
         if (!bool) return;
 
         this.formData = {
-          ...this.data
-        }
+          ...this.data,
+        };
 
         this.getOptions();
-      }
-    }
+      },
+    },
   },
   methods: {
-    getOptions() {
-    },
-    handleSubmit() {
-
-    }
+    getOptions() {},
+    handleSubmit() {},
   },
-}
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .AddNEditDialog {
   width: 450px;
   height: 200px;

From 2365b13795059a5631f5806dd5bad77617e19c6b Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Wed, 13 Mar 2024 16:50:00 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/MonthlyEquipment/index.js    |  90 +++++-----
 .../components/InputSearch/index.vue          |   2 +-
 .../views/dutyOfficer/index.vue               | 166 ++++++++++--------
 .../statisticalAnalysis/assets/charts.js      |   4 +-
 .../statisticalAnalysis/data.js               |  36 ++--
 .../statisticalAnalysis/index.vue             |  41 +++--
 6 files changed, 185 insertions(+), 154 deletions(-)

diff --git a/ruoyi-ui/src/api/MonthlyEquipment/index.js b/ruoyi-ui/src/api/MonthlyEquipment/index.js
index bb6cc820..9921dfbb 100644
--- a/ruoyi-ui/src/api/MonthlyEquipment/index.js
+++ b/ruoyi-ui/src/api/MonthlyEquipment/index.js
@@ -1,49 +1,55 @@
-import request from '@/utils/request'
-import { download } from '../../utils/request'
+import request from "@/utils/request";
+import { download } from "../../utils/request";
 // 全景数据 - 运行环境接口
 
-
 // 设备状态柱状图按时间和类型
 export function getSystemStatusList(query) {
-    return request({
-      url: '/system/status/list',
-      method: 'get',
-      params: {
-        ...query,
-      }
-    })
-  }
-
-  //设备状态列表按时间和类型
-  export function getSystemStatusTabList(query) {
-    //system/status/tablist
-    return request({
-        url: '/system/status/tablist',
-        method: 'get',
-        params: {
-          ...query,
-        }
-      })
-  }
+  return request({
+    url: "/system/status/list",
+    method: "get",
+    params: {
+      ...query,
+    },
+  });
+}
 
+//设备状态列表按时间和类型
+export function getSystemStatusTabList(query) {
+  //system/status/tablist
+  return request({
+    url: "/system/status/tablist",
+    method: "get",
+    params: {
+      ...query,
+    },
+  });
+}
 
-   //设备状态列表按类型
-   export function getSystemStatusType() {
-    //system/status/tablist
-    return request({
-        url: '/system/status/type',
-        method: 'get',
-        params: {
-        //  ...query,
-        }
-      })
-  }
-  //system/status/type
+//设备状态列表按类型
+export function getSystemStatusType() {
+  //system/status/tablist
+  return request({
+    url: "/system/status/type",
+    method: "get",
+  });
+}
+//system/status/type
 
-    //设备状态列表按类型
-   export function getSystemStatusExport(query) {
-    //system/status/export
-   //return download('/system/status/export',query,"file.xlsx");
-    return request.post('/system/status/export?startTime='+query.startTime+"&time="+ query.time +"&type="+query.type,{},{ headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      responseType: 'blob'})
-  }
\ No newline at end of file
+//设备状态列表按类型
+export function getSystemStatusExport(query) {
+  //system/status/export
+  //return download('/system/status/export',query,"file.xlsx");
+  return request.post(
+    "/system/status/export?startTime=" +
+      query.startTime +
+      "&time=" +
+      query.time +
+      "&type=" +
+      query.type,
+    {},
+    {
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      responseType: "blob",
+    }
+  );
+}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
index 36f75163..a0cb7305 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
@@ -118,7 +118,7 @@ export default {
       },
     };
   },
-  emit: ["handleSearch"],
+  emit: ["handleSearch", "handleResetForm"],
   computed: {
     getFormConfigOptions() {
       return {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
index 5c0b1e6a..87874eb6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class='DutyOfficer'>
+  <div class="DutyOfficer">
     <div class="filter">
       <div>
         <ButtonGradient @click.native="handleExport">
@@ -34,25 +34,28 @@
         </ButtonGradient>
       </div>
 
-      <InputSearch 
-        style="width: 402px;" 
-        :formList="searchFormList" 
+      <InputSearch
+        style="width: 402px"
+        :formList="searchFormList"
         :formConfigOptions="{ labelWidth: '100px' }"
         placeholder="请输入姓名、电话，回车搜索"
         type="input"
         :params="params"
-        @handleSearch="handleSearch" />
+        @handleSearch="handleSearch"
+      />
     </div>
 
     <div class="body">
-      <ElEmpty v-if="!data.length && !isFirst" description="暂无数据" style="width: 100%;height: 100%;position: absolute;" />
+      <ElEmpty
+        v-if="!data.length && !isFirst"
+        description="暂无数据"
+        style="width: 100%; height: 100%; position: absolute"
+      />
       <!-- <div v-if="!data.length && !isFirst" class="no-data" style="position: absolute">暂无数据</div> -->
 
       <SpecialTable v-else :columns="columns" :data="data" class="body">
         <template #title-DateDuty>
-          <div class="special-title">
-            值班中心
-          </div>
+          <div class="special-title">值班中心</div>
         </template>
         <template #content-date="{ data }">
           <div class="item">
@@ -64,46 +67,62 @@
           <div class="parent">
             <div class="item">
               <img src="@screen/images/form/location.svg" />
-              {{ data['organizationName'] }}
+              {{ data["organizationName"] }}
             </div>
           </div>
         </template>
         <template #content-dayShift="{ data }">
           <div class="item-parent" v-if="data.dayShift && data.dayShift.length">
-            <div class="item" v-for="(item,index) in data.dayShift" :key="index" >
+            <div
+              class="item"
+              v-for="(item, index) in data.dayShift"
+              :key="index"
+            >
               <img src="@screen/images/form/people.svg" />
               {{ item.name }}
             </div>
           </div>
-          <div class="no-data" v-else>
-            无值班人员
-          </div>
+          <div class="no-data" v-else>无值班人员</div>
         </template>
         <template #content-graveyardShift="{ data }">
-          <div class="item-parent" v-if="data.graveyardShift && data.graveyardShift.length">
-            <div class="item" v-for="(item,index) in data.graveyardShift" :key="index">
+          <div
+            class="item-parent"
+            v-if="data.graveyardShift && data.graveyardShift.length"
+          >
+            <div
+              class="item"
+              v-for="(item, index) in data.graveyardShift"
+              :key="index"
+            >
               <img src="@screen/images/form/people.svg" />
               {{ item.name }}
             </div>
           </div>
-          <div class="no-data" v-else>
-            无值班人员
-          </div>
+          <div class="no-data" v-else>无值班人员</div>
         </template>
         <template #operation-content="{ data }">
-          <ButtonGradient class="operate-button" @click.native="handleModifyDutyInformationTable(true, data)">
+          <ButtonGradient
+            class="operate-button"
+            @click.native="handleModifyDutyInformationTable(true, data)"
+          >
             <template #prefix>
               <img src="@screen/images/form/edit.svg" />
             </template>
             修改
           </ButtonGradient>
-          <ButtonGradient class="operate-button" @click.native="handleOperateRecord(true, data)">
+          <ButtonGradient
+            class="operate-button"
+            @click.native="handleOperateRecord(true, data)"
+          >
             <template #prefix>
               <img src="@screen/images/form/record.svg" />
             </template>
             记录
           </ButtonGradient>
-          <ButtonGradient class="operate-button" @click.native="handleDelete(data)">
+          <ButtonGradient
+            class="operate-button"
+            @click.native="handleDelete(data)"
+          >
             <template #prefix>
               <img src="@screen/images/form/delete.svg" />
             </template>
@@ -112,61 +131,67 @@
         </template>
       </SpecialTable>
     </div>
-    
 
-    <OperateRecord :visible="operateRecordVisible" @close="handleOperateRecord(false)" :data="dialogData" />
+    <OperateRecord
+      :visible="operateRecordVisible"
+      @close="handleOperateRecord(false)"
+      :data="dialogData"
+    />
 
-    <ModifyDutyInformationTable :visible="modifyDutyInformationTableVisible" :data="dialogData"
-      @close="handleModifyDutyInformationTable(false)" />
+    <ModifyDutyInformationTable
+      :visible="modifyDutyInformationTableVisible"
+      :data="dialogData"
+      @close="handleModifyDutyInformationTable(false)"
+    />
   </div>
 </template>
 
 <script>
-import SpecialTable from "./../../components/SpecialTable.vue"
-import OperateRecord from "./components/OperateRecord.vue"
-import ModifyDutyInformationTable from "./components/ModifyDutyInformationTable.vue"
-import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
-import InputSearch from '@screen/components/InputSearch/index.vue';
+import SpecialTable from "./../../components/SpecialTable.vue";
+import OperateRecord from "./components/OperateRecord.vue";
+import ModifyDutyInformationTable from "./components/ModifyDutyInformationTable.vue";
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
+import InputSearch from "@screen/components/InputSearch/index.vue";
 
 import { searchFormList } from "./data";
 import request from "@/utils/request";
-import { setLoading } from "@screen/utils/index.js"
+import { setLoading } from "@screen/utils/index.js";
 import { delay, exportFile, confirm, uploadFile } from "@screen/utils/common";
 import { Message } from "element-ui";
 import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
 
 export default {
-  name: 'DutyOfficer',
+  name: "DutyOfficer",
   components: {
     SpecialTable,
     OperateRecord,
     ModifyDutyInformationTable,
     ButtonGradient,
-    InputSearch
+    InputSearch,
   },
-  inject: ['getPagination', 'setTotal', 'setCurrentPage'],
+  inject: ["getPagination", "setTotal", "setCurrentPage"],
   data() {
     return {
       columns: [
         {
           key: "date",
           title: "值班日期",
-          width: "210px"
+          width: "210px",
         },
         {
           key: "organizationName",
           title: "驻点",
-          width: "240px"
+          width: "240px",
         },
         {
           key: "dayShift",
           title: "白班",
-          width: "510px"
+          width: "510px",
         },
         {
           key: "graveyardShift",
           title: "夜班",
-          width: "510px"
+          width: "510px",
         },
       ],
       data: [],
@@ -177,8 +202,8 @@ export default {
           required: false,
           type: "datePicker",
           options: {
-            valueFormat: "yyyy-MM-dd"
-          }
+            valueFormat: "yyyy-MM-dd",
+          },
         },
         {
           label: "驻点:",
@@ -195,7 +220,7 @@ export default {
       dialogData: null,
       isFirst: true,
       params: "name",
-    }
+    };
   },
   created() {
     this.getData();
@@ -203,7 +228,6 @@ export default {
   },
   methods: {
     async getOptions() {
-
       const result = await getSelectOptionsStation(2);
 
       this.searchFormList[1].options.options = result;
@@ -230,8 +254,8 @@ export default {
         filename: "机构值班表",
         data: {
           ...this.searchData,
-          ...this.getPagination()
-        }
+          ...this.getPagination(),
+        },
       });
     },
     handleExportTemplate() {
@@ -240,8 +264,8 @@ export default {
         filename: "机构值班表面板",
         data: {
           ...this.searchData,
-          ...this.getPagination()
-        }
+          ...this.getPagination(),
+        },
       });
     },
     handleSearch(data) {
@@ -258,35 +282,36 @@ export default {
         method: "get",
         params: {
           ...this.searchData,
-          ...this.getPagination()
-        }
+          ...this.getPagination(),
+        },
       })
-        .then(result => {
+        .then((result) => {
           if (result.code != 200) return;
-          this.data = result.rows.map(item => {
+          this.data = result.rows.map((item) => {
             const result = {
               date: item.date,
               organizationName: item.organizationName,
               station: item.station,
-              id: item.id
-            }
+              id: item.id,
+            };
 
-            item.shiftsList.forEach(item => {
-              const key = { 1: 'dayShift', 2: 'graveyardShift' }[item.scheduling];
+            item.shiftsList.forEach((item) => {
+              const key = { 1: "dayShift", 2: "graveyardShift" }[
+                item.scheduling
+              ];
               if (!result[key]) result[key] = [];
 
               result[key].push(item);
-            })
-
+            });
 
-            return result
+            return result;
           });
           this.setTotal(result.total);
         })
         .finally(() => {
           this.isFirst = false;
           closeLoading();
-        })
+        });
     },
     async handleDelete(data) {
       await confirm({ message: "是否要删除该值班信息?" });
@@ -297,31 +322,30 @@ export default {
         data: {
           date: data.date,
           station: data.station,
-        }
+        },
       })
-        .then(result => {
+        .then((result) => {
           if (result.code != 200) return Message.error("删除失败");
-          this.setCurrentPage(1)
+          this.setCurrentPage(1);
 
-          Message.success("删除成功")
+          Message.success("删除成功");
         })
         .catch(() => {
-          Message.error("删除失败")
-        })
+          Message.error("删除失败");
+        });
     },
 
     uploadFile() {
       uploadFile({ url: "/business/shifts/importEquipment" });
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .DutyOfficer {
-
   .special-title {
-    background: linear-gradient(180deg, #FFC071 0%, #D68D00 100%);
+    background: linear-gradient(180deg, #ffc071 0%, #d68d00 100%);
     background-clip: text;
     color: transparent;
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js
index ad0fdad3..5aaab11d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js
@@ -48,9 +48,7 @@ let options = {
   },
   yAxis: [
     {
-      min: 0,
-      max: 100,
-      type: "value",
+      type: "category",
       minInterval: 20,
       maxInterval: 20,
       name: "",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js
index a7115be6..3d40280c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js
@@ -43,75 +43,75 @@ export const searchFormList = [
     key: "type",
     required: true,
     type: "select",
-    default: "1",
+    default: "1-1",
     options: {
       options: [
         {
-          value: "1",
+          value: "1-1",
           label: "高清网络枪型固定摄像机",
         },
         {
-          value: "2",
+          value: "1-2",
           label: "高清网络球形摄像机",
         },
         {
-          value: "3",
+          value: "1-3",
           label: "桥下高清网络球形摄像机",
         },
         {
-          value: "4",
+          value: "1-4",
           label: "360°全景摄像机",
         },
         {
-          value: "5",
+          value: "1-5",
           label: "180°全景摄像机",
         },
         {
-          value: "6",
+          value: "2-1",
           label: "门架式可变信息标志",
         },
         {
-          value: "7",
+          value: "2-3",
           label: "雨棚可变信息标志",
         },
         {
-          value: "8",
+          value: "2-4",
           label: "站前悬臂式可变信息标志",
         },
         {
-          value: "9",
+          value: "3",
           label: "气象检测器",
         },
         {
-          value: "10",
+          value: "5",
           label: "路段语音广播系统",
         },
         {
-          value: "11",
+          value: "6",
           label: "护栏碰撞预警系统",
         },
         {
-          value: "12",
+          value: "7",
           label: "毫米波雷达",
         },
         {
-          value: "13",
+          value: "8",
           label: "合流区预警系统",
         },
         {
-          value: "14",
+          value: "10",
           label: "激光疲劳唤醒",
         },
         {
-          value: "15",
+          value: "11",
           label: "一类交通量调查站",
         },
         {
-          value: "16",
+          value: "12",
           label: "智能行车诱导系统",
         },
         {
-          value: "17",
+          value: "13",
           label: "智能设备箱",
         },
       ],
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 779e0763..e7ae63fe 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -80,23 +80,23 @@
             </el-table-column>
             <el-table-column prop="type" label="型号" width="">
               <template slot-scope="scope">
-                <div v-if="scope.row.type == 1">高清网络枪型固定摄像机</div>
-                <div v-if="scope.row.type == 2">高清网络球形摄像机</div>
-                <div v-if="scope.row.type == 3">桥下高清网络球形摄像机</div>
-                <div v-if="scope.row.type == 4">360°全景摄像机</div>
-                <div v-if="scope.row.type == 5">180°全景摄像机</div>
-                <div v-if="scope.row.type == 6">门架式可变信息标志</div>
-                <div v-if="scope.row.type == 7">雨棚可变信息标志</div>
-                <div v-if="scope.row.type == 8">站前悬臂式可变信息标志</div>
-                <div v-if="scope.row.type == 9">气象检测器</div>
-                <div v-if="scope.row.type == 10">路段语音广播系统</div>
-                <div v-if="scope.row.type == 11">护栏碰撞预警系统</div>
-                <div v-if="scope.row.type == 12">毫米波雷达</div>
-                <div v-if="scope.row.type == 13">合流区预警系统</div>
-                <div v-if="scope.row.type == 14">激光疲劳唤醒</div>
-                <div v-if="scope.row.type == 15">一类交通量调查站</div>
-                <div v-if="scope.row.type == 16">智能行车诱导系统</div>
-                <div v-if="scope.row.type == 17">智能设备箱</div>
+                <div v-if="scope.row.type == '1-1'">高清网络枪型固定摄像机</div>
+                <div v-if="scope.row.type == '1-2'">高清网络球形摄像机</div>
+                <div v-if="scope.row.type == '1-3'">桥下高清网络球形摄像机</div>
+                <div v-if="scope.row.type == '1-4'">360°全景摄像机</div>
+                <div v-if="scope.row.type == '1-5'">180°全景摄像机</div>
+                <div v-if="scope.row.type == '2-1'">门架式可变信息标志</div>
+                <div v-if="scope.row.type == '2-3'">雨棚可变信息标志</div>
+                <div v-if="scope.row.type == '2-4'">站前悬臂式可变信息标志</div>
+                <div v-if="scope.row.type == '3'">气象检测器</div>
+                <div v-if="scope.row.type == '5'">路段语音广播系统</div>
+                <div v-if="scope.row.type == '6'">护栏碰撞预警系统</div>
+                <div v-if="scope.row.type == '7'">毫米波雷达</div>
+                <div v-if="scope.row.type == '8'">合流区预警系统</div>
+                <div v-if="scope.row.type == '10'">激光疲劳唤醒</div>
+                <div v-if="scope.row.type == '11'">一类交通量调查站</div>
+                <div v-if="scope.row.type == '12'">智能行车诱导系统</div>
+                <div v-if="scope.row.type == '13'">智能设备箱</div>
               </template>
             </el-table-column>
             <el-table-column prop="network" label="网段" width="">
@@ -249,7 +249,7 @@ export default {
       this.startTime = moment(data.time[0]).format("YYYY-MM-DD HH:mm:ss");
       this.time = moment(data.time[1]).format("YYYY-MM-DD HH:mm:ss");
       let typeText =
-        this.searchFormList[1].options.options[this.typeQuery - 1].label;
+        this.searchFormList[1].options.options[this.typeQuery - 1]?.label;
       this.searchText = `${moment(this.startTime).format(
         "YYYY年MM月DD日"
       )}-${moment(this.time).format("YYYY年MM月DD日")},${typeText}`;
@@ -327,6 +327,7 @@ export default {
           }
         }
         this.equipments = allList;
+        console.log("Equipments", allList);
       });
     },
     setStatus(id, status) {
@@ -413,8 +414,10 @@ export default {
     },
   },
   async mounted() {
-    console.log("__________________", searchFormList[0].default);
     await this.initData();
+    let data = [1, 5, 10, 88, 9, 5, 52, 35];
+    let a = Array.from(5, 10, 88, 9, 5);
+    console.log(888, a);
   },
 };
 </script>

From 74ecfbfb190f9bba18104efcaa659959cea76840 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Wed, 13 Mar 2024 16:50:33 +0800
Subject: [PATCH 3/6] a

---
 .../pages/maintenanceOperations/statisticalAnalysis/index.vue  | 3 ---
 1 file changed, 3 deletions(-)

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 e7ae63fe..f0933ae9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -415,9 +415,6 @@ export default {
   },
   async mounted() {
     await this.initData();
-    let data = [1, 5, 10, 88, 9, 5, 52, 35];
-    let a = Array.from(5, 10, 88, 9, 5);
-    console.log(888, a);
   },
 };
 </script>

From 4812ca035fc6b47a1d4c29e544949552b01365e9 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Wed, 13 Mar 2024 16:56:23 +0800
Subject: [PATCH 4/6] 1

---
 .../pages/maintenanceOperations/statisticalAnalysis/index.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f0933ae9..48dba99f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -141,7 +141,7 @@ import {
   getSystemStatusType,
   getSystemStatusExport,
 } from "../../../../../api/MonthlyEquipment";
-import { download } from "../../../../../utils/request.js";
+// import { download } from "../../../../../utils/request.js";
 import Pagination from "@screen/components/Pagination.vue";
 import InputSearch from "@screen/components/InputSearch/index.vue";
 import { searchFormList } from "./data";

From 29e3b4d66fa8fabd3c93bb500f63f0ac9ee6416d Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Wed, 13 Mar 2024 17:05:08 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=80=E8=BF=91?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E7=AD=BE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/layout/index.vue                 |   2 -
 ruoyi-ui/src/router/routerCreater.js          |   2 +-
 ruoyi-ui/src/store/index.js                   |   4 +-
 ruoyi-ui/src/store/modules/menu.js            |  22 +++
 .../JiHeExpressway/common/PresetFormItems.js  |   8 +-
 .../components/FormConfig/index.vue           |   1 -
 .../components/HeaderMenu/CustomMenu.vue      |   1 +
 .../components/HeaderMenu/index.vue           | 187 +++++++++---------
 .../components/RecentPages/index.vue          |  89 +++++++++
 .../views/JiHeExpressway/components/empty.vue |   1 -
 ruoyi-ui/src/views/JiHeExpressway/index.vue   |   7 +-
 .../Home/components/HomeFilter/index.vue      |   2 +-
 .../views/JiHeExpressway/pages/developing.vue |   1 -
 .../src/views/event/event/dispatchYuan.vue    |   3 -
 ruoyi-ui/vue.config.js                        |   2 +-
 15 files changed, 224 insertions(+), 108 deletions(-)
 create mode 100644 ruoyi-ui/src/store/modules/menu.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue

diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index fe8f9720..8a009c49 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -274,8 +274,6 @@ export default {
     },
   },
   created() {
-    console.log(this.titleHeader, "this.titleHeader");
-    console.log(this.$route.path, "路由");
     if (this.$route.path == "/tunnel") {
       if (
         this.sideTheme == "theme-blue" ||
diff --git a/ruoyi-ui/src/router/routerCreater.js b/ruoyi-ui/src/router/routerCreater.js
index 75122681..c912b31d 100644
--- a/ruoyi-ui/src/router/routerCreater.js
+++ b/ruoyi-ui/src/router/routerCreater.js
@@ -34,7 +34,7 @@ function processNode(node) {
       path: item.path || "",
       title: item.title,
       name: item.name,
-      meta: { menuId : prev + "_" + ids.join("-") }
+      meta: { menuId : prev + "_" + ids.join("-"), title : item.title}
     };
 
     if (item.redirect) {
diff --git a/ruoyi-ui/src/store/index.js b/ruoyi-ui/src/store/index.js
index f6f93335..72a61d40 100644
--- a/ruoyi-ui/src/store/index.js
+++ b/ruoyi-ui/src/store/index.js
@@ -9,6 +9,7 @@ import settings from './modules/settings'
 import wsData from './modules/wsData'
 import getters from './getters'
 import manage from './modules/manage'
+import menu from './modules/menu'
 
 Vue.use(Vuex)
 
@@ -21,7 +22,8 @@ const store = new Vuex.Store({
     permission,
     settings,
     wsData,
-    manage
+    manage,
+    menu,
   },
   getters
 })
diff --git a/ruoyi-ui/src/store/modules/menu.js b/ruoyi-ui/src/store/modules/menu.js
new file mode 100644
index 00000000..7e6c0b2b
--- /dev/null
+++ b/ruoyi-ui/src/store/modules/menu.js
@@ -0,0 +1,22 @@
+const state = {
+  recentPages: []
+  }
+  
+  const mutations = {
+
+    addRecent(state, item) {
+      if (state.recentPages.find(unit => unit.path == item.path)) return;
+      state.recentPages.push(item);
+    },
+    removeRecent(state, item) {
+      let i = state.recentPages.findIndex(unit => unit.path == item.path);
+      state.recentPages.splice(i, 1);
+    }
+
+  }
+  
+  export default {
+    namespaced: true,
+    state,
+    mutations,
+  }
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
index 0b94fd25..2db40659 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
@@ -132,11 +132,12 @@ export const startStation = {
           },
         },
         key: "startStakeMark[0]",
+        default:55,
         rules: [
           {
             message: "请补全桩号",
             callback(value, data) {
-              if (!value?.trim() && data.startStakeMark[1]?.trim()) return false
+              if (!((value+'')?.trim() && data.startStakeMark[1]?.trim())) return false
               else return true
             }
           }
@@ -149,6 +150,7 @@ export const startStation = {
             color: "#3DE8FF",
           },
         },
+        default: 378,
         key: "startStakeMark[1]"
       },
     ],
@@ -170,11 +172,12 @@ export const endStation = {
           },
         },
         key: "endStakeMark[0]",
+        default: 208,
         rules: [
           {
             message: "请补全桩号",
             callback(value, data) {
-              if (!value?.trim() && data.endStakeMark[1]?.trim()) return false
+              if (!((value + '')?.trim() && data.endStakeMark[1]?.trim())) return false
               else return true
             }
           }
@@ -187,6 +190,7 @@ export const endStation = {
             color: "#3DE8FF",
           },
         },
+        default: 153,
         key: "endStakeMark[1]",
       },
     ],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
index 6d19fb8c..705e244a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
@@ -228,7 +228,6 @@ export default {
          * @type {{ callback?: (value: any) => boolean; type?: "phone"; message: string; }[]}
          */
         const rules = item.rules || [];
-
         for (let index = 0; index < rules.length; index++) {
           const rule = rules[index];
           // 返回值 true 通过 false 异常
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
index cd711a52..40b01d2d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
@@ -79,6 +79,7 @@ export default {
         }
       }
       this.$emit("onChange", node, key);
+      console.log(node , "菜单点击++========");
     }
   }
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
index 0282c440..6cc6e7ed 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
@@ -1,28 +1,29 @@
 <template>
-  <nav class="header">
-    <Clock class="time"></Clock>
-    <!-- 左侧菜单 -->
-    <CustomMenu :menuData="menuLeft" @onChange="onChange" prefix="l" :activeIndex="activeIndex" class="leftMenu">
-    </CustomMenu>
-    <!-- 中间标题 -->
-    <div class="vis-title">
-      <img class="logo-img" src="../../images/logo.png" />
-      <img class="title-img" src="../../images/title.png" />
+  <div class="header">
+    <div class="headerNavi">
+      <Clock class="time"></Clock>
+      <!-- 左侧菜单 -->
+      <CustomMenu :menuData="menuLeft" @onChange="onChange" prefix="l" :activeIndex="activeIndex" class="leftMenu">
+      </CustomMenu>
+      <!-- 中间标题 -->
+      <div class="vis-title">
+        <img class="logo-img" src="../../images/logo.png" />
+        <img class="title-img" src="../../images/title.png" />
+      </div>
+      <!-- 右侧菜单 -->
+      <CustomMenu :menuData="menuRight" @onChange="onChange" prefix="r" :activeIndex="activeIndex" class="rightMenu">
+      </CustomMenu>
+      <UserArea class="topButton"></UserArea>
     </div>
-    <!-- 右侧菜单 -->
-    <CustomMenu :menuData="menuRight" @onChange="onChange" prefix="r" :activeIndex="activeIndex" class="rightMenu">
-    </CustomMenu>
-    <UserArea class="topButton"></UserArea>
-  </nav>
+    <RecentPages class="recent"></RecentPages>
+  </div>
 </template>
 <script>
 import menuData from "@/common/menuData";
 import CustomMenu from "./CustomMenu.vue";
 import Clock from "./Clock.vue";
 import UserArea from './UserArea.vue'
-/**
- *
- */
+import RecentPages from "../RecentPages/index.vue";
 
 export default {
   name: "HeaderMenu",
@@ -36,7 +37,8 @@ export default {
   components: {
     CustomMenu,
     Clock,
-    UserArea
+    UserArea,
+    RecentPages
   },
   emit: ["change"],
   created() {
@@ -66,97 +68,102 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.header {
-  display: flex;
-  //   justify-content: space-between;
-  align-items: center;
-  background: url("../../images/header-bg.png") no-repeat;
-  background-size: 100% 100%;
-
-  .time {
-    width: 120px;
-    margin-right: 20px;
-  }
-
-
-
-  .vis-title {
-    flex: 1;
-    width: 0;
+.header{
+  .headerNavi { height: 68px;
     display: flex;
-    justify-content: center;
+    //   justify-content: space-between;
     align-items: center;
+    background: url("../../images/header-bg.png") no-repeat;
+    background-size: 100% 100%;
 
-    .logo-img {
-      display: inline-block;
-      //   margin-left: 100px;
-      width: 48px;
-      height: 37px;
+    .time {
+      width: 120px;
+      margin-right: 20px;
     }
 
-    .title-img {
-      display: inline-block;
-      margin-left: 10px;
-      width: 373px;
-      height: 28px;
-    }
-  }
 
-  .leftMenu {
-    width: 560px;
-  }
 
-  .rightMenu {
-    width: 500px;
-  }
+    .vis-title {
+      flex: 1;
+      width: 0;
+      display: flex;
+      justify-content: center;
+      align-items: center;
 
-  .topButton{
-    width: 180px;
-  }
+      .logo-img {
+        display: inline-block;
+        //   margin-left: 100px;
+        width: 48px;
+        height: 37px;
+      }
 
-  .user {
-    width: 200px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 14px;
-    font-weight: normal;
-    color: #fff;
-    line-height: 16px;
-
-    .name {
-      display: inline-block;
-      margin: 0 10px;
+      .title-img {
+        display: inline-block;
+        margin-left: 10px;
+        width: 373px;
+        height: 28px;
+      }
     }
 
-    .icon {
-      display: inline-block;
-      margin: 0 13px;
+    .leftMenu {
+      width: 560px;
     }
 
-    .icon-001 {
-      display: inline-block;
-      width: 12px;
-      height: 14px;
+    .rightMenu {
+      width: 500px;
     }
 
-    .icon-002 {
-      display: inline-block;
-      width: 9px;
-      height: 5px;
+    .topButton{
+      width: 180px;
     }
 
-    .icon-003 {
-      display: inline-block;
-      width: 18px;
-      height: 16px;
-    }
+    .user {
+      width: 200px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 14px;
+      font-weight: normal;
+      color: #fff;
+      line-height: 16px;
+
+      .name {
+        display: inline-block;
+        margin: 0 10px;
+      }
+
+      .icon {
+        display: inline-block;
+        margin: 0 13px;
+      }
+
+      .icon-001 {
+        display: inline-block;
+        width: 12px;
+        height: 14px;
+      }
 
-    .icon-004 {
-      display: inline-block;
-      width: 15px;
-      height: 15px;
+      .icon-002 {
+        display: inline-block;
+        width: 9px;
+        height: 5px;
+      }
+
+      .icon-003 {
+        display: inline-block;
+        width: 18px;
+        height: 16px;
+      }
+
+      .icon-004 {
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+      }
     }
   }
+  .recent{
+    height: 32px;
+  }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue
new file mode 100644
index 00000000..ddc259a1
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue
@@ -0,0 +1,89 @@
+<template>
+<div class="recent_pages">
+    <h4>最近使用:</h4>
+    <div class="history_buttons">
+        <div class="unit" :class="isActive(item) ? 'active' : ''" v-for="item in recentPages">
+            <p class="btn_main" @click="onClickItem(item)" :key="item.path">{{
+                item.title
+            }}</p>
+            <p class="btn_close" @click="onRemoveItem(item)">x</p>
+        </div>
+    </div>
+</div>
+</template>
+<script>
+import { mapMutations, mapState } from 'vuex';
+export default{
+    data(){
+        return {}
+    },
+    computed:{
+        ...mapState("menu", ["recentPages"])
+    },
+    watch:{
+        $route:{
+            handler(newV){
+                this.addRecent({
+                    title : newV.meta.title,
+                    path : newV.path
+                });
+            },
+            immediate : true
+        }
+    },
+    methods:{
+        ...mapMutations("menu", ["addRecent","removeRecent"]),
+        onClickItem(item){
+            this.$route.path != item.path && this.$router.push(item.path);
+        },
+        onRemoveItem(item){
+            this.removeRecent(item);
+            if(this.$route.path == item.path){
+                if(this.recentPages.length){
+                    this.$router.push(this.recentPages[this.recentPages.length-1].path)
+                }else{
+                    this.$router.push("/")
+                }
+            }
+        },
+        isActive(item) {
+            return this.$route.path == item.path;
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.recent_pages{ 
+    display: flex; flex-direction: row; align-items:stretch;
+    h4{ width: 100px; height: 32px; line-height: 32px; text-align: center; margin: 0; padding: 0; font-weight: bold;}
+    .history_buttons {
+        flex: 1;
+        display: flex;
+        flex-direction: row;
+        .unit {
+            cursor: default; margin-right: 3px;
+            position: relative;
+            height: 30px;
+            background-color: #048;
+
+            &.active {
+            background-color: #09C;
+            color: #FFF;
+            }
+
+            .btn_main {
+            height: 30px;
+            line-height: 30px;
+            padding: 0 12px
+            }
+
+            .btn_close {
+            background-color: #C00;
+            position: absolute;
+            right: 0;
+            top: 0;
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/empty.vue b/ruoyi-ui/src/views/JiHeExpressway/components/empty.vue
index 2fab079e..7a490f86 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/empty.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/empty.vue
@@ -19,7 +19,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.$route)
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/index.vue
index ddf08c79..24d8e652 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/index.vue
@@ -12,24 +12,23 @@
 <script>
 import HeaderMenu from "./components/HeaderMenu/index.vue";
 import Adaptation from "./components/Adaptation.vue";
-
 import getBoardBaseData from '@/common/getBoardBaseData'
 
 export default {
   name: "ji_ze_gao_su",
   components: {
     HeaderMenu,
-    Adaptation
+    Adaptation,
     // ...modules
   },
   data() {
     return {
       isShowContent:false,
-      headerHeight:68,
+      headerHeight:100,
       header: {
         scale: 1,
         originW: 1920,
-        originH: 68
+        originH: 100 //打开最近标签页时高100，不开启时高68
       },
     };
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
index f6272928..797c0282 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
@@ -96,7 +96,7 @@ export default {
         delete data.startStakeMark;
       if (!data.endStakeMark[0] || !data.endStakeMark[1])
         delete data.endStakeMark;
-      this.activeIcon = null;
+      // this.activeIcon = null;
       this.filterEnd(data);
     },
     async getDeviceTypeOptions() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/developing.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/developing.vue
index 5475e802..a609e984 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/developing.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/developing.vue
@@ -11,7 +11,6 @@ export default {
   components: {
   },
   mounted() {
-    console.log(this.$route)
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/event/event/dispatchYuan.vue b/ruoyi-ui/src/views/event/event/dispatchYuan.vue
index 4facaa08..4f4d1e07 100644
--- a/ruoyi-ui/src/views/event/event/dispatchYuan.vue
+++ b/ruoyi-ui/src/views/event/event/dispatchYuan.vue
@@ -711,8 +711,6 @@ export default {
     },
     deviceStatusChangeLog(event) {
       // console.log(event, "websockt工作台接收感知事件数据");
-      console.log(event, "已执行");
-      console.log(this.$route.query.id, "this.$route.query.id");
       for (let item of event) {
         if (this.$route.query.id == item.eventId) {
           this.zxList.unshift(item);
@@ -721,7 +719,6 @@ export default {
     },
   },
   async created() {
-    console.log(this.$route.query.id, "this.$route.query.id");
 
     await this.getEqTypeStateIcon();
     // await this.getTunnelData();
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 930c4c40..1a83dbf6 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -53,7 +53,7 @@ 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`, //王思祥 
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From c78850863094ce7b081ce0962b3f016b8af45607 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 13 Mar 2024 17:07:45 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=A2=84=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/common/menuData.js               |   6 +
 .../event/plan/addAndEditDialog/index.vue     | 617 ++++++++++++++++++
 .../pages/control/event/plan/data.js          |  79 +++
 .../control/event/plan/formTable/index.vue    | 343 ++++++++++
 .../control/event/plan/images/refresh.svg     |  22 +
 .../pages/control/event/plan/index.vue        | 222 +++++++
 6 files changed, 1289 insertions(+)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/images/refresh.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue

diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index 21d94eb8..3e788ba5 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -64,6 +64,12 @@ export default [
             name: "controlEventEvent",
             component: "control/event/event/index.vue",
           },
+          {
+            title: "事件预案",
+            path: "/control/event/plan",
+            name: "controlEventPlam",
+            component: "control/event/plan/index.vue",
+          },
           {
             title: "协调调度记录",
             path: "/control/event/coordinateSchedulingRecords",
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
new file mode 100644
index 00000000..95811c77
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
@@ -0,0 +1,617 @@
+<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">
+                    <el-row>
+                        <el-col :span="2">
+                            <div class="text">恢复操作:</div>
+                        </el-col>
+                        <el-col :span="22">
+                            <FormTable></FormTable>
+                        </el-col>
+                    </el-row>
+                </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>
+
+<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 { 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: [],
+    }
+};
+
+export 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)
+            }
+        },
+        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;
+}
+
+.fade-enter,
+.fade-leave-to {
+    opacity: 0;
+}
+
+.EventAddPlanDialog {
+    gap: 9px;
+    width: 1080px;
+    height: 310px;
+    display: flex;
+    flex-direction: column;
+
+    .first,
+    .second,
+    .third {
+        padding: 5px 10px 8px;
+        background-color: #296887;
+        margin-bottom: 15px;
+
+        .text {
+            margin-top: 12px;
+        }
+    }
+
+    .form {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    .footer {
+        display: flex;
+        justify-content: end;
+        gap: 15px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js
new file mode 100644
index 00000000..d9eeb945
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js
@@ -0,0 +1,79 @@
+import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import { merge, cloneDeep } from "lodash";
+
+export const searchFormList = [
+  {
+    label: "事件状态:",
+    key: "eventState",
+    type: "RadioGroup",
+    options: {
+      options: [
+        {
+          key: "0",
+          label: "未解决",
+        },
+        {
+          key: "1",
+          label: "已解决",
+        },
+        {
+          key: "2",
+          label: "已关闭",
+        },
+      ],
+    },
+  },
+  PresetFormItems.eventSources,
+  PresetFormItems.eventType,
+  {
+    label: "方向:",
+    key: "direction",
+    type: "RadioGroup",
+    options: {
+      options: [
+        {
+          key: "济南方向",
+          label: "济南方向",
+        },
+        {
+          key: "菏泽方向",
+          label: "菏泽方向",
+        },
+        {
+          key: "双向",
+          label: "双向",
+        },
+      ],
+    },
+  },
+  {
+    label: "时间范围:",
+    key: "daterange",
+    required: false,
+    type: "datePicker",
+    options: {
+      type: "daterange",
+      format: "yyyy-MM-dd HH:mm:ss",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
+    },
+  },
+  {
+    ...PresetFormItems.station,
+    label: "开始桩号:",
+    required: false,
+  },
+  merge(cloneDeep(PresetFormItems.station), {
+    options: {
+      options: [
+        {
+          key: "endStakeMark[0]",
+        },
+        {
+          key: "endStakeMark[1]",
+        },
+      ],
+    },
+    label: "结束桩号:",
+    required: false,
+  }),
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue
new file mode 100644
index 00000000..119ccd7f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue
@@ -0,0 +1,343 @@
+<template>
+    <div class="EventDetail">
+        <Table :data="tableData" :show-header="false">
+            <ElTableColumn prop="deviceType" width="160">
+                <template slot-scope="scope">
+                    <el-select v-model="scope.row.deviceType" placeholder="请选择设备类型" @change="changeDeviceType">
+                        <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </ElTableColumn>
+
+            <ElTableColumn prop="phrases2" width="260">
+                <template slot-scope="scope">
+                    <el-select v-if="scope.row.deviceType == 1" v-model="scope.row.phrases2" placeholder="检索规则条件">
+                        <el-option v-for="item in zyOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+
+                    <div v-if="scope.row.deviceType == 2" class="plhx">
+                        <el-select v-model="scope.row.phrases1" placeholder="">
+                            <el-option label="事发上游最近" :value="1"></el-option>
+                        </el-select>
+                        <el-input-number v-model="scope.row.phrases2" :min="0" :max="9999"
+                            style="width: 130px;"></el-input-number>个
+                    </div>
+
+                    <div v-if="scope.row.deviceType == 3 || scope.row.deviceType == 4" class="plhx">
+                        <el-select v-model="scope.row.phrases1" placeholder="">
+                            <el-option label="最近公里数" :value="1"></el-option>
+                        </el-select>
+                        <el-input-number v-model="scope.row.phrases2" :min="0" :max="9999"
+                            style="width: 130px;"></el-input-number>
+                        <p style="width: 56px;">公里</p>
+                    </div>
+
+                </template>
+            </ElTableColumn>
+
+            <ElTableColumn prop="phrases3" width="370">
+                <template slot-scope="scope">
+                    <div v-if="scope.row.deviceType == 1" class="mjs">
+                        <el-select v-model="scope.row.phrases3" placeholder="" multiple collapse-tags>
+                            <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                        <el-input placeholder="请选择" v-model="scope.row.phrases4" readonly>
+                            <i slot="suffix" class="el-input__icon el-icon-search"></i>
+                        </el-input>
+                    </div>
+
+                    <div v-if="scope.row.deviceType == 2" class="mjs">
+                        <el-select v-model="scope.row.phrases4" placeholder="">
+                            <el-option label="工作模式" :value="1"></el-option>
+                        </el-select>
+                        <el-select v-model="scope.row.phrases6" placeholder="">
+                            <el-option label="操作时长" :value="1"></el-option>
+                        </el-select>
+                    </div>
+
+                    <div v-if="scope.row.deviceType == 3" class="mjs">
+                        <el-select v-model="scope.row.phrases4" placeholder="">
+                            <el-option label="控制模式" :value="1"></el-option>
+                        </el-select>
+                        <el-select v-model="scope.row.phrases5" placeholder="">
+                            <el-option label="选择时间" :value="1"></el-option>
+                        </el-select>
+                        <el-select v-model="scope.row.phrases6" placeholder="">
+                            <el-option label="工作状态" :value="1"></el-option>
+                        </el-select>
+                    </div>
+
+                    <div v-if="scope.row.deviceType == 4" class="mjs">
+                        <el-input v-model="scope.row.phrases4" placeholder="请输入发布内容"></el-input>
+                    </div>
+
+                </template>
+            </ElTableColumn>
+
+
+            <ElTableColumn label="操作" width="100">
+                <template slot-scope="scope">
+                    <ElButton class="elButton" icon="el-icon-plus" plain size="mini"
+                        @click.native="onAdd(scope.row.id)" />
+                    <ElButton class="elButton" icon="el-icon-delete" plain size="mini"
+                        @click.native="onDel(scope.$index)" />
+                </template>
+            </ElTableColumn>
+        </Table>
+    </div>
+</template>
+
+<script>
+import Table from '@screen/components/Table.vue';
+import Button from '@screen/components/Buttons/Button.vue';
+import request from "@/utils/request";
+import { Message } from 'element-ui'
+
+
+export default {
+    name: 'formTable',
+    components: {
+        Button,
+        Table,
+    },
+    model: {
+        prop: 'visible',
+        event: 'update:value'
+    },
+    props: {
+        visible: Boolean,
+        eventType: Number,
+        // process: {
+        //     type: Array,
+        //     default: () => []
+        // }
+    },
+    data() {
+        return {
+            tableData: [
+                {
+                    deviceType: 1,
+                    phrases2: 1,
+                    phrases4: '安全行驶'
+                }
+            ],
+            deviceOptions: [
+                {
+                    value: 1,
+                    label: '门架式可变信息标志'
+                },
+                {
+                    value: 2,
+                    label: '疲劳唤醒'
+                },
+                {
+                    value: 3,
+                    label: '行车诱导'
+                },
+                {
+                    value: 4,
+                    label: '路段广播'
+                }
+            ],
+            zyOptions: [
+                {
+                    value: 1,
+                    label: '指定设备资源'
+                },
+                {
+                    value: 2,
+                    label: '事发上游最近'
+                },
+                {
+                    value: 3,
+                    label: '最近公里数'
+                },
+            ],
+            options: [
+                {
+                    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: '设施设备隐患'
+                },
+                {
+                    value: 10,
+                    label: '异常天气'
+                },
+                {
+                    value: 11,
+                    label: '其他事件'
+                }
+            ],
+            deviceType: 1,
+        }
+    },
+    methods: {
+        getProcess() {
+            this.tableData = [];
+            request({
+                url: `/business/dcEventType/${this.eventType}`,
+                method: "get",
+            }).then(result => {
+                if (result.code != 200) return Message.error(result.msg);
+                //流程列表
+                this.process = [];
+                this.tableData = [];
+                result.data.processConfigList?.forEach((it, index) => {
+                    let commonPhrasesArr = it.commonPhrases ? it.commonPhrases.split(',') : [''];
+                    let phrs = [];
+                    commonPhrasesArr?.forEach(phr => {
+                        phrs.push({ id: it.id, phrases: phr })
+                    })
+                    this.process.push({
+                        ...it,
+                        phrs: phrs,
+                        label: it.processNode,
+                        isActive: index == 0 ? true : false,
+                    })
+                    if (index == 0) {
+                        this.id = it.id;
+                        this.tableData = phrs;
+                    }
+                })
+
+            })
+        },
+        changeDeviceType(value) {
+            this.deviceType = value;
+        },
+        getTableData() {
+            let rows = this.process.find(item => item.id == this.id);
+            return rows?.phrs || [];
+        },
+        updateTableData(id = 1) {
+            this.id = id;
+            this.tableData = [];
+            let pros = this.process.find(item => item.id == id);
+            this.tableData = pros.phrs;
+        },
+        onAdd(id) {
+            this.tableData.push({
+                id: id,
+                phrases: ''
+            })
+        },
+        onDel(index) {
+            if (this.tableData.length <= 1) {
+                return Message.warning('最后一项不可删除！');
+            }
+            this.tableData.splice(index, 1)
+        },
+        submitTable() {
+            let data = []
+            this.process.forEach((lc) => {
+                let commonPhrases = [];
+                lc.phrs.forEach(phr => { if (phr.phrases) commonPhrases.push(phr.phrases) })
+                data.push({
+                    commonPhrases: commonPhrases.join(','),
+                    id: lc.id,
+                    eventType: lc.eventType,
+                    nodeNode: lc.nodeNode,
+                    processNode: lc.processNode
+                })
+            })
+            console.log('data', data)
+            // return;
+            request({
+                url: `/business/dcEventType/updateDcProcessConfig`,
+                method: "post",
+                data: {
+                    eventType: this.eventType,
+                    processConfigList: data
+                }
+            }).then(result => {
+                if (result.code != 200) return Message.error(result.msg);
+                Message.success(result.msg);
+                this.modelVisible = false;
+                this.$emit('reInitData', true)
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.EventDetail {
+    display: flex;
+    gap: 9px;
+    width: 100%;
+    // height: 768px;
+    min-height: 50px;
+    margin-top: 5px;
+    flex-direction: column;
+
+    ::v-deep {
+        .el-table .el-table__cell {
+            padding: 0 5px;
+        }
+    }
+
+    .mjs {
+        display: flex;
+
+        >div {
+            margin-right: 10px;
+        }
+    }
+
+    .plhx {
+        display: flex;
+    }
+
+
+}
+
+.elButton {
+    background: #2ba8c3;
+    border-radius: 2px 2px 2px 2px;
+    color: #FFFFFF;
+}
+
+.elButton:hover,
+.elButton:focus {
+    background: #2ba8c3;
+    border-radius: 2px 2px 2px 2px;
+    border-color: #FFFFFF;
+    color: #FFFFFF;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/images/refresh.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/images/refresh.svg
new file mode 100644
index 00000000..e31a5500
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/images/refresh.svg
@@ -0,0 +1,22 @@
+<svg width="16" height="14" viewBox="0 0 16 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814398">
+<g id="Group 1142814396">
+<path id="Rectangle 1304" d="M1.0437 2.41495L4.5636 2.01738L4.91112 6.00562" stroke="white" stroke-linecap="round"/>
+<g id="Ellipse 835">
+<mask id="path-2-inside-1_290_77" fill="white">
+<path d="M4.29579 2.52494C4.09359 2.27296 3.71712 2.25216 3.51748 2.50144C2.86315 3.31847 2.39514 4.30903 2.15904 5.38649C1.87758 6.67096 1.93836 8.02122 2.3337 9.26652C2.72904 10.5118 3.44118 11.5962 4.38007 12.3826C5.16561 13.0406 6.08036 13.4652 7.0411 13.6229C7.35243 13.674 7.61901 13.4293 7.63212 13.1145C7.64523 12.7997 7.39954 12.5346 7.08935 12.4765C6.32757 12.3339 5.60349 11.9884 4.97813 11.4646C4.19938 10.8124 3.6087 9.91289 3.28078 8.87998C2.95287 7.84706 2.90245 6.72709 3.13591 5.66169C3.33404 4.75752 3.72906 3.92712 4.28182 3.24492C4.4503 3.03698 4.46523 2.7361 4.29579 2.52494Z"/>
+</mask>
+<path d="M4.29579 2.52494C4.09359 2.27296 3.71712 2.25216 3.51748 2.50144C2.86315 3.31847 2.39514 4.30903 2.15904 5.38649C1.87758 6.67096 1.93836 8.02122 2.3337 9.26652C2.72904 10.5118 3.44118 11.5962 4.38007 12.3826C5.16561 13.0406 6.08036 13.4652 7.0411 13.6229C7.35243 13.674 7.61901 13.4293 7.63212 13.1145C7.64523 12.7997 7.39954 12.5346 7.08935 12.4765C6.32757 12.3339 5.60349 11.9884 4.97813 11.4646C4.19938 10.8124 3.6087 9.91289 3.28078 8.87998C2.95287 7.84706 2.90245 6.72709 3.13591 5.66169C3.33404 4.75752 3.72906 3.92712 4.28182 3.24492C4.4503 3.03698 4.46523 2.7361 4.29579 2.52494Z" stroke="white" stroke-width="2" mask="url(#path-2-inside-1_290_77)"/>
+</g>
+</g>
+<g id="Group 1142814397">
+<path id="Rectangle 1304_2" d="M15.0437 11.585L11.5238 11.9826L11.1763 7.99438" stroke="white" stroke-linecap="round"/>
+<g id="Ellipse 835_2">
+<mask id="path-4-inside-2_290_77" fill="white">
+<path d="M11.7916 11.4751C11.9938 11.727 12.3703 11.7478 12.5699 11.4986C13.2242 10.6815 13.6923 9.69097 13.9284 8.61351C14.2098 7.32904 14.149 5.97878 13.7537 4.73348C13.3584 3.48817 12.6462 2.40376 11.7073 1.61737C10.9218 0.95942 10.007 0.534814 9.0463 0.377109C8.73497 0.326006 8.46839 0.570722 8.45528 0.885536C8.44218 1.20035 8.68786 1.46544 8.99805 1.5235C9.75983 1.6661 10.4839 2.01159 11.1093 2.53538C11.888 3.18765 12.4787 4.08711 12.8066 5.12002C13.1345 6.15294 13.1849 7.27291 12.9515 8.33831C12.7534 9.24248 12.3583 10.0729 11.8056 10.7551C11.6371 10.963 11.6222 11.2639 11.7916 11.4751Z"/>
+</mask>
+<path d="M11.7916 11.4751C11.9938 11.727 12.3703 11.7478 12.5699 11.4986C13.2242 10.6815 13.6923 9.69097 13.9284 8.61351C14.2098 7.32904 14.149 5.97878 13.7537 4.73348C13.3584 3.48817 12.6462 2.40376 11.7073 1.61737C10.9218 0.95942 10.007 0.534814 9.0463 0.377109C8.73497 0.326006 8.46839 0.570722 8.45528 0.885536C8.44218 1.20035 8.68786 1.46544 8.99805 1.5235C9.75983 1.6661 10.4839 2.01159 11.1093 2.53538C11.888 3.18765 12.4787 4.08711 12.8066 5.12002C13.1345 6.15294 13.1849 7.27291 12.9515 8.33831C12.7534 9.24248 12.3583 10.0729 11.8056 10.7551C11.6371 10.963 11.6222 11.2639 11.7916 11.4751Z" stroke="white" stroke-width="2" mask="url(#path-4-inside-2_290_77)"/>
+</g>
+</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
new file mode 100644
index 00000000..5ec17711
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
@@ -0,0 +1,222 @@
+<template>
+    <div class='emergencyProcessManagement'>
+
+        <!-- 搜索栏 -->
+        <div class="filter">
+            <div>
+                <ButtonGradient @click="onAdd">
+                    <template #prefix>
+                        <img src="@screen/images/insert.svg" />
+                    </template>
+                    新增
+                </ButtonGradient>
+                <ButtonGradient @click="onRefresh" class="refresh-btn">
+                    <template #prefix>
+                        <img src="./images/refresh.svg" />
+                    </template>
+                    刷新
+                </ButtonGradient>
+            </div>
+            <InputSearch style="width: 402px;" :formList="searchFormList"
+                :formConfigOptions="{ dFormData: { eventState: 0 } }" @handleSearch="handleSearch" />
+        </div>
+
+        <!-- 内容 -->
+        <div class="body">
+            <Table :data="tableData">
+                <ElTableColumn prop="strEventCategory" label="事件分类" width="100" align="center" />
+                <ElTableColumn prop="strEventType" label="事件类型" width="100" align="center" />
+                <ElTableColumn prop="planName" label="预案名称" width="140" align="center" />
+                <ElTableColumn prop="triggeringCondition" label="检索条件" width="140" />
+                <ElTableColumn prop="deviceType" label="设备类型" width="140" />
+                <ElTableColumn prop="controllableDevice" label="可控设备" width="200" />
+                <ElTableColumn prop="controlCommand" label="控制指令" />
+                <ElTableColumn label="操作" width="210" align="center">
+                    <template slot-scope="scope">
+                        <ElButton type="text" style="color: #00D1FF;" @click="showDisposal(scope.row)">修改</ElButton>
+                        <ElButton type="text" style="color: #00EBC1;" @click="handleDelete(scope.row)">删除</ElButton>
+                    </template>
+                </ElTableColumn>
+            </Table>
+        </div>
+
+        <!-- 新增修改弹窗 -->
+        <AddAndEditDialog :visible="isShowDialog" :detail="detail" @close="onCloseAddNew"
+            @update:phrasesData="onUpdatePhrasesData" @reInitData="initData" />
+
+        <!-- 分页 -->
+        <div class="footer">
+            <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'"
+                :page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize"
+                :current-page.sync="searchData.pageNum" layout="total, sizes, prev, pager, next" :total="total">
+            </Pagination>
+        </div>
+    </div>
+</template>
+
+<script>
+import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
+import Pagination from '@screen/components/Pagination.vue';
+import Table from '@screen/components/Table.vue';
+import InputSearch from '@screen/components/InputSearch/index.vue';
+import AddAndEditDialog from './addAndEditDialog';
+import request from "@/utils/request";
+import { confirm } from "@screen/utils/common";
+import { Message } from 'element-ui'
+import { searchFormList } from './data';
+
+const eventTypeMap = {
+    0: {
+        1: '交通事故',
+        2: '车辆故障',
+        3: '交通管制',
+        4: '交通拥堵',
+        5: '非法上路',
+        6: '路障清除',
+        7: '施工建设',
+        8: '服务区异常',
+        9: '设施设备隐患',
+        10: '异常天气',
+        11: '其他事件',
+    },
+    1: {
+        1: '异常天气',
+        2: '拥堵',
+        3: '非机动车',
+        4: '行人',
+        5: '烟火',
+        6: '抛洒物',
+        7: '逆行',
+    },
+    2: {}
+
+}
+
+
+export default {
+    name: 'controlEventPlan',
+    components: {
+        ButtonGradient,
+        Pagination,
+        Table,
+        InputSearch,
+        AddAndEditDialog
+    },
+    data() {
+        return {
+            tableData: [],
+            searchFormList,
+            isShowDialog: false,
+            total: 20,
+            eventType: 1,
+            searchData: {
+                pageSize: 20,
+                pageNum: 1,
+            },
+            phrasesData: [],
+            detail: {}
+        }
+    },
+    created() {
+        this.initData();
+    },
+    methods: {
+        initData() {
+            request({
+                url: `/business/plans/list`,
+                method: "get",
+                params: this.searchData,
+            }).then((result) => {
+                if (result.code != 200) return Message.error(result?.msg);
+                result.rows.forEach(it => {
+                    it.strEventCategory = it.eventCategory == 0 ? '交通事件' : '感知事件';
+                    it.strEventType = eventTypeMap[it.eventCategory || 0][it.eventType];
+                })
+                this.tableData = result.rows;
+                this.total = result.total;
+            });
+        },
+        onSizeChange(pageSize) {
+            // this.searchData.pageSize = pageSize;
+            // this.getData();
+        },
+        onRefresh() {
+            this.initData();
+        },
+        onAdd() {
+            this.isShowDialog = true
+        },
+        onCloseAddNew() {
+            this.isShowDialog = false
+        },
+        onUpdatePhrasesData() {
+
+        },
+        handleSearch() {
+
+        },
+        async handleDelete(data) {
+            await confirm({ message: "是否要删除该预案?" });
+            // return console.log('删除成功',data.id)
+            request({
+                url: `/business/plans/${data.id}`,
+                method: "DELETE",
+
+            }).then(result => {
+                if (result.code != 200) return Message.error("删除失败");
+                this.initData()
+
+                Message.success("删除成功")
+            }).catch(() => {
+                Message.error("删除失败")
+            })
+        }
+    }
+}
+</script>
+
+<style lang='scss' scoped>
+.emergencyProcessManagement {
+    padding: 21px;
+
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    z-index: 6;
+    width: 100%;
+    height: 100%;
+
+    .filter {
+        height: 60px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        >div {
+            display: flex;
+            gap: 6px;
+        }
+    }
+
+    .body {
+        flex: 1;
+        position: relative;
+        overflow: hidden;
+
+        .content {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            overflow: auto;
+        }
+    }
+
+    .footer {
+        margin-top: 15px;
+        height: 36px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+}
+</style>
\ No newline at end of file