Merge pull request 'projects/mescc/zhp' (#96) 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: #96
This commit is contained in:
commit
59df1c16f6
@ -55,16 +55,11 @@
|
||||
|
||||
<!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
|
||||
<el-row v-if="this.listQuery.type === 2">
|
||||
<el-col :span="12">
|
||||
<el-col :span="18">
|
||||
<div class="blueTip">
|
||||
生产情况对比
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<bm-line-bar-target style="margin-top: 21px" :type="listQuery.type" :chartHeight="chartHeight"
|
||||
:legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'"
|
||||
:chartNum="chartNum" />
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<div class="blueTip">
|
||||
{{ title }}
|
||||
@ -80,7 +75,7 @@
|
||||
:legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<bm-line-bar-target style="margin-top: 21px" :type="listQuery.type" :chartHeight="chartHeight"
|
||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight"
|
||||
:legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'"
|
||||
:chartNum="chartNum" />
|
||||
</el-col>
|
||||
|
@ -55,22 +55,34 @@
|
||||
|
||||
<!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
|
||||
<el-row v-if="this.listQuery.type === 2">
|
||||
<el-col :span="12">
|
||||
<el-col :span="18">
|
||||
<div class="blueTip">
|
||||
生产情况对比
|
||||
</div>
|
||||
<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">
|
||||
<bm-line-bar-target style="margin-top:21px" :type="listQuery.type" :chartHeight="chartHeight"
|
||||
:legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart"
|
||||
:chartId=" 'chartTarget'" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<div class="blueTip">
|
||||
{{ title }}
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row v-if="this.listQuery.type === 2">
|
||||
<el-col :span="12">
|
||||
<!-- <div class="blueTip">
|
||||
生产情况对比
|
||||
</div> -->
|
||||
<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">
|
||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight"
|
||||
:legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart"
|
||||
:chartId=" 'chartTarget'" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<!-- <div class="blueTip">
|
||||
{{ title }}
|
||||
</div> -->
|
||||
<bm-line-bar-year-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
||||
:chartMsg="chartMsgYearTarget" ref="chartYearTarget" :chartId=" 'chartYearTarget'" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
|
Loading…
Reference in New Issue
Block a user