Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/data-collection/water-collection/water-collection.component.html

@@ -113,6 +113,14 @@
                         </span>
                         <input [(ngModel)]="waterData.administrativeRegion" type="text">
                     </mat-grid-tile>
+                    <!-- 上海数据导入后, 行政区字段无数据, 组织机构有数据 -->
+                    <!-- 显示暂且维持不变 -->
+                    <!-- <mat-grid-tile colspan='1' rowspan='1'>
+                        <span>
+                            组织机构:
+                        </span>
+                        <input [(ngModel)]="waterData.organizationName" type="text">
+                    </mat-grid-tile> -->
                     <mat-grid-tile colspan='2' rowspan='1'>
                         <span>
                             水源归属:
@@ -161,8 +169,7 @@
                         </span>
                         <select [(ngModel)]="fireCockData[0].PropertyValue">
                             <option value="0">可用</option>
-                            <option value="1">维护</option>
+                            <option value="1">不可用</option>
-                            <option value="2">损坏</option>
                         </select>
                     </mat-grid-tile>
                     <mat-grid-tile colspan='2' rowspan='1'>
@@ -172,6 +179,8 @@
                         <select [(ngModel)]="fireCockData[1].PropertyValue">
                             <option value="0">地上</option>
                             <option value="1">地下</option>
+                            <option value="2">室内</option>
+                            <option value="-1">其他</option>
                         </select>
                     </mat-grid-tile>
                     <mat-grid-tile colspan='2' rowspan='1'>
@@ -179,10 +188,10 @@
                             管网形式:
                         </span>
                         <select [(ngModel)]="fireCockData[2].PropertyValue">
-                            <option value="0">枝状管网</option>
+                            <option value="0">环状管网</option>
-                            <option value="1">环状管网</option>
+                            <option value="1">枝状管网</option>
-                            <option value="2">混合状管网</option>
+                            <!-- <option value="2">混合状管网</option> -->
-                            <option value="3">其他</option>
+                            <option value="-1">其他</option>
                         </select>
                     </mat-grid-tile>
                     <mat-grid-tile colspan='2' rowspan='1'>
@@ -190,14 +199,15 @@
                             管网直径:
                         </span>
                         <div class="unitDiv">
-                            <select [(ngModel)]="fireCockData[3].PropertyValue">
+                            <input type="text" [(ngModel)]="fireCockData[3].PropertyValue">
+                            <!-- <select [(ngModel)]="fireCockData[3].PropertyValue">
                                 <option value="0">100</option>
                                 <option value="1">150</option>
                                 <option value="2">200</option>
                                 <option value="3">300</option>
                                 <option value="4">350</option>
                                 <option value="5">400</option>
-                            </select>
+                            </select> -->
                             <span class="unit">mm</span>
                         </div>  
                     </mat-grid-tile>
@@ -226,8 +236,9 @@
                         </span>
                         <select [(ngModel)]="fireCockData[6].PropertyValue">
                             <option value="0">内扣式</option>
-                            <option value="1">卡式</option>
+                            <option value="1">螺纹式</option>
-                            <option value="2">螺纹式</option>
+                            <option value="2">卡式</option>
+                            <option value="3">其他</option>
                         </select>
                     </mat-grid-tile>
                     <mat-grid-tile colspan='2' rowspan='1'>

src/app/data-collection/water-collection/water-collection.component.ts

@@ -355,7 +355,8 @@ export class WaterCollectionComponent implements OnInit {
       location:{x:'',y:''},
       detailData:'',//详细信息
       createTime:'',
-      creatorId:''
+      creatorId:'',
+      organizationName:''
     }
     this.fireCockData = [
       {PropertyName :'可用状态',PropertyValue:''},