Skip to content

F
founder_vue
Commit d3b56a11 by 张超军
Options

hb

parents f290f2d8 eaf0d3b8
Showing with 416 additions and 328 deletions
public/JsonData/CODE_XZQH.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-24 17:21:02
* @LastEditTime: 2021-11-26 11:10:49
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......@@ -14,12 +14,7 @@
<script>
import zoom from "./utils/autosize";
export default {
mounted() {
//所在单位数据
this.$store.dispatch("publicData/_getList");
},
};
export default {};
</script>
<style lang="scss">
......
src/components/Cascader.vue
<!--
* @Author: your name
* @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-11-25 14:12:11
* @LastEditTime: 2021-11-26 14:05:08
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue
-->
<template>
<div :style="{ width: width + 'px' }">
<div :style="{ width: width + 'rem' }">
<el-cascader
v-model="form[id]"
ref="cascader"
......@@ -52,8 +52,9 @@ export default {
id: String,
width: {
type: [String, Number],
default: 264,
default: 16.5,
},
codeName: String,
},
methods: {
change(val) {
......@@ -61,10 +62,6 @@ export default {
if (!newVal) newVal = "";
this.$set(this.form, this.id, newVal);
this.$refs.cascader.dropDownVisible = false;
setTimeout(() => {
// this.$refs.cascader.computePresentContent();
}, 200);
//console.log(this.casVal);
},
getTreeData(data) {
if (data && data.length > 0) {
......@@ -77,13 +74,21 @@ export default {
},
},
mounted() {
let unidata = this.$store.state.publicData.unitData;
let unicode = this.$store.state.publicData.unitCode;
// if (this.form[this.id]) {
// this.casVal = this.form[this.id];
// }
if (this.options.length <= 0) {
this.options = this.getTreeData(unidata.filter((i) => i.code == unicode));
let self = this;
if (!this.codeName) {
let unidata = this.$store.state.publicData.unitData;
let unicode = this.$store.state.publicData.unitCode;
if (this.options.length <= 0) {
this.options = this.getTreeData(
unidata.filter((i) => i.code == unicode)
);
}
} else {
this.$axios.get(`JsonData/${this.codeName}.json`).then((res) => {
if (res.data.code == 0 && res.data.message == "success") {
this.options = self.getTreeData(res.data.ret);
}
});
}
},
};
......
src/components/SelectCode.vue
<!--
* @Author: your name
* @Date: 2021-11-25 10:15:01
* @LastEditTime: 2021-11-25 11:31:33
* @LastEditTime: 2021-11-26 15:57:33
* @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
......@@ -11,6 +11,7 @@
<el-select
v-model="value"
filterable
:class="{ multiple: multiple }"
popper-class="popperClass"
:multiple="multiple"
default-first-option
......@@ -20,15 +21,23 @@
@focus="placeholder = '请输入'"
@blur="placeholder = '请选择'"
:clearable="clearable"
collapse-tags
@change="change"
>
<el-option
v-for="item in options"
:key="item.id"
:label="item.name"
:value="item.code"
>
</el-option>
<el-checkbox-group v-model="checkList" @change="checkChange">
<el-option
ref="option"
v-for="item in options"
:key="item.id"
:label="item.name"
:value="item.code"
>
<div class="options" v-if="multiple" @click.stop="() => {}">
<el-checkbox :label="item.code">{{ item.name }}</el-checkbox>
</div>
<div class="options" v-else>{{ item.name }}</div>
</el-option>
</el-checkbox-group>
</el-select>
</div>
</template>
......@@ -40,6 +49,7 @@ export default {
placeholder: "请选择",
options: [],
value: [],
checkList: [],
};
},
props: {
......@@ -62,7 +72,7 @@ export default {
//宽度设置
width: {
type: [String, Number],
default: 264,
default: 16.5,
},
},
watch: {
......@@ -81,7 +91,23 @@ export default {
change(val) {
let newVal = val;
if (!newVal && !this.multiple) newVal = "";
if (newVal.length <= 0 && this.multiple) newVal = "";
if (this.multiple) {
if (newVal.length <= 0) {
newVal = "";
this.checkList = [];
} else {
this.checkList = newVal;
}
}
this.$set(this.form, this.id, newVal);
},
checkChange(val) {
let newVal = val;
this.value = val;
if (newVal.length <= 0) {
newVal = "";
this.checkList = [];
}
this.$set(this.form, this.id, newVal);
},
getOptions() {
......@@ -100,13 +126,52 @@ export default {
<style>
</style>
<style lang="scss" scoped>
.options {
padding: 0 10px;
}
.el-select /deep/ {
width: 100% !important;
.popperClass {
.el-select-dropdown__item {
padding: 0 10px;
padding: 0px;
box-sizing: border-box;
}
}
}
.multiple /deep/ {
.el-tag {
max-width: 100%;
position: relative;
padding-right: 15px;
}
.el-select__tags-text {
display: inline-block;
max-width: 100%;
text-overflow: ellipsis;
overflow: hidden;
}
.el-icon-close {
position: absolute;
top: 50%;
transform: translateY(-50%);
right: 0;
width: 14px;
height: 14px !important;
&::before {
height: 14px;
width: 14px;
}
}
}
.el-checkbox-group /deep/ {
.is-checked {
.el-checkbox__inner {
background-color: #055fe7 !important;
border-color: #055fe7 !important;
}
.el-checkbox__label {
color: #055fe7 !important;
}
}
}
</style>
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-25 17:24:11
* @LastEditTime: 2021-11-26 11:31:17
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -12,12 +12,13 @@ import Vue from "vue";
import axios from "axios";
import NProgress from "nprogress";
import "nprogress/nprogress.css";
import router from "../router";
import store from "../store";
import { Loading } from 'element-ui';
import { Loading, MessageBox } from 'element-ui';
var loadingIndex = 0;
var loadingBoo;
var timer;
var tiTimer;
// Full config: https://github.com/axios/axios#request-config
// axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || '';
// axios.defaults.headers.common['Authorization'] = AUTH_TOKEN;
......@@ -37,20 +38,29 @@ const _axios = axios.create(config);
var loading;
_axios.interceptors.request.use(
function (config) {
if (config.url.indexOf('/login/myLoginForm') <= 0) {
if (localStorage.getItem("token")) {
config.headers.Authorization = localStorage.getItem("token");
} else {
if (tiTimer) clearTimeout(tiTimer)
tiTimer = setTimeout(() => {
MessageBox.confirm('没有登陆账号，请登录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
router.replace("/login1");
}).catch(() => {
});
}, 200);
}
}
loadingBoo = (!config.loading && typeof config.loading == 'boolean') ? config.loading : true;
// debugger;
// 进度条
if (loadingBoo) {
if (!loading) loading = Loading.service({ fullscreen: true, text: '正在加载...' });
loadingIndex++;
}
NProgress.start();
//console.log('请求前' + loadingIndex)
// 在发送请求之前做些什么
// 判断是否存在token,如果存在将每个页面header添加token
if (localStorage.getItem("token")) {
config.headers["Authorization"] = localStorage.getItem("token");
}
return config;
},
function (error) {
......@@ -65,7 +75,7 @@ _axios.interceptors.response.use(
function (response) {
NProgress.done();
loadingIndex--;
console.log('请求后' + loadingIndex)
// console.log('请求后' + loadingIndex)
if (loadingIndex <= 0) {
clearTimeout(timer)
timer = setTimeout(() => {
......@@ -73,12 +83,6 @@ _axios.interceptors.response.use(
loading = null
}, 500);
}
if (response.data.code === 401) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userName”的信息。
this.$router.push("/login1");
}
return response;
},
function (error) {
......
src/router/modules/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-12 17:41:04
* @LastEditTime: 2021-11-26 11:32:58
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -10,7 +10,7 @@ import leftMenu from './leftMenu'
export default [
{
path: "/",
// redirect: "/login1"
redirect: "/login1",
meta: {
title: "登录",
auth: "5"
......
src/utils/util.js
......@@ -57,19 +57,19 @@ export default {
* @param {Object} arr
* @param {Object} i
*/
inArray: function(elem, arr) {
inArray: function (elem, arr) {
return arr == null ? -1 : arr.indexOf(elem);
},
/**
* 获取某天日期
* @param {Object} day
*/
getDay: function(day) {
getDay: function (day) {
var today = new Date();
var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
today.setTime(targetday_milliseconds);
const doHandleMonth = function(month) {
const doHandleMonth = function (month) {
var m = month;
if (month.toString().length == 1) {
m = "0" + month;
......@@ -99,7 +99,7 @@ export default {
* @param {Object} obj
*/
deepClone(obj) {
const isObject = function(obj) {
const isObject = function (obj) {
return typeof obj == "object";
};
......@@ -114,5 +114,66 @@ export default {
cloneObj[key] = isObject(obj[key]) ? this.deepClone(obj[key]) : obj[key];
}
return cloneObj;
},
//一个数组减去另一个数组中的值
arrToValue(souceArr, targetArr, key) {
if (!key) {
return souceArr.filter((x) => targetArr.indexOf(x) < 0);
} else {
souceArr.filter((x) => {
return targetArr.findIndex(y => y[key] == x[key]) < 0
});
}
},
// 转换字符串，undefined,null等转化为""
praseStrEmpty(str) {
return !str || str === 'undefined' || str === 'null' ? '' : str
},
/**
* 构造树型结构数据
* @param {*} data 数据源
* @param {*} id id字段 默认 'id'
* @param {*} parentId 父节点字段 默认 'parentId'
* @param {*} children 孩子节点字段 默认 'children'
* @param {*} rootId 根Id 默认 0
*/
handleTree(data = [], id = 'id', parentId = 'parentId', children = 'children', rootId) {
rootId =
rootId ||
Math.min.apply(
Math,
data.map(item => {
return item[parentId]
})
) ||
0
//对源数据深度克隆
const cloneData = JSON.parse(JSON.stringify(data))
//循环所有项
const treeData = cloneData.filter(father => {
let branchArr = cloneData.filter(child => {
//返回每一项的子级数组
return father[id] === child[parentId]
})
branchArr.length > 0 && (father.children = branchArr)
//返回第一层
return father[parentId] === rootId
})
// 排序
treeData
.sort((a, b) => {
return Number(a.code) - Number(b.code)
})
.forEach(m => {
if (m.children && m.children.length) {
m.children.sort((c, d) => {
return Number(c.code) - Number(d.code)
})
}
})
return treeData !== '' ? treeData : data
}
};
src/views/Home.vue
......@@ -198,22 +198,17 @@ export default {
*/
logout() {
// //console.log('退出登录');
// this.$router.replace('/login1')
this.$axios
.post("/login/login/userLogout")
.get("/login/login/logout")
.then((res) => {
if (res.data.code === 200) {
if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userInfor”的信息。
localStorage.removeItem("userInfo"); //删除名称为“userInfor”的信息。
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
})
.catch((err) => {
//console.info(err);
});
.catch((err) => {});
},
/**
* @description: 开始搜索
......@@ -546,15 +541,15 @@ export default {
.el-tabs__nav-prev {
font-size: 20px !important;
cursor: pointer;
&:hover{
color: #055FE7;
&:hover {
color: #055fe7;
}
}
.el-tabs__nav-next {
font-size: 20px !important;
cursor: pointer;
&:hover{
color: #055FE7;
&:hover {
color: #055fe7;
}
}
.is-active {
......
src/views/Home/Home.vue
......@@ -4,29 +4,17 @@
<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>
......@@ -36,14 +24,8 @@
</div>
</div>
<div
style="cursor:pointer"
@click="logout"
>
<img
src="../../assets/img/Home/exit.svg"
alt=""
/>安全退出
<div style="cursor: pointer" @click="logout">
<img src="../../assets/img/Home/exit.svg" alt="" />安全退出
</div>
</div>
<!-- 主体 -->
......@@ -54,10 +36,7 @@
<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>
......@@ -79,66 +58,36 @@
<!-- 第一列 -->
<div class="list l1">
<div class="import_images" @click="goQBAJK">
<img
src="../../assets/img/Home/import_images.svg"
alt=""
/>
<img src="../../assets/img/Home/import_images.svg" alt="" />
<div>案件图片导入</div>
</div>
<div
@click="godrFPTX"
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"
alt=""
style="width:38px; height:38px"
style="width: 38px; height: 38px"
/>
<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>
......@@ -153,47 +102,50 @@ import qs from "qs";
export default {
name: "Home",
data () {
data() {
return {
userInfo: { userName: "admin", passWord: "123456" }
userInfo: { userName: "admin", passWord: "123456" },
};
},
methods: {
goQBAJK () {
goQBAJK() {
this.$router.push({
path: '/qbalk',
path: "/qbalk",
query: {
xzaj: true
}
})
xzaj: true,
},
});
},
godrFPTX () {
godrFPTX() {
this.$router.push("/drFPTX");
},
gobdrd () {
gobdrd() {
this.$router.push("/cxyrd");
},
gosjzygl () {
gosjzygl() {
this.$router.push("/AllPersonnelBaseIndex/");
},
gozzwcj () {
gozzwcj() {
// this.$router.push("/AllPersonnelBaseIndex");
},
logout () {
this.$axios.post("/login/login/userLogout").then(res => {
if (res.data.code === 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor");
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
});
}
logout() {
this.$axios
.get("/login/login/logout")
.then((res) => {
if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userInfo"); //删除名称为“userInfor”的信息。
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
})
.catch((err) => {
});
},
},
created() {
sessionStorage.setItem("crumbs", []);
},
created(){
sessionStorage.setItem('crumbs',[])
}
};
</script>
......
src/views/SystemManage/GroupManage.vue
......@@ -74,7 +74,6 @@
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link
type="primary"
:underline="false"
......@@ -533,7 +532,6 @@
<span style="color: #055fe7">{{ userMultipleSelection.length }}</span>
项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link
type="primary"
:underline="false"
......
src/views/SystemManage/UserManage.vue
......@@ -29,11 +29,12 @@
</div>
<div class="search-item">
<div class="label">单位代码：</div>
<el-input
<Cascader :form="searchParams" id="unitCode" width="9.6875"></Cascader>
<!-- <el-input
class="search-info"
v-model="searchParams.unitCode"
placeholder="请输入单位代码"
/>
/> -->
</div>
<div class="search-item">
<div class="label">角色：</div>
......@@ -82,7 +83,7 @@
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
​
<el-link
type="primary"
:underline="false"
......
src/views/cxyrd/QueryConfirm.vue
......@@ -243,7 +243,6 @@
已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link
type="primary"
:underline="false"
......@@ -277,7 +276,7 @@
height
width="auto"
></el-table-column>
<el-table-column prop="" label="任务号/查询号" :width="cxyrdWidth1">
<el-table-column prop="" label="查询ID" :width="cxyrdWidth1">
<template slot-scope="scope">
<svg-icon
style="
......
src/views/cxyrd/TT.scss
......@@ -21,8 +21,9 @@ $phone: var(--phone, #606266); //#ff4242;
padding: 20px;
box-sizing: border-box;
position: absolute;
top: calc(50% - 300px);
left: calc(50% - 300px);
top: 30%;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
width: 600px;
height: 152px;
......
src/views/cxyrd/TT.vue
......@@ -60,16 +60,16 @@
<div class="btns">
<div
class="btn"
:class="{ active: isFinger === true }"
:class="{ active: isFinger == true }"
@click="finger"
>
指纹
</div>
<div class="btn" :class="{ active: isPlam === true, hui: true }">
<div class="btn" :class="{ active: isPlam == true, hui: true }">
<!-- @click="plam" -->
掌纹
</div>
<div class="btn" :class="{ active: isFace === true, hui: true }">
<div class="btn" :class="{ active: isFace == true, hui: true }">
<!-- @click="face" -->
人像
</div>
......@@ -78,14 +78,14 @@
<div v-show="isFinger" class="menu middle">
<div
class="menu-item"
:class="{ active: activeIndex === 1 }"
:class="{ active: activeIndex == 1 }"
@click="handleSelect(1)"
>
滚动
</div>
<div
class="menu-item"
:class="{ active: activeIndex === 2 }"
:class="{ active: activeIndex == 2 }"
@click="handleSelect(2)"
>
平面
......@@ -155,7 +155,7 @@
</div>
<div class="imgs middle">
<div v-show="isFinger === true" class="fingers">
<div v-show="isFinger == true" class="fingers">
<div class="data-label">
<div class="source-label">源<br />数<br />据</div>
<div class="dest-label">目<br />标<br />数<br />据</div>
......@@ -163,7 +163,7 @@
<!-- 指纹图部分-->
<div class="finger-data">
<!-- 滚动 1-10 右拇始 -->
<div v-if="activeIndex === 1">
<div v-if="activeIndex == 1">
<!-- Swiper -->
<div class="swiper-main">
<swiper :options="swiperOption" ref="swiper1">
......@@ -387,7 +387,7 @@
</div>
</div>
<!-- 平面 11-20 右拇始 -->
<div v-if="activeIndex === 2">
<div v-if="activeIndex == 2">
<!-- Swiper -->
<div class="swiper-main">
<swiper :options="swiperOption1" ref="swiper1">
......@@ -614,26 +614,20 @@
</div>
<!-- <t-t-finger-print-->
<!-- style="margin-top: -40px"-->
<!-- v-show="isFinger === true"-->
<!-- v-show="isFinger == true"-->
<!-- ></t-t-finger-print>-->
<t-t-plam v-show="isPlam === true"></t-t-plam>
<t-t-face v-show="isFace === true"></t-t-face>
<t-t-plam v-show="isPlam == true"></t-t-plam>
<t-t-face v-show="isFace == true"></t-t-face>
</div>
</div>
<!-- 认定完成确认框 -->
<div
<!-- <div
class="rdwcDialog"
v-show="isShowrdwcDialogBg"
@click="cancelrdwc"
></div>
<div class="rdwccontent" v-show="isShowrdwcDialog">
<div class="title">当前候选未全部查看，是否确认认定完成？</div>
<div class="rdwcbtns">
<button class="rdwcconfirm" @click="confirmrdwc">确认</button>
<button class="rdwccancel" @click="cancelrdwc">取消</button>
</div>
</div>
></div> -->
<div
class="jiantou"
ref="jiantou"
......@@ -648,7 +642,14 @@
/>
</div>
</div>
<!-- 认定判断弹框 -->
<div class="rdwccontent" v-show="isShowrdwcDialog">
<div class="title">当前候选未全部查看，是否确认认定完成？</div>
<div class="rdwcbtns">
<button class="rdwcconfirm" @click="confirmrdwc">确认</button>
<button class="rdwccancel" @click="cancelrdwc">取消</button>
</div>
</div>
<!-- 指纹详情 -->
<div class="detail" v-show="isShowDetail">
<div class="head-title">{{ zwName }}</div>
......@@ -817,6 +818,7 @@ export default {
targetDelText: "",
swiperOption: {
//swiper3
observer: true,
direction: "vertical",
mousewheel: true,
// loop: true,
......@@ -831,6 +833,7 @@ export default {
},
swiperOption1: {
//swiper3
observer: true,
direction: "vertical",
mousewheel: true,
// loop: true,
......@@ -964,8 +967,8 @@ export default {
this.currentQqid = this.$route.query.qqid;
this.getSourceList();
this.activeIndex = 1;
//console.log("源qid====>", this.qid);
//console.log("源qqid====>", this.currentQqid);
//console.log("源qid===>", this.qid);
//console.log("源qqid===>", this.currentQqid);
},
watch: {
phone(newValue, oldValue) {
......@@ -999,10 +1002,10 @@ export default {
handleSelect(index) {
this.activeIndex = index;
//console.info(this.activeIndex);
if (index === 1) {
if (index == 1) {
//console.info("滚动指纹");
}
if (index === 2) {
if (index == 2) {
//console.info("平面指纹");
}
},
......@@ -1022,10 +1025,10 @@ export default {
last(index) {
let i = index;
if (index > 0) {
debugger;
this.currentQqid = this.sourcedatas[i - 1].qqid;
this.sourcebarcode = this.sourcedatas[i - 1].barcode;
this.fingerLoading = true;
this.$set(this.sourcedatas[i - 1], "clickLog", "1");
if (this.sourcedatas[i - 1].removeFlag == "1") {
this.souceDel = true;
this.souceDelText = this.$moment(
......@@ -1054,6 +1057,7 @@ export default {
if (this.sourcedatas.length - 1 > index) {
this.currentQqid = this.sourcedatas[i + 1].qqid;
this.sourcebarcode = this.sourcedatas[i + 1].barcode;
this.$set(this.sourcedatas[i + 1], "clickLog", "1");
if (this.sourcedatas[i + 1].removeFlag == "1") {
this.souceDel = true;
this.souceDelText = this.$moment(
......@@ -1082,7 +1086,7 @@ export default {
let me = this;
this.screenLoading = true;
this.loadingIndex++;
if (me.dataType === "father") {
if (me.dataType == "father") {
me.$axios
.post(
"/api/queryque/standardAll",
......@@ -1093,11 +1097,13 @@ export default {
)
.then((res) => {
me.loadingIndex--;
if (res.data.code === 0) {
if (res.data.code == 0) {
me.sourcedatas = res.data.ret;
me.sourcedatasLength = res.data.ret.length;
me.sourcebarcode = res.data.ret[0].barcode;
me.currentQqid = res.data.ret[0].qqid;
me.$set(me.sourcedatas[0], "clickLog", 1);
if (res.data.ret[0].removeFlag == "1") {
this.souceDel = true;
this.souceDelText = this.$moment(
......@@ -1137,7 +1143,7 @@ export default {
)
.then((res) => {
me.loadingIndex--;
if (res.data.code === 0) {
if (res.data.code == 0) {
me.sourcedatas = res.data.ret;
me.sourcedatasLength = res.data.ret.length;
me.sourcebarcode = res.data.ret[0].barcode;
......@@ -1150,6 +1156,9 @@ export default {
} else {
this.souceDel = false;
}
me.$set(me.sourcedatas[0], "clickLog", 1);
this.getSourceRollFingerPrintDetail(
res.data.ret[0].barcode,
"yes"
......@@ -1160,8 +1169,8 @@ export default {
);
me.getMatchcandList(me.currentQqid);
if (
me.sourcedatas[0].affirmStatus === "1" ||
me.sourcedatas[0].affirmStatus === "3"
me.sourcedatas[0].affirmStatus == "1" ||
me.sourcedatas[0].affirmStatus == "3"
) {
this.rdcount = 1;
} else {
......@@ -1171,7 +1180,7 @@ export default {
//console.info("源数据", me.sourcedatas);
});
}
//console.log("源barcode====>", this.sourcebarcode);
//console.log("源barcode===>", this.sourcebarcode);
},
// 获取候选列表
getMatchcandList() {
......@@ -1185,7 +1194,7 @@ export default {
)
.then((res) => {
me.loadingIndex--;
if (res.data.code === 0) {
if (res.data.code == 0) {
me.tableData = res.data.ret;
me.$nextTick(() => {
me.$refs.singleTable.setCurrentRow(me.tableData[0]);
......@@ -1210,25 +1219,25 @@ export default {
)
.then(function (response) {
self.loadingIndex--;
if (response.data.code === 0) {
if (response.data.code == 0) {
//console.info("源plan", response.data.ret);
response.data.ret.forEach((element, index) => {
// 源 左手 平面
self.sourceFingersLeftL.forEach((item) => {
if (item.code === element.seq) {
if (item.code == element.seq) {
item.img = element.image;
}
});
// 源 右手 平面
self.sourceFingersRightL.forEach((item) => {
if (item.code === element.seq) {
if (item.code == element.seq) {
item.img = element.image;
}
});
});
// 去掉加载状态
self.fingerLoading = false;
} else if (response.data.code === 4) {
} else if (response.data.code == 4) {
// 去掉加载状态
self.fingerLoading = false;
}
......@@ -1250,24 +1259,24 @@ export default {
)
.then(function (response) {
self.loadingIndex--;
if (response.data.code === 0) {
if (response.data.code == 0) {
response.data.ret.forEach((element, index) => {
// 源 左手 滚动
self.sourceFingersLeftR.forEach((item) => {
if (item.code === element.seq) {
if (item.code == element.seq) {
item.img = element.image;
}
});
// 源 右手 滚动
self.sourceFingersRightR.forEach((item) => {
if (item.code === element.seq) {
if (item.code == element.seq) {
item.img = element.image;
}
});
});
// 去掉加载状态
self.fingerLoading = false;
} else if (response.data.code === 4) {
} else if (response.data.code == 4) {
// 去掉加载状态
self.fingerLoading = false;
}
......@@ -1291,25 +1300,25 @@ export default {
)
.then(function (response) {
self.loadingIndex--;
if (response.data.code === 0) {
if (response.data.code == 0) {
//console.info("目标plan", response.data.ret);
response.data.ret.forEach((element, index) => {
// 目标 左手 平面
self.destFingersLeftL.forEach((item) => {
if (item.code === element.seq) {
if (item.code == element.seq) {
item.img = element.image;
}
});
// 目标 右手 平面
self.destFingersRightL.forEach((item) => {
if (item.code === element.seq) {
if (item.code == element.seq) {
item.img = element.image;
}
});
});
// 去掉加载状态
self.fingerLoading = false;
} else if (response.data.code === 4) {
} else if (response.data.code == 4) {
// 去掉加载状态
self.fingerLoading = false;
}
......@@ -1331,23 +1340,23 @@ export default {
)
.then(function (response) {
self.loadingIndex--;
if (response.data.code === 0) {
if (response.data.code == 0) {
//console.info("目标roll", response.data.ret);
response.data.ret.forEach((element, index) => {
// 目标 左手 滚动
self.destFingersLeftR.forEach((item) => {
if (item.code === element.seq) {
if (item.code == element.seq) {
item.img = element.image;
}
});
// 目标 右手 滚动
self.destFingersRightR.forEach((item) => {
if (item.code === element.seq) {
if (item.code == element.seq) {
item.img = element.image;
}
});
}); // 去掉加载状态
} else if (response.data.code === 4) {
} else if (response.data.code == 4) {
}
//console.log(response);
})
......@@ -1374,14 +1383,14 @@ export default {
tableRowClassName({ row, column, rowIndex, columnIndex }) {
//console.log("row", row.clickLog);
// 比中的行
if (row.affirmStatus === "2" || row.affirmStatus === "3") {
if (row.affirmstatus == "2" || row.affirmstatus == "3") {
return "Bizhong";
} else if (row.affirmStatus === "1") {
} else if (row.affirmstatus == "1") {
// 认定完成的行
return "Identification";
}
// 浏览过的
if (row.clickLog === "1") {
if (row.clickLog == "1") {
return "looked";
}
},
......@@ -1425,7 +1434,7 @@ export default {
// self.loadingIndex--;
// if (res.data.code == 0) {
// let data = res.data.ret[0];
// //console.log("userInfo===>", data);
// //console.log("userInfo==>", data);
// let dw = await self.$axios({
// method: "get",
// url: "/api/code/unit/one/" + data.userunit,
......@@ -1447,11 +1456,16 @@ export default {
* @return {*}
*/
cancelrdwc() {
this.isShowbzDialogBg = false;
this.isShowrdwcDialogBg = false;
this.isShowrdwcDialog = false;
},
// 认定完成
Rdwc() {
if (this.sourcedatas.length <= 1) {
this.confirmrdwc();
return;
}
//console.info("认定完成");
this.loadingIndex++;
// 认定之前的操作
......@@ -1465,6 +1479,7 @@ export default {
this.loadingIndex--;
//console.log(res);
if (!res.data.ret) {
this.isShowbzDialogBg = true;
this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true;
} else {
......@@ -1477,6 +1492,7 @@ export default {
confirmrdwc() {
let self = this;
this.isShowrdwcDialogBg = false;
this.isShowbzDialogBg = false;
this.isShowrdwcDialog = false;
this.loadingIndex++;
// 1：倒查
......@@ -1497,6 +1513,32 @@ export default {
this.loadingIndex--;
// 跟新列表数据
self.$bus.emit("updateTTSourceData");
// this.getMatchcandList();
let index = this.sourcedatas.findIndex(
(i) => i.barcode == this.sourcebarcode
);
if (index >= 0) {
let obj = this.sourcedatas[index];
if (obj.affirmStatus != "1" && obj.affirmStatus != "3") {
this.rdcount += 1;
}
if (obj.affirmStatus == "2" || obj.affirmStatus == "3") {
obj.affirmStatus = "3";
} else {
obj.affirmStatus = "1";
}
this.$set(this.sourcedatas, index, obj);
}
this.tableData = this.tableData.map((i) => {
if (i.affirmstatus == "2" || i.affirmstatus == "3") {
i.affirmstatus = "3";
} else {
i.affirmstatus = "1";
}
return i;
});
//console.log(response);
this.$message.success("认定完成！");
if (self.datatype == "son") {
......@@ -1527,6 +1569,7 @@ export default {
this.isShowbzDialogBg = false;
this.isShowbzDialog = false;
this.cancelDetail();
this.cancelrdwc();
},
// 确认比中
confirmbz() {
......@@ -1550,13 +1593,40 @@ export default {
this.loadingIndex--;
// 跟新列表数据
self.$bus.emit("updateTTSourceData");
//源数据手动修改状态
let index = this.sourcedatas.findIndex(
(i) => i.barcode == this.sourcebarcode
);
if (index >= 0) {
let obj = this.sourcedatas[index];
if (obj.affirmStatus == "1" || obj.affirmStatus == "3") {
obj.affirmStatus = "3";
} else {
obj.affirmStatus = "2";
}
this.$set(this.sourcedatas, index, obj);
}
//目标数据手动修改状态
let tableDataIndex = this.tableData.findIndex(
(i) => i.destbarcode == this.destbarcode
);
let newObj = this.tableData[tableDataIndex];
if (newObj.affirmstatus == "1" || newObj.affirmstatus == "3") {
newObj.affirmstatus = "3";
} else {
newObj.affirmstatus = "2";
}
this.$set(this.tableData, tableDataIndex, newObj);
self.isShowbzDialogBg = false;
self.isShowbzDialog = false;
this.$message.success("比中成功！");
//console.log(response);
})
.catch((err) => {
this.$message.error("比中失败！");
});
self.isShowbzDialogBg = false;
self.isShowbzDialog = false;
},
// 展示详情
showDetail(fingerData, index, name) {
......@@ -1569,28 +1639,28 @@ export default {
let sourceimg = "";
let destimg = "";
// 源 左手的滚动
if (name === "sourceFingersLeftR") {
if (name == "sourceFingersLeftR") {
sourceimg = fingerData.img;
destimg = this.destFingersLeftR[index].img;
} else if (name === "sourceFingersRightR") {
} else if (name == "sourceFingersRightR") {
sourceimg = fingerData.img;
destimg = this.destFingersRightR[index].img;
} else if (name === "sourceFingersLeftL") {
} else if (name == "sourceFingersLeftL") {
sourceimg = fingerData.img;
destimg = this.destFingersLeftL[index].img;
} else if (name === "sourceFingersRightL") {
} else if (name == "sourceFingersRightL") {
sourceimg = fingerData.img;
destimg = this.destFingersRightL[index].img;
} else if (name === "destFingersLeftR") {
} else if (name == "destFingersLeftR") {
destimg = fingerData.img;
sourceimg = this.sourceFingersLeftR[index].img;
} else if (name === "destFingersRightR") {
} else if (name == "destFingersRightR") {
destimg = fingerData.img;
sourceimg = this.sourceFingersRightR[index].img;
} else if (name === "destFingersLeftL") {
} else if (name == "destFingersLeftL") {
destimg = fingerData.img;
sourceimg = this.sourceFingersLeftL[index].img;
} else if (name === "destFingersRightL") {
} else if (name == "destFingersRightL") {
destimg = fingerData.img;
sourceimg = this.sourceFingersRightL[index].img;
} else {
......@@ -1698,9 +1768,6 @@ export default {
},
},
mounted() {
setTimeout(() => {
//console.log(this.sourcedatas);
}, 2000);
this.finger();
this.$bus.on("ccbarcode", (code) => {
this.cleardest();
......
src/views/login/Login1.vue
......@@ -7,7 +7,7 @@
width="100wh"
height="100vh"
class="fillWidth video-js video"
style="object-fit: fill;"
style="object-fit: fill"
>
<source :src="barcgroundUrl" type="video/mp4" />
<img :style="fixStyle" :src="barcgroundImgUrl" alt="" />
......@@ -20,12 +20,12 @@
<div :style="drawerStyle" class="login_main_layer" v-if="loginShow">
<!-- <transition name="login_fade">-->
<div>
<div class=" login_top_layer middle">
<div class="login_top_layer middle">
<el-image class="login_emblem middle" :src="emblemUrl"></el-image>
<br />
<el-image class="login_system middle" :src="systemUrl"></el-image>
</div>
<div class=" middle margin_top25_bottom10">
<div class="middle margin_top25_bottom10">
<el-button
class="magin_left_right30"
:class="{ active: loginType.accountStatus }"
......@@ -53,8 +53,8 @@
</div>
</div>
<!-- </transition>-->
<div class="login_bottom_layer ">
<span class=" font_color"
<div class="login_bottom_layer">
<span class="font_color"
>Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span
>
</div>
......@@ -71,7 +71,7 @@ export default {
name: "Login1",
components: {
accountsLogin,
keyLogin
keyLogin,
},
data() {
......@@ -87,8 +87,8 @@ export default {
drawerStyle: "",
loginType: {
accountStatus: false, // 帐号密码登录状态
keyStatus: false // key登录状态
}
keyStatus: false, // key登录状态
},
};
},
methods: {
......@@ -124,7 +124,7 @@ export default {
autoplay: true,
muted: true,
//建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
preload: "auto"
preload: "auto",
//设置视频播放器的显示宽度（以像素为单位）
},
() => {
......@@ -133,7 +133,7 @@ export default {
}, 1000);
}
);
}
},
},
created() {},
mounted() {
......@@ -187,7 +187,7 @@ export default {
// }
// };
// window.onresize();
}
},
};
</script>
......
src/views/login/modules/AccountsLogin.vue
......@@ -81,81 +81,26 @@ export default {
// 登录
login(userinfo) {
let me = this;
//console.info(userinfo);
var authentication = new URLSearchParams();
authentication.append("userName", userinfo.userName);
authentication.append(
"passWord",
Encrypt(userinfo.passWord.trim()).toString()
);
me.btnLoading = true;
// let authentication = userinfo;
// let data = new FormData();
//密码加密
// authentication.passWord = Encrypt(
// authentication.passWord.trim()
// ).toString();
// let passwordAES = Encrypt(authentication.passWord.trim()).toString();
// data.append("username", this.userInfo.userName);
// data.append("password", passwordAES);
// data.passWord = passwordAES;
// todo 登录请求
this.$axios
.post("/login/myLoginForm", authentication, { loading: false })
// .post("/login/myLoginForm?" + qs.stringify(authentication))
.then((res) => {
me.btnLoading = false;
if (res.data.code === "200") {
localStorage.setItem("token", res.data.token);
localStorage.setItem("userName", res.data.userName);
localStorage.setItem(
"userInfor",
JSON.stringify(res.data.userInfo)
);
this.$message.success(userinfo.userName + "登录成功！");
this.$router.push("/Home/Home");
} else {
this.$message.error(res.data.message);
}
})
.catch((err) => {
// this.$message.error(err.message);
// this.getCaptcha();
//console.info(err);
});
// "/myLoginForm?userName=" +
// userinfo.userName +
// "&passWord=" +
// userinfo.passWord,
// qs.stringify(userinfo)
// , true, {
// headers: { "content-type": "application/x-www-form-urlencoded" }
// }
// )
// .then(res => {
// //console.info(res);
// });
// if (this.userInfo.username && this.userInfo.password) {
// this.$router.push("/Home/Home");
// }
// this.$store
// .dispatch("/myLoginForm", this.userInfo)
// .then(res => {
// if (res.code >= 0) {
// this.$message({
// message: "登录成功！",
// type: "success"
// });
// this.$router.push("/Home");
// } else {
// this.getCaptcha();
// this.$message({
// message: res.message,
// type: "warning"
// });
// }
// })
this.$axios({
url: "/login/login/myLoginForm",
method: "post",
data: { username: "admin", password: "admin" },
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
}).then((res) => {
if (res.data.code == 200) {
localStorage.setItem("token", res.data.token);
localStorage.setItem("userInfo", JSON.stringify(res.data.userInfo));
this.$message.success("登录成功！");
//所在单位数据
this.$store.dispatch("publicData/_getList");
this.$router.push("/Home/Home");
} else {
this.$message.error("登陆失败");
}
});
},
},
mounted() {
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-25 10:26:49
* @LastEditTime: 2021-11-26 11:35:37
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -94,11 +94,11 @@ module.exports = {
// target: "http://192.168.128.166:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
target: "http://192.168.128.118: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://www.meetfood.cn:2390/", // 湖南-线上
ws: true,
changeOrigin: true,
......@@ -107,8 +107,7 @@ module.exports = {
}
},
"/login": {
target: "http://47.92.226.24:3004/", // 登录
// target: "http://192.168.128.109:8765/", // 王
target: "http://192.168.128.118:8764/", // 登录
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -127,6 +126,7 @@ module.exports = {
"/security": {
//target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张
target: "http://www.meetfood.cn:2390", // 湖南-王
ws: true,
changeOrigin: true,
......
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