提交 208878c0 authored 作者: wangjiahao's avatar wangjiahao

feat:恢复样式

上级 c7d24c34
<template> <template>
<div> <div>
<div class="toolbar"> <div class="toolbar">
<el-button @click="undo">撤消</el-button>
<el-tooltip content="撤消"> <el-button @click="redo">重做</el-button>
<el-button class="el-icon-refresh-left" size="mini" circle @click="undo" /> <label for="input" class="insert">插入图片</label>
</el-tooltip>
<el-tooltip content="重做">
<el-button class="el-icon-refresh-left" size="mini" circle @click="redo" />
</el-tooltip>
<el-tooltip content="插入图片">
<el-button class="el-icon-refresh-left" for="input" size="mini" circle />
<input id="input" type="file" hidden @change="handleFileChange"> <input id="input" type="file" hidden @change="handleFileChange">
</el-tooltip> <el-button style="margin-left: 10px;" @click="preview">预览</el-button>
<el-tooltip content="预览"> <el-button @click="save">保存</el-button>
<el-button class="el-icon-refresh-left" size="mini" circle @click="preview" /> <el-button @click="clearCanvas">清空画布</el-button>
</el-tooltip> <div class="canvas-config">
<el-tooltip content="清空"> <span>画布大小</span>
<el-button class="el-icon-refresh-left" size="mini" circle @click="clearCanvas" /> <input v-model="canvasStyleData.width">
</el-tooltip> <span>*</span>
<el-tooltip content="保存"> <input v-model="canvasStyleData.height">
<el-button class="el-icon-circle-check" size="mini" circle @click="save" /> </div>
</el-tooltip> <div class="canvas-config">
<el-tooltip content="预览"> <span>画布比例</span>
<el-button class="el-icon-view" size="mini" circle @click="preview" /> <input v-model="scale" @input="handleScaleChange"> %
</el-tooltip> </div>
</div> </div>
<!-- 预览 --> <!-- 预览 -->
...@@ -193,9 +187,9 @@ export default { ...@@ -193,9 +187,9 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.toolbar { .toolbar {
height: 35px; height: 50px;
line-height: 35px; line-height: 50px;
background: #fff; background: #fff;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
...@@ -250,5 +244,5 @@ export default { ...@@ -250,5 +244,5 @@ export default {
color: #3a8ee6; color: #3a8ee6;
} }
} }
} }
</style> </style>
<template> <template>
<div class="rect-shape"> <div class="rect-shape">
<chart-component v-if="showCard" :ref="element.propValue.id" :chart-id="element.propValue.id" :chart="chart" /> <chart-component v-if="showCard" :ref="element.propValue.id" class="chart-class" :chart-id="element.propValue.id" :chart="chart" />
</div> </div>
</template> </template>
...@@ -54,4 +54,7 @@ export default { ...@@ -54,4 +54,7 @@ export default {
height: 100%; height: 100%;
overflow: auto; overflow: auto;
} }
.chart-class{
height: 100%;
}
</style> </style>
...@@ -17,10 +17,6 @@ import directives from './directive' ...@@ -17,10 +17,6 @@ import directives from './directive'
import VueClipboard from 'vue-clipboard2' import VueClipboard from 'vue-clipboard2'
import '@/custom-component' // 注册自定义组件 import '@/custom-component' // 注册自定义组件
import '@/assets/iconfont/iconfont.css'
import '@/styles/animate.css'
import 'element-ui/lib/theme-chalk/index.css'
import '@/styles/reset.css'
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.use(VueClipboard) Vue.use(VueClipboard)
......
...@@ -3,30 +3,29 @@ ...@@ -3,30 +3,29 @@
<!-- <de-header>Header</de-header> --> <!-- <de-header>Header</de-header> -->
<el-header class="de-header"> <el-header class="de-header">
<el-row class="panel-design-head"> <el-row class="panel-design-head">
<span style="float: left;line-height: 35px; color: gray"> <span style="float: left;line-height: 50px; color: gray">
<span>名称:测试仪表板</span> <span>名称:测试仪表板</span>
</span> </span>
<span style="float: right;line-height: 35px;"> <Toolbar />
<!-- <span style="float: right;line-height: 35px;">-->
<el-tooltip content="返回目录"> <!-- <el-tooltip content="返回目录">-->
<el-button class="el-icon-refresh-left" size="mini" circle @click="toDir" /> <!-- <el-button class="el-icon-refresh-left" size="mini" circle @click="toDir" />-->
</el-tooltip> <!-- </el-tooltip>-->
<el-tooltip content="背景图"> <!-- <el-tooltip content="背景图">-->
<el-button class="el-icon-full-screen" size="mini" circle /> <!-- <el-button class="el-icon-full-screen" size="mini" circle />-->
</el-tooltip> <!-- </el-tooltip>-->
<el-tooltip content="保存"> <!-- <el-tooltip content="保存">-->
<el-button class="el-icon-circle-check" size="mini" circle @click="saveDrawing" /> <!-- <el-button class="el-icon-circle-check" size="mini" circle @click="saveDrawing" />-->
</el-tooltip> <!-- </el-tooltip>-->
<el-tooltip content="预览"> <!-- <el-tooltip content="预览">-->
<el-button class="el-icon-view" size="mini" circle @click="preViewShow" /> <!-- <el-button class="el-icon-view" size="mini" circle @click="preViewShow" />-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
</el-row> </el-row>
</el-header> </el-header>
<de-container> <de-container>
...@@ -113,6 +112,13 @@ import componentList from '@/custom-component/component-list' // 左侧列表数 ...@@ -113,6 +112,13 @@ import componentList from '@/custom-component/component-list' // 左侧列表数
import { listenGlobalKeyDown } from '@/utils/shortcutKey' import { listenGlobalKeyDown } from '@/utils/shortcutKey'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import { uuid } from 'vue-uuid' import { uuid } from 'vue-uuid'
import Toolbar from '@/components/Toolbar'
// 引入样式
import '@/assets/iconfont/iconfont.css'
import '@/styles/animate.css'
import 'element-ui/lib/theme-chalk/index.css'
import '@/styles/reset.css'
export default { export default {
components: { components: {
...@@ -121,7 +127,8 @@ export default { ...@@ -121,7 +127,8 @@ export default {
DeAsideContainer, DeAsideContainer,
FilterGroup, FilterGroup,
ViewSelect, ViewSelect,
Editor Editor,
Toolbar
}, },
data() { data() {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论