Skip to content

F
founder_vue
Commit b3c86509 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents eac3cf11 4d200e5f
Showing with 225 additions and 63 deletions
.env.development
VUE_APP_AUTO_WRITE = dev
VUE_APP_BB_IP = http://172.20.0.149:8075/
\ No newline at end of file
VUE_APP_BB_IP = http://172.20.0.149:8075/
VUE_APP_TIBET_HEADER = open
.env.production
VUE_APP_AUTO_WRITE = pro
VUE_APP_BB_IP = http://10.100.17.124:9080/
\ No newline at end of file
VUE_APP_BB_IP = http://10.100.17.124:9080/
VUE_APP_TIBET_HEADER = open
\ No newline at end of file
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-01-19 16:17:12
* @LastEditTime: 2022-02-22 16:11:53
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2022-02-21 17:34:05
* @LastEditTime: 2022-02-22 11:53:49
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
......@@ -2821,7 +2821,7 @@ export default {
// 先判断查询类型
if (type == 2) {
// 正查 -- 左案右人
if (response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet && response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet.minutia) {
if (response.ret.casePalmTrait.casePalmFeatureMsg && response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet && response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet.minutia) {
// this.bdjqData_source = response.ret.caseFingerTrait.fingerFeatureMsg.minutiaSet.minutia
let arr = response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet.minutia
arr.forEach(item => {
......@@ -2834,7 +2834,7 @@ export default {
})
})
}
if (response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet && response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet.minutia) {
if (response.ret.personPalmTrait.fpt5PalmMsg && response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet && response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet.minutia) {
// this.bdjqData_target = response.ret.personFingerTrait.fingerMsg.fpt5TraitMinutiaSet.minutia
let arr = response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet.minutia
arr.forEach(item => {
......@@ -2850,7 +2850,7 @@ export default {
}
} else if (type == 1) {
// 倒查 -- 左人右案
if (response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet && response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet.minutia) {
if (response.ret.personPalmTrait.fpt5PalmMsg && response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet && response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet.minutia) {
let arr = response.ret.personPalmTrait.fpt5PalmMsg.fpt5PalmFeatureMinutiaSet.minutia
arr.forEach(item => {
this.bdjqData_source.push({
......@@ -2862,7 +2862,7 @@ export default {
})
})
}
if (response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet && response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet.minutia) {
if (response.ret.casePalmTrait.casePalmFeatureMsg && response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet && response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet.minutia) {
let arr = response.ret.casePalmTrait.casePalmFeatureMsg.minutiaSet.minutia
arr.forEach(item => {
this.bdjqData_target.push({
......@@ -2888,8 +2888,8 @@ export default {
searchType: type
})
.then(response => {
if (response.ret.caseSrcPalmTrait.palmFeatureMsg) {
let arr = response.ret.caseSrcPalmTrait.palmFeatureMsg.minutiaSet.minutia
if (response.ret.caseSrcPalmTrait.casePalmFeatureMsg) {
let arr = response.ret.caseSrcPalmTrait.casePalmFeatureMsg.minutiaSet.minutia
arr.forEach(item => {
this.bdjqData_source.push({
zwtzd_tzxzb: item.xczhw_zhwtzd_tzxzb,
......@@ -2900,8 +2900,8 @@ export default {
})
})
}
if (response.ret.caseDestPalmTrait.palmFeatureMsg) {
let arr = response.ret.caseDestPalmTrait.palmFeatureMsg.minutiaSet.minutia
if (response.ret.caseDestPalmTrait.casePalmFeatureMsg) {
let arr = response.ret.caseDestPalmTrait.casePalmFeatureMsg.minutiaSet.minutia
arr.forEach(item => {
this.bdjqData_target.push({
zwtzd_tzxzb: item.xczhw_zhwtzd_tzxzb,
......@@ -2911,7 +2911,7 @@ export default {
tzppbs: item.tzppbs,
})
})
this.pptzxzjd = response.ret.caseDestPalmTrait.palmFeatureMsg.pptzxzjd
this.pptzxzjd = response.ret.caseDestPalmTrait.casePalmFeatureMsg.pptzxzjd
}
})
}
......
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-02-21 21:38:08
* @LastEditTime: 2022-02-22 18:28:29
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -44,6 +44,14 @@ _axios.interceptors.request.use(
if (localStorage.getItem("token")) {
config.headers.Authorization = localStorage.getItem("token");
}
const userToken = localStorage.getItem('userToken')
if (userToken) {
config.headers['token'] = userToken // 让每个请求携带自定义 token 请根据实际情况自行修改
}
const appToken = localStorage.getItem('appToken')
if (appToken) {
config.headers['appToken'] = appToken // 让每个请求携带自定义 token 请根据实际情况自行修改
}
// TODO 加线上对接 header
}
// 判断当前请求是否设置了不显示Loading,默认显示
......@@ -89,8 +97,11 @@ _axios.interceptors.response.use(
type: 'warning'
}).then(() => {
localStorage.removeItem('token')
localStorage.removeItem('userToken')
localStorage.removeItem('appToken')
router.replace("/Login");
// TODO 线上退出登录线上地址更改
// location.href = "https://login.iam.com/apphub/logout";
}).catch(() => {
});
}, 0);
......
src/request/http.js
import axios from 'axios'
import {Message, MessageBox} from 'element-ui'
import qs from 'qs'
import {ACCESS_TOKEN} from '../store/mutation-types'
import {ACCESS_TOKEN, USER_TOKEN, APP_TOKEN} from '../store/mutation-types'
import router from '../router'
import {showLoading, hideLoading} from '@/utils/requestLoading'
import HttpConfig from '../request/HttpConfig.js'
......@@ -58,6 +58,16 @@ let initConfig = (config) => {
config.headers['Authorization'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
config.headers.BrowserHeader = 'H5'
}
if(process.env.VUE_APP_BB_IP == 'open') {
const userToken = localStorage.getItem(USER_TOKEN)
if (userToken) {
config.headers['token'] = userToken // 让每个请求携带自定义 token 请根据实际情况自行修改
}
const appToken = localStorage.getItem(APP_TOKEN)
if (appToken) {
config.headers['appToken'] = appToken // 让每个请求携带自定义 token 请根据实际情况自行修改
}
}
}
config.headers.userInfo = user.getHeaderUser()
......@@ -209,8 +219,11 @@ let handleError = (response) => {
type: 'warning'
}).then(() => {
localStorage.removeItem('token')
localStorage.removeItem('userToken')
localStorage.removeItem('appToken')
router.replace('/Login')
// TODO 线上退出登录线上地址更改
// location.href = "https://login.iam.com/apphub/logout";
}).catch(() => {
})
}, 500)
......
src/store/mutation-types.js
/*
* @Author: your name
* @Date: 2021-12-22 12:12:09
* @LastEditTime: 2022-02-22 18:06:31
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\store\mutation-types.js
*/
export const ACCESS_TOKEN = 'token'
export const USER_TYPE = 'userInfo'
export const USER_TOKEN = 'userToken'
export const APP_TOKEN = 'appToken'
// export const CONTENT_WIDTH_TYPE = {
// Fluid: 'Fluid',
// Fixed: 'Fixed'
......
src/views/Home.vue
......@@ -448,9 +448,12 @@ export default {
if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userInfo"); //删除名称为“userInfor”的信息。
localStorage.removeItem('userToken')
localStorage.removeItem('appToken')
this.$router.replace("/Login");
this.$message.info("退出成功！");
// TODO 线上退出登录线上地址更改
// location.href = "https://login.iam.com/apphub/logout";
}
})
.catch((err) => { });
......
src/views/SystemManage/UserManage.vue
......@@ -909,6 +909,7 @@ export default {
params[key] = this.addFormParams[key]
}
}
console.log(params);
this.$refs.addFormParams.validate((valid) => {
//console.log(valid);
if (valid) {
......
src/views/cxyrd/modules/LLSrc.vue
......@@ -296,6 +296,13 @@ export default {
this.fingerTotal = this.enumerate?.length || 0;
if (this.enumerate && this.enumerate?.length > 0) {
this.changeStyle(0, this.enumerate[0]);
} else {
this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit("changImageEditTarget", "xxx");
this.enumerate = [];
this.fingerTotal = 0;
this.changeStyle(0, []);
this.$bus.emit('target_info', {barcode_source: '', seq_source: '', barcode_target: '', seq_target: '', type: 2})
}
this.$emit("switchName", this.fingerShowType);
},
......
src/views/login/Login1.vue
......@@ -26,6 +26,7 @@
<el-image class="login_system middle" :src="systemUrl"></el-image>
</div>
<div class="middle margin_top25_bottom10">
<!-- 线上要注释掉 -->
<el-button
class="magin_left_right30"
:class="{ active: loginType.accountStatus }"
......
src/views/login/modules/AccountsLogin.vue
<template>
<div
class="login_account width70 middle"
v-show="isShow"
>
<!-- todo 输入框图标样式调整-->
<el-input
class="width100 margin_top25_bottom10"
type="text"
placeholder="请输入用户名"
@keydown.enter.native="login(userInfo)"
v-model="userInfo.username"
>
<i
slot="prefix"
style="display: flex; align-items: center"
>
<img
style="
<div class="login_account width70 middle" v-show="isShow">
<el-input class="width100 margin_top25_bottom10" type="text" placeholder="请输入用户名" @keydown.enter.native="login(userInfo)" v-model="userInfo.username">
<i slot="prefix" style="display: flex; align-items: center">
<img style="
margin: 1.3125rem 1.3125rem 1.3125rem 1.1875rem;
width: 1rem;
height: 1rem;
"
:src="usernameUrl"
alt
/>
" :src="usernameUrl" alt />
</i>
</el-input>
<el-input
class="width100 margin_top25_bottom10"
type="password"
placeholder="请输入密码"
v-model="userInfo.password"
@keydown.enter.native="login(userInfo)"
>
<el-input class="width100 margin_top25_bottom10" type="password" placeholder="请输入密码" v-model="userInfo.password" @keydown.enter.native="login(userInfo)">
<i slot="prefix">
<img
style="
<img style="
margin: 1.3125rem 1.3125rem 1.3125rem 1.1875rem;
width: 0.9375rem;
height: 0.9375rem;
"
:src="passwordUrl"
alt
/>
" :src="passwordUrl" alt />
</i>
</el-input>
<el-button
class="login_button width100 margin_top25_bottom10"
type="primary"
ref="userLogin"
@click="login(userInfo)"
:loading="btnLoading"
>登录
<el-button class="login_button width100 margin_top25_bottom10" type="primary" ref="userLogin" @click="login(userInfo)" :loading="btnLoading">登录
</el-button>
</div>
<!-- 对接线上 -->
<!-- <div class="AccountsLogin">
<div class="el-icon-loading"></div>
<span>正在加载中...</span>
</div> -->
</template>
<script>
......@@ -83,6 +55,10 @@ export default {
userInfo: { username: '', password: '' },
usernameUrl: require('../../../assets/img/login/user.png'),
passwordUrl: require('../../../assets/img/login/password.png'),
// 西藏对接数据
userToken: null,
appToken: null,
appId: null
}
},
async mounted () {
......@@ -196,6 +172,10 @@ export default {
// console.log(this.ip);
localStorage.setItem("userIP", ipRes); //存入 参数： 1.调用的值 2.所要存入的数据
console.log(localStorage.getItem("userIP"));//输出
// document.cookie = '_idp_session=asiodnsaondoaisndosandosando==='
// let result = this.getCookie('_idp_session')
// console.log(result);
// console.log(navigator);
},
methods: {
// 登录
......@@ -222,7 +202,6 @@ export default {
console.log(this.$store.state.tm.tmType);
this.$message.success('登录成功！')
//所在单位数据
this.$store.dispatch("ljk/_ljkRy") // 获取用户人员逻辑库JSON
......@@ -234,8 +213,123 @@ export default {
} else {
this.$message.error(res.data.message)
}
}).catch(err => {
console.log(err);
})
},
// 西藏默认登录逻辑
TibetChange () {
// TODO 新增用户默认数据
/**
* idCard: "130481199706122335"
identityCard: ""
name: "西藏"
okpassword: "123456"
password: "123456"
phoneNumber: "177032068993"
policeNumber: ""
roleId: ""
status: 1
unitCode: "540000000000"
unitName: ""
userGroupId: ""
username: "Tibet"
*/
let self = this
// 1.获取userToken
this.userToken = this.getCookie('_idp_session')
// 存储到localStorage
localStorage.setItem('userToken', this.userToken)
// 2.获取当前应用令牌接口
this.$axios({
method: 'post',
url: 'https://ip:port/tacs/getNewAppToken',
params: {
appId: self.appId,
userToken: self.userToken
}
}).then(res => {
if (res.data.tag == 'failed') {
self.$message.error(res.data.msg.info)
} else {
// 2.获取当前应用令牌接口 -- 成功
self.appToken = res.data.result
// 存储到localStorage
localStorage.setItem('appToken', self.appToken)
// 3.获取认证用户
self.$axios({
method: 'post',
url: 'https://ip:port/tacs/getNewIDPUserAttributes',
data: {
appId: self.appId,
userToken: self.userToken
}
}).then(infoRes => {
if (infoRes.data.tag == 'failed') {
self.$message.error(infoRes.data.msg.info)
} else {
// 3.获取认证用户 -- 成功
// 获取返回的用户信息
let yhId = infoRes.data.result.yhId
let xm = infoRes.data.result.xm
let jh = infoRes.data.result.jh
let sfzh = infoRes.data.result.sfzh
let dwdm = infoRes.data.result.dwdm
let dwmc = infoRes.data.result.dwmc
let zw = infoRes.data.result.zw
// 4.调用新增人员
self.$axios({
method: 'post',
url: '/security/users',
data: {
idCard: "130481199706122335",
identityCard: "",
name: "西藏",
okpassword: "123456",
password: "123456",
phoneNumber: "177032068993",
policeNumber: "",
roleId: "",
status: 1,
unitCode: "540000000000",
unitName: "",
userGroupId: "",
username: "Tibet"
}
}).then(xzryRes => {
if (xzryRes.data.code == 201 || xzryRes.data.code == 400) {
// 201 新建成功，登录用户
// 400 用户名已存在 -- 走登录逻辑
let userInfo = { username: '', password: '' }
// 4.开始登录
self.login(userInfo)
} else if (xzryRes.data.code == 404 || xzryRes.data.code == 500) {
this.$message.error('服务不存在')
}
}).catch(xzryErr => {
// 新增人员报错
})
}
}).catch(infoErr => {
// 3.获取认证用户 -- 失败
})
}
}).catch(err => {
// 2.获取当前应用令牌接口 -- 失败
})
},
/**
* @description: 读取cookie
* @param {*} name
* @return {*}
*/
getCookie (name) {
var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
if (arr = document.cookie.match(reg))
return unescape(arr[2]);
else
return null;
}
},
// mounted () {
// // todo 选中进来清空userInfo数据
......@@ -334,6 +428,9 @@ export default {
.el-button--primary:active {
background-color: #1689db;
}
.margin_top25_bottom10 {
margin: 25px 0 10px 0;
}
</style>
<style>
input:-webkit-autofill,
......@@ -350,5 +447,20 @@ input {
}
</style>
<style lang="scss" scoped>
// .AccountsLogin {
// margin-top: 100px;
// display: flex;
// flex-direction: column;
// justify-content: center;
// align-items: center;
// .el-icon-loading {
// color: #fff;
// font-size: 50px;
// }
// span {
// margin-top: 10px;
// color: #fff;
// font-size: 16px;
// }
// }
</style>
src/views/zzwcj/fingerprint.vue
......@@ -1218,8 +1218,10 @@ export default {
ip: '',
// 滚动指位信息
rGdzw: [],
rGdzw_string: '',
// 平面指位信息
rPmzw: [],
rPmzw_string: '',
// 上传的重复指位
cfFingerIndex: null,
SupportNbis: false,
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-02-21 10:45:20
* @LastEditTime: 2022-02-27 22:52:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,7 +91,7 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", // 统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.110:8099/", // 张 认定
// target: "http://192.168.128.106:8099", // 湖南-马
// target: "http://192.168.128.109:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.109:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", // 统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
......
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