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

4 years ago · 31d071359b
8 changed files with 56 additions and 19 deletions
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@ -125,7 +125,7 @@
      <div *ngIf="showtype == 3" id="firefacilities" style="margin: 10px;">
        <mat-accordion *ngIf="selectedItem.differentContent" class="tableContent" multi>
          <!-- 基本信息 -->
-          <mat-expansion-panel  *ngIf="this.differentContentOfUnitInfo[0].childrens.length != 0" expanded>
+          <mat-expansion-panel  *ngIf="this.differentContentOfUnitInfo.length != 0 && this.differentContentOfUnitInfo[0].childrens.length != 0" expanded>
            <mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px' class="panelhead"
              style="background-color: #2196F3;">
              <mat-panel-title style="font-size: 16px;color: #FFFFFF;">
@ -235,7 +235,7 @@
            </div>
          </mat-expansion-panel>
          <!-- 实景图 -->
-          <mat-expansion-panel  *ngIf="this.differentContentOfPicture[0].childrens.length != 0" expanded>
+          <mat-expansion-panel  *ngIf="this.differentContentOfPicture.length != 0 && this.differentContentOfPicture[0].childrens.length != 0" expanded>
            <mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px' class="panelhead"
              style="background-color: #2196F3;">
              <mat-panel-title style="font-size: 16px;color: #FFFFFF;">
--- a/src/app/plan-management/entry-plan-look/AddPlanone.html
+++ b/src/app/plan-management/entry-plan-look/AddPlanone.html
@ -62,7 +62,7 @@
                            <span *ngIf="uploadover" style="font-size: 13px;">(已上传)</span>
                        </div>
                        <div *ngIf="inputword">
-                          <mat-radio-button value="2" style="margin-right: 10px;">在线编制</mat-radio-button>
+                          <!-- <mat-radio-button value="2" style="margin-right: 10px;">在线编制</mat-radio-button> -->
                          <!-- <button mat-raised-button *ngIf="isinput" (click)='createWord()'>在线编制预案</button> -->
                        </div>
                        <!-- <div *ngIf="inputword">
--- a/src/app/ui/collection-tools-building/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-building/collection-tools.component.ts
@ -894,15 +894,23 @@ export class CollectionToolsBuildingComponent implements OnInit {
    if (this.selectingSitePlan && this.selectingSitePlan.id) {
      //打开遮罩层
      this.maskLayerService.sendMessage(true)
+      //遍历 建筑数据 删除多余数据
+      let object = this.canvasData.originalcompanyBuildingData.data
+      let adjoinArr = [] //毗邻数组
+      Object.keys(object).forEach(key=>{
+        let isExist = this.sitePlanData.find(item=>{ return item.id === object[key].FloorId })
+        if (isExist === undefined) {
+          console.log(object[key],'当前楼层已被删除')
+          delete object[key]
+        }
+      })
+      //遍历 建筑数据 删除多余数据
      this.saveNum = []
      let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
      SitePlanData.data = JSON.stringify(SitePlanData.data)
      let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
      CompanyData.data = JSON.stringify(CompanyData.data)

-      let object = this.canvasData.originalcompanyBuildingData.data
-      let adjoinArr = [] //毗邻数组
-
      if (this.pattern) {//如果是基本信息编辑模式
        for (const key in object) {
          if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻
@ -1882,6 +1890,8 @@ export class CollectionToolsBuildingComponent implements OnInit {
  deletePlaneData(item) {
    const isDelete = confirm('您确定要删除吗');
    if (isDelete) {
+      //打开遮罩层
+      this.maskLayerService.sendMessage(true)
      if (this.checkedBuildingIndex == -1) { //总平面图
        let isHave = this.canvasData.allDisposalNode.find(items => { return items.sitePlanId === item.id })
        if (isHave == undefined) {
@ -1933,9 +1943,11 @@ export class CollectionToolsBuildingComponent implements OnInit {
    if (isCompany === -1) {
      this.http.post("/api/CompanyData", newData).subscribe(data => { })
      this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
+      this.maskLayerService.sendMessage(false)
    } else {
      this.http.post("/api/BuildingData", newData, { params: this.params }).subscribe(data => { })
      this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
+      this.maskLayerService.sendMessage(false)
    }
  }

--- a/src/app/ui/collection-tools-plan/addPlaneFigure.html
+++ b/src/app/ui/collection-tools-plan/addPlaneFigure.html
@ -12,9 +12,9 @@
      </mat-form-field>
    </div>

-    <div class="keyMargin">
+    <!-- <div class="keyMargin">
      <a href="javascript:;" class="uploadBackGround" (click)='toGIS()' [ngClass]="{'uploadBackGroundSelected': selectedType == 'gis'}">导入GIS地图</a>
-    </div>
+    </div> -->

    <div class="keyMargin">
      <a href="javascript:;" class="uploadBackGround" [ngClass]="{'uploadBackGroundSelected': selectedType == 'image'}">
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@ -804,15 +804,23 @@ export class CollectionToolsPlanComponent implements OnInit {
        if (this.selectingSitePlan && this.selectingSitePlan.id) {
            //打开遮罩层
            this.maskLayerService.sendMessage(true)
+            //遍历 建筑数据 删除多余数据
+            let object = this.canvasData.originalcompanyBuildingData.data
+            let adjoinArr = [] //毗邻数组
+            Object.keys(object).forEach(key=>{
+              let isExist = this.sitePlanData.find(item=>{ return item.id === object[key].FloorId })
+              if (isExist === undefined) {
+                console.log(object[key],'当前楼层已被删除')
+                delete object[key]
+              }
+            })
+            //遍历 建筑数据 删除多余数据
            this.saveNum = []
            let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
            SitePlanData.data = JSON.stringify(SitePlanData.data)
            let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
            CompanyData.data = JSON.stringify(CompanyData.data)

-            let object = this.canvasData.originalcompanyBuildingData.data
-            let adjoinArr = [] //毗邻数组
-
            if (this.pattern) {//如果是基本信息编辑模式
                for (const key in object) {
                    if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻
@ -1884,6 +1892,8 @@ export class CollectionToolsPlanComponent implements OnInit {
    deletePlaneData(item) {
        const isDelete = confirm('您确定要删除吗');
        if (isDelete) {
+            //打开遮罩层
+            this.maskLayerService.sendMessage(true)
            if (this.checkedBuildingIndex == -1) { //总平面图
                let isHave = this.canvasData.allDisposalNode.find(items => { return items.sitePlanId === item.id })
                if (isHave == undefined) {
@ -1935,9 +1945,11 @@ export class CollectionToolsPlanComponent implements OnInit {
        if (isCompany === -1) {
            this.http.post("/api/CompanyData", newData).subscribe(data => { })
            this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
+            this.maskLayerService.sendMessage(false)
        } else {
            this.http.post("/api/BuildingData", newData, { params: this.params }).subscribe(data => { })
            this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
+            this.maskLayerService.sendMessage(false)
        }
    }

--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@ -917,15 +917,23 @@ export class CollectionToolsComponent implements OnInit {
    this.canvasData.updateBuildingData()

    if (this.selectingSitePlan && this.selectingSitePlan.id) {
+      //遍历 建筑数据 删除多余数据
+      let object = this.canvasData.originalcompanyBuildingData.data
+      let adjoinArr = [] //毗邻数组
+      Object.keys(object).forEach(key=>{
+        let isExist = this.sitePlanData.find(item=>{ return item.id === object[key].FloorId })
+        if (isExist === undefined) {
+          console.log(object[key],'当前楼层已被删除')
+          delete object[key]
+        }
+      })
+      //遍历 建筑数据 删除多余数据
      this.saveNum = []
      let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
      SitePlanData.data = JSON.stringify(SitePlanData.data)
      let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
      CompanyData.data = JSON.stringify(CompanyData.data)

-      let object = this.canvasData.originalcompanyBuildingData.data
-      let adjoinArr = [] //毗邻数组
-
      if (this.pattern) {//如果是基本信息编辑模式
        this.maskLayerService.sendMessage(true)
        for (const key in object) {
@ -1929,6 +1937,8 @@ export class CollectionToolsComponent implements OnInit {
  deletePlaneData(item) {
    const isDelete = confirm('您确定要删除吗');
    if (isDelete) {
+      //打开遮罩层
+      this.maskLayerService.sendMessage(true)
      if (this.checkedBuildingIndex == -1) { //总平面图
        let isHave = this.canvasData.allDisposalNode.find(items => { return items.sitePlanId === item.id })
        if (isHave == undefined) {
@ -1980,9 +1990,11 @@ export class CollectionToolsComponent implements OnInit {
    if (isCompany === -1) {
      this.http.post("/api/CompanyData", newData).subscribe(data => { })
      this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
+      this.maskLayerService.sendMessage(false)
    } else {
      this.http.post("/api/BuildingData", newData, { params: this.params }).subscribe(data => { })
      this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
+      this.maskLayerService.sendMessage(false)
    }
  }

--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@ -175,7 +175,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   * 重大调整-主版本号增加
   * 日期变更-日期版本号增加
   */
-  public VERSION = '1.5.1.20210715';
+  public VERSION = '1.5.2.20210719';
  /**
   * 数据初始化
   */
@ -614,6 +614,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
        }
        (axShape.assetData.PropertyInfos.find(i => i.PropertyName == "名称/编号")).PropertyValue = index;
      }
+      axShape.refresh();
      this.emit('canvasDataChanged');
      this.canvasData.isChange = true;
      this.updateCamera2D();
--- a/src/index.html
+++ b/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/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/ui/1.1/main.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/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/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>