shaojiahao
/
examSystem-Anxin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[完善] 编制工具修改

master
陈鹏飞 4 years ago
parent
dafd600f61
commit
9b744d44bb
16 changed files with 134 additions and 310 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      proxy.config.json
  2. 2
      src/app/app-routing.module.ts
  3. 6
      src/app/app.component.ts
  4. 5
      src/app/http-interceptors/cache-token.service.ts
  5. 6
      src/app/pages/lockscreen/lockscreen.component.html
  6. 19
      src/app/pages/lockscreen/lockscreen.component.ts
  7. 2
      src/app/pages/login/login.component.html
  8. 5
      src/app/pages/login/login.component.ts
  9. 2
      src/app/tabbar/tabbar.component.ts
  10. 310
      src/app/ui/collection-tools/collection-tools.component.html
  11. 32
      src/app/ui/collection-tools/collection-tools.component.scss
  12. 23
      src/app/ui/collection-tools/collection-tools.component.ts
  13. 5
      src/app/ui/collection-tools/panel.scss
  14. 2
      src/app/ui/ui-routing.module.ts
  15. 6
      src/assets/css/ngZorroTree.css
  16. 17
      src/styles.scss

2
proxy.config.json
Unescape View File

@ -1,6 +1,6 @@
{
"/api": {
"target": "http://121.37.20.190:8000",
"target": "http://121.37.20.190:8006",
"secure": false,
"changeOrigin": true
}

2
src/app/app-routing.module.ts
Unescape View File

@ -7,6 +7,7 @@ import { LockscreenComponent } from './pages/lockscreen/lockscreen.component';
//路由守卫
import {AuthGuard} from './auth.guard'
import { CreateTestScoreComponent } from './examiner/create-test-score/create-test-score.component';
import { CollectionToolsComponent } from './ui/collection-tools/collection-tools.component';
@ -20,6 +21,7 @@ const routes: Routes = [
]
},
{ path:'examiner/create-test-score', component:CreateTestScoreComponent,canActivate: [AuthGuard],}, //创建试卷具体分数页面
{ path: 'canvasTool', component:CollectionToolsComponent,canActivate: [AuthGuard], }, //编制工具
{ path:'adminLogin', component:LoginComponent}, //管理员登录路由
{ path:'login', component:LockscreenComponent}, //教员学员登录路由

6
src/app/app.component.ts
Unescape View File

@ -20,12 +20,12 @@ export class AppComponent {
let token = sessionStorage.getItem("token");
let refreshToken = sessionStorage.getItem("refreshToken");
if(token && refreshToken) {
this.http.post('/api/Account/RefreshToken', {
this.http.post('/api/ExamAccounts/RefreshToken', {
token: token,
refreshToken: refreshToken
}).subscribe((data:any) => {
sessionStorage.setItem('realName',data.realName)
sessionStorage.setItem('roleType',data.roleType)
sessionStorage.setItem("realName",data.realName);
sessionStorage.setItem("roleType",data.roleType);
sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken);
this.token.startUp()

5
src/app/http-interceptors/cache-token.service.ts
Unescape View File

@ -17,11 +17,12 @@ export class CacheTokenService {
var token = sessionStorage.getItem("token");
var refreshToken = sessionStorage.getItem("refreshToken");
if (token && refreshToken) {
this.http.post('/api/Account/RefreshToken', {
this.http.post('/api/ExamAccounts/RefreshToken', {
token: token,
refreshToken: refreshToken,
}).subscribe((data:any) => {
sessionStorage.setItem('realName',data.realName)
sessionStorage.setItem("realName",data.realName);
sessionStorage.setItem("roleType",data.roleType);
sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken);
})

6
src/app/pages/lockscreen/lockscreen.component.html
Unescape View File

@ -13,13 +13,13 @@
</div>
<div class="input" style="margin-bottom: 50px;">
<label class="role" [ngClass]="{'isCheck': roleType=='2'}" (click)='toggle(2)'>考官</label>
<label class="role" [ngClass]="{'isCheck': roleType=='1'}" (click)='toggle(1)'>考生</label>
<label class="role" [ngClass]="{'isCheck': roleType=='1'}" (click)='toggle(1)'>考官</label>
<label class="role" [ngClass]="{'isCheck': roleType=='0'}" (click)='toggle(0)'>考生</label>
</div>
<div class="input">
<mat-icon class="icon">account_box</mat-icon>
<input id="name" name="name" required ngModel placeholder="请输入用户名" maxlength="20">
<input id="loginName" name="loginName" required ngModel placeholder="请输入用户名" maxlength="20">
</div>
<div class="input">

19
src/app/pages/lockscreen/lockscreen.component.ts
Unescape View File

@ -20,21 +20,22 @@ export class LockscreenComponent implements OnInit {
}
roleType:string = '2'; //登录角色
roleType:string = '1'; //登录角色
errmsg :string = ''; //错误信息
//登录
onSubmit(e){
// 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})
let params = { roleType: this.roleType }
this.http.post('/api/ExamAccounts/SignIn',e,{params}).subscribe((data:any)=>{
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})
}
//切换登录角色

2
src/app/pages/login/login.component.html
Unescape View File

@ -9,7 +9,7 @@
<div class="input">
<mat-icon class="icon">account_box</mat-icon>
<input id="name" name="name" required ngModel placeholder="请输入用户名" maxlength="20">
<input id="loginName" name="loginName" required ngModel placeholder="请输入用户名" maxlength="20">
</div>
<div class="input">

5
src/app/pages/login/login.component.ts
Unescape View File

@ -27,9 +27,10 @@ export class LoginComponent implements OnInit {
//登录
onSubmit(e){
// let params = { roleType: '0' },{params}
this.http.post('/api/Account/SignIn',e).subscribe((data:any)=>{
let params = { roleType: '2' }
this.http.post('/api/ExamAccounts/SignIn',e,{params}).subscribe((data:any)=>{
sessionStorage.setItem("realName",data.realName);
sessionStorage.setItem("roleType",data.roleType);
sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken);
this.token.startUp(); //登陆成功启动定时器刷新token

2
src/app/tabbar/tabbar.component.ts
Unescape View File

@ -40,7 +40,7 @@ export class TabbarComponent implements OnInit {
signOut () {
let out = confirm("您确定要退出吗")
if(out) {
this.http.post('/api/Account/SignOut',{}).subscribe(data=>{
this.http.post('/api/ExamAccounts/SignOut',{}).subscribe(data=>{
sessionStorage.clear()
this.token.delete()
this.router.navigate(['/login'])

310
src/app/ui/collection-tools/collection-tools.component.html
Unescape View File

@ -1,176 +1,46 @@
<div class="content">
<!-- header头部 -->
<div class="header">
<button mat-button (click)="toggle()">
<mat-icon style="vertical-align: middle;">toc</mat-icon>
</button>
<button mat-button (click)="toggle2()">
<mat-icon style="vertical-align: middle;">list</mat-icon>
</button>
<span style="color: gray;margin-right: 10px;margin-left: 10px;">图标大小</span>
<mat-form-field style="margin-top: 3px;">
<mat-select (selectionChange)='iconScale()' [(ngModel)]="selected">
<mat-option value="1">正常</mat-option>
<mat-option value="2">放大2倍</mat-option>
<mat-option value="4">放大4倍</mat-option>
</mat-select>
</mat-form-field>
<button (click)="copyAsset()" class="copytobutn" mat-button title="复制" style="margin:0 5px;" *ngIf="isEditPattern">
<mat-icon style="padding-bottom: 7px;">library_books</mat-icon>
</button>
<button (click)="pasteAsset()" class="copytobutn" mat-button title="粘贴" *ngIf="isEditPattern">
<mat-icon style="padding-bottom: 7px;">screen_share</mat-icon>
</button>
<span [ngClass]="{'icongray': !basicInfo}" title="基本信息名称显示/隐藏" style="margin-right:20px;user-select: none;margin-left: 22px;" class="nameShow" (click)="basicInfoClick()">
基本信息名称
<mat-icon>visibility</mat-icon>
</span>
<span [ngClass]="{'icongray': !wantToWork}" *ngIf="!pattern" title="想定作业名称显示/隐藏" style="user-select: none;" class="nameShow" (click)="wantToWorkClick()">
想定作业名称
<mat-icon>visibility</mat-icon>
</span>
<div class="patternSwitch">
<span (click)="baseInfo()" [ngClass]="{'selectedPattern': pattern}">
基本信息编辑
</span>
<span *ngIf="isSixbtn" (click)="wantWork()" [ngClass]="{'selectedPattern': !pattern}">
想定作业编辑
</span>
</div>
<span style="position: absolute;right: 60px;cursor: pointer;">
<mat-icon title="查看/编辑模式" (click)="lookpat()" *ngIf="isEditPattern">tv</mat-icon>
<mat-icon title="查看/编辑模式" (click)="editpat()" *ngIf="!isEditPattern && isxxx">create</mat-icon>
<mat-icon *ngIf="isEditPattern " style="margin-left: 12px;" title="保存" (click)="saveSite()">description</mat-icon>
</span>
</div>
<!-- 头部操作栏 -->
<div class="headerOperate">
<button mat-button (click)="checkedBuilding({name:'总平面图'},-1)"
[ngClass]="{'buildingbtnchecked': checkedBuildingIndex==-1}">
<span>总平面图</span>
<span *ngIf="isEditPattern && !pattern">
<img src="../../../assets/images/fire.png" *ngIf="sitePlanIcon.fire==2">
<img src="../../../assets/images/noFire.png" *ngIf="sitePlanIcon.fire==1">
<img src="../../../assets/images/force.png" *ngIf="sitePlanIcon.force==2">
<img src="../../../assets/images/noForce.png" *ngIf="sitePlanIcon.force==1">
</span>
</button>
<button mat-button *ngFor="let item of allBuildings;let key = index" (click)="checkedBuilding(item,key)" class="bigeditdeletebtn"
[ngClass]="{'buildingbtnchecked': checkedBuildingIndex==key}">
<span>{{item.name}}</span>
<span *ngIf="isEditPattern && !pattern">
<img src="../../../assets/images/fire.png" *ngIf="item.fire && item.fire==2">
<img src="../../../assets/images/noFire.png" *ngIf="item.fire && item.fire==1">
<img src="../../../assets/images/force.png" *ngIf="item.force && item.force==2">
<img src="../../../assets/images/noForce.png" *ngIf="item.force && item.force==1">
</span>
<span class="editdeletebtn" *ngIf="isEditPattern && pattern">
<mat-icon (click)="editBuilding($event,item)"
style="font-size: 23px;vertical-align:sub;margin-left: 6px;color: rgb(26, 194, 26);">create</mat-icon>
<mat-icon (click)="deleteBuilding($event,item)"
style="font-size: 23px;vertical-align:sub;color: rgb(224, 51, 51);">delete</mat-icon>
</span>
</button>
<!-- <button (click)="yyy()">yyyyy</button> -->
<button mat-button (click)="createBuilding()" *ngIf="isEditPattern && pattern">
<span style="font-size: 24px;">+</span>
</button>
<div class="bigBox" *ngIf="!pattern">
<div class="weatherBox" [ngClass]="{'opened': weatherBtn,'close': !weatherBtn}">
<mat-icon class="openbtn" *ngIf="weatherBtn" (click)="weatherBtnHidden()">keyboard_arrow_right</mat-icon>
<mat-icon class="openbtn" *ngIf="!weatherBtn" (click)="weatherBtnShow()">keyboard_arrow_left</mat-icon>
<span class="name">天气</span>
<input [(ngModel)]="canvasData.selectPanelPointBaseData.weather" type="text" placeholder="最多输入10字节" maxlength="10">
<span class="name">气温</span>
<div style="display: inline-block;position: relative;">
<input [(ngModel)]="canvasData.selectPanelPointBaseData.airTemperature" style="width: 120px;" type="number" value="0" oninput="if(value.length>2)value=value.slice(0,2)">
<span style="position: absolute;right:17px;color: #9c9fa5;">℃</span>
</div>
<span class="name">风力</span>
<select [(ngModel)]="canvasData.selectPanelPointBaseData.windScale">
<option value ="0">0(无风)</option>
<option value ="1">1(软风)</option>
<option value ="2">2(轻风)</option>
<option value ="3">3(微风)</option>
<option value ="4">4(和风)</option>
<option value ="5">5(清风)</option>
<option value ="6">6(强风)</option>
</select>
<span class="name">风向</span>
<select [(ngModel)]="canvasData.selectPanelPointBaseData.windDirection">
<option value ="0">东</option>
<option value ="1">西</option>
<option value ="2">南</option>
<option value ="3">北</option>
<option value ="4">东南</option>
<option value ="5">西南</option>
<option value ="6">东北</option>
<option value ="7">西北</option>
</select>
</div>
</div>
</div>
<!-- header头部 -->
<!--功能区 -->
<div class="functionalDomain">
<div class='functionalDomainContent' id="functionalDomainContent">
<!-- H5Canvas -->
<app-working-area #canvas [init]='this'></app-working-area>
<!-- H5Canvas -->
<div id="leftDiv" class='functionalDomainLeft publicCss' [ngClass]="{'togglePanel': toggleExpandPanel==true,'scenarioAssignment': !pattern}" style="user-select: none;">
<div class="leftDragDiv" (mousedown)="leftDivMouseDown($event)"></div>
<!-- 平面图 -->
<div class="planarGraph">
<div class="planarGraphHeader" (click)='togglePlanarGraph()'>
<mat-icon *ngIf="togglePlane">keyboard_arrow_up</mat-icon>
<mat-icon *ngIf="!togglePlane">keyboard_arrow_down</mat-icon>
<label class="overflowText" style="font-weight: 550;">平面图</label>
<label class="hover" *ngIf="isEditPattern && pattern">
<mat-icon (click)='foundPanel($event)'>add</mat-icon>
</label>
<div id="leftDiv" class='functionalDomainLeft publicCss scenarioAssignment' [ngClass]="{'togglePanel': toggleExpandPanel==true}" style="user-select: none;">
<!-- 处置预案 -->
<div class="handlePlan">
<div class="planarGraphHeader" (click)='toggleHandlePlan()'>
<mat-icon *ngIf="toggleHandlePlans">keyboard_arrow_up</mat-icon>
<mat-icon *ngIf="!toggleHandlePlans">keyboard_arrow_down</mat-icon>
<label class="overflowText" style="font-weight: 550;">处置预案</label>
<!-- <label style="margin-left: 45px;" *ngIf="isEditPattern">
<mat-icon style="color: #c2a40ce8;" title="计算差异" (click)='countValue($event)'>flash_on</mat-icon>
<mat-icon style="margin-left: 3px;" title="新建空节点" (click)='addPanelPoint($event,null,treeData)'>add</mat-icon>
</label> -->
</div>
<div [hidden]="!togglePlane" >
<div class="sitePlanContent" *ngFor="let item of sitePlanData;let key = index" [ngClass]="{'isRefugeStorey':item.isRefugeStorey==true,'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'>
<label class="overflowText" style="display:inline-block; max-width: 180px;"><mat-icon *ngIf="!item.imageUrl" class="matIcons">broken_image</mat-icon> {{item.name}}</label>
<a href="javascript:;" class="fireForce" *ngIf="isEditPattern && !pattern">
<img src="../../../assets/images/fire.png" *ngIf="item.fire && item.fire==2">
<img src="../../../assets/images/noFire.png" *ngIf="item.fire && item.fire==1">
<img src="../../../assets/images/force.png" *ngIf="item.force && item.force==2">
<img src="../../../assets/images/noForce.png" *ngIf="item.force && item.force==1">
</a>
<a href="javascript:;" class="a-upload" *ngIf="selectSitePlanIndex==key && isEditPattern && pattern" title="替换底图" >
<input type="file" (change)='replaceBaseMap($event,item)' accept="image/*">
<mat-icon class="matIcons">photo_size_select_actual</mat-icon>
</a>
<a href="javascript:;" id="a-uploadImg" *ngIf="selectSitePlanIndex==key && !item.imageUrl && isEditPattern" title="上传底图" >
<input type="file" (change)='replaceBaseMap($event,item)' accept="image/*">
<img src="../../../assets/images/upload.jpg">
</a>
<!-- 右边定位操作栏 -->
<div id="rightOperate" *ngIf="selectSitePlanIndex==key && item.imageUrl && isEditPattern" (click)="$event.stopPropagation();">
<p class="functionButton">
<mat-icon class="functionIcon bigFunctionIcon" title="上移" (click)='moveUp(item,key)'>keyboard_arrow_up</mat-icon>
</p>
<p class="functionButton">
<mat-icon class="functionIcon" title="编辑属性" (click)='editPlaneData(item)'>edit</mat-icon>
<mat-icon class="functionIcon" title="删除" (click)="deletePlaneData(item)">delete</mat-icon>
</p>
<p class="functionButton">
<mat-icon class="functionIcon" title="旋转底图" (click)='revolveImg(item)'>cached</mat-icon>
<mat-icon class="functionIcon" title="复制" (click)="duplicateLayer(item)">library_books</mat-icon>
</p>
<p class="functionButton">
<mat-icon class="functionIcon bigFunctionIcon" title="下移" (click)='moveDown(item,key)'>keyboard_arrow_down</mat-icon>
</p>
<div [hidden]="!toggleHandlePlans">
<nz-tree #nzTreeComponent [nzData]="treeData" nzBlockNode nzDraggable (nzOnDrop)="nzEvent($event)" [nzTreeTemplate]="nzTreeTemplate" [nzBeforeDrop]="beforeDrop" [nzExpandedKeys]="defaultExpandedKeys"></nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin">
<div id="terrNodePublic" (click)='selectanelPoint(node.origin)' [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}">
<label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label>
<!-- <div class="planIconDiv" *ngIf="isEditPattern">
<mat-icon *ngIf="!node.origin.sitePlanId && !node.origin.buildingAreaId" (click)='editPanelPoint($event,node)'>edit</mat-icon>
<mat-icon *ngIf="node.level===0" (click)='addPanelPoint($event,node.origin,null)'>add</mat-icon>
<mat-icon *ngIf="!node.origin.sitePlanId && !node.origin.buildingAreaId" (click)='copyPanelPoint($event,node,treeData)'>library_books</mat-icon>
<mat-icon (click)='deletePanelPoint($event,node.origin)'>delete_forever</mat-icon>
</div> -->
</div>
<!-- 右边定位操作栏 -->
</div>
</ng-template>
</div>
</div>
<!-- 处置预案 -->
<!-- 素材库 -->
<div id="materialBank" *ngIf="isEditPattern" [ngClass]="{'selectEditMode': pattern}">
@ -200,35 +70,46 @@
</div>
</div>
<!-- 素材库 -->
<!-- 处置预案 -->
<div class="handlePlan" *ngIf="!pattern">
<div class="planarGraphHeader" (click)='toggleHandlePlan()'>
<mat-icon *ngIf="toggleHandlePlans">keyboard_arrow_up</mat-icon>
<mat-icon *ngIf="!toggleHandlePlans">keyboard_arrow_down</mat-icon>
<label class="overflowText" style="font-weight: 550;">处置预案</label>
<label style="margin-left: 45px;" *ngIf="isEditPattern">
<mat-icon style="color: #c2a40ce8;" title="计算差异" (click)='countValue($event)'>flash_on</mat-icon>
<mat-icon style="margin-left: 3px;" title="新建空节点" (click)='addPanelPoint($event,null,treeData)'>add</mat-icon>
</label>
<!-- 消防设施 -->
<div class="planarGraph">
<div class="planarGraphHeader" (click)='togglePlanarGraph()'>
<mat-icon *ngIf="togglePlane">keyboard_arrow_up</mat-icon>
<mat-icon *ngIf="!togglePlane">keyboard_arrow_down</mat-icon>
<label class="overflowText" style="font-weight: 550;">消防设施</label>
</div>
<div [hidden]="!toggleHandlePlans">
<nz-tree #nzTreeComponent [nzData]="treeData" nzBlockNode nzDraggable (nzOnDrop)="nzEvent($event)" [nzTreeTemplate]="nzTreeTemplate" [nzBeforeDrop]="beforeDrop" [nzExpandedKeys]="defaultExpandedKeys"></nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin">
<div id="terrNodePublic" (click)='selectanelPoint(node.origin)' [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}">
<label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label>
<div class="planIconDiv" *ngIf="isEditPattern">
<mat-icon *ngIf="!node.origin.sitePlanId && !node.origin.buildingAreaId" (click)='editPanelPoint($event,node)'>edit</mat-icon>
<mat-icon *ngIf="node.level===0" (click)='addPanelPoint($event,node.origin,null)'>add</mat-icon>
<mat-icon *ngIf="!node.origin.sitePlanId && !node.origin.buildingAreaId" (click)='copyPanelPoint($event,node,treeData)'>library_books</mat-icon>
<mat-icon (click)='deletePanelPoint($event,node.origin)'>delete_forever</mat-icon>
</div>
</div>
</ng-template>
<div [hidden]="!togglePlane">
<!-- 消防列表树 -->
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" cdkDropList [cdkDropListData]="dataSource" (cdkDropListDropped)="drop($event)">
<mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
<button mat-icon-button disabled></button>
<span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
{{node.name}}
</span>
<span *ngIf="node.isTemplate">({{node.children.length}})</span>
<span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
</mat-tree-node>
<mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
<button mat-icon-button
matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.name">
<mat-icon class="mat-icon-rtl-mirror">
{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
</mat-icon>
</button>
<span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
{{node.name}}
</span>
<span *ngIf="node.isTemplate && node.isNewElement">({{node.children.length}})</span>
<span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
</mat-tree-node>
</mat-tree>
<!-- 消防列表树 -->
</div>
</div>
<!-- 处置预案 -->
<!-- 消防设施 -->
</div>
@ -236,7 +117,7 @@
<!-- 右侧div鼠标拖动div -->
<div style="width: 3px;height: 100%;position: absolute;left: 0;cursor: e-resize;z-index: 1000;" (mousedown)="rightDivMouseDown($event)"></div>
<!-- 属性 -->
<div [ngClass]="{'forbidden': !isEditPattern}" id="property" class="property" style="height: 50%;background-color: white;">
<div [ngClass]="{'forbidden': !isEditPattern}" id="property" class="property" style="height: 100%;background-color: white;">
<div class="title">
<div>
<span style="user-select: none">属性</span>
@ -387,67 +268,10 @@
</div>
</div>
<!-- 消防要素 -->
<div id="firecategories" class="firecategories" style="height: 50%;">
<!-- 素材属性div鼠标拖动div -->
<div style="height:3px;width: 100%;position: absolute;top: 0;cursor: n-resize;z-index: 1000;" (mousedown)="firecategoriesDivMouseDown($event)"></div>
<div class="title">
<div>
<span style="user-select: none">消防要素</span>
</div>
</div>
<div class="firecategoriesTree">
<!-- 消防列表树写在这里 -->
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" cdkDropList [cdkDropListData]="dataSource" (cdkDropListDropped)="drop($event)">
<mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
<button mat-icon-button disabled></button>
<span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
{{node.name}}
</span>
<span *ngIf="node.isTemplate">({{node.children.length}})</span>
<span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
</mat-tree-node>
<mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
<button mat-icon-button
matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.name">
<mat-icon class="mat-icon-rtl-mirror">
{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
</mat-icon>
</button>
<span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
{{node.name}}
</span>
<span *ngIf="node.isTemplate && node.isNewElement">({{node.children.length}})</span>
<span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
</mat-tree-node>
</mat-tree>
</div>
</div>
</div>
<div id="bottomDiv" class="bottomCss" *ngIf="!pattern">
<div class="dragDiv" (mousedown)="bottomDivMouseDown($event)"></div>
<div class="title">
<div (click)="details()" [ngClass]="{'detailsAndattentBtn': detailsAndattentBtn}">
节点详情
</div>
<div (click)="attent()" [ngClass]="{'detailsAndattentBtn': !detailsAndattentBtn}">
注意事项
</div>
</div>
<div class="body">
<textarea [disabled]="!isEditPattern" *ngIf="detailsAndattentBtn" name="" id="" rows="10" [(ngModel)]="canvasData.selectPanelPointBaseData.description"></textarea>
<textarea [disabled]="!isEditPattern" *ngIf="!detailsAndattentBtn" name="" id="" rows="10" [(ngModel)]="canvasData.selectPanelPointBaseData.nodes"></textarea>
</div>
</div>
</div>
</div>
<!--功能区 -->
</div>

32
src/app/ui/collection-tools/collection-tools.component.scss
Unescape View File

@ -1,16 +1,12 @@
@import './panel.scss';
.icongray{
color: #D9D0DC;
}
.content {
width: 100%;
height: 100%;
overflow: hidden;
box-sizing: border-box;
padding: 1px;
padding: 3px;
display: flex;
flex-direction: column;
.buildingbtnchecked{
background-color: #34A6FD;
color: white;
@ -25,6 +21,7 @@
align-items:center;
min-height: 40px;
background-color: #fff;
box-shadow: inset 0px -3px 5px 0px rgb(165, 163, 163);
.nameShow{
cursor: pointer;
user-select: none;
@ -109,7 +106,7 @@
top: 0;
}
.functionalDomain {
flex: 90%;
flex: 95%;
overflow: hidden;
.functionalDomainContent {
position: relative;
@ -309,13 +306,6 @@
.firecategoriesTree{
overflow-y: auto;
height: 100%;
mat-tree-node{
position: relative;
}
.isLookCss{
position: absolute;
right: 6px;
}
}
}
@ -337,13 +327,19 @@ div:focus {
margin-right: 3px;
}
// tree
.isLookCss{
margin-left: auto;
color: #07CDCF;
.icongray{
color: #D9D0DC;
}
}
.mat-tree-node{
min-height: 0;
height: 32px;
line-height: 32px;
font-size: 13px;
padding-right: 3px;
min-height: 30px;
height: 30px;
font-size: 12px;
cursor: pointer;
}
.treeNode:hover{

23
src/app/ui/collection-tools/collection-tools.component.ts
Unescape View File

@ -147,7 +147,7 @@ export class CollectionToolsComponent implements OnInit {
this.isImgNumCss = false
}
}
pattern:boolean = true//默认为基本信息编辑
pattern:boolean = false//默认为基本信息编辑
yyy(){
@ -634,7 +634,7 @@ export class CollectionToolsComponent implements OnInit {
sessionStorage.setItem('planId','5fa8b0b8f8eb762cb03c6c30')
sessionStorage.setItem('buildingTypeId','5e7c9018a3050b1a840ed4b7')
this.getAllLibrary() //获取素材库
this.getAllLibrary('plan') //获取素材库
this.getAllBuildings() //获取所有建筑
this.getAllFirePlan() //获取当前单位灾情
@ -1316,7 +1316,6 @@ export class CollectionToolsComponent implements OnInit {
isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
isRefresh? this.isShowProperty = true : null
isRefresh? this.isShowAttribute = true : null
!this.pattern? this.mateFireForce() : null //刷新 建筑楼层 火源/力量图标
let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据
@ -1876,17 +1875,11 @@ export class CollectionToolsComponent implements OnInit {
}
this.http.post('/api/Disasters',msg).subscribe(data=>{
this.allFirePlan.push(data)
let params = {disasterId: this.allFirePlan[0].id || ''}
this.http.get('/api/DisposalNodes',{params:params}).subscribe(data=>{ //所有处置节点
this.canvasData.allDisposalNode = data
})
this.getDisposalNode()
})
} else { //单位 有灾情时
this.allFirePlan = data
let params = {disasterId: this.allFirePlan[0].id || ''}
this.http.get('/api/DisposalNodes',{params:params}).subscribe(data=>{ //所有处置节点
this.canvasData.allDisposalNode = data
})
this.getDisposalNode()
}
})
}
@ -1895,10 +1888,10 @@ export class CollectionToolsComponent implements OnInit {
getDisposalNode () {
this.selectDisposalNode = ''
let params = {disasterId: this.allFirePlan[0].id || ''}
this.http.get('/api/DisasterData/Markers',{params:params}).subscribe(data=>{ //灾情标签信息
this.canvasData.allNodeMarkers = data
this.mateFireForce()
})
// this.http.get('/api/DisasterData/Markers',{params:params}).subscribe(data=>{ //灾情标签信息
// this.canvasData.allNodeMarkers = data
// this.mateFireForce()
// })
this.http.get('/api/DisposalNodes',{params:params}).subscribe(data=>{ //处置节点
this.canvasData.allDisposalNode = data
this.handleHybridTree()

5
src/app/ui/collection-tools/panel.scss
Unescape View File

@ -17,8 +17,8 @@
font-family: Roboto, "Helvetica Neue", sans-serif;
font-size: 15px;
font-weight: 400;
color: #000;
background: linear-gradient(to top,#cdced1,#FFF);
color: #fff;
background: #07CDCF;
}
//平面图头部字体图标样式
.hover {
@ -207,6 +207,7 @@
margin: 1px 0;
}
//素材库图片flex
.mat-expansion-panel-header {background-color: #d6f4f5;}
#panelLibrary .text{
box-sizing: border-box;
margin-left: 10px;

2
src/app/ui/ui-routing.module.ts
Unescape View File

@ -10,7 +10,6 @@ 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 },
@ -21,7 +20,6 @@ const routes: Routes = [
{ path: 'testRecords', component:TestRecordsComponent },
{ path: 'teachear', component:TeacherManagementComponent }, //管理员 教员页面
{ path: 'examinee', component:EnterpriseuserComponent }, //管理员 考生页面
{ path: 'canvasTool', component:CollectionToolsComponent }, //编制工具
]
@NgModule({
imports: [RouterModule.forChild(routes)],

6
src/assets/css/ngZorroTree.css
Unescape View File

@ -336,10 +336,10 @@
.ant-tree .ant-tree-switcher {
flex: none;
width: 24px;
height: 35px;
width: 20px;
height: 34px;
margin: 0;
line-height: 22px;
line-height: 34px;
font-size: 18px;
text-align: center;
cursor: pointer

17
src/styles.scss
Unescape View File

@ -64,7 +64,14 @@ table td.mat-footer-cell:last-of-type{
align-items: center;
}
//滚动条样式
::-webkit-scrollbar{
width: 5px;
background-color: white;
}
::-webkit-scrollbar-thumb{
background-color: #999;
}
//x轴滚动条隐藏
.example-sidenav-content {
@ -73,7 +80,7 @@ table td.mat-footer-cell:last-of-type{
}
.mat-tab-body-wrapper{
height: 100%;
}
@ -81,12 +88,12 @@ table td.mat-footer-cell:last-of-type{
overflow: hidden!important;
}
.mat-select-panel {
width: 210px;
font-size: 13px!important;
width: 210px;
font-size: 13px!important;
}
.mat-drawer-container{
background-color: none;
background-color: none;
}
//可展开面板按钮颜色

Write Preview
Loading…
Cancel
Save