Merge pull request 'projects/mescc/zhp' (#90) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #90
This commit is contained in:
commit
46743fa4ef
@ -5,7 +5,7 @@
|
||||
</ButtonNav>
|
||||
<!-- </div> -->
|
||||
<div class="search">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
|
||||
<el-form-item label="时间维度" prop="date">
|
||||
<el-select size="small" clearable v-model="listQuery.date" placeholder="请选择" @change="handleChange">
|
||||
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
||||
@ -84,8 +84,8 @@
|
||||
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
|
||||
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
|
||||
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size"
|
||||
:table-data="tableData" :max-height="tableH" />
|
||||
</div>
|
||||
<!-- <div class="containerBottom">
|
||||
|
||||
@ -767,12 +767,28 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
.search {
|
||||
// height: calc((100px));
|
||||
background-color: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 16px 16px 0 16px;
|
||||
margin: 8px 0px;
|
||||
.smallTitle {
|
||||
font-size: 16px;
|
||||
color: #000;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.smallTitle::before {
|
||||
display: inline-block;
|
||||
width: 4px;
|
||||
height: 16px;
|
||||
background: #0b58ff;
|
||||
content: "";
|
||||
margin-right: 8px;
|
||||
vertical-align: -9px;
|
||||
}
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
@ -784,13 +800,12 @@ export default {
|
||||
|
||||
.blueTip::before {
|
||||
display: inline-block;
|
||||
content: '';
|
||||
width: 4px;
|
||||
height: 18px;
|
||||
background: #0B58FF;
|
||||
border-radius: 1px;
|
||||
margin-right: 8PX;
|
||||
margin-top: 8px;
|
||||
height: 16px;
|
||||
background: #0b58ff;
|
||||
content: "";
|
||||
margin-right: 8px;
|
||||
vertical-align: -3px;
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
|
@ -3,7 +3,7 @@
|
||||
<ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
|
||||
</ButtonNav>
|
||||
<div class="search">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
|
||||
<el-form-item label="时间维度" prop="type">
|
||||
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
|
||||
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
||||
@ -62,7 +62,7 @@
|
||||
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
||||
:legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
<el-col :span="6" style="margin-top: 30px">
|
||||
<el-col :span="6" style="margin-top: 21px">
|
||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
||||
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
@ -959,35 +959,12 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
.search {
|
||||
// height: calc((100px));
|
||||
background-color: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 16px 16px 0 16px;
|
||||
margin: 8px 0px;
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
height: calc((100vh - 170px));
|
||||
background-color: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 4px 16px 16px 16px;
|
||||
}
|
||||
|
||||
.blueTip::before {
|
||||
display: inline-block;
|
||||
content: '';
|
||||
width: 4px;
|
||||
height: 18px;
|
||||
background: #0B58FF;
|
||||
border-radius: 1px;
|
||||
margin-right: 8PX;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
margin-top: 8px;
|
||||
|
||||
.smallTitle {
|
||||
font-size: 16px;
|
||||
@ -996,6 +973,24 @@ export default {
|
||||
}
|
||||
|
||||
.smallTitle::before {
|
||||
display: inline-block;
|
||||
width: 4px;
|
||||
height: 16px;
|
||||
background: #0b58ff;
|
||||
content: "";
|
||||
margin-right: 8px;
|
||||
vertical-align: -9px;
|
||||
}
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
height: calc((100vh - 170px));
|
||||
background-color: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 4px 16px 16px 16px;
|
||||
}
|
||||
|
||||
.blueTip::before {
|
||||
display: inline-block;
|
||||
width: 4px;
|
||||
height: 16px;
|
||||
@ -1004,5 +999,4 @@ export default {
|
||||
margin-right: 8px;
|
||||
vertical-align: -3px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
@ -3,7 +3,7 @@
|
||||
<ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
|
||||
</ButtonNav>
|
||||
<div class="search">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
|
||||
<el-form-item label="时间维度" prop="type">
|
||||
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
|
||||
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
||||
@ -62,7 +62,7 @@
|
||||
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
||||
:legendList="legendList" ref="dayChart" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
<el-col :span="6" style="margin-top: 30px">
|
||||
<el-col :span="6" style="margin-top:21px">
|
||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
||||
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
|
||||
:chartNum="chartNum" />
|
||||
@ -1345,6 +1345,21 @@ export default {
|
||||
border-radius: 8px;
|
||||
padding: 16px 16px 0 16px;
|
||||
margin: 8px 0px;
|
||||
.smallTitle {
|
||||
font-size: 16px;
|
||||
color: #000;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.smallTitle::before {
|
||||
display: inline-block;
|
||||
width: 4px;
|
||||
height: 16px;
|
||||
background: #0b58ff;
|
||||
content: "";
|
||||
margin-right: 8px;
|
||||
vertical-align: -9px;
|
||||
}
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
@ -1361,27 +1376,13 @@ export default {
|
||||
height: 18px;
|
||||
background: #0B58FF;
|
||||
border-radius: 1px;
|
||||
margin-right: 8PX;
|
||||
margin-top: 8px;
|
||||
margin-right: 8px;
|
||||
vertical-align:-3px;
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
margin-top: 8px;
|
||||
|
||||
.smallTitle {
|
||||
font-size: 16px;
|
||||
color: #000;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.smallTitle::before {
|
||||
display: inline-block;
|
||||
width: 4px;
|
||||
height: 16px;
|
||||
background: #0b58ff;
|
||||
content: "";
|
||||
margin-right: 8px;
|
||||
vertical-align: -3px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
@ -5,7 +5,7 @@
|
||||
</ButtonNav>
|
||||
<!-- </div> -->
|
||||
<div class="search">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
|
||||
<el-form-item label="时间维度" prop="type">
|
||||
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
|
||||
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
||||
@ -84,8 +84,8 @@
|
||||
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
|
||||
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
|
||||
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size"
|
||||
:table-data="tableData" :max-height="tableH" />
|
||||
</div>
|
||||
<!-- <div class="containerBottom">
|
||||
|
||||
@ -843,12 +843,28 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
.search {
|
||||
// height: calc((100px));
|
||||
background-color: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 16px 16px 0 16px;
|
||||
margin:8px 0 8px 0px;
|
||||
.smallTitle {
|
||||
font-size: 16px;
|
||||
color: #000;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.smallTitle::before {
|
||||
display: inline-block;
|
||||
width: 4px;
|
||||
height: 16px;
|
||||
background: #0b58ff;
|
||||
content: "";
|
||||
margin-right: 8px;
|
||||
vertical-align: -9px;
|
||||
}
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
@ -860,13 +876,12 @@ export default {
|
||||
|
||||
.blueTip::before {
|
||||
display: inline-block;
|
||||
content: '';
|
||||
width: 4px;
|
||||
height: 18px;
|
||||
background: #0B58FF;
|
||||
border-radius: 1px;
|
||||
margin-right: 8PX;
|
||||
margin-top: 8px;
|
||||
height: 16px;
|
||||
background: #0b58ff;
|
||||
content: "";
|
||||
margin-right: 8px;
|
||||
vertical-align: -3px;
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
|
Loading…
Reference in New Issue
Block a user