From 1674b3d9da80f4001cc4d25767bc300fdc1f50a6 Mon Sep 17 00:00:00 2001
From: unknown <chiangbt@geoportal.cn>
Date: Sat, 14 Dec 2019 00:52:52 +0800
Subject: [PATCH] '20191213'
---
package-lock.json | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
package.json | 1 +
public/index.html | 6 +++---
src/App.vue | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
src/components/viewer_changeview.vue | 2 +-
src/components/viewer_ms3m.vue | 2 +-
src/components/viewer_s3m_single_box.vue | 2 +-
src/components/viewer_s3mbhyp.vue | 4 ++--
src/components/viewer_split.vue | 11 ++++++++++-
src/components/viewer_underground.vue | 13 +++++++++++--
src/main.js | 5 ++++-
src/router/index.js | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
12 files changed, 433 insertions(+), 72 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index dd34356..4597a02 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,28 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@ant-design/colors": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz",
+ "integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==",
+ "requires": {
+ "tinycolor2": "^1.4.1"
+ }
+ },
+ "@ant-design/icons": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz",
+ "integrity": "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
+ },
+ "@ant-design/icons-vue": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-2.0.0.tgz",
+ "integrity": "sha512-2c0QQE5hL4N48k5NkPG5sdpMl9YnvyNhf0U7YkdZYDlLnspoRU7vIA0UK9eHBs6OpFLcJB6o8eJrIl2ajBskPg==",
+ "requires": {
+ "@ant-design/colors": "^3.1.0",
+ "babel-runtime": "^6.26.0"
+ }
+ },
"@babel/code-frame": {
"version": "7.5.5",
"resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.5.5.tgz",
@@ -2136,6 +2158,14 @@
"integrity": "sha1-Ejy487hMIXHx9/slJhWxx4prGow=",
"dev": true
},
+ "add-dom-event-listener": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz",
+ "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==",
+ "requires": {
+ "object-assign": "4.x"
+ }
+ },
"address": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/address/download/address-1.1.2.tgz",
@@ -2215,6 +2245,41 @@
"color-convert": "^1.9.0"
}
},
+ "ant-design-vue": {
+ "version": "1.4.10",
+ "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.4.10.tgz",
+ "integrity": "sha512-8QuLI8vP7c7D0k/8m4VDQzkyf2+uhcUl5voFaZ4bbMkCpUxm/1uNp+FdbLP+MxGcV5Pv5YSYbakd8ucNCYueeQ==",
+ "requires": {
+ "@ant-design/icons": "^2.1.1",
+ "@ant-design/icons-vue": "^2.0.0",
+ "add-dom-event-listener": "^1.0.2",
+ "array-tree-filter": "^2.1.0",
+ "async-validator": "^3.0.3",
+ "babel-helper-vue-jsx-merge-props": "^2.0.3",
+ "babel-runtime": "6.x",
+ "classnames": "^2.2.5",
+ "component-classes": "^1.2.6",
+ "dom-align": "^1.7.0",
+ "dom-closest": "^0.2.0",
+ "dom-scroll-into-view": "^1.2.1",
+ "enquire.js": "^2.1.6",
+ "intersperse": "^1.0.0",
+ "is-negative-zero": "^2.0.0",
+ "ismobilejs": "^0.5.1",
+ "json2mq": "^0.2.0",
+ "lodash": "^4.17.5",
+ "moment": "^2.21.0",
+ "mutationobserver-shim": "^0.3.2",
+ "node-emoji": "^1.10.0",
+ "omit.js": "^1.0.0",
+ "raf": "^3.4.0",
+ "resize-observer-polyfill": "^1.5.1",
+ "shallow-equal": "^1.0.0",
+ "shallowequal": "^1.0.2",
+ "vue-ref": "^1.0.4",
+ "warning": "^3.0.0"
+ }
+ },
"any-promise": {
"version": "1.3.0",
"resolved": "https://registry.npm.taobao.org/any-promise/download/any-promise-1.3.0.tgz",
@@ -2303,6 +2368,11 @@
"es-abstract": "^1.7.0"
}
},
+ "array-tree-filter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
+ "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
+ },
"array-union": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/array-union/download/array-union-1.0.2.tgz",
@@ -2410,6 +2480,11 @@
"integrity": "sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=",
"dev": true
},
+ "async-validator": {
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.2.3.tgz",
+ "integrity": "sha512-yMJ4i3x5qEGVgEMowZiBkx+rjDrsXf64BWdHENCtHLgyPiEE+2r8jvqMF1cghCgdGo4sWVLJ7MDwPQgGSPDCcw=="
+ },
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
@@ -2536,6 +2611,11 @@
"resolve": "^1.12.0"
}
},
+ "babel-helper-vue-jsx-merge-props": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+ "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
+ },
"babel-jest": {
"version": "24.9.0",
"resolved": "https://registry.npm.taobao.org/babel-jest/download/babel-jest-24.9.0.tgz?cache=0&sync_timestamp=1566444289086&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-jest%2Fdownload%2Fbabel-jest-24.9.0.tgz",
@@ -2638,7 +2718,6 @@
"version": "6.26.0",
"resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
- "dev": true,
"requires": {
"core-js": "^2.4.0",
"regenerator-runtime": "^0.11.0"
@@ -2647,14 +2726,12 @@
"core-js": {
"version": "2.6.10",
"resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.10.tgz?cache=0&sync_timestamp=1575309477270&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.10.tgz",
- "integrity": "sha1-iluDkfjMcBPacDQRzltYVwYwDX8=",
- "dev": true
+ "integrity": "sha1-iluDkfjMcBPacDQRzltYVwYwDX8="
},
"regenerator-runtime": {
"version": "0.11.1",
"resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz",
- "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=",
- "dev": true
+ "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk="
}
}
},
@@ -3454,6 +3531,11 @@
}
}
},
+ "classnames": {
+ "version": "2.2.6",
+ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+ "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+ },
"clean-css": {
"version": "4.2.1",
"resolved": "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.1.tgz",
@@ -3816,12 +3898,25 @@
"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
"dev": true
},
+ "component-classes": {
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/component-classes/-/component-classes-1.2.6.tgz",
+ "integrity": "sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=",
+ "requires": {
+ "component-indexof": "0.0.3"
+ }
+ },
"component-emitter": {
"version": "1.3.0",
"resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz",
"integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=",
"dev": true
},
+ "component-indexof": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz",
+ "integrity": "sha1-EdCRMSI5648yyPJa6csAL/6NPCQ="
+ },
"compressible": {
"version": "2.0.17",
"resolved": "https://registry.npm.taobao.org/compressible/download/compressible-2.0.17.tgz?cache=0&sync_timestamp=1561981219831&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcompressible%2Fdownload%2Fcompressible-2.0.17.tgz",
@@ -4840,6 +4935,19 @@
"isarray": "^1.0.0"
}
},
+ "dom-align": {
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.10.2.tgz",
+ "integrity": "sha512-AYZUzLepy05E9bCY4ExoqHrrIlM49PEak9oF93JEFoibqKL0F7w5DLM70/rosLOawerWZ3MlepQcl+EmHskOyw=="
+ },
+ "dom-closest": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
+ "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
+ "requires": {
+ "dom-matches": ">=1.0.1"
+ }
+ },
"dom-converter": {
"version": "0.2.0",
"resolved": "https://registry.npm.taobao.org/dom-converter/download/dom-converter-0.2.0.tgz",
@@ -4855,6 +4963,16 @@
"integrity": "sha1-WDCgop4b+Df+UKcM2ApZcjKBPK4=",
"dev": true
},
+ "dom-matches": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
+ "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
+ },
+ "dom-scroll-into-view": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz",
+ "integrity": "sha1-6PNnMt0ImwIBqI14Fdw/iObWbH4="
+ },
"dom-serializer": {
"version": "0.2.2",
"resolved": "https://registry.npm.taobao.org/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1573447907918&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz",
@@ -5081,6 +5199,11 @@
}
}
},
+ "enquire.js": {
+ "version": "2.1.6",
+ "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
+ "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
+ },
"entities": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/entities/download/entities-2.0.0.tgz",
@@ -6315,8 +6438,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -6337,14 +6459,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -6359,20 +6479,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -6489,8 +6606,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -6502,7 +6618,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -6517,7 +6632,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -6525,14 +6639,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -6551,7 +6663,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -6632,8 +6743,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -6645,7 +6755,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -6731,8 +6840,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -6768,7 +6876,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -6788,7 +6895,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -6832,14 +6938,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -7609,6 +7713,11 @@
}
}
},
+ "intersperse": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/intersperse/-/intersperse-1.0.0.tgz",
+ "integrity": "sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE="
+ },
"invariant": {
"version": "2.2.4",
"resolved": "https://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finvariant%2Fdownload%2Finvariant-2.2.4.tgz",
@@ -7808,6 +7917,11 @@
"is-extglob": "^2.1.1"
}
},
+ "is-negative-zero": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+ "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
+ },
"is-number": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
@@ -7954,6 +8068,11 @@
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
"dev": true
},
+ "ismobilejs": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/ismobilejs/-/ismobilejs-0.5.2.tgz",
+ "integrity": "sha512-ta9UdV60xVZk/ZafFtSFslQaE76SvNkcs1r73d2PVR21zVzx9xuYv9tNe4MxA1NN7WoeCc2RjGot3Bz1eHDx3Q=="
+ },
"isobject": {
"version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
@@ -8736,8 +8855,7 @@
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz",
- "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=",
- "dev": true
+ "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk="
},
"js-yaml": {
"version": "3.13.1",
@@ -8841,6 +8959,14 @@
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
"dev": true
},
+ "json2mq": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
+ "integrity": "sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=",
+ "requires": {
+ "string-convert": "^0.2.0"
+ }
+ },
"json3": {
"version": "3.3.3",
"resolved": "https://registry.npm.taobao.org/json3/download/json3-3.3.3.tgz",
@@ -9063,8 +9189,7 @@
"lodash": {
"version": "4.17.15",
"resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.15.tgz",
- "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=",
- "dev": true
+ "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg="
},
"lodash.defaultsdeep": {
"version": "4.6.1",
@@ -9096,6 +9221,11 @@
"integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
"dev": true
},
+ "lodash.toarray": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
+ "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE="
+ },
"lodash.transform": {
"version": "4.6.0",
"resolved": "https://registry.npm.taobao.org/lodash.transform/download/lodash.transform-4.6.0.tgz",
@@ -9127,7 +9257,6 @@
"version": "1.4.0",
"resolved": "https://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz",
"integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=",
- "dev": true,
"requires": {
"js-tokens": "^3.0.0 || ^4.0.0"
}
@@ -9517,6 +9646,11 @@
}
}
},
+ "moment": {
+ "version": "2.24.0",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+ "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+ },
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",
@@ -9553,6 +9687,11 @@
"integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
"dev": true
},
+ "mutationobserver-shim": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
+ "integrity": "sha512-gciOLNN8Vsf7YzcqRjKzlAJ6y7e+B86u7i3KXes0xfxx/nfLmozlW1Vn+Sc9x3tPIePFgc1AeIFhtRgkqTjzDQ=="
+ },
"mute-stream": {
"version": "0.0.7",
"resolved": "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz",
@@ -9647,6 +9786,14 @@
}
}
},
+ "node-emoji": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
+ "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==",
+ "requires": {
+ "lodash.toarray": "^4.4.0"
+ }
+ },
"node-forge": {
"version": "0.9.0",
"resolved": "https://registry.npm.taobao.org/node-forge/download/node-forge-0.9.0.tgz?cache=0&sync_timestamp=1569524669712&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.9.0.tgz",
@@ -9830,8 +9977,7 @@
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
- "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
- "dev": true
+ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
"object-copy": {
"version": "0.1.0",
@@ -9946,6 +10092,14 @@
"integrity": "sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4=",
"dev": true
},
+ "omit.js": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz",
+ "integrity": "sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==",
+ "requires": {
+ "babel-runtime": "^6.23.0"
+ }
+ },
"on-finished": {
"version": "2.3.0",
"resolved": "https://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz",
@@ -10358,8 +10512,7 @@
"performance-now": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz",
- "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
- "dev": true
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
},
"pify": {
"version": "4.0.1",
@@ -11156,6 +11309,14 @@
"integrity": "sha1-YOWl/WSn+L+k0qsu1v30yFutFU4=",
"dev": true
},
+ "raf": {
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+ "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+ "requires": {
+ "performance-now": "^2.1.0"
+ }
+ },
"randombytes": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz",
@@ -11495,6 +11656,11 @@
"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
"dev": true
},
+ "resize-observer-polyfill": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+ "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+ },
"resolve": {
"version": "1.13.1",
"resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.13.1.tgz",
@@ -11911,6 +12077,16 @@
"kind-of": "^6.0.2"
}
},
+ "shallow-equal": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
+ "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
+ },
+ "shallowequal": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+ "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+ },
"shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz",
@@ -12423,6 +12599,11 @@
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
},
+ "string-convert": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
+ "integrity": "sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c="
+ },
"string-length": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/string-length/download/string-length-2.0.0.tgz",
@@ -12799,6 +12980,11 @@
"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
"dev": true
},
+ "tinycolor2": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
+ "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
+ },
"tmp": {
"version": "0.0.33",
"resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
@@ -13397,6 +13583,11 @@
"vue-style-loader": "^4.1.0"
}
},
+ "vue-ref": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-1.0.6.tgz",
+ "integrity": "sha512-UzD8t1CG+aoWVOOpGd5KcaCNtCgUc0byaKhJMH+6N7H/p1ThVkYl/VCt7DmCrdhUlzZK+hT5JPTKAdrbWi0nNw=="
+ },
"vue-router": {
"version": "3.1.3",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.1.3.tgz",
@@ -13457,6 +13648,14 @@
"makeerror": "1.0.x"
}
},
+ "warning": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
+ "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
+ "requires": {
+ "loose-envify": "^1.0.0"
+ }
+ },
"watchpack": {
"version": "1.6.0",
"resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz",
diff --git a/package.json b/package.json
index a6e2967..8574867 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
+ "ant-design-vue": "^1.4.10",
"core-js": "^3.4.3",
"vue": "^2.6.10",
"vue-router": "^3.1.3"
diff --git a/public/index.html b/public/index.html
index 4bddc41..d48c483 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,7 @@
* @Author: jiangbotao
* @Date: 2019-12-03 22:31:08
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-07 17:35:42
+ * @LastEditTime: 2019-12-14 00:41:13
* @FilePath: \superglobevue\public\index.html
-->
<!DOCTYPE html>
@@ -30,11 +30,11 @@
}
</style>
</head>
- <body>
+ <body style="padding: 0px; margin: 0px; overflow: hidden;">
<noscript>
<strong>We're sorry but superglobevue doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
- </body>
+ </body s>
</html>
diff --git a/src/App.vue b/src/App.vue
index 1a9edf3..a054fa7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,25 +2,100 @@
* @Author: jiangbotao
* @Date: 2019-12-03 22:31:08
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-10 10:16:09
+ * @LastEditTime: 2019-12-14 00:35:28
* @FilePath: \superglobevue\src\App.vue
-->
<template>
- <div id="app">
+<a-layout id="components-layout-demo-top-side-2">
+ <a-layout-header class="header">
+ <a-icon type="compass" /> 温州项目VUE 3DMap示例(v10.0)
+ <a-menu
+ theme="dark"
+ mode="horizontal"
+ :defaultSelectedKeys="['2']"
+ :style="{ lineHeight: '64px' }"
+ >
+ </a-menu>
+ </a-layout-header>
+ <a-layout>
+ <a-layout-sider width="200" style="background: #fff">
+ <a-menu
+ mode="inline"
+ :defaultSelectedKeys="['1']"
+ :defaultOpenKeys="['sub1']"
+ :style="{ height: '100%', borderRight: 0 }"
+ >
+ <a-sub-menu key="sub1">
+ <span slot="title"><a-icon type="user" />3D展示</span>
+ <a-menu-item key="1_1"><router-link :to="'/'">建筑物白模</router-link></a-menu-item>
+ <a-menu-item key="1_2"><router-link :to="'/tdt'">天地图</router-link></a-menu-item>
+ <a-menu-item key="1_3"><router-link :to="'/changeview'">固定视图</router-link></a-menu-item>
+ <a-menu-item key="1_4"><router-link :to="'/split'">多视图展示</router-link></a-menu-item>
+ </a-sub-menu>
+ <a-sub-menu key="sub2">
+ <span slot="title"><a-icon type="laptop" />倾斜摄影</span>
+ <a-menu-item key="2_1"><router-link :to="'/ms3m'">多模型图层</router-link></a-menu-item>
+ <a-menu-item key="2_2"><router-link :to="'/s3m'">倾斜摄影数据</router-link></a-menu-item>
+ <a-menu-item key="2_3"><router-link :to="'/s3m_single_box'">单体化查询1</router-link></a-menu-item>
+ <a-menu-item key="2_4"><router-link :to="'/s3m_single'">单体化查询2</router-link></a-menu-item>
+ <a-menu-item key="2_5"><router-link :to="'/hyp'">大场景图层淹没</router-link></a-menu-item>
+ </a-sub-menu>
+ <a-sub-menu key="sub3">
+ <span slot="title"><a-icon type="notification" />空间分析与查询</span>
+ <a-menu-item key="9"><router-link :to="'/fire'">火灾分析</router-link></a-menu-item>
+ <a-menu-item key="10"><router-link :to="'/underground'">地面开挖</router-link></a-menu-item>
+ <a-menu-item key="11"><router-link :to="'/ymo'">地形淹没分析</router-link></a-menu-item>
+ <a-menu-item key="12"><router-link :to="'/spatial1'">空间点查询</router-link></a-menu-item>
+ <a-menu-item key="13"><router-link :to="'/spatial2'">空间面查询</router-link></a-menu-item>
+ </a-sub-menu>
+ </a-menu>
+ </a-layout-sider>
+ <a-layout style="padding: 10px 10px 10px 10px">
+ <a-layout-content :style="{ background: '#fff', padding: '12px', margin: 0, minHeight: '500px' }">
+ <div id="app" style="position: relative; width:100%;">
+ <router-view/>
+ </div>
+ </a-layout-content>
+ </a-layout>
+ </a-layout>
+ </a-layout>
+ <!-- <div id="app">
<router-view/>
- </div>
+ </div> -->
</template>
-<style lang="scss">
-body{
- padding: 0px;
- margin: 0px;
-}
-#app {
- font-family: 'Avenir', Helvetica, Arial, sans-serif;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- text-align: center;
- color: #2c3e50;
+<script>
+export default {
+ name: 'App',
+ data() {
+ return {
+ collapsed: false,
+ };
+ },
}
+</script>
+
+<style lang="scss">
+ .ant-layout-header {
+ height: 64px;
+ padding: 0 50px;
+ line-height: 64px;
+ background: #0b5296;
+ color: white;
+ font-size: 30px;
+ border-bottom: 2px solid #bb5905;
+ }
+ .ant-layout {
+ height: 100%;
+ }
+ #components-layout-demo-top-side-2 .logo {
+ width: 120px;
+ height: 31px;
+ background: rgba(255, 255, 255, 0.2);
+ margin: 16px 28px 16px 0;
+ float: left;
+ }
+ #app{
+ height: 100%;
+ }
</style>
diff --git a/src/components/viewer_changeview.vue b/src/components/viewer_changeview.vue
index 13720c3..f0be6c2 100644
--- a/src/components/viewer_changeview.vue
+++ b/src/components/viewer_changeview.vue
@@ -4,7 +4,7 @@
* 当到一定尺度后开始可以改变视角
* @Date: 2019-12-03 21:30:29
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-04 20:25:49
+ * @LastEditTime: 2019-12-13 19:59:16
* @FilePath: \WebGL_Webpack_Vue\components\viewer6.vue
-->
<template>
diff --git a/src/components/viewer_ms3m.vue b/src/components/viewer_ms3m.vue
index dc9c263..f65f6fd 100644
--- a/src/components/viewer_ms3m.vue
+++ b/src/components/viewer_ms3m.vue
@@ -3,7 +3,7 @@
* 添加倾斜摄影场景和倾斜摄影图层
* @Date: 2019-12-02 09:05:50
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-12 14:02:01
+ * @LastEditTime: 2019-12-13 20:04:38
* @FilePath: \WebGL_Webpack_Vue\components\viewer.vue
-->
<template>
diff --git a/src/components/viewer_s3m_single_box.vue b/src/components/viewer_s3m_single_box.vue
index 7362915..6c13aa2 100644
--- a/src/components/viewer_s3m_single_box.vue
+++ b/src/components/viewer_s3m_single_box.vue
@@ -6,7 +6,7 @@
* 3、使用Popup来弹出倾斜摄影覆盖面的信息
* @Date: 2019-12-03 22:52:56
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-10 10:39:05
+ * @LastEditTime: 2019-12-13 20:05:50
* @FilePath: \superglobevue\src\components\viewer.vue
-->
<template>
diff --git a/src/components/viewer_s3mbhyp.vue b/src/components/viewer_s3mbhyp.vue
index 5d80990..56530db 100644
--- a/src/components/viewer_s3mbhyp.vue
+++ b/src/components/viewer_s3mbhyp.vue
@@ -4,7 +4,7 @@
* 使用场景中的HYP对象
* @Date: 2019-12-02 09:05:50
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-07 13:52:58
+ * @LastEditTime: 2019-12-14 00:46:44
* @FilePath: \WebGL_Webpack_Vue\components\viewer.vue
-->
<template>
@@ -170,7 +170,7 @@ export default {
color: black;
}
#setingBar{
- width:150px;
+ /* width:150px; */
height:110px;
background: rgba(42, 42, 42, 0.4);
padding: 8px;
diff --git a/src/components/viewer_split.vue b/src/components/viewer_split.vue
index ec45a9c..a366fc9 100644
--- a/src/components/viewer_split.vue
+++ b/src/components/viewer_split.vue
@@ -3,7 +3,7 @@
* @Author: jiangbotao
* @Date: 2019-12-03 22:52:56
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-10 11:01:35
+ * @LastEditTime: 2019-12-14 00:42:39
* @FilePath: \superglobevue\src\components\viewer.vue
-->
<template>
@@ -156,6 +156,15 @@ export default {
.sm-zoom {
top: 130px;
}
+.param-container {
+ background-color: rgba(255, 255, 255, 0.75);
+ padding: 5px;
+ border: 1px solid #267eb7;
+ border-radius: 10px;
+ color: black;
+ border-radius: 5px;
+ padding: 2px;
+}
label {
display: inline-block;
margin-right: 1rem;
diff --git a/src/components/viewer_underground.vue b/src/components/viewer_underground.vue
index 93414a3..e1980a0 100644
--- a/src/components/viewer_underground.vue
+++ b/src/components/viewer_underground.vue
@@ -3,7 +3,7 @@
* @Author: jiangbotao
* @Date: 2019-12-07 14:24:01
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-09 11:46:57
+ * @LastEditTime: 2019-12-14 00:49:56
* @FilePath: \superglobevue\src\components\viewer_3dmodel.vue
-->
<template>
@@ -31,7 +31,6 @@
</div>
<div id="toolbar" class="param-container tool-bar">
<div>
- <label style="color:#FFFFFF ">图层开挖:</label>
<button id="excavation" >绘制挖掘面</button>
<button id="dig" >进行倾斜开挖</button>
</div>
@@ -175,4 +174,14 @@ export default {
background-color:#78c300;
border-color:#c5e591;
}
+#dig {
+ color:rgb(255, 255, 255);
+ font-size:14px;padding-top:4px;padding-bottom:4px;padding-left:33px;padding-right:33px;
+ border-width:2px;border-color:rgb(74, 99, 31);border-style:solid;border-radius:11px;
+ background-color:rgb(44, 89, 128);}
+#dig:hover{
+ color:#ffffff;
+ background-color:#78c300;
+ border-color:#c5e591;
+}
</style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 3fbe484..89e4cf5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,14 +2,17 @@
* @Author: jiangbotao
* @Date: 2019-12-03 22:31:08
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-07 13:39:25
+ * @LastEditTime: 2019-12-13 19:57:31
* @FilePath: \superglobevue\src\main.js
*/
import Vue from 'vue'
+import Antd from 'ant-design-vue'
import App from './App'
import router from './router'
+import 'ant-design-vue/dist/antd.css'
Vue.config.productionTip = false
+Vue.use(Antd)
new Vue({
router,
diff --git a/src/router/index.js b/src/router/index.js
index 6711c0b..fa3705c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@
* @Author: jiangbotao
* @Date: 2019-12-03 22:31:08
* @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-04 08:09:41
+ * @LastEditTime: 2019-12-13 20:08:15
* @FilePath: \superglobevue\src\router\index.js
*/
import Vue from 'vue';
@@ -14,7 +14,72 @@ const routes = [
{
path: "/",
name: "home",
- component: () => import("../views/Home.vue")
+ component: () => import("./../components/viewer_3dmodel.vue")
+ },
+ {
+ path: "/tdt",
+ name: "home",
+ component: () => import("./../components/viewer_tdt.vue")
+ },
+ {
+ path: "/changeview",
+ name: "home",
+ component: () => import("./../components/viewer_changeview.vue")
+ },
+ {
+ path: "/split",
+ name: "home",
+ component: () => import("./../components/viewer_split.vue")
+ },
+ {
+ path: "/fire",
+ name: "home",
+ component: () => import("./../components/viewer_fire.vue")
+ },
+ {
+ path: "/underground",
+ name: "home",
+ component: () => import("./../components/viewer_underground.vue")
+ },
+ {
+ path: "/ymo",
+ name: "home",
+ component: () => import("./../components/viewer_ymo.vue")
+ },
+ {
+ path: "/s3m",
+ name: "home",
+ component: () => import("./../components/viewer_s3m.vue")
+ },
+ {
+ path: "/ms3m",
+ name: "home",
+ component: () => import("./../components/viewer_ms3m.vue")
+ },
+ {
+ path: "/s3m_single_box",
+ name: "home",
+ component: () => import("./../components/viewer_s3m_single_box.vue")
+ },
+ {
+ path: "/s3m_single",
+ name: "home",
+ component: () => import("./../components/viewer_s3m_single.vue")
+ },
+ {
+ path: "/hyp",
+ name: "home",
+ component: () => import("./../components/viewer_s3mbhyp.vue")
+ },
+ {
+ path: "/spatial1",
+ name: "home",
+ component: () => import("./../components/viewer_spatialquery.vue")
+ },
+ {
+ path: "/spatial2",
+ name: "home",
+ component: () => import("./../components/viewer_spatialquery_tl.vue")
}
];
--
libgit2 0.24.0