unknown пре 1 година
родитељ
комит
45efcdbb78
6 измењених фајлова са 113 додато и 203 уклоњено
  1. +89
    -185
      package-lock.json
  2. +1
    -0
      package.json
  3. +11
    -12
      src/views/dashboard/components/AirInfo.vue
  4. +10
    -6
      src/views/dashboard/components/OneMap.vue
  5. +1
    -0
      src/views/task-manage/all-task/components/LiveDrawer.vue
  6. +1
    -0
      src/views/task-manage/all-task/index.vue

+ 89
- 185
package-lock.json Прегледај датотеку

@@ -311,20 +311,25 @@
}
},
"@css-render/plugin-bem": {
"version": "0.15.9",
"resolved": "https://registry.npmmirror.com/@css-render/plugin-bem/-/plugin-bem-0.15.9.tgz",
"integrity": "sha512-xASEmYIX91Pow7YPzpAZ0eyrRNINVX7j9ITNbLt88gJHRLap3P1dv3hTSLtUZTxYXVHTklZ/SfJQ9FIO3jRahg==",
"version": "0.15.12",
"resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.12.tgz",
"integrity": "sha512-Lq2jSOZn+wYQtsyaFj6QRz2EzAnd3iW5fZeHO1WSXQdVYwvwGX0ZiH3X2JQgtgYLT1yeGtrwrqJdNdMEUD2xTw==",
"dev": true
},
"@css-render/vue3-ssr": {
"version": "0.15.9",
"resolved": "https://registry.npmmirror.com/@css-render/vue3-ssr/-/vue3-ssr-0.15.9.tgz",
"integrity": "sha512-b3wvEIZYjToOEAV/oUqVtcg+MPF/iSZB9VmVF7fMAAAfvVTc2kB4TZDhGZCMkGjGZxOUm1jia7q/Z9FJnJGLKw==",
"version": "0.15.12",
"resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.12.tgz",
"integrity": "sha512-AQLGhhaE0F+rwybRCkKUdzBdTEM/5PZBYy+fSYe1T9z9+yxMuV/k7ZRqa4M69X+EI1W8pa4kc9Iq2VjQkZx4rg==",
"dev": true
},
"@easydarwin/easyplayer": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@easydarwin/easyplayer/-/easyplayer-5.0.5.tgz",
"integrity": "sha512-gip21OGeY1YZDSjBDfqPvMy2ZrChr8edCHctUs6zoTxUDv7iaLYPQOYGY5nRl/h8o3t7p8pUBFQaIvjAQn+ifw=="
},
"@emotion/hash": {
"version": "0.8.0",
"resolved": "https://registry.npmmirror.com/@emotion/hash/-/hash-0.8.0.tgz",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
"integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
"dev": true
},
@@ -428,6 +433,12 @@
"local-pkg": "^0.4.1"
}
},
"@juggle/resize-observer": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz",
"integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==",
"dev": true
},
"@mapbox/jsonlint-lines-primitives": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
@@ -624,31 +635,27 @@
"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
"dev": true
},
"@types/jest": {
"version": "27.4.1",
"resolved": "https://registry.npmmirror.com/@types/jest/-/jest-27.4.1.tgz",
"integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==",
"dev": true,
"requires": {
"jest-matcher-utils": "^27.0.0",
"pretty-format": "^27.0.0"
}
},
"@types/json-schema": {
"version": "7.0.11",
"resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz",
"integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
"dev": true
},
"@types/katex": {
"version": "0.14.0",
"resolved": "https://registry.npmjs.org/@types/katex/-/katex-0.14.0.tgz",
"integrity": "sha512-+2FW2CcT0K3P+JMR8YG846bmDwplKUTsWgT2ENwdQ1UdVfRk3GQrh6Mi4sTopy30gI8Uau5CEqHTDZ6YvWIUPA==",
"dev": true
},
"@types/lodash": {
"version": "4.14.181",
"resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.181.tgz",
"integrity": "sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==",
"version": "4.14.191",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz",
"integrity": "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==",
"dev": true
},
"@types/lodash-es": {
"version": "4.17.6",
"resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.6.tgz",
"resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz",
"integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==",
"dev": true,
"requires": {
@@ -1339,9 +1346,9 @@
"dev": true
},
"async-validator": {
"version": "4.0.7",
"resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.0.7.tgz",
"integrity": "sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==",
"version": "4.2.5",
"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz",
"integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==",
"dev": true
},
"atob": {
@@ -1769,19 +1776,18 @@
}
},
"css-render": {
"version": "0.15.9",
"resolved": "https://registry.npmmirror.com/css-render/-/css-render-0.15.9.tgz",
"integrity": "sha512-FMVcWsVipKEBR/mVf1+pIjCRQdztILVKxbp8TN5/Vf0Q/fdTq0OIb8JRW/pk7PP1eeWnB/ejQ0MNBe7ELjLblg==",
"version": "0.15.12",
"resolved": "https://registry.npmjs.org/css-render/-/css-render-0.15.12.tgz",
"integrity": "sha512-eWzS66patiGkTTik+ipO9qNGZ+uNuGyTmnz6/+EJIiFg8+3yZRpnMwgFo8YdXhQRsiePzehnusrxVvugNjXzbw==",
"dev": true,
"requires": {
"@emotion/hash": "~0.8.0",
"@types/node": "~17.0.5",
"csstype": "~3.0.5"
},
"dependencies": {
"csstype": {
"version": "3.0.11",
"resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.0.11.tgz",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz",
"integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==",
"dev": true
}
@@ -1837,15 +1843,15 @@
"integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="
},
"date-fns": {
"version": "2.28.0",
"resolved": "https://registry.npmmirror.com/date-fns/-/date-fns-2.28.0.tgz",
"integrity": "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==",
"version": "2.29.3",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
"integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==",
"dev": true
},
"date-fns-tz": {
"version": "1.3.3",
"resolved": "https://registry.npmmirror.com/date-fns-tz/-/date-fns-tz-1.3.3.tgz",
"integrity": "sha512-Gks46gwbSauBQnV3Oofluj1wTm8J0tM7sbSJ9P+cJq/ZnTCpMohTKmmO5Tn+jQ7dyn0+b8G7cY4O2DZ5P/LXcA==",
"version": "1.3.7",
"resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.7.tgz",
"integrity": "sha512-1t1b8zyJo+UI8aR+g3iqr5fkUHWpd58VBx8J/ZSQ+w7YrGlw80Ag4sA86qkfCXRBLmMc4I2US+aPMd4uKvwj5g==",
"dev": true
},
"dateformat": {
@@ -1962,12 +1968,6 @@
"resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg=="
},
"diff-sequences": {
"version": "27.5.1",
"resolved": "https://registry.npmmirror.com/diff-sequences/-/diff-sequences-27.5.1.tgz",
"integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
"dev": true
},
"digest-header": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/digest-header/-/digest-header-0.0.1.tgz",
@@ -2718,9 +2718,9 @@
"dev": true
},
"evtd": {
"version": "0.2.3",
"resolved": "https://registry.npmmirror.com/evtd/-/evtd-0.2.3.tgz",
"integrity": "sha512-tmiT1YUVqFjTY+BSBOAskL83xNx41iUfpvKP6Gcd/xMHjg3mnER98jXGXJyKnxCG19uPc6EhZiUC+MUyvoqCtw==",
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/evtd/-/evtd-0.2.4.tgz",
"integrity": "sha512-qaeGN5bx63s/AXgQo8gj6fBkxge+OoLddLniox5qtLAEY5HSnuSlISXVPxnSae1dWblvTh4/HoMIB+mbMsvZzw==",
"dev": true
},
"execa": {
@@ -3309,6 +3309,12 @@
"resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
},
"highlight.js": {
"version": "11.7.0",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.7.0.tgz",
"integrity": "sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ==",
"dev": true
},
"hls.js": {
"version": "1.2.9",
"resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.2.9.tgz",
@@ -3716,60 +3722,6 @@
}
}
},
"jest-diff": {
"version": "27.5.1",
"resolved": "https://registry.npmmirror.com/jest-diff/-/jest-diff-27.5.1.tgz",
"integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
"dev": true,
"requires": {
"chalk": "^4.0.0",
"diff-sequences": "^27.5.1",
"jest-get-type": "^27.5.1",
"pretty-format": "^27.5.1"
},
"dependencies": {
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
}
}
},
"jest-get-type": {
"version": "27.5.1",
"resolved": "https://registry.npmmirror.com/jest-get-type/-/jest-get-type-27.5.1.tgz",
"integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
"dev": true
},
"jest-matcher-utils": {
"version": "27.5.1",
"resolved": "https://registry.npmmirror.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
"integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
"dev": true,
"requires": {
"chalk": "^4.0.0",
"jest-diff": "^27.5.1",
"jest-get-type": "^27.5.1",
"pretty-format": "^27.5.1"
},
"dependencies": {
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
}
}
},
"jest-worker": {
"version": "27.5.1",
"resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -3977,7 +3929,7 @@
},
"lodash-es": {
"version": "4.17.21",
"resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
"dev": true
},
@@ -4218,37 +4170,29 @@
}
},
"naive-ui": {
"version": "2.27.0",
"resolved": "https://registry.npmmirror.com/naive-ui/-/naive-ui-2.27.0.tgz",
"integrity": "sha512-g9A2uulbQKMuJpUjAyiAqBHQ4xrcbwRPdv+OS2FeNC5u/SrRWFiO64X10YDyMwQNudrwc3VVqKUrw3ZArxtFCg==",
"dev": true,
"requires": {
"@css-render/plugin-bem": "^0.15.8",
"@css-render/vue3-ssr": "^0.15.8",
"@types/lodash": "^4.14.170",
"@types/lodash-es": "^4.17.4",
"async-validator": "^4.0.1",
"css-render": "^0.15.8",
"version": "2.34.3",
"resolved": "https://registry.npmjs.org/naive-ui/-/naive-ui-2.34.3.tgz",
"integrity": "sha512-fUMr0dzb/iGsOTWgoblPVobY5X5dihQ1eam5dA+H74oyLYAvgX4pL96xQFPBLIYqvyRFBAsN85kHN5pLqdtpxA==",
"dev": true,
"requires": {
"@css-render/plugin-bem": "^0.15.10",
"@css-render/vue3-ssr": "^0.15.10",
"@types/katex": "^0.14.0",
"@types/lodash": "^4.14.181",
"@types/lodash-es": "^4.17.6",
"async-validator": "^4.0.7",
"css-render": "^0.15.10",
"date-fns": "^2.28.0",
"date-fns-tz": "^1.3.0",
"evtd": "^0.2.3",
"highlight.js": "^11.0.1",
"date-fns-tz": "^1.3.3",
"evtd": "^0.2.4",
"highlight.js": "^11.5.0",
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
"seemly": "^0.3.3",
"treemate": "^0.3.9",
"vdirs": "^0.1.7",
"vfonts": "^0.0.3",
"seemly": "^0.3.6",
"treemate": "^0.3.11",
"vdirs": "^0.1.8",
"vooks": "^0.2.12",
"vueuc": "^0.4.28"
},
"dependencies": {
"highlight.js": {
"version": "11.5.0",
"resolved": "https://registry.npmmirror.com/highlight.js/-/highlight.js-11.5.0.tgz",
"integrity": "sha512-SM6WDj5/C+VfIY8pZ6yW6Xa0Fm1tniYVYWYW1Q/DcMnISZFrC3aQAZZZFAAZtybKNrGId3p/DNbFTtcTXXgYBw==",
"dev": true
}
"vueuc": "^0.4.47"
}
},
"nanoid": {
@@ -4931,25 +4875,6 @@
"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
"dev": true
},
"pretty-format": {
"version": "27.5.1",
"resolved": "https://registry.npmmirror.com/pretty-format/-/pretty-format-27.5.1.tgz",
"integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
"dev": true,
"requires": {
"ansi-regex": "^5.0.1",
"ansi-styles": "^5.0.0",
"react-is": "^17.0.1"
},
"dependencies": {
"ansi-styles": {
"version": "5.2.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-5.2.0.tgz",
"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
"dev": true
}
}
},
"process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -5082,12 +5007,6 @@
"quickselect": "^2.0.0"
}
},
"react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmmirror.com/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
"dev": true
},
"read-pkg": {
"version": "5.2.0",
"resolved": "https://registry.npmmirror.com/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -5183,12 +5102,6 @@
"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
"dev": true
},
"resize-observer-polyfill": {
"version": "1.5.1",
"resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
"integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
"dev": true
},
"resolve": {
"version": "1.22.0",
"resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.0.tgz",
@@ -5326,13 +5239,10 @@
}
},
"seemly": {
"version": "0.3.3",
"resolved": "https://registry.npmmirror.com/seemly/-/seemly-0.3.3.tgz",
"integrity": "sha512-mAyqemz41e9HiZPMXAn7NtTExJgztwco5cdZjrt/iViU/oFeav+Q8K1c93M/tIZZ00QkT65JMr4xXQk7Vv5hWQ==",
"dev": true,
"requires": {
"@types/jest": "^27.0.1"
}
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/seemly/-/seemly-0.3.6.tgz",
"integrity": "sha512-lEV5VB8BUKTo/AfktXJcy+JeXns26ylbMkIUco8CYREsQijuz4mrXres2Q+vMLdwkuLxJdIPQ8IlCIxLYm71Yw==",
"dev": true
},
"semver": {
"version": "7.3.5",
@@ -6245,9 +6155,9 @@
"integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg=="
},
"treemate": {
"version": "0.3.10",
"resolved": "https://registry.npmmirror.com/treemate/-/treemate-0.3.10.tgz",
"integrity": "sha512-uxN98H84/zXAkn02rEeip9SNnOR889QIBXfpZnwjaanp8JRElxjdmDaKmVULclrn54J8RcJVCqfeQZsdeMjwow==",
"version": "0.3.11",
"resolved": "https://registry.npmjs.org/treemate/-/treemate-0.3.11.tgz",
"integrity": "sha512-M8RGFoKtZ8dF+iwJfAJTOH/SM4KluKOKRJpjCMhI8bG3qB74zrFoArKZ62ll0Fr3mqkMJiQOmWYkdYgDeITYQg==",
"dev": true
},
"tslib": {
@@ -6530,20 +6440,14 @@
"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
},
"vdirs": {
"version": "0.1.7",
"resolved": "https://registry.npmmirror.com/vdirs/-/vdirs-0.1.7.tgz",
"integrity": "sha512-MEUaLhV1jJyUqA2Ar4DfvlQx8jWs+PpCZ2dbM0ILelpMWGOybzt8ddL456VxeIbY/tkuDGT/Wzb8GG4LCuLuHw==",
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/vdirs/-/vdirs-0.1.8.tgz",
"integrity": "sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==",
"dev": true,
"requires": {
"evtd": "^0.2.2"
}
},
"vfonts": {
"version": "0.0.3",
"resolved": "https://registry.npmmirror.com/vfonts/-/vfonts-0.0.3.tgz",
"integrity": "sha512-nguyw8L6Un8eelg1vQ31vIU2ESxqid7EYmy8V+MDeMaHBqaRSkg3dTBToC1PR00D89UzS/SLkfYPnx0Wf23IQQ==",
"dev": true
},
"vite": {
"version": "2.9.1",
"resolved": "https://registry.npmmirror.com/vite/-/vite-2.9.1.tgz",
@@ -6648,7 +6552,7 @@
},
"vooks": {
"version": "0.2.12",
"resolved": "https://registry.npmmirror.com/vooks/-/vooks-0.2.12.tgz",
"resolved": "https://registry.npmjs.org/vooks/-/vooks-0.2.12.tgz",
"integrity": "sha512-iox0I3RZzxtKlcgYaStQYKEzWWGAduMmq+jS7OrNdQo1FgGfPMubGL3uGHOU9n97NIvfFDBGnpSvkWyb/NSn/Q==",
"dev": true,
"requires": {
@@ -6709,16 +6613,16 @@
}
},
"vueuc": {
"version": "0.4.28",
"resolved": "https://registry.npmmirror.com/vueuc/-/vueuc-0.4.28.tgz",
"integrity": "sha512-Udr1ROwJocHIThA5G+H5qN1QEFI4pskDvl+w/2Ul2XIjaAeIuQ6ygEOKHOXRJqKX5PxcTi1QQUpb7yQWsDw7ww==",
"version": "0.4.51",
"resolved": "https://registry.npmjs.org/vueuc/-/vueuc-0.4.51.tgz",
"integrity": "sha512-pLiMChM4f+W8czlIClGvGBYo656lc2Y0/mXFSCydcSmnCR1izlKPGMgiYBGjbY9FDkFG8a2HEVz7t0DNzBWbDw==",
"dev": true,
"requires": {
"@css-render/vue3-ssr": "^0.15.7",
"css-render": "^0.15.7",
"evtd": "^0.2.2",
"resize-observer-polyfill": "^1.5.1",
"seemly": "^0.3.1",
"@css-render/vue3-ssr": "^0.15.10",
"@juggle/resize-observer": "^3.3.1",
"css-render": "^0.15.10",
"evtd": "^0.2.4",
"seemly": "^0.3.6",
"vdirs": "^0.1.4",
"vooks": "^0.2.4"
}

+ 1
- 0
package.json Прегледај датотеку

@@ -9,6 +9,7 @@
"serve": "vite preview"
},
"dependencies": {
"@easydarwin/easyplayer": "^5.0.5",
"@tinymce/tinymce-vue": "^4.0.5",
"@vicons/antd": "^0.10.0",
"@vicons/ionicons5": "^0.10.0",

+ 11
- 12
src/views/dashboard/components/AirInfo.vue Прегледај датотеку

@@ -30,10 +30,11 @@
<div class="innerMonitor">
<div class="monitorName">机场内部监控</div>
<!-- <img src="../../../assets/images/webScreen.png" @click="videoShowStyle"> -->
<videoPlay
<!-- <videoPlay
v-bind="innerMonitorOptions"
style="z-index:1"
/>
/> -->
<!-- <EasyPlayer style="z-index=1" :video-url="innerVideoSrc" /> -->
</div>
<div class="innerMonitor">
<div class="monitorName">机场外部监控</div>
@@ -53,6 +54,7 @@ import { reactive, toRefs, watch } from 'vue'
import { getAirportInfo } from '@/api/dashboard/index.js'
import 'vue3-video-play/dist/style.css'
import { videoPlay } from 'vue3-video-play'

export default {
name: 'OneMap',
components: { videoPlay },
@@ -73,17 +75,12 @@ export default {

{ icon: new URL('../../../assets/images/airTemperature.png', import.meta.url).href, indicatorValue: null, indicatorName: '空气温度' }],
innerMonitorOptions: {
width: '256px',
height: '198px',
control: true, // 是否显示控制
controlBtns: [

'fullScreen'
], // 显示所有按钮,

src: ''
// width: '256px',
// height: '198px',
'video-url': ''

},
innerVideoSrc: '',
status: null,
mountedName: null,
outsideMonitorOptions: {
@@ -104,8 +101,10 @@ export default {
if (JSON.stringify(value) !== '{}') {
// console.log(props.data)
data.detail = props.data
data.innerMonitorOptions.src = data.detail.internalMonitorUrl
// data.innerMonitorOptions.video-url = data.detail.internalMonitorUrl
data.innerVideoSrc = data.detail.internalMonitorUrl
data.outsideMonitorOptions.src = data.detail.externalMonitorUrl
console.log(data.innerMonitorOptions.src, '直播地址', data.outsideMonitorOptions.src, '回放地址')
getAirportInfo({
airportId: data.detail.id
})

+ 10
- 6
src/views/dashboard/components/OneMap.vue Прегледај датотеку

@@ -244,7 +244,8 @@ export default {
listChecked: false,
airportSelected: true,
problemLayerList: [],
airportPopupShow: false
airportPopupShow: false,
problemlayer: null
})
watch(() => data.page, (newValue, oldValue) => {
if (newValue !== oldValue) {
@@ -508,6 +509,9 @@ export default {
}
// 添加问题图层
const addproblemLayer = (narr) => {
if (data.problemlayer !== null) {
data.map.removeLayer(data.problemLayer)
}
data.problemOverlay = new Overlay({
id: 'problem_overlay',
element: document.getElementById('problemOverlay'),
@@ -517,6 +521,7 @@ export default {
})
narr.map((item) => {
const Features = []
data.problemLayerList = []
if (item.fraction.length > 0) {
item.fraction.map((iitem) => {
const problem = iitem
@@ -555,16 +560,16 @@ export default {
Features.push(feature)
})
// 添加图层
const layer = new VectorLayer({
data.problemlayer = new VectorLayer({
source: new VectorSource({
features: Features
}),
visible: true
})

const obj = { type: item.name, layer: layer }
const obj = { type: item.name, layer: data.problemlayer }
data.problemLayerList.push(obj)
data.map.addLayer(layer)
data.map.addLayer(data.problemlayer)
}
})
}
@@ -647,7 +652,7 @@ export default {
* 展示直播视频
*/
const liveShow = (rowInfo) => {
router.push({ path: '/taskManage/all', query: { rowInfo: JSON.stringify(rowInfo) }})
router.push({ path: '/taskManage/all', query: { rowInfo: JSON.stringify(rowInfo), type: 1 }})
}
onMounted(() => {
initMap()
@@ -718,7 +723,6 @@ export default {
.container{
width:100vw;
height:100vh;

position:relative;
overflow:hidden;
}

+ 1
- 0
src/views/task-manage/all-task/components/LiveDrawer.vue Прегледај датотеку

@@ -147,6 +147,7 @@ export default defineComponent({

function handleDrawerColse() {
emit('update:visible', false)
// 如果是从首页进来的,关闭之后会跳转到首页,首页传进来的会传递一个参数为type==1
}

/* 获取轨迹数据 */

+ 1
- 0
src/views/task-manage/all-task/index.vue Прегледај датотеку

@@ -79,6 +79,7 @@ export default {
setup() {
const route = useRoute()
const rowInfo = route.query.rowInfo
const type=route.query.type
getAirOptions()
const searchRef = ref()
const data = reactive({

Loading…
Откажи
Сачувај