From b602f048c60bcbd2926de8cba7dc9c05a3569d8a Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 23 Aug 2022 09:12:44 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]8.23=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 proxy.config.json                             |  2 +-
 reset.css                                     | 77 ++++++++++++++-----
 .../plan-record/plan-record.component.html    | 12 +--
 .../wait-examineer.component.html             | 12 +--
 .../entry-plan-look/AddPlanone.html           |  4 +-
 .../entry-plan-look.component.html            |  4 +-
 .../entry-plan/entry-plan.component.html      |  4 +-
 .../open-plan/open-plan.component.html        |  4 +-
 .../pass-plan/pass-plan.component.html        | 12 +--
 .../combined-query.component.html             |  4 +-
 11 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index c9002ee..651febb 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",
+    "start": "ng serve --proxy-config  proxy.config.json  --open --port 7542 ",
     "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 f25983f..4095b1c 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,6 @@
 {
     "/api": {
-      "target": "http://121.36.37.70:8201",
+      "target": "http://121.36.37.70:8205",
       "secure": false,
       "changeOrigin": true
     }
diff --git a/reset.css b/reset.css
index c67618d..bc053b2 100644
--- a/reset.css
+++ b/reset.css
@@ -1,27 +1,66 @@
 @charset "utf-8";
-html,body,ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{
-	margin:0;
-	padding:0;
-	font-size:16px;
+html,
+body,
+ul,
+ol,
+dl,
+li,
+dt,
+dd,
+p,
+form,
+input,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+section,
+article,
+aside,
+header,
+footer,
+nav,
+figure,
+time,
+mark,
+main,
+canvas {
+	margin: 0;
+	padding: 0;
+	font-size: 16px;
 }
-b,strong,i,em,h1,h2,h3,h4,h5,h6{
-	font-weight:500;
-	font-style:normal;
+b,
+strong,
+i,
+em,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-weight: 500;
+	font-style: normal;
 }
-img{
-	border:none;
+img {
+	border: none;
 }
-a{
+a {
 	text-decoration: none;
-	color:#000;
-ul,ol,li{
-	list-style:none;
+	color: #000;
 }
-.clearfn:after{
-	content:"";
-	clear:both;
+ul,
+ol,
+li {
+	list-style: none;
+}
+.clearfn:after {
+	content: "";
+	clear: both;
 	display: block;
-	overflow:hidden;
-	height:0;
+	overflow: hidden;
+	height: 0;
 	visibility: hidden;
-}
\ No newline at end of file
+}
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 20e1890..23eca22 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.html
+++ b/src/app/plan-audit/plan-record/plan-record.component.html
@@ -32,18 +32,18 @@
                 <span>类型：</span>
                 <mat-form-field>
                   <mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel">
-                    <mat-option value="1">Ⅰ级预案</mat-option>
-                    <mat-option value="2">Ⅱ级预案</mat-option>
+                    <!-- <mat-option value="1">Ⅰ级预案</mat-option>
+                    <mat-option value="2">Ⅱ级预案</mat-option> -->
                     <mat-option value="3">Ⅲ级预案</mat-option>
                     <mat-option value="4">Ⅳ级预案</mat-option>
                     <mat-option value="5">Ⅴ级预案</mat-option>
-                    <mat-option value="6">应急预案(国家级)</mat-option>
-                    <mat-option value="7">应急预案(市级)</mat-option>
+                    <!-- <mat-option value="6">应急预案(国家级)</mat-option>
+                    <mat-option value="7">应急预案(市级)</mat-option> -->
                     <mat-option value="8">类型预案</mat-option>
                     <mat-option value="11">重点单位</mat-option>
-                    <mat-option value="12">消防水源</mat-option>
+                    <!-- <mat-option value="12">消防水源</mat-option>
                     <mat-option value="13">消防力量</mat-option>
-                    <mat-option value="14">联动力量</mat-option>
+                    <mat-option value="14">联动力量</mat-option> -->
                   </mat-select>
               </mat-form-field>
               <span>状态：</span>
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 3e3d469..b8ba2c7 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -17,18 +17,18 @@
             <span>类型：</span>
           <mat-form-field>
             <mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel">
-              <mat-option value="1">Ⅰ级预案</mat-option>
-              <mat-option value="2">Ⅱ级预案</mat-option>
+              <!-- <mat-option value="1">Ⅰ级预案</mat-option>
+              <mat-option value="2">Ⅱ级预案</mat-option> -->
               <mat-option value="3">Ⅲ级预案</mat-option>
               <mat-option value="4">Ⅳ级预案</mat-option>
               <mat-option value="5">Ⅴ级预案</mat-option>
-              <mat-option value="6">应急预案(国家级)</mat-option>
-              <mat-option value="7">应急预案(市级)</mat-option>
+              <!-- <mat-option value="6">应急预案(国家级)</mat-option>
+              <mat-option value="7">应急预案(市级)</mat-option> -->
               <mat-option value="8">类型预案</mat-option>
               <mat-option value="11">重点单位</mat-option>
-              <mat-option value="12">消防水源</mat-option>
+              <!-- <mat-option value="12">消防水源</mat-option>
               <mat-option value="13">消防力量</mat-option>
-              <mat-option value="14">联动力量</mat-option>
+              <mat-option value="14">联动力量</mat-option> -->
             </mat-select>
           </mat-form-field>
           <span class="bzjb">编制级别：</span>
diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html
index 1ae25a0..50c0bd1 100644
--- a/src/app/plan-management/entry-plan-look/AddPlanone.html
+++ b/src/app/plan-management/entry-plan-look/AddPlanone.html
@@ -74,14 +74,14 @@
                         </div> -->
                         <!-- <div *ngIf="pswShow">
                           <mat-checkbox [(ngModel)]='psw' name='psw' style="margin-left: 2px;">是否为全景图</mat-checkbox>
-                        </div>
+                        </div> -->
                         <div *ngIf="onlineedit">
                             <mat-radio-button value="2">在线编辑</mat-radio-button>
                         </div>
                         <div *ngIf="website">
                             <mat-radio-button value="3">网页地址</mat-radio-button>
                             <input type="text" *ngIf="isweb" name="webaddress" [(ngModel)]="webaddress" style="width: 175px;height: 20px;margin-left:10px;">
-                        </div> -->
+                        </div>
                         
                     </mat-radio-group>
                     
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
index 5fc22b0..ea2c851 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
@@ -108,8 +108,8 @@
                     <th mat-header-cell *matHeaderCellDef>操作</th>
                     <td mat-cell *matCellDef="let element">
                         <span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span>
-                        <span (click)="upzhuanMb(element)"
-                            *ngIf="element.planMode==1&&element.planType==16&&element.planCategory==5">转在线导入</span>
+                        <!-- <span (click)="upzhuanMb(element)"
+                            *ngIf="element.planMode==1&&element.planType==16&&element.planCategory==5">转在线导入</span> -->
                         <span (click)="editPlan(element)"
                             [ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1' )}">编辑</span>
                         <span (click)="lookPlan(element)"
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html
index dfaaade..c26248f 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.html
+++ b/src/app/plan-management/entry-plan/entry-plan.component.html
@@ -152,12 +152,12 @@
                         </mat-select>
                     </mat-form-field>
                 </div>
-                <div class="queryField" *ngIf="!padMore&&!pcMore">
+                <!-- <div class="queryField" *ngIf="!padMore&&!pcMore">
                     <mat-checkbox (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan">模板录入预案</mat-checkbox>
                 </div>
                 <div class="queryField" *ngIf="!padMore&&!pcMore">
                     <mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案</mat-checkbox>
-                </div>
+                </div> -->
             </div>
         </form>
     </div>
diff --git a/src/app/plan-management/open-plan/open-plan.component.html b/src/app/plan-management/open-plan/open-plan.component.html
index d9eb115..1071a5a 100644
--- a/src/app/plan-management/open-plan/open-plan.component.html
+++ b/src/app/plan-management/open-plan/open-plan.component.html
@@ -66,14 +66,14 @@
             </mat-select>
           </mat-form-field>
         </div>
-        <div class="queryField" *ngIf="!padMore">
+        <!-- <div class="queryField" *ngIf="!padMore">
           <mat-checkbox (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan">
             模板录入预案</mat-checkbox>
         </div>
         <div class="queryField" *ngIf="!padMore">
           <mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案
           </mat-checkbox>
-        </div>
+        </div> -->
         <div class="queryField" *ngIf="pcfind">
           <button mat-raised-button color="primary">查询</button>
           <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html
index 9d743e5..ecb120d 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.html
+++ b/src/app/plan-management/pass-plan/pass-plan.component.html
@@ -90,11 +90,11 @@
           <label style="margin-right: 10px;">预案级别:</label>
           <mat-form-field>
             <mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true">
-              <mat-option value=6>应急预案(国家级)</mat-option>
-              <mat-option value=7>应急预案(市级)</mat-option>
+              <!-- <mat-option value=6>应急预案(国家级)</mat-option>
+              <mat-option value=7>应急预案(市级)</mat-option> -->
               <mat-option value=8>类型预案</mat-option>
-              <mat-option value=1>Ⅰ级预案</mat-option>
-              <mat-option value=2>Ⅱ级预案</mat-option>
+              <!-- <mat-option value=1>Ⅰ级预案</mat-option>
+              <mat-option value=2>Ⅱ级预案</mat-option> -->
               <mat-option value=3>Ⅲ级预案</mat-option>
               <mat-option value=4>Ⅳ级预案</mat-option>
               <mat-option value=5>Ⅴ级预案</mat-option>
@@ -131,14 +131,14 @@
             </mat-select>
           </mat-form-field>
         </div>
-        <div class="queryField" *ngIf="!padMore&&!pcMore">
+        <!-- <div class="queryField" *ngIf="!padMore&&!pcMore">
           <mat-checkbox (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan">
             模板录入预案</mat-checkbox>
         </div>
         <div class="queryField" *ngIf="!padMore&&!pcMore">
           <mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案
           </mat-checkbox>
-        </div>
+        </div> -->
       </div>
 
     </form>
diff --git a/src/app/statistic-analysis/combined-query/combined-query.component.html b/src/app/statistic-analysis/combined-query/combined-query.component.html
index 19ba348..39e74ee 100644
--- a/src/app/statistic-analysis/combined-query/combined-query.component.html
+++ b/src/app/statistic-analysis/combined-query/combined-query.component.html
@@ -95,8 +95,8 @@
                 <label style="margin-right: 10px;">预案级别:</label>
                 <mat-form-field>
                   <mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true">
-                    <mat-option value=1>Ⅰ级预案</mat-option>
-                    <mat-option value=2>Ⅱ级预案</mat-option>
+                    <!-- <mat-option value=1>Ⅰ级预案</mat-option>
+                    <mat-option value=2>Ⅱ级预案</mat-option> -->
                     <mat-option value=3>Ⅲ级预案</mat-option>
                     <mat-option value=4>Ⅳ级预案</mat-option>
                     <mat-option value=5>Ⅴ级预案</mat-option>