[新增]cesium.js

3 years ago · 7c38db6f56
8 changed files with 248 additions and 98 deletions
--- 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",
--- 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",
--- 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",
--- 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
 -->
 <html>
 	<meta charset="utf-8"/>
@ -14,41 +14,19 @@
 			<img class="ziti" src="../../../assets/images/tophead.png">
 		</div>
 		<div class="mainbox">
-			<div class="colum" style="margin-left: 13%;width: 100px;">
-				<div class="centerLefta" >
-					<div class="tanCenterbtna" id="chooseZhi">
-						<span style="background-color: #ff4d29;color:#FFF;" >序号</span>
-						<span  *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" >{{item.idnum}}</span>
-					  </div>
-				  </div>
-			</div>
-			<div class="colum" >
-				<div class="centerLeft" >
-					<div class="tanCenterbtn" id="chooseZhi">
-						<span style="background-color: #ff4d29;color:#FFF;" name="zhidui" data-id=`{{chooseid}}`>请选择支队</span>
-						<span name="aaa"  *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" (click)="chosseZhidui(key)">{{item.name}}<img style="margin-left: 8px;display: none;" src="../../../assets/images/dui.png"></span>
-					  </div>
-				  </div>
-			</div>
-			<div class="colum">
-				<div class="centerLeft">
-					<div class="tanCenterbtn" id="endjieguo">
-					<span  style="text-align: center;background-color: #ff4d29;color:#FFF;">抽签结果:</span>
-					<span  *ngFor="let item of choujiang; let key=index"  ></span>
-					</div>
-				</div>
-			</div>
+			
 			
 			<div id="con1" class="zhuan" >
-				  <div class="banner"  name="banner" id="zhuanpan">
+				  <!-- <div class="banner"  name="banner" id="zhuanpan">
 					<div class="turnplate" style="background-image:url(../../../assets/images/turnplate-bg.png);background-size:100% 100%;">
 						<canvas class="item" id="wheelcanvas" width="422px" height="422px" ></canvas>
 						<img  class="pointer" src="../../../assets/images/turnplate-pointer.png" id="clickButton" disabled/>
 					</div>
-				</div>
+				</div> -->
+				
 				
 			</div>
-			<div class="chongzhi" style="height: 20%;"><button id="Reset" class="button">重置</button></div>
+			
 				
 			
 			<!-- <div class="colum" style="display: none;padding-left: 10%;margin-top: 20%;" id="end">
--- a/src/app/ui/reset/reset.component.scss
+++ b/src/app/ui/reset/reset.component.scss
@ -126,58 +126,11 @@ span{
 	}
 }
 .zhuan{
-	width: 500px;
+	width: 100%;
 	margin-left: 160px;
 	margin-top: 10%;
 }
-.stop{
-	pointer-events: none; 
-}
-.button {
-	height: 48px;
-	width: 130px;
-	background-color:transparent;
-	border-radius: 4px;
-    border: 1px solid #ECEDEE;
-    color: #FFF;
-    padding: 12px 32px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    font-size: 16px;
-    margin: 4px 2px;
-    cursor: pointer;
-}
-.chongzhi{
-	position: relative;
-	top: 80%;
-	right: 17%;
-}

-//选择后加背景色
-.beijicolor{
-	background-color:#FE693E ;
-}
-	body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;}
-	body{color:#333; font-size:12px;font-family:"Microsoft YaHei"}
-	ul,ol{list-style-type:none;}
-	select,input,img,select{vertical-align:middle;}
-	input{ font-size:12px;}
-	a{ text-decoration:none; color:#000;}
-	a:hover{color:#c00; text-decoration:none;}
-	.clear{clear:both;}

-	/* 大转盘样式 */
-	.banner{//max-height: 650px;
-		display: block;
-		width: 95%;
-		//max-width: 650px;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 20px;
-	}
-	.banner .turnplate{display:block;width:100%;position:relative;}
-	.banner .turnplate canvas.item{width:100%;height: 100%;}
-	.banner .turnplate img.pointer{position:absolute;width:30.5%;height:36.5%;left:34.6%;top:28.5%;}

 
--- a/src/app/ui/reset/reset.component.ts
+++ b/src/app/ui/reset/reset.component.ts
--- a/src/index.html
+++ b/src/index.html
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2020-09-25 08:48:54
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-10-07 14:13:32
+ * @LastEditTime: 2020-10-15 17:13:46
 -->
 <!doctype html>
 <html lang="zh-CN">
@ -27,5 +27,5 @@
 <script src="/assets/js/zepto.min.js"></script> -->
 <!-- <script src="/assets/js/zhuanpan.js"></script> -->
 <script src="/assets/js/awardRotate.js"></script>
-<script src="/assets/js/zhuanpan.js"></script>
+<!-- <script src="/assets/js/zhuanpan.js"></script>  -->
 </html>
--- 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));