fix: 修复提交冲突

This commit is contained in:
陈劲松
2020-12-09 09:14:58 +08:00
committed by chenjinsong
parent 01951db956
commit 641c6c9962

View File

@@ -459,7 +459,6 @@
</el-form>
</el-scrollbar>
<!--底部按钮-->
<div class="right-box-bottom-btns">
<button @click="esc(false)" id="chart-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
@@ -478,6 +477,7 @@
<!--preview -->
<chart-preview :panelId="panelId" ref="chartsPreview" ></chart-preview>
</div>
</div>
</template>
<script>