Skip to content

F
founder_vue
Commit bff11a32 by 米嘉伟
Options

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

parents 881cf2cc b4a8dabe
Showing with 668 additions and 175 deletions
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-15 18:27:32
* @LastEditTime: 2021-12-16 10:24:53
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......@@ -14,7 +14,7 @@
<script>
export default {
created () {
created() {
// console.log(document.body.scrollHeight)
var lett = this;
document.onkeydown = function (e) {
......@@ -130,6 +130,15 @@ export default {
color: #2e3846;
}
}
.screenSave {
margin-right: 0 !important;
// background: #ffffff!important;
// border-radius: 4px!important;
// border: 1px solid #aeb5c2!important;
// font-size: 14px!important;
// font-family: MicrosoftYaHei!important;
// color: #2e3846!important;
}
.el-message-box {
position: relative;
display: inline-block;
......@@ -160,6 +169,7 @@ export default {
.el-popconfirm__action {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
......
src/components/ImageEd.scss
......@@ -1430,6 +1430,7 @@ div {
justify-content: center;
position: relative;
.body-container {
position: relative;
z-index: 99;
width: 540px;
height: 540px;
......@@ -1442,6 +1443,7 @@ div {
height: 540px !important;
position: relative;
overflow: hidden;
box-sizing: content-box;
}
.tui-image-editor2 {
box-sizing: content-box;
......@@ -1456,6 +1458,12 @@ div {
}
/deep/.lower-canvas,
/deep/.upper-canvas {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
margin: auto;
max-height: 540px !important;
max-width: 540px !important;
height: 100%;
......
src/components/SelectCode.vue
<!--
* @Author: your name
* @Date: 2021-11-25 10:15:01
* @LastEditTime: 2021-12-15 17:33:15
* @LastEditTime: 2021-12-17 10:18:53
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\SelectCode.vue
......@@ -27,7 +27,7 @@
@change="change"
@visible-change="visibleChange"
>
<el-checkbox-group v-model="newForm[id]">
<el-checkbox-group v-model="newForm[id]" :max="multipleLimit">
<el-option
ref="option"
v-for="item in options"
......@@ -79,6 +79,8 @@ export default {
type: [String, Number],
default: 16.5,
},
//多选时最多可以选择几个
multipleLimit: Number,
},
watch: {
// form: {
......
src/components/swiper.vue
<!--
* @Author: your name
* @Date: 2021-11-13 16:32:50
* @LastEditTime: 2021-11-25 17:14:09
* @LastEditTime: 2021-12-17 11:25:49
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\swiper.vue
......@@ -29,7 +29,7 @@
<span>/{{ carData.length }}</span>
</div>
<div class="wenzi">
<p>
<p v-if="type != 'rgrd'">
<span>查询ID：</span>
<span
:class="{
......@@ -60,7 +60,11 @@
</el-carousel>
</div>
<!-- 可以点击上一条的左侧按钮-->
<div v-show="carIndex > 0" class="left" @click="btnQiehuan('left')">
<div
v-show="carIndex > 0 && type != 'rgrd'"
class="left"
@click="btnQiehuan('left')"
>
<img
style="transform: rotate(180deg)"
src="@/assets/img/right.png"
......@@ -68,12 +72,16 @@
/>
</div>
<!-- 不可点击的上一条左侧按钮 -->
<div v-show="carIndex === 0" class="left" @click="noData('left')">
<div
v-show="carIndex === 0 && type != 'rgrd'"
class="left"
@click="noData('left')"
>
<img src="@/assets/img/left.png" alt="" />
</div>
<!-- 可以点击的下一条的按钮-->
<div
v-show="carData.length - 1 > carIndex"
v-show="carData.length - 1 > carIndex && type != 'rgrd'"
class="right"
@click="btnQiehuan('right')"
>
......@@ -81,7 +89,7 @@
</div>
<!-- 不可以点击的下一条的按钮 -->
<div
v-show="carData.length - 1 === carIndex"
v-show="carData.length - 1 === carIndex && type != 'rgrd'"
class="right"
@click="noData('right')"
>
......@@ -100,6 +108,9 @@ export default {
carIndex: 0,
};
},
mounted() {
console.log(this.type);
},
methods: {
noData(type) {
if (type === "left") {
......@@ -135,6 +146,7 @@ export default {
type: Boolean,
default: false,
},
type: String,
},
};
</script>
......
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-15 18:33:41
* @LastEditTime: 2021-12-16 10:18:36
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -77,14 +77,16 @@ _axios.interceptors.response.use(
MessageBox.confirm(response.data.message == '未登录' ? '登陆超时,请重新登录!' : response.data.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
showCancelButton: true,
confirmButtonClass: 'screenSave',
closeOnPressEscape: false,
closeOnClickModal: false,
showCancelButton: false,
showClose: false,
type: 'warning'
}).then(() => {
localStorage.removeItem('token')
router.replace("/Login");
}).catch(() => {
localStorage.removeItem('token')
router.replace("/Login");
});
}, 500);
return;
......
src/router/modules/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-11 10:27:53
* @LastEditTime: 2021-12-17 14:26:13
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -188,5 +188,23 @@ export default [
auth: "5",
},
component: () => import("@/views/bzxxgl/fhxxLL.vue")
},
{
path: "/rgTT",
name: "rgTT",
meta: {
title: "人工认定界面",
auth: "5"
},
component: () => import("@/views/rgrd/rgTT.vue")
},
{
path: "/rgLL",
name: "rgLL",
meta: {
title: "人工认定界面",
auth: "5"
},
component: () => import("@/views/rgrd/rgLL.vue")
}
];
src/utils/UserUtil.js
export default function stRole() {
let userInfo = JSON.parse(localStorage.getItem('userInfo'))
// console.log('用户信息：', userInfo)
let username = userInfo.username
......
src/views/Editor/modules/ajdaxx.vue
......@@ -41,6 +41,16 @@
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="发案日期：" prop="occurdate">
<el-date-picker type="date" placeholder="请输入发案日期" v-model="ruleForm.occurdate" :picker-options="{
disabledDate: disabledDate,
}"></el-date-picker>
</el-form-item>
<el-form-item label="案件类别：" prop="ajlbdm">
<Cascader :form="ruleForm" id="ajlbdm" codeName="CODE_AJLB"></Cascader>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="损失价值（人民币元）：" prop="ssjzrmby">
<el-input placeholder="根据代码自动匹配" v-model="ruleForm.ssjzrmby" maxlength="11" show-word-limit></el-input>
</el-form-item>
......@@ -51,11 +61,6 @@
</el-radio-group>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="案件类别：" prop="ajlbdm">
<Cascader :form="ruleForm" id="ajlbdm" codeName="CODE_AJLB"></Cascader>
</el-form-item>
</div>
<div class="ayzzwjbxx-item ayzzwjbxx-item2">
<el-form-item label="简要案情：" prop="jyaq" class="input3">
<el-input type="textarea" :rows="2" placeholder="请输入简要案情" v-model="ruleForm.jyaq" maxlength="4000" show-word-limit></el-input>
......@@ -171,6 +176,7 @@ export default {
asjbh: '',
asjfsddXzqhdm: '',
xczzhwkbh: '',
occurdate: '',
ssjzrmby: '',
asjfsddDzmc: '',
sfmaPdbz: '0',
......@@ -313,6 +319,7 @@ export default {
this.ruleForm.asjbh = this.ajInfo.asjbh
this.ruleForm.asjfsddXzqhdm = this.ajInfo.asjfsddXzqhdm
this.ruleForm.xczzhwkbh = this.ajInfo.xczzhwkbh
this.ruleForm.occurdate = this.ajInfo.occurdate
this.ruleForm.ssjzrmby = this.ajInfo.ssjzrmby
this.ruleForm.asjfsddDzmc = this.ajInfo.asjfsddDzmc
this.ruleForm.sfmaPdbz = this.ajInfo.sfmaPdbz
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-14 20:37:53
* @LastEditTime: 2021-12-16 11:20:20
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -183,7 +183,9 @@ export default {
loading: true,
data: {
// barcode: 'A9999999777778888888888'
barcode: self.barcode
barcode: self.barcode,
dealFlag: 1,
fingerPosition: 1
}
})
console.log(res);
......@@ -237,11 +239,13 @@ export default {
this.$store.commit('zwbj/setSeq', seq)
this.$axios({
method: 'post',
url: `/api/org/caseBybarcode/barcode/seq`,
url: `/api/org/case/barcode/seqNo`,
// url: `/api/org/case/${self.id}/${seq}?mnt=1`,
data: {
barcode: self.barcode,
seqno: self.seq
seqno: self.seq,
dealFlag: 1,
fingerPosition: 1
},
loading: false,
cancelToken: source.token
......@@ -268,9 +272,11 @@ export default {
this.$axios({
method: 'post',
// url: '/api/org/case/' + self.id + '?mnt=1'
url: `/api/org/caseBybarcode/barcode`,
url: `/api/org/case/barcode`,
data: {
barcode: self.barcode
barcode: self.barcode,
dealFlag: 1,
fingerPosition: 1
},
}).then(res => {
console.log(res);
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-15 16:29:42
* @LastEditTime: 2021-12-17 10:42:08
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -348,10 +348,14 @@
</div>
</div>
</div>
<!-- 发查询弹窗 -->
<fcx :isShowFcx="isShowFcx" :rowData="fcxData" :type="'ry'" @closeFcx="closeFcx">
</fcx>
</div>
</template>
<script>
import fcx from "@/views/AllPersonnelBase/modules/fcx.vue"; // 发查询弹窗
import { mapState } from "vuex";
import MouseGesture from "./tzd_rotate.js";
import "@/icons/direction.svg";
......@@ -359,6 +363,9 @@ import "@/icons/direction.svg";
export default {
data () {
return {
// 发查询对象
fcxData: {},
isShowFcx: false, //发查询
// 人像信息
rxInfo: [],
// 绿色角度方向（暂时不做）
......@@ -629,7 +636,7 @@ export default {
};
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
},
...mapState({
......@@ -1424,8 +1431,41 @@ export default {
const [x, y] = reverse(point.x, point.y, det.x, det.y, -angle);
//console.log(x, y);
$(`#tzd${self.tzdId}`).css("left", x - 4 + "px");
$(`#tzd${self.tzdId}`).css("top", y - 4 + "px");
// canvasBox_height
if (self.imageEditor._graphics.getCanvasImage().flipX && !self.imageEditor._graphics.getCanvasImage().flipY) {
$(`#tzd${self.tzdId}`).css("left", self.canvasBox_width - (x + 4) + "px");
$(`#tzd${self.tzdId}`).css("top", (y - 4) + "px");
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.x = self.canvasBox_width - (x + 4)
item.y = y - 4
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && !self.imageEditor._graphics.getCanvasImage().flipX) {
$(`#tzd${self.tzdId}`).css("left", x - 4 + "px");
$(`#tzd${self.tzdId}`).css("top", self.canvasBox_height - (y + 4) + "px");
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.x = x - 4
item.y = self.canvasBox_height - (y + 4)
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && self.imageEditor._graphics.getCanvasImage().flipX) {
$(`#tzd${self.tzdId}`).css("left", self.canvasBox_width - (x + 4) + "px");
$(`#tzd${self.tzdId}`).css("top", self.canvasBox_height - (y + 4) + "px");
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.x = self.canvasBox_width - (x + 4)
item.y = self.canvasBox_height - (y + 4)
}
})
} else {
$(`#tzd${self.tzdId}`).css("left", x - 4 + "px");
$(`#tzd${self.tzdId}`).css("top", y - 4 + "px");
}
// console.log(self.imageEditor._graphics.getCanvasImage());
$(`#tzd${self.tzdId}`).css("box-sizing", "border-box");
}
}
......@@ -1657,14 +1697,53 @@ export default {
}
if (self.deg) {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${self.deg - self.startPlace}deg)`
);
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${-self.deg - self.startPlace}deg)`
);
if (!self.imageEditor._graphics.getCanvasImage().flipY && self.imageEditor._graphics.getCanvasImage().flipX) {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${self.deg + self.startPlace + 180}deg)`
);
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.angle = -(self.deg + self.startPlace + 180)
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && !self.imageEditor._graphics.getCanvasImage().flipX) {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${self.deg + self.startPlace}deg)`
);
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.angle = -(self.deg + self.startPlace)
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && self.imageEditor._graphics.getCanvasImage().flipX) {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${-self.deg - self.startPlace - 180}deg)`
);
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.angle = -(-self.deg - self.startPlace - 180)
}
})
} else {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${-self.deg - self.startPlace}deg)`
);
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.angle = -(-self.deg - self.startPlace)
}
})
}
// $("#tzd" + self.tzdId).css(
// "transform",
// `rotate(${self.deg - self.startPlace}deg)`
// );
} else {
}
}
......@@ -1692,18 +1771,18 @@ export default {
// //console.log(e);
if (self.isHandTZD) {
if (e.which === 1) {
if (self.deg) {
let objindex = self.tzdArr.findIndex((item) => {
return item.id == self.tzdId;
});
// self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
self.tzdArr[objindex].angle = self.deg;
} else {
let objindex = self.tzdArr.findIndex((item) => {
return item.id == self.tzdId;
});
self.tzdArr[objindex].angle = 0;
}
// if (self.deg) {
// let objindex = self.tzdArr.findIndex((item) => {
// return item.id == self.tzdId;
// });
// // self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
// self.tzdArr[objindex].angle = self.deg;
// } else {
// let objindex = self.tzdArr.findIndex((item) => {
// return item.id == self.tzdId;
// });
// self.tzdArr[objindex].angle = 0;
// }
self.tzdnumber++;
self.tzdFlag = false;
self.tzdId++;
......@@ -1848,6 +1927,13 @@ export default {
},
methods: {
/**
* 关闭发查询
*/
closeFcx (val) {
this.$bus.emit('isBlur', val)
this.isShowFcx = val;
},
/**
* 清除所有
*/
clearALL () {
......@@ -4082,20 +4168,11 @@ export default {
return;
}
},
/**
* 打开发查询
*/
btnChange () {
let isOptionsArr = [];
let sessionKeys = Object.keys(sessionStorage);
for (let index = 0; index < sessionKeys.length; index++) {
const element = sessionKeys[index];
if (element[0] == "i") {
isOptionsArr.push(JSON.parse(sessionStorage.getItem(element)));
}
}
console.log(isOptionsArr);
let flag = isOptionsArr.every((item) => {
return !item;
});
console.log(flag);
this.isShowFcx = true
},
/**
* 对特征点图层进行更新
......@@ -4378,6 +4455,9 @@ export default {
this.$bus.off("setRxInfoEnlarge");
this.$bus.off("setRxInfo");
},
components: {
fcx,
},
};
</script>
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -1092,8 +1092,8 @@ $canvasWidth: var(--canvasWidth, 670px);
/deep/ .canvas-container {
position: absolute !important;
width: 670px !important;
height: 670px !important;
width: 670px;
height: 670px;
z-index: 9;
}
}
......
src/views/Editor/modules/rydaxx.vue
......@@ -26,7 +26,7 @@
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="采集信息原因：" prop="cjxxyydm">
<SelectCode codeUrl="/api/code/cjxxyydm" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="cjxxyydm"></SelectCode>
<SelectCode codeUrl="/api/code/cjxxyydm" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="cjxxyydm" multiple :multipleLimit="5"></SelectCode>
</el-form-item>
<el-form-item label="指掌纹卡编号：" prop="zzhwkbh">
<el-input placeholder="请输入指掌纹卡编号" v-model="ruleForm.zzhwkbh" maxlength="23" show-word-limit></el-input>
......@@ -66,23 +66,14 @@
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="国籍：" prop="gjdm">
<!-- <el-select v-model="ruleForm.gjdm" placeholder="请输入国籍">-->
<!-- <el-option label="中国" value="中国"></el-option>-->
<!-- </el-select>-->
<SelectCode codeUrl="/api/code/nationality" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="gjdm"></SelectCode>
</el-form-item>
<el-form-item label="民族：" prop="mzdm">
<!-- <el-select v-model="ruleForm.mzdm" placeholder="请选择民族类型">-->
<!-- <el-option label="汉" value="汉"></el-option>-->
<!-- </el-select>-->
<SelectCode codeUrl="/api/code/nation" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="mzdm"></SelectCode>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="证件类型：" prop="cyzjdm" class="select">
<!-- <el-select v-model="ruleForm.cyzjdm" placeholder="请选择证件类型">-->
<!-- <el-option label="中国" value="中国"></el-option>-->
<!-- </el-select>-->
<SelectCode codeUrl="/api/code/certificates" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="cyzjdm"></SelectCode>
</el-form-item>
<el-form-item label="证件号码：" prop="zjhm" class="input2">
......@@ -91,9 +82,6 @@
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="户籍地行政区：" prop="hjdzXzqhdm" class="select">
<!-- <el-select v-model="ruleForm.hjdzXzqhdm" placeholder="请输入户籍地行政区">-->
<!-- <el-option label="中国" value="中国"></el-option>-->
<!-- </el-select>-->
<SelectCode codeUrl="/api/code/administrative" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="hjdzXzqhdm"></SelectCode>
</el-form-item>
<el-form-item label="户籍地址：" prop="hjdzDzmc" class="input2">
......@@ -398,7 +386,10 @@ export default {
this.ruleForm.id = this.ryInfo.id
this.ruleForm.rybh = this.ryInfo.ysxtAsjxgrybh
this.ruleForm.jzrybh = this.ryInfo.jzrybh
this.ruleForm.cjxxyydm = this.ryInfo.cjxxyydm
// 人员档案信息
if(this.ryInfo.cjxxyydm) {
this.ruleForm.cjxxyydm = this.ryInfo.cjxxyydm.split(',')
}
this.ruleForm.zzhwkbh = this.ryInfo.zzhwkbh
this.ruleForm.asjxgrybh = this.ryInfo.asjxgrybh
this.ruleForm.xm = this.ryInfo.xm
......@@ -449,13 +440,15 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
let logicList = this.ruleForm.logicdbtype2
let cjxxyyList = this.ruleForm.cjxxyydm
delete this.ruleForm.cjxxyydm
self.$axios({
method: 'post',
headers: {
"Content-Type": "application/json;charset=UTF-8"
},
url: '/api/personstore/person/file',
data: JSON.stringify({personDo: self.ruleForm, logicList: logicList})
data: JSON.stringify({personDo: self.ruleForm, logicList: logicList, cjxxyyList: cjxxyyList})
}).then(res => {
if (res.data.code === 0) {
self.$message.success('保存成功！')
......
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-14 19:27:45
* @LastEditTime: 2021-12-16 11:30:35
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -459,7 +459,9 @@ export default {
loading: true,
data: {
// barcode: 'R4308214500002021100049'
barcode: self.barcode
barcode: self.barcode,
dealFlag: 1,
fingerPosition: 1
}
})
// 初始化图片
......@@ -539,10 +541,12 @@ export default {
this.$axios({
method: 'post',
// url: `/api/org/roll/${self.id}/${seq}?mnt=1`,
url: '/api/org/rollByBarcode/barcode/seq',
url: '/api/org/roll/barcode/seq',
data: {
barcode: self.barcode,
seqno: self.seq
seqno: self.seq,
dealFlag: 1,
fingerPosition: 1
},
loading: false,
cancelToken: source.token,
......@@ -575,10 +579,12 @@ export default {
this.$axios({
method: 'post',
// url: `/api/org/plain/${self.id}/${seq}?mnt=1`,
url: '/api/org/plainByBarcode/barcode/seq',
url: '/api/org/plain/barcode/seq',
data: {
barcode: self.barcode,
seqno: self.seq
seqno: self.seq,
dealFlag: 1,
fingerPosition: 1
},
loading: false,
cancelToken: source.token,
......@@ -613,9 +619,11 @@ export default {
let res = await this.$axios({
method: 'post',
// url: '/api/org/roll/'+self.id+'?mnt=1',
url: '/api/png/rollEByBarcode/barcode',
url: '/api/png/roll/barcode',
data: {
barcode: self.barcode
barcode: self.barcode,
dealFlag: 1,
fingerPosition: 1
},
loading: false
// url: '/api/png/roll/1?mnt=1'
......@@ -660,7 +668,7 @@ export default {
let res = await this.$axios({
method: 'post',
// url: '/api/org/plain/'+self.id+'?mnt=1',
url: '/api/png/plainEByBarcode/barcode',
url: '/api/png/plain/barcode',
data: {
barcode: self.barcode
},
......
src/views/Home/Home.vue
......@@ -216,7 +216,7 @@ export default {
methods: {
goQBAJK () {
if (!this.roleArr.includes("F-2-16")) return;
this.$router.push({
this.$router.pushToTab({
path: "/qbalk",
query: {
xzaj: true,
......@@ -225,28 +225,31 @@ export default {
},
toXtgl () {
if (!this.roleArr.includes("H")) return;
this.$router.push("/UserManage");
this.$router.pushToTab("/UserManage");
},
godrFPTX () {
if (!this.roleArr.includes("B-1")) return;
this.$router.push("/drFPTX");
this.$router.pushToTab("/drFPTX");
},
gobdrd () {
if (!this.roleArr.includes("C")) return;
this.$router.push("/cxyrd");
this.$router.pushToTab("/cxyrd");
},
gosjzygl () {
if (!this.roleArr.includes("F-1")) return;
this.$router.push("/AllPersonnelBaseIndex/");
this.$router.pushToTab("/AllPersonnelBaseIndex/");
},
gozzwcj () {
this.$router.push("/zzwcj")
if (!this.roleArr.includes("A")) return;
this.$router.pushToTab("/zzwcj")
},
gozljc () {
this.$router.push("/zljc")
if (!this.roleArr.includes("D")) return;
this.$router.pushToTab("/zljc")
},
gobzxxgl () {
this.$router.push("/bzxxgl")
if (!this.roleArr.includes("G")) return;
this.$router.pushToTab("/bzxxfh")
},
logout () {
this.$axios
......
src/views/SystemManage/UserManage.vue
......@@ -120,7 +120,7 @@
<el-table-column
prop="name"
label="姓名"
:width="width1"
align="center"
show-overflow-tooltip
>
</el-table-column>
......
src/views/bzxxgl/bzxxfh.vue
<!--
* @Author: your name
* @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-14 20:29:09
* @LastEditTime: 2021-12-16 23:52:00
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
......@@ -83,7 +83,7 @@
<div class="bzxxfh-content-content">
<el-tag v-show="isShowTip">
<span v-html="'&nbsp;&nbsp;'"></span>
<i class="iconfont icon-tanhao1" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"></i>
<i class="iconfont icon-tanhao1" style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"></i>
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span class="clearCheck" @click="toggleSelection()">清空</span>
......@@ -121,10 +121,10 @@
</el-tooltip>
</div>
<div class="fhyx" v-show="scope.row.reviewStatus==='2'">
<img src="@/assets/img/bzxxgl/fhyx.png" alt="">
<img src="@/assets/img/bzxxgl/fhyx.svg" alt="">
</div>
<div class="fhwx" v-show="scope.row.reviewStatus==='1'">
<img src="@/assets/img/bzxxgl/fhwx.png" alt="">
<img src="@/assets/img/bzxxgl/fhwx.svg" alt="">
</div>
</div>
</template>
......
src/views/cxyrd/LT.vue
......@@ -179,7 +179,7 @@ export default {
let self = this
this.qid = this.$route.query.rowData;
//console.log("源qid====>", this.qid);
this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo);
if(this.userInfo) {
this.bzr = this.userInfo.name
......
src/views/cxyrd/QueryConfirm.vue
......@@ -152,9 +152,9 @@
</div>
</div>
<div class="display_style">
<el-checkbox
><span>显示"{{ account }}"发查询用户查询</span></el-checkbox
>
<!-- <el-checkbox
><span>显示系统自发查询</span></el-checkbox
> -->
</div>
</div>
<div class="width100 margin_top24_bottom24 display_style">
......@@ -174,6 +174,10 @@
{{ btn.name }}
</div>
</div>
<div class="rgrd" @click="$refs.recognitionDialog.open()">
<img src="@/assets/img/person1.png" alt="" />
<span>人工认定</span>
</div>
</div>
</div>
<hr />
......@@ -473,6 +477,8 @@
<el-dialog :visible.sync="historyDialogVisible" style="z-index: 1500">
</el-dialog>
<recognitionDialog ref="recognitionDialog"> </recognitionDialog>
<Fcxtj
:isShowFcx="isShowFcx"
:type="dialogType"
......@@ -491,9 +497,10 @@ import SvgIcon from "../../components/SvgIcon/index.vue";
import "@/icons/tree_f.svg";
import "@/icons/tree_c.svg";
import Confirmation from "@/components/Confirmation.vue";
import recognitionDialog from "./modules/Recognition_dialog.vue";
export default {
name: "cxyrd",
components: { SvgIcon, Confirmation, Fcxtj },
components: { SvgIcon, Confirmation, Fcxtj, recognitionDialog },
data() {
return {
isShowFcx: false,
......@@ -1323,6 +1330,19 @@ div {
display: inline-block;
/*border: none;*/
}
.rgrd {
float: right;
color: #055fe7;
cursor: pointer;
img {
cursor: pointer;
margin-right: 5px;
}
> span {
cursor: pointer;
color: #055fe7 !important;
}
}
hr {
background-color: #eeeeee;
height: 1px;
......
src/views/cxyrd/TL.vue
......@@ -171,7 +171,10 @@ export default {
};
},
created () {
this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
},
mounted () {
this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo);
if(this.userInfo) {
this.bzr = this.userInfo.name
......@@ -180,8 +183,6 @@ export default {
this.bzrsfzh = this.userInfo.idCard
this.phone = this.userInfo.phoneNumber
}
},
mounted () {
let self = this
this.$bus.on('bzJudgeTL', (val) => {
self.bzData = val
......
src/views/cxyrd/TT.vue
......@@ -1256,9 +1256,12 @@ export default {
.then((res) => {
me.loadingIndex--;
if (res.data.code == 0) {
me.currentQqid = res.data.ret[0].qqid;
me.sourceObj = res.data.ret[0];
me.sourcedatas = res.data.ret;
me.sourcedatasLength = res.data.ret.length;
me.sourcebarcode = res.data.ret[0].barcode;
me.$set(me.sourcedatas[0], "clickLog", 1);
//console.log(222);
if (res.data.ret[0].removeFlag == "1") {
this.souceDel = true;
......@@ -1320,7 +1323,7 @@ export default {
this.loadingIndex++;
// 平面
this.$axios
.post("/api/png/plainByBarcode/barcode", {
.post("/api/png/plain/barcode", {
barcode: this.sourcebarcode,
})
.then(function (response) {
......@@ -1358,7 +1361,7 @@ export default {
let self = this;
// 滚动 源数据
this.$axios
.post("/api/png/rollByBarcode/barcode", { barcode: barcode })
.post("/api/png/roll/barcode", { barcode: barcode })
.then(function (response) {
self.loadingIndex--;
if (response.data.code == 0) {
......@@ -1393,7 +1396,7 @@ export default {
this.loadingIndex++;
// 平面 目标
this.$axios
.post("/api/png/plainByBarcode/barcode", {
.post("/api/png/roll/barcode", {
barcode: this.destbarcode,
})
.then(function (response) {
......@@ -1431,7 +1434,7 @@ export default {
this.loadingIndex++;
// 滚动 目标数据
this.$axios
.post("/api/png/rollByBarcode/barcode", { barcode: this.destbarcode })
.post("/api/png/plain/barcode", { barcode: this.destbarcode })
.then(function (response) {
self.loadingIndex--;
if (response.data.code == 0) {
......
src/views/cxyrd/modules/LLCandidate.vue
......@@ -83,7 +83,12 @@
</span>
</template>
</el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')">
<el-table-column
prop="destbarcode"
label="目标条码号"
width="auto"
v-if="roleArr.includes('C-1-7')"
>
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag === 1">
......@@ -1076,10 +1081,11 @@ export default {
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno);
self.$store.commit("loading/setLoading", true);
// 平面 --- 换压缩图
if (val.destseqno > 10) {
///////////////////////////////
if (self.fingerShowType == "指纹") {
//案件指纹
this.$axios
.post("/api/png/plainByBarcode/barcode", {
.post("/api/org/case/barcode/seqNo", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid,
......@@ -1087,28 +1093,32 @@ export default {
.then((response) => {
self.$bus.emit(
"changImageEditTarget",
response.data.ret[0].image
response.data.ret.image || "xxx"
);
});
clearTimeout(self.timer);
self.timer = setTimeout(() => {
self.$store.commit("loading/setLoading", false);
}, 500);
} else {
// 滚动 --- 换压缩图
//案件指纹
this.$axios
.post("/api/org/caseBybarcode/barcode", {
.post("/api/org/case/palm/barcode/seq", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid,
hpseqno: val.destseqno,
})
// qqid: val.qqid,
.then((response) => {
self.$bus.emit(
"changImageEditTarget",
response.data.ret[0].image
response.data.ret.image || "xxx"
);
});
clearTimeout(self.timer);
self.timer = setTimeout(() => {
self.$store.commit("loading/setLoading", false);
}, 500);
}
clearTimeout(self.timer);
self.timer = setTimeout(() => {
self.$store.commit("loading/setLoading", false);
}, 500);
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
// this.$axios
......@@ -1149,7 +1159,7 @@ export default {
computed: {
roleArr() {
return this.$store.state.layout.Menu;
}
},
},
props: {
fingerShowType: String,
......
src/views/cxyrd/modules/LLSrc.vue
......@@ -70,7 +70,7 @@
<div
class="btn"
@click="switchZhangWen"
:class="{ active: fingerShowType == '掌纹' }"
:class="{ active: fingerShowType == '掌纹',hui: sourceDel }"
>
掌纹
</div>
......@@ -267,6 +267,7 @@ export default {
loading: null,
timer: null,
plamList: [],
sourceDel: false
};
},
methods: {
......@@ -274,7 +275,9 @@ export default {
* 切换位掌纹
*/
switchZhangWen() {
if(this.sourceDel) return;
this.fingerShowType = "掌纹";
this.fingerTotal = this.plamList?.length || 0;
if (this.plamList && this.plamList?.length > 0) {
this.changeStyle(0, this.plamList[0]);
}
......@@ -316,8 +319,10 @@ export default {
//获取掌纹
getPlam() {
this.$axios
.post("/api/org/case/palm/barcode", {
.post("/api/check/org/case/palm/barcode", {
querytype: '3',
barcode: sessionStorage.getItem("srcbarcode"),
qqid: sessionStorage.getItem("qqid")
})
.then((res) => {
if (res.data.code == 0 && res.data.message == "success") {
......@@ -337,11 +342,13 @@ export default {
let self = this;
// 发送请求
this.fingerShowType = "指纹";
this.$emit("switchName", this.fingerShowType);
self.$store.commit("loading/setLoading", true);
self.qqid = val.qqid;
self.qid = val.qid;
// 被删除
if (val.removeFlag === 1) {
self.sourceDel = true;
self.$bus.emit("deleteMessage", {
msg: "该条数据已删除！",
delTime: self.$moment(val.removeTime).format("YYYY.MM.DD HH:mm"),
......@@ -356,7 +363,7 @@ export default {
self.fingerTotal = 0;
// 请求该条码号的案件指纹图片
self.$axios
.post("/api/org/caseBybarcode/barcode", {
.post("/api/org/case/barcode", {
querytype: "3",
barcode: val.barcode,
qqid: self.qqid,
......@@ -383,6 +390,7 @@ export default {
}, 500);
});
} else {
self.sourceDel = false;
// 没有被删除
self.$bus.emit("deleteMessage", {
msg: null,
......@@ -404,7 +412,7 @@ export default {
sessionStorage.setItem("srcbarcode", barcode);
//console.log(barcode);
self.$axios
.post("/api/org/caseBybarcode/barcode", {
.post("/api/org/case/barcode", {
querytype: "3",
barcode: barcode,
qqid: self.qqid,
......@@ -1285,4 +1293,8 @@ del {
text-decoration: underline wavy red; /*红色波浪形下划线*/
text-decoration: line-through red; /*红色删除线*/
}
.hui{
color: #C2C4C7!important;
background-color: #ECEDF1!important;
}
</style>
src/views/cxyrd/modules/LTCandidate.vue
......@@ -131,7 +131,7 @@
</el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')">
<template slot-scope="scope">
<!-- 被删除-->
<!-- 被删除 -->
<span v-if="scope.row.removeFlag===1">
<del>{{ scope.row.destbarcode }}</del>
</span>
......@@ -329,6 +329,7 @@ export default {
})
} else {
self.$bus.emit('bzJudge', null)
this.$bus.emit("changImageEditTarget", 'xxx');
}
});
},
......@@ -1185,12 +1186,25 @@ export default {
let self = this;
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit('bzJudge', val)
if(val.removeFlag == 1) {
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
this.$bus.emit('bzJudge', null)
return
}
if (self.isDelete) {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno);
this.$bus.emit("changImageEditTarget", 'xxx');
// this.$bus.emit("changImageEditTarget", 'xxx');
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
this.$bus.emit('bzJudge', null)
return;
} else {
//console.log(val);
......@@ -1203,10 +1217,10 @@ export default {
sessionStorage.setItem("destseqno", val.destseqno);
// self.$store.commit('loading/setLoading', true)
// 平面 --- 换压缩图
if (val.destseqno > 10) {
if (val.destseqno > 10 && val.destseqno <= 20) {
this.$axios({
method: 'post',
url: '/api/png/plainByBarcode/barcode/seq',
url: '/api/png/plain/barcode/seq',
data: {
barcode: val.destbarcode,
seqno: val.destseqno,
......@@ -1216,11 +1230,11 @@ export default {
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
})
} else {
} else if(val.destseqno >= 1 && val.destseqno <= 10) {
// 滚动 --- 换压缩图
this.$axios({
method: 'post',
url: '/api/png/rollByBarcode/barcode/seq',
url: '/api/png/roll/barcode/seq',
data: {
barcode: val.destbarcode,
seqno: val.destseqno,
......@@ -1230,6 +1244,19 @@ export default {
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
})
} else {
// 掌纹
this.$axios({
method: 'post',
url: '/api/png/palm/barcode/seq',
data: {
barcode: val.destbarcode,
hpseqno: val.destseqno,
},
loading: true
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
})
}
} else {
this.$bus.emit("changImageEditTarget", 'xxx');
......
src/views/cxyrd/modules/Recognition_dialog.vue 0 → 100644
<template>
<div>
<el-dialog
:title="title"
:visible.sync="dialogVisible"
width="26.125rem"
append-to-body
:close-on-click-modal="false"
:modal="false"
@open="openDialog"
@closed="closedDialog"
>
<el-form
:model="ruleForm"
:label-position="labelPosition"
label-width="7rem"
ref="ruleForm"
>
<el-form-item label="源条码号：" prop="originCode" :rules="inputRule">
<el-input
type="text"
placeholder="请输入内容"
v-model="ruleForm.originCode"
maxlength="22"
show-word-limit
>
</el-input>
</el-form-item>
<el-form-item
label="源数据类型："
prop="originCodeType"
:rules="radioRule"
>
<el-radio v-model="ruleForm.originCodeType" label="0">人员</el-radio>
<el-radio v-model="ruleForm.originCodeType" label="1">案件</el-radio>
</el-form-item>
<el-form-item label="目标条码号：" prop="targetCode" :rules="inputRule">
<el-input
type="text"
placeholder="请输入内容"
v-model="ruleForm.targetCode"
maxlength="22"
show-word-limit
>
</el-input>
</el-form-item>
<el-form-item
label="目标数据类型："
prop="targetCodeType"
:rules="radioRule"
>
<el-radio v-model="ruleForm.targetCodeType" label="0">人员</el-radio>
<el-radio v-model="ruleForm.targetCodeType" label="1">案件</el-radio>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button class="confirmBtn" @click="rgrd()">人工认定</el-button>
<el-button class="cancelBtn" @click="off()" type="primary"
>取 消</el-button
>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
name: "tjddl",
props: {},
data() {
return {
ruleForm: {
originCode: "", //选择队列
originCodeType: "0", // 删除原图
targetCode: "", // 覆盖原图
targetCodeType: "0", // 处理模式
},
inputRule: [{ required: true, message: "请输入内容", trigger: "change" }],
radioRule: [{ required: true, message: "请选择内容", trigger: "change" }],
title: "人工认定",
labelPosition: "left", // 标签对齐方式
dialogVisible: false, // 弹窗状态
};
},
mounted() {},
watch: {},
methods: {
openDialog() {
this.$bus.emit("isBlur", true);
},
closedDialog() {
this.$bus.emit("isBlur", false);
//关闭后重置值和验证状态
this.$refs.ruleForm.resetFields();
},
open() {
this.dialogVisible = true;
},
rgrd() {
let self = this;
this.$refs.ruleForm.validate((boo) => {
if (boo) {
let form = this.ruleForm;
//人人查重
if (form.originCodeType == "0" && form.targetCodeType == "0") {
self.$router.pushToTab("/rgTT");
//人案倒查
} else if (form.originCodeType == "0" && form.targetCodeType == "1") {
self.$router.pushToTab("/rgTL");
//案人正查
} else if (form.originCodeType == "1" && form.targetCodeType == "0") {
self.$router.pushToTab("/rgLT");
//案案串查
} else if (form.originCodeType == "1" && form.targetCodeType == "1") {
self.$router.pushToTab("/rgLL");
}
}
});
},
off() {
this.dialogVisible = false;
},
},
};
</script>
<style lang="scss" scoped>
/deep/.el-button--primary {
border-color: #055fe7;
background: #055fe7;
}
/deep/.el-button + .el-button {
margin-left: 24px;
}
/deep/.el-dialog {
border-radius: 6px;
font-family: MicrosoftYaHei;
}
/deep/.el-dialog__header {
border-bottom: 1px solid #eee;
}
/deep/ .el-dialog__title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
/deep/.el-dialog__footer {
text-align: center;
}
/deep/.el-form-item__label {
padding: 0;
}
.el-form-item {
margin-bottom: 15px;
}
/deep/.el-switch__core {
border-radius: 4px;
}
/deep/.el-switch__core:after {
border-radius: 3px;
}
/deep/.el-switch.is-checked .el-switch__core {
border-color: #055fe7;
background-color: #055fe7;
}
/deep/.el-radio__input.is-checked .el-radio__inner {
border-color: #055fe7;
background: #055fe7;
}
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #333333;
}
/deep/ .el-radio {
margin-right: 20px;
}
.el-select-dropdown__item.selected {
/* color: #409EFF; */
/* font-weight: 700; */
color: #333;
font-weight: normal;
}
.confirmBtn {
width: 102px !important;
}
.confirmBtn,
.cancelBtn {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
</style>
\ No newline at end of file
src/views/cxyrd/modules/TLCandidate.vue
<template>
<div class="tl-candidate">
<div class="tl-search">
<div class="label">手纹</div>
<div class="label">{{searchType}}</div>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input>
<div class="btn" @click="search">筛选</div>
</div>
......@@ -9,10 +9,41 @@
<el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</div>
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" :data="tableData" :row-class-name="tableRowClassName">
<el-table-column label="排名" type="index" :width="width1"></el-table-column>
<el-table-column prop="score" label="得分" :width="width1"></el-table-column>
<el-table-column label="序号" prop="destseqno" :width="width1"></el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')"></el-table-column>
<el-table-column label="排名" type="index" :width="width1">
</el-table-column>
<el-table-column prop="score" label="得分" :width="width1">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag==1">
<del>{{scope.row.score}}</del>
</span>
<span v-else>
{{scope.row.score}}
</span>
</template>
</el-table-column>
<el-table-column label="序号" prop="destseqno" :width="width1">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag==1">
<del>{{scope.row.destseqno}}</del>
</span>
<span v-else>
{{scope.row.destseqno}}
</span>
</template>
</el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag==1">
<del>{{scope.row.destbarcode}}</del>
</span>
<span v-else>
{{scope.row.destbarcode}}
</span>
</template>
</el-table-column>
</el-table>
<div class="lt_candidate_bottom">
<span>共计<span>{{ total }}条</span>数据</span>
......@@ -39,7 +70,8 @@ export default {
loading: null,
timer: null,
// 是否被删除
isDelete: false
isDelete: false,
searchType: '手纹'
};
},
created () {
......@@ -50,6 +82,10 @@ export default {
},
mounted () {
let self = this;
// 监听掌纹/手纹
self.$bus.on('searchType', (searchType) => {
self.searchType = searchType
})
// 监听是否被删除
self.$bus.on('deleteMessage', (obj) => {
if (obj.delTime != null) {
......@@ -74,6 +110,11 @@ export default {
});
} else {
self.$bus.emit('bzJudgeTL', null)
if (self.isDelete) {
// self.$bus.emit('changImageEditTarget', 'xxx')
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}
});
// 比中，认定完成之后更新列表数据
......@@ -115,18 +156,32 @@ export default {
handleCurrentChange (val, old) {
let self = this;
console.log(val);
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit('bzJudgeTL', val)
if (val.removeFlag == 1) {
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
this.$bus.emit('bzJudgeTL', null)
return
}
if (this.isDelete) {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno);
this.$bus.emit("changImageEditTarget", 'xxx');
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
this.$bus.emit('bzJudgeTL', null)
return
}
const CancelToken = axios.CancelToken;
const source = CancelToken.source();
if (val != null) {
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit('bzJudgeTL', val)
// 改变数据为点击状态
self.$set(val, "clickLog", "1");
// 存储目标条码号
......@@ -137,28 +192,51 @@ export default {
sessionStorage.setItem("backcheckXh", val.destseqno);
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
if (!self.isFirstMounted) {
self.$store.commit('loading/setLoadingSd', true)
// self.$store.commit('loading/setLoadingSd', true)
}
this.$axios
.post("/api/org/caseBybarcode/barcode/seq", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid
}, { loading: false, cancelToken: source.token }).then(response => {
//console.log(response);
if (response.data.code === 0) {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
self.$store.commit('loading/setLoadingSd', false)
}, 500);
if (val.destseqno < 100) {
// 获取案件指纹
this.$axios
.post("/api/org/case/barcode/seqNo", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid
}, { loading: true, cancelToken: source.token }).then(response => {
//console.log(response);
if (response.data.code === 0) {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
// self.$store.commit('loading/setLoadingSd', false)
}, 500);
}
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
});
} else {
// 获取案件掌纹
// TODO
this.$axios
.post("/api/org/case/palm/barcode/seq", {
barcode: val.destbarcode,
hpseqno: val.destseqno,
}, { loading: true, cancelToken: source.token }).then(response => {
//console.log(response);
if (response.data.code === 0) {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
// self.$store.commit('loading/setLoadingSd', false)
}, 500);
}
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
});
});
}
}
else {
self.$bus.emit("changImageEditTarget", 'xxx');
......@@ -197,7 +275,7 @@ export default {
}
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
}
},
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-15 18:35:21
* @LastEditTime: 2021-12-17 15:07:31
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,8 +91,7 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.121:8099/", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
......@@ -100,7 +99,7 @@ module.exports = {
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/",
target: "http://192.168.128.115:8099", // 江
// target: "http://192.168.128.115:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -124,7 +123,7 @@ module.exports = {
// // target: "http://www.meetfood.cn:2390/system", // 湖南-王
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// pathRewrite: {++++
// "^/system": ""
// }
// },
......
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