[新增]新增更新内容弹出框

3 years ago · df3ef54573
9 changed files with 82 additions and 71 deletions
--- a/src/app/pages/login/login.component.spec.ts
+++ b/src/app/pages/login/login.component.spec.ts
@ -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();
-  });
-});
--- 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) {
+
+    }
+
+
+
 }
--- a/src/app/pages/login/lookUpdateData.html
+++ 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>
+
--- a/src/app/pages/login/lookUpdateData.scss
+++ b/src/app/pages/login/lookUpdateData.scss
--- 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,
--- 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>
    <!-- 全屏  -->
--- a/src/app/tabbar/tabbar.component.spec.ts
+++ b/src/app/tabbar/tabbar.component.spec.ts
@ -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();
-  });
-});
--- 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 {
  }

 }
+
--- 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>