Skip to content

F
founder_vue
Commit 13c967e8 by 张超军
Options

人员指纹编辑接口对接

parent d6c4c812
Showing with 166 additions and 36 deletions
public/image-edit/js/tui-image-editor.js
......@@ -14554,7 +14554,6 @@
canvasElement = document.createElement('canvas');
selectedElement.appendChild(canvasElement);
}
this._canvas = new _fabric2.default.Canvas(canvasElement, {
containerClass: 'tui-image-editor-canvas-container',
enableRetinaScaling: false
src/router/modules/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-02 16:09:44
* @LastEditTime: 2021-11-04 11:08:44
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -109,7 +109,7 @@ export default [
component: () => import("@/views/Editor/Index.vue"),
children: [
{
path: "/zwbj/ryzwbj/:id",
path: "/zwbj/ryzwbj/:id/:barcode",
name: "ryzwbj",
hidden: true,
meta: {
......
src/store/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-04 11:13:48
* @LastEditors: your name
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\index.js
*/
import Vue from "vue";
import Vuex from "vuex";
import getters from "./getters";
import createPersistedState from "vuex-persistedstate";
import user from "./modules/user";
import zwbj from "./modules/zwbj"
Vue.use(Vuex);
const store = new Vuex.Store({
modules: {
user
user,
zwbj
},
getters,
plugins: [
......
src/store/modules/mutations-types.js 0 → 100644
/*
* @Author: your name
* @Date: 2021-11-04 13:14:49
* @LastEditTime: 2021-11-04 13:14:49
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
*/
export const SET_SEQ = 'setSeq';
export const SET_TZDALL = 'setTzdall';
src/store/modules/zwbj.js 0 → 100644
/*
* @Author: your name
* @Date: 2021-11-04 11:12:33
* @LastEditTime: 2021-11-04 13:13:35
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
*/
import { SET_SEQ, SET_TZDALL } from "./mutations-types";
const state = {
// 当前的指位
seq: '',
// 全部特征点数组
pretzdall: []
};
const mutations = {
[SET_SEQ] (state, content) {
state.seq = content
},
[SET_TZDALL] (state, content) {
state.pretzdall = content
}
};
const actions = {
};
export default {
namespaced: true,
state,
mutations,
actions
};
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -828,7 +828,7 @@ export default {
*/
handleClick (row) {
console.log(row);
this.$router.push('/zwbj/ryzwbj/' + row.id)
this.$router.push('/zwbj/ryzwbj/' + row.id + '/' + row.barcode)
},
/**
* @description: 单选事件
......
src/views/Editor/modules/imageEd.scss
......@@ -15,7 +15,6 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.imageBox {
display: flex;
.imageEd {
width: 766px;
display: flex;
flex-direction: column;
.imageEd_header {
......@@ -30,6 +29,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
display: flex;
align-items: center;
position: relative;
z-index: 99999;
.size-options {
z-index: 10;
position: absolute;
......@@ -874,7 +874,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
position: relative;
.greendirection {
position: absolute;
left: 327px;
left: 390px;
bottom: 100px;
width: 114px;
height: 114px;
......@@ -897,7 +897,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
.drawing {
overflow: hidden;
width: 766px;
width: 880px;
height: 686px;
background: #ffffff;
border-radius: 8px;
......@@ -916,8 +916,9 @@ $transOrigin: var(--transOrigin, 0px, 0px);
z-index: 999;
}
.body-container {
width: 730px;
height: 644px;
position: relative;
width: 640px;
height: 640px;
background: #ffffff;
display: flex;
justify-content: center;
......@@ -926,7 +927,9 @@ $transOrigin: var(--transOrigin, 0px, 0px);
width: 640px !important;
height: 640px !important;
}
/deep/.tui-image-editor-canvas-container,.lower-canvas,.upper-canvas {
/deep/.tui-image-editor-canvas-container,
/deep/.lower-canvas,
/deep/.upper-canvas {
max-height: 640px !important;
max-width: 640px !important;
display: flex !important;
......@@ -992,24 +995,93 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.options-top {
position: relative;
width: 336px;
height: 352px;
height: 322px;
background: #f6f8fa;
.top-title {
position: relative;
height: 40px;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 16px;
background: #e9f3fd;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.4);
border-radius: 4px 4px 0px 0px;
.top-title-left {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
.top-title-right {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
display: flex;
align-items: center;
cursor: pointer;
.clear_icon {
width: 12px;
height: 14px;
display: flex;
margin-right: 4px;
img {
width: 100%;
height: 100%;
}
}
.name {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
}
}
.clearConfirm {
z-index: 10;
position: absolute;
top: 50px;
right: 0;
width: 300px;
height: 114px;
background: #ffffff;
box-shadow: 0px 18px 28px 10px rgba(0, 21, 51, 0.08);
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: 20px 30px;
.tips {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.btn-bottom {
margin-top: 17px;
display: flex;
.btn-confirm,
.btn-cancel {
cursor: pointer;
width: 72px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
display: flex;
justify-content: center;
align-items: center;
&:hover {
background: #377fec;
color: #ffffff;
}
&:active {
background: #044cb9;
color: #ffffff;
}
}
.btn-cancel {
background: #055fe7;
color: #ffffff;
}
.btn-confirm {
margin-right: 24px;
}
}
}
}
}
......@@ -1227,7 +1299,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
}
.save {
margin-top: 40px;
margin-top: 20px;
margin-left: 130px;
display: flex;
width: 100%;
......@@ -1267,10 +1339,10 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.save-type-options {
z-index: 10;
position: absolute;
bottom: -70px;
bottom: -50px;
left: 86px;
width: 146px;
height: 96px;
height: 66px;
background: #ffffff;
border-radius: 3px;
box-shadow: 0px 2px 5px 0px rgba(0, 21, 51, 0.25);
......@@ -1293,8 +1365,17 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.options-bottom {
margin-top: 16px;
width: 336px;
height: 322px;
height: 350px;
background: #f6f8fa;
.options-bottom-title {
padding-left: 16px;
width: 336px;
height: 32px;
background: #e9f3fd;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.39);
border-radius: 4px 4px 0px 0px;
line-height: 32px;
}
.options-bottom-btns {
position: relative;
width: 100%;
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -767,6 +767,7 @@ $directionRotate: var(--directionRotate, 0deg);
}
}
.drawing {
overflow: hidden;
width: 880px;
height: 686px;
background: #ffffff;
......@@ -797,8 +798,8 @@ $directionRotate: var(--directionRotate, 0deg);
height: 640px !important;
}
/deep/.tui-image-editor-canvas-container,
.lower-canvas,
.upper-canvas {
/deep/.lower-canvas,
/deep/.upper-canvas {
max-height: 640px !important;
max-width: 640px !important;
display: flex !important;
......
src/views/Editor/modules/imageEdAJ.vue
......@@ -226,9 +226,9 @@
<img src="@/assets/img/rybj/tzd.png" alt="">
<div class="number">{{tzdnumber}}</div>
</div>
<div class="bzd" @click="directionChange">
<img src="@/assets/img/rybj/bzd.png" alt="">
</div>
<!-- <div class="bzd" @click="directionChange">-->
<!-- <img src="@/assets/img/rybj/bzd.png" alt="">-->
<!-- </div>-->
<div class="rule">
<img src="@/assets/img/rybj/dp.png" alt="">
</div>
......@@ -740,7 +740,7 @@ export default {
});
this.multiplyColorpicker = multiplyColorpicker
// 差异化颜色选择器
// 差异化颜色选择器
var blendColorpicker = tui.colorPicker.create({
container: $('#tui-blend-color-picker')[0],
color: '#FF4041',
......@@ -1171,7 +1171,7 @@ export default {
// 开启拖拽
if (self.isHand || self.isHandSpace) {
// 放大后开启拖拽
self.startHand = true
// self.startHand = true
if (self.zoomLevel > 1) {
self.startHand = true
}
......@@ -2971,4 +2971,4 @@ export default {
<style lang="scss" scoped>
@import "./imageEdAJ.scss";
</style>
\ No newline at end of file
</style>
src/views/Editor/modules/ryzwbjLeft.scss
.ryzwbjLeft {
width: 448px;
width: 340px;
height: 100%;
padding: 24px;
box-sizing: border-box;
......@@ -29,7 +29,7 @@
}
.zzw {
width: 258px;
margin-left: 20px;
// margin-left: 20px;
.zzw-select {
width: 100%;
display: flex;
......
src/views/login/Login1.vue
......@@ -62,7 +62,6 @@
</template>
<script>
import zoom from "@/utils/autosize";
import accountsLogin from "./modules/AccountsLogin.vue";
import keyLogin from "./modules/KeyLogin.vue";
......@@ -120,10 +119,6 @@ export default {
}, 3000);
},
mounted() {
// zoom('homepage_hero_module')
// window.addEventListener('resize', function () {
// zoom('homepage_hero_module')
// })
this.loginType.accountStatus = true;
if (localStorage.getItem("token") !== null) {
this.$router.push("/Home/Home");
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-02 09:41:08
* @LastEditTime: 2021-11-04 10:41:01
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......
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