Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhutianqi
2021-05-31 18:03:48 +08:00
5 changed files with 855 additions and 165 deletions
+296 -148
View File
@@ -3,154 +3,288 @@
<div id="dynamicInformation" class="dynamic-information v-class">
<div class="dynamic-content">
<!-- 实施预警 -->
<div class="dynamic">
<div class="dynamic-content">
<h5>实施预警</h5>
<!-- <div class="dynamic-line"></div>-->
<!-- <span class="more" @click="dynamicWarning">更多</span> -->
<div class="more">
<el-button
v-btn-permission="'5XYSQKUDCFN2EGDE23VK'"
type="primary"
class="common-button-primary"
round
@click="dynamicWarning">
更多
</el-button>
</div>
<div class="content" style="height: 100%; padding-top: 5px;">
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
<el-table
:data="newTypeDatas"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="sortName" label="类型" align="center">
<template slot-scope="scope">
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
<div v-if="scope.row.sortName === 'FOREIGN_STAND'">海外标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
</template>
</el-table-column>
<el-table-column prop="standNum" label="编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
</el-table>
<el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>
<el-table
:data="productionVehicleDatas"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="sortName" label="类型" align="center">
<template slot-scope="scope">
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
<div v-if="scope.row.sortName === 'FOREIGN_STAND'">海外标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
</template>
</el-table-column>
<el-table-column prop="standNum" label="编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
</el-table>
<!-- <el-divider content-position="left" class="dynamic-child-title">新生产车实施日期预警</el-divider>-->
<!-- <el-table-->
<!-- :data="newProductionDatas"-->
<!-- height="200px"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column prop="sortName" label="类型" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>-->
<!-- <div v-if="scope.row.sortName === 'FOREIGN_STAND'">海外标准法规</div>-->
<!-- <div v-if="scope.row.sortName === 'INLAND_STAND'">国内标准法规</div>-->
<!-- <div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>-->
<!-- <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="standNum" label="编号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <div @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="standName" label="标准名称" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <div @click="showStandDetails(scope.row)">{{ scope.row.standName }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="新生产车实施日期" align="center"></el-table-column>-->
<!-- </el-table>-->
<!-- <el-divider content-position="left" class="dynamic-child-title">新车型条款预警</el-divider>-->
<!-- <el-table-->
<!-- :data="newCarWarning"-->
<!-- height="200px"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column prop="standNum" label="标准编号" align="center">-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="standNum" label="标准名称" align="center">-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="itemsNum" label="条款号" align="center">-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="itemsName" label="条款名称" align="center"></el-table-column>-->
<!-- <el-table-column prop="putTime" label="实施日期" align="center"></el-table-column>-->
<!-- <el-table-column prop="creationTime" label="预警日期" align="center"></el-table-column>-->
<!-- </el-table>-->
<!-- <el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>-->
<!-- <el-table-->
<!-- :data="producCarWarning"-->
<!-- height="200px"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column prop="standNum" label="标准编号" align="center">-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="standNum" label="标准名称" align="center">-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="itemsNum" label="条款号" align="center">-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="itemsName" label="条款名称" align="center"></el-table-column>-->
<!-- <el-table-column prop="putTime" label="实施日期" align="center"></el-table-column>-->
<!-- <el-table-column prop="creationTime" label="预警日期" align="center"></el-table-column>-->
<!-- </el-table>-->
</div>
<div class="dynamic" style="overflow-y: scroll">
<div class="container">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="标准预警" name="STANDARD">
<div class="dynamic-content">
<h5>实施预警</h5>
<!-- <div class="dynamic-line"></div>-->
<!-- <span class="more" @click="dynamicWarning">更多</span> -->
<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.keyword"
placeholder="根据适用车型查找"
@keyup.enter="searchBtnClick"></el-input>
</el-form-item>
</el-form>
</div>
<div class="content" style="height: 100%; padding-top: 5px; ">
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
<el-table
:data="newTypeDatas"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="sortName" label="类型" align="center">
<template slot-scope="scope">
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
<div v-if="scope.row.sortName === 'FOREIGN_STAND'">海外标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
</template>
</el-table-column>
<el-table-column prop="standNum" label="编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
<el-table-column prop="standName" label="适用车型" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准类型" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准责任工程师" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
</el-table>
<el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>
<el-table
:data="productionVehicleDatas"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="sortName" label="类型" align="center">
<template slot-scope="scope">
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
<div v-if="scope.row.sortName === 'FOREIGN_STAND'">海外标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
</template>
</el-table-column>
<el-table-column prop="standNum" label="编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
<el-table-column prop="standName" label="适用车型" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准类型" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准责任工程师" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
</el-table>
<el-divider content-position="left" class="dynamic-child-title">新车型条款预警</el-divider>
<el-table
:data="productionVehicleDatas"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="standNum" label="标准编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standNum" label="条款号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standNum" label="条款要求" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
<el-table-column prop="putTime" label="预警日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
<el-table-column prop="standName" label="适用车型" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准分类" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准责任工程师" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
</el-table>
<el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>
<el-table
:data="productionVehicleDatas"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="standNum" label="标准编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standNum" label="条款号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standNum" label="条款要求" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
<el-table-column prop="putTime" label="预警日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
<el-table-column prop="standName" label="适用车型" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准分类" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准责任工程师" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
</el-table>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="政策预警" name="POLICY">
<div class="dynamic-content">
<h5>实施预警</h5>
<div class="content" style="height: 100%; padding-top: 5px; ">
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
<el-table
:data="newTypeDatas"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="standNum" label="政策编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="政策名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
</el-table>
<el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>
<el-table
:data="productionVehicleDatas"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="standNum" label="政策编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="政策名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
<template slot-scope="scope">
{{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
</template>
</el-table-column>
</el-table>
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
@@ -164,6 +298,7 @@ export default {
name: 'standardWarning',
data () {
return {
activeName: 'STANDARD', //tab 默认选中值
// 头部搜索框
dynamic: {
keyWord: '',
@@ -211,6 +346,14 @@ export default {
}
},
methods: {
//切换tab
handleClick(tab, event) {
console.log(tab, event);
},
//查找适用车型
searchBtnClick(){
console.log('查找适用车型');
},
/**
* @author liruohao
* @date 2019/4/25
@@ -695,6 +838,11 @@ export default {
}
}
}
.container{
/deep/.el-tabs__header{
height:50px;
}
}
.dynamic-content {
height: 100%;
overflow-y: hidden;