zhanghaijun 2 anni fa
parent
commit
c76922f387
57 ha cambiato i file con 104 aggiunte e 101 eliminazioni
  1. 1 1
      train-server/src/main/resources/static/assets/404-3a1c8a6f.js
  2. 1 1
      train-server/src/main/resources/static/assets/404-legacy-5faf10cf.js
  3. 1 1
      train-server/src/main/resources/static/assets/Device-328f59bf.js
  4. 1 1
      train-server/src/main/resources/static/assets/Device-legacy-df4616c9.js
  5. 1 0
      train-server/src/main/resources/static/assets/DeviceTest-07613d90.css
  6. 0 1
      train-server/src/main/resources/static/assets/DeviceTest-421ca5b7.js
  7. 0 1
      train-server/src/main/resources/static/assets/DeviceTest-d357be27.css
  8. 1 0
      train-server/src/main/resources/static/assets/DeviceTest-fff7b458.js
  9. 0 1
      train-server/src/main/resources/static/assets/DeviceTest-legacy-321b01e5.js
  10. 1 0
      train-server/src/main/resources/static/assets/DeviceTest-legacy-b9e815bc.js
  11. 1 1
      train-server/src/main/resources/static/assets/HomeIndex-0101807d.js
  12. 1 1
      train-server/src/main/resources/static/assets/HomeIndex-legacy-0c19d712.js
  13. 0 1
      train-server/src/main/resources/static/assets/el-button-6eee6882.js
  14. 0 1
      train-server/src/main/resources/static/assets/el-button-f53fc369.css
  15. 0 1
      train-server/src/main/resources/static/assets/el-button-legacy-65b7f6f9.js
  16. 1 0
      train-server/src/main/resources/static/assets/el-notification-c2770360.css
  17. 1 0
      train-server/src/main/resources/static/assets/el-notification-e9e7a7ba.js
  18. 1 0
      train-server/src/main/resources/static/assets/el-notification-legacy-b1851c5b.js
  19. 0 1
      train-server/src/main/resources/static/assets/el-popper-1261d1bd.js
  20. 1 0
      train-server/src/main/resources/static/assets/el-popper-971e935b.js
  21. 1 0
      train-server/src/main/resources/static/assets/el-popper-legacy-8d3ee7c7.js
  22. 0 1
      train-server/src/main/resources/static/assets/el-popper-legacy-98957729.js
  23. 1 0
      train-server/src/main/resources/static/assets/el-tag-36f6ebe5.css
  24. 20 0
      train-server/src/main/resources/static/assets/el-tag-6d29e56e.js
  25. 0 1
      train-server/src/main/resources/static/assets/el-tag-8917ddcd.css
  26. 0 20
      train-server/src/main/resources/static/assets/el-tag-d75cbe80.js
  27. 23 0
      train-server/src/main/resources/static/assets/el-tag-legacy-82397a58.js
  28. 0 23
      train-server/src/main/resources/static/assets/el-tag-legacy-f0556e0b.js
  29. 1 1
      train-server/src/main/resources/static/assets/index-bed17ddf.js
  30. 0 1
      train-server/src/main/resources/static/assets/index-1fd45bc6.js
  31. 0 1
      train-server/src/main/resources/static/assets/index-28178421.js
  32. 1 0
      train-server/src/main/resources/static/assets/index-37343452.js
  33. 1 0
      train-server/src/main/resources/static/assets/index-470c90ee.css
  34. 0 1
      train-server/src/main/resources/static/assets/index-4cb7387f.js
  35. 0 1
      train-server/src/main/resources/static/assets/index-6d12eb1c.js
  36. 1 1
      train-server/src/main/resources/static/assets/index-3f2ca7f0.css
  37. 1 0
      train-server/src/main/resources/static/assets/index-afd491d8.js
  38. 8 8
      train-server/src/main/resources/static/assets/index-d98c3d65.js
  39. 1 0
      train-server/src/main/resources/static/assets/index-c043fb93.js
  40. 1 0
      train-server/src/main/resources/static/assets/index-c5f9be64.js
  41. 1 1
      train-server/src/main/resources/static/assets/index-e9aa14d4.js
  42. 0 1
      train-server/src/main/resources/static/assets/index-e287c44a.css
  43. 1 1
      train-server/src/main/resources/static/assets/index-legacy-d1f1256a.js
  44. 0 1
      train-server/src/main/resources/static/assets/index-legacy-0bfa2872.js
  45. 5 5
      train-server/src/main/resources/static/assets/index-legacy-552e4f5d.js
  46. 0 1
      train-server/src/main/resources/static/assets/index-legacy-1199044c.js
  47. 1 1
      train-server/src/main/resources/static/assets/index-legacy-176fe3f0.js
  48. 1 1
      train-server/src/main/resources/static/assets/index-legacy-d9c01edf.js
  49. 1 0
      train-server/src/main/resources/static/assets/index-legacy-3fb57fbc.js
  50. 1 0
      train-server/src/main/resources/static/assets/index-legacy-4370b764.js
  51. 1 0
      train-server/src/main/resources/static/assets/index-legacy-786acc7e.js
  52. 0 1
      train-server/src/main/resources/static/assets/index-legacy-b6a408fb.js
  53. 1 1
      train-server/src/main/resources/static/assets/polyfills-legacy-91b25bd7.js
  54. 1 0
      train-server/src/main/resources/static/assets/use-form-item-783a3a70.js
  55. 1 0
      train-server/src/main/resources/static/assets/use-form-item-legacy-16453200.js
  56. 3 3
      train-server/src/main/resources/static/index.html
  57. 13 12
      train-web/src/pages/situation/index.vue

+ 1 - 1
train-server/src/main/resources/static/assets/404-3a1c8a6f.js

@@ -1 +1 @@
-import{_ as t}from"./_plugin-vue_export-helper-c27b6911.js";import{W as o,o as r,f as n,$ as s,w as a,X as c,Y as _}from"./index-d98c3d65.js";const d={},i={style:{"border-radius":"8px",border:"1px solid #3666",margin:"0 auto",width:"600px","text-align":"center",padding:"50px"}},l=c("h2",null,"页面找不到",-1);function p(x,f){const e=o("router-link");return r(),n("div",i,[l,s(e,{to:"/"},{default:a(()=>[_(" 跳转首页 ")]),_:1})])}const h=t(d,[["render",p]]);export{h as default};
+import{_ as t}from"./_plugin-vue_export-helper-c27b6911.js";import{W as o,o as r,f as n,$ as s,w as a,X as c,Y as _}from"./index-b3ef0e7a.js";const d={},i={style:{"border-radius":"8px",border:"1px solid #3666",margin:"0 auto",width:"600px","text-align":"center",padding:"50px"}},l=c("h2",null,"页面找不到",-1);function p(x,f){const e=o("router-link");return r(),n("div",i,[l,s(e,{to:"/"},{default:a(()=>[_(" 跳转首页 ")]),_:1})])}const h=t(d,[["render",p]]);export{h as default};

File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/404-legacy-5faf10cf.js


File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/Device-328f59bf.js


File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/Device-legacy-df4616c9.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/DeviceTest-07613d90.css


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/DeviceTest-421ca5b7.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/DeviceTest-d357be27.css


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/DeviceTest-fff7b458.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/DeviceTest-legacy-321b01e5.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/DeviceTest-legacy-b9e815bc.js


+ 1 - 1
train-server/src/main/resources/static/assets/HomeIndex-0101807d.js

@@ -1 +1 @@
-import{_ as e}from"./_plugin-vue_export-helper-c27b6911.js";import{o,f as r}from"./index-d98c3d65.js";const c={};function n(t,s){return o(),r("h2",null,"欢迎访问")}const f=e(c,[["render",n]]);export{f as default};
+import{_ as e}from"./_plugin-vue_export-helper-c27b6911.js";import{o,f as r}from"./index-b3ef0e7a.js";const c={};function n(t,s){return o(),r("h2",null,"欢迎访问")}const f=e(c,[["render",n]]);export{f as default};

+ 1 - 1
train-server/src/main/resources/static/assets/HomeIndex-legacy-0c19d712.js

@@ -1 +1 @@
-System.register(["./_plugin-vue_export-helper-legacy-762b7923.js","./index-legacy-552e4f5d.js"],(function(e,t){"use strict";var r,n,u;return{setters:[e=>{r=e._},e=>{n=e.o,u=e.f}],execute:function(){e("default",r({},[["render",function(e,t){return n(),u("h2",null,"欢迎访问")}]]))}}}));
+System.register(["./_plugin-vue_export-helper-legacy-762b7923.js","./index-legacy-109caf83.js"],(function(e,t){"use strict";var r,n,u;return{setters:[e=>{r=e._},e=>{n=e.o,u=e.f}],execute:function(){e("default",r({},[["render",function(e,t){return n(),u("h2",null,"欢迎访问")}]]))}}}));

File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/el-button-6eee6882.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/el-button-f53fc369.css


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/el-button-legacy-65b7f6f9.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/el-notification-c2770360.css


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/el-notification-e9e7a7ba.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/el-notification-legacy-b1851c5b.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/el-popper-1261d1bd.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/el-popper-971e935b.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/el-popper-legacy-8d3ee7c7.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/el-popper-legacy-98957729.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/el-tag-36f6ebe5.css


File diff suppressed because it is too large
+ 20 - 0
train-server/src/main/resources/static/assets/el-tag-6d29e56e.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/el-tag-8917ddcd.css


File diff suppressed because it is too large
+ 0 - 20
train-server/src/main/resources/static/assets/el-tag-d75cbe80.js


File diff suppressed because it is too large
+ 23 - 0
train-server/src/main/resources/static/assets/el-tag-legacy-82397a58.js


File diff suppressed because it is too large
+ 0 - 23
train-server/src/main/resources/static/assets/el-tag-legacy-f0556e0b.js


File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/index-bed17ddf.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/index-1fd45bc6.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/index-28178421.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/index-37343452.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/index-470c90ee.css


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/index-4cb7387f.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/index-6d12eb1c.js


File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/index-3f2ca7f0.css


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/index-afd491d8.js


File diff suppressed because it is too large
+ 8 - 8
train-server/src/main/resources/static/assets/index-d98c3d65.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/index-c043fb93.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/index-c5f9be64.js


File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/index-e9aa14d4.js


+ 0 - 1
train-server/src/main/resources/static/assets/index-e287c44a.css

@@ -1 +0,0 @@
-.echart-box[data-v-4b135e26]{width:23.958333vw;height:19.791667vw;background-color:#031a67;position:absolute;bottom:0;border-radius:.520833vw}.point-box[data-v-4b135e26]{width:6vh;height:3vh;text-align:center;background-color:#00f;border-radius:1vh;color:#fff;position:absolute;cursor:pointer}

File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/index-legacy-d1f1256a.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/index-legacy-0bfa2872.js


File diff suppressed because it is too large
+ 5 - 5
train-server/src/main/resources/static/assets/index-legacy-552e4f5d.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/index-legacy-1199044c.js


File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/index-legacy-176fe3f0.js


File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/index-legacy-d9c01edf.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/index-legacy-3fb57fbc.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/index-legacy-4370b764.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/index-legacy-786acc7e.js


File diff suppressed because it is too large
+ 0 - 1
train-server/src/main/resources/static/assets/index-legacy-b6a408fb.js


File diff suppressed because it is too large
+ 1 - 1
train-server/src/main/resources/static/assets/polyfills-legacy-91b25bd7.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/use-form-item-783a3a70.js


File diff suppressed because it is too large
+ 1 - 0
train-server/src/main/resources/static/assets/use-form-item-legacy-16453200.js


+ 3 - 3
train-server/src/main/resources/static/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>城轨车站多智能体虚拟场景演练系统</title>
-    <script type="module" crossorigin src="/assets/index-d98c3d65.js"></script>
+    <script type="module" crossorigin src="/assets/index-b3ef0e7a.js"></script>
     <link rel="stylesheet" href="/assets/index-534d28ba.css">
     <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
     <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -14,7 +14,7 @@
     <div id="app"></div>
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script nomodule crossorigin id="vite-legacy-polyfill" src="/assets/polyfills-legacy-91b25bd7.js"></script>
-    <script nomodule crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-552e4f5d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule crossorigin id="vite-legacy-polyfill" src="/assets/polyfills-legacy-a5617613.js"></script>
+    <script nomodule crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-109caf83.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

+ 13 - 12
train-web/src/pages/situation/index.vue

@@ -36,7 +36,7 @@
       <el-row :gutter="20">
         <el-col :span="6">{{ '水灾控制' }}</el-col>
         <el-col :span="18">
-          <el-slider v-model="waterSpeed" :format-tooltip="(val:number)=>val / 100" @change="waterControl"/>
+          <el-slider v-model="waterSpeed" :format-tooltip="(val: number) => val / 100" @change="waterControl"/>
         </el-col>
       </el-row>
     </div>
@@ -63,6 +63,7 @@
 import imageUrl from '@/assets/images/backage-situation.png'
 import {ElPopover} from 'element-plus';
 import {situationClientControl, situationDevice, situationWaterControl} from '@/api/device.ts'
+import {Arrayable} from "@vueuse/core";
 
 // 客流进站速度
 const clientSpeed = ref(0);
@@ -76,7 +77,7 @@ const deviceData = ref<{ command: number, postion: string, value: number, top: s
 // 定时器
 let intervalId: number | undefined = undefined;
 onMounted(function () {
-  intervalId = setInterval(getDevice, 1000);
+  intervalId = setInterval(getDevice, 1000) as unknown as number;
 })
 onBeforeUnmount(() => {
   if (intervalId) {
@@ -85,12 +86,10 @@ onBeforeUnmount(() => {
 });
 const getDevice = function () {
   situationDevice().then(({data}) => {
-    let resultArray = [];
+    let resultArray: { command: number, postion: string, value: number, top: string, left: string }[] = [];
     for (let i = 0; i < data.length; i++) {
       const device: any = data[i];
-      // console.log("---", device.message);
-      resultArray = [...resultArray, ...((JSON.parse(device.message) || []).map((item) => {
-        console.log("item: ", item);
+      resultArray = [...resultArray, ...((JSON.parse(device.message) || []).map((item: any) => {
         switch (item.postion.trim()) {
           case "站厅":
             return {...item, command: device.command, postion: item.postion.trim(), top: '18vh', left: '110vh'}
@@ -107,20 +106,22 @@ const getDevice = function () {
           default:
             return undefined;
         }
-      })).filter((item) => item)]
+      })).filter((item: any) => item)]
     }
     console.log(JSON.stringify(resultArray));
     deviceData.value = resultArray;
   });
 };
-const clientControl = (value: number) => {
-  situationClientControl(value).then(() => {
+const clientControl = (value: Arrayable<number>): void => {
+  const actualValue = Array.isArray(value) ? value[0] : value;
+  situationClientControl(actualValue).then(() => {
     ElNotification({title: '系统通知', message: '客流控制成功', type: 'success'})
   });
 }
-const waterControl = function (value: number) {
-  situationWaterControl(value != 0, value / 100).then(() => {
-    ElNotification({title: '系统通知', message: value != 0 ? '水灾控制成功' : '关闭水灾成功', type: 'success'})
+const waterControl = function (value: Arrayable<number>): void {
+  const actualValue = Array.isArray(value) ? value[0] : value; // 获取实际的数值
+  situationWaterControl(actualValue != 0, actualValue / 100).then(() => {
+    ElNotification({title: '系统通知', message: actualValue != 0 ? '水灾控制成功' : '关闭水灾成功', type: 'success'})
   });
 };