Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/TheCommandPlatform-Anxin

src/app/ui/dangerous/dangerous.component.html

@@ -1 +1,6 @@
-<p>dangerous works!</p>
+<div class="box">
+    <div class="title">
+        <div>危化品类型</div>
+        <div>危化品分布</div>
+    </div>
+</div>

src/app/ui/dangerous/dangerous.component.scss

@@ -0,0 +1,17 @@
+.box{
+    width: 100%;
+    height: 100%;
+    border: 1px solid red;
+    display: flex;
+    flex-direction: column;
+    .title{
+        flex: 2%;
+        width: 100%;
+        div{
+            display: inline-block;
+            width: 200px;
+            height: 80%;
+            border: #26b5fb;
+        }
+    }
+}

src/app/ui/plan-assistance/plan-assistance.component.html

@@ -1 +1,11 @@
-<app-working-area #workingArea></app-working-area>
+<div class="content">
+    <div class="left">
+
+    </div>
+
+    <!-- canvas -->
+    <div class="center">
+        <app-working-area #workingArea></app-working-area>
+    </div>
+    <!-- canvas -->
+</div>

src/app/ui/plan-assistance/plan-assistance.component.scss

@@ -0,0 +1,20 @@
+.content {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    padding: 1px;
+    overflow: hidden;
+    display: flex;
+}
+
+//左侧菜单
+.left {
+    width: 300px;
+    height: 100%;
+    background-color: #000;
+}
+
+//右侧工作区
+.center {
+    flex: 1;
+}

src/app/ui/plan/collection-tools.component.html

@@ -153,12 +153,12 @@
                 <!-- 数值 -->
                 <div *ngIf="item.PropertyType == 2">
                   <p>{{item.PropertyName}}<span style="font-size: 14px;" *ngIf="item.PhysicalUnit">({{item.PhysicalUnit}})</span></p>
-                  <!-- <input type="number" class="biginput" [value]="item.PropertyValue" (input)="assetInputChange(item,$event)"> -->
                   <div class="siteproperty_size">{{item.PropertyValue}}</div>
                 </div>
                 <!-- 图片数量 -->
                 <div *ngIf="item.PropertyType == 4" style="height: 140px;">
                   <div style="position: relative;width: 100%;height: 21px;margin: 1px 0;">
+                    
                     <p style="width: 40%;display: inline-block;">{{item.PropertyName}}</p>
                     <span style="width: 26%;text-align:right;font-size: 13px;">{{imagesArr.length ? imagesArr.length : 0}} / {{item.PropertyValue}}</span>
                
@@ -173,8 +173,8 @@
                   </div>
                 </div>
                 <!-- 方向 -->
-                <div *ngIf="item.PropertyType == 5" class="selectDiv">
-                  <p style="display: inline-block;">{{item.PropertyName}}</p>
+                <div *ngIf="item.PropertyType == 5">
+                  <p>{{item.PropertyName}}</p>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==0">东</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==1">西</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==2">南</div>
@@ -183,16 +183,7 @@
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==5">西南</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==6">东北</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==7">西北</div>
-                  <!-- <select (change)="direction(item,$event)">
-                    <option value ="0" [selected]="item.PropertyValue ==0">东</option>
-                    <option value ="1" [selected]="item.PropertyValue ==1">西</option>
-                    <option value ="2" [selected]="item.PropertyValue ==2">南</option>
-                    <option value ="3" [selected]="item.PropertyValue ==3">北</option>
-                    <option value ="4" [selected]="item.PropertyValue ==4">东南</option>
-                    <option value ="5" [selected]="item.PropertyValue ==5">西南</option>
-                    <option value ="6" [selected]="item.PropertyValue ==6">东北</option>
-                    <option value ="7" [selected]="item.PropertyValue ==7">西北</option>
-                  </select> -->
+  
                 </div>
                 <!-- 布尔值 是1或否0 -->
                 <div *ngIf="item.PropertyType == 6">
@@ -204,7 +195,7 @@
                   <input [checked]="item.PropertyValue == 0" class="input" type="radio" name="radio" (click)="assetRadioChange(item,'0')"><span>否</span> -->
                 </div>
                 <!-- 供给区域 -->
-                <div *ngIf="item.PropertyType == 7" class="selectDiv">
+                <div *ngIf="item.PropertyType == 7">
                   <p style="display: inline-block;">{{item.PropertyName}}</p>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==0">全部</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==1">高区</div>
@@ -213,31 +204,15 @@
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==4">高中区</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==5">高低区</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==6">中底区</div>
-                  <!-- <select (change)="supplyArea(item,$event)">
-                    <option value ="0" [selected]="item.PropertyValue ==0">全部</option>
-                    <option value ="1" [selected]="item.PropertyValue ==1">高区</option>
-                    <option value ="2" [selected]="item.PropertyValue ==2">中区</option>
-                    <option value ="3" [selected]="item.PropertyValue ==3">低区</option>
-                    <option value ="4" [selected]="item.PropertyValue ==4">高中区</option>
-                    <option value ="5" [selected]="item.PropertyValue ==5">高低区</option>
-                    <option value ="6" [selected]="item.PropertyValue ==6">中低区</option>
-                  </select> -->
                 </div>
                 <!-- 供给类型 -->
-                <div *ngIf="item.PropertyType == 8" class="selectDiv">
+                <div *ngIf="item.PropertyType == 8">
                   <p style="display: inline-block;">{{item.PropertyName}}</p>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==0">消火栓</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==1">喷淋</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==2">水幕</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==3">泡沫</div>
                   <div class="siteproperty_size" *ngIf="item.PropertyValue ==4">消防</div>
-                  <!-- <select (change)="supplyType(item,$event)" value="4">
-                    <option value ="0" [selected]="item.PropertyValue ==0">消火栓</option>
-                    <option value ="1" [selected]="item.PropertyValue ==1">喷淋</option>
-                    <option value ="2" [selected]="item.PropertyValue ==2">水幕</option>
-                    <option value ="3" [selected]="item.PropertyValue ==3">泡沫</option>
-                    <option value ="4" [selected]="item.PropertyValue ==4">消防</option>
-                  </select> -->
                 </div>
             </div>
             </div>