From 26e5cb19956049ec0c4b0e64a96eaf1cd2a1279e Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Tue, 7 May 2024 16:38:00 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/assets/iconfont/demo_index.html  |  29 ++-
 ruoyi-ui/src/assets/iconfont/iconfont.css     |  10 +-
 ruoyi-ui/src/assets/iconfont/iconfont.js      |   2 +-
 ruoyi-ui/src/assets/iconfont/iconfont.json    |   7 +
 ruoyi-ui/src/assets/iconfont/iconfont.ttf     | Bin 2544 -> 2860 bytes
 ruoyi-ui/src/assets/iconfont/iconfont.woff    | Bin 1672 -> 1924 bytes
 ruoyi-ui/src/assets/iconfont/iconfont.woff2   | Bin 1228 -> 1444 bytes
 ruoyi-ui/src/views/JiHeExpressway/index.vue   | 214 +++++++++++++++++-
 .../pages/datav/roadNet/index.vue             |   2 +-
 ruoyi-ui/vue.config.js                        |   4 +-
 10 files changed, 256 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/assets/iconfont/demo_index.html b/ruoyi-ui/src/assets/iconfont/demo_index.html
index 28fc1e31..2d1ff5c8 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">&#xe602;</span>
+                <div class="name">行人</div>
+                <div class="code-name">&amp;#xe602;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe60d;</span>
                 <div class="name">关闭</div>
@@ -108,9 +114,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1710745723035') format('woff2'),
-       url('iconfont.woff?t=1710745723035') format('woff'),
-       url('iconfont.ttf?t=1710745723035') format('truetype');
+  src: url('iconfont.woff2?t=1715061600935') format('woff2'),
+       url('iconfont.woff?t=1715061600935') format('woff'),
+       url('iconfont.ttf?t=1715061600935') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -136,6 +142,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-pedestrian"></span>
+            <div class="name">
+              行人
+            </div>
+            <div class="code-name">.icon-pedestrian
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-guanbi"></span>
             <div class="name">
@@ -217,6 +232,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-pedestrian"></use>
+                </svg>
+                <div class="name">行人</div>
+                <div class="code-name">#icon-pedestrian</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-guanbi"></use>
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.css b/ruoyi-ui/src/assets/iconfont/iconfont.css
index b93c0ab7..6645fce4 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=1710745723035') format('woff2'),
-       url('iconfont.woff?t=1710745723035') format('woff'),
-       url('iconfont.ttf?t=1710745723035') format('truetype');
+  src: url('iconfont.woff2?t=1715061600935') format('woff2'),
+       url('iconfont.woff?t=1715061600935') format('woff'),
+       url('iconfont.ttf?t=1715061600935') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-pedestrian:before {
+  content: "\e602";
+}
+
 .icon-guanbi:before {
   content: "\e60d";
 }
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.js b/ruoyi-ui/src/assets/iconfont/iconfont.js
index 3f366d4b..a67ef640 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-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 c,i,o,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)}}c=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(c,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),c()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=c,l=n.document,a=!1,m(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,s())})}function s(){a||(a=!0,o())}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-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
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.json b/ruoyi-ui/src/assets/iconfont/iconfont.json
index 7f0688f2..cc03ca14 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": "28559895",
+      "name": "行人",
+      "font_class": "pedestrian",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
     {
       "icon_id": "2718724",
       "name": "关闭",
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.ttf b/ruoyi-ui/src/assets/iconfont/iconfont.ttf
index aaa28364e57c0ebe26357c8d57f556d1e064bbb5..fa4ca65566fb2f8a03f178a2fb1a13517429f854 100644
GIT binary patch
delta 752
zcmYLGOK1~O6utMonKzTkB$>>_$+u1VOXw#PX(16?A}!U0pmm{8i%^0c+d_Y|U8F@x
z6*r3DXBKYUxf2mVmo0RoJGTlVrMO6oxDdgewBBhJzIo@}`_4P(-ZwM9tk?FF(~TF|
z@_PWL1K_vWg^gQYs&^HD{{@h4%(=Ch!e0Ll0PGXWb3`b6`~l_LgzmY;^?HsH^8TbH
zx3GM(Ccly{kpGbO=3=eBf;PBxp776?YKyM%a^x+5I!QfeSC-d8>&L&RsJXUFg88T0
zU85=>rG)yzm&kNv<PQWTA^^TmukHVj$6FHcE!wNVe3pjqQ{lRo!^3Ax@>FK^)=x-)
zRp2Mt07Z?Ib&!CrNx5%lP3DcWj$|18hu-`|%|HeP1gV90mmPV#D0>Yq8Z)HuhXT-~
z;Da2{r1n0@3r)I`55H$K)PjG_W@igj84e~|@ar60X~FMC;}QJ8F}#Ow@GEm@Pt}ii
zc#Mxh3_2Qc3Fzx#K@kxYcHABs94enfnuWYISY-}&hOwPlB_z@zvMWzIn(d@viiq1;
zMy|L$jO9wXg!xLogbEQ=EZ|42C<mtWpcOHNNa$CMU{WbQOqbG_an3jyOqVtrmxCgy
zn5AsQ$j04(I2#Ce=e6NzIBX>*cvni}mSL)P#E@)J5yn*fycSBP6?9_vLwds;&^7tg
zon(4kO5;Y#sW_PoEvci6kBv4rS1qct6sraFO|!?)qqn1@gT>)KUcELM4{1CaOFmEN
vpG~zm-6N3oCE(p5|0K7m$dIFiG73~s#Q<n4?u@&(zB*r9@;(Im>6gGiu4;dG

delta 450
zcmYLEJxD@P6#mYA?|IF%1p9HYFbgCya0&{SK%%LFh9aVPm1&?UWMU0zTVrBFOGCCc
z6hcF|w>39KG(3eGYN(;1I#+|v<$LFx?|t7n_g?nAd5*({EqPV~gdL#!cye!Z!B=_#
zv<4%Zh?yI~rQLS`PmHky6Y^0z;=0BdN~E%R9~bO><&Q6!UN=QW+h^|s_wJOL&rmm}
z_`jEX|F)Tmxi2DDfDG}@cqYB$${wBv?|`-w7A%))gOd`(C1Y*gbGzCZ`9QnQ1n}H<
z`t_fGiaN9+_jU-yawwm~MA=V`vQv15b4>=wKx<YZ&JLF4pd-p!N7E}TDo=|6j}z+f
z)p;JV!Um&yAY4>fWKx9<usA8O2o|qXQ0pyM3u=uOXn{wdKHGxw*5_J)p$2fQ;0B)*
rpc$&Dd4CV`Vie<i$$;!2Y3u6kuZE3l!!1dWMmiZ}BT06Yza1mL=^Rhc

diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.woff b/ruoyi-ui/src/assets/iconfont/iconfont.woff
index 25ffc382e020408c81b67006663de9a352482bbd..a21f25382182662413e187d5ff9ee7328102a5a8 100644
GIT binary patch
delta 1429
zcmV;G1#0?;4TKLAcTYw}00961000Ms01E&B000XtkrYdRegFUg+?*dav}bI2W&i*J
z2mk;BTmS$BT$36pa%g2?WB>pKWB>pFF8}}lHYeUIy=Z7<VE_OHlmGw#8~^|SBnRFD
ziD+$fcmMzeumAu64gdfEARqt$0Bmn#VE_OHzyJUM5&!@I5(TORMr~nuZ~y=W)Bpeg
z9{>OVAORLC0A+4rZDjxe1@r&_0YCr%0%s7TJg{(Yb94Xz2Q&Zx08Rh^0BQg7S`3p2
z0fc|i4TCTYL|+UI6)GKq@6N$54ABYt)rp-ks4r%WI(m_Pi7rwOxB)}(3Pvbj3aU@2
zrRxK8*GIOPXYLs0=8LcGI8ShTzpKBh#Jy)<a+Q<COA|GYD*t-){e4Z7{xDGnUJ~Wv
zmM9Bf5~Qt(@@sn{pLQhFA2VqkjQ{|6oLzrXO>7%Q6rQ)Up4mU|uGjnL*w|!?cikvn
zOSa`Dv1@(=sz3rRAXWWQ)R?&GkxNlx5IJB~q*A#c!GWJU+_-Z<i8vyJ1e|-RD>YP&
zC=v%WVP>nSqSol?+wptf`{un5$q1eNfL;7Da?vt+16@D}5=tx}e&F}Iy}=8>PZEEZ
zyJIPZ$b`C7?f}0``Q@3I=kZhLIT9s--;j7!;16Mt4LT5KaR(^B7()U-Y3+h~(a_75
zLr7@6ZR-`<-miA5P)narYf$a%zNwQ6bvg~pZUkE@Sy#>HVr^J5&2sn_KC`6Zvh66o
zWy?Ovh<!15RV!Ai6jJx&qVbWlYG{82@54&<6}bvKOKFzYYCJ5l*FUwN*?M-|RtmCv
zRW){<rfrlyD81Be4_EN`oeM!x!zH)!dHB1dv^Sarq?HgM%;&NvBfN(~)JAK3DiJk-
z5;v$r;CHhzWP^SphJd3aPU3#XpWGFXcPXKyOcNT=APcf2lhF3Y<=aWCmE3>6yz$Eu
zxV?LQIvS5h)9a5;!D|NxtA~fHdBl597d(dlp8H=(4y5l-t9V3Wr+?sIrAK_HA*yiw
zs2L@YLVu6}7YTLnTnYpVZ74vLG*cKuQ1G+npbmr<h=eqcZ5pO&z}LpI2qyp5*(U76
zKD)uL!Z$&{<_57n17?;5Goyc^$~v0|pXq>PH}Dlel%62P*K5TSM4)qg{O~T*tcBu*
zM7gW*L&FMQScv~5uJ>>J8(u<16d_dR!-O9ALSmEzxxP#Y>@^2`zCvJ+QaEtofKql&
zHe_v?t0`-W(Q;v?!OU4Pblqn2IvinB0gv669n6D#$6Dwux2))k1y6r)&KkJ@(f?4o
zhhIb<@)1(`jCgaEE8zVhPHG_b3q|-!Yj`@_ftl*oH1<A~K-b|5_)_;88rxxWt>$U)
z3Dsr(M_tc(f0P&=o$`{1^QaK_#S;8r1i~%SUu+_H;U=34UQUqnZnJj<FWlr$;=H`w
zDR1sge2m}Az1c&k5aoYP?B}lR<_>jpx8g{c(G|Ar3WLVNs<_lE^*s3J+LcSU;#MoZ
zb?M5_PvEs1Ta)$SaDB4%=X7&@1RPDjJ^x_u>Ac4fe<w1JrjxbNXl*h*616OZ4R-H5
z`VUF0=bw0-V_;-pU;yHZoa_AY{5D@1xLFuL;8A?>0|foQfrWp8xdF)KU|<4?0st>t
z3bO!soMT{QU|??e-@p*V!T<t5l92%wZ~y>D4gzs_oMT~NU|_+60RmtEApigX00000
zi~#BZLIHvSt^wKtE&u>{oMT{QU|`^2h-6@400AZ-<^n<nhW}tb0{{{)0ek>>oQ07+
zZo)tig`dHY1eCK61w8>o0wTXetk^_}!Q%Uk@#-9g41FT~3osa9;ovbMV4`^P!k0El
j)t8>?EcW2q<6FuqH`|?8bxq2qzH#QNL=P?D6H5R9@3C^4

delta 1165
zcmZqS@8A_F_jhw+U}OLSwhjhv5Y72vqKJ2WB?ANFxlH!C6Vr1l(-;_-Sb#W}fq~g2
zTxR0yjMT&w1_qWAplW>}HdBu({g?q11d1&I@@0Tnh5a6LM@DW*1yJk&kk1Da2TA1Q
zCxg^o05SzYm}wDnRc>NM0Z{A#kS`C!3XGy!3~qUexv2~ctUx}a1JLqxfyFi(3i6AA
zma+l)3~oRi)3{Lm_+$>omip7YEe1R;^PM{cl4d{HlUmTOoLX>e(p;m6dX47JxF;Jw
zO|&_{!E@~T3I%(X>#4Dw{|?CfJ(X6MwkROv%i?VNchXZ<l&_cXoEx3=^Yzi1r9a~@
zRct*{XSePri?F|w>c*8fV}SJaBf+n#AC>=}Xz-75g|zf!pbIMI#7;WzEnV*@a{T`7
zn{RT;uDMLUJ2%4VNb8$ruDU9U-X*+yJ^!<bu3Tv-SH1B@Oc7@gtH14+3-aH;UHiY_
zNU>(?rDA=z6}nTSUM%dH8_5|o{pm;9vU}fa%bszwJlM3J`K2@CvxS@uc4rk#W#XLP
zg)SCz>#f?+km&HofTOwUN{3YFyTbDe>)A{{nJk&}slz>SiDP;4Ta7g#hZb+`?Z3Y1
zcgk|%?NNp4&y#fC@wXQrKVIyq`gb;O_^0=u>UBFW-0R()!Wz4&UUB{w?gEv+Tb{IU
zl7GZ>O<K^)LucXZ022e#e$6k3KQV2auzb&oI~ofegWK4qX`8+EId&}k+Zrv&ooPwJ
z{2v_Z-*mD6m{n}Jq1W^Ju{g7C+iI(|#)c2hOEkSJIPbFHi;z#hsJh<41G}F;xA$+E
zDmydppn<>7&r63)BvT#jW<B}qYd1OCfYHt&PEPIGh2W056T<sE7_Xh;t=z}8!A+A-
zRwhVmT50t5G*#bwMsK^CZMmy=TAL+LP6{|=Jjw8)X#M>!G80|@&ywBPHQD@ThKl)<
zyxW`&v+CE(omBmxiG9Mfbd~nys*Q8{9V1*y_gggTua%tMY5QjB+(oK#!Mu`(pZ{pu
zX*}(QF!SmcQ9q^_#nx$TJo0_7nupCd)0&r)k1bfIckr>{sx2A&U7~+J+9#nApE==2
z*-_`G-M>FgU$S1ty#AZ-CeL#x7pu%RZJ07&W#hahn`Wt8@x0_!BkJaUbkiy(sTC_G
zt-KX-_Ne{s*Q?tdmkP<OTUWnh+U?!ZZ;virdi2}1@8_N+^#qmPTl43|{X6BVC!@E1
zUUNC`SmEZomce@$HAp`yVg1K=zu-_3IMF31q$DITJX(_QF!tjgvv|q+9gz|a4<^3p
ziRbuL&&<tS%sk=r!2>KptPBc=xl)0t6s#fd$Nd8WhYv9@IZT?!D7t}}!JU_>04SH3
zkdSb&k&*EZgDlW=5Qt;g#_)|%iP4X75mawN`i7*0L<UARg=b7oY;FG&?3fw&c^PAX
zX17kX-Taf)ozX_j;E#~!QMFsln)~ictUs5iabfv|{XGq=JsmAQQ-kJTHGArvGj02=
anEZ#qW&O^-A7*+87cXLuw&Z7LU;qI5Veq;D

diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.woff2 b/ruoyi-ui/src/assets/iconfont/iconfont.woff2
index 747763724367487409c691da0e8a41d4e6ef12c1..848e27825a5548299db79774ecda45b5b83224b8 100644
GIT binary patch
delta 1433
zcmV;K1!nrp38V`ccTYw#00961000G~01E&B000Xt000G6kr*C-TndO>hadqq0we<<
z3labXAO(bH2WcCb2_q49dvJ1*{qw+X_{fl|($|VRs@H&oaEu=e!I8yv3lj<ca}d!S
zIeUA7M|KPn5DNtIK~=TJR!AnrloS-&CIJHA2J$qs=|C1|1_ife-Rp$x&}>c)8j0=%
znYdO5_#k}L%O!b#_Q|6!OuF6WG)KaV|Nr-!8SBt~MJ}G`$>hC{nKlmTC#r285+O~@
z8Y%89wZ*nr_83m#mD*byyz?sv5KFBVrmJUYip0H}j_xOyWjQTSbjsdcJ2v4DoY)9Q
z@GUO&N{gJq0dvYc1Ww!Um!H(<gTYaj_Zi#Xy_Ktha7>qfqh-)H=qUs^+5irqK;@CS
z<zzf~7|l$T7RCC4mY%a?`xs-u4@(I0!?7qLprDT$&Mg>AA_l>3MbhBl;r{VlmM9)r
zTT31UNI5J7B8Ng?%rtQVm;sy*aySr<`ti8eTEJXkhJSoANQd-*yko4!W{YAm{7lWz
zuGGw-#AhgfNxDu3AWT`hgWE3>Q}CJ*n3nC3tVwE?njx9u9zX||?5r)U=^)yw@~hj~
zFwoZ8(Bqh*QR19<UURD%;s)k<)I*fjGAMmLRrgMrrf>$50l*-XOew83jUvFMB|%6b
znT#Nj>(>b!US9T}AYg6Bk(!-^{B|jrvMM16Ga!(Ei9jo1B#dwjP07GBsbQ%kMVy>2
zC$$${ix7u}iqNS&v(%$n+^;x2%}7+lO~I)WO*C0*6n>2Wpy)XzIcAxy4r0x)(q>9}
zRxdA+q>|-B)vUja03uQVsT5elbU4{mv7#}e=&vLxXfg%IDVuPLi9<yA;Ue<Tk@Pe|
z7y+JtjHavP=H+wv7g&m#CXQi`tL`z|NcNffO1GB=Dk?{t_MZAtVZ1hMBI$(L%W9SG
z+rhWHRjOZ}Y~FsMmS-Hk-{Q^lFUgO?!bOSPkdye*O710El$`ded3S7wi>-$VsE#<g
z|4jAwJop@(k%9!uc7JEP1A=w-$$faaM9x}&rI7+BuH*Uhj$9|foKPBNt}M?NIL&$X
zR*4zJBAF<ijxr;^2&J*1^bYlxQEXHFz#unWklyPTvOS5eYHZ2=-?&JXwHjZGO^eF4
z$~4V~AYYvAne>6*;eF22oUhdV*t1sf`}$Vw>GM#Y-5Q?|T!1~>C+GV!R7WykWF&ll
zVFsb9&QHrP=79~Z*ERKU!*Lq+Oap(frWw8YWxug!_lQr;%FM7@XH^~_k6}sX{^se4
zi4mqs3RGBD$bFIo&iH;-!gJy{5QGEAi8ljEV<U+2e4f*c=PZ@OmB+$qp&=omwD31H
z6njI1!|88Px;QwmqoZ=KY2o$zhM=^6^5?>h#_wQy*#JOvNz)ZOEcdxSGJm=MRHnJy
zo93Igaj%*G$|x`EFFp9hKZ>1upC@fdYWnJH{unlW+Hm9p4n@lrU4}0%hOGIT<0T@c
zou$CHzVW1n9P*hjX|`#K<rDDjj;4BtWEvUqUn0{AFnHvF;*(Fata5OOqaIv;e3~Ja
z3f<Sok>((Z*chPL8UrEOSuiAW4wPhfXqNRH95RLAlI*a5c<|Tr-5$LZ_9`$6PxemH
zjROmd+GW2G&Yh9A+#e)G$WWOT^~xs($R^H7mr$uPv5Y-^^qz;V8)=fUfzzy3olbeq
zzLjKd>=&;D7z#XM-I2%{4OmlnYxU=Sf#9rT2$A;Z7pbGh<w+@15NMxhAdNhd{^TO4
zDCQaAe*36LKGyR?$BQE}`44M=qcZgx`N>I+R7^$L{>lDf-UY;3zS+-+iWNs(@x+%H
n9)?F!iDuY^vr@2e(_=V4e84!37i>DPZY73VcLIk&7YhIYcU-@U

delta 1216
zcmV;x1V8(v3(N@^cTYw#00961000Ec01E&B000T_000Dkkr*C-P6~!Zg-QW70we<*
z3lIPVAO(bH2V5JZ2vJlp^2mM^#tnA~Q5KV{Qcfn}e&25(njJy3hR)vILkLiki%(Qo
zr+})uwyJfu%2yEy-TB_LW{q~CoU|~Dg_3lVcI$LjIi+__-+qBdd<po2+OwMj0wMo%
zshssZcAD|+03dUJ4?D1|0TiIIJGX_fuU>(ISckEzA&0H62z1()$@Z+UTm(Fy<46O7
z*|R!>G&i0rXdF0;YK1@!t*owlWf31hMS5p@74Sa%{`ey{oJp$8y3fT!fef7d&T?VL
zSvm42eun_JCsfGTo|!h@kj<~z#o=vsI#EG;XMp~gR+7Gdhq=eRXsNbZ`3~T#_-iwF
z>bApVN&CmERYc7acSF*3q~<#pCG$N{65o47%92HhQuuLhR6AV`EK`97UeSwwz&{{f
z0gDC8AuE!-G*1ZJ1@<<>o&uo_U}O>;=klVvcO8Ti-@AvHqz@h-M#=sA#vWecD~-~E
z(j-PJIT6i&x!OdMbg?KyD$bHf$$5S%F*Ifz4<Lt40(@{3aFg2yD4ZnPp{5+)ieQ@e
z+dMkr-@d77$QVGo!9mVnHoyzT#1mWAgp41Ug1eDh_X$Q<@j;p%Hf@)fdhs@1NDT=&
zPS`?dpcd|ED4^2fohAVs6c~+yF4Q<bMX_<ZV$;-r#oRJ1EH7FNn`79b`)jycy`7t_
z8^G*1dF!;MseOG@o2IqibQl36VPt!^PP>U%?zs32E6;#wX)r_n)nNn*n8sp%l^w;q
zPM@)bM_m2sBk@vT?RPC*ZQXMx;NF42uz$jSFL2<VTWC29ZeAU^@}qr+4{Khm`4*sI
z%?Ct(KMD@8FDw@K_<?21lQ*zt4Tyb1c+#i+{T&18OL$3f?r|=UuU9y8*s!}hl{LFE
zf7jr#6YIDAVa*SL`|zsqv55SL?aP+2?8?yi(9snus9<|rup@j2_)KGt{8&ggPivgQ
z^HUn9HD8B}K*96b-p$jlBaS&5c6P~9iIfz7B31S_6*7fHvMlW#Ov96tq%;WLq{@o-
zO@XP~Ep0`C?~6bt006K)aJ#P|<(qqgDQ9~rn{ulE(xaT+C;H#;cR+2O-{Cf|^l$2|
zTLGVEMt;Mx|6Bq2E$|yj)Mo#5lKYyNMfcDYRC|}rSQ<wewWN)8;!m>=df1<IsJ7UD
ze=QwKA!$rO)>_0B(k4{8973&i3Z1qTSh@`Tzg49Js}@5D{kB8W>my|SF5n930aQj=
zpw{mnbh-?WyLDL&GLL~cf-;Qg#T2AgLpd@OE?NueP8H5n1tgF$D4-9EiHt7Bil7EE
zU7Rp<(Xj|o7{zGSSRwyBs8VS$9i#1kfFz2PBcw}>ilR_wi6pgZkcR=`5J(0?=!H=r
zX=zYCHp>6JS`e+13XZ9XlNcEWmc=ZNi4iHf2Chh~snv2Os|~u)Vj&2{?xHZX)G&p*
z5mMP<EsPGmsRKkpBFS3>by7t!SX5nc<oHtcMV^CB*2kJik)uQvbu`hcA9dm%8bV>O
ehMG=S?*llA6kX6>1u5jfC}=ryWFQGO2mk;83pM5d

diff --git a/ruoyi-ui/src/views/JiHeExpressway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/index.vue
index c1f020dc..7b4cd655 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="pageBox">
-    <HeaderMenu class="header" :style="headerStyle"/>
-     <!-- @onChange="handleChange" -->
+    <HeaderMenu class="header" :style="headerStyle" />
+    <!-- @onChange="handleChange" -->
     <Adaptation class="content" :headerHeight="headerHeight">
       <Transition name="fade">
         <router-view v-if="isShowContent" />
@@ -15,6 +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: {
@@ -24,6 +25,8 @@ export default {
   },
   data() {
     return {
+      notifications: [],
+      notifyIndex:0,
       isShowContent:false,
       headerHeight:100,
       header: {
@@ -57,6 +60,102 @@ 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 => {
       this.isShowContent = true;
@@ -71,6 +170,19 @@ 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;
@@ -135,3 +247,101 @@ 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/pages/datav/roadNet/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue
index 477fc9f0..200a0273 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue
@@ -24,7 +24,7 @@
             <img class="arrow arrow_02" src="./img/arrowRight.svg" alt="">
             <img class="arrow arrow_03" src="./img/arrowRight.svg" alt="">
             <div class="manageTotal">
-                <h4 class="keep-ratio">济荷运管中心</h4>
+                <h4 class="keep-ratio">济菏运管中心</h4>
                 <p>内存：<em>20.79</em>/62.36GB CPU：<em>1.00</em>/12<br>存储：<em>25.68</em>/2328.93GB</p>
             </div>
             <ul class="manageDetail">
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 77f27227..59319d90 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -52,8 +52,8 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // 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.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        target: `http://10.168.68.42:8087`, //王思祥
         // target: `http://10.168.72.174:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
         // target: `http://10.168.56.165:8087`, //王家宝

From 10a581b773262ba15de2ab382de79ec8fcfa26e3 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 8 May 2024 15:57:13 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/RoadStateCard/index.vue        | 46 ++++++-----------
 .../pages/control/event/dispatch/index.vue    | 50 +++++--------------
 .../pages/control/event/event/index.vue       |  1 +
 3 files changed, 30 insertions(+), 67 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
index 67d4a0be..6a77ffe0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
@@ -1,18 +1,11 @@
 <template>
-  <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">
+  <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" v-if="isShowLeft">
       <!-- <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>
@@ -26,25 +19,14 @@
         </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: isShowLeft ? '50%' : '25%' }"
+          @click.native="$emit('firstBtnClick', cardData.id)">{{ getFirstBtnText(cardData.state) }}</Button>
+        <Button v-if="cardData.state == 4" :style="{ background: lastBtnColor, width: isShowLeft ? '50%' : '25%' }"
+          @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>
 
@@ -106,6 +88,10 @@ export default {
         },
       ],
     },
+    isShowLeft: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -180,7 +166,7 @@ export default {
       display: flex;
       flex-direction: column;
 
-      > p {
+      >p {
         font-size: 12px;
         color: #f4f4f4;
         line-height: 24px;
@@ -212,7 +198,7 @@ export default {
       display: flex;
       gap: 9px;
 
-      > div {
+      >div {
         // flex: 1;
       }
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
index 7a2b35b8..af94e2d9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
@@ -9,51 +9,27 @@
         刷新
       </ButtonGradient>
 
-      <InputSearch
-        ref="searchComp"
-        style="width: 402px"
-        :formList="searchFormList"
-        :formConfigOptions="{ dFormData: { eventState: '0' } }"
-        @handleSearch="handleSearch"
-      />
+      <InputSearch ref="searchComp" style="width: 402px" :formList="searchFormList"
+        :formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
     </div>
 
     <!-- 内容 -->
     <div class="body">
-      <RoadStateCard
-        v-for="(item, index) in data"
-        :key="index"
-        :cardData="item"
-        @firstBtnClick="firstBtnClick"
-        @lastBtnClick="lastBtnClick"
-      />
+      <RoadStateCard v-for="(item, index) in data" :key="index" :cardData="item" :isShowLeft="false" @firstBtnClick="firstBtnClick"
+        @lastBtnClick="lastBtnClick" />
     </div>
 
     <!-- 分页 -->
     <div class="footer">
-      <Pagination
-        @current-change="initData"
-        @size-change="onSizeChange"
-        width="'100%'"
-        :page-sizes="[12, 16, 20, 30, 50]"
-        :page-size="searchData.pageSize"
-        :current-page.sync="searchData.pageNum"
-        layout="total, sizes, prev, pager, next"
-        :total="total"
-      >
+      <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'"
+        :page-sizes="[12, 16, 20, 30, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        layout="total, sizes, prev, pager, next" :total="total">
       </Pagination>
     </div>
 
-    <EventDetailDialog
-      :visible="eventDetailDialogVisible"
-      :formData="detailDialogFormData"
-      @update:value="handleClose"
-    />
-    <EventDispatchDialog
-      :visible="eventDispatchDialogVisible"
-      @update:value="handleClose"
-      :eventId="eventId"
-    />
+    <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData"
+      @update:value="handleClose" />
+    <EventDispatchDialog :visible="eventDispatchDialogVisible" @update:value="handleClose" :eventId="eventId" />
   </div>
 </template>
 
@@ -104,7 +80,7 @@ export default {
     this.initData();
   },
   methods: {
-    onRefreshForm(){
+    onRefreshForm() {
       this.searchData.pageNum = 1;
       this.$refs.searchComp.handleResetForm();
     },
@@ -205,8 +181,8 @@ export default {
     display: flex;
     // justify-content: flex-end;
     justify-content: space-between;
-    .refresh-btn {
-    }
+
+    .refresh-btn {}
   }
 
   .body {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
index 2bc8b0fa..3ab3a6f7 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
@@ -153,6 +153,7 @@ export default {
         cardData: { ...item, state },
         lastBtnColor: textColor,
         lastBtnText: text,
+        isShowLeft: this.activeName == '-1'
       };
     },
     queryData(flag) {

From 14888282090239303051455d3dc8fca070de023e Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 8 May 2024 16:14:54 +0800
Subject: [PATCH 3/6] bug

---
 .../event/emergencyProcessManagement/commonPhrases/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
index 4a8ade16..20e94a80 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" title="配置常用语" width="880px">
+  <Dialog v-model="modelVisible" title="配置常用语" width="880px" top="8%">
     <!-- <Button style="margin: 10px 0 20px 20px; width: 100px;" @click.native="onAdd">添加</Button> -->
     <div class="header">
       <el-form ref="form" label-width="120px">

From c0713842f226235b001cb78c28d8b27e371e6f1b Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 8 May 2024 17:02:39 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E8=AF=B1=E5=AF=BC?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DeviceControlDialog.vue        |  5 +++-
 .../Dialogs/DrivingGuidance/index.vue         | 29 +++++++++++--------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
index efaad632..93b1ef0b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
@@ -38,7 +38,7 @@ export default {
   props: {
     visible: Boolean,
     deviceId: String,
-    id: String,
+    id: Number,
     deviceType: String,
   },
   data() {
@@ -49,6 +49,9 @@ export default {
   computed: {
     modelVisible: {
       get() {
+        if(this.visible){
+          console.log('id',id)
+        }
         return this.visible;
       },
       set(val) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 5a8efaf2..30a45fa7 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -164,18 +164,23 @@ export default {
     handleClickTabs() { },
     requestURL(functionId = 52, options = {}) {
       return new Promise((resolve, reject) => {
-        request
-          .post(
-            `business/device/functions/${this.dialogData.iotDeviceId}/${functionId}`,
-            options
-          )
-          .then((result) => {
-            if (result.code != 200) return reject();
-            resolve(result.data[0]);
-          })
-          .catch((err) => {
-            reject();
-          });
+        if (!this.dialogData.iotDeviceId) {
+          reject();
+        } else {
+          request
+            .post(
+              `business/device/functions/${this.dialogData.iotDeviceId}/${functionId}`,
+              options
+            )
+            .then((result) => {
+              if (result.code != 200) return reject();
+              resolve(result.data[0]);
+            })
+            .catch((err) => {
+              reject();
+            });
+        }
+
       });
     },
   },

From 320c9ec098982dd50dd9b6343586b6bead59764d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Wed, 8 May 2024 17:06:29 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=8B=A5=E6=8C=A4=E5=BA=A6=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E6=8E=92=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Dialog/index.vue               |   6 +-
 .../components/VideoMulti/index.vue           |   7 +-
 .../components/DialogBoard.vue                | 168 ++++++++++++++++++
 .../components/DialogCamera.vue               |  64 +++++++
 .../CrowdnessIndicatorRankings/index.vue      | 164 +++++++++++++++--
 5 files changed, 389 insertions(+), 20 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogBoard.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogCamera.vue

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
index 525c2062..da63a7db 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
@@ -10,7 +10,7 @@
           <div class="dialog-title">
             <img class="title-icon" src="@screen/images/dialog/title-icon.svg" />
             <span>{{ title }}</span>
-            <img class="icon-close" @click.stop="modelVisible = false" src="@screen/images/dialog/icon-close.svg" />
+            <img class="icon-close" @click.stop="close()" src="@screen/images/dialog/icon-close.svg" />
           </div>
 
           <div class="dialog-content">
@@ -86,6 +86,10 @@ export default {
     },
   },
   methods: {
+    close(){
+      console.log('------')
+      this.modelVisible = false
+    },
     updateDialogVisible(bool) {
       this.modelVisible = bool;
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
index 6dc49afb..43dac124 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
@@ -68,7 +68,12 @@ export default {
       const changeItem = find(this.urls, { iotDeviceId: this.cameraId });
       this.dialogData = { ...changeItem, parseOtherConfig: changeItem.otherConfig && JSON.parse(changeItem.otherConfig) };
       console.log(this.cameraId, this.dialogData)
-      this.showVideo();
+      this.player?.destroy();
+      const self = this;
+      setTimeout(() => {
+        self.showVideo();  
+      }, 500);
+      
     },
     async playVideo() {
       this.player?.destroy();
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogBoard.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogBoard.vue
new file mode 100644
index 00000000..503eedc9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogBoard.vue
@@ -0,0 +1,168 @@
+<template>
+  <Dialog v-if="data" v-model="visibleModel" :title="data.deviceName" width="600px">
+    <div v-for="(itm, indx) in selectedBdMsg" :key="indx" class="tplItem">
+                
+      <BoardPreview class="boardPreview" :boardWH="selectedSize" :tpl="itm"></BoardPreview>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+
+import BoardPreview from "@screen/components/infoBoard/BoardPreview.vue";
+import request from "@/utils/request";
+import { getBoardDeviceInfo } from "@/api/board/board";
+
+export default {
+  name: "DialogBoard",
+  components: {
+    Dialog,
+    Button,
+    BoardPreview,
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    data: {
+      type: Object,
+      default: null,
+    },
+  },
+  emit: ["close"],
+  data() {
+    return {
+      selectedBdMsg:[],
+      selectedSize:null
+    };
+  },
+  computed: {
+    visibleModel: {
+      get() {
+        if (this.visible) this.getData();
+        return this.visible;
+      },
+      set(bool) {
+        this.$emit("close", bool);
+      },
+    },
+  },
+  methods: {
+    getData() {
+      const deviceFrom = this.data;
+      if(deviceFrom.otherConfig){
+        this.selectedSize = JSON.parse(deviceFrom.otherConfig).screenSize
+        
+      }
+      if (!deviceFrom.iotDeviceId || deviceFrom.iotDeviceId.includes("null_")) {
+          this.$message.warning("设备未接入！");
+          return;
+        }
+        this.selectedBdMsg = [];
+        getBoardDeviceInfo(deviceFrom.iotDeviceId, deviceFrom.id)
+          .then((res) => {
+            this.selectedBdMsg = res.data["3A"].content;
+        
+          })
+          .catch((err) => { });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+.tplItem {
+          margin-right: 14px;
+          display: flex;
+          align-items: stretch;
+          padding-bottom: 10px;
+
+          .boardPreview {
+            border: 2px solid #004c64;
+            background-color: #133242;
+            // width: 560px;
+            // height:80px;
+            flex: 1;
+          }
+
+          .infoBtnBox {
+            width: 160px;
+            height: 80px;
+            display: flex;
+            margin-left: 10px;
+            /* // border: solid 1px #05afe3; */
+            border: 2px solid #004c64;
+            background-color: #133242;
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+
+            .btn {
+              background-repeat: no-repeat;
+              background-size: 100% 100%;
+              width: 40px;
+              height: 40px;
+
+              &.btnApply {
+                background-image: url(~@/assets/jihe/images/button/toLeft.svg);
+              }
+
+              &.btnEdit {
+                background-image: url(~@/assets/jihe/images/button/edit.svg);
+              }
+
+              &.btnDelete {
+                background-image: url(~@/assets/jihe/images/button/delete.svg);
+              }
+            }
+
+            i {
+              font-size: 24px;
+              color: #666;
+              padding-left: 4px;
+              cursor: pointer;
+              caret-color: rgba(0, 0, 0, 0);
+              user-select: none;
+            }
+
+            i:hover {
+              color: #05afe3;
+            }
+
+            .disabledClass {
+              pointer-events: none;
+              cursor: auto !important;
+              color: #ccc;
+            }
+          }
+        }
+
+        .tplItem.ghost_class {
+
+          .boardPreview,
+          .infoBtnBox {
+            border-color: #F00;
+          }
+        }
+
+        .tplItem.chosen_class {
+
+          .boardPreview,
+          .infoBtnBox {
+            border-color: #0A0;
+          }
+        }
+
+        .tplItem.drag_class {
+
+          .boardPreview,
+          .infoBtnBox {
+            border-color: #FF0;
+          }
+        }
+
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogCamera.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogCamera.vue
new file mode 100644
index 00000000..843eb3e0
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogCamera.vue
@@ -0,0 +1,64 @@
+<template>
+  <Dialog v-if="data" v-model="visibleModel" :title="data.deviceName" width="600px">
+    <Video  class="video-stream" :camId="data.iotDeviceId" />
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+
+import Video from "@screen/components/Video/Video.vue"
+import request from "@/utils/request";
+import { getBoardDeviceInfo } from "@/api/board/board";
+
+export default {
+  name: "DialogCamera",
+  components: {
+    Dialog,
+    Button,
+    Video
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    data: {
+      type: Object,
+      default: null,
+    },
+  },
+  emit: ["close"],
+  data() {
+    return {
+      selectedBdMsg:[],
+      selectedSize:null
+    };
+  },
+  computed: {
+    visibleModel: {
+      get() {
+        if (this.visible) this.getData();
+        return this.visible;
+      },
+      set(bool) {
+        this.$emit("close", bool);
+      },
+    },
+  },
+  methods: {
+    getData() {
+     
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+ .video-stream {
+      width: 100%;
+      height: 100%;
+    }
+
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
index 69bf17be..f6d67e09 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
@@ -5,7 +5,7 @@
         ref="AMapContainerRef"
         v-if="delayLoad"
         @update:isGisCompleted="(data) => {
-          this.bindMap(data)
+          this.bindMap(data)  
         }
       "
         style="z-index: 9"
@@ -19,7 +19,7 @@
         @click="handleClick(item)"
       >
         <div
-          v-if="item.key === 'bar'"
+          v-if="['bar','level','camera'].indexOf(item.key) !== -1"
           class="label"
           slot="reference"
           :style="{
@@ -57,21 +57,36 @@
         </ElPopover>
       </div>
     </div>
+    <DialogBoard
+      :visible="dialogVisible"
+      @close="handledDialogBoard(false)"
+      :data="dialogData"
+    />
+    <DialogCamera
+      :visible="dialogVisibleCamera"
+      @close="handledDialogCamera(false)"
+      :data="dialogDataCamera"
+    />
   </Card>
 </template>
 
 <script>
 import Card from "@screen/components/Card2/Card.vue";
+import DialogBoard from "./components/DialogBoard.vue";
+import DialogCamera from "./components/DialogCamera.vue";
 import AMapContainer from "@screen/pages/Home/components/AMapContainer/index.vue";
 import { provideMixin } from "./../../mixin";
 import { getWeatherForecast } from "@/api/commandDispatch";
 import * as echarts from "echarts";
 import { StatChartOption } from "./charts";
+import request from "@/utils/request";
 
 export default {
   name: "CrowdnessIndicatorRankings",
   components: {
     Card,
+    DialogBoard,
+    DialogCamera,
     AMapContainer,
   },
   mixins: [provideMixin],
@@ -95,10 +110,6 @@ export default {
           key: "level",
           label: "情报板",
         },
-        // {
-        //   key: "car",
-        //   label: "天气",
-        // },
         {
           key: "pie",
           label: "断面车流量",
@@ -106,12 +117,34 @@ export default {
       ],
       delayLoad: true,
       weatherData: {},
+      markerBoard:[],
+      dialogVisible:false,
+      dialogData: null,
+      markerCamera:[],
+      dialogVisibleCamera:false,
+      dialogDataCamera: null,
     };
   },
   computed: {
     isActive() {
       return (item) => this.active.includes(item.key);
     },
+    modelVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:value", val);
+      },
+    },
+  },
+  watch: {
+    modelVisible: {
+      immediate: true,
+      handler(bool) {
+        if (!bool) return;
+      },
+    },
   },
   methods: {
     handleClick(item) {
@@ -129,8 +162,90 @@ export default {
         });
       } else if (item.key === "bar") {
         this.$refs.AMapContainerRef.showRoadConditions(findIndex === -1);
+      } else if (item.key === 'level'){
+        this.getBoard(findIndex === -1);
+      } else if (item.key === 'camera'){
+        this.getCamera(findIndex === -1);
+      }
+    },
+    getCamera(isShow){
+      if(isShow){
+        const self = this;
+        this.markerCamera = [];
+        request({
+          url: "/video/nearCamPileNum",
+          method: "get",
+          params: {
+            pileNum: this.detailData.stakeMark,
+          },
+        }).then(result=>{
+          if (result.code != 200) return Message.error(`查询失败!${result.msg}`);
+          const list = [...result.data.downCamera,...result.data.upCamera];
+          
+          const icon = require(`@screen/images/layer/路测设备/摄像机_active.svg`);
+          const icon_f = require(`@screen/images/layer/路测设备/摄像机_fault.svg`);
+          list.forEach(e => {
+            const p = new AMap.LngLat(parseFloat(e.longitude), parseFloat(e.latitude));
+            const m = this.addMarker(p,e.useState?icon:icon_f,e.useState,function(){
+              console.log(e,'-------------')
+              if(e.useState === 1){
+                self.dialogDataCamera = e;
+                self.dialogVisibleCamera = true;
+              } else {
+                self.$message.warning("设备未接入！！");
+              }
+            })
+            this.markerCamera.push(m)
+          });
+        })
+      } else {
+        this.markerCamera.forEach(e => {
+          e.setMap(null);
+          e = null;
+        });
+      }
+    },
+    handledDialogCamera(bool) {
+      this.dialogVisibleCamera = bool;
+    },
+    getBoard(isShow){
+      if(isShow){
+        const self = this;
+        this.markerBoard = [];
+        const fileData = new FormData(); // new formData对象        
+        fileData.append("stakeMark", this.detailData.stakeMark);
+        fileData.append("direction", this.detailData.direction ==='济南方向'?1:2);
+        request({
+          url: "/business/device/selectNearBoard",
+          method: "post",
+          data:fileData
+        }).then(result=>{
+          if (result.code != 200) return Message.error(`查询失败!${result.msg}`);
+          const icon = require(`@screen/images/layer/路测设备/情报板_active.svg`);
+          const icon_f = require(`@screen/images/layer/路测设备/情报板_fault.svg`);
+          result.data.forEach(e => {
+            const p = new AMap.LngLat(parseFloat(e.longitude), parseFloat(e.latitude));
+            const m = this.addMarker(p,e.useState?icon:icon_f,e.useState,function(){
+              if(e.useState === 1){
+                self.dialogData = e;
+                self.dialogVisible = true;
+              } else {
+                self.$message.warning("设备未接入！");
+              }
+            })
+            this.markerBoard.push(m)
+          });
+        })
+      } else {
+        this.markerBoard.forEach(e => {
+          e.setMap(null);
+          e = null;
+        });
       }
     },
+    handledDialogBoard(bool) {
+      this.dialogVisible = bool;
+    },
     getWeather() {
       getWeatherForecast(117.2, 36.65).then((res) => {
         this.weatherData =
@@ -138,24 +253,35 @@ export default {
         console.log("气象", res);
       });
     },
-
+    // 绑定地图事件
     bindMap(isLoaded){
       if(!isLoaded){
         return;
       }
+      const self = this;
+      setTimeout(() => {
       // 获取map接口
+        const {AMap,mapIns} = self.$refs.AMapContainerRef.getMapInstance();
+        const {longitude,dimension,eventName} = self.detailData;
+        const icon = require(`@screen/images/layer/事件专题/${eventName}_active.svg`);
+        const center = new AMap.LngLat(parseFloat(longitude), parseFloat(dimension));
+        self.addMarker(center,icon, 1);
+        mapIns.setZoomAndCenter(12, center);
+        // 
+        console.log(mapIns,AMap,'--------')
+        console.log(self.detailData,'############');  
+      }, 500);
+      
+    },
+    addMarker(position,icon, state, fn = null){
       const {AMap,mapIns} = this.$refs.AMapContainerRef.getMapInstance();
-      const {longitude,dimension,eventName} = this.detailData;
-      const icon = require(`@screen/images/layer/事件专题/${eventName}_active.svg`);
       const nowBg = require(`@screen/images/mapBg/active.svg`);
-
-      const center = new AMap.LngLat(parseFloat(longitude), parseFloat(dimension));
-      
+      const nowBg_f = require(`@screen/images/mapBg/fault.svg`);
       var marker = new AMap.Marker({
-        position:center,
+        position:position,
         content: `
           <div style="
-            background-image: url(${nowBg});
+            background-image: url(${state?nowBg:nowBg_f});
             background-size: 100% 100%;
             background-repeat: no-repeat;
             width: 51px;
@@ -176,11 +302,13 @@ export default {
       `,
         anchor: 'bottom-center',
       });
+      marker.on("click", (e) => {
+          if(fn){
+            fn(e)
+          }
+      })
       mapIns.add(marker);
-      mapIns.setZoomAndCenter(12, center);
-      // 
-      console.log(mapIns,AMap,'--------')
-      console.log(this.detailData,'############');
+      return marker;
     }
   },
   mounted() {

From 0055deab44e21272388707c442af51bb32905809 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 8 May 2024 17:50:51 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E8=AE=BE=E5=A4=87-?=
 =?UTF-8?q?=E6=B0=B4=E8=86=9C=E5=8E=9A=E5=BA=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/components/Dialogs/MeteorologicalDetection/index.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
index 57ad41ac..335c20c1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
@@ -139,7 +139,7 @@ export default {
         },
         {
           label: "水膜厚度(mm)",
-          key: "waterFilmlceSnowValue",
+          key: "waterFilmIceSnowValue",
         },
         {
           label: "大气压力(hPa)",