Skip to content

F
founder_vue
Commit e7ebc316 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents de62fd0a bda8ca77
Showing with 64 additions and 17 deletions
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2022-05-23 10:48:04
* @LastEditTime: 2022-05-25 14:25:29
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
......@@ -1988,6 +1988,7 @@ export default {
self.isReset = false;
imageEditor.flipX().then(function (status) {
self.changeTzdDrawing_source();
self.historys.unshift(self.$t('ImageEd.flap'))
});
} else {
self.isX = true;
......@@ -1995,6 +1996,7 @@ export default {
self.isReset = false;
imageEditor2.flipX().then(function (status) {
self.changeTzdDrawing_target();
self.historys2.unshift(self.$t('ImageEd.flap'))
});
}
});
......@@ -2008,6 +2010,7 @@ export default {
self.isReset = false;
imageEditor.flipY().then(function (status) {
self.changeTzdDrawing_source();
self.historys.unshift(self.$t('ImageEd.flap'))
});
} else {
self.isX = false;
......@@ -2015,6 +2018,7 @@ export default {
self.isReset = false;
imageEditor2.flipY().then(function (status) {
self.changeTzdDrawing_target();
self.historys2.unshift(self.$t('ImageEd.flap'))
});
}
});
......@@ -2030,6 +2034,7 @@ export default {
setTimeout(() => {
console.log(11111, -self.startPlaceSource);
imageEditor.rotate(-parseInt(imageEditor._graphics.getCanvasImage().angle));
9///////////////////////////////////////////////// self.historys.unshift(self.$t('ImageEd.rotate'));
imageEditor.resetZoom();
self.startPlaceSource = 0;
// 旋转角度同样恢复到0
......@@ -2041,6 +2046,7 @@ export default {
if (imageEditor._graphics.getCanvasImage().flipX || imageEditor._graphics.getCanvasImage().flipY) {
imageEditor.resetFlip().then(function (status) { });
self.resetTzdDrawing_source();
self.historys.unshift(self.$t('ImageEd.flap'))
}
} else {
self.isX = false;
......@@ -2050,6 +2056,7 @@ export default {
setTimeout(() => {
console.log(11111, -self.startPlaceTarget);
imageEditor2.rotate(-parseInt(imageEditor2._graphics.getCanvasImage().angle));
self.historys2.unshift(self.$t('ImageEd.rotate'));
imageEditor2.resetZoom();
self.startPlaceTarget = 0;
// 旋转角度同样恢复到0
......@@ -2061,6 +2068,7 @@ export default {
if (imageEditor2._graphics.getCanvasImage().flipX || imageEditor2._graphics.getCanvasImage().flipY) {
imageEditor2.resetFlip().then(function (status) { });
self.resetTzdDrawing_target();
self.historys2.unshift(self.$t('ImageEd.flap'))
}
}
});
......@@ -6077,6 +6085,7 @@ export default {
// 事件不能连续重复执行，需要缓存时间
setTimeout(() => {
self.imageEditor.rotate(-canvasImage.angle);
self.historys.unshift(self.$t('ImageEd.rotate'))
self.imageEditor.resetZoom();
self.zoomLevel = 1
self.startPlaceSource = 0;
......@@ -6084,6 +6093,7 @@ export default {
if (self.imageEditor._graphics.getCanvasImage().flipX || self.imageEditor._graphics.getCanvasImage().flipY) {
self.imageEditor.resetFlip().then(function (status) {
self.resetTzdDrawing_source(true);
self.historys.unshift(self.$t('ImageEd.flap'))
});
}
}, 200);
......@@ -6092,6 +6102,7 @@ export default {
let canvasImage = this.imageEditor2._graphics.getCanvasImage();
setTimeout(() => {
self.imageEditor2.rotate(-canvasImage.angle);
self.historys2.unshift(self.$t('ImageEd.rotate'))
self.imageEditor2.resetZoom();
self.zoomLevel2 = 1
self.startPlaceTarget = 0;
......@@ -6099,6 +6110,7 @@ export default {
if (self.imageEditor2._graphics.getCanvasImage().flipX || self.imageEditor2._graphics.getCanvasImage().flipY) {
self.imageEditor2.resetFlip().then(function (status) {
self.resetTzdDrawing_target(true);
self.historys2.unshift(self.$t('ImageEd.flap'))
});
}
}, 200);
......
src/i18n/zh-cn.js
/*
* @Author: your name
* @Date: 2022-03-25 16:36:01
* @LastEditTime: 2022-05-23 10:47:42
* @LastEditTime: 2022-05-25 13:30:53
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \uuuz\founder_vue\src\i18n\zh-cn.js
......@@ -914,7 +914,8 @@ export default {
show_line: '显示直线',
show_curve: '显示曲线',
show_marked_points: '显示标记点',
delete_marked_points: '删除标记点'
delete_marked_points: '删除标记点',
flap: '翻转'
},
// 人员指纹编辑
Ryzwbj: {
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-04-23 10:44:41
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-05-25 12:55:54
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
-->
......@@ -936,7 +936,15 @@ export default {
// self.resetTzdDrawing();
// }
imageEditor.discardSelection();
imageEditor.undo();
imageEditor.undo().then(res => {
console.log(res);
console.log(typeof res);
if (typeof res === 'number') {
self.startPlace = res
}
}).catch(err => {
console.log(err);
});
setTimeout(() => {
self.initFilters()
}, 200);
......@@ -953,7 +961,15 @@ export default {
// self.resetTzdDrawing();
// }
imageEditor.discardSelection();
imageEditor.redo();
imageEditor.redo().then(res => {
console.log(res);
console.log(typeof res);
if (typeof res === 'number') {
self.startPlace = res
}
}).catch(err => {
console.log(err);
});
setTimeout(() => {
self.initFilters()
}, 200);
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-04-26 18:19:51
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-05-25 13:04:58
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
-->
......@@ -1363,7 +1363,15 @@ export default {
// self.initStatus()
console.log("撤销");
imageEditor.discardSelection();
imageEditor.undo();
imageEditor.undo().then(res => {
console.log(res);
console.log(typeof res);
if (typeof res === 'number') {
self.startPlace = res
}
}).catch(err => {
console.log(err);
});
// if (!$(this).hasClass("disabled")) {
// imageEditor.discardSelection();
// imageEditor.undo();
......@@ -1378,7 +1386,15 @@ export default {
e.stopPropagation()
console.log("恢复");
imageEditor.discardSelection();
imageEditor.redo();
imageEditor.redo().then(res => {
console.log(res);
console.log(typeof res);
if (typeof res === 'number') {
self.startPlace = res
}
}).catch(err => {
console.log(err);
});
setTimeout(() => {
self.initFilters()
}, 200);
......@@ -8499,6 +8515,7 @@ export default {
* 处理指位信息--存入session中
*/
handleFingerPosition () {
if (this.isHideImageExport) return;
let lr_finger = [];
let tj_lr_finger = "";
this.rightFinger.forEach(item => {
......@@ -8519,6 +8536,7 @@ export default {
* 处理指位信息--存入session中
*/
handleHandPosition () {
if (this.isHideImageExport) return;
let lr_finger = [];
let tj_lr_finger = "";
this.handsType.forEach(item => {
......
src/views/zzwlr/xzry.vue
<!--
* @Author: your name
* @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-03-29 22:44:51
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-05-25 13:14:32
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue
-->
......@@ -62,7 +62,7 @@
<el-form-item> </el-form-item>
<el-form-item class="no_require" :label="$t('Common.asjxgrybh')+'：'">
<!-- -->
<el-input v-model.trim="ruleForm.asjxgrybh" :placeholder="$t('asjxgrybh_placeholder')" maxlength="23" show-word-limit
<el-input v-model.trim="ruleForm.asjxgrybh" :placeholder="$t('Common.asjxgrybh_placeholder')" maxlength="23" show-word-limit
clearable></el-input>
</el-form-item>
</el-row>
......
src/views/zzwlr/xzryedit.vue
<!--
* @Author: your name
* @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-02-17 10:59:55
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-05-25 13:14:40
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue
-->
......@@ -60,7 +60,7 @@
<el-form-item> </el-form-item>
<el-form-item class="no_require" :label="$t('Common.asjxgrybh')+'：'">
<!-- -->
<el-input v-model.trim="ruleForm.asjxgrybh" :placeholder="$t('asjxgrybh_placeholder')" maxlength="23" show-word-limit clearable></el-input>
<el-input v-model.trim="ruleForm.asjxgrybh" :placeholder="$t('Common.asjxgrybh_placeholder')" maxlength="23" show-word-limit clearable></el-input>
</el-form-item>
</el-row>
<el-divider></el-divider>
......
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