Skip to content

F
founder_vue
Commit 891d710c by 米嘉伟
Options

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

parents cae6f3bd 86eb7772
Showing with 346 additions and 257 deletions
package-lock.json
...@@ -2050,37 +2050,6 @@ ...@@ -2050,37 +2050,6 @@
"webpack-merge": "^4.2.2" "webpack-merge": "^4.2.2"
}, },
"dependencies": { "dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": { "debug": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz", "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
...@@ -2090,35 +2059,11 @@ ...@@ -2090,35 +2059,11 @@
"ms": "2.1.2" "ms": "2.1.2"
} }
}, },
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz", "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=", "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true "dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
} }
} }
}, },
...@@ -13816,6 +13761,63 @@ ...@@ -13816,6 +13761,63 @@
} }
} }
}, },
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": { "vue-router": {
"version": "3.4.6", "version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz", "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
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-06 16:22:17 * @LastEditTime: 2021-12-07 20:15:55
* @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
...@@ -11,7 +11,7 @@ import store from '../store/index'; ...@@ -11,7 +11,7 @@ import store from '../store/index';
import { Loading } from 'element-ui' // 装包方式这样引入,我这里通过cdn引入,通过window.ELEMENT调用 import { Loading } from 'element-ui' // 装包方式这样引入,我这里通过cdn引入,通过window.ELEMENT调用
// loading对象 // loading对象
let loading; let loading;
let timer;
// 当前正在请求的数量 // 当前正在请求的数量
let needLoadingRequestCount = 0; let needLoadingRequestCount = 0;
...@@ -35,6 +35,7 @@ export function showLoading(target) { ...@@ -35,6 +35,7 @@ export function showLoading(target) {
store.commit('loading/setLoadingSd', true) store.commit('loading/setLoadingSd', true)
} }
} }
if (timer) clearTimeout(timer);
needLoadingRequestCount++; needLoadingRequestCount++;
} }
...@@ -58,16 +59,23 @@ export function hideLoading(loadingTarget) { ...@@ -58,16 +59,23 @@ export function hideLoading(loadingTarget) {
} }
// 防抖：将 300ms 间隔内的关闭 loading 便合并为一次。防止连续请求时， loading闪烁的问题。 // 防抖：将 300ms 间隔内的关闭 loading 便合并为一次。防止连续请求时， loading闪烁的问题。
let toHideLoading = utils.debounce((loadingTarget) => { let toHideLoading = function (loadingTarget) {
// loading.close(); if (timer) clearTimeout(timer);
// loading = null; timer = setTimeout(() => {
// console.log(loadingTarget);
// store.commit('loading/setLoading', false)
store.commit('loading/setSmallLoading', false) store.commit('loading/setSmallLoading', false)
store.commit('loading/setLoadingSd', false) store.commit('loading/setLoadingSd', false)
// if (loadingTarget) { }, 500);
// store.commit('loading/setSmallLoading', false) };
// } else { // let toHideLoading = utils.debounce((loadingTarget) => {
// store.commit('loading/setLoading', false) // // loading.close();
// } // // loading = null;
}, 500); // // console.log(loadingTarget);
// // store.commit('loading/setLoading', false)
// store.commit('loading/setSmallLoading', false)
// store.commit('loading/setLoadingSd', false)
// // if (loadingTarget) {
// // store.commit('loading/setSmallLoading', false)
// // } else {
// // store.commit('loading/setLoading', false)
// // }
// }, 500);
src/views/Home/Home.vue
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
/>用户角色 />用户角色
<div class="rolelist"> <div class="rolelist">
<ul> <ul>
<li>姓名：xxxx</li> <li>姓名：李某某</li>
<li>姓名：xxxx</li> <li>单位：侦察大队</li>
<li>姓名：xxxx</li> <li>角色：系统管理员</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -65,10 +65,20 @@ ...@@ -65,10 +65,20 @@
<p>质量检查</p> <p>质量检查</p>
<p>60</p> <p>60</p>
</div> </div>
<div class="todopublic quality_inspection">
<div />
</div>
<div class="todopublic shanbuapp"> <div class="todopublic shanbuapp">
<p>闪捕App</p> <p>闪捕App</p>
<p>30</p> <p>30</p>
</div> </div>
<div class="todopublic quality_inspection">
<div />
</div>
<div class="todopublic fingerprint"> <div class="todopublic fingerprint">
<p>待发指纹</p> <p>待发指纹</p>
<p>30</p> <p>30</p>
...@@ -262,16 +272,35 @@ export default { ...@@ -262,16 +272,35 @@ export default {
.header .right .role:hover .rolelist { .header .right .role:hover .rolelist {
display: block; display: block;
} }
.header .right div .rolelist { .header .right div .rolelist {
position: absolute; position: absolute;
top: 170%; top: 170%;
left: -80%; left: -80%;
width: 160px; width: 160px;
background-color: #fff; background-color: transparent;
color: #000; color: #000;
display: none; display: none;
} }
.header .right div .rolelist ul{
width: 160px;
height: 144px;
background: #ffffff;
box-shadow: 0px 4px 14px 0px rgba(0, 0, 0, 0.2);
border-radius: 0px 0px 6px 6px;
}
.header .right div .rolelist li{
width: 160px;
height: 48px;
background: transparent;
padding: 12px 16px;
font-size: 14px;
font-family: MicrosoftYaHei;
}
.header .right div img { .header .right div img {
margin-right: 7px; margin-right: 7px;
} }
...@@ -353,8 +382,17 @@ export default { ...@@ -353,8 +382,17 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 0 26px; padding: 0 12px;
}
.main .todoview .todopublic div {
width: 4px;
height: 100%;
margin: 41px 0 40px 0;
background: #eeeeee;
box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.05);
} }
.main .todoview .todopublic p:nth-child(odd) { .main .todoview .todopublic p:nth-child(odd) {
font-size: 16px; font-size: 16px;
color: #999999; color: #999999;
......
src/views/SystemManage/GroupPermission.vue
...@@ -104,6 +104,16 @@ ...@@ -104,6 +104,16 @@
数据权限 数据权限
</div> </div>
</div> </div>
<div class="btnsBox">
<div class="explain">
<div class="state">
<p>权限说明</p>
<span></span>
</div>
<el-checkbox v-model="checked" disabled class="huise1">角色权限</el-checkbox>
<el-checkbox v-model="checked" disabled class="danhuang1">用户组权限</el-checkbox>
<el-checkbox v-model="checked" disabled class="lei2 huise1 danhuang2">角色+用户组</el-checkbox>
</div>
<div class="save"> <div class="save">
<div @click="redact" class="editText" v-if="editBoo"> <div @click="redact" class="editText" v-if="editBoo">
<i class="el-icon-edit"></i> <i class="el-icon-edit"></i>
...@@ -116,6 +126,7 @@ ...@@ -116,6 +126,7 @@
<!-- <el-button @click="search">search</el-button>--> <!-- <el-button @click="search">search</el-button>-->
</div> </div>
</div> </div>
</div>
<el-checkbox-group v-model="checkList" :disabled="disabled"> <el-checkbox-group v-model="checkList" :disabled="disabled">
<div class="role-info"> <div class="role-info">
<!-- 角色权限菜单列--> <!-- 角色权限菜单列-->
......
src/views/SystemManage/UserManage.vue
...@@ -293,6 +293,13 @@ ...@@ -293,6 +293,13 @@
v-model="addFormParams.name" v-model="addFormParams.name"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="info-item" label="身份证号:" prop="identityCard">
<el-input
placeholder="请输入用户警号"
class="input-info"
v-model="addFormParams.identityCard"
></el-input>
</el-form-item> -->
<el-form-item class="info-item" label="所属单位:" prop="unitCode"> <el-form-item class="info-item" label="所属单位:" prop="unitCode">
<Cascader :form="addFormParams" id="unitCode"></Cascader> <Cascader :form="addFormParams" id="unitCode"></Cascader>
</el-form-item> </el-form-item>
...@@ -595,6 +602,7 @@ export default { ...@@ -595,6 +602,7 @@ export default {
sWidth: 50, sWidth: 50,
// 新增对象 // 新增对象
addFormParams: { addFormParams: {
identityCard: "",
username: "2233333", username: "2233333",
phoneNumber: "13327454372", phoneNumber: "13327454372",
password: "2222222", password: "2222222",
...@@ -608,6 +616,7 @@ export default { ...@@ -608,6 +616,7 @@ export default {
roleId: [], roleId: [],
}, },
editFormParams: { editFormParams: {
identityCard: "",
username: "", //用户名 username: "", //用户名
name: "", //姓名 name: "", //姓名
unitCode: "", //单位代码 unitCode: "", //单位代码
...@@ -618,6 +627,10 @@ export default { ...@@ -618,6 +627,10 @@ export default {
roleId: [], // 角色 roleId: [], // 角色
}, },
addrules: { addrules: {
//身份证
identityCard: [
{ validator: validatePass, trigger: "blur", required: true },
],
password: [ password: [
{ validator: validatePass, trigger: "blur", required: true }, { validator: validatePass, trigger: "blur", required: true },
], //密码 ], //密码
......
src/views/SystemManage/UserPermission.vue
...@@ -94,18 +94,35 @@ ...@@ -94,18 +94,35 @@
数据权限 数据权限
</div> </div>
</div> </div>
<div class="btnsBox">
<div class="explain">
<div class="state">
<p>权限说明</p>
<span></span>
</div>
<el-checkbox v-model="checked" disabled class="huise1">角色权限</el-checkbox>
<el-checkbox v-model="checked" disabled class="danhuang1">用户组权限</el-checkbox>
<el-checkbox v-model="checked" disabled class="wu1">用户权限</el-checkbox>
<el-checkbox v-model="checked" disabled class="lei2 huise1 danhuang2">角色+用户组</el-checkbox>
<el-checkbox v-model="checked" disabled class="lei2 huise1 wu2">角色+用户</el-checkbox>
<el-checkbox v-model="checked" disabled class="lei2 wu2 danhuang1">用户组+用户</el-checkbox>
<el-checkbox v-model="checked" disabled class="huise1 lei3 lei2 wu3 danhuang2">角色+用户组+用户</el-checkbox>
</div>
<div class="save"> <div class="save">
<div @click="redact" class="editText" v-if="editBoo"> <div @click="redact" class="editText" v-if="editBoo">
<i class="el-icon-edit"></i> <i class="el-icon-edit"></i>
<span>编辑</span> <span>编辑</span>
</div> </div>
<div :class="{ disabel: isSave, btn: true }" @click="save">保存</div> <div :class="{ disabel: isSave, btn: true }" @click="save">
保存
</div>
<!-- <el-button @click="add">add</el-button>--> <!-- <el-button @click="add">add</el-button>-->
<!-- <el-button @click="edit">edit</el-button>--> <!-- <el-button @click="edit">edit</el-button>-->
<!-- <el-button @click="del">del</el-button>--> <!-- <el-button @click="del">del</el-button>-->
<!-- <el-button @click="search">search</el-button>--> <!-- <el-button @click="search">search</el-button>-->
</div> </div>
</div> </div>
</div>
<el-checkbox-group v-model="checkList" :disabled="disabled"> <el-checkbox-group v-model="checkList" :disabled="disabled">
<div class="role-info"> <div class="role-info">
<!-- 角色权限菜单列--> <!-- 角色权限菜单列-->
......
src/views/SystemManage/scss/userpermission.scss
...@@ -250,7 +250,9 @@ ...@@ -250,7 +250,9 @@
.btns { .btns {
width: 224px; width: 224px;
height: 48px; height: 48px;
margin-left: 2px;
background: #f6f8fa; background: #f6f8fa;
box-shadow: inset 0px 1px 3px 1px rgba(5, 95, 231, 0.5);
border-radius: 8px; border-radius: 8px;
text-align: center; text-align: center;
.btn { .btn {
...@@ -267,13 +269,66 @@ ...@@ -267,13 +269,66 @@
// border-radius: 6px; // border-radius: 6px;
//} //}
&.active { &.active {
background: #ffffff; background: #055fe7;
color: #055fe7; color: #fff;
box-shadow: 0px 6px 8px 1px rgba(0, 21, 51, 0.05); box-shadow: 0px 6px 8px 1px rgba(0, 21, 51, 0.05);
border-radius: 6px; border-radius: 6px;
} }
} }
} }
.btnsBox {
width: calc(100% - 224px);
height: 100%;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 0 0 20px;
box-sizing: border-box;
}
.explain {
background: linear-gradient(270deg, rgba(246, 248, 250, 0.7) 0%, #eef6ff 100%);
border-radius: 8px;
height: 45px;
padding: 0 20px;
display: flex;
align-items: center;
justify-content: space-evenly;
.el-checkbox {
.el-checkbox__label {
cursor: default !important;
color: #666666;
}
.el-checkbox__inner {
cursor: default !important;
&::after {
cursor: default !important;
}
}
}
.state {
position: relative;
padding: 0 5px;
> p {
color: #333333;
font-size: 15px;
position: relative;
z-index: 2;
}
> span {
position: absolute;
width: 100%;
height: 10px;
background-color: #93bffe;
bottom: -2px;
z-index: 1;
left: 50%;
transform: translateX(-50%);
}
}
.el-checkbox {
margin-left: 20px;
}
}
.save { .save {
.btn { .btn {
right: 30px; right: 30px;
......
src/views/cxyrd/LL.vue
<template> <template>
<div class="ltDiv"> <div class="ltDiv">
<div class="lt" :class="{ bzActive: isShowbzDialogBg }"> <div class="lt" :class="{ bzActive: isShowbzDialogBg || loading_sd }">
<div class="header"> <div class="header">
<div class="label">串查</div> <div class="label">串查</div>
<div class="btns"> <div class="btns">
...@@ -11,7 +11,14 @@ ...@@ -11,7 +11,14 @@
<div class="header_line"></div> <div class="header_line"></div>
<div class="lt_main"> <div class="lt_main">
<div class="lt_main_left"> <div class="lt_main_left">
<LLSrc :src-data="qid"></LLSrc> <LLSrc
:src-data="qid"
@switchName="
(val) => {
fingerShowType = val;
}
"
></LLSrc>
</div> </div>
<div class="lt_main_middle"> <div class="lt_main_middle">
<!-- <div class="lt_main_header">顶部工具</div> <!-- <div class="lt_main_header">顶部工具</div>
...@@ -20,8 +27,17 @@ ...@@ -20,8 +27,17 @@
<ImageEd></ImageEd> <ImageEd></ImageEd>
</div> </div>
<div class="lt_main_right"> <div class="lt_main_right">
<LLCandidate></LLCandidate> <LLCandidate :fingerShowType="fingerShowType"></LLCandidate>
</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> </div>
<!-- 比中弹窗 --> <!-- 比中弹窗 -->
...@@ -164,6 +180,7 @@ ...@@ -164,6 +180,7 @@
</template> </template>
<script> <script>
import { mapState } from "vuex";
import "@/icons/error.svg"; import "@/icons/error.svg";
import Utils from "@/utils/util.js"; import Utils from "@/utils/util.js";
import LLSrc from "./modules/LLSrc.vue"; import LLSrc from "./modules/LLSrc.vue";
...@@ -177,6 +194,11 @@ export default { ...@@ -177,6 +194,11 @@ export default {
LLCandidate, LLCandidate,
ImageEd, ImageEd,
}, },
computed: {
...mapState({
loading_sd: (state) => state.loading.loading_sd,
}),
},
data() { data() {
return { return {
source: { source: {
...@@ -193,6 +215,7 @@ export default { ...@@ -193,6 +215,7 @@ export default {
tqryXm: "", tqryXm: "",
xh: "", xh: "",
}, },
fingerShowType: "指纹",
qid: null, qid: null,
radio: 6, radio: 6,
phone: "", phone: "",
...@@ -243,9 +266,8 @@ export default { ...@@ -243,9 +266,8 @@ export default {
*/ */
confirmrdwc() { confirmrdwc() {
let self = this; let self = this;
this.isShowrdwcDialogBg = false; this.isShowbzDialogBg = false;
this.isShowrdwcDialog = false; this.isShowrdwcDialog = false;
let srcseqno = sessionStorage.getItem("srcseqno") || ""; let srcseqno = sessionStorage.getItem("srcseqno") || "";
let destseqno = sessionStorage.getItem("destseqno") || ""; let destseqno = sessionStorage.getItem("destseqno") || "";
let srcbarcode = sessionStorage.getItem("srcbarcode") || ""; let srcbarcode = sessionStorage.getItem("srcbarcode") || "";
...@@ -273,9 +295,6 @@ export default { ...@@ -273,9 +295,6 @@ export default {
self.$bus.emit("updateFinderSource"); self.$bus.emit("updateFinderSource");
//console.log(response); //console.log(response);
this.$message.success("认定完成！"); this.$message.success("认定完成！");
if (type == "son") {
window.close();
}
}); });
}, },
/** /**
...@@ -284,7 +303,7 @@ export default { ...@@ -284,7 +303,7 @@ export default {
* @return {*} * @return {*}
*/ */
cancelrdwc() { cancelrdwc() {
this.isShowrdwcDialogBg = false; this.isShowbzDialogBg = false;
this.isShowrdwcDialog = false; this.isShowrdwcDialog = false;
}, },
/** /**
...@@ -338,17 +357,6 @@ export default { ...@@ -338,17 +357,6 @@ export default {
this.$message.error("比中失败！"); this.$message.error("比中失败！");
}); });
// 更新电话
this.$axios({
method: "post",
url: "/api/user/update",
data: {
telephone: self.phone,
},
}).then((res) => {
//console.log(res);
});
this.isShowbzDialogBg = false; this.isShowbzDialogBg = false;
this.isShowbzDialog = false; this.isShowbzDialog = false;
}, },
...@@ -366,7 +374,7 @@ export default { ...@@ -366,7 +374,7 @@ export default {
sessionStorage.getItem("destbarcode") || "" sessionStorage.getItem("destbarcode") || ""
); );
this.$axios({ this.$axios({
url: "/api/casestore/casebase", url: "/api/casestore/casebase/detail",
method: "get", method: "get",
params: { params: {
barcode: destbarcode, barcode: destbarcode,
...@@ -399,7 +407,7 @@ export default { ...@@ -399,7 +407,7 @@ export default {
this.$set(self.source, "asjbh", srcbarcode); this.$set(self.source, "asjbh", srcbarcode);
this.$axios({ this.$axios({
method: "get", method: "get",
url: "/api/casestore/casebase?barcode=" + srcbarcode, url: "/api/casestore/casebase/detail?barcode=" + srcbarcode,
}).then((res) => { }).then((res) => {
if (res.data.code == 0 && res.data.message) { if (res.data.code == 0 && res.data.message) {
let result = res.data.ret; let result = res.data.ret;
...@@ -460,7 +468,6 @@ export default { ...@@ -460,7 +468,6 @@ export default {
Rdwc() { Rdwc() {
//console.log("认定完成"); //console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || ""; let qqid = sessionStorage.getItem("qqid") || "";
// 认定之前的操作 // 认定之前的操作
this.$axios({ this.$axios({
method: "post", method: "post",
...@@ -472,7 +479,8 @@ export default { ...@@ -472,7 +479,8 @@ export default {
}).then((res) => { }).then((res) => {
//console.log(res); //console.log(res);
if (!res.data.ret) { if (!res.data.ret) {
this.isShowrdwcDialogBg = true; this.isShowbzDialogBg = true;
// this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true; this.isShowrdwcDialog = true;
} else { } else {
// 执行认定完成 // 执行认定完成
...@@ -559,6 +567,37 @@ export default { ...@@ -559,6 +567,37 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
// 加载动画
.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%;
}
}
}
.ltDiv { .ltDiv {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
src/views/cxyrd/TT.vue
...@@ -1107,7 +1107,7 @@ export default { ...@@ -1107,7 +1107,7 @@ export default {
this.souceDel = true; this.souceDel = true;
this.souceDelText = this.$moment( this.souceDelText = this.$moment(
this.sourcedatas[i - 1].removeTime this.sourcedatas[i - 1].removeTime
).format("LLL"); ).format("YYYY.MM.DD HH:mm");
} else { } else {
this.souceDel = false; this.souceDel = false;
} }
...@@ -1136,7 +1136,7 @@ export default { ...@@ -1136,7 +1136,7 @@ export default {
this.souceDel = true; this.souceDel = true;
this.souceDelText = this.$moment( this.souceDelText = this.$moment(
this.sourcedatas[i + 1].removeTime this.sourcedatas[i + 1].removeTime
).format("LLL"); ).format("YYYY.MM.DD HH:mm");
} else { } else {
this.souceDel = false; this.souceDel = false;
} }
...@@ -1182,7 +1182,7 @@ export default { ...@@ -1182,7 +1182,7 @@ export default {
this.souceDel = true; this.souceDel = true;
this.souceDelText = this.$moment( this.souceDelText = this.$moment(
res.data.ret[0].removeFlag.removeTime res.data.ret[0].removeFlag.removeTime
).format("LLL"); ).format("YYYY.MM.DD HH:mm");
} else { } else {
this.souceDel = false; this.souceDel = false;
} }
...@@ -1226,7 +1226,7 @@ export default { ...@@ -1226,7 +1226,7 @@ export default {
this.souceDel = true; this.souceDel = true;
this.souceDelText = this.$moment( this.souceDelText = this.$moment(
res.data.ret[0].removeFlag.removeTime res.data.ret[0].removeFlag.removeTime
).format("LLL"); ).format("YYYY.MM.DD HH:mm");
} else { } else {
this.souceDel = false; this.souceDel = false;
} }
...@@ -1444,7 +1444,9 @@ export default { ...@@ -1444,7 +1444,9 @@ export default {
val.clickLog = "1"; val.clickLog = "1";
if (val.removeFlag == "1") { if (val.removeFlag == "1") {
this.targetDel = true; this.targetDel = true;
this.targetDelText = this.$moment(val.removeTime).format("LLL"); this.targetDelText = this.$moment(val.removeTime).format(
"YYYY.MM.DD HH:mm"
);
} else { } else {
this.targetDel = false; this.targetDel = false;
} }
......
src/views/cxyrd/modules/LLCandidate.vue
...@@ -16,30 +16,8 @@ ...@@ -16,30 +16,8 @@
<!-- 指纹下拉框--> <!-- 指纹下拉框-->
<div class="finger-dropdown"> <div class="finger-dropdown">
<div class="fingerName"> <div class="fingerName">
<!-- <div @click="fingerDropdownChange">--> <span>{{ fingerShowType }}</span>
<!-- <span>指纹</span><i style=" width: 1rem; height: 1rem" class="el-icon-caret-bottom"></i>-->
<span>指纹</span>
</div> </div>
<transition name="slide-fade">
<div
class="dropdown-options"
v-show="isFingerDropdown"
@click="changefingershowType($event)"
>
<div class="option-item">
<div class="selected">
<span v-if="fingershowType === '指纹'">√</span>
</div>
<div class="txt">指纹</div>
</div>
<div class="option-item">
<div class="selected">
<span v-if="fingershowType === '掌纹'">√</span>
</div>
<div class="txt">掌纹</div>
</div>
</div>
</transition>
</div> </div>
<el-input <el-input
class="input" class="input"
...@@ -74,9 +52,9 @@ ...@@ -74,9 +52,9 @@
> >
<el-table-column label="排名" type="index" :width="width1"> <el-table-column label="排名" type="index" :width="width1">
</el-table-column> </el-table-column>
<!-- <el-table-column label="排名" width="50"></el-table-column>-->
<el-table-column prop="score" label="得分" :width="width2"> <el-table-column prop="score" label="得分" :width="width2">
<template slot-scope="scope"> <template slot-scope="scope">
<div :class="{ lcurrte: targetBh == scope.row.destbarcode }">
<!-- 被删除--> <!-- 被删除-->
<span v-if="scope.row.removeFlag === 1"> <span v-if="scope.row.removeFlag === 1">
<del>{{ scope.row.score }}</del> <del>{{ scope.row.score }}</del>
...@@ -84,15 +62,25 @@ ...@@ -84,15 +62,25 @@
<span v-else> <span v-else>
{{ scope.row.score }} {{ scope.row.score }}
</span> </span>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="destseqno" label="序号" :width="width3"> <el-table-column prop="destseqno" label="序号" :width="width3">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.removeFlag === 1">
<del>{{
scope.$index + 1 >= 9
? scope.$index + 1
: "0" + (scope.$index + 1)
}}</del>
</span>
<span v-else>
{{ {{
scope.$index + 1 >= 9 scope.$index + 1 >= 9
? scope.$index + 1 ? scope.$index + 1
: "0" + (scope.$index + 1) : "0" + (scope.$index + 1)
}} }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto"> <el-table-column prop="destbarcode" label="目标条码号" width="auto">
...@@ -113,96 +101,6 @@ ...@@ -113,96 +101,6 @@
> >
</div> </div>
</div> </div>
<transition name="slide-fade">
<div class="selectFinger" v-show="isShowOptions">
<div class="left-title">左手</div>
<div class="line" :class="{ active: leftRoll }">
<div class="selected">
<i class="el-icon-check" v-show="leftRoll"></i>
</div>
<div class="selected-type">滚动</div>
<div class="item" :class="{ active: leftRM }" @click="changeLeftRM">
拇
</div>
<div class="item" :class="{ active: leftRS }" @click="changeLeftRS">
食
</div>
<div class="item" :class="{ active: leftRZ }" @click="changeLeftRZ">
中
</div>
<div class="item" :class="{ active: leftRH }" @click="changeLeftRH">
环
</div>
<div class="item" :class="{ active: leftRX }" @click="changeLeftRX">
小
</div>
</div>
<div class="line" :class="{ active: leftPain }">
<div class="selected">
<i class="el-icon-check" v-show="leftPain"></i>
</div>
<div class="selected-type">平面</div>
<div class="item" :class="{ active: leftPM }" @click="changeLeftPM">
拇
</div>
<div class="item" :class="{ active: leftPS }" @click="changeLeftPS">
食
</div>
<div class="item" :class="{ active: leftPZ }" @click="changeLeftPZ">
中
</div>
<div class="item" :class="{ active: leftPH }" @click="changeLeftPH">
环
</div>
<div class="item" :class="{ active: leftPX }" @click="changeLeftPX">
小
</div>
</div>
<div class="right-title">右手</div>
<div class="line" :class="{ active: rightRoll }">
<div class="selected">
<i class="el-icon-check" v-show="rightRoll"></i>
</div>
<div class="selected-type">滚动</div>
<div class="item" :class="{ active: rightRM }" @click="changeRightRM">
拇
</div>
<div class="item" :class="{ active: rightRS }" @click="changeRightRS">
食
</div>
<div class="item" :class="{ active: rightRZ }" @click="changeRightRZ">
中
</div>
<div class="item" :class="{ active: rightRH }" @click="changeRightRH">
环
</div>
<div class="item" :class="{ active: rightRX }" @click="changeRightRX">
小
</div>
</div>
<div class="line" :class="{ active: rightPain }">
<div class="selected">
<i class="el-icon-check" v-show="rightPain"></i>
</div>
<div class="selected-type">平面</div>
<div class="item" :class="{ active: rightPM }" @click="changeRightPM">
拇
</div>
<div class="item" :class="{ active: rightPS }" @click="changeRightPS">
食
</div>
<div class="item" :class="{ active: rightPZ }" @click="changeRightPZ">
中
</div>
<div class="item" :class="{ active: rightPH }" @click="changeRightPH">
环
</div>
<div class="item" :class="{ active: rightPX }" @click="changeRightPX">
小
</div>
</div>
</div>
</transition>
</div> </div>
</template> </template>
...@@ -263,6 +161,8 @@ export default { ...@@ -263,6 +161,8 @@ export default {
timer: null, timer: null,
// 是否被删除 // 是否被删除
isDelete: false, isDelete: false,
//目标表格点击
targetBh: "",
}; };
}, },
created() { created() {
...@@ -1112,32 +1012,15 @@ export default { ...@@ -1112,32 +1012,15 @@ export default {
*/ */
search() { search() {
let self = this; let self = this;
//console.info(this.select);
if (self.isDelete) return; if (self.isDelete) return;
// if (self.input3 != "") { let value = this.input3.trim();
// this.tableData = this.sourceTableData.filter(item => { if (value) {
// return item.destbarcode == self.input3; this.tableData = this.sourceTableData.filter((item) => {
// }); return item.destbarcode.indexOf(value) >= 0;
// } else {
// this.tableData = this.sourceTableData;
// }
let zcseq = sessionStorage.getItem("zcseq");
let qqid = sessionStorage.getItem("qqid");
self.$store.commit("loading/setLoading", true);
this.$axios
.post(`/api/query/matchcand/dest/${qqid}/${zcseq}`, {
srcbarcode: sessionStorage.getItem("srcbarcode"),
destbarcode: self.input3.trim(),
})
.then((response) => {
//console.log(response);
self.tableData = response.data.ret;
self.total = self.tableData.length;
clearTimeout(self.timer);
self.timer = setTimeout(() => {
self.$store.commit("loading/setLoading", false);
}, 500);
}); });
} else {
this.tableData = this.sourceTableData;
}
}, },
/** /**
* @description: 选中切换方法 * @description: 选中切换方法
...@@ -1146,6 +1029,13 @@ export default { ...@@ -1146,6 +1029,13 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange(val, old) { handleCurrentChange(val, old) {
if (!val) return;
// document
// .getElementsByClassName("lcurrte")[0]
// .parentElement.parentElement.parentElement.classList.remove(
// "current-row"
// );
this.targetBh = val.destbarcode;
let self = this; let self = this;
if (self.isDelete) { if (self.isDelete) {
// 存储目标条码号 // 存储目标条码号
...@@ -1220,15 +1110,25 @@ export default { ...@@ -1220,15 +1110,25 @@ export default {
checked(newValue, oldValue) { checked(newValue, oldValue) {
if (newValue) { if (newValue) {
this.tableData = this.sourceTableData; this.tableData = this.sourceTableData;
// setTimeout(() => {
// document
// .getElementsByClassName("lcurrte")[0]
// .parentElement.parentElement.parentElement.classList.add(
// "current-row"
// );
// }, 100);
} else { } else {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.affirmstatus != 1; return item.affirmstatus != 2 && item.affirmstatus != 3;
}); });
//console.log(this.tableData); //console.log(this.tableData);
} }
this.total = this.tableData.length; this.total = this.tableData.length;
}, },
}, },
props: {
fingerShowType: String,
},
}; };
const candidates = [ const candidates = [
{ {
...@@ -1272,11 +1172,9 @@ const candidates = [ ...@@ -1272,11 +1172,9 @@ const candidates = [
height: calc(100% - 40px); height: calc(100% - 40px);
background: #f6f8fa; background: #f6f8fa;
border-radius: 8px; border-radius: 8px;
div { div {
display: inline-block; display: inline-block;
} }
.lt_cnadidate_search { .lt_cnadidate_search {
// width: 352px; // width: 352px;
width: 100%; width: 100%;
......
src/views/cxyrd/modules/LLSrc.vue
...@@ -274,12 +274,14 @@ export default { ...@@ -274,12 +274,14 @@ export default {
*/ */
switchZhangWen() { switchZhangWen() {
this.fingerShowType = "掌纹"; this.fingerShowType = "掌纹";
this.$emit("switchName", this.fingerShowType);
}, },
/** /**
* 切换为指纹 * 切换为指纹
*/ */
switchZhiWen() { switchZhiWen() {
this.fingerShowType = "指纹"; this.fingerShowType = "指纹";
this.$emit("switchName", this.fingerShowType);
}, },
/** /**
* @description: 比中与认定完成添加样式 * @description: 比中与认定完成添加样式
...@@ -311,14 +313,17 @@ export default { ...@@ -311,14 +313,17 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange(val, old) { handleCurrentChange(val, old) {
if (!val) return;
let self = this; let self = this;
// 发送请求 // 发送请求
self.$store.commit("loading/setLoading", true); self.$store.commit("loading/setLoading", true);
self.qqid = val.qqid;
self.qid = val.qid;
// 被删除 // 被删除
if (val.removeFlag === 1) { if (val.removeFlag === 1) {
self.$bus.emit("deleteMessage", { self.$bus.emit("deleteMessage", {
msg: "该条数据已删除！", msg: "该条数据已删除！",
delTime: self.$moment(val.removeTime).format("YYYY.MM.DD HH:MM"), delTime: self.$moment(val.removeTime).format("YYYY.MM.DD HH:mm"),
}); });
// 清空目标table表 // 清空目标table表
// self.$bus.emit("initCandidate", []); // self.$bus.emit("initCandidate", []);
...@@ -332,7 +337,7 @@ export default { ...@@ -332,7 +337,7 @@ export default {
// 请求该条码号的案件指纹图片 // 请求该条码号的案件指纹图片
self.$axios self.$axios
.post("/api/org/caseBybarcode/barcode", { .post("/api/org/caseBybarcode/barcode", {
querytype: "2", querytype: "3",
barcode: val.barcode, barcode: val.barcode,
qqid: self.qqid, qqid: self.qqid,
}) })
...@@ -380,7 +385,7 @@ export default { ...@@ -380,7 +385,7 @@ export default {
//console.log(barcode); //console.log(barcode);
self.$axios self.$axios
.post("/api/org/caseBybarcode/barcode", { .post("/api/org/caseBybarcode/barcode", {
querytype: "2", querytype: "3",
barcode: barcode, barcode: barcode,
qqid: self.qqid, qqid: self.qqid,
}) })
...@@ -537,8 +542,9 @@ export default { ...@@ -537,8 +542,9 @@ export default {
if (newValue) { if (newValue) {
this.dataList = this.sourceDataList; this.dataList = this.sourceDataList;
} else { } else {
console.log(this.sourceDataList, 11111111);
this.dataList = this.sourceDataList.filter((item) => { this.dataList = this.sourceDataList.filter((item) => {
return item.affirmStatus != 1; return item.affirmStatus != 1 && item.affirmStatus != 3;
}); });
//console.log(this.dataList); //console.log(this.dataList);
} }
......
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-06 17:00:24 * @LastEditTime: 2021-12-07 10:37:43
* @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
...@@ -107,14 +107,14 @@ module.exports = { ...@@ -107,14 +107,14 @@ module.exports = {
} }
}, },
"/login": { "/login": {
// target: "http://www.meetfood.cn:2390/", // 登录 target: "http://www.meetfood.cn:2390/", // 登录
target: "http://192.168.128.121:8764/", // 登录 // target: "http://192.168.128.121: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": {
...@@ -129,8 +129,8 @@ module.exports = { ...@@ -129,8 +129,8 @@ module.exports = {
"/security": { "/security": {
//target: "http://192.168.128.106:8765", // 湖南-王 //target: "http://192.168.128.106:8765", // 湖南-王
target: "http://192.168.128.121:8764", // 湖南-张 // target: "http://192.168.128.121:8764", // 湖南-张
// target: "http://www.meetfood.cn:2390", // 湖南-王 target: "http://www.meetfood.cn:2390", // 湖南-王
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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