Skip to content

F
founder_vue
Commit bde77f56 by 张超军
Options

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

parents f3d19459 bff11a32
Showing with 413 additions and 77 deletions
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/SystemManage/UserManage.vue
......@@ -51,7 +51,6 @@
id="permissionId"
codeUrl="/security/permissions/getAllPermission"
multiple
:multipleLimit="3"
></SelectCode>
</div>
<div class="clear-btn" @click="clear" v-if="newStr">清空</div>
......
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/LLSrc.vue
......@@ -277,6 +277,7 @@ 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]);
}
......@@ -341,6 +342,7 @@ 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;
......
src/views/cxyrd/modules/Recognition_dialog.vue
......@@ -16,39 +16,45 @@
label-width="7rem"
ref="ruleForm"
>
<el-form-item label="源条码号：" prop="f1" :rules="inputRule">
<el-form-item label="源条码号：" prop="originCode" :rules="inputRule">
<el-input
type="text"
placeholder="请输入内容"
v-model="ruleForm.f1"
v-model="ruleForm.originCode"
maxlength="22"
show-word-limit
>
</el-input>
</el-form-item>
<el-form-item label="源数据类型：" prop="f2" :rules="radioRule">
<el-radio v-model="ruleForm.f2" label="1">人员</el-radio>
<el-radio v-model="ruleForm.f2" label="2">案件</el-radio>
<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="f3" :rules="inputRule">
<el-form-item label="目标条码号：" prop="targetCode" :rules="inputRule">
<el-input
type="text"
placeholder="请输入内容"
v-model="ruleForm.f3"
v-model="ruleForm.targetCode"
maxlength="22"
show-word-limit
>
</el-input>
</el-form-item>
<el-form-item label="目标数据类型：" prop="f4" :rules="radioRule">
<el-radio v-model="ruleForm.f4" label="1">人员</el-radio>
<el-radio v-model="ruleForm.f4" label="2">案件</el-radio>
<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="addList('ruleForm')"
>人工认定</el-button
>
<el-button class="confirmBtn" @click="rgrd()">人工认定</el-button>
<el-button class="cancelBtn" @click="off()" type="primary"
>取 消</el-button
>
......@@ -64,10 +70,10 @@ export default {
data() {
return {
ruleForm: {
f1: "", //选择队列
f2: "1", // 删除原图
f3: "", // 覆盖原图
f4: "1", // 处理模式
originCode: "", //选择队列
originCodeType: "0", // 删除原图
targetCode: "", // 覆盖原图
targetCodeType: "0", // 处理模式
},
inputRule: [{ required: true, message: "请输入内容", trigger: "change" }],
radioRule: [{ required: true, message: "请选择内容", trigger: "change" }],
......@@ -84,10 +90,33 @@ export default {
},
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;
},
......
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-17 11:36:34
* @LastEditTime: 2021-12-17 15:07:31
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -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