diff --git a/config/index.js b/config/index.js index f2faac0..6d5aaf6 100644 --- a/config/index.js +++ b/config/index.js @@ -11,7 +11,7 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api': { - target: 'http://192.168.0.35:8089/', + target: 'http://192.168.0.112:8085', changeOrigin: true, pathRewrite: { '^/api': '' diff --git a/src/assets/map/emergency_rescue/i1.png b/src/assets/map/emergency_rescue/i1.png new file mode 100644 index 0000000..a661849 Binary files /dev/null and b/src/assets/map/emergency_rescue/i1.png differ diff --git a/src/assets/map/emergency_rescue/i10.png b/src/assets/map/emergency_rescue/i10.png new file mode 100644 index 0000000..c99f84a Binary files /dev/null and b/src/assets/map/emergency_rescue/i10.png differ diff --git a/src/assets/map/emergency_rescue/i10_on.png b/src/assets/map/emergency_rescue/i10_on.png new file mode 100644 index 0000000..cfc6d7d Binary files /dev/null and b/src/assets/map/emergency_rescue/i10_on.png differ diff --git a/src/assets/map/emergency_rescue/i11.png b/src/assets/map/emergency_rescue/i11.png new file mode 100644 index 0000000..26429f1 Binary files /dev/null and b/src/assets/map/emergency_rescue/i11.png differ diff --git a/src/assets/map/emergency_rescue/i11_on.png b/src/assets/map/emergency_rescue/i11_on.png new file mode 100644 index 0000000..2c791ef Binary files /dev/null and b/src/assets/map/emergency_rescue/i11_on.png differ diff --git a/src/assets/map/emergency_rescue/i12.png b/src/assets/map/emergency_rescue/i12.png new file mode 100644 index 0000000..081fc3b Binary files /dev/null and b/src/assets/map/emergency_rescue/i12.png differ diff --git a/src/assets/map/emergency_rescue/i12_on.png b/src/assets/map/emergency_rescue/i12_on.png new file mode 100644 index 0000000..2c88e57 Binary files /dev/null and b/src/assets/map/emergency_rescue/i12_on.png differ diff --git a/src/assets/map/emergency_rescue/i13.png b/src/assets/map/emergency_rescue/i13.png new file mode 100644 index 0000000..23a974d Binary files /dev/null and b/src/assets/map/emergency_rescue/i13.png differ diff --git a/src/assets/map/emergency_rescue/i13_on.png b/src/assets/map/emergency_rescue/i13_on.png new file mode 100644 index 0000000..98d2639 Binary files /dev/null and b/src/assets/map/emergency_rescue/i13_on.png differ diff --git a/src/assets/map/emergency_rescue/i1_on.png b/src/assets/map/emergency_rescue/i1_on.png new file mode 100644 index 0000000..6ed2b3e Binary files /dev/null and b/src/assets/map/emergency_rescue/i1_on.png differ diff --git a/src/assets/map/emergency_rescue/i2.png b/src/assets/map/emergency_rescue/i2.png new file mode 100644 index 0000000..2f1ba2c Binary files /dev/null and b/src/assets/map/emergency_rescue/i2.png differ diff --git a/src/assets/map/emergency_rescue/i2_on.png b/src/assets/map/emergency_rescue/i2_on.png new file mode 100644 index 0000000..20ea12d Binary files /dev/null and b/src/assets/map/emergency_rescue/i2_on.png differ diff --git a/src/assets/map/emergency_rescue/i3.png b/src/assets/map/emergency_rescue/i3.png new file mode 100644 index 0000000..638740f Binary files /dev/null and b/src/assets/map/emergency_rescue/i3.png differ diff --git a/src/assets/map/emergency_rescue/i3_on.png b/src/assets/map/emergency_rescue/i3_on.png new file mode 100644 index 0000000..91fa012 Binary files /dev/null and b/src/assets/map/emergency_rescue/i3_on.png differ diff --git a/src/assets/map/emergency_rescue/i4.png b/src/assets/map/emergency_rescue/i4.png new file mode 100644 index 0000000..d6b10b0 Binary files /dev/null and b/src/assets/map/emergency_rescue/i4.png differ diff --git a/src/assets/map/emergency_rescue/i4_on.png b/src/assets/map/emergency_rescue/i4_on.png new file mode 100644 index 0000000..243d01e Binary files /dev/null and b/src/assets/map/emergency_rescue/i4_on.png differ diff --git a/src/assets/map/emergency_rescue/i5.png b/src/assets/map/emergency_rescue/i5.png new file mode 100644 index 0000000..23ffce2 Binary files /dev/null and b/src/assets/map/emergency_rescue/i5.png differ diff --git a/src/assets/map/emergency_rescue/i5_on.png b/src/assets/map/emergency_rescue/i5_on.png new file mode 100644 index 0000000..041a138 Binary files /dev/null and b/src/assets/map/emergency_rescue/i5_on.png differ diff --git a/src/assets/map/emergency_rescue/i6.png b/src/assets/map/emergency_rescue/i6.png new file mode 100644 index 0000000..089e138 Binary files /dev/null and b/src/assets/map/emergency_rescue/i6.png differ diff --git a/src/assets/map/emergency_rescue/i6_on.png b/src/assets/map/emergency_rescue/i6_on.png new file mode 100644 index 0000000..bfa2465 Binary files /dev/null and b/src/assets/map/emergency_rescue/i6_on.png differ diff --git a/src/assets/map/emergency_rescue/i7.png b/src/assets/map/emergency_rescue/i7.png new file mode 100644 index 0000000..2a7d764 Binary files /dev/null and b/src/assets/map/emergency_rescue/i7.png differ diff --git a/src/assets/map/emergency_rescue/i7_on.png b/src/assets/map/emergency_rescue/i7_on.png new file mode 100644 index 0000000..eb2c5f2 Binary files /dev/null and b/src/assets/map/emergency_rescue/i7_on.png differ diff --git a/src/assets/map/emergency_rescue/i8.png b/src/assets/map/emergency_rescue/i8.png new file mode 100644 index 0000000..2382598 Binary files /dev/null and b/src/assets/map/emergency_rescue/i8.png differ diff --git a/src/assets/map/emergency_rescue/i8_on.png b/src/assets/map/emergency_rescue/i8_on.png new file mode 100644 index 0000000..f2aff73 Binary files /dev/null and b/src/assets/map/emergency_rescue/i8_on.png differ diff --git a/src/assets/map/emergency_rescue/i9.png b/src/assets/map/emergency_rescue/i9.png new file mode 100644 index 0000000..be2c4ff Binary files /dev/null and b/src/assets/map/emergency_rescue/i9.png differ diff --git a/src/assets/map/emergency_rescue/i9_on.png b/src/assets/map/emergency_rescue/i9_on.png new file mode 100644 index 0000000..33b18f1 Binary files /dev/null and b/src/assets/map/emergency_rescue/i9_on.png differ diff --git a/src/assets/map/emergency_rescue/ico1.png b/src/assets/map/emergency_rescue/ico1.png index 5741164..b868fbf 100644 Binary files a/src/assets/map/emergency_rescue/ico1.png and b/src/assets/map/emergency_rescue/ico1.png differ diff --git a/src/assets/map/emergency_rescue/ico1_on.png b/src/assets/map/emergency_rescue/ico1_on.png index 2fcc9ee..3d83464 100644 Binary files a/src/assets/map/emergency_rescue/ico1_on.png and b/src/assets/map/emergency_rescue/ico1_on.png differ diff --git a/src/assets/map/emergency_rescue/ico2.png b/src/assets/map/emergency_rescue/ico2.png index 44b4387..4b1506d 100644 Binary files a/src/assets/map/emergency_rescue/ico2.png and b/src/assets/map/emergency_rescue/ico2.png differ diff --git a/src/assets/map/emergency_rescue/ico2_on.png b/src/assets/map/emergency_rescue/ico2_on.png index 8447b3e..867d861 100644 Binary files a/src/assets/map/emergency_rescue/ico2_on.png and b/src/assets/map/emergency_rescue/ico2_on.png differ diff --git a/src/assets/map/emergency_rescue/ico3.png b/src/assets/map/emergency_rescue/ico3.png index 3277fcd..945abd3 100644 Binary files a/src/assets/map/emergency_rescue/ico3.png and b/src/assets/map/emergency_rescue/ico3.png differ diff --git a/src/assets/map/emergency_rescue/ico3_on.png b/src/assets/map/emergency_rescue/ico3_on.png index fb6c516..084ac6f 100644 Binary files a/src/assets/map/emergency_rescue/ico3_on.png and b/src/assets/map/emergency_rescue/ico3_on.png differ diff --git a/src/assets/map/emergency_rescue/ico4.png b/src/assets/map/emergency_rescue/ico4.png new file mode 100644 index 0000000..dd89344 Binary files /dev/null and b/src/assets/map/emergency_rescue/ico4.png differ diff --git a/src/assets/map/emergency_rescue/ico4_on.png b/src/assets/map/emergency_rescue/ico4_on.png new file mode 100644 index 0000000..c416438 Binary files /dev/null and b/src/assets/map/emergency_rescue/ico4_on.png differ diff --git a/src/assets/map/emergency_rescue/ico5.png b/src/assets/map/emergency_rescue/ico5.png new file mode 100644 index 0000000..a1d3900 Binary files /dev/null and b/src/assets/map/emergency_rescue/ico5.png differ diff --git a/src/assets/map/emergency_rescue/ico5_on.png b/src/assets/map/emergency_rescue/ico5_on.png new file mode 100644 index 0000000..1d1961b Binary files /dev/null and b/src/assets/map/emergency_rescue/ico5_on.png differ diff --git a/src/assets/map/emergency_rescue/img1.png b/src/assets/map/emergency_rescue/img1.png deleted file mode 100644 index e4a4bde..0000000 Binary files a/src/assets/map/emergency_rescue/img1.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img10.png b/src/assets/map/emergency_rescue/img10.png deleted file mode 100644 index d10cb4f..0000000 Binary files a/src/assets/map/emergency_rescue/img10.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img10_on.png b/src/assets/map/emergency_rescue/img10_on.png deleted file mode 100644 index e29765b..0000000 Binary files a/src/assets/map/emergency_rescue/img10_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img1_on.png b/src/assets/map/emergency_rescue/img1_on.png deleted file mode 100644 index 2719bad..0000000 Binary files a/src/assets/map/emergency_rescue/img1_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img2.png b/src/assets/map/emergency_rescue/img2.png deleted file mode 100644 index 3201858..0000000 Binary files a/src/assets/map/emergency_rescue/img2.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img2_on.png b/src/assets/map/emergency_rescue/img2_on.png deleted file mode 100644 index 3d2d2c5..0000000 Binary files a/src/assets/map/emergency_rescue/img2_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img3.png b/src/assets/map/emergency_rescue/img3.png deleted file mode 100644 index 18d94f0..0000000 Binary files a/src/assets/map/emergency_rescue/img3.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img3_on.png b/src/assets/map/emergency_rescue/img3_on.png deleted file mode 100644 index f31e992..0000000 Binary files a/src/assets/map/emergency_rescue/img3_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img4.png b/src/assets/map/emergency_rescue/img4.png deleted file mode 100644 index 0ac8083..0000000 Binary files a/src/assets/map/emergency_rescue/img4.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img4_on.png b/src/assets/map/emergency_rescue/img4_on.png deleted file mode 100644 index 1ad0558..0000000 Binary files a/src/assets/map/emergency_rescue/img4_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img5.png b/src/assets/map/emergency_rescue/img5.png deleted file mode 100644 index 1fe78a2..0000000 Binary files a/src/assets/map/emergency_rescue/img5.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img5_on.png b/src/assets/map/emergency_rescue/img5_on.png deleted file mode 100644 index 3ca7142..0000000 Binary files a/src/assets/map/emergency_rescue/img5_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img6.png b/src/assets/map/emergency_rescue/img6.png deleted file mode 100644 index f033faa..0000000 Binary files a/src/assets/map/emergency_rescue/img6.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img6_on.png b/src/assets/map/emergency_rescue/img6_on.png deleted file mode 100644 index 43b2b49..0000000 Binary files a/src/assets/map/emergency_rescue/img6_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img7.png b/src/assets/map/emergency_rescue/img7.png deleted file mode 100644 index f55dece..0000000 Binary files a/src/assets/map/emergency_rescue/img7.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img7_on.png b/src/assets/map/emergency_rescue/img7_on.png deleted file mode 100644 index e140491..0000000 Binary files a/src/assets/map/emergency_rescue/img7_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img8.png b/src/assets/map/emergency_rescue/img8.png deleted file mode 100644 index 9ae1279..0000000 Binary files a/src/assets/map/emergency_rescue/img8.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img8_on.png b/src/assets/map/emergency_rescue/img8_on.png deleted file mode 100644 index 55c267c..0000000 Binary files a/src/assets/map/emergency_rescue/img8_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img9.png b/src/assets/map/emergency_rescue/img9.png deleted file mode 100644 index 0781aab..0000000 Binary files a/src/assets/map/emergency_rescue/img9.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/img9_on.png b/src/assets/map/emergency_rescue/img9_on.png deleted file mode 100644 index f464a51..0000000 Binary files a/src/assets/map/emergency_rescue/img9_on.png and /dev/null differ diff --git a/src/assets/map/emergency_rescue/menubg.png b/src/assets/map/emergency_rescue/menubg.png new file mode 100644 index 0000000..b2e6b22 Binary files /dev/null and b/src/assets/map/emergency_rescue/menubg.png differ diff --git a/src/assets/map/emergency_rescue/navbg.png b/src/assets/map/emergency_rescue/navbg.png new file mode 100644 index 0000000..d196eb6 Binary files /dev/null and b/src/assets/map/emergency_rescue/navbg.png differ diff --git a/src/assets/map/emergency_rescue/navbg_bak.png b/src/assets/map/emergency_rescue/navbg_bak.png new file mode 100644 index 0000000..f42527e Binary files /dev/null and b/src/assets/map/emergency_rescue/navbg_bak.png differ diff --git a/src/assets/map/emergency_rescue/point/img1.png b/src/assets/map/emergency_rescue/point/img1.png new file mode 100644 index 0000000..e1345ca Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img1.png differ diff --git a/src/assets/map/emergency_rescue/point/img10.png b/src/assets/map/emergency_rescue/point/img10.png new file mode 100644 index 0000000..f29dd17 Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img10.png differ diff --git a/src/assets/map/emergency_rescue/point/img11.png b/src/assets/map/emergency_rescue/point/img11.png new file mode 100644 index 0000000..c8921fe Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img11.png differ diff --git a/src/assets/map/emergency_rescue/point/img12.png b/src/assets/map/emergency_rescue/point/img12.png new file mode 100644 index 0000000..8fdf4ce Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img12.png differ diff --git a/src/assets/map/emergency_rescue/point/img13.png b/src/assets/map/emergency_rescue/point/img13.png new file mode 100644 index 0000000..3871a42 Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img13.png differ diff --git a/src/assets/map/emergency_rescue/point/img2.png b/src/assets/map/emergency_rescue/point/img2.png new file mode 100644 index 0000000..768be46 Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img2.png differ diff --git a/src/assets/map/emergency_rescue/point/img3.png b/src/assets/map/emergency_rescue/point/img3.png new file mode 100644 index 0000000..396a10e Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img3.png differ diff --git a/src/assets/map/emergency_rescue/point/img4.png b/src/assets/map/emergency_rescue/point/img4.png new file mode 100644 index 0000000..efff498 Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img4.png differ diff --git a/src/assets/map/emergency_rescue/point/img5.png b/src/assets/map/emergency_rescue/point/img5.png new file mode 100644 index 0000000..ccc9768 Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img5.png differ diff --git a/src/assets/map/emergency_rescue/point/img6.png b/src/assets/map/emergency_rescue/point/img6.png new file mode 100644 index 0000000..778ddf5 Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img6.png differ diff --git a/src/assets/map/emergency_rescue/point/img7.png b/src/assets/map/emergency_rescue/point/img7.png new file mode 100644 index 0000000..511806b Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img7.png differ diff --git a/src/assets/map/emergency_rescue/point/img8.png b/src/assets/map/emergency_rescue/point/img8.png new file mode 100644 index 0000000..117baa7 Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img8.png differ diff --git a/src/assets/map/emergency_rescue/point/img9.png b/src/assets/map/emergency_rescue/point/img9.png new file mode 100644 index 0000000..24e7d71 Binary files /dev/null and b/src/assets/map/emergency_rescue/point/img9.png differ diff --git a/src/assets/map/emergency_rescue/reset_point.png b/src/assets/map/emergency_rescue/reset_point.png deleted file mode 100644 index 260a3d5..0000000 Binary files a/src/assets/map/emergency_rescue/reset_point.png and /dev/null differ diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index a897638..2cd8eb9 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -26,6 +26,7 @@ export default { .app-main { /* 50= navbar 50 */ min-height: calc(100vh - 50px); + // height: 100vh; width: 100%; position: relative; overflow: hidden; diff --git a/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue b/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue new file mode 100644 index 0000000..13b4b27 --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue @@ -0,0 +1,239 @@ + + + + + diff --git a/src/views/emergen_cyrescue/emergency_map/components/dialog.vue b/src/views/emergen_cyrescue/emergency_map/components/dialog.vue new file mode 100644 index 0000000..1a333c9 --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_map/components/dialog.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue index 771ff3f..bb20536 100644 --- a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue +++ b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue @@ -1,132 +1,380 @@ diff --git a/src/views/emergen_cyrescue/emergency_map/index.vue b/src/views/emergen_cyrescue/emergency_map/index.vue index 392c125..dae2aa2 100644 --- a/src/views/emergen_cyrescue/emergency_map/index.vue +++ b/src/views/emergen_cyrescue/emergency_map/index.vue @@ -1,6 +1,6 @@ @@ -15,5 +15,9 @@ export default { } -