diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue
index cc8374da..d6ee8eb4 100644
--- a/ruoyi-ui/src/App.vue
+++ b/ruoyi-ui/src/App.vue
@@ -9,13 +9,15 @@
 <template>
   <div id="app">
     <router-view />
-    <websocket />
-    <!-- <websocket_phone /> -->
+    <websocket @newEvent="onNewEvent"/>
+    <WarningNotify ref="notifyShow" />
+      <!-- <websocket_phone /> -->
   </div>
 </template>
 
 <script>
 import websocket from "@/views/websocket";
+import WarningNotify from "@screen/components/WarningNotify.vue";
 // import websocket_phone from "@/views/websocket_phone";
 export default {
   name: "App",
@@ -29,6 +31,7 @@ export default {
   },
   components: {
     websocket,
+    WarningNotify
     // websocket_phone
   },
   watch: {
@@ -49,6 +52,11 @@ export default {
       },
     };
   },
+  methods:{
+    onNewEvent(para){
+      this.$refs["notifyShow"].showNotify(para);
+    }
+  }
 };
 </script>
 
diff --git a/ruoyi-ui/src/assets/iconfont/demo_index.html b/ruoyi-ui/src/assets/iconfont/demo_index.html
index 2d1ff5c8..c09ef71a 100644
--- a/ruoyi-ui/src/assets/iconfont/demo_index.html
+++ b/ruoyi-ui/src/assets/iconfont/demo_index.html
@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe7ef;</span>
+                <div class="name">汽车</div>
+                <div class="code-name">&amp;#xe7ef;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe602;</span>
                 <div class="name">行人</div>
@@ -114,9 +120,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1715061600935') format('woff2'),
-       url('iconfont.woff?t=1715061600935') format('woff'),
-       url('iconfont.ttf?t=1715061600935') format('truetype');
+  src: url('iconfont.woff2?t=1715072390653') format('woff2'),
+       url('iconfont.woff?t=1715072390653') format('woff'),
+       url('iconfont.ttf?t=1715072390653') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -142,6 +148,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-car"></span>
+            <div class="name">
+              汽车
+            </div>
+            <div class="code-name">.icon-car
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-pedestrian"></span>
             <div class="name">
@@ -232,6 +247,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-car"></use>
+                </svg>
+                <div class="name">汽车</div>
+                <div class="code-name">#icon-car</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-pedestrian"></use>
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.css b/ruoyi-ui/src/assets/iconfont/iconfont.css
index 6645fce4..9f4fcc1f 100644
--- a/ruoyi-ui/src/assets/iconfont/iconfont.css
+++ b/ruoyi-ui/src/assets/iconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4466169 */
-  src: url('iconfont.woff2?t=1715061600935') format('woff2'),
-       url('iconfont.woff?t=1715061600935') format('woff'),
-       url('iconfont.ttf?t=1715061600935') format('truetype');
+  src: url('iconfont.woff2?t=1715072390653') format('woff2'),
+       url('iconfont.woff?t=1715072390653') format('woff'),
+       url('iconfont.ttf?t=1715072390653') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-car:before {
+  content: "\e7ef";
+}
+
 .icon-pedestrian:before {
   content: "\e602";
 }
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.js b/ruoyi-ui/src/assets/iconfont/iconfont.js
index a67ef640..c807aaeb 100644
--- a/ruoyi-ui/src/assets/iconfont/iconfont.js
+++ b/ruoyi-ui/src/assets/iconfont/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4466169='<svg><symbol id="icon-pedestrian" viewBox="0 0 1024 1024"><path d="M453.7669545 593.57411555l-9.85998222-19.72110222-44.82161779 131.77287112a102.63893333 102.63893333 0 0 1-14.34168888 25.09937777l-89.64209779 126.84288a49.75047111 49.75047111 0 0 0-6.27484444 40.33877333 52.88846221 52.88846221 0 0 0 24.2028089 33.61450667 58.26673778 58.26673778 0 0 0 33.16736 10.30826668 55.57816889 55.57816889 0 0 0 12.10254222 0 53.78503111 53.78503111 0 0 0 35.4076444-25.54652445l84.71096891-125.49802667a313.74449776 313.74449776 0 0 0 26.44423112-51.54360892l24.65223112-68.5761422-6.72426667-3.58513777a181.97162668 181.97162668 0 0 1-69.02328888-73.50613334zM616.01861671 263.24536889a100.84693333 100.84693333 0 0 0 101.74236443-99.50208 101.74350222 101.74350222 0 0 0-203.48586665 0 100.84693333 100.84693333 0 0 0 101.74350222 99.50208z m95.01923557 437.44938666l-78.43612445-142.97770666-2.68970667-4.48284444-7.61856002-11.20483556 5.82542223-29.13280002 25.09937779-101.29521776a123.25660445 123.25660445 0 0 0-89.64096-146.56398222 100.84693333 100.84693333 0 0 0-30.47765333-4.92999111 69.02442667 69.02442667 0 0 0-54.23331555 16.13596444l-101.29408 96.36408889a102.63893333 102.63893333 0 0 0-14.34282668 21.06595556L304.96155004 516.48170667a44.82048 44.82048 0 0 0 23.30624 61.85301333 50.64704 50.64704 0 0 0 65.88643557-20.61653332l59.16444443-124.15431113 17.03139557-16.13596444-14.79111111 64.09443556c-14.79111111 54.68160001-7.61969778 134.46257779 108.01720888 196.76273778l3.58627556 2.24142222 34.51221333 62.30015999a980.22968889 980.22968889 0 0 1 36.30421334 173.45649779 50.19875555 50.19875555 0 0 0 22.4108089 35.40764444 60.95644445 60.95644445 0 0 0 34.06392887 10.30826666h7.17141333a58.71502222 58.71502222 0 0 0 37.64906667-19.71996444 56.4736 56.4736 0 0 0 11.65311999-44.82048l-21.96252444-151.49511112a170.31850667 170.31850667 0 0 0-17.92796443-45.26876444z m67.23128887-192.72817777a44.82048 44.82048 0 0 0-22.41080888-25.99594667l-89.64095999-44.82161778-23.30737778 95.02037334 69.02442666 36.75249778a44.82048 44.82048 0 0 0 22.85795555 6.72426668 51.54360889 51.54360889 0 0 0 44.82161778-67.23128891z"  ></path></symbol><symbol id="icon-guanbi" viewBox="0 0 1024 1024"><path d="M512 0.006C229.233 0.006 0.006 229.233 0.006 512S229.233 1023.993 512 1023.993 1023.994 794.767 1023.994 512 794.767 0.006 512 0.006z m0 962.549C263.563 962.555 61.445 760.437 61.445 512S263.563 61.445 512 61.445 962.555 263.563 962.555 512 760.437 962.555 512 962.555z" fill="#040000" ></path><path d="M707.498 273.063L512 468.561 316.502 273.063l-43.449 43.439L468.551 512 273.053 707.497l43.449 43.45L512 555.449l195.498 195.498 43.449-43.45L555.449 512l195.498-195.498z" fill="#040000" ></path></symbol><symbol id="icon-menu" viewBox="0 0 1024 1024"><path d="M512 747.52c-10.24 0-20.48-5.12-30.72-10.24l-414.72-256C51.2 476.16 40.96 460.8 40.96 445.44s10.24-30.72 25.6-40.96l414.72-256c15.36-10.24 40.96-10.24 56.32 0l414.72 256c15.36 10.24 25.6 25.6 25.6 40.96s-5.12 30.72-20.48 40.96l-414.72 256c-10.24 5.12-20.48 5.12-30.72 5.12zM117.76 445.44l394.24 240.64 394.24-240.64L512 204.8 117.76 445.44z m-20.48-10.24z"  ></path><path d="M512 936.96c-15.36 0-30.72-5.12-46.08-15.36l-378.88-230.4c-15.36-10.24-20.48-25.6-10.24-40.96s25.6-20.48 40.96-10.24L496.64 870.4c10.24 5.12 20.48 5.12 30.72 0l378.88-230.4c15.36-10.24 35.84-5.12 40.96 10.24s5.12 35.84-10.24 40.96L558.08 921.6c-15.36 10.24-30.72 15.36-46.08 15.36z"  ></path></symbol><symbol id="icon-menuactive" viewBox="0 0 1024 1024"><path d="M51.2 404.48c-10.24-5.12-10.24-15.36 0-25.6L501.76 102.4h20.48L972.8 378.88c10.24 5.12 10.24 20.48 0 25.6l-450.56 276.48c-5.12 5.12-15.36 5.12-20.48 0L51.2 404.48z" fill="#2c2c2c" ></path><path d="M512 906.24c-20.48 0-40.96-5.12-56.32-15.36l-378.88-230.4c-25.6-15.36-30.72-46.08-20.48-71.68 15.36-25.6 46.08-30.72 71.68-15.36l378.88 230.4h10.24l378.88-230.4c25.6-15.36 56.32-5.12 71.68 15.36 15.36 25.6 5.12 56.32-15.36 71.68l-378.88 230.4c-20.48 10.24-40.96 15.36-61.44 15.36z" fill="#2c2c2c" ></path></symbol><symbol id="icon-left" viewBox="0 0 1024 1024"><path d="M268.9 488.3L681.6 75.6C688.2 69 697.3 65 707.4 65c20.2 0 36.5 16.3 36.5 36.5 0 10.1-4.1 19.2-10.7 25.8l-391 391 378.5 378.5c6 6.2 9.7 14.7 9.7 24.1 0 19.2-15.5 34.7-34.7 34.7-9.4 0-17.9-3.7-24.1-9.7L279.2 553.4c-4.7-4.8-8.1-11.1-9.3-18 0.7 4.9-0.3 5.5-1 4.4-6.6-6.6-10.7-15.7-10.7-25.8 0.1-10 4.1-19.1 10.7-25.7z m0 0"  ></path></symbol><symbol id="icon-right" viewBox="0 0 1024 1024"><path d="M755.1 535.7L342.4 948.4C335.8 955 326.70000001 959 316.60000001 959c-20.2 0-36.5-16.3-36.50000001-36.5 0-10.1 4.1-19.2 10.7-25.8l391-391-378.49999999-378.5c-6-6.2-9.7-14.7-9.70000001-24.1 0-19.2 15.5-34.7 34.7-34.7 9.4 0 17.9 3.7 24.1 9.7L744.8 470.6c4.7 4.8 8.1 11.1 9.30000001 18-0.7-4.9 0.3-5.5 0.99999999-4.4 6.6 6.6 10.69999999 15.7 10.7 25.8-0.1 10-4.1 19.1-10.7 25.7z m0 0"  ></path></symbol><symbol id="icon-recent" viewBox="0 0 1024 1024"><path d="M504 1024C225.6 1024 0 798.4 0 520S225.6 16 504 16s504 225.6 504 504-225.6 504-504 504z m0-939.2C264 84.8 68.8 280 68.8 520c0 240.8 195.2 436 436 436s436-195.2 436-436c-0.8-240-196-435.2-436.8-435.2z"  ></path><path d="M452 572.8V221.6h71.2v280h237.6v71.2H452z"  ></path></symbol></svg>',function(n){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var i,o,c,l,a,d=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}i=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4466169,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?d(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(c=i,l=n.document,a=!1,m(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,s())})}function s(){a||(a=!0,c())}function m(){try{l.documentElement.doScroll("left")}catch(t){return void setTimeout(m,50)}s()}}(window);
\ No newline at end of file
+window._iconfont_svg_string_4466169='<svg><symbol id="icon-car" viewBox="0 0 1024 1024"><path d="M895.2832 399.93344h-79.03232c-3.60448 0.06144-7.168 1.024-10.30144 2.7648l-35.61472-107.08992c-11.3664-60.88704-54.35392-90.3168-107.13088-90.3168H328.4992c-60.6208 0-97.40288 39.44448-107.15136 90.25536l-35.71712 107.43808a21.97504 21.97504 0 0 0-10.93632-3.09248H95.68256a21.97504 21.97504 0 0 0-22.016 21.95456v19.0464c0 12.10368 9.85088 21.97504 22.016 21.97504l29.9008 5.12a137.56416 137.56416 0 0 0-14.80704 64.06144l-11.07968 126.3616c0 3.64544 0.26624 7.3728 0.7168 11.14112a42.1888 42.1888 0 0 0-0.7168 7.168v152.02304c0 21.64736 17.57184 39.15776 39.26016 39.15776H198.8608a39.19872 39.19872 0 0 0 39.28064-39.15776v-48.82432h515.39968v48.82432c0 21.64736 17.57184 39.15776 39.26016 39.15776h59.94496a39.19872 39.19872 0 0 0 39.26016-39.15776v-152.04352c0-2.39616-0.26624-4.79232-0.73728-7.14752 0.45056-3.76832 0.73728-7.49568 0.73728-11.1616l-11.10016-126.3616c0-24.59648-5.40672-45.6704-14.86848-64.14336l29.22496-4.95616a21.97504 21.97504 0 0 0 22.03648-21.97504v-19.0464a22.07744 22.07744 0 0 0-22.03648-21.97504z m-647.55712-22.46656l26.15296-69.46816 0.32768-1.6384c2.60096-14.00832 8.3968-16.54784 16.9984-27.36128h409.55904c8.68352 11.14112 14.09024 13.96736 16.44544 27.25888l26.60352 71.2704 9.74848 38.7072c-2.21184 28.32384-36.352 50.688-64.67584 50.688H302.65344c-28.38528 0-62.52544-22.36416-64.7168-50.70848l9.78944-38.74816z m18.30912 330.38336a59.392 59.392 0 1 1 5.18144-118.62016 59.392 59.392 0 0 1-5.18144 118.62016z m332.20608-43.76576a17.69472 17.69472 0 0 1-17.69472 17.63328H413.696a17.69472 17.69472 0 0 1-17.69472-17.6128v-49.58208c0-9.74848 7.94624-17.63328 17.69472-17.63328h166.85056c9.74848 0 17.69472 7.8848 17.69472 17.6128v49.58208z m127.26272 43.76576a59.392 59.392 0 0 1-59.4944-59.31008 59.392 59.392 0 0 1 59.4944-59.31008 59.392 59.392 0 0 1 59.47392 59.31008 59.43296 59.43296 0 0 1-59.47392 59.31008z" fill="#000000" ></path></symbol><symbol id="icon-pedestrian" viewBox="0 0 1024 1024"><path d="M453.7669545 593.57411555l-9.85998222-19.72110222-44.82161779 131.77287112a102.63893333 102.63893333 0 0 1-14.34168888 25.09937777l-89.64209779 126.84288a49.75047111 49.75047111 0 0 0-6.27484444 40.33877333 52.88846221 52.88846221 0 0 0 24.2028089 33.61450667 58.26673778 58.26673778 0 0 0 33.16736 10.30826668 55.57816889 55.57816889 0 0 0 12.10254222 0 53.78503111 53.78503111 0 0 0 35.4076444-25.54652445l84.71096891-125.49802667a313.74449776 313.74449776 0 0 0 26.44423112-51.54360892l24.65223112-68.5761422-6.72426667-3.58513777a181.97162668 181.97162668 0 0 1-69.02328888-73.50613334zM616.01861671 263.24536889a100.84693333 100.84693333 0 0 0 101.74236443-99.50208 101.74350222 101.74350222 0 0 0-203.48586665 0 100.84693333 100.84693333 0 0 0 101.74350222 99.50208z m95.01923557 437.44938666l-78.43612445-142.97770666-2.68970667-4.48284444-7.61856002-11.20483556 5.82542223-29.13280002 25.09937779-101.29521776a123.25660445 123.25660445 0 0 0-89.64096-146.56398222 100.84693333 100.84693333 0 0 0-30.47765333-4.92999111 69.02442667 69.02442667 0 0 0-54.23331555 16.13596444l-101.29408 96.36408889a102.63893333 102.63893333 0 0 0-14.34282668 21.06595556L304.96155004 516.48170667a44.82048 44.82048 0 0 0 23.30624 61.85301333 50.64704 50.64704 0 0 0 65.88643557-20.61653332l59.16444443-124.15431113 17.03139557-16.13596444-14.79111111 64.09443556c-14.79111111 54.68160001-7.61969778 134.46257779 108.01720888 196.76273778l3.58627556 2.24142222 34.51221333 62.30015999a980.22968889 980.22968889 0 0 1 36.30421334 173.45649779 50.19875555 50.19875555 0 0 0 22.4108089 35.40764444 60.95644445 60.95644445 0 0 0 34.06392887 10.30826666h7.17141333a58.71502222 58.71502222 0 0 0 37.64906667-19.71996444 56.4736 56.4736 0 0 0 11.65311999-44.82048l-21.96252444-151.49511112a170.31850667 170.31850667 0 0 0-17.92796443-45.26876444z m67.23128887-192.72817777a44.82048 44.82048 0 0 0-22.41080888-25.99594667l-89.64095999-44.82161778-23.30737778 95.02037334 69.02442666 36.75249778a44.82048 44.82048 0 0 0 22.85795555 6.72426668 51.54360889 51.54360889 0 0 0 44.82161778-67.23128891z"  ></path></symbol><symbol id="icon-guanbi" viewBox="0 0 1024 1024"><path d="M512 0.006C229.233 0.006 0.006 229.233 0.006 512S229.233 1023.993 512 1023.993 1023.994 794.767 1023.994 512 794.767 0.006 512 0.006z m0 962.549C263.563 962.555 61.445 760.437 61.445 512S263.563 61.445 512 61.445 962.555 263.563 962.555 512 760.437 962.555 512 962.555z" fill="#040000" ></path><path d="M707.498 273.063L512 468.561 316.502 273.063l-43.449 43.439L468.551 512 273.053 707.497l43.449 43.45L512 555.449l195.498 195.498 43.449-43.45L555.449 512l195.498-195.498z" fill="#040000" ></path></symbol><symbol id="icon-menu" viewBox="0 0 1024 1024"><path d="M512 747.52c-10.24 0-20.48-5.12-30.72-10.24l-414.72-256C51.2 476.16 40.96 460.8 40.96 445.44s10.24-30.72 25.6-40.96l414.72-256c15.36-10.24 40.96-10.24 56.32 0l414.72 256c15.36 10.24 25.6 25.6 25.6 40.96s-5.12 30.72-20.48 40.96l-414.72 256c-10.24 5.12-20.48 5.12-30.72 5.12zM117.76 445.44l394.24 240.64 394.24-240.64L512 204.8 117.76 445.44z m-20.48-10.24z"  ></path><path d="M512 936.96c-15.36 0-30.72-5.12-46.08-15.36l-378.88-230.4c-15.36-10.24-20.48-25.6-10.24-40.96s25.6-20.48 40.96-10.24L496.64 870.4c10.24 5.12 20.48 5.12 30.72 0l378.88-230.4c15.36-10.24 35.84-5.12 40.96 10.24s5.12 35.84-10.24 40.96L558.08 921.6c-15.36 10.24-30.72 15.36-46.08 15.36z"  ></path></symbol><symbol id="icon-menuactive" viewBox="0 0 1024 1024"><path d="M51.2 404.48c-10.24-5.12-10.24-15.36 0-25.6L501.76 102.4h20.48L972.8 378.88c10.24 5.12 10.24 20.48 0 25.6l-450.56 276.48c-5.12 5.12-15.36 5.12-20.48 0L51.2 404.48z" fill="#2c2c2c" ></path><path d="M512 906.24c-20.48 0-40.96-5.12-56.32-15.36l-378.88-230.4c-25.6-15.36-30.72-46.08-20.48-71.68 15.36-25.6 46.08-30.72 71.68-15.36l378.88 230.4h10.24l378.88-230.4c25.6-15.36 56.32-5.12 71.68 15.36 15.36 25.6 5.12 56.32-15.36 71.68l-378.88 230.4c-20.48 10.24-40.96 15.36-61.44 15.36z" fill="#2c2c2c" ></path></symbol><symbol id="icon-left" viewBox="0 0 1024 1024"><path d="M268.9 488.3L681.6 75.6C688.2 69 697.3 65 707.4 65c20.2 0 36.5 16.3 36.5 36.5 0 10.1-4.1 19.2-10.7 25.8l-391 391 378.5 378.5c6 6.2 9.7 14.7 9.7 24.1 0 19.2-15.5 34.7-34.7 34.7-9.4 0-17.9-3.7-24.1-9.7L279.2 553.4c-4.7-4.8-8.1-11.1-9.3-18 0.7 4.9-0.3 5.5-1 4.4-6.6-6.6-10.7-15.7-10.7-25.8 0.1-10 4.1-19.1 10.7-25.7z m0 0"  ></path></symbol><symbol id="icon-right" viewBox="0 0 1024 1024"><path d="M755.1 535.7L342.4 948.4C335.8 955 326.70000001 959 316.60000001 959c-20.2 0-36.5-16.3-36.50000001-36.5 0-10.1 4.1-19.2 10.7-25.8l391-391-378.49999999-378.5c-6-6.2-9.7-14.7-9.70000001-24.1 0-19.2 15.5-34.7 34.7-34.7 9.4 0 17.9 3.7 24.1 9.7L744.8 470.6c4.7 4.8 8.1 11.1 9.30000001 18-0.7-4.9 0.3-5.5 0.99999999-4.4 6.6 6.6 10.69999999 15.7 10.7 25.8-0.1 10-4.1 19.1-10.7 25.7z m0 0"  ></path></symbol><symbol id="icon-recent" viewBox="0 0 1024 1024"><path d="M504 1024C225.6 1024 0 798.4 0 520S225.6 16 504 16s504 225.6 504 504-225.6 504-504 504z m0-939.2C264 84.8 68.8 280 68.8 520c0 240.8 195.2 436 436 436s436-195.2 436-436c-0.8-240-196-435.2-436.8-435.2z"  ></path><path d="M452 572.8V221.6h71.2v280h237.6v71.2H452z"  ></path></symbol></svg>',function(c){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var l,a,n,i,o,d=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}l=function(){var t,e=document.createElement("div");e.innerHTML=c._iconfont_svg_string_4466169,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?d(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(n=l,i=c.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,s())})}function s(){o||(o=!0,n())}function m(){try{i.documentElement.doScroll("left")}catch(t){return void setTimeout(m,50)}s()}}(window);
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.json b/ruoyi-ui/src/assets/iconfont/iconfont.json
index cc03ca14..8294fb7a 100644
--- a/ruoyi-ui/src/assets/iconfont/iconfont.json
+++ b/ruoyi-ui/src/assets/iconfont/iconfont.json
@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "7791021",
+      "name": "汽车",
+      "font_class": "car",
+      "unicode": "e7ef",
+      "unicode_decimal": 59375
+    },
     {
       "icon_id": "28559895",
       "name": "行人",
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.ttf b/ruoyi-ui/src/assets/iconfont/iconfont.ttf
index fa4ca655..f74f6253 100644
Binary files a/ruoyi-ui/src/assets/iconfont/iconfont.ttf and b/ruoyi-ui/src/assets/iconfont/iconfont.ttf differ
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.woff b/ruoyi-ui/src/assets/iconfont/iconfont.woff
index a21f2538..4fe39e19 100644
Binary files a/ruoyi-ui/src/assets/iconfont/iconfont.woff and b/ruoyi-ui/src/assets/iconfont/iconfont.woff differ
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.woff2 b/ruoyi-ui/src/assets/iconfont/iconfont.woff2
index 848e2782..b5b8d69d 100644
Binary files a/ruoyi-ui/src/assets/iconfont/iconfont.woff2 and b/ruoyi-ui/src/assets/iconfont/iconfont.woff2 differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue
index 9e6908a7..e2f9fc52 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue
@@ -34,6 +34,6 @@ export default {
 
 <style lang="scss" scoped>
 .early_warning{
-
+  &:hover{ cursor: pointer;}
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue b/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue
new file mode 100644
index 00000000..9e9bf2c0
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue
@@ -0,0 +1,305 @@
+<template>
+  <div>
+  </div>
+</template>
+
+<script>
+import moment from "moment";
+export default {
+  name: "WarningNotify",
+  props: {
+   
+  },
+  provide() {
+    return {
+    }
+  },
+  data() {
+    return {
+      notifications: [],
+      notifyIndex: 0,
+    }
+  },
+  computed: {
+    
+  },
+  watch: {
+    
+  },
+  methods: {
+    //点击事件回调
+    closeNotify(para) {
+      // let type = para.type;
+      this.notifications[para.index].close();
+    },
+    showNotify(para){
+      let _this = this;
+      let obj = {
+        content: "这里是从websocket收到的告警内容，最少一行，最多三行，多了就隐藏掉，这是演示的三行的效果。",
+        time: moment().format("yyyy-MM-DD hh:mm"),
+        type: ["pedestrian", "car", "pedestrian"][_this.notifyIndex % 3],
+        level: ["info", "danger"][_this.notifyIndex % 2],
+        duration: 0
+      }
+
+      _this.notifications[_this.notifyIndex] = _this.$notify({
+        title: '',
+        dangerouslyUseHTMLString: true,
+        duration: obj.duration,
+        customClass: 'notify_whole',
+        offset: 50,
+        showClose: false,
+        message: _this.$createElement(
+          "div",
+          { class: "notify_box " + obj.level },
+          [
+            _this.$createElement(
+              "div",
+              { class: 'nofify_head' },
+              [
+                _this.$createElement(
+                  "p",
+                  { class: "title" },
+                  [
+                    _this.$createElement(
+                      "i",
+                      { class: 'icon el-icon-warning' }
+                    ), _this.$createElement(
+                      "span",
+                      { class: 'text' },
+                      "告警"
+                    )
+                  ]
+                )
+                , _this.$createElement(
+                  "button",
+                  {
+                    class: 'btn_close el-icon-close',
+                    on: {
+                      click: _this.closeNotify.bind(_this, { type: obj.type, index: _this.notifyIndex }),
+                    },
+                  }
+                )
+              ]
+            ),
+            _this.$createElement(
+              "div",
+              { class: 'nofify_content' },
+              [
+                _this.$createElement(
+                  "span",
+                  { class: 'type_icon' },
+                  [
+                    _this.$createElement(
+                      "i",
+                      { class: 'iconfont icon-' + obj.type }
+                    )
+                  ]
+                ),
+
+                _this.$createElement(
+                  "div",
+                  { class: 'info' },
+                  [
+                    _this.$createElement(
+                      "p",
+                      { class: 'content' },
+                      obj.content
+                    )
+                    ,
+                    _this.$createElement(
+                      "p",
+                      { class: 'time' },
+                      obj.time
+                    )
+                  ]
+                ),
+
+              ]
+            ),
+
+          ]
+        ),
+      });
+      _this.notifyIndex++;
+    }
+  },
+  mounted() {
+  },
+};
+</script>
+
+<style lang="scss">
+.notify_whole {
+  padding: 0;
+  width: 420px !important;
+  // height: 120px !important;
+  margin-top: 40px !important;
+  background: none;
+  border: none;
+  border-radius: 0;
+}
+
+.el-notification__group {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+}
+
+.el-notification__content {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+}
+
+.notify_box {
+  width: 100%;
+  height: 100%;
+  border: 1px solid;
+
+  .nofify_head {
+    display: flex;
+    justify-content: space-between;
+    height: 44px;
+    align-items: center;
+    margin: 0 12px;
+
+    .title {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+
+      .icon {
+        font-size: 24px;
+      }
+
+      .text {
+        font-size: 17px;
+        margin-left: 4px;
+        font-weight: bold;
+      }
+    }
+
+    .btn_close {
+      background: none;
+      border: none;
+      cursor: pointer;
+      font-size: 20px;
+      text-align: center;
+    }
+  }
+
+  .nofify_content {
+    display: flex;
+    align-items: center;
+    padding: 20px 20px 16px 0;
+
+    .type_icon {
+      width: 80px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .iconfont {
+        font-size: 48px;
+      }
+    }
+
+    .info {
+      flex: 1;
+
+      .content {
+        color: #FFF;
+        font-size: 16px;
+        word-wrap: break-word;
+        white-space: wrap;
+      }
+
+      .time {
+        color: #FFF;
+        font-size: 14px;
+        opacity: 0.5;
+        text-align: right;
+        margin-top: 8px;
+      }
+    }
+  }
+}
+
+$infoColor: #3DE8FF;
+$dangerColor: #FF5F5F;
+
+.notify_box.info {
+  background-image: linear-gradient(180deg, rgba(14, 69, 92, 0.9) 0%, rgba(20, 89, 119, 0.9) 100%);
+  border-image: linear-gradient(180deg, rgba(78, 174, 204, 1), rgba(78, 174, 204, 0)) 2 2;
+
+  .nofify_head {
+    border-bottom: 1px solid #FFFFFF33;
+
+    .title {
+      .icon {
+        color: $infoColor;
+      }
+
+      .text {
+        color: $infoColor;
+      }
+    }
+
+    .btn_close {
+      color: $infoColor;
+    }
+  }
+
+  .nofify_content {
+    .type_icon {
+      .iconfont {
+        color: $infoColor;
+      }
+    }
+
+    .info {
+      .content {}
+
+      .time {}
+    }
+  }
+}
+
+.notify_box.danger {
+  background-image: linear-gradient(180deg, rgba(30, 0, 0, 0.9) 0%, rgba(111, 0, 0, 0.9) 100%);
+  border-image: linear-gradient(180deg, rgba(237, 147, 128, 1), rgba(239, 146, 157, 0)) 2 2;
+
+  .nofify_head {
+    border-bottom: 1px solid #FFFFFF33;
+
+    .title {
+      .icon {
+        color: $dangerColor;
+      }
+
+      .text {
+        color: $dangerColor;
+      }
+    }
+
+    .btn_close {
+      color: $dangerColor;
+    }
+  }
+
+  .nofify_content {
+    .type_icon {
+      .iconfont {
+        color: $dangerColor;
+      }
+    }
+
+    .info {
+      .content {}
+
+      .time {}
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/index.vue
index 7b4cd655..456f4ff9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/index.vue
@@ -15,7 +15,7 @@ import HeaderMenu from "./components/HeaderMenu/index.vue";
 import Adaptation from "./components/Adaptation.vue";
 import getBoardBaseData from '@/common/getBoardBaseData'
 import { mapGetters } from "vuex";
-import moment from "moment";
+
 export default {
   name: "ji_ze_gao_su",
   components: {
@@ -25,8 +25,7 @@ export default {
   },
   data() {
     return {
-      notifications: [],
-      notifyIndex:0,
+      
       isShowContent:false,
       headerHeight:100,
       header: {
@@ -60,101 +59,6 @@ export default {
     }
   },
   mounted(){
-    
-    let _this = this;
-    document.onkeydown = function(e){
-
-      if(e.code == 'Space'){
-        let obj = {
-          content: "一个沙雕横穿马路导致堵车，他还不承认，不知道怎么办，请求指导，在线等。",
-          time:moment().format("yyyy-MM-DD hh:mm"),
-          type : "3",
-          level: ["info", "danger"][_this.notifyIndex%2]
-        }
-
-        _this.notifications[_this.notifyIndex] = _this.$notify({
-          title: '',
-          dangerouslyUseHTMLString: true,
-          duration: 0,
-          customClass: 'notify_whole',
-          offset: 50,
-          showClose: false,
-          message: _this.$createElement(
-            "div",
-            {class : "notify_box " + obj.level},
-            [
-              _this.$createElement(
-                "div",
-                { class: 'nofify_head' },
-                [
-                  _this.$createElement(
-                    "p",
-                    { class:"title"},
-                    [
-                      _this.$createElement(
-                        "i",
-                        { class: 'icon el-icon-warning' }
-                      ), _this.$createElement(
-                        "span",
-                        { class: 'text' },
-                        "告警"
-                      )
-                    ]
-                  )
-                  , _this.$createElement(
-                    "button",
-                    {
-                      class: 'btn_close el-icon-close',
-                      on: {
-                        click: _this.closeNotify.bind(_this, { type: obj.type, index: _this.notifyIndex }),
-                      },
-                    }
-                  )
-                ]
-              ),
-              _this.$createElement(
-                "div",
-                { class:'nofify_content'},
-                [
-                      _this.$createElement(
-                        "span",
-                        { class: 'type_icon' },
-                        [
-                          _this.$createElement(
-                            "i",
-                            { class: 'iconfont icon-pedestrian' }
-                          )
-                        ]
-                      ),
-                      
-                      _this.$createElement(
-                        "span",
-                        { class: 'info' },
-                        [
-                          _this.$createElement(
-                            "span",
-                            { class: 'content' },
-                            obj.content
-                          )
-                          ,
-                          _this.$createElement(
-                            "div",
-                            {class: 'time'},
-                            obj.time
-                          )
-                        ]
-                      ),
-                  
-                ]
-              ),
-              
-            ]
-          ),
-        });
-        _this.notifyIndex ++;
-      }
-    }
-
 
     // this.$store.commit("menu/resetRecent");
     getBoardBaseData().then(res => {
@@ -170,19 +74,7 @@ export default {
     this.calcHeaderScale();
   },
   methods: {
-    //点击事件回调
-    closeNotify(para) {
-      let type = para.type;
-      console.log("hahah");
-      console.log(type);
-      if (type === '2') {
-        console.log("自动关闭，流程。。");
-      }
-      if (type === '3') {
-        console.log("手动确认，流程。。");
-      }
-      this.notifications[para.index].close();
-    },
+    
     calcHeaderScale(){
       let winW = window.innerWidth;
       this.header.scale = winW / this.header.originW;
@@ -247,101 +139,3 @@ export default {
   }
 }
 </style>
-
-<style lang="scss">
-
-.notify_whole {
-  padding: 0;
-  width: 420px !important;
-  // height: 120px !important;
-  margin-top: 50px !important;
-  background: none;
-  border: none; border-radius: 0;
-}
-.el-notification__group {
-  width: 100%; height: 100%; margin: 0;
-}
-.el-notification__content {
-  width: 100%;
-    height: 100%;
-    margin: 0;
-}
-.notify_box{ width: 100%; height: 100%; background-image: linear-gradient(180deg, rgba(14, 69, 92, 0.9) 0%, rgba(20, 89, 119, 0.9) 100%); 
-  border: 1px solid; border-image: linear-gradient(180deg, rgba(78, 174, 204, 1), rgba(78, 174, 204, 0)) 2 2;
-    .nofify_head{ display: flex; justify-content: space-between; height: 44px; align-items: center; margin: 0 12px;
-      .title{ display: flex; justify-content: flex-start; align-items: center;
-        .icon { font-size: 24px;}
-        .text{ font-size: 17px; margin-left: 4px; font-weight: bold;}
-      }
-      .btn_close{ background: none; border: none;
-        cursor: pointer;
-        font-size: 20px;
-        text-align: center;
-        }
-    }
-    .nofify_content{
-      display: flex; align-items: center; padding: 20px 20px 16px 0;
-      .type_icon{ width: 80px; display: flex; align-items: center; justify-content: center;
-        .iconfont{ font-size: 48px;}
-      }
-      .info{ flex: 1;
-        .content{ color:#FFF; font-size: 16px; word-wrap: break-word; white-space: wrap;}
-        .time{ color: #FFF; font-size: 14px; opacity: 0.5; text-align: right; margin-top: 8px;}
-      }
-    }
-}
-
-$infoColor: #3DE8FF;
-$dangerColor: #FF5F5F;
-
-.notify_box.info {
-  background-image: linear-gradient(180deg, rgba(14, 69, 92, 0.9) 0%, rgba(20, 89, 119, 0.9) 100%);
-  border-image: linear-gradient(180deg, rgba(78, 174, 204, 1), rgba(78, 174, 204, 0)) 2 2;
-
-  .nofify_head { border-bottom: 1px solid #FFFFFF33;
-    .title {
-      .icon { color: $infoColor;}
-      .text {color: $infoColor; }
-    }
-
-    .btn_close {color: $infoColor;}
-  }
-
-  .nofify_content {
-    .type_icon { 
-      .iconfont{color: $infoColor;}
-    }
-
-    .info {
-      .content {}
-
-      .time {}
-    }
-  }
-}
-.notify_box.danger {
-  background-image: linear-gradient(180deg, rgba(30, 0, 0, 0.9) 0%, rgba(111, 0, 0, 0.9) 100%);
-  border-image: linear-gradient(180deg, rgba(237, 147, 128, 1), rgba(239, 146, 157, 0)) 2 2;
-
-  .nofify_head { border-bottom: 1px solid #FFFFFF33;
-    .title {
-      .icon { color: $dangerColor;}
-      .text {color: $dangerColor; }
-    }
-
-    .btn_close {color: $dangerColor;}
-  }
-
-  .nofify_content {
-    .type_icon { 
-      .iconfont{color: $dangerColor;}
-    }
-
-    .info {
-      .content {}
-
-      .time {}
-    }
-  }
-}
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index c77e90ab..5091a678 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -4,7 +4,15 @@
  * icon: 展示的图标
  */
 
-// 相机的状态
+function arrayToDic(arr) {
+  let obj = {};
+  arr.map((item) => {
+    obj[item.value] = item;
+  });
+  return obj;
+}
+
+// 相机状态
 export const CameraStatusEnum = {
   "-1": {
     color: "",
@@ -60,7 +68,7 @@ export const CameraDirectionEnumList = Object.keys(CameraDirectionEnum).map(
   }
 );
 
-// 设备的状态
+// 设备状态
 export const DeviceTypeEnum = {
   0: {
     text: "异常",
@@ -94,7 +102,8 @@ export const CameraControlTypeEnum = {
   },
 };
 
-//交通事件类型
+
+//交通事件主类
 export const EventTopics = {
   交通事故: 1,
   车辆故障: 2,
@@ -109,79 +118,73 @@ export const EventTopics = {
   其他事件: 11,
 };
 
-//路网设施类型
-// 1-收费站
-// 2-桥梁
-// 3-互通立交
-// 4-枢纽立交
-// 5-隧道
-// 6-服务区',
-// 7-停车区，
-// 8-清障驻点
-// 9-边坡
-export const RoadNFTopics = {
-  收费站: 1,
-  桥梁: 2,
-  枢纽立交: 4,
-  服务区: 6,
-  停车区: 7,
-  清障驻点: 8,
-  边坡: 9,
-};
-
-// 事件类型 eventType
-export const EventType = {
-  0: {
-    text: "待确认",
-  },
-  1: {
-    text: "处理中",
-  },
-  2: {
-    text: "已完成",
-  },
-};
-
-// 信息来源 warningSource
-export const InfoWarningSource = {
-  1: {
-    text: "视频AI",
-  },
-  2: {
-    text: "雷达识别",
-  },
-  3: {
-    text: "锥桶",
-  },
-  4: {
-    text: "护栏碰撞",
-  },
-  5: {
-    text: "扫码报警",
-  },
-  6: {
-    text: "非机预警",
-  },
-  // 7: {
-  //   text: "气象监测器",
-  // },
-};
+//交通事件主类  {1: "交通事故",... }
+export const trafficType = Object.keys(EventTopics).reduce((prev, now) => {
+  return { ...prev, [EventTopics[now]]: now };
+}, {});
 
-export const warningSourceMapping = {
-  1: "视频AI",
-  2: "雷达识别",
-  3: "锥桶",
-  4: "护栏碰撞",
-  5: "扫码报警",
-  6: "非机预警",
-  // 7: '气象监测器'
-};
+//交通事件主类 [{value:"", label:""},...]
+export const trafficKV = Object.keys(trafficType).map((key) => {
+  return {
+    value: key * 1,
+    label: trafficType[key],
+  };
+});
 
-export const warningStateMapping = {
-  1: "上报",
-  2: "已完成",
-  3: "已终止",
-  4: "自动结束",
+//交通事件子类
+export const EventSubclass = {
+  "1-1": "追尾",
+  "1-2": "侧翻",
+  "1-3": "撞护栏",
+  "1-4": "自燃",
+  "1-5": "其他事故",
+  "2-1": "车辆故障",
+  "3-1": "主线封闭限行",
+  "3-2": "收费站封闭和限行",
+  "3-3": "立交封闭和限行",
+  "3-4": "服务区封闭和限行",
+  "4-1": "道路拥堵",
+  "4-2": "立交拥堵",
+  "4-3": "收费站拥堵",
+  "4-4": "服务区拥堵",
+  "5-1": "行人",
+  "5-2": "非机动车",
+  "5-3": "摩托车",
+  "5-4": "其他",
+  "6-1": "烟雾",
+  "6-2": "倒伏树木",
+  "6-3": "撒落物",
+  "6-4": "动物",
+  "6-5": "其他",
+  "7-1": "道路养护施工",
+  "7-2": "收费站养护施工",
+  "7-3": "服务区养护施工",
+  "7-4": "枢纽立交匝道养护施工",
+  "7-5": "地方道路养护施工",
+  "7-6": "道路工程建设施工",
+  "7-7": "收费站工程建设施工",
+  "7-8": "服务区工程建设施工",
+  "7-9": "枢纽立交匝道工程建设施工",
+  "7-10": "地方道路工程建设施工",
+  "8-1": "封闭、暂停营业",
+  "8-2": "重要设施停用",
+  "8-3": "服务区其他异常",
+  "9-1": "摄像机",
+  "9-2": "护栏",
+  "9-3": "隔离栅",
+  "9-4": "情报板",
+  "9-5": "防炫板",
+  "9-6": "其他",
+  "10-1": "雨",
+  "10-2": "雪",
+  "10-3": "雾",
+  "10-4": "大风",
+  "10-5": "低温寒潮",
+  "10-6": "路面积雪",
+  "10-7": "路面结冰",
+  "10-8": "路面积水",
+  "10-9": "其他",
+  "11-1": "其他事件",
 };
 
 // 感知事件主类 warningType
@@ -200,80 +203,7 @@ export const WarningType = {
   99: "其他事件",
 };
 
-function arrayToDic(arr) {
-  let obj = {};
-  arr.map((item) => {
-    obj[item.value] = item;
-  });
-  return obj;
-}
-//设备Options
-export const deviceTypeOptions = [
-  {
-    value: 1,
-    label: "摄像机",
-  },
-  {
-    value: 2,
-    label: "可变信息标志",
-    timingControl: true,
-  },
-  {
-    value: 3,
-    label: "气象监测器",
-  },
-  {
-    value: 4,
-    label: "出口诱导灯",
-  },
-  {
-    value: 5,
-    label: "路段语音广播",
-    timingControl: true,
-  },
-  {
-    value: 6,
-    label: "护栏碰撞",
-  },
-  {
-    value: 7,
-    label: "毫米波雷达",
-  },
-  {
-    value: 8,
-    label: "合流区预警",
-  },
-  {
-    value: 9,
-    label: "智慧锥桶",
-  },
-  {
-    value: 10,
-    label: "激光疲劳唤醒",
-    timingControl: true,
-  },
-  {
-    value: 11,
-    label: "一类交通量调查站",
-  },
-  {
-    value: 12,
-    label: "行车诱导",
-    timingControl: true,
-  },
-  {
-    value: 13,
-    label: "智能设备箱",
-    // timingControl: true,
-  },
-  {
-    value: 14,
-    label: "光线在线监测",
-  },
-];
-
-export const deviceTypeDic = arrayToDic(deviceTypeOptions);
-
+//感知事件主类  [{ value: "", label: "" }, ...]
 export const WarningTypeList = Object.keys(WarningType).map((key) => {
   return {
     value: key * 1,
@@ -281,26 +211,7 @@ export const WarningTypeList = Object.keys(WarningType).map((key) => {
   };
 });
 
-// 交通事件主类  {1: "交通事故" } 格式
-export const trafficType = Object.keys(EventTopics).reduce((prev, now) => {
-  return { ...prev, [EventTopics[now]]: now };
-}, {});
-
-//激光疲劳唤醒工作模式
-export const awakerWorkModeDic = {
-  0: "激光关闭",
-  1: "常亮模式",
-  2: "间隔100ms闪烁模式",
-  3: "间隔200ms闪烁模式",
-  4: "间隔500ms闪烁模式",
-  5: "2次闪烁模式",
-  6: "SOS模式",
-  7: "自定义模式1",
-  8: "自定义模式2",
-  9: "自定义模式3",
-};
-
-// 感知事件主类的子类(上方) warningSubclass
+// 感知事件子类
 export const WarningSubclass = {
   1: {
     "1-1": "拥堵",
@@ -377,14 +288,6 @@ export const WarningSubclass = {
   },
 };
 
-//========= 交通事件 主类（key vulue） =========
-export const trafficKV = Object.keys(trafficType).map((key) => {
-  return {
-    value: key * 1,
-    label: trafficType[key],
-  };
-});
-
 //交通事件、感知事件 子类（key vulue）预案使用
 export const eventSubClassMap = {
   1: {
@@ -855,6 +758,162 @@ export const eventSubClassMap = {
   },
 };
 
+//路网设施类型
+// 1-收费站
+// 2-桥梁
+// 3-互通立交
+// 4-枢纽立交
+// 5-隧道
+// 6-服务区',
+// 7-停车区，
+// 8-清障驻点
+// 9-边坡
+export const RoadNFTopics = {
+  收费站: 1,
+  桥梁: 2,
+  枢纽立交: 4,
+  服务区: 6,
+  停车区: 7,
+  清障驻点: 8,
+  边坡: 9,
+};
+
+// 事件类型 eventType
+export const EventType = {
+  0: {
+    text: "待确认",
+  },
+  1: {
+    text: "处理中",
+  },
+  2: {
+    text: "已完成",
+  },
+};
+
+// 信息来源 warningSource
+export const InfoWarningSource = {
+  1: {
+    text: "视频AI",
+  },
+  2: {
+    text: "雷达识别",
+  },
+  3: {
+    text: "锥桶",
+  },
+  4: {
+    text: "护栏碰撞",
+  },
+  5: {
+    text: "扫码报警",
+  },
+  6: {
+    text: "非机预警",
+  },
+  // 7: {
+  //   text: "气象监测器",
+  // },
+};
+
+export const warningSourceMapping = {
+  1: "视频AI",
+  2: "雷达识别",
+  3: "锥桶",
+  4: "护栏碰撞",
+  5: "扫码报警",
+  6: "非机预警",
+  // 7: '气象监测器'
+};
+
+export const warningStateMapping = {
+  1: "上报",
+  2: "已完成",
+  3: "已终止",
+  4: "自动结束",
+};
+
+//设备Options
+export const deviceTypeOptions = [
+  {
+    value: 1,
+    label: "摄像机",
+  },
+  {
+    value: 2,
+    label: "可变信息标志",
+    timingControl: true,
+  },
+  {
+    value: 3,
+    label: "气象监测器",
+  },
+  {
+    value: 4,
+    label: "出口诱导灯",
+  },
+  {
+    value: 5,
+    label: "路段语音广播",
+    timingControl: true,
+  },
+  {
+    value: 6,
+    label: "护栏碰撞",
+  },
+  {
+    value: 7,
+    label: "毫米波雷达",
+  },
+  {
+    value: 8,
+    label: "合流区预警",
+  },
+  {
+    value: 9,
+    label: "智慧锥桶",
+  },
+  {
+    value: 10,
+    label: "激光疲劳唤醒",
+    timingControl: true,
+  },
+  {
+    value: 11,
+    label: "一类交通量调查站",
+  },
+  {
+    value: 12,
+    label: "行车诱导",
+    timingControl: true,
+  },
+  {
+    value: 13,
+    label: "智能设备箱",
+    // timingControl: true,
+  },
+  {
+    value: 14,
+    label: "光线在线监测",
+  },
+];
+
+export const deviceTypeDic = arrayToDic(deviceTypeOptions);
+
+//激光疲劳唤醒 工作模式
+export const awakerWorkModeDic = {
+  0: "激光关闭",
+  1: "常亮模式",
+  2: "间隔100ms闪烁模式",
+  3: "间隔200ms闪烁模式",
+  4: "间隔500ms闪烁模式",
+  5: "2次闪烁模式",
+  6: "SOS模式",
+  7: "自定义模式1",
+  8: "自定义模式2",
+  9: "自定义模式3",
+};
+
 //激光疲劳唤醒 工作模式
 export const gzmsMap = {
   SETMD0: "激光关闭",
@@ -1032,74 +1091,21 @@ export const DirectionTypes = {
   3: "济南方向",
   2: "双向",
 };
-export const EventSubclass = {
-  "1-1": "追尾",
-  "1-2": "侧翻",
-  "1-3": "撞护栏",
-  "1-4": "自燃",
-  "1-5": "其他事故",
-  "2-1": "车辆故障",
-  "3-1": "主线封闭限行",
-  "3-2": "收费站封闭和限行",
-  "3-3": "立交封闭和限行",
-  "3-4": "服务区封闭和限行",
-  "4-1": "道路拥堵",
-  "4-2": "立交拥堵",
-  "4-3": "收费站拥堵",
-  "4-4": "服务区拥堵",
-  "5-1": "行人",
-  "5-2": "非机动车",
-  "5-3": "摩托车",
-  "5-4": "其他",
-  "6-1": "烟雾",
-  "6-2": "倒伏树木",
-  "6-3": "撒落物",
-  "6-4": "动物",
-  "6-5": "其他",
-  "7-1": "道路养护施工",
-  "7-2": "收费站养护施工",
-  "7-3": "服务区养护施工",
-  "7-4": "枢纽立交匝道养护施工",
-  "7-5": "地方道路养护施工",
-  "7-6": "道路工程建设施工",
-  "7-7": "收费站工程建设施工",
-  "7-8": "服务区工程建设施工",
-  "7-9": "枢纽立交匝道工程建设施工",
-  "7-10": "地方道路工程建设施工",
-  "8-1": "封闭、暂停营业",
-  "8-2": "重要设施停用",
-  "8-3": "服务区其他异常",
-  "9-1": "摄像机",
-  "9-2": "护栏",
-  "9-3": "隔离栅",
-  "9-4": "情报板",
-  "9-5": "防炫板",
-  "9-6": "其他",
-  "10-1": "雨",
-  "10-2": "雪",
-  "10-3": "雾",
-  "10-4": "大风",
-  "10-5": "低温寒潮",
-  "10-6": "路面积雪",
-  "10-7": "路面结冰",
-  "10-8": "路面积水",
-  "10-9": "其他",
-  "11-1": "其他事件",
-};
+
+// 方向
 export const directionOptions = [
   { value: "1", label: "菏泽方向" },
   { value: "3", label: "济南方向" },
   { value: "2", label: "双向" },
 ];
 
-//行车诱导相关
-
+//行车诱导控制模式
 export const inducerModeDic = {
   "00": "手动模式",
   "01": "自动模式",
   "02": "万年历",
 };
-
+//行车诱导工作模式
 export const inducerWorkTypeDic = {
   "00": "不更新",
   "01": "常亮",
diff --git a/ruoyi-ui/src/views/websocket.vue b/ruoyi-ui/src/views/websocket.vue
index 1fafe36b..f763f881 100644
--- a/ruoyi-ui/src/views/websocket.vue
+++ b/ruoyi-ui/src/views/websocket.vue
@@ -31,7 +31,8 @@ export default {
       // 建立 websocket 连接
       this.socket.initialize({
         // url: 'ws://' + location.hostname + ':' + port + path,
-        url: 'wss://' + location.hostname + ':' + window.location.port  + '/ws' || 80 + '/ws',
+        // url: 'wss://' + location.hostname + ':' + window.location.port  + '/ws' || 80 + '/ws',
+        url: 'ws://10.168.77.128:7789/ws',
         // url: "ws://10.7.179.15" + ":" + port + path,
         // url: "ws://10.168.64.171" + ":" + port + path,
         //  url: 'ws://10.168.78.127'+ ':' + port + path,
@@ -40,8 +41,10 @@ export default {
         tokenSN: this.token,
         heartRate: interval,
       });
+
       this.socket.onopen = () => {};
       this.socket.onmessage = (message) => {
+
         // debugger
         message = JSON.parse(message);
         const method = message.method;
@@ -53,7 +56,11 @@ export default {
         const params = message.params;
         const subEvent = params.subEvent;
         const content = params.content;
-        var contentList = JSON.parse(content);
+        if(_.isString(content)){
+          var contentList = JSON.parse(content);
+        }else{
+          var contentList = content;
+        }
 
         switch (subEvent) {
           case "payment_webSocket_send":
@@ -92,7 +99,10 @@ export default {
             this.$nextTick(() => {
               this.$store.commit("EVENTUNTREATEDNUM", contentList);
             });
-
+            break;
+          case "0":
+          case "1":
+            this.$emit("newEvent", params);
             break;
           default:
         }
@@ -101,6 +111,48 @@ export default {
   },
   created() {},
   methods: {},
+  mounted(){
+    let _this = this;
+    document.onkeydown = function (e) {
+      if (e.code == 'Space') {
+        let params = {
+          "subEvent": "0",
+          "content": {
+            "event": {
+              "id": "1555c6599eb14e3fb68d04e512182ee7",
+              "deptId": 103,
+              "stakeMark": "K059+289",
+              "endStakeMark": "",
+              "direction": "1",
+              "userId": 1,
+              "estimatedEndTime": "2024-04-11 00:00:00",
+              "eventType": 3,
+              "eventSubclass": "3-2",
+              "eventState": 0,
+              "eventSource": 1,
+              "inTunnel": 0,
+              "roadId": 1,
+              "occurrenceTime": "2024-04-10 16:56:02",
+              "lang": "",
+              "dcEventTrafficControl": {
+                "controlType": 1,
+                "controlCause": 1,
+                "exitsInlets": 2,
+                "facilityId": 11,
+                "measure": 1,
+                "classify": 1,
+                "facilityIds": [
+                  11
+                ]
+              },
+              "createTime": "2024-05-08 18:02:40"
+            },
+            "content": "菏泽方向 K059+289 发生收费站封闭和限行事件"
+          }
+        };
+        _this.$emit("newEvent", params);
+      }}
+  }
 };
 </script>