[转盘]重置功能修改

4 years ago · baec70c3f9
34 changed files with 1702 additions and 446 deletions
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@ -1,3 +1,11 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-10-07 15:00:15
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-10-09 14:37:03
+ */
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { LoginComponent } from './pages/login/login.component';
--- 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-07 15:47:54
+ * @LastEditTime: 2020-10-09 14:28:40
 -->
 <html>
 	<meta charset="utf-8"/>
@ -22,7 +22,7 @@
 				<div class="centerLeft">
 					<div class="tanCenterbtn" id="endjieguo">
 					<span  style="text-align: center;">抽签结果:</span>
-					<span   *ngFor="let item of choujiang; let key=index"  ></span>
+					<span  *ngFor="let item of choujiang; let key=index"  ></span>
 					</div>
 				</div>
 			</div>
@ -31,11 +31,12 @@
 				  <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/>
+						<img  class="pointer" src="../../../assets/images/turnplate-pointer.png" id="clickButton" disabled/>
 					</div>
 				</div>
-				<div><button>重置</button></div>
+				
 			</div>
+			<div><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
@ -57,6 +57,19 @@ span{
 .stop{
 	pointer-events: none; 
 }
+.button {
+	border-radius: 4px;
+    background-color: #4CAF50; /* Green */
+    border: none;
+    color: white;
+    padding: 15px 32px;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 16px;
+    margin: 4px 2px;
+    cursor: pointer;
+}


 //选择后加背景色
--- a/src/assets/images/1.png
+++ b/src/assets/images/1.png
--- a/src/assets/images/2.png
+++ b/src/assets/images/2.png
--- a/src/assets/images/demo.jpg
+++ b/src/assets/images/demo.jpg
--- a/src/assets/images/direction.png
+++ b/src/assets/images/direction.png
--- a/src/assets/images/enterPaintButton.png
+++ b/src/assets/images/enterPaintButton.png
--- a/src/assets/images/fire.png
+++ b/src/assets/images/fire.png
--- a/src/assets/images/force.png
+++ b/src/assets/images/force.png
--- a/src/assets/images/jt.png
+++ b/src/assets/images/jt.png
--- a/src/assets/images/lotteryBtn.png
+++ b/src/assets/images/lotteryBtn.png
--- a/src/assets/images/lotteryContent.png
+++ b/src/assets/images/lotteryContent.png
--- a/src/assets/images/noFire.png
+++ b/src/assets/images/noFire.png
--- a/src/assets/images/noForce.png
+++ b/src/assets/images/noForce.png
--- a/src/assets/images/noImg.png
+++ b/src/assets/images/noImg.png
--- a/src/assets/images/route.png
+++ b/src/assets/images/route.png
--- a/src/assets/images/turnplate-pointer-hui.png
+++ b/src/assets/images/turnplate-pointer-hui.png
--- a/src/assets/images/turnplate-pointer.png
+++ b/src/assets/images/turnplate-pointer.png
--- a/src/assets/images/upload.jpg
+++ b/src/assets/images/upload.jpg
--- a/src/assets/images/upload.png
+++ b/src/assets/images/upload.png
--- a/src/assets/images/upload2.png
+++ b/src/assets/images/upload2.png
--- a/src/assets/images/weather.png
+++ b/src/assets/images/weather.png
--- a/src/assets/images/zhuan.gif
+++ b/src/assets/images/zhuan.gif
--- a/src/assets/images/举高喷射消防车.png
+++ b/src/assets/images/举高喷射消防车.png
--- a/src/assets/images/压缩空气泡沫消防车.png
+++ b/src/assets/images/压缩空气泡沫消防车.png
--- a/src/assets/images/固定水泡.png
+++ b/src/assets/images/固定水泡.png
--- a/src/assets/images/地上消火栓.png
+++ b/src/assets/images/地上消火栓.png
--- a/src/assets/images/标签正常.png
+++ b/src/assets/images/标签正常.png
--- a/src/assets/images/水罐消防车.png
+++ b/src/assets/images/水罐消防车.png
--- a/src/assets/images/泡沫栓.png
+++ b/src/assets/images/泡沫栓.png
--- a/src/assets/images/泡沫消防车.png
+++ b/src/assets/images/泡沫消防车.png
--- a/src/assets/images/进攻方向.png
+++ b/src/assets/images/进攻方向.png
--- a/src/assets/js/zhuanpan.js
+++ b/src/assets/js/zhuanpan.js