From 0b0405af2cc44b787ca5a7ca8cf782050d9e3c48 Mon Sep 17 00:00:00 2001 From: Sjh <55341701@qq.com> Date: Fri, 12 Jan 2024 11:19:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=A1=E6=A0=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=87=8D=E7=82=B9=E5=8D=95=E4=BD=8D=E5=92=8C=E4=B8=80?= =?UTF-8?q?=E8=88=AC=E5=8D=95=E4=BD=8D=E5=8C=BA=E5=88=86=EF=BC=9B=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- proxy.config.json | 2 +- src/app/app.component.ts | 4 ++-- src/app/plan-audit/plan-record/plan-record.component.html | 7 ++++++- src/app/plan-audit/plan-record/plan-record.component.ts | 2 +- .../wait-examineer/wait-examineer.component.html | 7 ++++++- .../create-plan-online-five.component.ts | 2 +- src/app/plan-management/entry-plan/entry-plan.component.ts | 2 +- src/index.html | 4 ++-- 9 files changed, 21 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 4b4ab52..c7a7bb5 100644 --- a/package.json +++ b/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", diff --git a/proxy.config.json b/proxy.config.json index e61e510..8129e12 100644 --- a/proxy.config.json +++ b/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/", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index dce8026..f5fbc97 100644 --- a/src/app/app.component.ts +++ b/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; diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html index da81445..f79ed4b 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -104,7 +104,12 @@ {{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'?'联动力量':'未知'}} {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}} diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts index f002638..6f6a9e8 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/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 diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index 8789cac..bb58543 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -91,7 +91,12 @@ {{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'?'联动力量':'未知'}} {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}} diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index c3d7666..f99ddb9 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/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); } }); } diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts index ef18354..a9f5959 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/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(); diff --git a/src/index.html b/src/index.html index fac3faa..3931af2 100644 --- a/src/index.html +++ b/src/index.html @@ -24,9 +24,9 @@ securityJsCode: '0afa0b144398727fad2ca06f5f7156b3' } - +