Merge pull request 'projects/mescc/zhp' (#95) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #95
This commit is contained in:
朱菊兰 2024-07-12 08:54:16 +08:00
commit 5b0bb2ccdb

View File

@ -59,17 +59,35 @@
<div class="blueTip"> <div class="blueTip">
生产情况对比 生产情况对比
</div> </div>
<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>
<el-col :span="6" style="margin-top: 21px"> <el-col :span="6">
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" <bm-line-bar-target style="margin-top: 21px" :type="listQuery.type" :chartHeight="chartHeight"
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" /> :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'"
:chartNum="chartNum" />
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="blueTip"> <div class="blueTip">
{{ title }} {{ title }}
</div> </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" :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" :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" <bm-line-bar-year-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgYearTarget" :chartId="'chartYearTarget'" :chartNum="chartNum" /> :chartMsg="chartMsgYearTarget" :chartId="'chartYearTarget'" :chartNum="chartNum" />
</el-col> </el-col>