Skip to content

F
founder_vue
Commit d85d785b by liyuhang19990520
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 99cc8db3 ebde5cda
Showing with 216 additions and 71 deletions
public/index.html
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-12 17:43:47
* @LastEditTime: 2021-11-13 00:22:18
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\public\index.html
......@@ -56,6 +56,7 @@
<script src="<%= BASE_URL %>image-edit/js/FileSaver.min.js"></script>
<script src="<%= BASE_URL %>image-edit/js/tui-image-editor.js"></script>
<script src="<%= BASE_URL %>image-edit/js/fabric-irregular.js"></script>
<script src="<%= BASE_URL %>js/rotate_matrix.js"></script>
<!-- <script src="<%= BASE_URL %>image-edit/js/ui.js"></script>
<script src="<%= BASE_URL %>image-edit/js/action.js"></script> -->
<!-- <script src="<%= BASE_URL %>image-edit/js/service-basic.js"></script> -->
......
public/js/rotate_matrix.js 0 → 100644
/*
* @Author: your name
* @Date: 2021-11-13 00:21:03
* @LastEditTime: 2021-11-13 00:21:47
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\rotate_matrix.js
*/
class Matrix {
constructor() {
this.arr = [1, 0, 0, 0, 1, 0, 0, 0, 1];
}
translate(x, y) {
this.arr = this._mult(this.arr, [1, 0, 0, 0, 1, 0, x, y, 1]);
}
rotate(angle) {
const cos = Math.cos(angle);
const sin = Math.sin(angle);
this.arr = this._mult(this.arr, [cos, -sin, 0, sin, cos, 0, 0, 0, 1]);
}
_mult(a, b) {
const ret = [];
for (let y = 0; y < 3; y++) {
for (let x = 0; x < 3; x++) {
let sum = 0;
for (let i = 0; i < 3; i++) {
sum += b[i + y * 3] * a[x + i * 3];
}
ret[x + y * 3] = sum;
}
}
return ret;
}
}
const reverse = (x, y, cx, cy, angle) => {
const matrix = new Matrix();
matrix.translate(cx, cy);
matrix.rotate(angle);
const m = matrix.arr;
x = x - cx;
y = y - cy;
const x1 = x * m[0] + y * m[3] + m[6];
const y1 = x * m[1] + y * m[4] + m[7];
return [x1, y1];
};
\ No newline at end of file
src/components/ImageEd.scss
......@@ -1193,13 +1193,13 @@ div {
}
/deep/ .el-slider__bar {
height: 3px;
background-color: #055FE7;
background-color: #055fe7;
}
/deep/ .el-slider__button {
width: 10px;
height: 10px;
background: #FFFFFF;
border: 2px solid #055FE7;
background: #ffffff;
border: 2px solid #055fe7;
}
.qb_v {
width: 34px;
......@@ -1315,19 +1315,29 @@ div {
justify-content: center;
align-items: center;
.tui-image-editor {
width: 520px;
width: 520px !important;
height: 520px !important;
display: flex;
align-items: center;
justify-content: center;
}
.tui-image-editor2 {
width: 520px;
height: 520px;
width: 520px !important;
height: 520px !important;
display: flex;
justify-content: center;
align-items: center;
}
/deep/.lower-canvas,
/deep/.upper-canvas {
max-height: 520px !important;
max-width: 520px !important;
height: 100%;
width: auto !important;
display: flex !important;
justify-content: center !important;
align-items: center !important;
}
}
}
}
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -44,12 +44,13 @@
prop="xckybh"
>
<el-input
class="inputBh"
v-model.trim="ruleForm.xckybh"
placeholder="请输入现场勘验编号"
maxlength="23"
maxlength="22"
show-word-limit
clearable
></el-input>
><template slot="prepend">K</template></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -377,7 +378,9 @@ export default {
}
reqParam.caseBase = this.ruleForm
let defaultArr = 'A'
let defaultValue = 'K'
reqParam.personDo.ysxtAsjbh = defaultArr.concat(this.ruleForm.ysxtAsjbh)
reqParam.personDo.xckybh = defaultValue.concat(this.ruleForm.xckybh)
this.$axios
.post("/api/casestore/caseadd", reqParam)
.then(response => {
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-12 20:17:17
* @LastEditTime: 2021-11-13 11:21:59
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -177,12 +177,9 @@ export default {
console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ajzwbjImage', element.image)
self.$bus.emit('ajzwbjTDZ')
}
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ajzwbjImage', res.data.ret.image)
self.$bus.emit('ajzwbjTDZ')
}
}
})
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -854,6 +854,13 @@ $directionRotate: var(--directionRotate, 0deg);
// transform-origin: $transOrigin;
// background-color: #999;
}
.tzdDrawing_2 {
width: 640px;
height: 640px;
position: absolute;
background: transparent;
transform-origin: 320px 320px;
}
.irregular {
width: 640px;
height: 640px;
......
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-12 19:48:54
* @LastEditTime: 2021-11-13 11:21:36
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -257,20 +257,22 @@ export default {
// ip:port/api/org/roll/{id}/{seq}
let self = this
this.$axios({
method: 'get',
url: `/api/org/roll/${self.id}/${seq}?mnt=1`,
method: 'post',
// url: `/api/org/roll/${self.id}/${seq}?mnt=1`,
url: '/api/org/rollByBarcode/barcode/seq',
data: {
barcode: self.barcode,
seqno: self.seq
},
loading: false
// url: `/api/org/roll/${1}/${seq}?mnt=1`
}).then(res => {
// console.log(res);
console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', element.image)
self.$bus.emit('ryzwbjTDZ')
}
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', res.data.ret.image)
self.$bus.emit('ryzwbjTDZ')
}
}
})
......@@ -285,20 +287,22 @@ export default {
// ip:port/api/org/plain/{id}/{seq}
let self = this
this.$axios({
method: 'get',
url: `/api/org/plain/${self.id}/${seq}?mnt=1`,
method: 'post',
// url: `/api/org/plain/${self.id}/${seq}?mnt=1`,
url: '/api/org/plainByBarcode/barcode/seq',
data: {
barcode: self.barcode,
seqno: self.seq
},
loading: false
// url: `/api/org/plain/${1}/${seq}?mnt=1`
}).then(res => {
// console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', element.image)
self.$bus.emit('ryzwbjTDZ')
}
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', res.data.ret.image)
self.$bus.emit('ryzwbjTDZ')
}
}
})
......@@ -477,7 +481,7 @@ export default {
* @return {*}
*/
zzwChange (event) {
if(!this.PainFingerFlag && event.target.innerText == '平面指纹') {
if (!this.PainFingerFlag && event.target.innerText == '平面指纹') {
return
}
this.zwSelect = event.target.innerText
......
src/views/drFPTX/RAList.vue
......@@ -12,8 +12,14 @@
v-model="dataType"
class="chooseType"
>
<el-radio :label="1">人员</el-radio>
<el-radio :label="2">案件</el-radio>
<el-radio
:label="1"
@click.native.prevent="clickitemdataType(1)"
>人员</el-radio>
<el-radio
:label="2"
@click.native.prevent="clickitemdataType(2)"
>案件</el-radio>
</el-radio-group>
<div class='search barcode'>
<div class='item'> 条码号：</div>
......@@ -74,6 +80,9 @@
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="{
disabledDate: disabledDate,
}"
>
</el-date-picker>
</div>
......@@ -543,7 +552,7 @@ export default {
},
data () {
return {
dataType: 1, // 导入类型
dataType: null, // 导入类型
barcode: "", // 条码号
logicDatabaseoptions: [
{
......@@ -631,6 +640,10 @@ export default {
this.search();
},
},
mounted () {
this.search();
},
methods: {
// 获取全部人员列表请求
search () {
......@@ -878,6 +891,16 @@ export default {
}
console.log(this.multipleSelection);
},
disabledDate (a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
clickitemdataType (e) {
e === this.dataType ? this.dataType = '' : this.dataType = e
},
},
computed: {
/**
......@@ -886,6 +909,7 @@ export default {
* @return {*}
*/
Tpage1 () {
console.log(this.total1, this.pageSize, 1112223333)
return (
Math.floor(this.total1 / this.pageSize) + 1
);
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-12 20:42:26
* @LastEditTime: 2021-11-13 11:09:56
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,8 +91,8 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定
target: "http://192.168.128.110:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.110:8099", // 湖南-张
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
......
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