Commit d3b56a11 by 张超军

hb

parents f290f2d8 eaf0d3b8
This source diff could not be displayed because it is too large. You can view the blob instead.
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue * @FilePath: \指纹系统\founder_vue\src\App.vue
...@@ -14,12 +14,7 @@ ...@@ -14,12 +14,7 @@
<script> <script>
import zoom from "./utils/autosize"; import zoom from "./utils/autosize";
export default { export default {};
mounted() {
//所在单位数据
this.$store.dispatch("publicData/_getList");
},
};
</script> </script>
<style lang="scss"> <style lang="scss">
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-15 14:15:58 * @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 * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue * @FilePath: \founder_vue\src\components\confrim.vue
--> -->
<template> <template>
<div :style="{ width: width + 'px' }"> <div :style="{ width: width + 'rem' }">
<el-cascader <el-cascader
v-model="form[id]" v-model="form[id]"
ref="cascader" ref="cascader"
...@@ -52,8 +52,9 @@ export default { ...@@ -52,8 +52,9 @@ export default {
id: String, id: String,
width: { width: {
type: [String, Number], type: [String, Number],
default: 264, default: 16.5,
}, },
codeName: String,
}, },
methods: { methods: {
change(val) { change(val) {
...@@ -61,10 +62,6 @@ export default { ...@@ -61,10 +62,6 @@ export default {
if (!newVal) newVal = ""; if (!newVal) newVal = "";
this.$set(this.form, this.id, newVal); this.$set(this.form, this.id, newVal);
this.$refs.cascader.dropDownVisible = false; this.$refs.cascader.dropDownVisible = false;
setTimeout(() => {
// this.$refs.cascader.computePresentContent();
}, 200);
//console.log(this.casVal);
}, },
getTreeData(data) { getTreeData(data) {
if (data && data.length > 0) { if (data && data.length > 0) {
...@@ -77,13 +74,21 @@ export default { ...@@ -77,13 +74,21 @@ export default {
}, },
}, },
mounted() { mounted() {
let self = this;
if (!this.codeName) {
let unidata = this.$store.state.publicData.unitData; let unidata = this.$store.state.publicData.unitData;
let unicode = this.$store.state.publicData.unitCode; let unicode = this.$store.state.publicData.unitCode;
// if (this.form[this.id]) {
// this.casVal = this.form[this.id];
// }
if (this.options.length <= 0) { if (this.options.length <= 0) {
this.options = this.getTreeData(unidata.filter((i) => i.code == unicode)); 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);
}
});
} }
}, },
}; };
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-25 10:15:01 * @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 * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\SelectCode.vue * @FilePath: \founder_vue\src\components\SelectCode.vue
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<el-select <el-select
v-model="value" v-model="value"
filterable filterable
:class="{ multiple: multiple }"
popper-class="popperClass" popper-class="popperClass"
:multiple="multiple" :multiple="multiple"
default-first-option default-first-option
...@@ -20,15 +21,23 @@ ...@@ -20,15 +21,23 @@
@focus="placeholder = '请输入'" @focus="placeholder = '请输入'"
@blur="placeholder = '请选择'" @blur="placeholder = '请选择'"
:clearable="clearable" :clearable="clearable"
collapse-tags
@change="change" @change="change"
> >
<el-checkbox-group v-model="checkList" @change="checkChange">
<el-option <el-option
ref="option"
v-for="item in options" v-for="item in options"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.code" :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-option>
</el-checkbox-group>
</el-select> </el-select>
</div> </div>
</template> </template>
...@@ -40,6 +49,7 @@ export default { ...@@ -40,6 +49,7 @@ export default {
placeholder: "请选择", placeholder: "请选择",
options: [], options: [],
value: [], value: [],
checkList: [],
}; };
}, },
props: { props: {
...@@ -62,7 +72,7 @@ export default { ...@@ -62,7 +72,7 @@ export default {
//宽度设置 //宽度设置
width: { width: {
type: [String, Number], type: [String, Number],
default: 264, default: 16.5,
}, },
}, },
watch: { watch: {
...@@ -81,7 +91,23 @@ export default { ...@@ -81,7 +91,23 @@ export default {
change(val) { change(val) {
let newVal = val; let newVal = val;
if (!newVal && !this.multiple) newVal = ""; 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); this.$set(this.form, this.id, newVal);
}, },
getOptions() { getOptions() {
...@@ -100,13 +126,52 @@ export default { ...@@ -100,13 +126,52 @@ export default {
<style> <style>
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.options {
padding: 0 10px;
}
.el-select /deep/ { .el-select /deep/ {
width: 100% !important; width: 100% !important;
.popperClass { .popperClass {
.el-select-dropdown__item { .el-select-dropdown__item {
padding: 0 10px; padding: 0px;
box-sizing: border-box; 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> </style>
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js * @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
...@@ -12,12 +12,13 @@ import Vue from "vue"; ...@@ -12,12 +12,13 @@ import Vue from "vue";
import axios from "axios"; import axios from "axios";
import NProgress from "nprogress"; import NProgress from "nprogress";
import "nprogress/nprogress.css"; import "nprogress/nprogress.css";
import router from "../router";
import store from "../store"; import store from "../store";
import { Loading } from 'element-ui'; import { Loading, MessageBox } from 'element-ui';
var loadingIndex = 0; var loadingIndex = 0;
var loadingBoo; var loadingBoo;
var timer; var timer;
var tiTimer;
// Full config: https://github.com/axios/axios#request-config // Full config: https://github.com/axios/axios#request-config
// axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || ''; // axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || '';
// axios.defaults.headers.common['Authorization'] = AUTH_TOKEN; // axios.defaults.headers.common['Authorization'] = AUTH_TOKEN;
...@@ -37,20 +38,29 @@ const _axios = axios.create(config); ...@@ -37,20 +38,29 @@ const _axios = axios.create(config);
var loading; var loading;
_axios.interceptors.request.use( _axios.interceptors.request.use(
function (config) { 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; loadingBoo = (!config.loading && typeof config.loading == 'boolean') ? config.loading : true;
// debugger;
// 进度条
if (loadingBoo) { if (loadingBoo) {
if (!loading) loading = Loading.service({ fullscreen: true, text: '正在加载...' }); if (!loading) loading = Loading.service({ fullscreen: true, text: '正在加载...' });
loadingIndex++; loadingIndex++;
} }
NProgress.start(); NProgress.start();
//console.log('请求前' + loadingIndex)
// 在发送请求之前做些什么
// 判断是否存在token,如果存在将每个页面header添加token
if (localStorage.getItem("token")) {
config.headers["Authorization"] = localStorage.getItem("token");
}
return config; return config;
}, },
function (error) { function (error) {
...@@ -65,7 +75,7 @@ _axios.interceptors.response.use( ...@@ -65,7 +75,7 @@ _axios.interceptors.response.use(
function (response) { function (response) {
NProgress.done(); NProgress.done();
loadingIndex--; loadingIndex--;
console.log('请求后' + loadingIndex) // console.log('请求后' + loadingIndex)
if (loadingIndex <= 0) { if (loadingIndex <= 0) {
clearTimeout(timer) clearTimeout(timer)
timer = setTimeout(() => { timer = setTimeout(() => {
...@@ -73,12 +83,6 @@ _axios.interceptors.response.use( ...@@ -73,12 +83,6 @@ _axios.interceptors.response.use(
loading = null loading = null
}, 500); }, 500);
} }
if (response.data.code === 401) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userName”的信息。
this.$router.push("/login1");
}
return response; return response;
}, },
function (error) { function (error) {
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
...@@ -10,7 +10,7 @@ import leftMenu from './leftMenu' ...@@ -10,7 +10,7 @@ import leftMenu from './leftMenu'
export default [ export default [
{ {
path: "/", path: "/",
// redirect: "/login1" redirect: "/login1",
meta: { meta: {
title: "登录", title: "登录",
auth: "5" auth: "5"
......
...@@ -57,19 +57,19 @@ export default { ...@@ -57,19 +57,19 @@ export default {
* @param {Object} arr * @param {Object} arr
* @param {Object} i * @param {Object} i
*/ */
inArray: function(elem, arr) { inArray: function (elem, arr) {
return arr == null ? -1 : arr.indexOf(elem); return arr == null ? -1 : arr.indexOf(elem);
}, },
/** /**
* 获取某天日期 * 获取某天日期
* @param {Object} day * @param {Object} day
*/ */
getDay: function(day) { getDay: function (day) {
var today = new Date(); var today = new Date();
var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day; var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
today.setTime(targetday_milliseconds); today.setTime(targetday_milliseconds);
const doHandleMonth = function(month) { const doHandleMonth = function (month) {
var m = month; var m = month;
if (month.toString().length == 1) { if (month.toString().length == 1) {
m = "0" + month; m = "0" + month;
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
* @param {Object} obj * @param {Object} obj
*/ */
deepClone(obj) { deepClone(obj) {
const isObject = function(obj) { const isObject = function (obj) {
return typeof obj == "object"; return typeof obj == "object";
}; };
...@@ -114,5 +114,66 @@ export default { ...@@ -114,5 +114,66 @@ export default {
cloneObj[key] = isObject(obj[key]) ? this.deepClone(obj[key]) : obj[key]; cloneObj[key] = isObject(obj[key]) ? this.deepClone(obj[key]) : obj[key];
} }
return cloneObj; 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
} }
}; };
...@@ -198,22 +198,17 @@ export default { ...@@ -198,22 +198,17 @@ export default {
*/ */
logout() { logout() {
// //console.log('退出登录');
// this.$router.replace('/login1')
this.$axios this.$axios
.post("/login/login/userLogout") .get("/login/login/logout")
.then((res) => { .then((res) => {
if (res.data.code === 200) { if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。 localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。 localStorage.removeItem("userInfo"); //删除名称为“userInfor”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userInfor”的信息。
this.$router.replace("/login1"); this.$router.replace("/login1");
this.$message.info("退出成功!"); this.$message.info("退出成功!");
} }
}) })
.catch((err) => { .catch((err) => {});
//console.info(err);
});
}, },
/** /**
* @description: 开始搜索 * @description: 开始搜索
...@@ -546,15 +541,15 @@ export default { ...@@ -546,15 +541,15 @@ export default {
.el-tabs__nav-prev { .el-tabs__nav-prev {
font-size: 20px !important; font-size: 20px !important;
cursor: pointer; cursor: pointer;
&:hover{ &:hover {
color: #055FE7; color: #055fe7;
} }
} }
.el-tabs__nav-next { .el-tabs__nav-next {
font-size: 20px !important; font-size: 20px !important;
cursor: pointer; cursor: pointer;
&:hover{ &:hover {
color: #055FE7; color: #055fe7;
} }
} }
.is-active { .is-active {
......
...@@ -4,29 +4,17 @@ ...@@ -4,29 +4,17 @@
<div class="header"> <div class="header">
<!-- 头部左侧 --> <!-- 头部左侧 -->
<div class="left"> <div class="left">
<div><img <div><img src="../../assets/img/Home/badges.png" alt="" /></div>
src="../../assets/img/Home/badges.png"
alt=""
/></div>
<span><img <span><img src="../../assets/img/Home/logo.svg" alt="" /></span>
src="../../assets/img/Home/logo.svg"
alt=""
/></span>
</div> </div>
<!-- 头部右侧 --> <!-- 头部右侧 -->
<div class="right"> <div class="right">
<div> <div>
<img <img src="../../assets/img/Home/setting.svg" alt="" /> 系统管理
src="../../assets/img/Home/setting.svg"
alt=""
/> 系统管理
</div> </div>
<div class="role"> <div class="role">
<img <img src="../../assets/img/Home/role.svg" alt="" />用户角色
src="../../assets/img/Home/role.svg"
alt=""
/>用户角色
<div class="rolelist"> <div class="rolelist">
<ul> <ul>
<li>姓名:xxxx</li> <li>姓名:xxxx</li>
...@@ -36,14 +24,8 @@ ...@@ -36,14 +24,8 @@
</div> </div>
</div> </div>
<div <div style="cursor: pointer" @click="logout">
style="cursor:pointer" <img src="../../assets/img/Home/exit.svg" alt="" />安全退出
@click="logout"
>
<img
src="../../assets/img/Home/exit.svg"
alt=""
/>安全退出
</div> </div>
</div> </div>
<!-- 主体 --> <!-- 主体 -->
...@@ -54,10 +36,7 @@ ...@@ -54,10 +36,7 @@
<div class="todoview"> <div class="todoview">
<div class="todo"> <div class="todo">
<div> <div>
<img <img src="../../assets/img/Home/todoview.svg" alt="" />
src="../../assets/img/Home/todoview.svg"
alt=""
/>
</div> </div>
<p>待办工作</p> <p>待办工作</p>
</div> </div>
...@@ -79,66 +58,36 @@ ...@@ -79,66 +58,36 @@
<!-- 第一列 --> <!-- 第一列 -->
<div class="list l1"> <div class="list l1">
<div class="import_images" @click="goQBAJK"> <div class="import_images" @click="goQBAJK">
<img <img src="../../assets/img/Home/import_images.svg" alt="" />
src="../../assets/img/Home/import_images.svg"
alt=""
/>
<div>案件图片导入</div> <div>案件图片导入</div>
</div> </div>
<div <div @click="godrFPTX" class="import_FTP">
@click="godrFPTX" <img src="../../assets/img/Home/import_FTP.svg" alt="" />
class="import_FTP"
>
<img
src="../../assets/img/Home/import_FTP.svg"
alt=""
/>
<div>FPTX导入</div> <div>FPTX导入</div>
</div> </div>
</div> </div>
<!-- 第二列 --> <!-- 第二列 -->
<div <div class="list l2" @click="gosjzygl">
class="list l2" <img src="../../assets/img/Home/query.svg" alt="" />
@click="gosjzygl"
>
<img
src="../../assets/img/Home/query.svg"
alt=""
/>
<p>发查询</p> <p>发查询</p>
</div> </div>
<!-- 第三列 --> <!-- 第三列 -->
<div <div @click="gobdrd" class="list l2 l3">
@click="gobdrd" <img src="../../assets/img/Home/comparison.svg" alt="" />
class="list l2 l3"
>
<img
src="../../assets/img/Home/comparison.svg"
alt=""
/>
<p>比对认定</p> <p>比对认定</p>
</div> </div>
<!-- 第四列 --> <!-- 第四列 -->
<div <div @click="gozzwcj" class="list l1 l4">
@click="gozzwcj"
class="list l1 l4"
>
<div class="import_images collect"> <div class="import_images collect">
<img <img
src="../../assets/img/Home/collect_new.svg" src="../../assets/img/Home/collect_new.svg"
alt="" alt=""
style="width:38px; height:38px" style="width: 38px; height: 38px"
/> />
<div>活体采集</div> <div>活体采集</div>
</div> </div>
<div <div @click="gosjzygl" class="import_FTP management">
@click="gosjzygl" <img src="../../assets/img/Home/management.svg" alt="" />
class="import_FTP management"
>
<img
src="../../assets/img/Home/management.svg"
alt=""
/>
<div>数据资源管理</div> <div>数据资源管理</div>
</div> </div>
</div> </div>
...@@ -153,47 +102,50 @@ import qs from "qs"; ...@@ -153,47 +102,50 @@ import qs from "qs";
export default { export default {
name: "Home", name: "Home",
data () { data() {
return { return {
userInfo: { userName: "admin", passWord: "123456" } userInfo: { userName: "admin", passWord: "123456" },
}; };
}, },
methods: { methods: {
goQBAJK () { goQBAJK() {
this.$router.push({ this.$router.push({
path: '/qbalk', path: "/qbalk",
query: { query: {
xzaj: true xzaj: true,
} },
}) });
}, },
godrFPTX () { godrFPTX() {
this.$router.push("/drFPTX"); this.$router.push("/drFPTX");
}, },
gobdrd () { gobdrd() {
this.$router.push("/cxyrd"); this.$router.push("/cxyrd");
}, },
gosjzygl () { gosjzygl() {
this.$router.push("/AllPersonnelBaseIndex/"); this.$router.push("/AllPersonnelBaseIndex/");
}, },
gozzwcj () { gozzwcj() {
// this.$router.push("/AllPersonnelBaseIndex"); // this.$router.push("/AllPersonnelBaseIndex");
}, },
logout () { logout() {
this.$axios.post("/login/login/userLogout").then(res => { this.$axios
if (res.data.code === 200) { .get("/login/login/logout")
.then((res) => {
if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。 localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。 localStorage.removeItem("userInfo"); //删除名称为“userInfor”的信息。
localStorage.removeItem("userInfor");
this.$router.replace("/login1"); this.$router.replace("/login1");
this.$message.info("退出成功!"); this.$message.info("退出成功!");
} }
})
.catch((err) => {
}); });
}
}, },
created(){ },
sessionStorage.setItem('crumbs',[]) created() {
} sessionStorage.setItem("crumbs", []);
},
}; };
</script> </script>
......
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link <el-link
type="primary" type="primary"
:underline="false" :underline="false"
...@@ -533,7 +532,6 @@ ...@@ -533,7 +532,6 @@
<span style="color: #055fe7">{{ userMultipleSelection.length }}</span> <span style="color: #055fe7">{{ userMultipleSelection.length }}</span>
项​ 项​
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link <el-link
type="primary" type="primary"
:underline="false" :underline="false"
......
...@@ -29,11 +29,12 @@ ...@@ -29,11 +29,12 @@
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">单位代码:</div> <div class="label">单位代码:</div>
<el-input <Cascader :form="searchParams" id="unitCode" width="9.6875"></Cascader>
<!-- <el-input
class="search-info" class="search-info"
v-model="searchParams.unitCode" v-model="searchParams.unitCode"
placeholder="请输入单位代码" placeholder="请输入单位代码"
/> /> -->
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">角色:</div> <div class="label">角色:</div>
...@@ -82,7 +83,7 @@ ...@@ -82,7 +83,7 @@
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link <el-link
type="primary" type="primary"
:underline="false" :underline="false"
......
...@@ -243,7 +243,6 @@ ...@@ -243,7 +243,6 @@
已选择 已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​ <span style="color: #055fe7">{{ selectionData.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link <el-link
type="primary" type="primary"
:underline="false" :underline="false"
...@@ -277,7 +276,7 @@ ...@@ -277,7 +276,7 @@
height height
width="auto" width="auto"
></el-table-column> ></el-table-column>
<el-table-column prop="" label="任务号/查询号" :width="cxyrdWidth1"> <el-table-column prop="" label="查询ID" :width="cxyrdWidth1">
<template slot-scope="scope"> <template slot-scope="scope">
<svg-icon <svg-icon
style=" style="
......
...@@ -21,8 +21,9 @@ $phone: var(--phone, #606266); //#ff4242; ...@@ -21,8 +21,9 @@ $phone: var(--phone, #606266); //#ff4242;
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
top: calc(50% - 300px); top: 30%;
left: calc(50% - 300px); left: 50%;
transform: translateX(-50%);
z-index: 1000; z-index: 1000;
width: 600px; width: 600px;
height: 152px; height: 152px;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
width="100wh" width="100wh"
height="100vh" height="100vh"
class="fillWidth video-js video" class="fillWidth video-js video"
style="object-fit: fill;" style="object-fit: fill"
> >
<source :src="barcgroundUrl" type="video/mp4" /> <source :src="barcgroundUrl" type="video/mp4" />
<img :style="fixStyle" :src="barcgroundImgUrl" alt="" /> <img :style="fixStyle" :src="barcgroundImgUrl" alt="" />
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
<div :style="drawerStyle" class="login_main_layer" v-if="loginShow"> <div :style="drawerStyle" class="login_main_layer" v-if="loginShow">
<!-- <transition name="login_fade">--> <!-- <transition name="login_fade">-->
<div> <div>
<div class=" login_top_layer middle"> <div class="login_top_layer middle">
<el-image class="login_emblem middle" :src="emblemUrl"></el-image> <el-image class="login_emblem middle" :src="emblemUrl"></el-image>
<br /> <br />
<el-image class="login_system middle" :src="systemUrl"></el-image> <el-image class="login_system middle" :src="systemUrl"></el-image>
</div> </div>
<div class=" middle margin_top25_bottom10"> <div class="middle margin_top25_bottom10">
<el-button <el-button
class="magin_left_right30" class="magin_left_right30"
:class="{ active: loginType.accountStatus }" :class="{ active: loginType.accountStatus }"
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
</div> </div>
</div> </div>
<!-- </transition>--> <!-- </transition>-->
<div class="login_bottom_layer "> <div class="login_bottom_layer">
<span class=" font_color" <span class="font_color"
>Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span >Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span
> >
</div> </div>
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
name: "Login1", name: "Login1",
components: { components: {
accountsLogin, accountsLogin,
keyLogin keyLogin,
}, },
data() { data() {
...@@ -87,8 +87,8 @@ export default { ...@@ -87,8 +87,8 @@ export default {
drawerStyle: "", drawerStyle: "",
loginType: { loginType: {
accountStatus: false, // 帐号密码登录状态 accountStatus: false, // 帐号密码登录状态
keyStatus: false // key登录状态 keyStatus: false, // key登录状态
} },
}; };
}, },
methods: { methods: {
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
autoplay: true, autoplay: true,
muted: true, muted: true,
//建议浏览器是否应在<video>加载元素后立即开始下载视频数据。 //建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
preload: "auto" preload: "auto",
//设置视频播放器的显示宽度(以像素为单位) //设置视频播放器的显示宽度(以像素为单位)
}, },
() => { () => {
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
}, 1000); }, 1000);
} }
); );
} },
}, },
created() {}, created() {},
mounted() { mounted() {
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
// } // }
// }; // };
// window.onresize(); // window.onresize();
} },
}; };
</script> </script>
......
...@@ -81,81 +81,26 @@ export default { ...@@ -81,81 +81,26 @@ export default {
// 登录 // 登录
login(userinfo) { login(userinfo) {
let me = this; 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; me.btnLoading = true;
// let authentication = userinfo; this.$axios({
// let data = new FormData(); url: "/login/login/myLoginForm",
//密码加密 method: "post",
// authentication.passWord = Encrypt( data: { username: "admin", password: "admin" },
// authentication.passWord.trim() headers: {
// ).toString(); "Content-Type": "application/x-www-form-urlencoded",
// let passwordAES = Encrypt(authentication.passWord.trim()).toString(); },
// data.append("username", this.userInfo.userName); }).then((res) => {
// data.append("password", passwordAES); if (res.data.code == 200) {
// 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("token", res.data.token);
localStorage.setItem("userName", res.data.userName); localStorage.setItem("userInfo", JSON.stringify(res.data.userInfo));
localStorage.setItem( this.$message.success("登录成功!");
"userInfor", //所在单位数据
JSON.stringify(res.data.userInfo) this.$store.dispatch("publicData/_getList");
);
this.$message.success(userinfo.userName + "登录成功!");
this.$router.push("/Home/Home"); this.$router.push("/Home/Home");
} else { } else {
this.$message.error(res.data.message); this.$message.error("登陆失败");
} }
})
.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"
// });
// }
// })
}, },
}, },
mounted() { mounted() {
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -94,11 +94,11 @@ module.exports = { ...@@ -94,11 +94,11 @@ module.exports = {
// target: "http://192.168.128.166:8099", // 湖南-张 // 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.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://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390/", // 湖南-线上 target: "http://www.meetfood.cn:2390/", // 湖南-线上
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
...@@ -107,8 +107,7 @@ module.exports = { ...@@ -107,8 +107,7 @@ module.exports = {
} }
}, },
"/login": { "/login": {
target: "http://47.92.226.24:3004/", // 登录 target: "http://192.168.128.118:8764/", // 登录
// target: "http://192.168.128.109:8765/", // 王
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
...@@ -127,6 +126,7 @@ module.exports = { ...@@ -127,6 +126,7 @@ module.exports = {
"/security": { "/security": {
//target: "http://192.168.128.106:8765", // 湖南-王 //target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张
target: "http://www.meetfood.cn:2390", // 湖南-王 target: "http://www.meetfood.cn:2390", // 湖南-王
ws: true, ws: true,
changeOrigin: 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