Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -8,59 +8,70 @@
|
||||
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
|
||||
<!-- <el-tab-pane label="标准预警" name="STANDARD">-->
|
||||
<div class="dynamic-content">
|
||||
<el-row>
|
||||
<el-col>
|
||||
<h5>实施预警</h5>
|
||||
</el-col>
|
||||
<el-col>
|
||||
<div class="more">
|
||||
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
|
||||
<el-form-item label="标准编号">
|
||||
<el-input clearable size="small"
|
||||
v-model="dynamic.standCode"
|
||||
placeholder="根据标准编号查找">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称">
|
||||
<el-input clearable size="small"
|
||||
v-model="dynamic.standName"
|
||||
placeholder="根据标准名称查找">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
|
||||
<el-datePicker
|
||||
clearable size="small"
|
||||
v-model="dynamic.putTime"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="根据实施日期查找">
|
||||
</el-datePicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用车型">
|
||||
<el-input clearable size="small"
|
||||
v-model="dynamic.applyType"
|
||||
placeholder="根据适用车型查找">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="searchBtnClick"
|
||||
class="common-button-primary">
|
||||
查询
|
||||
</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="clearBtnClick"
|
||||
class="common-button-primary">
|
||||
清空
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div>
|
||||
<h5>实施预警</h5>
|
||||
</div>
|
||||
<div class="more">
|
||||
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
|
||||
<el-form-item label="标准编号">
|
||||
<el-input clearable size="mini"
|
||||
v-model="dynamic.standCode"
|
||||
placeholder="根据标准编号查找">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称">
|
||||
<el-input clearable size="mini"
|
||||
v-model="dynamic.standName"
|
||||
placeholder="根据标准名称查找">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
|
||||
<el-datePicker
|
||||
clearable size="mini"
|
||||
v-model="dynamic.putTime"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="根据实施日期查找">
|
||||
</el-datePicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用车型">
|
||||
<el-input clearable size="mini"
|
||||
v-model="dynamic.applyType"
|
||||
placeholder="根据适用车型查找">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<div style="margin: 8px 0 0 0; float: right">
|
||||
<el-button
|
||||
type="primary"
|
||||
size="mini"
|
||||
@click="searchBtnClick"
|
||||
class="common-button-primary">
|
||||
查询
|
||||
</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
@click="clearBtnClick"
|
||||
class="common-button-primary">
|
||||
清空
|
||||
</el-button>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div class="content" style="height: 100%; padding-top: 5px; ">
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="primary"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="searchBtnClick"-->
|
||||
<!-- class="common-button-primary">-->
|
||||
<!-- 查询-->
|
||||
<!-- </el-button>-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="clearBtnClick"-->
|
||||
<!-- class="common-button-primary">-->
|
||||
<!-- 清空-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="content" style="height: 100%; padding-top: 50px; ">
|
||||
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
|
||||
<el-table
|
||||
:data="newItems"
|
||||
@@ -1087,6 +1098,7 @@ export default {
|
||||
}
|
||||
|
||||
.more {
|
||||
margin-top: 30px;
|
||||
/deep/ .el-input__inner {
|
||||
width: 155px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user