Skip to content

Commit

Permalink
修改工具栏样式
Browse files Browse the repository at this point in the history
  • Loading branch information
zcZhang123 committed Oct 25, 2019
1 parent 33014fe commit b9d035a
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 9 deletions.
31 changes: 27 additions & 4 deletions src/components/klineChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,16 @@
<!-- 绘图工具栏按钮 -->
<div class="canvas-toolbar-div" v-show="showChart === 'candle'">
<!-- <div class="toolbar"> -->
<span class="toolbar-iconfont toolbar-span" title="绘制直线" @click="drawLine">&#xe653;</span>
<span class="toolbar-iconfont toolbar-span" title="铅笔" @click="drawTablet">&#xe6be;</span>
<span
:class="this.toolbarType != 'line' ? 'toolbar-iconfont toolbar-span':'toolbar-iconfont toolbar-span toolbar-span-active'"
title="绘制直线"
@click="drawLine"
>&#xe653;</span>
<span
:class="this.toolbarType != 'tablet' ? 'toolbar-iconfont toolbar-span':'toolbar-iconfont toolbar-span toolbar-span-active'"
title="铅笔"
@click="drawTablet"
>&#xe6be;</span>
<span class="toolbar-iconfont toolbar-span">
<el-color-picker v-model="drawColor" @change="changeDrawColor"></el-color-picker>
</span>
Expand All @@ -332,7 +340,11 @@
<!-- 图表 -->
<div id="echarts-kline-div" @click="hiddenPopover">
<!-- 绘图工具栏画布-->
<canvas id="drawToolCanvas" class="draw-toolbar-canvas"></canvas>
<canvas
id="drawToolCanvas"
@mouseup="mouseUpCanvas"
:class="this.showDrawCanvas ? 'draw-toolbar-canvas draw-toolbar-canvas-click' : 'draw-toolbar-canvas'"
></canvas>
<KLine
ref="candle"
v-show="showChart === 'candle' && cycle !== 'everyhour'"
Expand Down Expand Up @@ -448,7 +460,9 @@ export default {
showSlider: false, // 是否显示绘图工具栏调整线宽滑块
canvas: null,
canvasContext: null,
drawTool: null
drawTool: null,
showDrawCanvas: false,
toolbarType: ""
};
},
props: {
Expand Down Expand Up @@ -873,11 +887,20 @@ export default {
},
// 绘制直线
drawLine() {
this.toolbarType = "line";
this.showDrawCanvas = true;
this.drawTool.style = "drawLine";
this.drawTool.drawing();
},
// 绘制完成后鼠标松开事件
mouseUpCanvas() {
this.toolbarType = "";
this.showDrawCanvas = false;
},
// 绘制写字板
drawTablet() {
this.toolbarType = "tablet";
this.showDrawCanvas = true;
this.drawTool.style = "drawTablet";
this.drawTool.drawing();
},
Expand Down
15 changes: 10 additions & 5 deletions src/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,19 @@

.draw-toolbar-canvas {
margin-left: 35px;
z-index: 11;
position: absolute;
background: #355fcf;
}

.draw-toolbar-canvas-click {
z-index: 11;
}

.canvas-toolbar-div {
width: 35px;
height: 370px;
height: 260px;
margin-top: 50px;
position: absolute;
background: aqua;
background: #161b21;
z-index: 1;
}

Expand All @@ -43,7 +45,6 @@
.toolbar-span {
width: 30px;
height: 30px;
background: #355fcf;
margin: 10px 2px 0 2px;
border-radius: 8px;
float: left;
Expand All @@ -52,6 +53,10 @@
list-style: none;
}

.toolbar-span-active {
background: #355fcf;
}

.canvas-toolbar-div .el-color-picker__trigger {
display: inline-block;
-webkit-box-sizing: border-box;
Expand Down

0 comments on commit b9d035a

Please sign in to comment.