diff --git a/src/app/ui/plan/collection-tools.component.html b/src/app/ui/plan/collection-tools.component.html index 428ea04..90b30b9 100644 --- a/src/app/ui/plan/collection-tools.component.html +++ b/src/app/ui/plan/collection-tools.component.html @@ -8,12 +8,24 @@
{{item.name}}
-
- settings_voice +
+ volume_up
泵房
控制室
+ +
+
+
+ settings_voice +
+
+ 按住说话 +
+
+ search +
@@ -38,7 +50,7 @@
-
+
@@ -101,22 +113,29 @@ 选中高亮
--> -
+
- 颜色 + 颜色
-
+ +

透明度

+ + +
{{colorDivSliderValue}}%
@@ -143,9 +162,9 @@

{{item.PropertyName}}

{{imagesArr.length ? imagesArr.length : 0}} / {{item.PropertyValue}} -
+
-
+
diff --git a/src/app/ui/plan/collection-tools.component.scss b/src/app/ui/plan/collection-tools.component.scss index 2e6d78a..af85a09 100644 --- a/src/app/ui/plan/collection-tools.component.scss +++ b/src/app/ui/plan/collection-tools.component.scss @@ -14,6 +14,7 @@ .buildingbtnchecked{ // background-color: #e46b03; color: white; + background-image: url("../../../assets/images/标签选中.png")!important; } } @@ -38,22 +39,28 @@ // align-items:center;/*由于flex-direction: column,因此align-items代表的是水平方向*/ justify-content: center; user-select: none; - background-image: url("../../../assets/images/numbg.png") ; + background-image: url("../../../assets/images/标签正常.png") ; background-size:100% 100%; color: white; span{ - margin: 0 13px ; + padding: 0 13px; + padding-right: 18px; } } .bigeditdeletebtn:hover{ - cursor: pointer; + cursor: pointer; + background-image: url("../../../assets/images/标签经过.png") ; } .bigTalkBox{ user-select: none; - right: 26px; + .titleIcon{ + font-size: 33px; + vertical-align: sub; + color: white; + } .talkBox{ - width: 330px; - height: 360px; + width: 309px; + height: 326px; border: 1px solid #30bbec; background-color: #013a64; opacity: .9 ; @@ -63,9 +70,47 @@ z-index: 2000; .btndiv{ div{ - border-radius: 8px; + border-radius: 18px; + width: 70px; + height: 30px; + text-align: center; + line-height: 30px; + display: inline-block; + font-size: 13px; + color: white; + cursor: pointer; + + } + div:nth-child(1){ + background-color: #fe9400; + margin: 10px; + } + div:nth-child(2){ + background-color: #f95e5a; + } + } + .bottomDiv{ + position: absolute; + bottom:6px; + width: 100%; + height: 32px; + line-height: 32px; + display: flex; + color: white; + text-align: center; + div:nth-child(1){ + flex: 1; + } + div:nth-child(2){ + flex: 6; + color: #409eff; + background: url('../../../assets/images/输入框.png'); + background-size: 100% 100%; + } + div:nth-child(3){ + flex: 1; + } - div:flist } } } @@ -97,9 +142,8 @@ flex: 5; } .functionalDomainLeft { - - background-color: #113e5e; - // opacity: 0.8; + // background: url("../../../assets/images/列表背景.png"); + background-size: 100% 100%; display: flex; flex-direction: column; margin-left: 0px; @@ -121,7 +165,7 @@ } .functionalDomainRight { color: white; - background-color: #113e5e; + // background-color: #113e5e; z-index: 1001; margin-right: 0px; transition: margin-right 0.5s; @@ -271,21 +315,7 @@ .colorBigDiv{ width: 88%; margin-left: 8px; - .colorBigTemplateDiv{ - span{ - color: #9c9fa5; - font-size: 14px; - height: 26px; - line-height: 26px; - } - .colorTemplateDiv{ - width: 65%; - height: 22px; - display: inline-block; - vertical-align: middle; - margin-left: 26px; - } - } + .colorDiv{ .colorLi{ @@ -300,7 +330,21 @@ } } } - + .colorBigTemplateDiv{ + span{ + color: #9c9fa5; + font-size: 14px; + height: 26px; + line-height: 26px; + } + .colorTemplateDiv{ + width: 65%; + height: 22px; + display: inline-block; + vertical-align: middle; + margin-left: 26px; + } + } } } //右侧消防要素 diff --git a/src/app/ui/plan/collection-tools.component.ts b/src/app/ui/plan/collection-tools.component.ts index d7b63f0..9e35e3a 100644 --- a/src/app/ui/plan/collection-tools.component.ts +++ b/src/app/ui/plan/collection-tools.component.ts @@ -695,7 +695,7 @@ export class planComponent implements OnInit { //陈鹏飞↓↓↓ //陈鹏飞↓↓↓ //陈鹏飞↓↓↓ - params = {companyId: "5e9964caa760a059e84512e9"} + params = {companyId: "5eaa261766f97891845a6caa"} allFireElements:any = []; //当前 单位/建筑 下的消防要素 isShowAttribute:boolean = true; //属性栏 是否显示 默认数据 diff --git a/src/assets/images/列表背景.png b/src/assets/images/列表背景.png new file mode 100644 index 0000000..e52aae7 Binary files /dev/null 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..2705df2 Binary files /dev/null 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..a449524 Binary files /dev/null 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..5a07652 Binary files /dev/null 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..e983a17 Binary files /dev/null and b/src/assets/images/输入框.png differ