Skip to content

F
founder_vue
Commit 842f9786 by 米嘉伟
Options

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

parents cb54832f 9764cba1
Showing with 553 additions and 307 deletions
src/assets/styles/main.scss
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
margin: 0; margin: 0;
box-sizing: border-box; box-sizing: border-box;
} }
body {
overflow: hidden;
}
.disabel { .disabel {
border: none !important; border: none !important;
background-color: #ecedf1 !important; background-color: #ecedf1 !important;
......
src/components/Cascader.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-15 14:15:58 * @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-11-30 13:45:59 * @LastEditTime: 2021-12-09 15:57:53
* @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>
<el-tooltip
class="item"
effect="dark"
:content="valStr"
:disabled="disable"
placement="top-start"
:open-delay="1000"
>
<div :style="{ width: width + 'rem' }"> <div :style="{ width: width + 'rem' }">
<el-cascader <el-cascader
v-model="form[id]" v-model="form[id]"
...@@ -23,6 +31,7 @@ ...@@ -23,6 +31,7 @@
> >
</el-cascader> </el-cascader>
</div> </div>
</el-tooltip>
</template> </template>
<script> <script>
export default { export default {
...@@ -31,8 +40,28 @@ export default { ...@@ -31,8 +40,28 @@ export default {
options: [], options: [],
casVal: null, casVal: null,
placeholder: "请选择", placeholder: "请选择",
valStr: "",
valTempStr: "",
}; };
}, },
watch: {
form: {
handler(val) {
//保存选中的label
setTimeout(() => {
//获取提示的中文
this.valStr = $(this.$refs.cascader.$el).find("input").val();
//如果是单位，从后截图6位中文然后赋值
if (!this.codeName) {
this.valTempStr = this.getTemplateStr(this.valStr);
$(this.$refs.cascader.$el).find("input").val(this.valTempStr);
}
}, 0);
},
immediate: true,
deep: true,
},
},
props: { props: {
props: { props: {
type: Object, type: Object,
...@@ -56,13 +85,38 @@ export default { ...@@ -56,13 +85,38 @@ export default {
}, },
codeName: String, codeName: String,
}, },
computed: {
disable() {
if (this.valStr?.trim() == "" || this.form[this.id]?.trim() == "") {
return true;
} else {
return false;
}
},
},
methods: { methods: {
change(val) { change(val) {
let newVal = val; let newVal = val;
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;
}, },
getTemplateStr(str) {
let newStr;
let index = str.indexOf("[");
if (index >= 0) {
if (index > 6) {
newStr = "..." + str.slice(index - 6);
}
if (index <= 6) {
newStr = str;
}
} else {
newStr = "";
}
return newStr;
},
getTreeData(data) { getTreeData(data) {
if (data && data.length > 0) { if (data && data.length > 0) {
return data.map((item) => ({ return data.map((item) => ({
......
src/plugins/axios.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-08 17:13:56 * @LastEditTime: 2021-12-10 21:07:12
* @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
...@@ -65,6 +65,10 @@ _axios.interceptors.request.use( ...@@ -65,6 +65,10 @@ _axios.interceptors.request.use(
_axios.interceptors.response.use( _axios.interceptors.response.use(
function (response) { function (response) {
if (response.headers.token) localStorage.setItem("token", response.headers.token); if (response.headers.token) localStorage.setItem("token", response.headers.token);
if (response.config.loading !== false) {
hideLoading(response.config.loadingTarget);
// console.log(response.config.loadingTarget);
}
if (response.data.code == 401) { if (response.data.code == 401) {
if (resTimer) clearTimeout(resTimer) if (resTimer) clearTimeout(resTimer)
resTimer = setTimeout(() => { resTimer = setTimeout(() => {
...@@ -77,10 +81,7 @@ _axios.interceptors.response.use( ...@@ -77,10 +81,7 @@ _axios.interceptors.response.use(
}).catch(() => { }).catch(() => {
}); });
}, 500); }, 500);
} return;
if (response.config.loading !== false) {
hideLoading(response.config.loadingTarget);
// console.log(response.config.loadingTarget);
} }
// NProgress.done(); // NProgress.done();
return response; return response;
......
src/router/index.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-08 17:20:24 * @LastEditTime: 2021-12-10 16:41:15
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\router\index.js * @FilePath: \指纹系统\founder_vue\src\router\index.js
......
src/store/modules/loading.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-04 11:12:33 * @Date: 2021-11-04 11:12:33
* @LastEditTime: 2021-12-05 20:34:25 * @LastEditTime: 2021-12-09 10:08:11
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js * @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
*/ */
import { SET_LOADING, SET_JUMPROUTE, SET_PREROUTE, SET_WILLROUTE, SET_SMALLLOADING, SET_LOADINGSD } from "./mutations-types"; import { SET_LOADING, SET_JUMPROUTE, SET_PREROUTE, SET_WILLROUTE, SET_SMALLLOADING, SET_LOADINGSD, SET_GLASS } from "./mutations-types";
const state = { const state = {
// 是否处于加载中 // 是否处于加载中
loading: false, loading: false,
...@@ -18,28 +18,33 @@ const state = { ...@@ -18,28 +18,33 @@ const state = {
// 即将要跳转的路由 // 即将要跳转的路由
willRoute: '', willRoute: '',
// 手动路由加载 // 手动路由加载
loading_sd: false loading_sd: false,
//全局毛玻璃
groundGlassBoo: false,
}; };
const mutations = { const mutations = {
[SET_LOADING] (state, content) { [SET_LOADING](state, content) {
state.loading = content state.loading = content
}, },
[SET_JUMPROUTE] (state, content) { [SET_JUMPROUTE](state, content) {
state.jumproute = content state.jumproute = content
}, },
[SET_PREROUTE] (state, content) { [SET_PREROUTE](state, content) {
state.preRoute = content state.preRoute = content
}, },
[SET_WILLROUTE] (state, content) { [SET_WILLROUTE](state, content) {
state.willRoute = content state.willRoute = content
}, },
[SET_SMALLLOADING] (state, content) { [SET_SMALLLOADING](state, content) {
state.smallLoading = content state.smallLoading = content
}, },
[SET_LOADINGSD] (state, content) { [SET_LOADINGSD](state, content) {
state.loading_sd = content state.loading_sd = content
}, },
[SET_GLASS](state, content) {
state.groundGlassBoo = content
},
}; };
const actions = { const actions = {
......
src/store/modules/mutations-types.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-04 13:14:49 * @Date: 2021-11-04 13:14:49
* @LastEditTime: 2021-12-06 11:46:37 * @LastEditTime: 2021-12-09 10:07:50
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js * @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
...@@ -43,3 +43,5 @@ export const SET_LOADINGSD = 'setLoadingSd' ...@@ -43,3 +43,5 @@ export const SET_LOADINGSD = 'setLoadingSd'
// 是否切换到了人像 // 是否切换到了人像
export const SET_ISFACE = 'setIsFace' export const SET_ISFACE = 'setIsFace'
// 记录全局毛玻璃是否开启
export const SET_GLASS = 'setGlass'
src/utils/requestLoading.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-26 16:37:59 * @Date: 2021-11-26 16:37:59
* @LastEditTime: 2021-12-07 20:15:55 * @LastEditTime: 2021-12-09 17:10:50
* @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\utils\requestLoading.js * @FilePath: \founder_vue\src\utils\requestLoading.js
......
src/views/Home.vue
...@@ -4,19 +4,47 @@ ...@@ -4,19 +4,47 @@
<el-container class="layout-container"> <el-container class="layout-container">
<transition name="slide"> <transition name="slide">
<el-aside :width="isCollapse ? '4rem' : '17.5rem'" class="aside"> <el-aside :width="isCollapse ? '4rem' : '17.5rem'" class="aside">
<div class="logo" :class="{ minLogo: isCollapse }" @click="$router.push('/index')"> <div
class="logo"
:class="{ minLogo: isCollapse }"
@click="$router.push('/index')"
>
<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" src="../assets/img/Home/title.png" alt="" /> <img
v-show="!isCollapse"
class="title"
src="../assets/img/Home/title.png"
alt=""
/>
</div> </div>
<!-- <div class="search"> <!-- <div class="search">
<el-input v-if="!isCollapse" @keyup.enter.native="goSearch()" class="searchTxt" prefix-icon="el-icon-search" v-model="searchTxt" placeholder="搜索"></el-input> <el-input v-if="!isCollapse" @keyup.enter.native="goSearch()" class="searchTxt" prefix-icon="el-icon-search" v-model="searchTxt" placeholder="搜索"></el-input>
<i class="search-icon el-icon-search" v-else></i> <i class="search-icon el-icon-search" v-else></i>
</div> --> </div> -->
<el-menu :collapse-transition="false" ref="menu" :default-active="menuActive" text-color="#CCCCCC" active-text-color="#ffffff" background-color="#1F2D45" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" :collapse="isCollapse" @select="selectPath"> <el-menu
:collapse-transition="false"
ref="menu"
:default-active="menuActive"
text-color="#CCCCCC"
active-text-color="#ffffff"
background-color="#1F2D45"
class="el-menu-vertical-demo"
@open="handleOpen"
@close="handleClose"
:collapse="isCollapse"
@select="selectPath"
>
<div v-for="(menu, i) in routes" :key="i"> <div v-for="(menu, i) in routes" :key="i">
<el-submenu :index="menu.name" v-if="menu.children && !menu.hidden"> <el-submenu
:index="menu.name"
v-if="menu.children && !menu.hidden"
>
<template slot="title"> <template slot="title">
<img v-if="$route.path != menu.path" :src="menu.icon_d" alt="" /> <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> <span v-show="!isCollapse">{{ menu.meta.title }}</span>
</template> </template>
...@@ -26,15 +54,26 @@ ...@@ -26,15 +54,26 @@
}}</el-menu-item> }}</el-menu-item>
</div> </div>
</el-submenu> </el-submenu>
<el-menu-item :index="menu.name" v-else-if="!menu.children && !menu.hidden"> <el-menu-item
<img v-if="$route.path != menu.path" :src="menu.icon_d" alt="" /> :index="menu.name"
v-else-if="!menu.children && !menu.hidden"
>
<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 slot="title">{{ menu.meta.title }}</span> <span slot="title">{{ menu.meta.title }}</span>
</el-menu-item> </el-menu-item>
</div> </div>
</el-menu> </el-menu>
<div class="fz"> <div class="fz">
<img v-if="!isCollapse" src="../assets/img/Home/logo.png" alt="" /> <img
v-if="!isCollapse"
src="../assets/img/Home/logo.png"
alt=""
/>
<img v-else src="../assets/img/Home/fang.png" alt="" /> <img v-else src="../assets/img/Home/fang.png" alt="" />
</div> </div>
</el-aside> </el-aside>
...@@ -54,15 +93,35 @@ ...@@ -54,15 +93,35 @@
</div> </div>
<div class="quit" @click="$router.push('/index')"></div> <div class="quit" @click="$router.push('/index')"></div>
<div class="logout" @click="logout"> <div class="logout" @click="logout">
<svg-icon v-show="!isHoverLogout" icon-class="logout_d" class="icon" @mouseover="isHoverLogout = true" @mouseleave="isHoverLogout = false" /> <svg-icon
<svg-icon v-show="isHoverLogout" icon-class="logout_a" class="icon" /> v-show="!isHoverLogout"
icon-class="logout_d"
class="icon"
@mouseover="isHoverLogout = true"
@mouseleave="isHoverLogout = false"
/>
<svg-icon
v-show="isHoverLogout"
icon-class="logout_a"
class="icon"
/>
</div> </div>
</div> </div>
</el-header> </el-header>
<el-main class="main"> <el-main class="main">
<div class="contain"> <div class="contain">
<el-tabs :closable="paths.length > 1" v-model="routePath" @tab-click="handleClick" @tab-remove="tabRemove"> <el-tabs
<el-tab-pane :label="item.name" :name="item.routeName" v-for="item in paths" :key="item.routeName"></el-tab-pane> :closable="paths.length > 1"
v-model="routePath"
@tab-click="handleClick"
@tab-remove="tabRemove"
>
<el-tab-pane
:label="item.name"
:name="item.routeName"
v-for="item in paths"
:key="item.routeName"
></el-tab-pane>
</el-tabs> </el-tabs>
<div class="breadcrumb"></div> <div class="breadcrumb"></div>
<!-- 路由出口 --> <!-- 路由出口 -->
...@@ -81,7 +140,15 @@ ...@@ -81,7 +140,15 @@
<button @click="toAllPersonnelBase">全部人员库</button> --> <button @click="toAllPersonnelBase">全部人员库</button> -->
</div> </div>
<el-dialog class="jump-route" append-to-body :modal="false" @close="cancelJumpRoute" :visible.sync="jumpRouteDialogVisible" width="27.625rem" :before-close="handleClose"> <el-dialog
class="jump-route"
append-to-body
:modal="false"
@close="cancelJumpRoute"
:visible.sync="jumpRouteDialogVisible"
width="27.625rem"
:before-close="handleClose"
>
<span>当前页面有未保存的指位特征，是否确认跳转路由？</span> <span>当前页面有未保存的指位特征，是否确认跳转路由？</span>
<div class="dialog-footer"> <div class="dialog-footer">
<button class="confirm-btn" @click="confirmJumpRoute">确 定</button> <button class="confirm-btn" @click="confirmJumpRoute">确 定</button>
...@@ -111,8 +178,12 @@ ...@@ -111,8 +178,12 @@
<!-- 人像 --> <!-- 人像 -->
<transition name="el-fade-in-linear"> <transition name="el-fade-in-linear">
<div class="face-big" v-show="enLargeFace"> <div class="face-big" v-show="enLargeFace">
<div class="face-name">{{rxInfoEnlarge.name}}</div> <div class="face-name">{{ rxInfoEnlarge.name }}</div>
<img class="face-img" :src="'data:image/jpeg;base64,'+rxInfoEnlarge.image" alt=""> <img
class="face-img"
:src="'data:image/jpeg;base64,' + rxInfoEnlarge.image"
alt=""
/>
</div> </div>
</transition> </transition>
</div> </div>
...@@ -126,7 +197,7 @@ import indexRoutes from "@/router/modules/index"; ...@@ -126,7 +197,7 @@ import indexRoutes from "@/router/modules/index";
import { mapGetters, mapState } from "vuex"; import { mapGetters, mapState } from "vuex";
export default { export default {
name: "Home", name: "Home",
data () { data() {
return { return {
searchTxt: "", searchTxt: "",
routes: this.$store.getters["layout/leftMenuData"], routes: this.$store.getters["layout/leftMenuData"],
...@@ -146,12 +217,12 @@ export default { ...@@ -146,12 +217,12 @@ export default {
// 路由跳转的方式----- 1.面包屑切换。2.面包屑删除当前。3.左侧菜单跳转 // 路由跳转的方式----- 1.面包屑切换。2.面包屑删除当前。3.左侧菜单跳转
routeChangeType: "change", routeChangeType: "change",
// 人像信息 // 人像信息
rxInfoEnlarge: {} rxInfoEnlarge: {},
}; };
}, },
mounted () { mounted() {
console.log(this.loading_sd); console.log(this.loading_sd);
this.$store.commit('loading/setLoadingSd', false) this.$store.commit("loading/setLoadingSd", false);
let self = this; let self = this;
this.menuActive = this.$route.name; this.menuActive = this.$route.name;
...@@ -159,29 +230,30 @@ export default { ...@@ -159,29 +230,30 @@ export default {
this.$bus.on("isBlur", (isBlur) => { this.$bus.on("isBlur", (isBlur) => {
if (isBlur) { if (isBlur) {
self.isCropper = true; self.isCropper = true;
self.$store.commit("loading/setGlass", true);
} else { } else {
self.isCropper = false; self.isCropper = false;
self.$store.commit("loading/setGlass", false);
} }
}); });
// 初始化人像是否放大 // 初始化人像是否放大
self.$store.commit('ryzwbj/setEnlargeFace', false) self.$store.commit("ryzwbj/setEnlargeFace", false);
document.querySelector('.shadow').addEventListener('click', function(e) { document.querySelector(".shadow").addEventListener("click", function (e) {
// 如果图像是处于放大状态 // 如果图像是处于放大状态
if(self.enLargeFace) { if (self.enLargeFace) {
self.isCropper = false self.isCropper = false;
self.$store.commit('ryzwbj/setEnlargeFace', false) self.$store.commit("ryzwbj/setEnlargeFace", false);
} }
}) });
// 获取放大的人像信息 // 获取放大的人像信息
this.$bus.on('setRxInfoEnlarge', (rxInfoEnlarge) => { this.$bus.on("setRxInfoEnlarge", (rxInfoEnlarge) => {
console.log(11111111111); console.log(11111111111);
self.rxInfoEnlarge = rxInfoEnlarge self.rxInfoEnlarge = rxInfoEnlarge;
}) });
}, },
updated () { updated() {
this.menuActive = this.$route.name; this.menuActive = this.$route.name;
}, },
computed: { computed: {
...@@ -195,7 +267,7 @@ export default { ...@@ -195,7 +267,7 @@ export default {
enLargeFace: (state) => state.ryzwbj.enLargeFace, enLargeFace: (state) => state.ryzwbj.enLargeFace,
loading_sd: (state) => state.loading.loading_sd, loading_sd: (state) => state.loading.loading_sd,
}), }),
cachePageName () { cachePageName() {
return this.$store.state.layout.cachePageName; return this.$store.state.layout.cachePageName;
}, },
}, },
...@@ -206,9 +278,9 @@ export default { ...@@ -206,9 +278,9 @@ export default {
* @return {*} * @return {*}
*/ */
logout () { logout() {
this.$axios this.$axios
.get("/login/login/logout") .get("/security/logout")
.then((res) => { .then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。 localStorage.removeItem("token"); //删除名称为“token”的信息。
...@@ -217,7 +289,7 @@ export default { ...@@ -217,7 +289,7 @@ export default {
this.$message.info("退出成功！"); this.$message.info("退出成功！");
} }
}) })
.catch((err) => { }); .catch((err) => {});
}, },
/** /**
* @description: 开始搜索 * @description: 开始搜索
...@@ -225,11 +297,11 @@ export default { ...@@ -225,11 +297,11 @@ export default {
* @return {*} * @return {*}
*/ */
goSearch () { goSearch() {
this.searchTxt = ""; this.searchTxt = "";
//console.log(this.searchTxt); //console.log(this.searchTxt);
}, },
handleClick ({ name }) { handleClick({ name }) {
if ( if (
(this.$route.name === "ryzwbj" || this.$route.name === "ajzwbj") && (this.$route.name === "ryzwbj" || this.$route.name === "ajzwbj") &&
!this.jumproute !this.jumproute
...@@ -261,7 +333,7 @@ export default { ...@@ -261,7 +333,7 @@ export default {
/** /**
* 确认需要跳转路由 * 确认需要跳转路由
*/ */
confirmJumpRoute () { confirmJumpRoute() {
this.isCropper = false; this.isCropper = false;
this.jumpRouteDialogVisible = false; this.jumpRouteDialogVisible = false;
if (this.routeChangeType === "change") { if (this.routeChangeType === "change") {
...@@ -306,13 +378,13 @@ export default { ...@@ -306,13 +378,13 @@ export default {
/** /**
* 取消跳转路由 * 取消跳转路由
*/ */
cancelJumpRoute () { cancelJumpRoute() {
this.jumpRouteDialogVisible = false; this.jumpRouteDialogVisible = false;
this.isCropper = false; this.isCropper = false;
this.routePath = this.$route.name; this.routePath = this.$route.name;
this.menuActive = ""; this.menuActive = "";
}, },
tabRemove (name) { tabRemove(name) {
if (name != "ryzwbj" && name != "ajzwbj") { if (name != "ryzwbj" && name != "ajzwbj") {
let routerObj = this.paths.find((i) => i.routeName == name); let routerObj = this.paths.find((i) => i.routeName == name);
if (routerObj) { if (routerObj) {
...@@ -379,7 +451,7 @@ export default { ...@@ -379,7 +451,7 @@ export default {
} }
} }
}, },
setKeepAlive () { setKeepAlive() {
let cachePageName; let cachePageName;
if (JSON.parse(sessionStorage.getItem("crumbs")).length > 0) { if (JSON.parse(sessionStorage.getItem("crumbs")).length > 0) {
cachePageName = JSON.parse(sessionStorage.getItem("crumbs")) cachePageName = JSON.parse(sessionStorage.getItem("crumbs"))
...@@ -398,7 +470,7 @@ export default { ...@@ -398,7 +470,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
goManager () { goManager() {
this.$router.push("/Home/htzwcj"); this.$router.push("/Home/htzwcj");
this.menuActive = ""; this.menuActive = "";
}, },
...@@ -408,7 +480,7 @@ export default { ...@@ -408,7 +480,7 @@ export default {
* @param {*} path * @param {*} path
* @return {*} * @return {*}
*/ */
selectPath (index, path) { selectPath(index, path) {
console.log(index); console.log(index);
console.log(path); console.log(path);
if ( if (
...@@ -429,7 +501,7 @@ export default { ...@@ -429,7 +501,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
closePaths (pathName) { closePaths(pathName) {
let res = this.paths.filter((item) => { let res = this.paths.filter((item) => {
return item.name != pathName; return item.name != pathName;
}); });
...@@ -445,7 +517,7 @@ export default { ...@@ -445,7 +517,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRouter (route) { changeRouter(route) {
this.$router.push(route.path); this.$router.push(route.path);
this.menuActive = route.routeName; this.menuActive = route.routeName;
}, },
...@@ -454,32 +526,28 @@ export default { ...@@ -454,32 +526,28 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
switchCollapse () { switchCollapse() {
this.isCollapse = !this.isCollapse; this.isCollapse = !this.isCollapse;
}, },
handleOpen (key, keyPath) { handleOpen(key, keyPath) {
//console.log(key, keyPath); //console.log(key, keyPath);
}, },
handleClose (key, keyPath) { handleClose(key, keyPath) {
//console.log(key, keyPath); //console.log(key, keyPath);
}, },
}, },
beforeDestroy () { beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题 //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
}, },
watch: { watch: {
loading_sd (newValue, oldValue) { loading_sd(newValue, oldValue) {
console.log(newValue); console.log(newValue);
}, },
enLargeFace (newValue, oldValue) { enLargeFace(newValue, oldValue) {},
}, menuActive(newValue, oldValue) {},
menuActive (newValue, oldValue) { loading(newValue, oldValue) {},
},
loading (newValue, oldValue) {
},
$route: { $route: {
handler (newValue, oldValue) { handler(newValue, oldValue) {
// console.log(oldValue); // console.log(oldValue);
// 如果是人员指纹编辑界面或者是案件指纹编辑界面，进行判断是否跳转 // 如果是人员指纹编辑界面或者是案件指纹编辑界面，进行判断是否跳转
// if(oldValue.name === 'ryzwbj' || oldValue.name === 'ajzwbj') { // if(oldValue.name === 'ryzwbj' || oldValue.name === 'ajzwbj') {
...@@ -517,7 +585,7 @@ export default { ...@@ -517,7 +585,7 @@ export default {
immediate: true, immediate: true,
}, },
}, },
created () { created() {
this.paths = sessionStorage.getItem("crumbs") this.paths = sessionStorage.getItem("crumbs")
? JSON.parse(sessionStorage.getItem("crumbs")) ? JSON.parse(sessionStorage.getItem("crumbs"))
: []; : [];
...@@ -547,7 +615,7 @@ export default { ...@@ -547,7 +615,7 @@ export default {
height: 722px; height: 722px;
box-shadow: 0px 14px 30px 2px rgba(0, 21, 51, 0.16); box-shadow: 0px 14px 30px 2px rgba(0, 21, 51, 0.16);
border-radius: 8px; border-radius: 8px;
border: 1px solid #CCCCCC; border: 1px solid #cccccc;
background: #ffffff; background: #ffffff;
} }
} }
...@@ -579,7 +647,7 @@ export default { ...@@ -579,7 +647,7 @@ export default {
} }
.el-dialog { .el-dialog {
height: 169px; height: 169px;
background: #FFFFFF; background: #ffffff;
box-shadow: 0px 18px 28px 10px rgba(0, 21, 51, 0.08) !important; box-shadow: 0px 18px 28px 10px rgba(0, 21, 51, 0.08) !important;
border-radius: 6px; border-radius: 6px;
.confirm-btn { .confirm-btn {
...@@ -587,19 +655,19 @@ export default { ...@@ -587,19 +655,19 @@ export default {
outline: none; outline: none;
width: 72px; width: 72px;
height: 40px; height: 40px;
background: #FFFFFF; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #AEB5C2; border: 1px solid #aeb5c2;
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #2E3846; color: #2e3846;
&:hover { &:hover {
border: 1px solid #377FEC; border: 1px solid #377fec;
color: #377FEC; color: #377fec;
} }
&:active { &:active {
border: 1px solid #044CB9; border: 1px solid #044cb9;
color: #044CB9; color: #044cb9;
} }
} }
.cancel-btn { .cancel-btn {
...@@ -607,12 +675,12 @@ export default { ...@@ -607,12 +675,12 @@ export default {
outline: none; outline: none;
width: 72px; width: 72px;
height: 40px; height: 40px;
background: #055FE7; background: #055fe7;
border: 1px solid #055FE7; border: 1px solid #055fe7;
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #FFFFFF; color: #ffffff;
&:hover { &:hover {
background: #377fec; background: #377fec;
border: 1px solid #377fec; border: 1px solid #377fec;
......
src/views/Home/Home.vue
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
}, },
logout() { logout() {
this.$axios this.$axios
.get("/login/login/logout") .get("/security/logout")
.then((res) => { .then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。 localStorage.removeItem("token"); //删除名称为“token”的信息。
...@@ -158,7 +158,7 @@ export default { ...@@ -158,7 +158,7 @@ export default {
}, },
created() { created() {
sessionStorage.setItem("crumbs", []); sessionStorage.setItem("crumbs", []);
this.userInfo = JSON.parse(localStorage.getItem("userInfo")).user; this.userInfo = JSON.parse(localStorage.getItem("userInfo"));
console.log(this.userInfo); console.log(this.userInfo);
}, },
}; };
......
src/views/SystemManage/GroupManage.vue
...@@ -1333,6 +1333,7 @@ export default { ...@@ -1333,6 +1333,7 @@ export default {
}, },
activated() { activated() {
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return
this.search(); this.search();
}); });
}, },
...@@ -1345,9 +1346,9 @@ export default { ...@@ -1345,9 +1346,9 @@ export default {
mounted() { mounted() {
this.search(); this.search();
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return
this.search(); this.search();
}); });
debugger;
this.$nextTick(() => { this.$nextTick(() => {
document.body.appendChild(this.$refs.isShowEditGroupDialog); document.body.appendChild(this.$refs.isShowEditGroupDialog);
document.body.appendChild(this.$refs.isShowAddUserDialog); document.body.appendChild(this.$refs.isShowAddUserDialog);
......
src/views/SystemManage/GroupPermission.vue
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
import "@/icons/group-item.svg"; import "@/icons/group-item.svg";
import qs from "qs"; import qs from "qs";
export default { export default {
name: "UserPermission", // name: "UserPermission",
data() { data() {
return { return {
id: "", id: "",
......
src/views/SystemManage/PermissionManage.vue
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
ref="multipleTable" ref="multipleTable"
:data="groupTableData" :data="groupTableData"
:key="key2" :key="key2"
class="table" class="table groupTable"
> >
<el-table-column <el-table-column
prop="name" prop="name"
...@@ -969,6 +969,7 @@ export default { ...@@ -969,6 +969,7 @@ export default {
}, },
activated() { activated() {
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return
if (this.isUser) { if (this.isUser) {
this.searchUser(); this.searchUser();
} else { } else {
...@@ -984,6 +985,7 @@ export default { ...@@ -984,6 +985,7 @@ export default {
}, },
mounted() { mounted() {
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return
if (this.isUser) { if (this.isUser) {
this.searchUser(); this.searchUser();
} else { } else {
...@@ -1009,6 +1011,9 @@ export default { ...@@ -1009,6 +1011,9 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
@import "scss/group"; @import "scss/group";
@import "scss/permission"; @import "scss/permission";
.groupTable{
height: 550px!important;
}
.el-table /deep/ { .el-table /deep/ {
.el-tooltip { .el-tooltip {
width: 100% !important; width: 100% !important;
......
src/views/SystemManage/RoleManage.vue
...@@ -491,7 +491,7 @@ export default { ...@@ -491,7 +491,7 @@ export default {
if (item) { if (item) {
let id = this.diyRoleList.length + 20 + "copy"; let id = this.diyRoleList.length + 20 + "copy";
var roleitem = { var roleitem = {
name: item.name + "_copy", name: "请输入名称",
value: "", value: "",
flag: false, flag: false,
code: this.diyRoleList.length, code: this.diyRoleList.length,
...@@ -520,11 +520,14 @@ export default { ...@@ -520,11 +520,14 @@ export default {
// 保存 // 保存
save() { save() {
let self = this; let self = this;
//如果是添加角色
if (this.customAddUser.length > 0) { if (this.customAddUser.length > 0) {
//如果选的用户不是添加的用户
if (this.diyRoleItemIndex !== this.customAddUser[0].id) { if (this.diyRoleItemIndex !== this.customAddUser[0].id) {
let userObj = this.diyRoleList.find( let userObj = this.diyRoleList.find(
(i) => i.id == this.diyRoleItemIndex (i) => i.id == this.diyRoleItemIndex
); );
debugger;
//修改 //修改
let obj = { let obj = {
id: this.diyRoleItemIndex, id: this.diyRoleItemIndex,
...@@ -535,7 +538,7 @@ export default { ...@@ -535,7 +538,7 @@ export default {
return; return;
} }
console.log(this.customAddUser); console.log(this.customAddUser);
//如果位置在新增的用户就新增
let name = this.customAddUser[0].value; let name = this.customAddUser[0].value;
let checkArr = this.checkList; let checkArr = this.checkList;
let params = { let params = {
...@@ -571,12 +574,12 @@ export default { ...@@ -571,12 +574,12 @@ export default {
}, 800); }, 800);
} else { } else {
setTimeout(() => { setTimeout(() => {
this.$message.success("新增角色失败!"); this.$message.error(res.data.detail);
}, 800); }, 800);
} }
}); });
} else { } else {
//修改 //修改角色
let userObj = this.diyRoleList.find( let userObj = this.diyRoleList.find(
(i) => i.id == this.diyRoleItemIndex (i) => i.id == this.diyRoleItemIndex
); );
...@@ -589,6 +592,7 @@ export default { ...@@ -589,6 +592,7 @@ export default {
this.editUserRole(obj); this.editUserRole(obj);
} }
}, },
//选中主的全选子的，取消主的取消全部子的
handleCheckAllChange(boo, id) { handleCheckAllChange(boo, id) {
let obj = this.permissionDataList.find((i) => i.id == id); let obj = this.permissionDataList.find((i) => i.id == id);
let sonArr = obj.children.map((i) => i.id); let sonArr = obj.children.map((i) => i.id);
...@@ -619,12 +623,15 @@ export default { ...@@ -619,12 +623,15 @@ export default {
this.checkList = []; this.checkList = [];
} }
} }
//分开button，重构数据
this.defaultRoleBtns = result.filter((i) => i.defaultFlag == 1); this.defaultRoleBtns = result.filter((i) => i.defaultFlag == 1);
this.diyRoleList = result.filter((i) => { this.diyRoleList = JSON.parse(JSON.stringify(result)).filter(
(i) => {
i.value = i.name; i.value = i.name;
i.name = "请输入名称";
return i.defaultFlag == 0; return i.defaultFlag == 0;
}); }
);
//console.log(1111111, this.diyRoleList); //console.log(1111111, this.diyRoleList);
let arr = [...this.diyRoleList, ...this.defaultRoleBtns]; let arr = [...this.diyRoleList, ...this.defaultRoleBtns];
let obj = arr.find((i) => i.id == this.diyRoleItemIndex); let obj = arr.find((i) => i.id == this.diyRoleItemIndex);
...@@ -644,6 +651,13 @@ export default { ...@@ -644,6 +651,13 @@ export default {
this.$message.error("请选择角色后操作"); this.$message.error("请选择角色后操作");
return; return;
} }
if (
this.customAddUser.length > 0 &&
this.btnCheckList.includes(this.customAddUser[0].id)
) {
this.$message.error("请保存后进行删除操作");
return;
}
let ids = this.btnCheckList.join(","); let ids = this.btnCheckList.join(",");
let boo = this.btnCheckList.find((i) => i == this.diyRoleItemIndex); let boo = this.btnCheckList.find((i) => i == this.diyRoleItemIndex);
let loading = this.$loading({ let loading = this.$loading({
...@@ -688,7 +702,7 @@ export default { ...@@ -688,7 +702,7 @@ export default {
let id = this.diyRoleList.length + 20 + "l"; let id = this.diyRoleList.length + 20 + "l";
var roleitem = { var roleitem = {
value: "", value: "",
name: "自定义" + (this.diyRoleList.length + 1), name: "请输入名称",
flag: false, flag: false,
code: this.diyRoleList.length, code: this.diyRoleList.length,
edit: true, edit: true,
...@@ -748,6 +762,10 @@ export default { ...@@ -748,6 +762,10 @@ export default {
this.$message.success("更新成功"); this.$message.success("更新成功");
}, 500); }, 500);
this.resetEdit(); this.resetEdit();
} else {
setTimeout(() => {
this.$message.error(res.data.detail);
}, 500);
} }
}); });
}, },
...@@ -761,6 +779,7 @@ export default { ...@@ -761,6 +779,7 @@ export default {
this.viewSelect(item); this.viewSelect(item);
this.diyRoleItemIndex = item.id; this.diyRoleItemIndex = item.id;
}, },
// 选中的权限
viewSelect(item) { viewSelect(item) {
this.checkList = this.checkList =
(item.permissions && item.permissions.map((i) => i.id)) || []; (item.permissions && item.permissions.map((i) => i.id)) || [];
...@@ -774,7 +793,7 @@ export default { ...@@ -774,7 +793,7 @@ export default {
this.diyRoleItemIndex = item.id; this.diyRoleItemIndex = item.id;
this.viewSelect(item); this.viewSelect(item);
}, },
// 编辑 // 编辑以后出现输入框的一系列细节
editDiyRoleItem(item) { editDiyRoleItem(item) {
let edit = item.edit; let edit = item.edit;
let index = this.diyRoleList.findIndex((i) => i.id == item.id); let index = this.diyRoleList.findIndex((i) => i.id == item.id);
......
src/views/SystemManage/UserManage.vue
...@@ -1118,6 +1118,7 @@ export default { ...@@ -1118,6 +1118,7 @@ export default {
}, },
activated() { activated() {
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return;
this.search(); this.search();
}); });
}, },
...@@ -1130,6 +1131,7 @@ export default { ...@@ -1130,6 +1131,7 @@ export default {
mounted() { mounted() {
this.search(); this.search();
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return;
this.search(); this.search();
}); });
this.$nextTick(() => { this.$nextTick(() => {
......
src/views/SystemManage/UserPermission.vue
...@@ -412,7 +412,7 @@ ...@@ -412,7 +412,7 @@
<script> <script>
export default { export default {
name: "UserPermission", // name: "UserPermission",
data() { data() {
return { return {
id: "", id: "",
......
src/views/SystemManage/scss/group.scss
...@@ -223,9 +223,12 @@ ...@@ -223,9 +223,12 @@
} }
} }
.table-data { .table-data /deep/{
height: 580px; height: 530px;
width: 100%; width: 100%;
.el-table {
height: 510px!important;
}
.tagsBox { .tagsBox {
display: flex; display: flex;
.el-tooltip { .el-tooltip {
...@@ -329,6 +332,7 @@ ...@@ -329,6 +332,7 @@
} }
} }
.el-table /deep/ { .el-table /deep/ {
.is-checked { .is-checked {
.el-checkbox__inner { .el-checkbox__inner {
background: #055fe7; background: #055fe7;
......
src/views/SystemManage/scss/user.scss
...@@ -181,9 +181,12 @@ ...@@ -181,9 +181,12 @@
} }
} }
} }
.table-data { .table-data /deep/ {
height: 580px; height: 530px;
width: 100%; width: 100%;
.el-table {
height: 510px !important;
}
.tagsBox { .tagsBox {
display: flex; display: flex;
.el-tooltip { .el-tooltip {
......
src/views/cxyrd/LL.vue
...@@ -13,6 +13,11 @@ ...@@ -13,6 +13,11 @@
<div class="lt_main_left"> <div class="lt_main_left">
<LLSrc <LLSrc
:src-data="qid" :src-data="qid"
@sourceObj="
(val) => {
sourceObj = val;
}
"
@switchName=" @switchName="
(val) => { (val) => {
fingerShowType = val; fingerShowType = val;
...@@ -27,7 +32,14 @@ ...@@ -27,7 +32,14 @@
<ImageEd></ImageEd> <ImageEd></ImageEd>
</div> </div>
<div class="lt_main_right"> <div class="lt_main_right">
<LLCandidate :fingerShowType="fingerShowType"></LLCandidate> <LLCandidate
:fingerShowType="fingerShowType"
@targetObj="
(val) => {
targetObj = val;
}
"
></LLCandidate>
</div> </div>
</div> </div>
</div> </div>
...@@ -59,7 +71,7 @@ ...@@ -59,7 +71,7 @@
串查 串查
</div> </div>
</div> </div>
<div class="bzitem"> <div class="bzitem" style="visibility: hidden">
<div class="bzname">现场勘验编号：</div> <div class="bzname">现场勘验编号：</div>
<div class="bzvalue">{{ xckybh }}</div> <div class="bzvalue">{{ xckybh }}</div>
</div> </div>
...@@ -115,30 +127,31 @@ ...@@ -115,30 +127,31 @@
<div class="bz-target"> <div class="bz-target">
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中单位：</div> <div class="bzname">比中单位：</div>
<div class="bzvalue">{{ bzdw }}</div> <div class="bzvalue">{{ bzr.unitName }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人：</div> <div class="bzname">比中人：</div>
<div class="bzvalue">{{ bzr }}</div> <div class="bzvalue">{{ bzr.name }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">单位代码：</div> <div class="bzname">单位代码：</div>
<div class="bzvalue">{{ dwdm }}</div> <div class="bzvalue">{{ bzr.unitCode }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人身份证号：</div> <div class="bzname">比中人身份证号：</div>
<div class="bzvalue">{{ bzrsfzh }}</div> <div class="bzvalue">{{ bzr.idCard }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中时间：</div> <div class="bzname">比中时间：</div>
<div class="bzvalue">{{ bzsj }}</div> <div class="bzvalue">{{ bzr.bzTime }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人联系电话：</div> <div class="bzname">比中人联系电话：</div>
<el-input <el-input
class="bzphone" class="bzphone"
v-model="phone" v-model="bzr.phoneNumber"
placeholder="请输入内容" placeholder="请输入内容"
disabled
></el-input> ></el-input>
<div class="input-error" v-show="isPhoneError"> <div class="input-error" v-show="isPhoneError">
<!-- <img src="@/assets/img/inputerror.png" alt=""> --> <!-- <img src="@/assets/img/inputerror.png" alt=""> -->
...@@ -233,10 +246,23 @@ export default { ...@@ -233,10 +246,23 @@ export default {
xckybh: "", xckybh: "",
rybh: "", rybh: "",
zw: "", zw: "",
//比中人信息
bzr: {
bzTime: "",
idCard: "",
phoneNumber: "",
name: "",
unitCode: "",
unitName: "",
},
// 是否展示认定完成确认框背景 // 是否展示认定完成确认框背景
isShowrdwcDialogBg: false, isShowrdwcDialogBg: false,
// 是否展示认定完成确认框 // 是否展示认定完成确认框
isShowrdwcDialog: false, isShowrdwcDialog: false,
//当前选中的源对象
sourceObj: {},
//当前选中的目标对象
targetObj: {},
}; };
}, },
created() { created() {
...@@ -336,27 +362,35 @@ export default { ...@@ -336,27 +362,35 @@ export default {
return; return;
} }
// 3：串查 // 3：串查
let querytype = 3; let queryType = "3";
this.$axios({ this.$axios({
method: "post", method: "post",
url: "/api/matchcand/affirm/hit", url: "/api/matchcand/affirm/hit",
data: { data: {
affirmstatus, srcseqno: parseInt(srcseqno),
srcseqno, destseqno: parseInt(destseqno),
destseqno,
srcbarcode, srcbarcode,
destbarcode, destbarcode,
qqid, qqid: parseInt(qqid),
qid, qid: parseInt(qid),
querytype, queryType,
affirmDescribe: self.textarea, affirmDescribe: self.textarea,
userName: self.bzr.name,
idCard: self.bzr.idCard,
tel: self.bzr.phoneNumber,
unit: self.bzr.unitName,
unitCode: self.bzr.unitCode,
affirmtime: new Date(self.bzr.bzTime),
}, },
}) })
.then((response) => { .then((response) => {
if(response.data.code == 0){
// 跟新列表数据 // 跟新列表数据
self.$bus.emit("updateFinderSource"); self.$bus.emit("updateFinderSource");
//console.log(response);
this.$message.success("比中成功！"); this.$message.success("比中成功！");
}else{
this.$message.error(response.data.message)
}
}) })
.catch((err) => { .catch((err) => {
this.$message.error("比中失败！"); this.$message.error("比中失败！");
...@@ -398,6 +432,7 @@ export default { ...@@ -398,6 +432,7 @@ export default {
"xh", "xh",
sessionStorage.getItem("destseqno") || "" sessionStorage.getItem("destseqno") || ""
); );
this.$set(this.bzr, "bzTime", result.time);
} }
}); });
}, },
...@@ -422,33 +457,9 @@ export default { ...@@ -422,33 +457,9 @@ export default {
} }
} }
this.$set(self.source, "xh", sessionStorage.getItem("zcseq") || ""); this.$set(self.source, "xh", sessionStorage.getItem("zcseq") || "");
this.$set(this.bzr, "bzTime", result.time);
} }
}); });
// this.$axios({
// method: "post",
// url: "/api/user/searchByUserid",
// data: {
// id: id,
// },
// loading: false,
// }).then(async (res) => {
// if (res.data.code == 0) {
// let data = res.data.ret[0];
// //console.log(data);
// let dw = await self.$axios({
// method: "get",
// url: "/api/code/unit/one/" + data.userunit,
// loading: false,
// });
// let time = new Date(data.updatetime);
// self.bzsj = Utils.timeStampTurnTime2(time);
// self.bzr = data.userdesc;
// self.dwdm = dw.data.ret.code;
// self.bzdw = dw.data.ret.name;
// self.bzrsfzh = data.idcard;
// self.phone = data.telephone;
// }
// });
}, },
/** /**
* @description: 比中 * @description: 比中
...@@ -456,12 +467,26 @@ export default { ...@@ -456,12 +467,26 @@ export default {
* @return {*} * @return {*}
*/ */
Bz() { Bz() {
if (
(this.targetObj.affirmstatus == 2 ||
this.targetObj.affirmstatus == 3) &&
(this.sourceObj.affirmstatus == 2 || this.sourceObj.affirmstatus == 3)
) {
this.$message.error("已经比中过的数据无法再次比中！");
return;
}
let params = JSON.parse(localStorage.getItem("userInfo"));
for (let key in this.bzr) {
this.bzr[key] = params[key];
}
this.getUserInfo(); this.getUserInfo();
this.getUserInfo2(); this.getUserInfo2();
this.asjbh = sessionStorage.getItem("srcbarcode"); this.asjbh = sessionStorage.getItem("srcbarcode");
this.xh = sessionStorage.getItem("srcseqno"); this.xh = sessionStorage.getItem("srcseqno");
this.rybh = sessionStorage.getItem("destbarcode"); this.rybh = sessionStorage.getItem("destbarcode");
this.judgeZw(Number(sessionStorage.getItem("destseqno"))); this.judgeZw(Number(sessionStorage.getItem("destseqno")));
this.isShowbzDialogBg = true; this.isShowbzDialogBg = true;
this.isShowbzDialog = true; this.isShowbzDialog = true;
}, },
......
src/views/cxyrd/QueryConfirm.vue
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
@change="selectUserInfo" @change="selectUserInfo"
> >
<el-option <el-option
v-for="item in userOption" v-for="(item,index) in userOption"
:key="item.userid" :key="index"
:label="item.userdesc" :label="item.userdesc"
:value="item.userid" :value="item.userid"
> >
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
</el-select> </el-select>
</div> </div>
<div class="display_style"> <div class="display_style">
<span>任务号/查询ID：</span> <span>查询ID：</span>
<el-input <el-input
class="el_input" class="el_input"
placeholder="请输入任务号/查询ID" placeholder="请输入查询ID"
v-model="reqParam.contrastCustomSearchReq.qqid" v-model="reqParam.contrastCustomSearchReq.qqid"
></el-input> ></el-input>
</div> </div>
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
:picker-options="{
disabledDate: disabledDate,
}"
> >
</el-date-picker> </el-date-picker>
</div> </div>
...@@ -624,6 +627,13 @@ export default { ...@@ -624,6 +627,13 @@ export default {
}, },
}, },
methods: { methods: {
disabledDate(a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
// 获取认定列表 // 获取认定列表
search() { search() {
this.getParam(); this.getParam();
...@@ -637,7 +647,7 @@ export default { ...@@ -637,7 +647,7 @@ export default {
this.list = response.data.ret.list; this.list = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total; this.reqParam.page.total = response.data.ret.total;
//console.info("查询结果===>", this.list); //console.info("查询结果===>", this.list);
this.userInfo = this.getUserInfo(this.list); // this.userInfo = this.getUserInfo(this.list);
} else { } else {
// 请求成功无返回值 // 请求成功无返回值
this.list = []; this.list = [];
...@@ -688,7 +698,7 @@ export default { ...@@ -688,7 +698,7 @@ export default {
}); });
} }
}); });
this.userOption = this.unique(userInfo); // this.userOption = this.unique(userInfo);
// //console.info("用户信息==>", this.userOption); // //console.info("用户信息==>", this.userOption);
}, },
// 用户信息去重 // 用户信息去重
......
src/views/cxyrd/TT.vue
<template> <template>
<div style="width: 100%"> <div style="width: 100%">
<div :class="{ bzActive: isShowbzDialogBg, tt: true }"> <div :class="{ bzActive: isShowbzDialogBg || loading_sd, tt: true }">
<div class="header"> <div class="header">
<div class="label">查重</div> <div class="label">查重</div>
<div class="btns"> <div class="btns">
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<div <div
class="del" class="del"
slot-scope="scope" slot-scope="scope"
v-if="targetDel && destbarcode == scope.row.destbarcode" v-if="scope.row.removeFlag == '1'"
> >
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
</div> </div>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<div <div
class="del" class="del"
slot-scope="scope" slot-scope="scope"
v-if="targetDel && destbarcode == scope.row.destbarcode" v-if="scope.row.removeFlag == '1'"
> >
{{ scope.row.score }} {{ scope.row.score }}
</div> </div>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<div <div
class="del" class="del"
slot-scope="scope" slot-scope="scope"
v-if="targetDel && destbarcode == scope.row.destbarcode" v-if="scope.row.removeFlag == '1'"
> >
{{ scope.row.destbarcode }} {{ scope.row.destbarcode }}
</div> </div>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<p> <p>
<img src="@/assets/img/TT/delTime.png" alt="" /> <img src="@/assets/img/TT/delTime.png" alt="" />
<span>删除时间</span> <span>删除时间</span>
<span>2012.12.24 12:39:45</span> <span>{{ targetDelText }}</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -666,6 +666,17 @@ ...@@ -666,6 +666,17 @@
/> />
</div> </div>
</div> </div>
<!-- 加载动画 -->
<div class="loading" v-show="loading_sd">
<div class="loading-finger">
<img src="@/assets/img/loadingfinger.gif" alt="" />
</div>
<div class="loading-name">
<img src="@/assets/img/loadingtxt.gif" alt="" />
</div>
</div>
<!-- 认定判断弹框 --> <!-- 认定判断弹框 -->
<div class="rdwccontent" v-show="isShowrdwcDialog"> <div class="rdwccontent" v-show="isShowrdwcDialog">
<div class="title">当前候选未全部查看，是否确认认定完成？</div> <div class="title">当前候选未全部查看，是否确认认定完成？</div>
...@@ -735,11 +746,11 @@ ...@@ -735,11 +746,11 @@
</div> </div>
<div class="item"> <div class="item">
<div class="title">人员编号：</div> <div class="title">人员编号：</div>
<div class="value">{{ sourcebarcode }}</div> <div class="value">{{ sourceObj.barcode }}</div>
<div class="title">姓名：</div> <div class="title">姓名：</div>
<div class="value">{{ userName }}</div> <div class="value">{{ bzsource.xm }}</div>
<div class="title">捺印日期：</div> <div class="title">捺印日期：</div>
<div class="value">{{ dateTime }}</div> <div class="value">{{ bzsource.nysj }}</div>
</div> </div>
</div> </div>
<div class="bz-src-item"> <div class="bz-src-item">
...@@ -749,40 +760,41 @@ ...@@ -749,40 +760,41 @@
</div> </div>
<div class="item"> <div class="item">
<div class="title">人员编号：</div> <div class="title">人员编号：</div>
<div class="value">{{ sourcebarcode }}</div> <div class="value">{{ targetObj.destbarcode }}</div>
<div class="title">姓名：</div> <div class="title">姓名：</div>
<div class="value">{{ userName }}</div> <div class="value">{{ bztarget.xm }}</div>
<div class="title">捺印日期：</div> <div class="title">捺印日期：</div>
<div class="value">{{ dateTime }}</div> <div class="value">{{ bztarget.nysj }}</div>
</div> </div>
</div> </div>
</div> </div>
<div class="bz-target"> <div class="bz-target">
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中单位：</div> <div class="bzname">比中单位：</div>
<div class="bzvalue">{{ bzdw }}</div> <div class="bzvalue">{{ bzr.unitName }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人：</div> <div class="bzname">比中人：</div>
<div class="bzvalue">{{ bzr }}</div> <div class="bzvalue">{{ bzr.name }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">单位代码：</div> <div class="bzname">单位代码：</div>
<div class="bzvalue">{{ dwdm }}</div> <div class="bzvalue">{{ bzr.unitCode }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人身份证号：</div> <div class="bzname">比中人身份证号：</div>
<div class="bzvalue">{{ bzrsfzh }}</div> <div class="bzvalue">{{ bzr.idCard }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中时间：</div> <div class="bzname">比中时间：</div>
<div class="bzvalue">{{ bzsj }}</div> <div class="bzvalue">{{ bzr.bzTime }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人联系电话：</div> <div class="bzname">比中人联系电话：</div>
<el-input <el-input
class="bzphone" class="bzphone"
v-model="phone" v-model="bzr.phoneNumber"
disabled
placeholder="请输入内容" placeholder="请输入内容"
></el-input> ></el-input>
<div class="input-error" v-show="isPhoneError"> <div class="input-error" v-show="isPhoneError">
...@@ -815,6 +827,7 @@ ...@@ -815,6 +827,7 @@
</template> </template>
<script> <script>
import { mapState } from "vuex";
import "swiper/dist/css/swiper.css"; import "swiper/dist/css/swiper.css";
import { swiper, swiperSlide } from "vue-awesome-swiper"; import { swiper, swiperSlide } from "vue-awesome-swiper";
import TTPlam from "./modules/TTPlam.vue"; import TTPlam from "./modules/TTPlam.vue";
...@@ -832,6 +845,11 @@ export default { ...@@ -832,6 +845,11 @@ export default {
swiperSlide, swiperSlide,
Swiper, Swiper,
}, },
computed: {
...mapState({
loading_sd: (state) => state.loading.loading_sd,
}),
},
data() { data() {
return { return {
width1: 50, width1: 50,
...@@ -956,7 +974,14 @@ export default { ...@@ -956,7 +974,14 @@ export default {
// 指纹图片加载 // 指纹图片加载
fingerLoading: true, fingerLoading: true,
bzdw: "", bzdw: "",
bzr: "", bzr: {
bzTime: "",
idCard: "",
phoneNumber: "",
name: "",
unitCode: "",
unitName: "",
},
dwdm: "", dwdm: "",
bzrsfzh: "", bzrsfzh: "",
bzsj: "", bzsj: "",
...@@ -987,6 +1012,20 @@ export default { ...@@ -987,6 +1012,20 @@ export default {
sonTargetDel: false, sonTargetDel: false,
faceDetail: 1, faceDetail: 1,
plamDetail: 1, plamDetail: 1,
//当前展示的源对象
sourceObj: {},
//当前展示的目标对象
targetObj: {},
//比中弹框目标信息
bztarget: {
xm: "",
nysj: "",
},
//比重弹框目标信息
bzsource: {
xm: "",
nysj: "",
},
}; };
}, },
created() { created() {
...@@ -1052,21 +1091,21 @@ export default { ...@@ -1052,21 +1091,21 @@ export default {
loadingIndex(val, oldval) { loadingIndex(val, oldval) {
if (oldval == 0) { if (oldval == 0) {
this.screenLoading = true; this.screenLoading = true;
this.sLoading = this.$loading({ // this.sLoading = this.$loading({
// 通过cdn引入的element-ui // // 通过cdn引入的element-ui
customClass: "screen", // customClass: "screen",
spinner: "screenIcon", // spinner: "screenIcon",
lock: true, // lock: true,
text: " ", // text: " ",
background: "rgba(255, 255, 255, 0.9)", // background: "rgba(255, 255, 255, 0.9)",
}); // });
} }
if (this.timer) clearTimeout(this.timer); if (this.timer) clearTimeout(this.timer);
if (val == 0) { if (val == 0) {
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.screenLoading = false; this.screenLoading = false;
this.sLoading.close(); // this.sLoading.close();
this.sLoading = null; // this.sLoading = null;
}, 200); }, 200);
} }
}, },
...@@ -1101,6 +1140,7 @@ export default { ...@@ -1101,6 +1140,7 @@ export default {
if (index > 0) { if (index > 0) {
this.currentQqid = this.sourcedatas[i - 1].qqid; this.currentQqid = this.sourcedatas[i - 1].qqid;
this.sourcebarcode = this.sourcedatas[i - 1].barcode; this.sourcebarcode = this.sourcedatas[i - 1].barcode;
this.sourceObj = this.sourcedatas[i - 1];
this.fingerLoading = true; this.fingerLoading = true;
this.$set(this.sourcedatas[i - 1], "clickLog", "1"); this.$set(this.sourcedatas[i - 1], "clickLog", "1");
if (this.sourcedatas[i - 1].removeFlag == "1") { if (this.sourcedatas[i - 1].removeFlag == "1") {
...@@ -1131,6 +1171,7 @@ export default { ...@@ -1131,6 +1171,7 @@ export default {
if (this.sourcedatas.length - 1 > index) { if (this.sourcedatas.length - 1 > index) {
this.currentQqid = this.sourcedatas[i + 1].qqid; this.currentQqid = this.sourcedatas[i + 1].qqid;
this.sourcebarcode = this.sourcedatas[i + 1].barcode; this.sourcebarcode = this.sourcedatas[i + 1].barcode;
this.sourceObj = this.sourcedatas[i + 1];
this.$set(this.sourcedatas[i + 1], "clickLog", "1"); this.$set(this.sourcedatas[i + 1], "clickLog", "1");
if (this.sourcedatas[i + 1].removeFlag == "1") { if (this.sourcedatas[i + 1].removeFlag == "1") {
this.souceDel = true; this.souceDel = true;
...@@ -1162,13 +1203,9 @@ export default { ...@@ -1162,13 +1203,9 @@ export default {
this.loadingIndex++; this.loadingIndex++;
if (me.dataType == "father") { if (me.dataType == "father") {
me.$axios me.$axios
.post( .post("/api/queryque/standardAll", {
"/api/queryque/standardAll",
{
contrastCustomSearchReq: { qid: me.qid }, contrastCustomSearchReq: { qid: me.qid },
}, })
{ loading: false }
)
.then((res) => { .then((res) => {
me.loadingIndex--; me.loadingIndex--;
if (res.data.code == 0) { if (res.data.code == 0) {
...@@ -1176,6 +1213,7 @@ export default { ...@@ -1176,6 +1213,7 @@ export default {
me.sourcedatasLength = res.data.ret.length; me.sourcedatasLength = res.data.ret.length;
me.sourcebarcode = res.data.ret[0].barcode; me.sourcebarcode = res.data.ret[0].barcode;
me.currentQqid = res.data.ret[0].qqid; me.currentQqid = res.data.ret[0].qqid;
me.sourceObj = res.data.ret[0];
me.$set(me.sourcedatas[0], "clickLog", 1); me.$set(me.sourcedatas[0], "clickLog", 1);
if (res.data.ret[0].removeFlag == "1") { if (res.data.ret[0].removeFlag == "1") {
...@@ -1208,13 +1246,9 @@ export default { ...@@ -1208,13 +1246,9 @@ export default {
}); });
} else { } else {
me.$axios me.$axios
.post( .post("/api/queryque/standardAll", {
"/api/queryque/standardAll",
{
contrastCustomSearchReq: { qqid: me.currentQqid }, contrastCustomSearchReq: { qqid: me.currentQqid },
}, })
{ loading: false }
)
.then((res) => { .then((res) => {
me.loadingIndex--; me.loadingIndex--;
if (res.data.code == 0) { if (res.data.code == 0) {
...@@ -1263,8 +1297,7 @@ export default { ...@@ -1263,8 +1297,7 @@ export default {
if (me.currentQqid !== null) { if (me.currentQqid !== null) {
me.$axios me.$axios
.get( .get(
"/api/query/matchcand/" + me.currentQqid + "/" + me.sourcebarcode, "/api/query/matchcand/" + me.currentQqid + "/" + me.sourcebarcode
{ loading: false }
) )
.then((res) => { .then((res) => {
me.loadingIndex--; me.loadingIndex--;
...@@ -1283,13 +1316,9 @@ export default { ...@@ -1283,13 +1316,9 @@ export default {
this.loadingIndex++; this.loadingIndex++;
// 平面 // 平面
this.$axios this.$axios
.post( .post("/api/png/plainByBarcode/barcode", {
"/api/png/plainByBarcode/barcode",
{
barcode: this.sourcebarcode, barcode: this.sourcebarcode,
}, })
{ loading: false }
)
.then(function (response) { .then(function (response) {
self.loadingIndex--; self.loadingIndex--;
if (response.data.code == 0) { if (response.data.code == 0) {
...@@ -1325,11 +1354,7 @@ export default { ...@@ -1325,11 +1354,7 @@ export default {
let self = this; let self = this;
// 滚动 源数据 // 滚动 源数据
this.$axios this.$axios
.post( .post("/api/png/rollByBarcode/barcode", { barcode: barcode })
"/api/png/rollByBarcode/barcode",
{ barcode: barcode },
{ loading: false }
)
.then(function (response) { .then(function (response) {
self.loadingIndex--; self.loadingIndex--;
if (response.data.code == 0) { if (response.data.code == 0) {
...@@ -1364,13 +1389,9 @@ export default { ...@@ -1364,13 +1389,9 @@ export default {
this.loadingIndex++; this.loadingIndex++;
// 平面 目标 // 平面 目标
this.$axios this.$axios
.post( .post("/api/png/plainByBarcode/barcode", {
"/api/png/plainByBarcode/barcode",
{
barcode: this.destbarcode, barcode: this.destbarcode,
}, })
{ loading: false }
)
.then(function (response) { .then(function (response) {
self.loadingIndex--; self.loadingIndex--;
if (response.data.code == 0) { if (response.data.code == 0) {
...@@ -1406,11 +1427,7 @@ export default { ...@@ -1406,11 +1427,7 @@ export default {
this.loadingIndex++; this.loadingIndex++;
// 滚动 目标数据 // 滚动 目标数据
this.$axios this.$axios
.post( .post("/api/png/rollByBarcode/barcode", { barcode: this.destbarcode })
"/api/png/rollByBarcode/barcode",
{ barcode: this.destbarcode },
{ loading: false }
)
.then(function (response) { .then(function (response) {
self.loadingIndex--; self.loadingIndex--;
if (response.data.code == 0) { if (response.data.code == 0) {
...@@ -1441,6 +1458,7 @@ export default { ...@@ -1441,6 +1458,7 @@ export default {
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(val); console.log(val);
if (val) { if (val) {
this.targetObj = val;
val.clickLog = "1"; val.clickLog = "1";
if (val.removeFlag == "1") { if (val.removeFlag == "1") {
this.targetDel = true; this.targetDel = true;
...@@ -1472,60 +1490,56 @@ export default { ...@@ -1472,60 +1490,56 @@ export default {
}, },
//比中 //比中
Bz() { Bz() {
if (
(this.targetObj.affirmstatus == 2 ||
this.targetObj.affirmstatus == 3) &&
(this.sourceObj.affirmStatus == 2 || this.sourceObj.affirmStatus == 3)
) {
this.$message.error("已经比中过的数据无法再次比中！");
return;
}
this.isShowbzDialogBg = true; this.isShowbzDialogBg = true;
this.isShowbzDialog = true; this.isShowbzDialog = true;
//console.info("比中弹窗"); let params = JSON.parse(localStorage.getItem("userInfo"));
// 获取用户信息 for (let key in this.bzr) {
// this.getUserInfo(); this.bzr[key] = params[key];
}
this.getUser(); this.getUser();
}, },
getUser() { getUser() {
let self = this; let self = this;
this.loadingIndex++; this.loadingIndex += 2;
this.$axios({
method: "post",
url: `/api/personstore/findname?ysxtAsjxgrybh=${this.sourceObj.barcode}`,
}).then((res) => {
this.loadingIndex--;
if (res.data.code == 0) {
let result = res.data.ret;
if (result) {
for (let key in self.bzsource) {
self.bzsource[key] = result[key];
}
this.$set(this.bzr, "bzTime", result.time);
}
}
});
this.$axios({ this.$axios({
method: "post", method: "post",
url: `/api/personstore/findname?ysxtAsjxgrybh=R430795G000002021100002`, url: `/api/personstore/findname?ysxtAsjxgrybh=${this.targetObj.destbarcode}`,
loading: false,
}).then((res) => { }).then((res) => {
this.loadingIndex--; this.loadingIndex--;
if (res.data.code == 0) { if (res.data.code == 0) {
let result = res.data.ret; let result = res.data.ret;
self.userName = result.xm; if (result) {
self.dateTime = result.nysj; for (let key in self.bztarget) {
self.bztarget[key] = result[key];
}
this.$set(this.bzr, "bzTime", result.time);
}
} }
}); });
}, },
// 获取用户信息
// getUserInfo(id = 1) {
// let self = this;
// this.loadingIndex++;
// this.$axios({
// method: "post",
// url: "/api/user/searchByUserid",
// loading: false,
// data: {
// id: id,
// },
// }).then(async (res) => {
// self.loadingIndex--;
// if (res.data.code == 0) {
// let data = res.data.ret[0];
// //console.log("userInfo==>", data);
// let dw = await self.$axios({
// method: "get",
// url: "/api/code/unit/one/" + data.userunit,
// loading: false,
// });
// let time = new Date(data.updatetime);
// self.bzsj = Utils.timeStampTurnTime2(time);
// self.bzr = data.userdesc;
// self.dwdm = dw.data.ret.code;
// self.bzdw = dw.data.ret.name;
// self.bzrsfzh = data.idcard;
// self.phone = data.telephone;
// }
// });
// },
/** /**
* @description: 取消认定完成 * @description: 取消认定完成
* @param {*} * @param {*}
...@@ -1546,11 +1560,7 @@ export default { ...@@ -1546,11 +1560,7 @@ export default {
this.loadingIndex++; this.loadingIndex++;
// 认定之前的操作 // 认定之前的操作
this.$axios this.$axios
.post( .post("/api/matchcand/affirm/confirm", { qqid: this.currentQqid })
"/api/matchcand/affirm/confirm",
{ qqid: this.currentQqid },
{ loading: false }
)
.then((res) => { .then((res) => {
this.loadingIndex--; this.loadingIndex--;
//console.log(res); //console.log(res);
...@@ -1574,17 +1584,13 @@ export default { ...@@ -1574,17 +1584,13 @@ export default {
// 1：倒查 // 1：倒查
let querytype = 0; let querytype = 0;
this.$axios this.$axios
.post( .post("/api/matchcand/affirm/finish", {
"/api/matchcand/affirm/finish",
{
srcbarcode: self.sourcebarcode, srcbarcode: self.sourcebarcode,
destbarcode: self.destbarcode, destbarcode: self.destbarcode,
qqid: self.currentQqid, qqid: self.currentQqid,
qid: self.qid, qid: self.qid,
querytype: querytype, querytype: querytype,
}, })
{ loading: false }
)
.then((response) => { .then((response) => {
this.loadingIndex--; this.loadingIndex--;
// 跟新列表数据 // 跟新列表数据
...@@ -1656,22 +1662,25 @@ export default { ...@@ -1656,22 +1662,25 @@ export default {
this.loadingIndex++; this.loadingIndex++;
let querytype = 0; let querytype = 0;
this.$axios this.$axios
.post( .post("/api/matchcand/affirm/hit", {
"/api/matchcand/affirm/hit",
{
srcbarcode: self.sourcebarcode, srcbarcode: self.sourcebarcode,
destbarcode: self.destbarcode, destbarcode: self.destbarcode,
// affirmstatus: "1" qid: parseInt(self.qid),
querytype: "0", queryType: "0",
qqid: self.currentQqid, qqid: parseInt(self.currentQqid),
}, userName: self.bzr.name,
{ loading: false } idCard: self.bzr.idCard,
) tel: self.bzr.phoneNumber,
unit: self.bzr.unitName,
unitCode: self.bzr.unitCode,
affirmtime: new Date(self.bzr.bzTime),
affirmDescribe: self.textarea,
})
.then((response) => { .then((response) => {
this.loadingIndex--; this.loadingIndex--;
if (response.data.code == 0) {
// 跟新列表数据 // 跟新列表数据
self.$bus.emit("updateTTSourceData"); self.$bus.emit("updateTTSourceData");
//源数据手动修改状态 //源数据手动修改状态
let index = this.sourcedatas.findIndex( let index = this.sourcedatas.findIndex(
(i) => i.barcode == this.sourcebarcode (i) => i.barcode == this.sourcebarcode
...@@ -1701,6 +1710,7 @@ export default { ...@@ -1701,6 +1710,7 @@ export default {
self.isShowbzDialog = false; self.isShowbzDialog = false;
this.$message.success("比中成功！"); this.$message.success("比中成功！");
//console.log(response); //console.log(response);
}
}) })
.catch((err) => { .catch((err) => {
this.$message.error("比中失败！"); this.$message.error("比中失败！");
...@@ -2252,6 +2262,36 @@ div { ...@@ -2252,6 +2262,36 @@ div {
.el-table th { .el-table th {
padding: 0; padding: 0;
} }
.loading {
z-index: 999999;
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: rgba($color: #fff, $alpha: 0.65);
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.loading-finger {
width: 100px;
height: 100px;
img {
width: 100%;
height: 100%;
}
}
.loading-name {
width: 100px;
height: auto;
margin-top: 20px;
img {
width: 100%;
height: 100%;
}
}
}
/* 修改表格里内容 */ /* 修改表格里内容 */
/deep/.dest-table .el-table__body-wrapper tr td { /deep/.dest-table .el-table__body-wrapper tr td {
height: 24px; height: 24px;
......
src/views/cxyrd/modules/LLCandidate.vue
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
<div class="lt_candidate_number"> <div class="lt_candidate_number">
<el-table <el-table
highlight-current-row :highlight-current-row="isDelete ? false : true"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
class="lt_candidate_table" class="lt_candidate_table"
:data="tableData" :data="tableData"
...@@ -1037,13 +1037,9 @@ export default { ...@@ -1037,13 +1037,9 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange(val, old) { handleCurrentChange(val, old) {
debugger;
if (!val) return; if (!val) return;
// document if (this.isDelete) return;
// .getElementsByClassName("lcurrte")[0] this.$emit("targetObj", val);
// .parentElement.parentElement.parentElement.classList.remove(
// "current-row"
// );
this.targetBh = val.destbarcode; this.targetBh = val.destbarcode;
let self = this; let self = this;
if (val.removeFlag == "1") { if (val.removeFlag == "1") {
......
src/views/cxyrd/modules/LLSrc.vue
...@@ -470,12 +470,12 @@ export default { ...@@ -470,12 +470,12 @@ export default {
}, },
// 指纹部分 增加边框 // 指纹部分 增加边框
changeStyle(index, imageInfo) { changeStyle(index, imageInfo) {
console.log(imageInfo);
let self = this; let self = this;
this.isActive = index; this.isActive = index;
//console.log(this.isActive); //console.log(this.isActive);
// 存储源数据序号 // 存储源数据序号
if (imageInfo) { if (imageInfo) {
this.$emit("sourceObj", imageInfo);
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
sessionStorage.setItem("srcseqno", imageInfo.seq); sessionStorage.setItem("srcseqno", imageInfo.seq);
......
src/views/cxyrd/modules/TTPlam.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-23 17:43:14 * @Date: 2021-10-23 17:43:14
* @LastEditTime: 2021-12-06 10:01:49 * @LastEditTime: 2021-12-09 17:28:43
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
</p> </p>
<el-carousel <el-carousel
@mousewheel.native="rollScroll($event)" @mousewheel.native="rollScroll($event)"
@change="change"
direction="vertical" direction="vertical"
ref="carousel" ref="carousel"
:autoplay="false" :autoplay="false"
...@@ -144,6 +145,7 @@ export default { ...@@ -144,6 +145,7 @@ export default {
return { return {
zwName: "222", zwName: "222",
loadingIndex: 0, loadingIndex: 0,
changeIndex: 0,
sourceSrc: "", sourceSrc: "",
targetSrc: "", targetSrc: "",
isShowDetail: false, isShowDetail: false,
...@@ -179,6 +181,9 @@ export default { ...@@ -179,6 +181,9 @@ export default {
}); });
}, },
methods: { methods: {
change(val) {
this.changeIndex = val;
},
rollScroll(event) { rollScroll(event) {
let _that = this; let _that = this;
// chrome、ie使用的wheelDelta，火狐使用detail // chrome、ie使用的wheelDelta，火狐使用detail
...@@ -187,16 +192,17 @@ export default { ...@@ -187,16 +192,17 @@ export default {
if (!_that.timeOut) { if (!_that.timeOut) {
_that.timeOut = setTimeout(() => { _that.timeOut = setTimeout(() => {
_that.timeOut = null; _that.timeOut = null;
scrollVal > 0 if (scrollVal > 0 && _that.changeIndex > 0) {
? _that.$refs.carousel.prev() _that.$refs.carousel.prev();
: _that.$refs.carousel.next(); } else if (scrollVal <= 0 && _that.changeIndex < 3) {
_that.$refs.carousel.next();
}
}, 300); }, 300);
} else { } else {
} }
}, },
showDetail(item) { showDetail(item) {
this.checkItem = item; this.checkItem = item;
console.log(this.checkItem);
this.isShowDetail = true; this.isShowDetail = true;
this.$emit("logbg", true); this.$emit("logbg", true);
}, },
...@@ -205,6 +211,9 @@ export default { ...@@ -205,6 +211,9 @@ export default {
$(".plamDetail").remove(); $(".plamDetail").remove();
}, },
watch: { watch: {
isPlam(val) {
if (val) this.changeIndex = 0;
},
plamDetail(val) { plamDetail(val) {
this.isShowDetail = false; this.isShowDetail = false;
}, },
......
src/views/login/modules/AccountsLogin.vue
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
let me = this; let me = this;
me.btnLoading = true; me.btnLoading = true;
this.$axios({ this.$axios({
url: "/login/login/myLoginForm", url: "/security/login/myLoginForm",
method: "post", method: "post",
data: qs.stringify(userinfo), data: qs.stringify(userinfo),
headers: { headers: {
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-08 18:09:43 * @LastEditTime: 2021-12-10 21:10:28
* @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
...@@ -90,8 +90,8 @@ module.exports = { ...@@ -90,8 +90,8 @@ module.exports = {
proxy: { proxy: {
"/api": { "/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定 target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.108:8099", // 湖南-张 // target: "http://192.168.128.124: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:8764", // 湖南-张呈光 // target: "http://192.168.128.118:8764", // 湖南-张呈光
...@@ -107,17 +107,17 @@ module.exports = { ...@@ -107,17 +107,17 @@ module.exports = {
"^/api": "/api" "^/api": "/api"
} }
}, },
"/login": { // "/login": {
// target: "http://www.meetfood.cn:2390/", // 登录 // // target: "http://www.meetfood.cn:2390/", // 登录
target: "http://192.168.128.124:8764/", // 登录 // target: "http://192.168.128.124:8764/", // 登录
// target: "http://192.168.128.114:8099", // 登录-马 // // target: "http://192.168.128.114:8099", // 登录-马
ws: true, // ws: true,
changeOrigin: true, // changeOrigin: true,
pathRewrite: { // pathRewrite: {
"^/login": "" //本地 // "^/login": "" //本地
// "^/login": "/login" //线上 // // "^/login": "/login" //线上
} // }
}, // },
// "/system": { // "/system": {
// target: "http://192.168.128.106:8765/security", // 湖南-王 // target: "http://192.168.128.106:8765/security", // 湖南-王
// // target: "http://www.meetfood.cn:2390/system", // 湖南-王 // // target: "http://www.meetfood.cn:2390/system", // 湖南-王
......
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