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; - - 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) { } + + 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 @@ +更新公告
+更新内容如下：
+1.增加V级文本预案模板导入功能；
+2.已上传至预案编制管理平台的Ⅴ级文本预案，增加【转在线导入】功能；
+3.增加V级文本预案自定义在线编制功能；
+为了预案导入功能正常使用，且提高文本预案识别导入的成功率，需要注意以下几点：
+1.【转在线导入】功能，仅支持以Ⅴ级文本预案模板做预案的文档，其他文档不支持【转在线导入】功能。
+2.Ⅴ级文本预案模板可以随意修改内容，但整体框架不得做任何修改，不允许随意删除、合并、增加单元格，否则影响预案识别导入的内容。
+3.文档导入成功后，可在线编辑，也可以自行添加新的功能模块。
+4.V级预案模板导入时仅支持微软Office保存并且格式为.docx的文档，其余格式无法导入。
+5.V级预案模板文档以及V级预案使用说明、视频可点击右上角帮助进行下载、查看。其中Ⅴ级文本预案模板文件夹内放置九大类型预案模板、V级预案转在线导入文件夹内包含使用说明及视频、V级预案自定义文件夹内包含使用说明及视频、V级在线编制文件夹内包含使用说明及视频。
+ 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 @@ help - + - - + 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; - - 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 @@ - - - + + +