[完善]审核页面重点单位和一般单位区分；审核记录增加参数

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config  proxy.config.json  --open --port 51423",
+    "start": "ng serve --proxy-config  proxy.config.json  --open --port 51423 --host 192.168.1.82",
     "build": "ng build",
     "build-prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod",
     "publish": "ng build --prod --verbose",

proxy.config.json

@@ -1,6 +1,6 @@
 {
   "/api": {
-    "target": "http://10.81.73.39:8000/",
+    "target": "http://121.36.37.70:8201/",
     "生产": "http://10.81.73.39:8000/",
     "测试": "http://121.36.37.70:8201/",
     "生产2": "http://183.194.244.232:8088/",

src/app/app.component.ts

@@ -20,12 +20,12 @@ export class AppComponent {
     private injector: Injector
   ) {
     global.injector = injector;
-  }
+  } 
 
   isMaskLayerShow: boolean = false;
 
   ngOnInit(): void {
-    console.log("更新日期2023.12.21");
+    console.log("更新日期2024.1.12");
     //监听遮罩层
     this.maskLayerService.getMessage().subscribe((message: any) => {
       this.isMaskLayerShow = message;

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

@@ -104,7 +104,12 @@
               <td style="width: 10%;">
                 <!-- <input type="radio" name="yuan"  value={{item.id}} [(ngModel)]="checked" (click)='radioClick(item)'> -->
                 {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
-                'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
+                'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':(item.contentType=='11'
+                &&item.itemObj&&
+                item.itemObj.isFollowed)?'重点单位':(item.contentType=='11'
+                &&item.itemObj&&
+                !item.itemObj.isFollowed)?'一般单位':(item.contentType=='11'
+                &&!item.itemObj)?'已删除':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
               </td>
               <td style="width: 10%;">
                 {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}

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

@@ -109,6 +109,7 @@ export class PlanRecordComponent implements OnInit {
       IsNewData: this.IsNewData,
       PageNumber: this.PageNumber,
       PageSize: 10,
+      PageType: 2,
     };
     this.http
       .get("/api/ContentVerifies", { params: paramsdata })
@@ -206,7 +207,6 @@ export class PlanRecordComponent implements OnInit {
       this.http
         .get(`/api/PlanComponents/${item.itemId}`)
         .subscribe((data: any) => {
-    
           this.companyId = data.companyId;
           this.companyName = data.companyName;
           //this.bianzhi = false

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

@@ -91,7 +91,12 @@
             </td>
             <td style="width: 10%;">
               {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
-              'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
+              'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':(item.contentType=='11'
+              &&item.itemObj&&
+              item.itemObj.isFollowed)?'重点单位':(item.contentType=='11'
+              &&item.itemObj&&
+              !item.itemObj.isFollowed)?'一般单位':(item.contentType=='11'
+              &&!item.itemObj)?'已删除':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
             </td>
             <td style="width: 10%;">
               {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@@ -817,7 +817,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
                     if (i.surveyName === "建筑信息") {
                       i.attinf.forEach((v) => {
                         if (v.completed) {
-                          v.propertyValue ? (v.value = v.propertyValue) : null;
+                          v.value ? null : (v.value = v.propertyValue);
                         }
                       });
                     }

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

@@ -86,7 +86,7 @@ export class EntryPlanComponent implements OnInit {
   organizationName: any; //当前单位组织机构名称
   preparelevels: any;
   integritySort: any = "desc"; //完整度排序
-  haveyuan = "true"; //有无预案
+  haveyuan; //有无预案
   colorRgb(sColor) {
     var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
     var sColor = sColor.toLowerCase();

src/index.html

@@ -24,9 +24,9 @@
     securityJsCode: '0afa0b144398727fad2ca06f5f7156b3'
   }
 </script>
-<!-- <script
+<script
   src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&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=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
 <script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->