Merge pull request '修改bug' (#94) from projects/mescc/zhp into projects/mescc/develop
所有检测均成功
continuous-integration/drone/push Build is passing
所有检测均成功
continuous-integration/drone/push Build is passing
Reviewed-on: #94
这个提交包含在:
当前提交
3a5c2eeb2a
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-06-20 16:13:52
|
* @Date: 2024-06-20 16:13:52
|
||||||
* @LastEditTime: 2024-07-11 13:52:44
|
* @LastEditTime: 2024-07-11 16:45:08
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -38,7 +38,7 @@ export default {
|
|||||||
grid: {
|
grid: {
|
||||||
left: 60,
|
left: 60,
|
||||||
right: 0,
|
right: 0,
|
||||||
bottom: 30,
|
bottom: 31,
|
||||||
top: 30,
|
top: 30,
|
||||||
containLabel:true,
|
containLabel:true,
|
||||||
},
|
},
|
||||||
|
@ -62,10 +62,10 @@
|
|||||||
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
||||||
:legendList="legendList" ref="dayChart" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
|
:legendList="legendList" ref="dayChart" :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" ref="dayTargetChart" :chartId=" 'chartTarget'"
|
:legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart"
|
||||||
:chartNum="chartNum" />
|
:chartId=" 'chartTarget'" :chartNum="chartNum" />
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<div class="blueTip">
|
<div class="blueTip">
|
||||||
@ -83,9 +83,10 @@
|
|||||||
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
||||||
:legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
|
:legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :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=" 'chartDayTarget'" :chartNum="chartNum" />
|
:legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'"
|
||||||
|
:chartNum="chartNum" />
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="6">
|
<!-- <el-col :span="6">
|
||||||
<div class="blueTip">
|
<div class="blueTip">
|
||||||
|
正在加载...
在新工单中引用
屏蔽一个用户