-
-
- 图标大小
-
-
- 正常
- 放大2倍
- 放大4倍
-
-
-
-
-
-
-
- 基本信息名称
- visibility
-
-
- 想定作业名称
- visibility
-
- tv
- create
- description
-
-
-
-
-
-
- 基本信息编辑
-
-
- 想定作业编辑
-
-
-
-
-
-
-
-
-
-
+
-
+
- keyboard_arrow_right
- keyboard_arrow_left
- 天气
-
- 气温
-
-
-
- ℃
-
- 风力
-
- 风向
-
-
-
-
-
-
-
- keyboard_arrow_up
- keyboard_arrow_down
-
-
+
+
+
+
+
+ keyboard_arrow_up
+ keyboard_arrow_down
+
+
-
-
-
-
-
-
- 
- 
- 
- 
-
-
-
- photo_size_select_actual
-
-
-
- 
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
@@ -200,35 +70,46 @@
-
\ No newline at end of file
diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss
index 19402a6..557f5fc 100644
--- a/src/app/ui/collection-tools/collection-tools.component.scss
+++ b/src/app/ui/collection-tools/collection-tools.component.scss
@@ -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{
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 2b9a6b4..16cc996 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -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()
diff --git a/src/app/ui/collection-tools/panel.scss b/src/app/ui/collection-tools/panel.scss
index f0ae073..287a991 100644
--- a/src/app/ui/collection-tools/panel.scss
+++ b/src/app/ui/collection-tools/panel.scss
@@ -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;
diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts
index 3040846..003f889 100644
--- a/src/app/ui/ui-routing.module.ts
+++ b/src/app/ui/ui-routing.module.ts
@@ -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)],
diff --git a/src/assets/css/ngZorroTree.css b/src/assets/css/ngZorroTree.css
index d04cca9..3f270a6 100644
--- a/src/assets/css/ngZorroTree.css
+++ b/src/assets/css/ngZorroTree.css
@@ -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
diff --git a/src/styles.scss b/src/styles.scss
index 6ba0a06..6ac0f08 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -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;
}
//可展开面板按钮颜色
- keyboard_arrow_up
- keyboard_arrow_down
-
-
+
+
+
+
@@ -236,7 +117,7 @@
-
+ keyboard_arrow_up
+ keyboard_arrow_down
+
-
-
-
-
+
-
+
-
-
-
- edit
- add
- library_books
- delete_forever
-
-
+
+
+
+
+
+ {{node.name}}
+
+ ({{node.children.length}})
+ visibility
+
+
+
+
+
+ {{node.name}}
+
+ ({{node.children.length}})
+ visibility
+
+
+
+
+
-
-
-
属性
@@ -387,67 +268,10 @@
-
-
-
-
-
-
-
- 消防要素
-
-
-
-
-
-
-
-
- {{node.name}}
-
- ({{node.children.length}})
- visibility
-
-
-
-
-
-
- {{node.name}}
-
- ({{node.children.length}})
- visibility
-
-
-
-
-
-
-
-
-
- 节点详情
-
-
- 注意事项
-
-
-
-
-
-