From 4d7f03dc4e5d002b49795f34eeebba8ffe3bfda3 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 25 Jan 2022 09:49:18 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistic-analysis/home/home.component.ts |   1 -
 src/app/tabbar/tabbar.component.html          |  14 +-
 src/app/tabbar/tabbar.component.ts            | 248 +++++++++---------
 3 files changed, 141 insertions(+), 122 deletions(-)

diff --git a/src/app/statistic-analysis/home/home.component.ts b/src/app/statistic-analysis/home/home.component.ts
index 481214c..235927e 100644
--- a/src/app/statistic-analysis/home/home.component.ts
+++ b/src/app/statistic-analysis/home/home.component.ts
@@ -52,7 +52,6 @@ export class HomeComponent implements OnInit {
       this.planState.resize()
       this.chartDwsjcj.resize()
       this.chartZdgzqy.resize()
-  
     } */
     //获取数据
     ordata
diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html
index fba1820..f43ba6a 100644
--- a/src/app/tabbar/tabbar.component.html
+++ b/src/app/tabbar/tabbar.component.html
@@ -212,7 +212,7 @@
             </div>
         </div>
     </div>
-    
+
     <div class="isUpdates" *ngIf="isUpdates">
         <!-- <span class="name" (click)="submitAudit()"
             *ngIf="!contentVerify || contentVerify.verifyState == 5 || contentVerify.verifyState == 4">提交审核</span>
@@ -243,6 +243,18 @@
             <mat-icon>save_alt</mat-icon>
             <span>下载帮助文档</span>
         </button>
+        <button mat-menu-item (click)="aFile('../../assets/helpword/plantemplate.zip','Ⅴ级卡片式预案模板')">
+            <mat-icon>save_alt</mat-icon>
+            <span>V级卡片式预案模板</span>
+        </button>
+        <button mat-menu-item (click)="aFile('../../assets/helpword/plancustom.zip','V级预案自定义')">
+            <mat-icon>save_alt</mat-icon>
+            <span>V级预案自定义</span>
+        </button>
+        <button mat-menu-item (click)="aFile('../../assets/helpword/planwebmake.zip','V级在线编制以及转在线导入')">
+            <mat-icon>save_alt</mat-icon>
+            <span>V级在线编制以及转在线导入</span>
+        </button>
     </mat-menu>
     <!-- 全屏  -->
     <button mat-button (click)="!isfullscreen?fullscreenToggle():closefullscreen()" class="fullscreen">
diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts
index 48f4d6d..ad4e06e 100644
--- a/src/app/tabbar/tabbar.component.ts
+++ b/src/app/tabbar/tabbar.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit,Output,EventEmitter } from '@angular/core';
+import { Component, OnInit, Output, EventEmitter } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
-import { Router,ActivatedRoute,NavigationEnd  } from '@angular/router'
-import {CacheTokenService} from '../http-interceptors/cache-token.service'//引入服务
+import { Router, ActivatedRoute, NavigationEnd } from '@angular/router'
+import { CacheTokenService } from '../http-interceptors/cache-token.service'//引入服务
 import { MatDialog } from '@angular/material/dialog';
-import {ChangepasswordComponent} from '../ui/changepassword/changepassword.component'
+import { ChangepasswordComponent } from '../ui/changepassword/changepassword.component'
 import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 import { filter } from 'rxjs/operators';
 import { TabbarAndScoreService } from '../http-interceptors/tabbar-and-score.service';
@@ -23,133 +23,140 @@ export class TabbarComponent implements OnInit {
   defaulttheme = new EventEmitter<boolean>();
   @Output()
   redtheme = new EventEmitter<boolean>();
-  
-  onChange(eventValue: boolean){
+
+  onChange(eventValue: boolean) {
     this.toggleDarkTheme.emit(eventValue);
   }
 
-  constructor(private tabbarService: TabbarAndScoreService,private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
+  constructor(private tabbarService: TabbarAndScoreService, private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, public dialog: MatDialog, public snackBar: MatSnackBar) { }
 
   grade = null //单位完整度得分
-  title:any = "数字化预案编制管理平台"
-  planName:any = null
+  title: any = "数字化预案编制管理平台"
+  planName: any = null
   routerEventsListener //监测路由变化
 
 
-  integrityData:any
-  companyIntegrityScore:any//是否显示单位分数
-  isUpdates:any //是否显示单位提交审核 撤销审核等按钮
-  contentVerify:any//当前单位的审核状态信息
-  ngOnInit() {  
-    
+  integrityData: any
+  companyIntegrityScore: any//是否显示单位分数
+  isUpdates: any //是否显示单位提交审核 撤销审核等按钮
+  contentVerify: any//当前单位的审核状态信息
+  ngOnInit() {
+
     this.routerEventsListener = this.router.events.pipe(
       filter(event => event instanceof NavigationEnd)
     ).subscribe((e) => {
-        this.title = "数字化预案编制管理平台"
-        this.planName = null
-        this.grade = null
-        this.isUpdates = null
-        if(this.router.url.indexOf("editunitinfo") == -1 || this.router.url.indexOf("viewunitinfoplan") == -1){//如果url地址是从录入预案跳转
-          this.companyIntegrityScore = ''
-        }
+      this.title = "数字化预案编制管理平台"
+      this.planName = null
+      this.grade = null
+      this.isUpdates = null
+      if (this.router.url.indexOf("editunitinfo") == -1 || this.router.url.indexOf("viewunitinfoplan") == -1) {//如果url地址是从录入预案跳转
+        this.companyIntegrityScore = ''
+      }
     })
 
-    if(this.router.url.indexOf("editunitinfo") != -1 || this.router.url.indexOf("viewunitinfoplan") != -1){//如果url地址是从录入预案跳转
+    if (this.router.url.indexOf("editunitinfo") != -1 || this.router.url.indexOf("viewunitinfoplan") != -1) {//如果url地址是从录入预案跳转
       this.title = sessionStorage.getItem("companyName")
       this.planName = sessionStorage.getItem("planName")
     }
-    if(this.router.url.indexOf("editplaninfo") != -1 || (this.router.url.indexOf("viewunitinfo") != -1 && this.router.url.indexOf("viewunitinfoplan") == -1)){//如果url地址是从重点单位跳转
+    if (this.router.url.indexOf("editplaninfo") != -1 || (this.router.url.indexOf("viewunitinfo") != -1 && this.router.url.indexOf("viewunitinfoplan") == -1)) {//如果url地址是从重点单位跳转
       this.title = sessionStorage.getItem("companyName")
       this.getIntegrityScore()
       //从维护更新页面进入需要显示提交审核按钮
-      if(this.route.snapshot.queryParams["isUpdates"] == '1'){
+      if (this.route.snapshot.queryParams["isUpdates"] == '1') {
         this.contentVerify = JSON.parse(sessionStorage.getItem('contentVerify'))
         // console.log(6666,JSON.parse(sessionStorage.getItem('contentVerify')))
         this.isUpdates = true
       }
-      this.tabbarService.getMessage().subscribe((message: any)=>{
+      this.tabbarService.getMessage().subscribe((message: any) => {
         this.getIntegrityScore()
       });
     }
     this.getUserInfo()
-    
+
   }
   //根据usci获取当前单位的分数信息
-  getIntegrityScore(){
+  getIntegrityScore() {
     let unitId = sessionStorage.getItem('companyId')
-    this.http.get(`/api/Companies/${unitId}`).subscribe((data:any) => {
-      this.companyIntegrityScore = data.companyIntegrityScore 
+    this.http.get(`/api/Companies/${unitId}`).subscribe((data: any) => {
+      this.companyIntegrityScore = data.companyIntegrityScore
     })
   }
-  isSpinner:boolean = false//下载帮助文档进度
+  isSpinner: boolean = false//下载帮助文档进度
   //下载帮助文档
-  downloadHelpFile () {
+  downloadHelpFile() {
     this.getFileMSG()
   }
-  helpFile:any = 'api/ObjectMetadata/help/数字化预案编制管理平台手册.pdf'; //下载文件的url地址
-  download:any; //下载的文件
+  helpFile: any = 'api/ObjectMetadata/help/数字化预案编制管理平台手册.pdf'; //下载文件的url地址
+  download: any; //下载的文件
 
   //获取下载文件信息
-  getFileMSG () {
+  getFileMSG() {
     this.isSpinner = true
-    this.http.get(`${this.helpFile}`).subscribe(data=>{
+    this.http.get(`${this.helpFile}`).subscribe(data => {
       this.download = data
       this.downloadFile()
-    },err=>{
+    }, err => {
       let config = new MatSnackBarConfig();
       config.verticalPosition = 'bottom';
       config.duration = 3000
-      this.snackBar.open('下载失败','确定',config);
+      this.snackBar.open('下载失败', '确定', config);
     })
   }
+  aFile(url, name) {
+    console.log('下载帮助文件')
+    let a = document.createElement("a");
+    a.href = url;
+    a.download = name;
+    a.click();
+  }
   //提交单位审核
-  submitAudit(){
+  submitAudit() {
     let isTrue = confirm('您确定要审核该条信息吗')
-    if(isTrue){
-      let body:any = {
-        title : sessionStorage.getItem('companyName'),
-        Operation : sessionStorage.getItem('contentVerify') ? 1 : 0,
-        itemId : sessionStorage.getItem('companyId'),
-        verifyState : 3,
-        contentType : 11
+    if (isTrue) {
+      let body: any = {
+        title: sessionStorage.getItem('companyName'),
+        Operation: sessionStorage.getItem('contentVerify') ? 1 : 0,
+        itemId: sessionStorage.getItem('companyId'),
+        verifyState: 3,
+        contentType: 11
       }
-      this.http.post(`/api/ContentVerifies`,body).subscribe(data=>{
+      this.http.post(`/api/ContentVerifies`, body).subscribe(data => {
         this.contentVerify = data
-        sessionStorage.setItem('contentVerify',JSON.stringify(data))
-        },err=>{
-          const config = new MatSnackBarConfig();
-          config.verticalPosition = 'top';
-          config.duration = 3000
-          this.snackBar.open(err,'确定',config);
+        sessionStorage.setItem('contentVerify', JSON.stringify(data))
+      }, err => {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open(err, '确定', config);
       })
     }
-    
+
   }
   //撤销单位审核
-  cancelAudit(){
+  cancelAudit() {
     let isTrue = confirm('您确定要撤销审核该条信息吗')
-    if(isTrue){
-      this.http.delete(`/api/ContentVerifies/${this.contentVerify.id}`).subscribe(data=>{
+    if (isTrue) {
+      this.http.delete(`/api/ContentVerifies/${this.contentVerify.id}`).subscribe(data => {
         this.contentVerify = data
-        sessionStorage.setItem('contentVerify',JSON.stringify(data))
+        sessionStorage.setItem('contentVerify', JSON.stringify(data))
       },
-      err=>{
-        const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
-        config.duration = 3000
-        this.snackBar.open(err,'确定',config);
-      })
+        err => {
+          const config = new MatSnackBarConfig();
+          config.verticalPosition = 'top';
+          config.duration = 3000
+          this.snackBar.open(err, '确定', config);
+        })
     }
-    
+
   }
   //初始化下载
-  downloadFile () {
+  downloadFile() {
     let file = this.download
     let fileSize = file.fileLength//下载文件的总大小
     let shardSize = 10 * 1024 * 1024 //文件大小是否大于10MB
 
-    if (file && fileSize<=shardSize) { //<=10MB时直接下载
-      this.http.get(`/api/Objects/help/${file.objectName}`,{responseType: 'blob'},).subscribe(data=>{
+    if (file && fileSize <= shardSize) { //<=10MB时直接下载
+      this.http.get(`/api/Objects/help/${file.objectName}`, { responseType: 'blob' },).subscribe(data => {
         let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL创建一个下载Blob的url地址
         let link = document.createElement("a");
         link.style.display = "none";
@@ -158,33 +165,34 @@ export class TabbarComponent implements OnInit {
         document.body.appendChild(link);
         link.click();
         this.isSpinner = false
-      },err=>{
+      }, err => {
         let config = new MatSnackBarConfig();
         config.verticalPosition = 'bottom';
         config.duration = 3000
-        this.snackBar.open('下载失败','确定',config);
+        this.snackBar.open('下载失败', '确定', config);
       })
-    } else if (file && fileSize>shardSize) { //>10MB时分块下载
+    } else if (file && fileSize > shardSize) { //>10MB时分块下载
       this.blockingDownload() //分段下载
     }
 
   }
 
   //分段下载并合并
-  async blockingDownload () {
+  async blockingDownload() {
     let file = this.download
     let fileSize = file.fileLength //下载文件的总大小
     let shardSize = 3 * 1024 * 1024 //3MB一个分片
     let allSlice = Math.ceil(fileSize / shardSize) //总文件/3MB===共分多少段
-    let allFile:any = [] //所有的file分段
+    let allFile: any = [] //所有的file分段
 
-    for (let i=0;i<allSlice;i++) {
+    for (let i = 0; i < allSlice; i++) {
       let start = i * shardSize //每次下载文件开始位置
-      let end = Math.min(fileSize, start + shardSize-1); //每次下载文件结束为止
+      let end = Math.min(fileSize, start + shardSize - 1); //每次下载文件结束为止
 
-      let result =  await new Promise ((result,reject)=>{
-        this.http.get(`/api/Objects/help/${file.objectName}`,{headers:{'range':`bytes= ${start}-${end}`},responseType:'blob'}).subscribe(data=>{
-          result(data) }) 
+      let result = await new Promise((result, reject) => {
+        this.http.get(`/api/Objects/help/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => {
+          result(data)
+        })
       })
       allFile.push(result)
 
@@ -202,44 +210,44 @@ export class TabbarComponent implements OnInit {
     } //for循环
 
   }
-  
 
-  ngOnDestroy(){
+
+  ngOnDestroy() {
     this.routerEventsListener.unsubscribe()
   }
 
 
-  integrityDetails(width,zong){
-    let style:any = {}
-    style.width = (width/zong)*100 +'%';
+  integrityDetails(width, zong) {
+    let style: any = {}
+    style.width = (width / zong) * 100 + '%';
     return style
   }
   //计分规则
-  scoringRuleImg:boolean = false
-  scoringRule(){
+  scoringRuleImg: boolean = false
+  scoringRule() {
     this.scoringRuleImg = !this.scoringRuleImg
   }
-  closebtn(){
+  closebtn() {
     this.scoringRuleImg = false
   }
-  boxed(css){
+  boxed(css) {
     const Element = document.body;
     Element.style.width = '1200px'
   }
 
-  standard(){
+  standard() {
     const Element = document.body;
     Element.style.width = '100%'
   }
 
-  isfullscreen:boolean = false;
-  fullscreenToggle(){
+  isfullscreen: boolean = false;
+  fullscreenToggle() {
     const docElmWithBrowsersFullScreenFunctions = document.documentElement as HTMLElement & {
       mozRequestFullScreen(): Promise<void>;
       webkitRequestFullscreen(): Promise<void>;
       msRequestFullscreen(): Promise<void>;
     };
-  
+
     if (docElmWithBrowsersFullScreenFunctions.requestFullscreen) {
       docElmWithBrowsersFullScreenFunctions.requestFullscreen();
     } else if (docElmWithBrowsersFullScreenFunctions.mozRequestFullScreen) { /* Firefox */
@@ -249,32 +257,32 @@ export class TabbarComponent implements OnInit {
     } else if (docElmWithBrowsersFullScreenFunctions.msRequestFullscreen) { /* IE/Edge */
       docElmWithBrowsersFullScreenFunctions.msRequestFullscreen();
     }
-    
-  this.isfullscreen = true;
-  
-  }
-  closefullscreen(){
-  const docWithBrowsersExitFunctions = document as Document & {
-    mozCancelFullScreen(): Promise<void>;
-    webkitExitFullscreen(): Promise<void>;
-    msExitFullscreen(): Promise<void>;
-  };
-  if (docWithBrowsersExitFunctions.exitFullscreen) {
-    docWithBrowsersExitFunctions.exitFullscreen();
-  } else if (docWithBrowsersExitFunctions.mozCancelFullScreen) { /* Firefox */
-    docWithBrowsersExitFunctions.mozCancelFullScreen();
-  } else if (docWithBrowsersExitFunctions.webkitExitFullscreen) { /* Chrome, Safari and Opera */
-    docWithBrowsersExitFunctions.webkitExitFullscreen();
-  } else if (docWithBrowsersExitFunctions.msExitFullscreen) { /* IE/Edge */
-    docWithBrowsersExitFunctions.msExitFullscreen();
+
+    this.isfullscreen = true;
+
   }
-  this.isfullscreen = false;
+  closefullscreen() {
+    const docWithBrowsersExitFunctions = document as Document & {
+      mozCancelFullScreen(): Promise<void>;
+      webkitExitFullscreen(): Promise<void>;
+      msExitFullscreen(): Promise<void>;
+    };
+    if (docWithBrowsersExitFunctions.exitFullscreen) {
+      docWithBrowsersExitFunctions.exitFullscreen();
+    } else if (docWithBrowsersExitFunctions.mozCancelFullScreen) { /* Firefox */
+      docWithBrowsersExitFunctions.mozCancelFullScreen();
+    } else if (docWithBrowsersExitFunctions.webkitExitFullscreen) { /* Chrome, Safari and Opera */
+      docWithBrowsersExitFunctions.webkitExitFullscreen();
+    } else if (docWithBrowsersExitFunctions.msExitFullscreen) { /* IE/Edge */
+      docWithBrowsersExitFunctions.msExitFullscreen();
+    }
+    this.isfullscreen = false;
   }
 
-  realName:any; //登录用户信息
+  realName: any; //登录用户信息
   //获取用户信息
-  getUserInfo () {
-    this.http.get("/api/Account/Profiles").subscribe((data:any)=>{
+  getUserInfo() {
+    this.http.get("/api/Account/Profiles").subscribe((data: any) => {
       this.realName = data.realName
     })
   }
@@ -282,9 +290,9 @@ export class TabbarComponent implements OnInit {
   //退出系统
   signOut = () => {
     let out = confirm("您确定要退出吗")
-    if(out) {
-      this.http.post('/api/Account/SignOut',{}).subscribe(
-        data=> {
+    if (out) {
+      this.http.post('/api/Account/SignOut', {}).subscribe(
+        data => {
           this.token.delete()
           sessionStorage.clear()
           window.localStorage.clear()
@@ -292,7 +300,7 @@ export class TabbarComponent implements OnInit {
           const config = new MatSnackBarConfig();
           config.verticalPosition = 'bottom';
           config.duration = 3000
-          this.snackBar.open('成功退出','确定',config);
+          this.snackBar.open('成功退出', '确定', config);
         }
       )
     }
@@ -300,10 +308,10 @@ export class TabbarComponent implements OnInit {
 
   //修改密码
   changpsw() {
-    let dialogRef = this.dialog.open(ChangepasswordComponent, 
-      {width:'348px'});
+    let dialogRef = this.dialog.open(ChangepasswordComponent,
+      { width: '348px' });
 
-    dialogRef.afterClosed().subscribe();   
+    dialogRef.afterClosed().subscribe();
   }
 
 }

From 90f08edce06b5ff1990c016813e21396f87c8ea7 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 25 Jan 2022 11:36:20 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/tabbar/tabbar.component.html | 6 +++---
 src/index.html                       | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html
index f43ba6a..3ccd634 100644
--- a/src/app/tabbar/tabbar.component.html
+++ b/src/app/tabbar/tabbar.component.html
@@ -243,15 +243,15 @@
             <mat-icon>save_alt</mat-icon>
             <span>下载帮助文档</span>
         </button>
-        <button mat-menu-item (click)="aFile('../../assets/helpword/plantemplate.zip','Ⅴ级卡片式预案模板')">
+        <button mat-menu-item (click)="aFile('/assets/helpword/plantemplate.zip','V级卡片式预案模板.zip')">
             <mat-icon>save_alt</mat-icon>
             <span>V级卡片式预案模板</span>
         </button>
-        <button mat-menu-item (click)="aFile('../../assets/helpword/plancustom.zip','V级预案自定义')">
+        <button mat-menu-item (click)="aFile('/assets/helpword/plancustom.zip','V级预案自定义.zip')">
             <mat-icon>save_alt</mat-icon>
             <span>V级预案自定义</span>
         </button>
-        <button mat-menu-item (click)="aFile('../../assets/helpword/planwebmake.zip','V级在线编制以及转在线导入')">
+        <button mat-menu-item (click)="aFile('/assets/helpword/planwebmake.zip','V级在线编制以及转在线导入.zip')">
             <mat-icon>save_alt</mat-icon>
             <span>V级在线编制以及转在线导入</span>
         </button>
diff --git a/src/index.html b/src/index.html
index 2ccf502..7aab4f9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -23,10 +23,10 @@
 </body>
 
 <!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
-<!-- <script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
-<script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="https://webapi.amap.com/ui/1.1/main.js"></script>
+<script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
+<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
+<!-- <script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
+<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->
 <script src="/assets/html2canvas.js"></script>
 <script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
 <script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>

From df3ef54573aac05edd435468694e94056ac2af08 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 25 Jan 2022 14:25:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E5=BC=B9=E5=87=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/login/login.component.spec.ts | 25 ------------
 src/app/pages/login/login.component.ts      | 44 ++++++++++++++++++---
 src/app/pages/login/lookUpdateData.html     | 12 ++++++
 src/app/pages/login/lookUpdateData.scss     |  0
 src/app/pages/pages.module.ts               |  6 +--
 src/app/tabbar/tabbar.component.html        | 18 ++++++---
 src/app/tabbar/tabbar.component.spec.ts     | 25 ------------
 src/app/tabbar/tabbar.component.ts          | 15 +++++--
 src/index.html                              |  8 ++--
 9 files changed, 82 insertions(+), 71 deletions(-)
 delete mode 100644 src/app/pages/login/login.component.spec.ts
 create mode 100644 src/app/pages/login/lookUpdateData.html
 create mode 100644 src/app/pages/login/lookUpdateData.scss
 delete mode 100644 src/app/tabbar/tabbar.component.spec.ts

diff --git a/src/app/pages/login/login.component.spec.ts b/src/app/pages/login/login.component.spec.ts
deleted file mode 100644
index d6d85a8..0000000
--- a/src/app/pages/login/login.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { LoginComponent } from './login.component';
-
-describe('LoginComponent', () => {
-  let component: LoginComponent;
-  let fixture: ComponentFixture<LoginComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ LoginComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(LoginComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index 19ae75f..050fdc0 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -47,11 +47,6 @@ export class LoginComponent implements OnInit {
                     this.router.navigate([`/keyUnit`])
                     this.dialogChangePassword()
                     return
-                    data.forEach(item => {
-                        if (item.url) {
-
-                        }
-                    });
                 } else {
                     this.snackBar.open('该用户角色未分配任何菜单', '确定', {
                         duration: 3000
@@ -79,9 +74,26 @@ export class LoginComponent implements OnInit {
 
             dialogRef.afterClosed().subscribe((data) => {
                 sessionStorage.setItem('isDefaultPassword', 'false')
+                this.lookUpdateData()
             });
+        } else {
+            this.lookUpdateData()
         }
     }
+
+    //查看更新内容
+    lookUpdateData() {
+        let dialogRef = this.dialog.open(lookUpdateDataComponent,
+            { width: '668px' });
+
+        dialogRef.afterClosed().subscribe((data) => {
+
+        });
+    }
+
+
+
+
     //7天免登录自动登录
     automaticLogin() {
         let isNoLogin = localStorage.getItem("isnologin")
@@ -148,4 +160,26 @@ export class ChangepasswordComponent2 implements OnInit {
 
 
 
+}
+
+
+@Component({
+    selector: 'app-lookUpdateData',
+    templateUrl: './lookUpdateData.html',
+    styleUrls: ['./lookUpdateData.scss']
+})
+
+export class lookUpdateDataComponent implements OnInit {
+
+    constructor(private http: HttpClient, public snackBar: MatSnackBar,
+        public dialogRef: MatDialogRef<lookUpdateDataComponent>) { }
+
+    ngOnInit() {
+    }
+    onSubmit(e) {
+
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/src/app/pages/login/lookUpdateData.html b/src/app/pages/login/lookUpdateData.html
new file mode 100644
index 0000000..4b4e9bd
--- /dev/null
+++ b/src/app/pages/login/lookUpdateData.html
@@ -0,0 +1,12 @@
+<span>更新公告</span><br>
+<span>更新内容如下：</span><br>
+<span>1.增加V级文本预案模板导入功能；</span><br>
+<span>2.已上传至预案编制管理平台的Ⅴ级文本预案，增加【转在线导入】功能；</span><br>
+<span>3.增加V级文本预案自定义在线编制功能；</span><br>
+<span>为了预案导入功能正常使用，且提高文本预案识别导入的成功率，需要注意以下几点：</span><br>
+<span>1.【转在线导入】功能，仅支持以Ⅴ级文本预案模板做预案的文档，其他文档不支持【转在线导入】功能。</span><br>
+<span>2.Ⅴ级文本预案模板可以随意修改内容，但整体框架不得做任何修改，不允许随意删除、合并、增加单元格，否则影响预案识别导入的内容。</span><br>
+<span>3.文档导入成功后，可在线编辑，也可以自行添加新的功能模块。</span><br>
+<span>4.V级预案模板导入时仅支持微软Office保存并且格式为.docx的文档，其余格式无法导入。</span><br>
+<span>5.V级预案模板文档以及V级预案使用说明、视频可点击右上角帮助进行下载、查看。其中Ⅴ级文本预案模板文件夹内放置九大类型预案模板、V级预案转在线导入文件夹内包含使用说明及视频、V级预案自定义文件夹内包含使用说明及视频、V级在线编制文件夹内包含使用说明及视频。</span><br>
+
diff --git a/src/app/pages/login/lookUpdateData.scss b/src/app/pages/login/lookUpdateData.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index aca91df..29842dd 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -1,11 +1,9 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { PagesComponent } from './pages.component';
-import { ChangepasswordComponent2, LoginComponent } from './login/login.component';
+import { ChangepasswordComponent2, LoginComponent, lookUpdateDataComponent } from './login/login.component';
 import { RegisterComponent } from './register/register.component';
 import { PagesRoutingModule } from './pages-routing.module'
-
-
 import {A11yModule} from '@angular/cdk/a11y';
 import {DragDropModule} from '@angular/cdk/drag-drop';
 import {PortalModule} from '@angular/cdk/portal';
@@ -54,7 +52,7 @@ import { HomeComponent } from './home/home.component';
 import { HomedetailComponent } from './homedetail/homedetail.component';
 import { UiModule } from '../ui/ui.module';
 @NgModule({
-  declarations: [PagesComponent, LoginComponent, RegisterComponent, LockscreenComponent, HomeComponent, HomedetailComponent,ChangepasswordComponent2],
+  declarations: [PagesComponent, LoginComponent, RegisterComponent, LockscreenComponent, HomeComponent, HomedetailComponent,ChangepasswordComponent2,lookUpdateDataComponent],
   imports: [
 
     PagesRoutingModule,
diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html
index 3ccd634..a17eb55 100644
--- a/src/app/tabbar/tabbar.component.html
+++ b/src/app/tabbar/tabbar.component.html
@@ -239,21 +239,29 @@
         <mat-icon>help</mat-icon>
     </button>
     <mat-menu #appSetHelp="matMenu" yPosition="below" xPosition="after">
-        <button mat-menu-item (click)='downloadHelpFile()'>
+        <button mat-menu-item (click)='lookUpdate()'>
+            <mat-icon>update</mat-icon>
+            <span>查看更新内容</span>
+        </button>
+        <button mat-menu-item (click)="aFile('/assets/helpword/help.pdf','数字化预案编制管理平台手册.pdf')">
             <mat-icon>save_alt</mat-icon>
             <span>下载帮助文档</span>
         </button>
-        <button mat-menu-item (click)="aFile('/assets/helpword/plantemplate.zip','V级卡片式预案模板.zip')">
+        <button mat-menu-item (click)="aFile('/assets/helpword/plantemplate.zip','V级文本预案模板.zip')">
             <mat-icon>save_alt</mat-icon>
-            <span>V级卡片式预案模板</span>
+            <span>V级文本预案模板</span>
         </button>
         <button mat-menu-item (click)="aFile('/assets/helpword/plancustom.zip','V级预案自定义.zip')">
             <mat-icon>save_alt</mat-icon>
             <span>V级预案自定义</span>
         </button>
-        <button mat-menu-item (click)="aFile('/assets/helpword/planwebmake.zip','V级在线编制以及转在线导入.zip')">
+        <button mat-menu-item (click)="aFile('/assets/helpword/planonlineedit.zip','V级在线编制.zip')">
+            <mat-icon>save_alt</mat-icon>
+            <span>V级在线编制</span>
+        </button>
+        <button mat-menu-item (click)="aFile('/assets/helpword/planonlineimport.zip','V级预案转在线导入.zip')">
             <mat-icon>save_alt</mat-icon>
-            <span>V级在线编制以及转在线导入</span>
+            <span>V级预案转在线导入</span>
         </button>
     </mat-menu>
     <!-- 全屏  -->
diff --git a/src/app/tabbar/tabbar.component.spec.ts b/src/app/tabbar/tabbar.component.spec.ts
deleted file mode 100644
index 6bcc230..0000000
--- a/src/app/tabbar/tabbar.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TabbarComponent } from './tabbar.component';
-
-describe('TabbarComponent', () => {
-  let component: TabbarComponent;
-  let fixture: ComponentFixture<TabbarComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ TabbarComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TabbarComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts
index ad4e06e..78b70a6 100644
--- a/src/app/tabbar/tabbar.component.ts
+++ b/src/app/tabbar/tabbar.component.ts
@@ -1,13 +1,13 @@
-import { Component, OnInit, Output, EventEmitter } from '@angular/core';
+import { Component, OnInit, Output, EventEmitter, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
 import { Router, ActivatedRoute, NavigationEnd } from '@angular/router'
 import { CacheTokenService } from '../http-interceptors/cache-token.service'//引入服务
-import { MatDialog } from '@angular/material/dialog';
 import { ChangepasswordComponent } from '../ui/changepassword/changepassword.component'
 import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 import { filter } from 'rxjs/operators';
 import { TabbarAndScoreService } from '../http-interceptors/tabbar-and-score.service';
-
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { lookUpdateDataComponent } from '../pages/login/login.component';
 @Component({
   selector: 'app-tabbar',
   templateUrl: './tabbar.component.html',
@@ -109,6 +109,14 @@ export class TabbarComponent implements OnInit {
     a.download = name;
     a.click();
   }
+  lookUpdate() {
+    let dialogRef = this.dialog.open(lookUpdateDataComponent,
+      { width: '668px' });
+
+    dialogRef.afterClosed().subscribe((data) => {
+
+    });
+  }
   //提交单位审核
   submitAudit() {
     let isTrue = confirm('您确定要审核该条信息吗')
@@ -315,3 +323,4 @@ export class TabbarComponent implements OnInit {
   }
 
 }
+
diff --git a/src/index.html b/src/index.html
index 7aab4f9..2ccf502 100644
--- a/src/index.html
+++ b/src/index.html
@@ -23,10 +23,10 @@
 </body>
 
 <!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
-<script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
-<!-- <script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->
+<!-- <script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
+<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
+<script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
+<script src="https://webapi.amap.com/ui/1.1/main.js"></script>
 <script src="/assets/html2canvas.js"></script>
 <script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
 <script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>

From 7f9646db34dda1cfb221f93a37d0cfc7528d5125 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 26 Jan 2022 09:06:58 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/login/lookUpdateData.html | 23 +++----
 src/app/tabbar/tabbar.component.html    | 18 +-----
 src/app/tabbar/tabbar.component.ts      | 84 -------------------------
 src/index.html                          |  8 +--
 4 files changed, 18 insertions(+), 115 deletions(-)

diff --git a/src/app/pages/login/lookUpdateData.html b/src/app/pages/login/lookUpdateData.html
index 4b4e9bd..d841691 100644
--- a/src/app/pages/login/lookUpdateData.html
+++ b/src/app/pages/login/lookUpdateData.html
@@ -1,12 +1,13 @@
-<span>更新公告</span><br>
-<span>更新内容如下：</span><br>
-<span>1.增加V级文本预案模板导入功能；</span><br>
-<span>2.已上传至预案编制管理平台的Ⅴ级文本预案，增加【转在线导入】功能；</span><br>
-<span>3.增加V级文本预案自定义在线编制功能；</span><br>
-<span>为了预案导入功能正常使用，且提高文本预案识别导入的成功率，需要注意以下几点：</span><br>
-<span>1.【转在线导入】功能，仅支持以Ⅴ级文本预案模板做预案的文档，其他文档不支持【转在线导入】功能。</span><br>
-<span>2.Ⅴ级文本预案模板可以随意修改内容，但整体框架不得做任何修改，不允许随意删除、合并、增加单元格，否则影响预案识别导入的内容。</span><br>
-<span>3.文档导入成功后，可在线编辑，也可以自行添加新的功能模块。</span><br>
-<span>4.V级预案模板导入时仅支持微软Office保存并且格式为.docx的文档，其余格式无法导入。</span><br>
-<span>5.V级预案模板文档以及V级预案使用说明、视频可点击右上角帮助进行下载、查看。其中Ⅴ级文本预案模板文件夹内放置九大类型预案模板、V级预案转在线导入文件夹内包含使用说明及视频、V级预案自定义文件夹内包含使用说明及视频、V级在线编制文件夹内包含使用说明及视频。</span><br>
+
+<p style="text-align: center;">更新公告</p>
+<p>更新内容如下：</p>
+<p>1.增加V级文本预案模板导入功能；</p>
+<p>2.已上传至预案编制管理平台的Ⅴ级文本预案，增加【转在线导入】功能；</p>
+<p>3.增加V级文本预案自定义在线编制功能；</p>
+<p>为了预案导入功能正常使用，且提高文本预案识别导入的成功率，需要注意以下几点：</p>
+<p>1.【转在线导入】功能，仅支持以Ⅴ级文本预案模板做预案的文档，其他文档不支持【转在线导入】功能。</p>
+<p>2.Ⅴ级文本预案模板可以随意修改内容，但整体框架不得做任何修改，不允许随意删除、合并、增加单元格，否则影响预案识别导入的内容。</p>
+<p>3.文档导入成功后，可在线编辑，也可以自行添加新的功能模块。</p>
+<p>4.V级预案模板导入时仅支持微软Office保存并且格式为.docx的文档，其余格式无法导入。</p>
+<p>5.V级预案模板文档以及V级预案使用说明、视频可点击右上角帮助进行下载、查看。其中Ⅴ级文本预案模板文件夹内放置九大类型预案模板、V级预案转在线导入文件夹内包含使用说明及视频、V级预案自定义文件夹内包含使用说明及视频、V级在线编制文件夹内包含使用说明及视频。</p>
 
diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html
index a17eb55..cdbb933 100644
--- a/src/app/tabbar/tabbar.component.html
+++ b/src/app/tabbar/tabbar.component.html
@@ -214,15 +214,6 @@
     </div>
 
     <div class="isUpdates" *ngIf="isUpdates">
-        <!-- <span class="name" (click)="submitAudit()"
-            *ngIf="!contentVerify || contentVerify.verifyState == 5 || contentVerify.verifyState == 4">提交审核</span>
-        <span class="name" (click)="cancelAudit()" *ngIf="contentVerify && contentVerify.verifyState == 3">撤销审核</span> -->
-
-        <!-- <span class="span" *ngIf="contentVerify && contentVerify.verifyState == 3">(
-            <span *ngIf="contentVerify.operation == 2" style="color: red;">删除</span>
-            <span *ngIf="contentVerify.operation == 0">新增</span>
-            <span *ngIf="contentVerify.operation == 1">更新</span>
-            待审核)</span> -->
         <span [matTooltip]="contentVerify.remark" class="span"
             *ngIf="contentVerify && contentVerify.verifyState == 4">(审核通过)</span>
         <span [matTooltip]="contentVerify.remark" class="span"
@@ -230,10 +221,10 @@
     </div>
 
 
-    <div class="spinner" *ngIf="isSpinner">
+    <!-- <div class="spinner" *ngIf="isSpinner">
         <mat-spinner [diameter]='26' color="warn"></mat-spinner>
         <span style="font-size: 13px;margin-left: 6px;">帮助文档下载中,请等待...</span>
-    </div>
+    </div> -->
     <!-- 帮助文档按钮 -->
     <button mat-icon-button [matMenuTriggerFor]="appSetHelp" class="help" title="帮助">
         <mat-icon>help</mat-icon>
@@ -277,11 +268,6 @@
     <!-- 黑夜模式开关 -->
     <mat-slide-toggle (change)='onChange($event.checked)' class="darktheme"></mat-slide-toggle>
 
-    <!-- 锁屏按钮 -->
-    <!-- <button mat-button class="lockscreen" [routerLink]="['/lockscreen']" routerLinkActive="router-link-active" >
-      <mat-icon>screen_lock_landscape</mat-icon>
-    </button> -->
-
     <!-- 登录信息按钮 -->
     <button mat-icon-button [matMenuTriggerFor]="appMenu" class="login">
         <mat-icon>account_circle</mat-icon>
diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts
index 78b70a6..ea52644 100644
--- a/src/app/tabbar/tabbar.component.ts
+++ b/src/app/tabbar/tabbar.component.ts
@@ -81,29 +81,8 @@ export class TabbarComponent implements OnInit {
       this.companyIntegrityScore = data.companyIntegrityScore
     })
   }
-  isSpinner: boolean = false//下载帮助文档进度
-  //下载帮助文档
-  downloadHelpFile() {
-    this.getFileMSG()
-  }
-  helpFile: any = 'api/ObjectMetadata/help/数字化预案编制管理平台手册.pdf'; //下载文件的url地址
-  download: any; //下载的文件
 
-  //获取下载文件信息
-  getFileMSG() {
-    this.isSpinner = true
-    this.http.get(`${this.helpFile}`).subscribe(data => {
-      this.download = data
-      this.downloadFile()
-    }, err => {
-      let config = new MatSnackBarConfig();
-      config.verticalPosition = 'bottom';
-      config.duration = 3000
-      this.snackBar.open('下载失败', '确定', config);
-    })
-  }
   aFile(url, name) {
-    console.log('下载帮助文件')
     let a = document.createElement("a");
     a.href = url;
     a.download = name;
@@ -155,71 +134,8 @@ export class TabbarComponent implements OnInit {
           this.snackBar.open(err, '确定', config);
         })
     }
-
-  }
-  //初始化下载
-  downloadFile() {
-    let file = this.download
-    let fileSize = file.fileLength//下载文件的总大小
-    let shardSize = 10 * 1024 * 1024 //文件大小是否大于10MB
-
-    if (file && fileSize <= shardSize) { //<=10MB时直接下载
-      this.http.get(`/api/Objects/help/${file.objectName}`, { responseType: 'blob' },).subscribe(data => {
-        let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL创建一个下载Blob的url地址
-        let link = document.createElement("a");
-        link.style.display = "none";
-        link.href = url;
-        link.setAttribute("download", '数字化预案编制管理平台手册.pdf');
-        document.body.appendChild(link);
-        link.click();
-        this.isSpinner = false
-      }, err => {
-        let config = new MatSnackBarConfig();
-        config.verticalPosition = 'bottom';
-        config.duration = 3000
-        this.snackBar.open('下载失败', '确定', config);
-      })
-    } else if (file && fileSize > shardSize) { //>10MB时分块下载
-      this.blockingDownload() //分段下载
-    }
-
   }
 
-  //分段下载并合并
-  async blockingDownload() {
-    let file = this.download
-    let fileSize = file.fileLength //下载文件的总大小
-    let shardSize = 3 * 1024 * 1024 //3MB一个分片
-    let allSlice = Math.ceil(fileSize / shardSize) //总文件/3MB===共分多少段
-    let allFile: any = [] //所有的file分段
-
-    for (let i = 0; i < allSlice; i++) {
-      let start = i * shardSize //每次下载文件开始位置
-      let end = Math.min(fileSize, start + shardSize - 1); //每次下载文件结束为止
-
-      let result = await new Promise((result, reject) => {
-        this.http.get(`/api/Objects/help/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => {
-          result(data)
-        })
-      })
-      allFile.push(result)
-
-      if (allFile.length === allSlice) { //合并文件输出给浏览器
-        let url = window.URL.createObjectURL(new Blob(allFile)); //createObjectURL创建一个下载Blob的url地址
-        let link = document.createElement("a");
-        link.style.display = "none";
-        link.href = url;
-        link.setAttribute("download", '数字化预案编制管理平台手册.pdf');
-        document.body.appendChild(link);
-        link.click();
-        this.isSpinner = false
-      }
-
-    } //for循环
-
-  }
-
-
   ngOnDestroy() {
     this.routerEventsListener.unsubscribe()
   }
diff --git a/src/index.html b/src/index.html
index 2ccf502..7aab4f9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -23,10 +23,10 @@
 </body>
 
 <!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
-<!-- <script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
-<script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="https://webapi.amap.com/ui/1.1/main.js"></script>
+<script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
+<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
+<!-- <script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
+<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->
 <script src="/assets/html2canvas.js"></script>
 <script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
 <script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>