Commit 406e9de2 authored by wangxuelai's avatar wangxuelai

'最新代码提交'

parent d241a38b
<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>轻校</title><link rel="shortcut icon" href="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/qxlogo4.png"><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0;" name="viewport"><meta http-equiv="X-UA-Compatible" content="IE=edge"><!-- Polyfills --><!--[if lt IE 10]>
<script src="js/console-polyfill.js"></script>
<![endif]--><script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script><link href="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.css?1571108834729" rel="stylesheet"><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?20191012" charset="utf-8"></script></head><body><div id="root"></div><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.js?1571108834729" charset="utf-8"></script></body></html>
\ No newline at end of file
<![endif]--><script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script><link href="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.css?1571120171115" rel="stylesheet"><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?20191012" charset="utf-8"></script></head><body><div id="root"></div><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.js?1571120171115" charset="utf-8"></script></body></html>
\ No newline at end of file
......@@ -156,6 +156,7 @@ class DrawImg extends React.Component {
}
doaction = (action) => {
let lastDrawStartIndex = 0;
let currentSelectImgObj = null;
if (action == this.state.action) {
this.setState({
action: 0,
......@@ -205,6 +206,23 @@ class DrawImg extends React.Component {
// lastDrawStartIndex = this.drawTrail.findLastIndex(ele => ele.isStart == true);
break;
case 7:
// this.setState({
// action,
// });
this.drawTrail = [];
this.drawcontext.clearRect(0, 0, this.state.canvasSizeObj.width, this.state.canvasSizeObj.height);
this.drawrectcontext.clearRect(0, 0, this.state.canvasSizeObj.width, this.state.canvasSizeObj.height);
this.drawcirclecontext.clearRect(0, 0, this.state.canvasSizeObj.width, this.state.canvasSizeObj.height);
this.drawarrowcontext.clearRect(0, 0, this.state.canvasSizeObj.width, this.state.canvasSizeObj.height);
currentSelectImgObj = this.state.batchCommentImgObj.find(ele => ele.copysrc == this.state.currentDrawImage);
if (currentSelectImgObj.copysrc != currentSelectImgObj.src) {
this.state.batchCommentImgObj.find(ele => ele.copysrc == this.state.currentDrawImage).copysrc = currentSelectImgObj.src;
this.setState({
batchCommentImgObj: this.state.batchCommentImgObj,
currentDrawImage: currentSelectImgObj.src,
});
}
break;
case 8:
default:
break;
......@@ -1322,19 +1340,25 @@ class DrawImg extends React.Component {
</div>
<div className={pageStyle.drawactionname}>撤销</div>
</div>
{/*
<div className={`${pageStyle.drawoperateitem} ${pageStyle.hoverdrawoperateitem}`} onClick={() => this.doaction(7)}>
<div className={`${pageStyle.iconbox} ${action == 7 ? pageStyle.iconboxselected : ''}`}>
<div className={pageStyle.tobig} />
<div className={pageStyle.redo} />
</div>
<div className={pageStyle.drawactionname}>放大</div>
<div className={pageStyle.drawactionname}>重置</div>
</div>
<div className={`${pageStyle.drawoperateitem} ${pageStyle.hoverdrawoperateitem}`} onClick={() => this.doaction(8)}>
<div className={`${pageStyle.iconbox} ${action == 8 ? pageStyle.iconboxselected : ''}`}>
<div className={pageStyle.tosmall} />
{/*
<div className={`${pageStyle.drawoperateitem} ${pageStyle.hoverdrawoperateitem}`} onClick={() => this.doaction(8)}>
<div className={`${pageStyle.iconbox} ${action == 8 ? pageStyle.iconboxselected : ''}`}>
<div className={pageStyle.tobig} />
</div>
<div className={pageStyle.drawactionname}>放大</div>
</div>
<div className={`${pageStyle.drawoperateitem} ${pageStyle.hoverdrawoperateitem}`} onClick={() => this.doaction(9)}>
<div className={`${pageStyle.iconbox} ${action == 9 ? pageStyle.iconboxselected : ''}`}>
<div className={pageStyle.tosmall} />
</div>
<div className={pageStyle.drawactionname}>缩小</div>
</div>
<div className={pageStyle.drawactionname}>缩小</div>
</div>
*/}
<div className={pageStyle.commonbtnbox}>
<div className={pageStyle.skipdrawbtn} onClick={this.skipDraw}>跳过标记<br />直接批量打分</div>
......
......@@ -160,6 +160,60 @@
left: 50%;
margin-left: -8px;
}
.rect {
width: 24px;
height: 24px;
background-image: url('@{imagesroot}drawimage/rectselect.png');
background-size: 100% 100%;
}
.circle {
width: 24px;
height: 24px;
background-image: url('@{imagesroot}drawimage/circleselect.png');
background-size: 100% 100%;
}
.arrow {
width: 20px;
height: 20px;
background-image: url('@{imagesroot}drawimage/arrowselect.png');
background-size: 100% 100%;
}
.draw {
width: 20px;
height: 20px;
background-image: url('@{imagesroot}drawimage/drawselect.png');
background-size: 100% 100%;
}
.text {
width: 20px;
height: 20px;
background-image: url('@{imagesroot}drawimage/textselect.png');
background-size: 100% 100%;
}
.reback {
width: 20px;
height: 20px;
background-image: url('@{imagesroot}drawimage/rebackselect.png');
background-size: 100% 100%;
}
.redo {
width: 22px;
height: 22px;
background-image: url('@{imagesroot}drawimage/redoselect.png?1');
background-size: 100% 100%;
}
.tobig {
width: 20px;
height: 20px;
background-image: url('@{imagesroot}drawimage/tobigselect.png');
background-size: 100% 100%;
}
.tosmall {
width: 20px;
height: 20px;
background-image: url('@{imagesroot}drawimage/tosmallselect.png');
background-size: 100% 100%;
}
}
}
cursor: pointer;
......@@ -190,6 +244,36 @@
left: 50%;
margin-left: -8px;
}
.rect {
width: 24px;
height: 24px;
background-image: url('@{imagesroot}drawimage/rectselect.png');
background-size: 100% 100%;
}
.circle {
width: 24px;
height: 24px;
background-image: url('@{imagesroot}drawimage/circleselect.png');
background-size: 100% 100%;
}
.arrow {
width: 20px;
height: 20px;
background-image: url('@{imagesroot}drawimage/arrowselect.png');
background-size: 100% 100%;
}
.draw {
width: 20px;
height: 20px;
background-image: url('@{imagesroot}drawimage/drawselect.png');
background-size: 100% 100%;
}
.text {
width: 20px;
height: 20px;
background-image: url('@{imagesroot}drawimage/textselect.png');
background-size: 100% 100%;
}
}
.rect {
width: 24px;
......@@ -227,6 +311,12 @@
background-image: url('@{imagesroot}drawimage/rebackunselect.png');
background-size: 100% 100%;
}
.redo {
width: 22px;
height: 22px;
background-image: url('@{imagesroot}drawimage/redounselect.png?1');
background-size: 100% 100%;
}
.tobig {
width: 20px;
height: 20px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment