Skip to content

F
founder_vue
Commit 8a6f7275 by 李萌萌
Options

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

parents 7397e20b ed1ecc25
Showing with 831 additions and 274 deletions
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-12-16 21:33:05
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-12-17 12:05:17
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
......@@ -340,7 +339,7 @@
<!-- <div class="tzdDrawing_2"></div>
<div class="tzdDrawing"></div> -->
</div>
<div class="edit" id="sourceEdit" @click="sourceChange" v-if="roleArr.includes('C-1-9')">编辑</div>
<div class="edit" id="sourceEdit" v-show="!isFHxx" @click="sourceChange" v-if="roleArr.includes('C-1-9')">编辑</div>
<div class="shade_source" v-show="type=='target'" @click.self="sourceEdit"></div>
</div>
<div class="target" @click.self="targetEdit">
......@@ -375,7 +374,7 @@
<!-- <div class="tzdDrawing_2_target"></div>
<div class="tzdDrawing_target"></div> -->
</div>
<div class="edit" id="targetEdit" @click="targetChange" v-if="roleArr.includes('C-1-9')">编辑</div>
<div class="edit" id="targetEdit" v-show="!isFHxx" @click="targetChange" v-if="roleArr.includes('C-1-9')">编辑</div>
<div class="shade_target" v-show="type=='source'" @click.self="targetEdit"></div>
</div>
</div>
......@@ -462,6 +461,8 @@ export default {
name: "ImageEd",
data () {
return {
// 判断是否是复核页面
isFHxx: false,
// 记录导入图片的宽度和高度
newWidth: 540,
newHeight: 540,
......@@ -1987,6 +1988,8 @@ export default {
this.$bus.on('deleteMessage', (obj) => {
if (obj.delTime != null) {
self.zwtp_target = false
self.zwtp_source = false
self.isDelete = true
self.delTime = obj.delTime
self.sourceImage = null;
......@@ -2013,6 +2016,8 @@ export default {
this.$bus.on('targetDeleteMessage', (obj) => {
if (obj.delTime != null) {
self.zwtp_target = false
self.zwtp_source = false
self.targetIsDelete = true
self.targetDelTime = obj.delTime
self.targetImage = null;
......@@ -2037,6 +2042,13 @@ export default {
self.fhxqLeftBarcode = barcodeAll.leftBarcode
self.fhxqRightBarcode = barcodeAll.rightBarcode
})
if (this.routeName == 'fhxxTL' || this.routeName == 'fhxxLT' || this.routeName == 'fhxxLL') {
this.isFHxx = true
} else {
this.isFHxx = false
}
},
methods: {
/**
......@@ -2245,34 +2257,8 @@ export default {
this.$router.push({
path: `/ajzwbj/110/${srcbarcode}`,
})
} else if (this.routeName == 'fhxxTL') {
// 倒查 -- 源 - 人员
console.log(23213213213132);
if (self.fhxqLeftBarcode != null) {
this.$router.push({
path: `/ryzwbj/110/${self.fhxqLeftBarcode}`,
})
} else {
this.$message.error('没有条码号！')
}
} else if (this.routeName == 'fhxxLT') {
// 正查 -- 源 - 案件
if (self.fhxqLeftBarcode != null) {
this.$router.push({
path: `/ajzwbj/110/${self.fhxqLeftBarcode}`,
})
} else {
this.$message.error('没有条码号！')
}
} else if (this.routeName == 'fhxxLL') {
// 串查 -- 源 - 案件
if (self.fhxqLeftBarcode != null) {
this.$router.push({
path: `/ajzwbj/110/${self.fhxqLeftBarcode}`,
})
} else {
this.$message.error('没有条码号！')
}
} else if (this.routeName == 'fhxxTL' || this.routeName == 'fhxxLT' || this.routeName == 'fhxxLL') {
// 已复核，去掉编辑按钮
}
},
/**
......
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/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/views/AllPersonnelBase/modules/fcx.vue
......@@ -112,14 +112,6 @@
label="数据类型:"
prop="destPsnDataType"
>
<!-- <el-radio-group v-model="ruleForm.destPsnDataType">
<el-radio label="1">滚动</el-radio>
<el-radio label="2">平面</el-radio>
<el-radio
label="3"
v-if="radio"
>掌纹</el-radio>
</el-radio-group> -->
<el-checkbox-group v-model="ruleForm.destPsnDataType">
<el-checkbox label="1">滚动</el-checkbox>
<el-checkbox label="2">平面</el-checkbox>
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-17 01:07:40
* @LastEditTime: 2021-12-17 15:32:06
* @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: [],
// 绿色角度方向（暂时不做）
......@@ -600,6 +607,7 @@ export default {
tzdDrawingTop: 0,
// 路由传参
barcode: "",
id: "",
// 特征点全部数组
tzdall: [],
// 之前的手动特征点
......@@ -647,6 +655,15 @@ export default {
// 获取barcode，seq
this.barcode = this.$route.params.barcode;
if(this.$route.params.id != 'xz') {
this.id = this.$route.params.id;
} else {
this.id = this.$route.query.id
}
this.fcxData.push({
barcode: this.barcode,
id: this.id
})
},
mounted () {
//console.log(this.$route.name);
......@@ -1429,7 +1446,7 @@ export default {
$(`#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) {
if (item.id == self.tzdId) {
item.x = self.canvasBox_width - (x + 4)
item.y = y - 4
}
......@@ -1438,7 +1455,7 @@ export default {
$(`#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) {
if (item.id == self.tzdId) {
item.x = x - 4
item.y = self.canvasBox_height - (y + 4)
}
......@@ -1447,7 +1464,7 @@ export default {
$(`#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) {
if (item.id == self.tzdId) {
item.x = self.canvasBox_width - (x + 4)
item.y = self.canvasBox_height - (y + 4)
}
......@@ -1696,7 +1713,7 @@ export default {
`rotate(${self.deg + self.startPlace + 180}deg)`
);
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
if (item.id == self.tzdId) {
item.angle = -(self.deg + self.startPlace + 180)
}
})
......@@ -1706,7 +1723,7 @@ export default {
`rotate(${self.deg + self.startPlace}deg)`
);
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
if (item.id == self.tzdId) {
item.angle = -(self.deg + self.startPlace)
}
})
......@@ -1716,7 +1733,7 @@ export default {
`rotate(${-self.deg - self.startPlace - 180}deg)`
);
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
if (item.id == self.tzdId) {
item.angle = -(-self.deg - self.startPlace - 180)
}
})
......@@ -1726,7 +1743,7 @@ export default {
`rotate(${-self.deg - self.startPlace}deg)`
);
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
if (item.id == self.tzdId) {
item.angle = -(-self.deg - self.startPlace)
}
})
......@@ -1920,6 +1937,13 @@ export default {
},
methods: {
/**
* 关闭发查询
*/
closeFcx (val) {
this.$bus.emit('isBlur', val)
this.isShowFcx = val;
},
/**
* 清除所有
*/
clearALL () {
......@@ -4154,20 +4178,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
},
/**
* 对特征点图层进行更新
......@@ -4450,6 +4465,9 @@ export default {
this.$bus.off("setRxInfoEnlarge");
this.$bus.off("setRxInfo");
},
components: {
fcx,
},
};
</script>
......
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-16 11:30:35
* @LastEditTime: 2021-12-17 15:48:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -373,6 +373,23 @@ export default {
if (self.finger && self.finger.code) {
this.activerollFinger = self.finger.code
self.preSeq = this.activerollFinger
if (self.finger.code >= 1 && self.finger.code <= 5) {
// 右手-滚动
this.zwSelect = '滚动'
this.activeRollHand = 'right'
} else if(self.finger.code >= 6 && self.finger.code <= 10) {
// 左手-滚动
this.zwSelect = '滚动'
this.activeRollHand = 'left'
} else if(self.finger.code >= 11 && self.finger.code <= 15) {
// 右手-平面
this.zwSelect = '平面'
this.activePainHand = 'right'
} else if(self.finger.code >= 16 && self.finger.code <= 20) {
// 左手-平面
this.zwSelect = '平面'
this.activePainHand = 'left'
}
// 默认选中第一个出现的指纹
this.getRollOrPainFinger(self.finger)
/*if (self.finger.code > 10) {
......
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,31 +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 () {
if (!this.roleArr.includes("A")) return;
this.$router.push("/zzwcj")
this.$router.pushToTab("/zzwcj")
},
gozljc () {
if (!this.roleArr.includes("D")) return;
this.$router.push("/zljc")
this.$router.pushToTab("/zljc")
},
gobzxxgl () {
if (!this.roleArr.includes("G")) return;
this.$router.push("/bzxxfh")
this.$router.pushToTab("/bzxxfh")
},
logout () {
this.$axios
......
src/views/bzxxgl/bzxxfh.vue
<!--
* @Author: your name
* @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-16 23:52:00
* @LastEditTime: 2021-12-17 15:52:56
* @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
......@@ -406,25 +406,25 @@ export default {
let routeUrl = this.$router.resolve({
path: "fhxxTT/"+rowData.id,
});
window.open(routeUrl.href, "_blank");
window.open(routeUrl.href, "_self");
} else if (rowData.querytype == '1') {
// 倒查
let routeUrl = this.$router.resolve({
path: "fhxxTL/"+rowData.id,
});
window.open(routeUrl.href, "_blank");
window.open(routeUrl.href, "_self");
} else if (rowData.querytype == '2') {
// 正查
let routeUrl = this.$router.resolve({
path: "fhxxLT/"+rowData.id,
});
window.open(routeUrl.href, "_blank");
window.open(routeUrl.href, "_self");
} else if (rowData.querytype == '3') {
// 串查
let routeUrl = this.$router.resolve({
path: "fhxxLL/"+rowData.id,
});
window.open(routeUrl.href, "_blank");
window.open(routeUrl.href, "_self");
}
},
/**
......
src/views/bzxxgl/scss/fhxxLT.scss
......@@ -404,6 +404,20 @@
font-family: MicrosoftYaHei;
color: #ff6300;
}
.jcbzFlag {
width: 128px;
height: 40px;
background: #ECEDF1;
border-radius: 4px;
border: none;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #AEAFB4;
}
}
/deep/.el-textarea__inner {
font-size: 14px;
......
src/views/cxyrd/QueryConfirm.vue
......@@ -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/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;
......
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/case/barcode/seqNo", {
.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.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"),
......@@ -383,6 +390,7 @@ export default {
}, 500);
});
} else {
self.sourceDel = false;
// 没有被删除
self.$bus.emit("deleteMessage", {
msg: null,
......@@ -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
......@@ -1191,6 +1191,7 @@ export default {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
this.$bus.emit('bzJudge', null)
return
}
if (self.isDelete) {
......@@ -1203,6 +1204,7 @@ export default {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
this.$bus.emit('bzJudge', null)
return;
} else {
//console.log(val);
......
src/views/cxyrd/modules/LTSrc.vue
......@@ -272,6 +272,7 @@ export default {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
}
this.$bus.emit('bzJudge', null)
// 清空目标table表
// self.$bus.emit("initCandidate", []);
// 保存qqid和qid
......
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
......@@ -156,13 +156,13 @@ 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) {
......@@ -174,11 +174,14 @@ export default {
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");
// 存储目标条码号
......
src/views/cxyrd/modules/TLSrc.vue
......@@ -617,6 +617,7 @@ export default {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
}
this.$bus.emit('bzJudgeTL', null)
// self.$bus.emit("changImageEdit", 'xxx');
// 清空目标table表
self.$bus.emit("initTLCandidate", []);
......
src/views/zljc/Index.vue
......@@ -396,8 +396,8 @@ export default {
// console.log('hang', val)
//跳转时页面
this.$router.push({
name: 'jcxq',
params: {
path: '/jcxq',
query: {
barcode: val.barcode,
id: val.personId,
}
......@@ -528,7 +528,7 @@ export default {
}
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
},
/**
......
src/views/zljc/jcxq.vue
......@@ -17,7 +17,7 @@
@click="yjhg"
v-if="roleArr.includes('D-1-9')"
>一键合格</el-button>
<el-button
<!-- <el-button
class='bhg'
v-if="personStatus!=null&&leftStatus!=null&&rightStatus!=null&&palmStatus!=null&&faceStatus!=null"
@click="tjjg"
......@@ -25,7 +25,7 @@
<el-button
class='jh'
v-else
>提交结果</el-button>
>提交结果</el-button> -->
<!-- <el-button :class="[?'bhg':'jh']">提交结果</el-button> -->
</div>
......@@ -34,12 +34,14 @@
<!-- 人员信息 -->
<div class='lableresult'>
<span
class="iconfont cgColors"
v-if="personStatus===1"
:class="[personStatus===1?'iconfont cgColors':'iconfont cgColors tmxz ']"
v-if="personStatus!=null"
@click="tjRyxx1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="personStatus===0"
:class="[personStatus===0?'iconfont sbColors':'iconfont sbColors tmxz ']"
v-if="personStatus!=null"
@click="tjRyxx0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
......@@ -55,12 +57,14 @@
<!-- 左手 -->
<div class='lableresult'>
<span
class="iconfont cgColors"
v-if="leftStatus===1"
:class="[leftStatus===1?'iconfont cgColors':'iconfont cgColors tmxz ']"
v-if="leftStatus!=null"
@click="tjZsNyzw1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="leftStatus===0"
:class="[leftStatus===0?'iconfont sbColors':'iconfont sbColors tmxz ']"
v-if="leftStatus!=null"
@click="tjZsNyzw0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
......@@ -76,12 +80,14 @@
<!-- 右手 -->
<div class='lableresult'>
<span
class="iconfont cgColors"
v-if="rightStatus===1"
:class="[rightStatus===1?'iconfont cgColors':'iconfont cgColors tmxz ']"
v-if="rightStatus!=null"
@click="tjYsNyzw1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="rightStatus===0"
:class="[rightStatus===0?'iconfont sbColors':'iconfont sbColors tmxz ']"
v-if="rightStatus!=null"
@click="tjYsNyzw0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
......@@ -97,12 +103,14 @@
<!-- 掌纹 -->
<div class='lableresult'>
<span
class="iconfont cgColors"
v-if="palmStatus===1"
:class="[palmStatus===1?'iconfont cgColors':'iconfont cgColors tmxz ']"
v-if="palmStatus!=null"
@click="tjZw1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="palmStatus===0"
:class="[palmStatus===0?'iconfont sbColors':'iconfont sbColors tmxz ']"
v-if="palmStatus!=null"
@click="tjZw0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
......@@ -118,12 +126,12 @@
<!-- 人像 -->
<div class='lableresult'>
<span
class="iconfont cgColors"
v-if="faceStatus===1"
:class="[faceStatus===1?'iconfont cgColors':'iconfont cgColors tmxz ']"
v-if="faceStatus!=null"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="faceStatus===0"
:class="[faceStatus===0?'iconfont sbColors':'iconfont sbColors tmxz ']"
v-if="faceStatus!=null"
>&#xe63c;</span>
<span
class="iconfont cgColor"
......@@ -202,12 +210,12 @@ export default {
},
created () {
console.log(this.$route.params, '跳转参数到详情页')
this.rowData.barcode = this.$route.params.barcode
this.rowData.id = this.$route.params.id
this.rowData.barcode = this.$route.query.barcode
this.rowData.id = this.$route.query.id
this.hqyhxx()
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
},
},
......@@ -463,6 +471,9 @@ export default {
.sbColor {
color: #ff0039;
}
.tmxz {
opacity: 0.1;
}
}
}
.line {
......
src/views/zljc/modules/ryxx.vue
......@@ -8,6 +8,21 @@
<div class="headRight">
</div>
</div>
<div
class="tpType"
v-show="personStatus!=null"
>
<img
v-show="personStatus==1"
src="@/assets/img/zljc/hg.svg"
alt=""
>
<img
v-show="personStatus==0"
src="@/assets/img/zljc/bhg.svg"
alt=""
>
</div>
<el-form
:label-position="labelPosition"
:inline="true"
......@@ -435,6 +450,7 @@
</div>
</template>
<script>
import qs from 'qs'
import Cascader from "@/components/Cascader.vue";
import SelectCode from "@/components/SelectCode.vue";
const targetOptions = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
......@@ -454,7 +470,9 @@ export default {
this.id = this.rowData.id
this.barcode = this.rowData.barcode
// console.log(this.id, 'ididididid')
this.hqyhxx()
this.getInfo()
},
// watch: {
// rowData (newVal, oldVal) {
......@@ -504,9 +522,66 @@ export default {
},
jcsm: '',// 检查说明
personStatus: null, // 人员检查结果
clearId: null,
clearId1: null
}
},
watch: {
jcsm: {
//注意：当观察的数据为对象或数组时，curVal和oldVal是相等的，因为这两个形参指向的是同一个数据对象
handler (curVal, oldVal) {
// 自动保存方法
clearInterval(this.clearId)
this.clearId = setTimeout(() => {
this.autoSave();
}, 1000)
},
deep: true
}
},
methods: {
// 自动保存
autoSave () {
let reqParam = {
personId: null, //人员id
type: 1, //用来判断人员、左手、右手页面传来，0代表全部，1代表从人员页面，2代表从左手页面，3代表从右手页面
personCheckedDescription: '', // 检查说明
}
reqParam.personId = this.id
reqParam.personCheckedDescription = this.jcsm
this.$axios
.post("/api/zljc/result/save", reqParam, { loading: false })
.then((response) => {
console.log(response)
this.personStatus = response.data.ret.personStatus
this.$emit('personStatus', response.data.ret.personStatus)
clearInterval(this.clearId1)
this.clearId1 = setTimeout(() => {
this.$message.success("检查说明自动保存成功")
}, 5000)
})
},
// 获取状态
hqyhxx () {
this.$axios({
url: '/api/zljc/result/queryRyzljcxx',
method: 'post',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
},
data: qs.stringify({ personId: this.rowData.id })
}).then((response) => {
this.personStatus = response.data.ret.personStatus
this.jcsm = response.data.ret.personCheckedDescription
this.$emit('personStatus', response.data.ret.personStatus)
})
},
getInfo () {
// console.log(this.rowData.id, 'sadhagdsadhksak')
this.$axios
......@@ -515,7 +590,6 @@ export default {
if (response.data.code === 0) {
console.log(response.data.ret)
this.tableDate = response.data.ret;
this.checkedTargets = response.data.ret.logicDatabaseName || []
// this.total = response.data.ret.total;
// console.info("查询结果===>", this.tableDate);
......@@ -570,11 +644,24 @@ export default {
justify-content: center;
}
.ryxxForm {
position: relative;
width: 958px;
height: 1427px;
background: #ffffff;
box-shadow: 0px 5px 40px 0px rgba(0, 21, 51, 0.06);
border-radius: 8px;
.tpType {
position: absolute;
left: 50%;
top: 22%;
margin-top: -48px; /* 高度的一半 */
margin-left: -66px; /* 宽度的一半 */
width: 132px;
height: 96px;
z-index: 99;
// img {
// }
}
}
/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-16 23:00:27
* @LastEditTime: 2021-12-17 15:07:31
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,14 +91,14 @@ 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.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
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
target:"http://zwpt.xzclub.top:9333/",
// target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.115:8099", // 江
ws: true,
changeOrigin: true,
......@@ -130,9 +130,9 @@ module.exports = {
"/security": {
//target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.121:8765", // 湖南-张
target: "http://192.168.128.121:8765", // 湖南-张
// target: "http://www.meetfood.cn:2390", // 湖南-王
target: "http://zwpt.xzclub.top:9333",
// target: "http://zwpt.xzclub.top:9333",
ws: true,
changeOrigin: true,
pathRewrite: {
......
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