diff --git a/proxy.config.json b/proxy.config.json index fc28c34..b28a11f 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://121.37.20.190:8100/", + "target": "http://121.37.20.190:8000", "secure": false, "changeOrigin": true } diff --git a/src/app/http-interceptors/cache-token.service.ts b/src/app/http-interceptors/cache-token.service.ts index f5acaf9..5e0b65e 100644 --- a/src/app/http-interceptors/cache-token.service.ts +++ b/src/app/http-interceptors/cache-token.service.ts @@ -22,7 +22,6 @@ export class CacheTokenService { refreshToken: refreshToken, }).subscribe((data:any) => { sessionStorage.setItem('realName',data.realName) - sessionStorage.setItem('roleType',data.roleType) sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); }) diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 3b148f1..c489a07 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -34,7 +34,7 @@
-
+
diff --git a/src/app/pages/lockscreen/lockscreen.component.ts b/src/app/pages/lockscreen/lockscreen.component.ts index f83430d..5894d66 100644 --- a/src/app/pages/lockscreen/lockscreen.component.ts +++ b/src/app/pages/lockscreen/lockscreen.component.ts @@ -27,17 +27,14 @@ export class LockscreenComponent implements OnInit { //登录 onSubmit(e){ - let params = { roleType: this.roleType } - this.http.post('/api/Account/SignIn',e,{params}).subscribe((data:any)=>{ - sessionStorage.setItem('username',e.name) - sessionStorage.setItem('expires',data.expires) - sessionStorage.setItem('realName',data.realName) - sessionStorage.setItem('roleType',data.roleType) - sessionStorage.setItem("token",data.token); - sessionStorage.setItem("refreshToken",data.refreshToken); - this.token.startUp(); //登陆成功启动定时器刷新token - this.router.navigate(['/home/createexam']) //登陆成功跳转页面 - },(err) => {this.errmsg = err}) + // let params = { roleType: this.roleType } + // this.http.post('/api/Account/SignIn',e,{params}).subscribe((data:any)=>{ + // sessionStorage.setItem("realName",data.realName); + // sessionStorage.setItem("token",data.token); + // sessionStorage.setItem("refreshToken",data.refreshToken); + // this.token.startUp(); //登陆成功启动定时器刷新token + // this.router.navigate(['/home/createexam']) //登陆成功跳转页面 + // },(err) => {this.errmsg = err}) } //切换登录角色 diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index f059bea..d15cdfd 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -27,12 +27,9 @@ export class LoginComponent implements OnInit { //登录 onSubmit(e){ - let params = { roleType: '0' } - this.http.post('/api/Account/SignIn',e,{params}).subscribe((data:any)=>{ - sessionStorage.setItem('username',e.name) - sessionStorage.setItem('expires',data.expires) - sessionStorage.setItem('realName',data.realName) - sessionStorage.setItem('roleType',data.roleType) + // let params = { roleType: '0' },{params} + this.http.post('/api/Account/SignIn',e).subscribe((data:any)=>{ + sessionStorage.setItem("realName",data.realName); sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); this.token.startUp(); //登陆成功启动定时器刷新token diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html index 354a895..481d5c1 100644 --- a/src/app/tabbar/tabbar.component.html +++ b/src/app/tabbar/tabbar.component.html @@ -6,7 +6,7 @@ * @LastEditors: sueRimn * @LastEditTime: 2020-12-11 10:01:47 --> - +

欢迎登录消防救援考核系统

diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index a5b4984..2b9a6b4 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -625,29 +625,14 @@ export class CollectionToolsComponent implements OnInit { this.canvasData.isChange = true } - isSixShow = true isSixbtn = true //控制想定作业编辑按钮 isxxx = true //控制查看编辑模式的编辑模式按钮 ngOnInit(): void { - - if(this.router.url.indexOf("keyUnit/viewunitinfoplan") == -1 && this.router.url.indexOf("keyUnit/viewunitinfo") != -1 || this.router.url.indexOf("keyUnit/editplaninfo")!= -1){ - this.isSixbtn = false - } - - if(!this.isSixbtn && sessionStorage.getItem("six") == "edit"){ - this.isSixShow = true - } - if(!this.isSixbtn && sessionStorage.getItem("six") == "look"){ - this.isEditPattern = false - this.isxxx = false - } - - if (sessionStorage.getItem('editable') == "0") { - this.isEditPattern = false - this.isxxx = false - } + sessionStorage.setItem('companyId','5fa2512ef8eb762cb03c65fb') + sessionStorage.setItem('planId','5fa8b0b8f8eb762cb03c6c30') + sessionStorage.setItem('buildingTypeId','5e7c9018a3050b1a840ed4b7') this.getAllLibrary() //获取素材库 this.getAllBuildings() //获取所有建筑 @@ -661,18 +646,19 @@ export class CollectionToolsComponent implements OnInit { event.preventDefault(); }; }) - + this.canvasData.getMessage().subscribe((message: any)=>{ if(message == "send a message"){ this.refurbishTreeData() } }) + } ngAfterViewInit(): void { - + this.getSitePlan() // 监听canvas组件选中素材事件 this.canvas.on("select",obj=>{ diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.html b/src/app/ui/enterpriseuser/enterpriseuser.component.html index f8e8e66..ca37553 100644 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.html +++ b/src/app/ui/enterpriseuser/enterpriseuser.component.html @@ -41,12 +41,12 @@ 消防救援站 - 上海总队 + {{element.organizationName}} 手机号 - 13562321997 + {{element.phone}} diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.html b/src/app/ui/teacherManagement/enterpriseuser.component.html index b2e9ba1..b2f662d 100644 --- a/src/app/ui/teacherManagement/enterpriseuser.component.html +++ b/src/app/ui/teacherManagement/enterpriseuser.component.html @@ -41,7 +41,7 @@ 消防救援站 - 上海总队 + {{element.organizationName}} diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 003f889..3040846 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -10,6 +10,7 @@ import { LookOverTestComponent } from './look-over-test/look-over-test.component import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; import { JoinExamComponent } from './join-exam/join-exam.component'; import { TestRecordsComponent } from './test-records/test-records.component'; +import { CollectionToolsComponent } from './collection-tools/collection-tools.component' const routes: Routes = [ { path: '', component:CreateExamComponent }, @@ -20,6 +21,7 @@ const routes: Routes = [ { path: 'testRecords', component:TestRecordsComponent }, { path: 'teachear', component:TeacherManagementComponent }, //管理员 教员页面 { path: 'examinee', component:EnterpriseuserComponent }, //管理员 考生页面 + { path: 'canvasTool', component:CollectionToolsComponent }, //编制工具 ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/assets/images/enterPaintButton.png b/src/assets/images/enterPaintButton.png new file mode 100644 index 0000000..e6b99b7 Binary files /dev/null and b/src/assets/images/enterPaintButton.png differ diff --git a/src/assets/images/handle-fixed.png b/src/assets/images/handle-fixed.png new file mode 100644 index 0000000..b4b600b Binary files /dev/null and b/src/assets/images/handle-fixed.png differ diff --git a/src/assets/images/handle-main.png b/src/assets/images/handle-main.png new file mode 100644 index 0000000..ee067ff Binary files /dev/null and b/src/assets/images/handle-main.png differ diff --git a/src/assets/images/handle-secondary.png b/src/assets/images/handle-secondary.png new file mode 100644 index 0000000..b4a3090 Binary files /dev/null and b/src/assets/images/handle-secondary.png differ diff --git a/src/assets/images/handle-terminal.png b/src/assets/images/handle-terminal.png new file mode 100644 index 0000000..ec03b31 Binary files /dev/null and b/src/assets/images/handle-terminal.png differ