nzdrtrt
/
Luck-Draw
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[修改]冲突

master
chenjingyu 3 years ago
parent
d4c3f437a2
commit
2ad2be46e8
3 changed files with 4 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/app/ui/reset/reset.component.html
  2. 3
      src/app/ui/reset/reset.component.ts
  3. 6
      src/index.html

7
src/app/ui/reset/reset.component.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-25 08:48:50 * @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-08-23 14:47:08 * @LastEditTime: 2021-08-23 14:50:04
--> -->
<html> <html>
<meta charset="utf-8"/> <meta charset="utf-8"/>
@ -26,12 +26,7 @@
</div> </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"> <!-- <div class="colum" style="display: none;padding-left: 10%;margin-top: 20%;" id="end">

3
src/app/ui/reset/reset.component.ts
Unescape View File

@ -4,9 +4,10 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-10-07 15:38:37 * @Date: 2020-10-07 15:38:37
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-08-23 14:47:07 * @LastEditTime: 2021-08-23 14:48:30
*/ */
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import * as Cesium from 'cesium';
import '../../../assets/js/zhuanpan' import '../../../assets/js/zhuanpan'
@Component({ @Component({

6
src/index.html
Unescape View File

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

Write Preview
Loading…
Cancel
Save