From 2ecb435a6f8873ab644a7a940be9a096c734215b Mon Sep 17 00:00:00 2001 From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com> Date: Thu, 6 Jun 2024 22:09:47 +0800 Subject: [PATCH] =?UTF-8?q?V1=E7=89=88=E6=9C=AC=E5=B0=81=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Map.vue | 27 ++++- components/WZDialog.vue | 13 ++- config/mapConfig.js | 6 +- nuxt.config.js | 14 ++- package.json | 4 +- .../PeakCoalMonitoring.vue | 8 +- pages/visual/PeakCoalView.vue | 11 +- plugins/axios.js | 6 +- store/map.js | 101 ++++++++++++++++- store/system.js | 15 +++ test/output.json | 102 ++++++++++++++++++ test/test.js | 47 ++++++++ test/test.xlsx | Bin 0 -> 10563 bytes yarn.lock | 101 ++++++++++++++++- 14 files changed, 437 insertions(+), 18 deletions(-) create mode 100644 store/system.js create mode 100644 test/output.json create mode 100644 test/test.js create mode 100644 test/test.xlsx diff --git a/components/Map.vue b/components/Map.vue index a027524..e57b101 100644 --- a/components/Map.vue +++ b/components/Map.vue @@ -4,7 +4,7 @@ @@ -345,6 +351,9 @@ export default { .w-z-dialog { height: 2000px; width: 100%; + &.middle { + height: 1200px; + } } diff --git a/config/mapConfig.js b/config/mapConfig.js index 42e7688..d30b0b5 100644 --- a/config/mapConfig.js +++ b/config/mapConfig.js @@ -1,8 +1,10 @@ export const ms3dConfig = { "scene": { "center": { - "lat": 36.543132, - "lng": 114.110195, + "lat": 39.85981, + "lng": 106.90566, + // "lat": 36.543132, + // "lng": 114.110195, "alt": 2187, "heading": 0, "pitch": -60 diff --git a/nuxt.config.js b/nuxt.config.js index 8b70d4d..0e961b9 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -5,7 +5,8 @@ export default { // Global page headers: https://go.nuxtjs.dev/config-head head: { - title: '峰煤智慧监控应用系统', + // title: '峰煤智慧监控应用系统', + title: '', htmlAttrs: { lang: 'zh-cn' }, @@ -58,7 +59,16 @@ export default { // Modules: https://go.nuxtjs.dev/config-modules modules: [ + "@gauseen/nuxt-proxy" ], + proxyTable: { + "/api": { + target: 'http://101.43.201.20:5000/', + changeOrigin: true, + ws: false, + pathRewrite: {} + } + }, // Build Configuration: https://go.nuxtjs.dev/config-build build: { @@ -66,5 +76,5 @@ export default { }, env: { scale: 0.5 - } + }, } diff --git a/package.json b/package.json index 078761a..d723f04 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "generate": "nuxt generate" }, "dependencies": { + "@gauseen/nuxt-proxy": "^1.0.1", "ant-design-vue": "^1.7.8", "axios": "^1.6.1", "core-js": "^3.25.3", @@ -27,6 +28,7 @@ }, "devDependencies": { "less": "^4.2.0", - "less-loader": "6" + "less-loader": "6", + "xlsx": "^0.18.5" } } diff --git a/pages/peak-coal-monitoring/PeakCoalMonitoring.vue b/pages/peak-coal-monitoring/PeakCoalMonitoring.vue index 99c80b4..06eafb2 100644 --- a/pages/peak-coal-monitoring/PeakCoalMonitoring.vue +++ b/pages/peak-coal-monitoring/PeakCoalMonitoring.vue @@ -8,7 +8,7 @@
-

峰煤焦化超低排放"管控治"

+

{{ title }}

一体化平台

@@ -56,9 +56,15 @@ import ZKZDialog from "@/components/ZKZDialog"; import GBZDialog from "@/components/GBZDialog"; import CEMSDialog from "@/components/CEMSDialog"; import pointDialog from '@/components/PointDialog' +import {mapState} from "vuex"; export default { name: "PeakCoalMonitoring", components: {AlarmOverview, DeviceOverview, EnergyProfile, MonitorData, PollutionInformation, AtmosphericModule}, + computed: { + ...mapState({ + title: state => state.system.title, + }) + }, methods: { /** * 图层构造器 diff --git a/pages/visual/PeakCoalView.vue b/pages/visual/PeakCoalView.vue index 05c5815..ec97eed 100644 --- a/pages/visual/PeakCoalView.vue +++ b/pages/visual/PeakCoalView.vue @@ -3,8 +3,9 @@
-

峰煤焦化超低排放"管控治"

-

一体化平台

+ +

{{ title }}

+
@@ -126,6 +127,7 @@ import ZKZDialog from "@/components/ZKZDialog"; import GBZDialog from "@/components/GBZDialog"; import CEMSDialog from "@/components/CEMSDialog"; import pointDialog from '@/components/PointDialog' +import {mapState} from "vuex"; export default { name: "PeakCoalView", components: {}, @@ -141,6 +143,11 @@ export default { showCamera: false } }, + computed: { + ...mapState({ + title: state => state.system.title, + }) + }, mounted() { this.$log.info('test') this.$log.error('test') diff --git a/plugins/axios.js b/plugins/axios.js index 008f6e7..ba6d55b 100644 --- a/plugins/axios.js +++ b/plugins/axios.js @@ -1,17 +1,17 @@ import axios from 'axios' //引用axios import { message } from 'ant-design-vue'; import Vue from 'vue' - +axios.defaults.withcredentials =true // create an axios instance const service = axios.create({ - baseURL: '/smartcampus-web', // 所有异步请求都加上/api,nginx转发到后端Springboot - withCredentials: true, // send cookies when cross-domain requests + baseURL: '', // 所有异步请求都加上/api,nginx转发到后端Springboot timeout: 5000 // request timeout }) // request interceptor service.interceptors.request.use( config => { + config.headers['Access-Control-Allow-Origin'] = '*' return config }, error => { diff --git a/store/map.js b/store/map.js index 6ce147c..52bef04 100644 --- a/store/map.js +++ b/store/map.js @@ -16,7 +16,106 @@ export const state = { ssc: [], shisc: [], wz: [ - {"longitude":"114.100153","latitude":"36.55161"} + { + "longitude": 114.10027777777778, + "latitude": 36.55 + }, + { + "longitude": 114.10111111111111, + "latitude": 36.54972222222222 + }, + { + "longitude": 114.10111111111111, + "latitude": 36.55138888888889 + }, + { + "longitude": 114.10277777777777, + "latitude": 36.55 + }, + { + "longitude": 114.10305555555556, + "latitude": 36.55222222222222 + }, + { + "longitude": 114.1036111111111, + "latitude": 36.55166666666666 + }, + { + "longitude": 114.10722222222222, + "latitude": 36.55333333333333 + }, + { + "longitude": 114.1061111111111, + "latitude": 36.55416666666667 + }, + { + "longitude": 114.10472222222222, + "latitude": 36.55444444444444 + }, + { + "longitude": 114.11, + "latitude": 36.55416666666667 + }, + { + "longitude": 114.11055555555555, + "latitude": 36.555277777777775 + }, + { + "longitude": 114.11222222222221, + "latitude": 36.555277777777775 + }, + { + "longitude": 114.11222222222221, + "latitude": 36.553888888888885 + }, + { + "longitude": 114.11416666666666, + "latitude": 36.55416666666667 + }, + { + "longitude": 114.11444444444444, + "latitude": 36.555277777777775 + }, + { + "longitude": 114.11749999999999, + "latitude": 36.55777777777777 + }, + { + "longitude": 114.11888888888888, + "latitude": 36.55611111111111 + }, + { + "longitude": 114.11083333333333, + "latitude": 36.55777777777777 + }, + { + "longitude": 114.10888888888888, + "latitude": 36.556666666666665 + }, + { + "longitude": 114.10916666666667, + "latitude": 36.5575 + }, + { + "longitude": 114.10749999999999, + "latitude": 36.55777777777777 + }, + { + "longitude": 114.1061111111111, + "latitude": 36.55777777777777 + }, + { + "longitude": 114.10555555555555, + "latitude": 36.55611111111111 + }, + { + "longitude": 114.10722222222222, + "latitude": 36.556666666666665 + }, + { + "longitude": 114.11638888888888, + "latitude": 36.555277777777775 + } ], jkd: [ {"longitude":"114.103822","latitude":"36.5538"}, diff --git a/store/system.js b/store/system.js new file mode 100644 index 0000000..7cd98bb --- /dev/null +++ b/store/system.js @@ -0,0 +1,15 @@ +export const state = { + title: '' +} + +export const mutations = { + setTitle (state, title) { + state.title = title + } +} + +export const actions = { + setTitle ({ commit }, title) { + commit('setTitle', title) + } +} diff --git a/test/output.json b/test/output.json new file mode 100644 index 0000000..69a4196 --- /dev/null +++ b/test/output.json @@ -0,0 +1,102 @@ +[ + { + "longitude": 114.10027777777778, + "latitude": 36.55 + }, + { + "longitude": 114.10111111111111, + "latitude": 36.54972222222222 + }, + { + "longitude": 114.10111111111111, + "latitude": 36.55138888888889 + }, + { + "longitude": 114.10277777777777, + "latitude": 36.55 + }, + { + "longitude": 114.10305555555556, + "latitude": 36.55222222222222 + }, + { + "longitude": 114.1036111111111, + "latitude": 36.55166666666666 + }, + { + "longitude": 114.10722222222222, + "latitude": 36.55333333333333 + }, + { + "longitude": 114.1061111111111, + "latitude": 36.55416666666667 + }, + { + "longitude": 114.10472222222222, + "latitude": 36.55444444444444 + }, + { + "longitude": 114.11, + "latitude": 36.55416666666667 + }, + { + "longitude": 114.11055555555555, + "latitude": 36.555277777777775 + }, + { + "longitude": 114.11222222222221, + "latitude": 36.555277777777775 + }, + { + "longitude": 114.11222222222221, + "latitude": 36.553888888888885 + }, + { + "longitude": 114.11416666666666, + "latitude": 36.55416666666667 + }, + { + "longitude": 114.11444444444444, + "latitude": 36.555277777777775 + }, + { + "longitude": 114.11749999999999, + "latitude": 36.55777777777777 + }, + { + "longitude": 114.11888888888888, + "latitude": 36.55611111111111 + }, + { + "longitude": 114.11083333333333, + "latitude": 36.55777777777777 + }, + { + "longitude": 114.10888888888888, + "latitude": 36.556666666666665 + }, + { + "longitude": 114.10916666666667, + "latitude": 36.5575 + }, + { + "longitude": 114.10749999999999, + "latitude": 36.55777777777777 + }, + { + "longitude": 114.1061111111111, + "latitude": 36.55777777777777 + }, + { + "longitude": 114.10555555555555, + "latitude": 36.55611111111111 + }, + { + "longitude": 114.10722222222222, + "latitude": 36.556666666666665 + }, + { + "longitude": 114.11638888888888, + "latitude": 36.555277777777775 + } +] \ No newline at end of file diff --git a/test/test.js b/test/test.js new file mode 100644 index 0000000..2df9615 --- /dev/null +++ b/test/test.js @@ -0,0 +1,47 @@ +const XLSX = require('xlsx'); + +const fs = require('fs'); +// 读取xlsx文件 +const workbook = XLSX.readFile('./test.xlsx'); + +// 读取特定的worksheet，默认第一个worksheet +const worksheet = workbook.Sheets['Sheet2']; + +// 将worksheet转换为JSON对象 +const jsonData = XLSX.utils.sheet_to_json(worksheet); +function dmsToDecimal(degrees, minutes, seconds) { + return degrees + minutes / 60 + seconds / 3600; +} + + +const results = [] + +for (const jsonDatum of jsonData) { + const location = jsonDatum['经纬度'] + const [lat, lon] = location.split(' ') + let latStr = lat.replace(/\°|\'|["(N|E)]/g, '@') + let lonStr = lon.replace(/\°|\'|["(N|E)]/g, '@') + const [latDegrees, latMinutes, latSeconds] = latStr.split('@') + const [longDegrees, longMinutes, longSeconds] = lonStr.split('@') + const latitude = dmsToDecimal(parseInt(latDegrees), parseInt(latMinutes), parseInt(latSeconds)); + const longitude = dmsToDecimal(parseInt(longDegrees), parseInt(longMinutes),parseInt( longSeconds)); + results.push( { + longitude, + latitude + }) +} + + +// 文件内容 +const content = JSON.stringify(results, null, 2) + +// 文件路径 +const filePath = './output.json'; + +// 写入文件 +fs.writeFile(filePath, content, 'utf8', function(err) { + if (err) { + return console.log(err); + } + console.log('文件已保存'); +}); diff --git a/test/test.xlsx b/test/test.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..4f3cedc1e4edae6fa1f8dadb0f4f3781038c8cf5 GIT binary patch literal 10563 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 Y-MF$mG}s0K03`5-8f?a})IXp84{Uu&mH+?% literal 0 HcmV?d00001 diff --git a/yarn.lock b/yarn.lock index 6857a20..6bccf4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1297,6 +1297,13 @@ resolved "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== +"@gauseen/nuxt-proxy@^1.0.1": + version "1.0.1" + resolved "https://registry.npmmirror.com/@gauseen/nuxt-proxy/-/nuxt-proxy-1.0.1.tgz#e8964109796ef4a20f9677cc498e773942d02225" + integrity sha512-9uDd8AAGrKU2q1SPOkajL8y0AFKVBoeHrGtmcvr7FJ2VzZwZ1QsusUgOKsLg1qJ3xUnw7Nqgjc/rHZoaX0UlbQ== + dependencies: + http-proxy-middleware "^0.18.0" + "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" resolved "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" @@ -2068,6 +2075,11 @@ add-dom-event-listener@^1.0.2: dependencies: object-assign "4.x" +adler-32@~1.3.0: + version "1.3.1" + resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2" + integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A== + aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -2757,6 +2769,14 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541, can resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz#95a982440d3d314c471db68d02664fb7536c5a30" integrity sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA== +cfb@~1.2.1: + version "1.2.2" + resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44" + integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA== + dependencies: + adler-32 "~1.3.0" + crc-32 "~1.2.0" + chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -2890,6 +2910,11 @@ clone@^2.1.2: resolved "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== +codepage@~1.15.0: + version "1.15.0" + resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab" + integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA== + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -3125,6 +3150,11 @@ countup.js@^2.8.0: resolved "https://registry.npmmirror.com/countup.js/-/countup.js-2.8.0.tgz#64951f2df3ede28839413d654d8fef28251c32a8" integrity sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ== +crc-32@~1.2.0, crc-32@~1.2.1: + version "1.2.2" + resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff" + integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ== + crc@^4.3.2: version "4.3.2" resolved "https://registry.npmmirror.com/crc/-/crc-4.3.2.tgz#49b7821cbf2cf61dfd079ed93863bbebd5469b9a" @@ -3909,6 +3939,11 @@ etag@^1.8.1, etag@~1.8.1: resolved "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== +eventemitter3@^4.0.0: + version "4.0.7" + resolved "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + events@^3.0.0: version "3.3.0" resolved "https://registry.npmmirror.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" @@ -4137,6 +4172,11 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" +follow-redirects@^1.0.0: + version "1.15.6" + resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + follow-redirects@^1.15.0: version "1.15.3" resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" @@ -4163,6 +4203,11 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +frac@~1.1.2: + version "1.1.2" + resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b" + integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA== + fraction.js@^4.3.6: version "4.3.7" resolved "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7" @@ -4631,6 +4676,25 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" +http-proxy-middleware@^0.18.0: + version "0.18.0" + resolved "https://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab" + integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q== + dependencies: + http-proxy "^1.16.2" + is-glob "^4.0.0" + lodash "^4.17.5" + micromatch "^3.1.9" + +http-proxy@^1.16.2: + version "1.18.1" + resolved "https://registry.npmmirror.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.npmmirror.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" @@ -5491,7 +5555,7 @@ merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.9: version "3.1.10" resolved "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -7381,6 +7445,11 @@ require-from-string@^2.0.2: resolved "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + resize-detector@^0.1.10: version "0.1.10" resolved "https://registry.npmmirror.com/resize-detector/-/resize-detector-0.1.10.tgz#1da3f961aa5f914ccbcfd3752d52fd45beeb692c" @@ -7860,6 +7929,13 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +ssf@~0.11.2: + version "0.11.2" + resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c" + integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g== + dependencies: + frac "~1.1.2" + ssri@^6.0.1: version "6.0.2" resolved "https://registry.npmmirror.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" @@ -8845,6 +8921,16 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" +wmf@~1.0.1: + version "1.0.2" + resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da" + integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw== + +word@~0.3.0: + version "0.3.0" + resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961" + integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA== + worker-farm@^1.7.0: version "1.7.0" resolved "https://registry.npmmirror.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" @@ -8892,6 +8978,19 @@ ws@^7.3.1: resolved "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== +xlsx@^0.18.5: + version "0.18.5" + resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0" + integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ== + dependencies: + adler-32 "~1.3.0" + cfb "~1.2.1" + codepage "~1.15.0" + crc-32 "~1.2.1" + ssf "~0.11.2" + wmf "~1.0.1" + word "~0.3.0" + xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"