Skip to content

F
founder_vue
Commit f311bf3c by 张超军
Options

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

parents a42b985f cdf21bc1
Showing with 464 additions and 116 deletions
src/plugins/axios.js
......@@ -36,7 +36,7 @@ _axios.interceptors.request.use(
let token = localStorage.getItem("token");
if (token) {
config.headers.Authorization = token;
console.info(config);
// console.info(config);
}
return config;
},
......
src/router/modules/index.js
......@@ -62,7 +62,19 @@ export default [
title: "指掌纹录入",
auth: "5"
},
component: () => import("@/views/zzwlr/Index.vue")
component: () => import("@/views/zzwlr/Index.vue"),
children: [
{
path: "/drFPTX",
name: "drFPTX",
hidden: false,
meta: {
title: "导入FTPX",
auth: "5"
},
component: () => import("@/views/drFPTX/Index.vue")
}
]
},
{
path: "/zwbj",
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -635,10 +635,15 @@ export default {
.then(response => {
if (response.data.code === 0) {
let arr = response.data.ret
for (let i = 0; i < arr.length; i++) {
cityOptions.push(arr[i].hpseqno)
if (this.rowData.length == 1) {
for (var item in arr) {
this.cities = arr[item]
console.log("指位返回列表===>", item, arr);
}
} else {
console.log("多条案件")
}
console.info("指位返回列表===>", arr);
} else {
this.$message.error(response.data.message);
}
......@@ -783,33 +788,18 @@ export default {
if (this.dxcx.domains.length > 0) {
queryRequest.excludeBarcode.push(this.pccx.domains[0].value)
}
// 一条源数据，用户选择指位；多条源数据，用户不选择
if (this.rowData.length == 1) {
let SrcQueryData = {
id: '', // 人员pid
barcode: '', // 条码号
selectedSeqnos: null // 指位(选择)(页面获取)
}; //发查询源数据
let selectedSeqnos = [3, 4];// 指位
for (let i = 0; i < this.rowData.length; i++) {
SrcQueryData.id = this.rowData[i].pid
SrcQueryData.barcode = this.rowData[i].barcode
SrcQueryData.selectedSeqnos = selectedSeqnos;
queryRequest.srcQueryDataList.push(SrcQueryData)
}
} else {
for (let i = 0; i < this.rowData.length; i++) {
let SrcQueryData = {//发查询源数据
id: '', // 人员pid
barcode: '', // 条码号
seqnoList: '' // 指位
};
SrcQueryData.id = this.rowData[i].pid
SrcQueryData.barcode = this.rowData[i].barcode
const seqnoList = []
SrcQueryData.seqnoList = seqnoList;
queryRequest.srcQueryDataList.push(SrcQueryData)
}
// 源数据
let SrcQueryData = {
id: '', // 人员pid
barcode: '', // 条码号
selectedSeqnos: null // 指位(选择)(页面获取)
}; //发查询源数据
let selectedSeqnos = [];// 指位
for (let i = 0; i < this.rowData.length; i++) {
SrcQueryData.id = this.rowData[i].pid
SrcQueryData.barcode = this.rowData[i].barcode
SrcQueryData.selectedSeqnos = selectedSeqnos;
queryRequest.srcQueryDataList.push(SrcQueryData)
}
this.reqParam = queryRequest
} else if (this.type == 'aj') {
......@@ -873,13 +863,17 @@ export default {
}; //发查询源数据
SrcQueryData.id = this.rowData[i].cid
SrcQueryData.barcode = this.rowData[i].barcode
SrcQueryData.selectedSeqnos = this.checkedCities
// SrcQueryData.selectedSeqnos = this.checkedCities
if (this.rowData.length == 1) {
SrcQueryData.selectedSeqnos = this.checkedCities
} else {
SrcQueryData.selectedSeqnos = this.rowData[i].hpseqno
}
queryRequest.srcQueryDataList.push(SrcQueryData)
}
this.reqParam = queryRequest
}
console.log('发请求', this.reqParam)
this.$axios
.post(reqUrl, this.reqParam)
......@@ -891,6 +885,7 @@ export default {
});
cityOptions = []
this.dialogVisible = false;
this.$router.push('/cxyrd')
} else {
this.$message.error(response.data.message);
}
......
src/views/Home.vue
......@@ -2,13 +2,20 @@
<div id="home">
<el-container class="layout-container">
<transition name="slide">
<el-aside :width="isCollapse ? '64px' : '280px'" class="aside">
<el-aside
:width="isCollapse ? '64px' : '280px'"
class="aside"
>
<div
class="logo"
:class="{ minLogo: isCollapse }"
@click="$router.push('/Home/Home')"
>
<img class="jh" src="../assets/img/Home/jh.png" alt="" />
<img
class="jh"
src="../assets/img/Home/jh.png"
alt=""
/>
<img
v-show="!isCollapse"
class="title"
......@@ -33,19 +40,35 @@
:collapse="isCollapse"
@select="selectPath"
>
<div v-for="(menu, i) in routes" :key="i">
<el-submenu :index="menu.name" v-if="menu.children">
<div
v-for="(menu, i) in routes"
:key="i"
>
<el-submenu
:index="menu.name"
v-if="menu.children"
>
<template slot="title">
<img
v-if="$route.path != menu.path"
:src="menu.icon_d"
alt=""
/>
<img v-else :src="menu.icon_a" alt="" />
<img
v-else
:src="menu.icon_a"
alt=""
/>
<span v-show="!isCollapse">{{ menu.meta.title }}</span>
</template>
<div v-for="(item, index) in menu.children" :key="index">
<el-menu-item v-if="!item.hidden" :index="item.name">{{
<div
v-for="(item, index) in menu.children"
:key="index"
>
<el-menu-item
v-if="!item.hidden"
:index="item.name"
>{{
item.meta.title
}}</el-menu-item>
</div>
......@@ -59,22 +82,45 @@
:src="menu.icon_d"
alt=""
/>
<img v-else :src="menu.icon_a" alt="" />
<img
v-else
:src="menu.icon_a"
alt=""
/>
<span slot="title">{{ menu.meta.title }}</span>
</el-menu-item>
</div>
</el-menu>
<div class="fz">
<img v-if="!isCollapse" src="../assets/img/Home/logo.png" alt="" />
<img v-else src="../assets/img/Home/fang.png" alt="" />
<img
v-if="!isCollapse"
src="../assets/img/Home/logo.png"
alt=""
/>
<img
v-else
src="../assets/img/Home/fang.png"
alt=""
/>
</div>
</el-aside>
</transition>
<el-container>
<el-header class="header">
<div class="collapse" @click="switchCollapse">
<img v-if="isCollapse" :src="rightImg" alt="" />
<img v-else :src="leftImg" alt="" />
<div
class="collapse"
@click="switchCollapse"
>
<img
v-if="isCollapse"
:src="rightImg"
alt=""
/>
<img
v-else
:src="leftImg"
alt=""
/>
</div>
<div class="options">
<div class="sendFind">发查询</div>
......@@ -83,8 +129,14 @@
<div class="message">
<div class="circle"></div>
</div>
<div class="quit" @click="$router.push('/Home/Home')"></div>
<div class="logout" @click="logout">
<div
class="quit"
@click="$router.push('/Home/Home')"
></div>
<div
class="logout"
@click="logout"
>
<svg-icon
v-show="!isHoverLogout"
icon-class="logout_d"
......@@ -119,7 +171,10 @@
:class="{ active: $route.path == item.path }"
>
<span>{{ item.name }}</span>
<div class="closeIcon" @click.stop="closePaths(item.name)">
<div
class="closeIcon"
@click.stop="closePaths(item.name)"
>
×
</div>
</div>
......@@ -146,7 +201,7 @@ import indexRoutes from "@/router/modules/index";
import { mapGetters } from "vuex";
export default {
name: "Home",
data() {
data () {
return {
searchTxt: "",
routes: indexRoutes[2].children,
......@@ -158,11 +213,14 @@ export default {
isHoverLogout: false
};
},
created() {},
mounted() {
created () { },
mounted () {
this.menuActive = this.$route.name;
console.log(this.$route);
},
updated () {
this.menuActive = this.$route.name;
},
computed: {
...mapGetters(["defaultGoodsImage", "userAuth"])
},
......@@ -173,7 +231,7 @@ export default {
* @return {*}
*/
logout() {
logout () {
// console.log('退出登录');
// this.$router.replace('/login1')
this.$axios.post("/login/login/userLogout").then(res => {
......@@ -190,7 +248,7 @@ export default {
* @return {*}
*/
goSearch() {
goSearch () {
this.searchTxt = "";
console.log(this.searchTxt);
},
......@@ -199,7 +257,7 @@ export default {
* @param {*}
* @return {*}
*/
goManager() {
goManager () {
this.$router.push("/Home/htzwcj");
this.menuActive = "";
},
......@@ -209,7 +267,7 @@ export default {
* @param {*} path
* @return {*}
*/
selectPath(index, path) {
selectPath (index, path) {
this.$router.push({ name: index });
},
/**
......@@ -217,7 +275,7 @@ export default {
* @param {*}
* @return {*}
*/
closePaths(pathName) {
closePaths (pathName) {
let res = this.paths.filter(item => {
return item.name != pathName;
});
......@@ -233,7 +291,7 @@ export default {
* @param {*}
* @return {*}
*/
changeRouter(route) {
changeRouter (route) {
this.$router.push(route.path);
this.menuActive = route.routeName;
},
......@@ -242,18 +300,18 @@ export default {
* @param {*}
* @return {*}
*/
switchCollapse() {
switchCollapse () {
this.isCollapse = !this.isCollapse;
},
handleOpen(key, keyPath) {
handleOpen (key, keyPath) {
console.log(key, keyPath);
},
handleClose(key, keyPath) {
handleClose (key, keyPath) {
console.log(key, keyPath);
}
},
watch: {
$route(newValue, oldValue) {
$route (newValue, oldValue) {
if (newValue.path != "/Home/htzwcj") {
if (this.paths.length == 0) {
this.paths.push({
......
src/views/Home/Home.vue
......@@ -4,17 +4,29 @@
<div class="header">
<!-- 头部左侧 -->
<div class="left">
<div><img src="../../assets/img/Home/badges.png" alt="" /></div>
<div><img
src="../../assets/img/Home/badges.png"
alt=""
/></div>
<span><img src="../../assets/img/Home/logo.svg" alt=""/></span>
<span><img
src="../../assets/img/Home/logo.svg"
alt=""
/></span>
</div>
<!-- 头部右侧 -->
<div class="right">
<div>
<img src="../../assets/img/Home/setting.svg" alt="" /> 系统管理
<img
src="../../assets/img/Home/setting.svg"
alt=""
/> 系统管理
</div>
<div class="role">
<img src="../../assets/img/Home/role.svg" alt="" />用户角色
<img
src="../../assets/img/Home/role.svg"
alt=""
/>用户角色
<div class="rolelist">
<ul>
<li>姓名：xxxx</li>
......@@ -25,7 +37,10 @@
</div>
<div @click="logout">
<img src="../../assets/img/Home/exit.svg" alt="" />安全退出
<img
src="../../assets/img/Home/exit.svg"
alt=""
/>安全退出
</div>
</div>
<!-- 主体 -->
......@@ -36,7 +51,10 @@
<div class="todoview">
<div class="todo">
<div>
<img src="../../assets/img/Home/todoview.svg" alt="" />
<img
src="../../assets/img/Home/todoview.svg"
alt=""
/>
</div>
<p>待办工作</p>
</div>
......@@ -58,26 +76,50 @@
<!-- 第一列 -->
<div class="list l1">
<div class="import_images">
<img src="../../assets/img/Home/import_images.svg" alt="" />
<img
src="../../assets/img/Home/import_images.svg"
alt=""
/>
<div>图片导入</div>
</div>
<div class="import_FTP">
<img src="../../assets/img/Home/import_FTP.svg" alt="" />
<div
@click="godrFPTX"
class="import_FTP"
>
<img
src="../../assets/img/Home/import_FTP.svg"
alt=""
/>
<div>导入FPTX</div>
</div>
</div>
<!-- 第二列 -->
<div class="list l2" @click="gosjzygl">
<img src="../../assets/img/Home/query.svg" alt="" />
<div
class="list l2"
@click="gosjzygl"
>
<img
src="../../assets/img/Home/query.svg"
alt=""
/>
<p>发查询</p>
</div>
<!-- 第三列 -->
<div @click="gobdrd" class="list l2 l3">
<img src="../../assets/img/Home/comparison.svg" alt="" />
<div
@click="gobdrd"
class="list l2 l3"
>
<img
src="../../assets/img/Home/comparison.svg"
alt=""
/>
<p>比对认定</p>
</div>
<!-- 第四列 -->
<div @click="gozzwcj" class="list l1 l4">
<div
@click="gozzwcj"
class="list l1 l4"
>
<div class="import_images collect">
<img
src="../../assets/img/Home/collect_new.svg"
......@@ -86,8 +128,14 @@
/>
<div>活体采集</div>
</div>
<div @click="gosjzygl" class="import_FTP management">
<img src="../../assets/img/Home/management.svg" alt="" />
<div
@click="gosjzygl"
class="import_FTP management"
>
<img
src="../../assets/img/Home/management.svg"
alt=""
/>
<div>数据资源管理</div>
</div>
</div>
......@@ -102,22 +150,25 @@ import qs from "qs";
export default {
name: "Home",
data() {
data () {
return {
userInfo: { userName: "admin", passWord: "123456" }
};
},
methods: {
gobdrd() {
godrFPTX () {
this.$router.push("/drFPTX")
},
gobdrd () {
this.$router.push("/cxyrd");
},
gosjzygl() {
gosjzygl () {
this.$router.push("/AllPersonnelBaseIndex/");
},
gozzwcj() {
this.$router.push("/AllPersonnelBaseIndex");
gozzwcj () {
// this.$router.push("/AllPersonnelBaseIndex");
},
logout() {
logout () {
this.$axios.post("/login/login/userLogout").then(res => {
if (res.data.code === 200) {
this.$router.replace("/login1");
......
src/views/cxyrd/TT.scss
// 电话验证颜色
$phone: var(--phone, #606266); //#ff4242;
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
.rdwcDialog {
position: absolute;
top: 0;
left: 0;
z-index: 100;
width: 100%;
height: 100%;
background: rgba($color: #fff, $alpha: 0.65);
filter: blur(2px);
}
.rdwccontent {
padding: 20px;
box-sizing: border-box;
position: absolute;
top: calc(50% - 300px);
left: calc(50% - 300px);
z-index: 1000;
width: 600px;
height: 152px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px;
display: flex;
flex-direction: column;
align-items: center;
.title {
font-size: 16px;
font-family: Microsoft YaHei;
color: #282f3c;
}
.rdwcbtns {
display: flex;
align-items: center;
margin-top: 30px;
.rdwcconfirm,
.rdwccancel {
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
.rdwcconfirm {
&:hover {
border: 1px solid #055fe7;
color: #055fe7;
}
&:active {
border: 1px solid #044CB9;
color: #044CB9;
}
}
.rdwccancel {
margin-left: 24px;
background: #055fe7;
color: #ffffff;
&:hover {
background: #377FEC;
color: #FFFFFF;
}
&:active {
background: #044CB9;
color: #FFFFFF;
}
}
}
}
.bzDialog {
position: absolute;
top: 0;
......@@ -105,6 +183,35 @@
.bzitem {
width: 338px;
margin-bottom: 20px;
position: relative;
.bzphone {
/deep/.el-input__inner {
color: $phone;
}
}
.error-desc {
position: absolute;
height: 20px;
bottom: -24px;
right: 36px;
font-size: 12px;
font-family: Microsoft YaHei;
color: #FF3745;
}
.input-error {
position: absolute;
width: 16px;
height: 16px;
right: 51px;
top: 6px;
// img {
// object-fit: contain;
// }
.icon {
width: 16px;
height: 16px;
}
}
.bzname {
width: 114px;
}
......
src/views/cxyrd/modules/TTFace.vue
<template>
<div class="tt_face">
<!-- <div class="middle"></div>-->
<div class="tt_face_src">
<div class="tt_face_src_label">
<div class="tt_face_src_label_font">源数据</div>
</div>
<div class="faces">
<div class="face_div">
<div class="face"></div>
<div class="face">
<img class="img" src="@/assets/img/正面.gif" />
</div>
<div class="face_label">正面</div>
</div>
<div class="face_div">
<div class="face"></div>
<div class="face">
<img class="img" src="@/assets/img/左侧面.gif" />
</div>
<div class="face_label">左侧面</div>
</div>
<div class="face_div">
<div class="face"></div>
<div class="face">
<img class="img" src="@/assets/img/右侧面.gif" />
</div>
<div class="face_label">右侧面</div>
</div>
<div class="face_div">
<div class="face"></div>
<div class="face">
<img class="img-idcard" src="@/assets/img/身份证.gif" />
</div>
<div class="face_label">身份证照</div>
</div>
</div>
......@@ -30,19 +37,27 @@
</div>
<div class="faces">
<div class="face_div">
<div class="face"></div>
<div class="face">
<img class="img" src="@/assets/img/正面.gif" />
</div>
<div class="face_label">正面</div>
</div>
<div class="face_div">
<div class="face"></div>
<div class="face">
<img class="img" src="@/assets/img/左侧面.gif" />
</div>
<div class="face_label">左侧面</div>
</div>
<div class="face_div">
<div class="face"></div>
<div class="face">
<img class="img" src="@/assets/img/右侧面.gif" />
</div>
<div class="face_label">右侧面</div>
</div>
<div class="face_div">
<div class="face"></div>
<div class="face">
<img class="img-idcard" src="@/assets/img/身份证.gif" />
</div>
<div class="face_label">身份证照</div>
</div>
</div>
......@@ -64,21 +79,23 @@ div {
border: none;
}
.tt_face {
height: 800px;
height: 770px;
width: 1180px;
margin-left: 330px;
}
/*源数据外层*/
.tt_face .tt_face_src {
height: 390px;
/*border: 1px solid darkred;*/
/*border: 1px solid darkred;*/
height: 360px;
width: 100%;
display: flex;
flex-direction: row;
}
/*目标数据外层*/
.tt_face .tt_face_dest {
height: 390px;
height: 360px;
width: 100%;
display: flex;
flex-direction: row;
......@@ -86,7 +103,7 @@ div {
/*源标题*/
.tt_face_src_label {
width: 40px;
height: 340px;
height: 320px;
background: #f6f8fa;
border-radius: 8px 0px 0px 8px;
display: flex;
......@@ -105,10 +122,15 @@ div {
/*-webkit-background-clip: text;*/
/*-webkit-text-fill-color: transparent;*/
}
.img {
margin-top: 30%;
}
.img-idcard {
margin-top: 40%;
}
.tt_face_dest_label {
width: 40px;
height: 340px;
height: 320px;
background: #f6f8fa;
border-radius: 8px 0px 0px 8px;
display: flex;
......@@ -132,7 +154,7 @@ div {
.face_div {
border: #333333 1px solid;
width: 255px;
height: 340px;
height: 320px;
background: #ffffff;
border-radius: 8px;
border: 1px solid #cccccc;
......@@ -140,7 +162,7 @@ div {
}
.face {
width: 255px;
height: 340px;
height: 320px;
}
.face_label {
width: 100%;
......
src/views/cxyrd/modules/TTPlam.vue
......@@ -2,12 +2,20 @@
<div class="tt_plam">
<div class="outside">
<div class="slabel">源数据</div>
<div class="palm"></div>
<br />
<div class="palm">
<img class="img" src="@/assets/img/左手.gif" />
</div>
<br />
<div class="left">左掌</div>
</div>
<div class="outside">
<div class="dlabel">目标数据</div>
<div class="palm"></div>
<br />
<div class="palm">
<img class="img" src="@/assets/img/右手.gif" />
</div>
<br />
<div class="palm_label">右掌</div>
</div>
</div>
......@@ -26,19 +34,23 @@ div {
display: inline-block;
border: none;
}
.img {
margin-top: 20%;
}
.tt_plam {
height: 780px;
width: 100%;
overflow-y: scroll;
margin-top: -15px;
}
.outside {
height: 800px;
width: 730px;
height: 740px;
width: 740px;
margin-right: 24px;
}
.palm {
width: 730px;
height: 730px;
width: 660px;
height: 660px;
background: #ffffff;
border-radius: 8px;
border: 1px solid #cccccc;
......
src/views/drFPTX/Index.vue 0 → 100644
<template>
<div>
<el-radio-group v-model="drlx">
<el-radio :label="3">人员</el-radio>
<el-radio :label="6">案件</el-radio>
<el-radio :label="9">比中关系</el-radio>
</el-radio-group>
<div></div>
<el-radio-group v-model="wjlx">
<el-radio :label="3">FPTX文件</el-radio>
<el-radio :label="6">FTPX文件夹</el-radio>
</el-radio-group>
<!-- <a
href="javascript:;"
class="input-file input-fileup"
>
<i class="iconfont icon-beike"></i>&nbsp;选择文件夹<input
ref="file"
class="fileUploaderClass"
type='file'
name="file"
webkitdirectory
style="position: absolute;left: 50%;top: 20px;"
@change.stop="changesData"
/>
</a> -->
<!-- <el-upload
class="upload-demo"
ref="upload"
action="http://192.168.128.108:8099/api/upload/person"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:auto-upload="false"
>
<el-button
slot="trigger"
size="small"
type="primary"
>选取文件</el-button>
<el-button
style="margin-left: 10px;"
size="small"
type="success"
@click="submitUpload"
>上传到服务器</el-button> -->
<!-- <div
slot="tip"
class="el-upload__tip"
>只能上传jpg/png文件，且不超过500kb</div> -->
<!-- </el-upload> -->
</div>
</template>
<script>
export default {
name: 'drFTPX',
components: {
},
data () {
return {
drlx: 3,
wjlx: 3,
fileList: []
};
},
methods: {
submitUpload () {
this.$refs.upload.submit();
},
handleRemove (file, fileList) {
console.log(file, fileList);
},
handlePreview (file) {
console.log(file);
},
changesData () {
console.log(this.$refs.file.files);
}
}
}
</script>
<style lang="scss" scoped>
div#globalUploader {
height: 100px;
}
</style>
\ No newline at end of file
src/views/zzwlr/Index.vue
......@@ -7,17 +7,16 @@
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue
-->
<template>
<div>
指掌纹录入
</div>
<div>
<router-view></router-view>
</div>
</template>
<script>
export default {
}
export default {
}
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
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