shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[修改]8.23修改意见

tangshan
邵佳豪 3 years ago
parent
357ed14f63
commit
b602f048c6
11 changed files with 88 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      package.json
  2. 2
      proxy.config.json
  3. 45
      reset.css
  4. 12
      src/app/plan-audit/plan-record/plan-record.component.html
  5. 12
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  6. 4
      src/app/plan-management/entry-plan-look/AddPlanone.html
  7. 4
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  8. 4
      src/app/plan-management/entry-plan/entry-plan.component.html
  9. 4
      src/app/plan-management/open-plan/open-plan.component.html
  10. 12
      src/app/plan-management/pass-plan/pass-plan.component.html
  11. 4
      src/app/statistic-analysis/combined-query/combined-query.component.html

2
package.json
Unescape View File

@ -3,7 +3,7 @@
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "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": "ng build",
"build-prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod", "build-prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod",
"publish": "ng build --prod --verbose", "publish": "ng build --prod --verbose",

2
proxy.config.json
Unescape View File

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

45
reset.css
Unescape View File

@ -1,10 +1,46 @@
@charset "utf-8"; @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{ 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; margin: 0;
padding: 0; padding: 0;
font-size: 16px; font-size: 16px;
} }
b,strong,i,em,h1,h2,h3,h4,h5,h6{ b,
strong,
i,
em,
h1,
h2,
h3,
h4,
h5,
h6 {
font-weight: 500; font-weight: 500;
font-style: normal; font-style: normal;
} }
@ -14,7 +50,10 @@ img{
a { a {
text-decoration: none; text-decoration: none;
color: #000; color: #000;
ul,ol,li{ }
ul,
ol,
li {
list-style: none; list-style: none;
} }
.clearfn:after { .clearfn:after {

12
src/app/plan-audit/plan-record/plan-record.component.html
Unescape View File

@ -32,18 +32,18 @@
<span>类型：</span> <span>类型：</span>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel"> <mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel">
<mat-option value="1">Ⅰ级预案</mat-option> <!-- <mat-option value="1">Ⅰ级预案</mat-option>
<mat-option value="2">Ⅱ级预案</mat-option> <mat-option value="2">Ⅱ级预案</mat-option> -->
<mat-option value="3">Ⅲ级预案</mat-option> <mat-option value="3">Ⅲ级预案</mat-option>
<mat-option value="4">Ⅳ级预案</mat-option> <mat-option value="4">Ⅳ级预案</mat-option>
<mat-option value="5">Ⅴ级预案</mat-option> <mat-option value="5">Ⅴ级预案</mat-option>
<mat-option value="6">应急预案(国家级)</mat-option> <!-- <mat-option value="6">应急预案(国家级)</mat-option>
<mat-option value="7">应急预案(市级)</mat-option> <mat-option value="7">应急预案(市级)</mat-option> -->
<mat-option value="8">类型预案</mat-option> <mat-option value="8">类型预案</mat-option>
<mat-option value="11">重点单位</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="13">消防力量</mat-option>
<mat-option value="14">联动力量</mat-option> <mat-option value="14">联动力量</mat-option> -->
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span>状态：</span> <span>状态：</span>

12
src/app/plan-audit/wait-examineer/wait-examineer.component.html
Unescape View File

@ -17,18 +17,18 @@
<span>类型：</span> <span>类型：</span>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel"> <mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel">
<mat-option value="1">Ⅰ级预案</mat-option> <!-- <mat-option value="1">Ⅰ级预案</mat-option>
<mat-option value="2">Ⅱ级预案</mat-option> <mat-option value="2">Ⅱ级预案</mat-option> -->
<mat-option value="3">Ⅲ级预案</mat-option> <mat-option value="3">Ⅲ级预案</mat-option>
<mat-option value="4">Ⅳ级预案</mat-option> <mat-option value="4">Ⅳ级预案</mat-option>
<mat-option value="5">Ⅴ级预案</mat-option> <mat-option value="5">Ⅴ级预案</mat-option>
<mat-option value="6">应急预案(国家级)</mat-option> <!-- <mat-option value="6">应急预案(国家级)</mat-option>
<mat-option value="7">应急预案(市级)</mat-option> <mat-option value="7">应急预案(市级)</mat-option> -->
<mat-option value="8">类型预案</mat-option> <mat-option value="8">类型预案</mat-option>
<mat-option value="11">重点单位</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="13">消防力量</mat-option>
<mat-option value="14">联动力量</mat-option> <mat-option value="14">联动力量</mat-option> -->
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span class="bzjb">编制级别：</span> <span class="bzjb">编制级别：</span>

4
src/app/plan-management/entry-plan-look/AddPlanone.html
Unescape View File

@ -74,14 +74,14 @@
</div> --> </div> -->
<!-- <div *ngIf="pswShow"> <!-- <div *ngIf="pswShow">
<mat-checkbox [(ngModel)]='psw' name='psw' style="margin-left: 2px;">是否为全景图</mat-checkbox> <mat-checkbox [(ngModel)]='psw' name='psw' style="margin-left: 2px;">是否为全景图</mat-checkbox>
</div> </div> -->
<div *ngIf="onlineedit"> <div *ngIf="onlineedit">
<mat-radio-button value="2">在线编辑</mat-radio-button> <mat-radio-button value="2">在线编辑</mat-radio-button>
</div> </div>
<div *ngIf="website"> <div *ngIf="website">
<mat-radio-button value="3">网页地址</mat-radio-button> <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;"> <input type="text" *ngIf="isweb" name="webaddress" [(ngModel)]="webaddress" style="width: 175px;height: 20px;margin-left:10px;">
</div> --> </div>
</mat-radio-group> </mat-radio-group>

4
src/app/plan-management/entry-plan-look/entry-plan-look.component.html
Unescape View File

@ -108,8 +108,8 @@
<th mat-header-cell *matHeaderCellDef>操作</th> <th mat-header-cell *matHeaderCellDef>操作</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span> <span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span>
<span (click)="upzhuanMb(element)" <!-- <span (click)="upzhuanMb(element)"
*ngIf="element.planMode==1&&element.planType==16&&element.planCategory==5">转在线导入</span> *ngIf="element.planMode==1&&element.planType==16&&element.planCategory==5">转在线导入</span> -->
<span (click)="editPlan(element)" <span (click)="editPlan(element)"
[ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1' )}">编辑</span> [ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1' )}">编辑</span>
<span (click)="lookPlan(element)" <span (click)="lookPlan(element)"

4
src/app/plan-management/entry-plan/entry-plan.component.html
Unescape View File

@ -152,12 +152,12 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </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> <mat-checkbox (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan">模板录入预案</mat-checkbox>
</div> </div>
<div class="queryField" *ngIf="!padMore&&!pcMore"> <div class="queryField" *ngIf="!padMore&&!pcMore">
<mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案</mat-checkbox> <mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案</mat-checkbox>
</div> </div> -->
</div> </div>
</form> </form>
</div> </div>

4
src/app/plan-management/open-plan/open-plan.component.html
Unescape View File

@ -66,14 +66,14 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <!-- <div class="queryField" *ngIf="!padMore">
<mat-checkbox (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan"> <mat-checkbox (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan">
模板录入预案</mat-checkbox> 模板录入预案</mat-checkbox>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案 <mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案
</mat-checkbox> </mat-checkbox>
</div> </div> -->
<div class="queryField" *ngIf="pcfind"> <div class="queryField" *ngIf="pcfind">
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>

12
src/app/plan-management/pass-plan/pass-plan.component.html
Unescape View File

@ -90,11 +90,11 @@
<label style="margin-right: 10px;">预案级别:</label> <label style="margin-right: 10px;">预案级别:</label>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true"> <mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true">
<mat-option value=6>应急预案(国家级)</mat-option> <!-- <mat-option value=6>应急预案(国家级)</mat-option>
<mat-option value=7>应急预案(市级)</mat-option> <mat-option value=7>应急预案(市级)</mat-option> -->
<mat-option value=8>类型预案</mat-option> <mat-option value=8>类型预案</mat-option>
<mat-option value=1>Ⅰ级预案</mat-option> <!-- <mat-option value=1>Ⅰ级预案</mat-option>
<mat-option value=2>Ⅱ级预案</mat-option> <mat-option value=2>Ⅱ级预案</mat-option> -->
<mat-option value=3>Ⅲ级预案</mat-option> <mat-option value=3>Ⅲ级预案</mat-option>
<mat-option value=4>Ⅳ级预案</mat-option> <mat-option value=4>Ⅳ级预案</mat-option>
<mat-option value=5>Ⅴ级预案</mat-option> <mat-option value=5>Ⅴ级预案</mat-option>
@ -131,14 +131,14 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </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 (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan">
模板录入预案</mat-checkbox> 模板录入预案</mat-checkbox>
</div> </div>
<div class="queryField" *ngIf="!padMore&&!pcMore"> <div class="queryField" *ngIf="!padMore&&!pcMore">
<mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案 <mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案
</mat-checkbox> </mat-checkbox>
</div> </div> -->
</div> </div>
</form> </form>

4
src/app/statistic-analysis/combined-query/combined-query.component.html
Unescape View File

@ -95,8 +95,8 @@
<label style="margin-right: 10px;">预案级别:</label> <label style="margin-right: 10px;">预案级别:</label>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true"> <mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true">
<mat-option value=1>Ⅰ级预案</mat-option> <!-- <mat-option value=1>Ⅰ级预案</mat-option>
<mat-option value=2>Ⅱ级预案</mat-option> <mat-option value=2>Ⅱ级预案</mat-option> -->
<mat-option value=3>Ⅲ级预案</mat-option> <mat-option value=3>Ⅲ级预案</mat-option>
<mat-option value=4>Ⅳ级预案</mat-option> <mat-option value=4>Ⅳ级预案</mat-option>
<mat-option value=5>Ⅴ级预案</mat-option> <mat-option value=5>Ⅴ级预案</mat-option>

Write Preview
Loading…
Cancel
Save