diff --git a/angular.json b/angular.json index b435257..2d8a69d 100644 --- a/angular.json +++ b/angular.json @@ -25,14 +25,21 @@ "aot": true, "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + { + "glob": "**/*", + "input": "node_modules/cesium/Build/Cesium", + "output": "src/assets/cesium" + } ], "styles": [ "src/styles.scss", "./node_modules/swiper/css/swiper.min.css", + "./node_modules/cesium/Build/Cesium/Widgets/widgets.css", "./node_modules/viewerjs/dist/viewer.css" ], "scripts": [ + "./node_modules/cesium/Build/Cesium/Cesium.js", "node_modules/echarts/dist/echarts.js", "src/assets/mTokenK1/mToken_K1.js", "./node_modules/swiper/js/swiper.min.js", diff --git a/package-lock.json b/package-lock.json index 5b2bab3..59f84cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4681,9 +4681,9 @@ } }, "@types/cesium": { - "version": "1.65.3", - "resolved": "https://registry.npm.taobao.org/@types/cesium/download/@types/cesium-1.65.3.tgz", - "integrity": "sha1-vG0xrx67i8IAIsKtXHqnDIaNp5I=" + "version": "1.67.12", + "resolved": "https://registry.npm.taobao.org/@types/cesium/download/@types/cesium-1.67.12.tgz", + "integrity": "sha1-YGWYymuk/ymJtXGDCbL6haCr3kw=" }, "@types/estree": { "version": "0.0.42", @@ -6030,12 +6030,9 @@ "dev": true }, "cesium": { - "version": "1.66.0", - "resolved": "https://registry.npm.taobao.org/cesium/download/cesium-1.66.0.tgz", - "integrity": "sha1-rIqYWDKXQOsiMEk2B26m+Ob6rYI=", - "requires": { - "esm": "^3.2.25" - } + "version": "1.74.0", + "resolved": "https://registry.npm.taobao.org/cesium/download/cesium-1.74.0.tgz", + "integrity": "sha1-eQOKvUDrPjoyIxYtCYTa9tCUlvs=" }, "cesium-typings": { "version": "1.50.2", @@ -7806,11 +7803,6 @@ "estraverse": "^4.1.1" } }, - "esm": { - "version": "3.2.25", - "resolved": "https://registry.npm.taobao.org/esm/download/esm-3.2.25.tgz", - "integrity": "sha1-NCwYwp1WFXaIulzjH4Qx+7eVzBA=" - }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz", diff --git a/package.json b/package.json index 6c9be3c..e08e281 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,11 @@ "@angular/platform-browser": "~9.0.0", "@angular/platform-browser-dynamic": "~9.0.0", "@angular/router": "~9.0.0", - "@types/cesium": "^1.59.5", + "@types/cesium": "^1.67.12", "@types/swiper": "^5.3.0", "angular-calendar": "^0.28.2", "bson-objectid": "^1.3.1", - "cesium": "^1.64.0", + "cesium": "^1.74.0", "date-fns": "^2.9.0", "e-ngx-cesium": "^6.3.2", "echarts": "^4.6.0", diff --git a/src/app/ui/reset/reset.component.html b/src/app/ui/reset/reset.component.html index 91c484b..ebe943e 100644 --- a/src/app/ui/reset/reset.component.html +++ b/src/app/ui/reset/reset.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-25 08:48:50 * @LastEditors: sueRimn - * @LastEditTime: 2020-10-14 09:10:58 + * @LastEditTime: 2020-10-27 13:58:29 --> @@ -14,41 +14,19 @@
-
-
-
- 序号 - {{item.idnum}} -
-
-
-
-
-
- 请选择支队 - {{item.name}} -
-
-
-
-
-
- 抽签结果: - -
-
-
+
- -
+ @@ -27,5 +27,5 @@ --> - + diff --git a/src/main.ts b/src/main.ts index 611c343..ec25709 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,6 +8,7 @@ if (environment.production) { enableProdMode(); } -// window['CESIUM_BASE_URL'] = 'src/assets/cesium'; +window['CESIUM_BASE_URL'] = 'src/assets/cesium'; + platformBrowserDynamic().bootstrapModule(AppModule) .catch(err => console.error(err));