fix: 修复提交冲突
This commit is contained in:
@@ -459,7 +459,6 @@
|
|||||||
|
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-scrollbar>
|
</el-scrollbar>
|
||||||
|
|
||||||
<!--底部按钮-->
|
<!--底部按钮-->
|
||||||
<div class="right-box-bottom-btns">
|
<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">
|
<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 -->
|
<!--preview -->
|
||||||
<chart-preview :panelId="panelId" ref="chartsPreview" ></chart-preview>
|
<chart-preview :panelId="panelId" ref="chartsPreview" ></chart-preview>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
Reference in New Issue
Block a user