[完善]审核预案查看

proxy.config.json

@@ -1,6 +1,6 @@
 {
     "/api": {
-      "target": "http://121.36.37.70:8201",
+      "target": "http://10.81.73.39:8000",
       "secure": false,
       "changeOrigin": true
     }

src/app/data-collection/fire-force/fire-force.component.html

@@ -43,8 +43,9 @@
             </div>
             <div class="fireForceTree" id="fireForceTree" *ngIf="isTreeView">
                 <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
-                    <mat-tree-node (click)="selectTreeNode(node)" [ngClass]="{'selectedTreeNode': node.id == selectedFireForceId}"
+                    <mat-tree-node (click)="selectTreeNode(node)"
-                        *matTreeNodeDef="let node;" matTreeNodePadding matTreeNodePaddingIndent='10px'>
+                        [ngClass]="{'selectedTreeNode': node.id == selectedFireForceId}" *matTreeNodeDef="let node;"
+                        matTreeNodePadding matTreeNodePaddingIndent='10px'>
 
                         <button mat-icon-button disabled></button>
                         <span class="nodename">{{node.name}}</span>
@@ -113,7 +114,8 @@
     <div class="mapbox">
         <div class="mapcheckbox">
             <mat-checkbox (change)="checkBoxChange()" [(ngModel)]="item.isChecked" color="primary"
-                *ngFor="let item of checkBoxList">{{item.name}}</mat-checkbox>
+                *ngFor="let item of checkBoxList">{{item.name}}
+            </mat-checkbox>
         </div>
         <div id="map" class="map" style="overflow: hidden;">
             <div id="container"></div>
@@ -219,8 +221,8 @@
                             <span>
                                 备注:
                             </span>
-                            <textarea [(ngModel)]="FireForceDetailInfo.remark" style="height: 80%;width: 84%;"
+                            <textarea [(ngModel)]="FireForceDetailInfo.remark" style="height: 80%;width: 84%;" cols="30"
-                                cols="30" rows="10"></textarea>
+                                rows="10"></textarea>
                         </mat-grid-tile>
                     </mat-grid-list>
                     <p>位置信息</p>
@@ -350,8 +352,8 @@
                             <span>
                                 备注:
                             </span>
-                            <textarea [(ngModel)]="FireForceDetailInfo.remark" style="height: 80%;width: 84%;"
+                            <textarea [(ngModel)]="FireForceDetailInfo.remark" style="height: 80%;width: 84%;" cols="30"
-                                cols="30" rows="10"></textarea>
+                                rows="10"></textarea>
                         </mat-grid-tile>
                     </mat-grid-list>
                     <p>位置信息</p>
@@ -540,8 +542,8 @@
                             <span>
                                 备注:
                             </span>
-                            <textarea [(ngModel)]="FireForceDetailInfo.remark" style="height: 80%;width: 82%;"
+                            <textarea [(ngModel)]="FireForceDetailInfo.remark" style="height: 80%;width: 82%;" cols="30"
-                                cols="30" rows="10"></textarea>
+                                rows="10"></textarea>
                         </mat-grid-tile>
                     </mat-grid-list>
                     <p>位置信息</p>

src/app/external-links-plan/external-links-plan.component.ts

@@ -91,7 +91,7 @@ export class ExternalLinksPlanComponent implements OnInit {
   threedUrl: any
   handleData() {
     let data = this.planData
-    if (this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件
+    if (this.planData.planMode == 1 || this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件
 
       this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => {
         console.log(data)

src/app/plan-audit/plan-pass/plan-pass.component.ts

@@ -82,11 +82,10 @@ export class PlanPassComponent implements OnInit {
         this.http.get(`/api/ObjectMetadata/PlanPlatform/${item}`).subscribe((data: any) => {
           data.isLoading = false
           this.allFile.push(data)
-          this.allFile = new MatTableDataSource<any>(this.allFile) })
+          this.allFile = new MatTableDataSource<any>(this.allFile)
+        })
       });
-    } else if (this.planData.planMode==1) { //预案planMode=1时, 解析文档
+    } else if (this.planData.planMode == 1 || this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件
-
-    } else if (this.planData.planMode==2) { //预案planMode=2时, 跳查看页面组件
       sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length ? this.compantData.buildingTypes[0].id : undefined);
       sessionStorage.setItem("companyId", this.route.snapshot.queryParams.id);
       sessionStorage.setItem("planId", this.route.snapshot.queryParams.auditPlanId);
@@ -143,7 +142,8 @@ export class PlanPassComponent implements OnInit {
 
       let result = await new Promise((result, reject) => {
         this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => {
-          result(data) }) 
+          result(data)
+        })
       })
       allFile.push(result)
       e.progress = Number((i / allSlice).toFixed(2)) * 100 + '%'

src/app/plan-audit/plan-record/plan-record.component.ts

@@ -274,6 +274,7 @@ export class PlanRecordComponent implements OnInit {
   planType
   twoOrthree
   handleData() {
+    console.log(this.planData)
     this.compantData = { name: '', buildingTypes: [], address: '' }
     this.planType = this.planData.planMode
     let data = this.planData
@@ -284,9 +285,7 @@ export class PlanRecordComponent implements OnInit {
     }
     if (this.planData.planMode == 0) { //预案planMode=0时, 查看word
       //this.lookWord()
-    } else if (this.planData.planMode == 1) { //预案planMode=1时, 解析文档
+    } else if (this.planData.planMode == 1 || this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件
-
-    } else if (this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件
       this.showtype = 2
       this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => {
         data && data.company ? this.compantData = data.company : null

src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@@ -181,7 +181,7 @@ export class WaitExamineerComponent implements OnInit {
   bianzhi = false
   radioClick(e, item) {
     this.selectedItem = item
-    //console.log(item)
+
     // console.log('当前选择的信息',JSON.parse(this.selectedItem.differentContent) )
     if (item.contentType == 11 && this.selectedItem.differentContent) {
 
@@ -242,9 +242,6 @@ export class WaitExamineerComponent implements OnInit {
 
     // console.log('功能分区', this.differentContentOfFunction)
 
-
-
-
     this.showtype = -1
     this.organizationName = ''
     this.itemid = item.itemId
@@ -380,6 +377,7 @@ export class WaitExamineerComponent implements OnInit {
   planType
   twoOrthree
   handleData() {
+    
     this.compantData = { name: '', buildingTypes: [], address: '' }
     this.planType = this.planData.planMode
     let data = this.planData
@@ -390,9 +388,7 @@ export class WaitExamineerComponent implements OnInit {
     }
     if (this.planData.planMode == 0) { //预案planMode=0时, 查看word
       //this.lookWord()
-    } else if (this.planData.planMode == 1) { //预案planMode=1时, 解析文档
+    } else if (this.planData.planMode == 1 || this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件
-
-    } else if (this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件
       this.showtype = 2
       this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => {
         data && data.company ? this.compantData = data.company : null

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -1157,7 +1157,7 @@ export class AddPlanone {
       this.website = false
     }
     if (formdata.value.firstCtrltwo == '1') { //如果是2D预案
-      this.localup = true
+      this.localup = false
       this.inputword = false
       this.onlineedit = true
       this.website = true

src/index.html

@@ -23,10 +23,10 @@
 </body>
 
 <!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
-<!-- <script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
+<script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
+<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
-<script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
+<!-- <script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="https://webapi.amap.com/ui/1.1/main.js"></script>
+<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->
 <script src="/assets/html2canvas.js"></script>
 <script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
 <script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>