基础数据查询二次优化修改

This commit is contained in:
zhouyuejun
2018-12-04 18:16:01 +08:00
parent f46835b33b
commit 47d5d8b223
38 changed files with 2046 additions and 2682 deletions
@@ -1,68 +1,38 @@
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
<select class="mr-4 form-control" [(ngModel)]="SEL_COL" name="" id="">
<option value="">选择列名</option>
<option value="cityCode">城市代码</option>
<option value="cityNameChn">城市中文名</option>
<option value="cityNameEng">城市英文名</option>
<option value="countryId">所在国家</option>
<option value="">选择列名</option>
<option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option>
</select>
<label class="radio-inline custom-radio nowrap mr-4">
<input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
<span>过滤</span>
<input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
<span>过滤</span>
</label>
<label class="radio-inline custom-radio nowrap mr-4">
<input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position">
<span>查找定位</span>
<input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position">
<span>查找定位</span>
</label>
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()" id="inputerInfo">
</div>
<div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-1">
<!-- <button type="button" class="btn btn-info mr-3">打印</button>
<button type="button" class="btn btn-info mr-3">城市登记</button>
<button type="button" class="btn btn-info mr-3">国家登记</button>
<button type="button" class="btn btn-info mr-3">洲/地区登记</button>
<button type="button" class="btn btn-info mr-3">定制查询</button> -->
<!-- <button type="button" class="btn btn-info mr-3">刷新</button> -->
</div>
</div>
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter)="inputEnter()" id="inputerInfo">
</div>
</div>
<div class="second-condition mb-3 row">
<!-- <div class="input-container mr-4">
<label for="">洲/地区:&nbsp;&nbsp;</label>
<select class="form-control">
<option value=""></option>
</select>
</div> -->
<div class="input-container mr-4">
<label for="countryId">国家:&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.countryId" (ngModelChange)="selectChange()" id="citry">
<option value=""></option>
<option *ngFor="let item of citys" [value]="item.countryId">{{item.countryId}}</option>
<!-- <option value="ZG">中国</option>
<option value="MG">美国</option>
<option value="YG">英国</option> -->
</select>
</div>
<div class="third-condition row">
<!-- <label class="radio-inline custom-checkbox nowrap checkInfo mr-4">
<input type="checkbox">
<span>洲/地区-国家关联</span>
</label> -->
<label class="radio-inline custom-checkbox nowrap checkInfo mr-4">
<input type="checkbox">
<span>国家-城市关联</span>
</label>
</div>
<div class="second-condition mb-3 row">
<div class="input-container mr-4">
<label for="countryId">国家:&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.countryId" (ngModelChange)="selectChange()"
id="citry">
<option value=""></option>
<option *ngFor="let item of citys" [value]="item.countryId">{{item.countryId}}</option>
</select>
</div>
</div>
</div>
</div>
<div class="airline-table">
<div id="table-container" class="table-container">
<!-- <div id="divFieldset_title" class="divFieldseTitle">城市</div> -->
<div class="airline-table">
<div id="table-container" class="table-container">
<table id="table" class="table table-bordered table-striped">
<thead>
<tr>
@@ -71,22 +41,19 @@
<th>城市中文名</th>
<th>城市英文名</th>
<th>所在国家</th>
<!-- <th *ngFor="let airline_col of city_lists">{{airline_col.COL_CN}}</th> -->
</tr>
</thead>
<tbody>
<tr *ngFor="let city of render_data;let i = index" (click)="selectRow(city)"
[ngClass]="{'selected':row_state===city}">
<tr *ngFor="let city of render_data;let i = index" (click)="selectRow(city)" [ngClass]="{'selected':row_state===city}">
<td>{{i+1}}</td>
<td>{{city.cityCode}}</td>
<td>{{city.cityNameChn}}</td>
<td>{{city.cityNameEng}}</td>
<td>{{city.countryId}}</td>
<!-- <td *ngFor="let airline_col of city_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td> -->
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>