[修改]冲突

3 years ago · 2ad2be46e8
3 changed files with 4 additions and 12 deletions
--- 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: 2021-08-23 14:47:08
+ * @LastEditTime: 2021-08-23 14:50:04
 -->
 <html>
 	<meta charset="utf-8"/>
@ -26,12 +26,7 @@
 				
 				
 			</div>
-<<<<<<< HEAD
 			
-=======
-			<div class="chongzhi" style="height: 20%;"><button id="Reset" class="button">重置考评</button></div>
-			<div class="chongzhi" style="height: 20%;"><button id="otherReset" class="button">重置业务</button></div>
->>>>>>> 013e5da7c002990e9063f0e2dec8cf22e702765f
 				
 			
 			<!-- <div class="colum" style="display: none;padding-left: 10%;margin-top: 20%;" id="end">
--- a/src/app/ui/reset/reset.component.ts
+++ b/src/app/ui/reset/reset.component.ts
@ -4,9 +4,10 @@
 * @Author: sueRimn
 * @Date: 2020-10-07 15:38:37
 * @LastEditors: sueRimn
- * @LastEditTime: 2021-08-23 14:47:07
+ * @LastEditTime: 2021-08-23 14:48:30
 */
 import { Component, OnInit } from '@angular/core';
+import * as Cesium from 'cesium';
 import '../../../assets/js/zhuanpan'

@Component({
--- a/src/index.html
+++ b/src/index.html
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2020-09-25 08:48:54
 * @LastEditors: sueRimn
- * @LastEditTime: 2021-08-23 14:47:11
+ * @LastEditTime: 2021-08-23 14:49:31
 -->
 <!doctype html>
 <html lang="zh-CN">
@ -28,9 +28,5 @@
 <script src="/assets/js/zepto.min.js"></script> -->
 <!-- <script src="/assets/js/zhuanpan.js"></script> -->
 <script src="/assets/js/awardRotate.js"></script>
-<<<<<<< HEAD
 <!-- <script src="/assets/js/zhuanpan.js"></script>  -->
-=======
-<!-- <script src="/assets/js/zhuanpan.js"></script> -->
->>>>>>> 013e5da7c002990e9063f0e2dec8cf22e702765f
 </html>