diff --git a/src/app/ui/allaround/allaround.component.scss b/src/app/ui/allaround/allaround.component.scss index 6c2caa4..fe4af07 100644 --- a/src/app/ui/allaround/allaround.component.scss +++ b/src/app/ui/allaround/allaround.component.scss @@ -4,6 +4,7 @@ padding: 10px; overflow-y: auto; color: #fff; + font-size: 17px; } //图片外部div diff --git a/src/app/ui/basicinfo-look/basicinfo.component.html b/src/app/ui/basicinfo-look/basicinfo.component.html index 3a103b6..dd078bf 100644 --- a/src/app/ui/basicinfo-look/basicinfo.component.html +++ b/src/app/ui/basicinfo-look/basicinfo.component.html @@ -3,7 +3,7 @@ - + 单位信息 keyboard_arrow_down @@ -37,8 +37,8 @@ -
- * +
+ * 联系人：
-
+
* 辖区中队： - +
-
+
* 单位地址： - +
+
总平面图
@@ -147,7 +150,6 @@
-
@@ -246,7 +248,7 @@
-->
- +
@@ -289,19 +291,25 @@
- -
-
- +
+ +
+ +
+
+
- - +
+ +
+
keyboard_arrow_up
@@ -332,6 +340,9 @@ 消防要素 + + | +
@@ -429,7 +440,7 @@

{{item.PropertyName}}

{{imagesArr.length ? imagesArr.length : 0}} / {{item.PropertyValue}} -
+
@@ -492,17 +503,21 @@ - + {{node.name}} ({{node.children.length}}) - visibility + + + + + - +

重点提示

diff --git a/src/app/ui/key-site-look/key-site.component.scss b/src/app/ui/key-site-look/key-site.component.scss index d116ac6..83a762a 100644 --- a/src/app/ui/key-site-look/key-site.component.scss +++ b/src/app/ui/key-site-look/key-site.component.scss @@ -17,17 +17,21 @@ table { margin: 15px auto; color: #fff; text-align: center; + font-size: 18px; .cdk-header-cell { text-align: center; + font-size: 18px; color: #fff; } } .mat-cell, .mat-footer-cell { + font-size: 18px; color: #fff } .mat-header-cell {color: #fff;} textarea,table { background-color: transparent; + font-size: 18px; } //重点提示 diff --git a/src/app/ui/plan/collection-tools.component.html b/src/app/ui/plan/collection-tools.component.html index 83a7929..19a8578 100644 --- a/src/app/ui/plan/collection-tools.component.html +++ b/src/app/ui/plan/collection-tools.component.html @@ -40,11 +40,12 @@
- + +
- +
@@ -229,11 +230,15 @@ - + {{node.name}} ({{node.children.length}}) - visibility + + + + + @@ -245,11 +250,15 @@ {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}} - + {{node.name}} ({{node.children.length}}) - visibility + + + + + diff --git a/src/app/ui/plan/collection-tools.component.scss b/src/app/ui/plan/collection-tools.component.scss index 14c0727..64f1529 100644 --- a/src/app/ui/plan/collection-tools.component.scss +++ b/src/app/ui/plan/collection-tools.component.scss @@ -14,11 +14,19 @@ .buildingbtnchecked{ color: white; background-image: url("../../../assets/images/标签选中.png")!important; + /* background-image: -webkit-linear-gradient(bottom, #fff, #9ABCE5); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; */ } } //头部操作栏 .headerOperate { + .xinzengtop{ + margin: 2px 30px; + margin-top: 8px; + } + background-image: url("../../../assets/images/top.png"); position: relative; span{ font-size: 18px; @@ -26,9 +34,9 @@ flex: 2%; display: flex; align-items:center; - min-height: 40px; + min-height: 45px; box-sizing: border-box; - margin: 3px 0; + margin: 0 0; .bigeditdeletebtn{ margin-right: 12px; @@ -38,7 +46,7 @@ // align-items:center;/*由于flex-direction: column，因此align-items代表的是水平方向*/ justify-content: center; user-select: none; - background-image: url("../../../assets/images/标签正常.png") ; + //background-image: url("../../../assets/images/标签选中.png") ; background-size:100% 100%; color: white; span{ @@ -48,7 +56,7 @@ } .bigeditdeletebtn:hover{ cursor: pointer; - background-image: url("../../../assets/images/标签经过.png") ; + background-image: url("../../../assets/images/标签选中.png") ; } .bigTalkBox{ user-select: none; @@ -141,14 +149,14 @@ flex: 5; } .functionalDomainLeft { - // background: url("../../../assets/images/列表背景.png"); + background: url("../../../assets/images/left\ list\ .png"); background-size: 100% 100%; display: flex; flex-direction: column; margin-left: 0px; transition: margin-left 0.5s; // min-width: 235px; - border: 1px solid #30bbec; + //border: 1px solid #30bbec; width: 235px; left: 0; z-index: 111; @@ -163,11 +171,15 @@ flex: 1; } .functionalDomainRight { + background-image:url("../../../assets/images/right\ list\ .png") ; + background-repeat: no-repeat; + background-size: 100% 100%; + -moz-background-size: 100% 100%; color: white; z-index: 1001; margin-right: 0px; transition: margin-right 0.5s; - border: 1px solid #30bbec; + //border: 1px solid #30bbec; width: 235px; right: 0; flex: 1; @@ -194,16 +206,20 @@ display: flex; align-content: center; span{ + //padding: 8px 8px; + font-size: 18px; display: inline-block; flex: 1; text-align: center; + font-family:"MicrosoftYaHei-Bold"; } span:hover{ cursor: pointer; } } .selectedTitle{ - background: #0c2d44; + //background: #83B0E0; + color: #82B0E0; } //右侧属性 @@ -360,6 +376,7 @@ position: absolute; right: 6px; z-index: 1000; + } } .mat-tree{ diff --git a/src/app/ui/plan/collection-tools.component.ts b/src/app/ui/plan/collection-tools.component.ts index 12390c4..80c9670 100644 --- a/src/app/ui/plan/collection-tools.component.ts +++ b/src/app/ui/plan/collection-tools.component.ts @@ -514,6 +514,7 @@ export class planComponent implements OnInit { //选择建筑 checkedBuilding(item,index){ + console.log(this.checkedBuildingIndex) if (this.checkedBuildingIndex!=index) { this.beforeOneCheckedBuilding = item this.checkedBuildingIndex = index diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index f3a39d6..07a0c32 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -7,7 +7,6 @@ import { CanvasShareDataService, GameMode } from '../canvas-share-data.service'; import {CacheTokenService} from '../http-interceptors/cache-token.service'; // 引入自动登录 获取token服务 import * as ObjectID from 'bson-objectid'; import { Router } from '@angular/router'; -import { isThisSecond } from 'date-fns'; import { Charm } from './charm'; @@ -19,7 +18,8 @@ import { Charm } from './charm'; export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterViewInit { - constructor(private eventManager: EventManager, public canvasData: CanvasShareDataService, public token: CacheTokenService, private router: Router, ) { + constructor(private eventManager: EventManager, public canvasData: CanvasShareDataService, + public token: CacheTokenService, private router: Router) { super(); } @@ -134,6 +134,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV public verificationURL = '/plan'; // 验证url地址是否为验证页面 public verificationURLTwo = '/similarPlans'; // 验证url地址是否为验证页面 count = 0; + clumn = 1; isLogin() { const token = sessionStorage.getItem('token'); // 判断 是否登录状态 if (token) { @@ -1611,7 +1612,11 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV carButton.setParent(this.app.stage); - carButton.position.set(25, this.count * 65); + if (this.count >= 12) { + this.count = 0; + this.clumn +=3; + } + carButton.position.set(this.clumn * 25, this.count * 65); this.count++; } /** diff --git a/src/assets/images/hide.png b/src/assets/images/hide.png new file mode 100644 index 0000000..3fec252 Binary files /dev/null and b/src/assets/images/hide.png differ diff --git a/src/assets/images/left list .png b/src/assets/images/left list .png new file mode 100644 index 0000000..a435f4d Binary files /dev/null and b/src/assets/images/left list .png differ diff --git a/src/assets/images/left list @2x.png b/src/assets/images/left list @2x.png new file mode 100644 index 0000000..727e3b9 Binary files /dev/null and b/src/assets/images/left list @2x.png differ diff --git a/src/assets/images/leftlist.png b/src/assets/images/leftlist.png new file mode 100644 index 0000000..2cbd518 Binary files /dev/null and b/src/assets/images/leftlist.png differ diff --git a/src/assets/images/pic.png b/src/assets/images/pic.png new file mode 100644 index 0000000..effb836 Binary files /dev/null and b/src/assets/images/pic.png differ diff --git a/src/assets/images/right list .png b/src/assets/images/right list .png new file mode 100644 index 0000000..0b7c7ad Binary files /dev/null and b/src/assets/images/right list .png differ diff --git a/src/assets/images/rightlist.png b/src/assets/images/rightlist.png new file mode 100644 index 0000000..c1461a3 Binary files /dev/null and b/src/assets/images/rightlist.png differ diff --git a/src/assets/images/show.png b/src/assets/images/show.png new file mode 100644 index 0000000..b8f0834 Binary files /dev/null and b/src/assets/images/show.png differ diff --git a/src/assets/images/处置预案.png b/src/assets/images/处置预案.png new file mode 100644 index 0000000..760cb58 Binary files /dev/null and b/src/assets/images/处置预案.png differ diff --git a/src/assets/images/形状4.png b/src/assets/images/形状4.png new file mode 100644 index 0000000..42a6985 Binary files /dev/null and b/src/assets/images/形状4.png differ diff --git a/src/assets/images/形状5.png b/src/assets/images/形状5.png new file mode 100644 index 0000000..42bbdc9 Binary files /dev/null and b/src/assets/images/形状5.png differ diff --git a/src/assets/images/形状6.png b/src/assets/images/形状6.png new file mode 100644 index 0000000..f55e2f2 Binary files /dev/null and b/src/assets/images/形状6.png differ diff --git a/src/assets/images/智能实战指挥平台.png b/src/assets/images/智能实战指挥平台.png new file mode 100644 index 0000000..00e9b9a Binary files /dev/null and b/src/assets/images/智能实战指挥平台.png differ diff --git a/src/assets/images/标签选中.png b/src/assets/images/标签选中.png index 5a07652..ac12870 100644 Binary files a/src/assets/images/标签选中.png and b/src/assets/images/标签选中.png differ diff --git a/src/assets/images/楼层区域.png b/src/assets/images/楼层区域.png new file mode 100644 index 0000000..251a838 Binary files /dev/null and b/src/assets/images/楼层区域.png differ diff --git a/src/styles.scss b/src/styles.scss index d68e5ab..54ee0b2 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -85,8 +85,6 @@ table td.mat-footer-cell:last-of-type{ overflow: hidden!important; } .mat-tab-label,.mat-tab-label,.mat-tab-label-content { - color: #fff; -} -.mat-tab-label-content{ - color: white; + color: #fff; + font-size: 18px; } \ No newline at end of file