Skip to content

F
founder_vue
Commit 86eb7772 by li_hongchao
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents 8e2c0d7a 282d98ea
Showing with 563 additions and 274 deletions
public/iconfont/demo_index.html
......@@ -55,6 +55,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe63c;</span>
<div class="name">错误-不合格</div>
<div class="code-name">&amp;#xe63c;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe63b;</span>
<div class="name">保存</div>
<div class="code-name">&amp;#xe63b;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe63a;</span>
<div class="name">检查</div>
<div class="code-name">&amp;#xe63a;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe639;</span>
<div class="name">审核</div>
<div class="code-name">&amp;#xe639;</div>
......@@ -330,9 +348,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1638362401014') format('woff2'),
url('iconfont.woff?t=1638362401014') format('woff'),
url('iconfont.ttf?t=1638362401014') format('truetype');
src: url('iconfont.woff2?t=1638878673085') format('woff2'),
url('iconfont.woff?t=1638878673085') format('woff'),
url('iconfont.ttf?t=1638878673085') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -359,6 +377,33 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-cuowu-buhege"></span>
<div class="name">
错误-不合格
</div>
<div class="code-name">.icon-cuowu-buhege
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-baocun"></span>
<div class="name">
保存
</div>
<div class="code-name">.icon-baocun
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-jiancha"></span>
<div class="name">
检查
</div>
<div class="code-name">.icon-jiancha
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shenhe1"></span>
<div class="name">
审核
......@@ -774,6 +819,30 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-cuowu-buhege"></use>
</svg>
<div class="name">错误-不合格</div>
<div class="code-name">#icon-cuowu-buhege</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-baocun"></use>
</svg>
<div class="name">保存</div>
<div class="code-name">#icon-baocun</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-jiancha"></use>
</svg>
<div class="name">检查</div>
<div class="code-name">#icon-jiancha</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shenhe1"></use>
</svg>
<div class="name">审核</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1638362401014') format('woff2'),
url('iconfont.woff?t=1638362401014') format('woff'),
url('iconfont.ttf?t=1638362401014') format('truetype');
src: url('iconfont.woff2?t=1638878673085') format('woff2'),
url('iconfont.woff?t=1638878673085') format('woff'),
url('iconfont.ttf?t=1638878673085') format('truetype');
}
.iconfont {
......@@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-cuowu-buhege:before {
content: "\e63c";
}
.icon-baocun:before {
content: "\e63b";
}
.icon-jiancha:before {
content: "\e63a";
}
.icon-shenhe1:before {
content: "\e639";
}
......
public/iconfont/iconfont.json
......@@ -6,6 +6,27 @@
"description": "",
"glyphs": [
{
"icon_id": "26222466",
"name": "错误-不合格",
"font_class": "cuowu-buhege",
"unicode": "e63c",
"unicode_decimal": 58940
},
{
"icon_id": "26222460",
"name": "保存",
"font_class": "baocun",
"unicode": "e63b",
"unicode_decimal": 58939
},
{
"icon_id": "26201357",
"name": "检查",
"font_class": "jiancha",
"unicode": "e63a",
"unicode_decimal": 58938
},
{
"icon_id": "26156485",
"name": "审核",
"font_class": "shenhe1",
......
src/router/modules/leftMenu.js
......@@ -130,7 +130,6 @@ export default [
meta: {
title: "检查详情",
auth: "5",
parentId: 'zljc'
},
component: () => import("@/views/zljc/jcxq.vue")
},
......
src/utils/requestLoading.js
/*
* @Author: your name
* @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
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\utils\requestLoading.js
......@@ -11,7 +11,7 @@ import store from '../store/index';
import { Loading } from 'element-ui' // 装包方式这样引入,我这里通过cdn引入,通过window.ELEMENT调用
// loading对象
let loading;
let timer;
// 当前正在请求的数量
let needLoadingRequestCount = 0;
......@@ -35,6 +35,7 @@ export function showLoading(target) {
store.commit('loading/setLoadingSd', true)
}
}
if (timer) clearTimeout(timer);
needLoadingRequestCount++;
}
......@@ -45,7 +46,7 @@ export function hideLoading(loadingTarget) {
if (needLoadingRequestCount === 0) {
// 关闭loading
toHideLoading(loadingTarget);
// if(loadingTarget) {
// store.commit('loading/setSmallLoading', false)
......@@ -58,16 +59,23 @@ export function hideLoading(loadingTarget) {
}
// 防抖：将 300ms 间隔内的关闭 loading 便合并为一次。防止连续请求时， loading闪烁的问题。
let toHideLoading = utils.debounce((loadingTarget) => {
// loading.close();
// loading = null;
// 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);
let toHideLoading = function (loadingTarget) {
if (timer) clearTimeout(timer);
timer = setTimeout(() => {
store.commit('loading/setSmallLoading', false)
store.commit('loading/setLoadingSd', false)
}, 500);
};
// let toHideLoading = utils.debounce((loadingTarget) => {
// // loading.close();
// // loading = null;
// // 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/AllPersonnelBase/gzlb.vue
......@@ -124,8 +124,8 @@
<Cascader
:form="ruleForm"
id="collectunitName"
codeName="CODE_XZQH"
></Cascader>
<!-- <el-select
v-model="collectunitName"
placeholder="请选择提取单位"
......@@ -436,6 +436,7 @@
prop="followCase.briefCase"
label="简要案情"
:width="width5"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -40,18 +40,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="现场勘验编号："
prop="xckybh"
>
<el-form-item label="警综案事件编号：">
<el-input
class="inputBh"
v-model.trim="ruleForm.xckybh"
placeholder="请输入现场勘验编号"
maxlength="22"
v-model.trim="ruleForm.jzasjbh"
placeholder="请输入警综案事件编号"
maxlength="23"
show-word-limit
clearable
><template slot="prepend">K</template></el-input>
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -59,7 +55,7 @@
<el-row>
<el-col :span="12">
<el-form-item
label="案事件发生地点："
label="案事件发生行政区："
prop="asjfsddXzqhdm"
>
<Cascader
......@@ -70,7 +66,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="现场掌指纹卡编号：">
<el-form-item label="现场勘验编号：">
<el-input
class="inputBh"
v-model.trim="ruleForm.xckybh"
placeholder="请输入现场勘验编号"
maxlength="22"
show-word-limit
clearable
><template slot="prepend">K</template></el-input>
</el-form-item>
<!-- <el-form-item label="现场掌指纹卡编号：">
<el-input
v-model.trim="ruleForm.xczzhwkbh"
placeholder="请输入现场物掌指纹卡编号"
......@@ -78,27 +84,30 @@
show-word-limit
clearable
></el-input>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<!-- 四 -->
<el-row>
<el-col :span="12">
<el-form-item label="损失价值(人民币元)：">
<el-form-item
label="案事件发生地点："
prop="asjfsddDzmc"
>
<el-input
v-model.trim="ruleForm.ssjzrmby"
placeholder="请输入损失价值"
maxlength="11"
v-model.trim="ruleForm.asjfsddDzmc"
placeholder="请输入案事件发生地点"
maxlength="100"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="警综案事件编号：">
<el-form-item label="现场掌指纹卡编号：">
<el-input
v-model.trim="ruleForm.jzasjbh"
placeholder="请输入警综案事件编号"
v-model.trim="ruleForm.xczzhwkbh"
placeholder="请输入现场物掌指纹卡编号"
maxlength="23"
show-word-limit
clearable
......@@ -109,12 +118,14 @@
<!-- 五 -->
<el-row>
<el-col :span="12">
<el-form-item label="案件类别：">
<Cascader
:form="ruleForm"
id="ajlbdm"
codeName="CODE_AJLB"
></Cascader>
<el-form-item label="损失价值(人民币元)：">
<el-input
v-model.trim="ruleForm.ssjzrmby"
placeholder="请输入损失价值"
maxlength="11"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -130,6 +141,19 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="案件类别：">
<Cascader
:form="ruleForm"
id="ajlbdm"
codeName="CODE_AJLB"
></Cascader>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="简要案情：">
<el-input
......@@ -317,7 +341,7 @@ export default {
ruleForm: {
ysxtAsjbh: "", // 案事件编号
xckybh: "", // 现场勘验编号
asjfsddXzqhdm: "1212", // 行政区代码
asjfsddXzqhdm: "", // 行政区代码
asjfsddDzmc: "", // 案事件发生地
ssjzrmby: "", // 损失价值
xczzhwkbh: "", // 现场掌指纹卡编号
......@@ -346,7 +370,10 @@ export default {
{ required: true, message: "请输入现场勘验编号", trigger: "blur" },
],
asjfsddXzqhdm: [
{ required: true, message: "请输入案事件发生地", trigger: "blur" },
{ required: true, message: "请选择案事件发生行政区", trigger: "blur" },
],
asjfsddDzmc: [
{ required: true, message: "请输入案事件发生地点", trigger: "blur" },
],
sfmaPdbz: [
{ required: true, message: "请选择是否命案", trigger: "change" },
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -486,7 +486,6 @@ export default {
ifidcard: "是", // 是否采集二代身份证
zwbdxtlxms: "1", // 指纹比对描述
nydwGajgjgdm: "1", // 捺印单位代码
},
logicList: [],// 逻辑库代码
rules: {
......
src/views/SystemManage/GroupPermission.vue
......@@ -104,6 +104,16 @@
数据权限
</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 @click="redact" class="editText" v-if="editBoo">
<i class="el-icon-edit"></i>
......@@ -115,6 +125,7 @@
<!-- <el-button @click="del">del</el-button>-->
<!-- <el-button @click="search">search</el-button>-->
</div>
</div>
</div>
<el-checkbox-group v-model="checkList" :disabled="disabled">
<div class="role-info">
......
src/views/SystemManage/UserManage.vue
......@@ -293,6 +293,13 @@
v-model="addFormParams.name"
></el-input>
</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">
<Cascader :form="addFormParams" id="unitCode"></Cascader>
</el-form-item>
......@@ -595,6 +602,7 @@ export default {
sWidth: 50,
// 新增对象
addFormParams: {
identityCard: "",
username: "2233333",
phoneNumber: "13327454372",
password: "2222222",
......@@ -608,6 +616,7 @@ export default {
roleId: [],
},
editFormParams: {
identityCard: "",
username: "", //用户名
name: "", //姓名
unitCode: "", //单位代码
......@@ -618,6 +627,10 @@ export default {
roleId: [], // 角色
},
addrules: {
//身份证
identityCard: [
{ validator: validatePass, trigger: "blur", required: true },
],
password: [
{ validator: validatePass, trigger: "blur", required: true },
], //密码
......
src/views/SystemManage/UserPermission.vue
......@@ -94,16 +94,33 @@
数据权限
</div>
</div>
<div class="save">
<div @click="redact" class="editText" v-if="editBoo">
<i class="el-icon-edit"></i>
<span>编辑</span>
<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 @click="redact" class="editText" v-if="editBoo">
<i class="el-icon-edit"></i>
<span>编辑</span>
</div>
<div :class="{ disabel: isSave, btn: true }" @click="save">
保存
</div>
<!-- <el-button @click="add">add</el-button>-->
<!-- <el-button @click="edit">edit</el-button>-->
<!-- <el-button @click="del">del</el-button>-->
<!-- <el-button @click="search">search</el-button>-->
</div>
<div :class="{ disabel: isSave, btn: true }" @click="save">保存</div>
<!-- <el-button @click="add">add</el-button>-->
<!-- <el-button @click="edit">edit</el-button>-->
<!-- <el-button @click="del">del</el-button>-->
<!-- <el-button @click="search">search</el-button>-->
</div>
</div>
<el-checkbox-group v-model="checkList" :disabled="disabled">
......
src/views/SystemManage/scss/userpermission.scss
......@@ -250,7 +250,9 @@
.btns {
width: 224px;
height: 48px;
margin-left: 2px;
background: #f6f8fa;
box-shadow: inset 0px 1px 3px 1px rgba(5, 95, 231, 0.5);
border-radius: 8px;
text-align: center;
.btn {
......@@ -267,13 +269,66 @@
// border-radius: 6px;
//}
&.active {
background: #ffffff;
color: #055fe7;
background: #055fe7;
color: #fff;
box-shadow: 0px 6px 8px 1px rgba(0, 21, 51, 0.05);
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 {
.btn {
right: 30px;
......
src/views/cxyrd/LL.vue
<template>
<div class="ltDiv">
<div class="lt" :class="{ bzActive: isShowbzDialogBg }">
<div class="lt" :class="{ bzActive: isShowbzDialogBg || loading_sd }">
<div class="header">
<div class="label">串查</div>
<div class="btns">
......@@ -11,7 +11,14 @@
<div class="header_line"></div>
<div class="lt_main">
<div class="lt_main_left">
<LLSrc :src-data="qid"></LLSrc>
<LLSrc
:src-data="qid"
@switchName="
(val) => {
fingerShowType = val;
}
"
></LLSrc>
</div>
<div class="lt_main_middle">
<!-- <div class="lt_main_header">顶部工具</div>
......@@ -20,10 +27,19 @@
<ImageEd></ImageEd>
</div>
<div class="lt_main_right">
<LLCandidate></LLCandidate>
<LLCandidate :fingerShowType="fingerShowType"></LLCandidate>
</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="bzDialog" v-show="isShowbzDialogBg" @click="cancelbz"></div> -->
<div class="bzDialog" v-show="isShowbzDialogBg"></div>
......@@ -164,6 +180,7 @@
</template>
<script>
import { mapState } from "vuex";
import "@/icons/error.svg";
import Utils from "@/utils/util.js";
import LLSrc from "./modules/LLSrc.vue";
......@@ -177,6 +194,11 @@ export default {
LLCandidate,
ImageEd,
},
computed: {
...mapState({
loading_sd: (state) => state.loading.loading_sd,
}),
},
data() {
return {
source: {
......@@ -193,6 +215,7 @@ export default {
tqryXm: "",
xh: "",
},
fingerShowType: "指纹",
qid: null,
radio: 6,
phone: "",
......@@ -243,9 +266,8 @@ export default {
*/
confirmrdwc() {
let self = this;
this.isShowrdwcDialogBg = false;
this.isShowbzDialogBg = false;
this.isShowrdwcDialog = false;
let srcseqno = sessionStorage.getItem("srcseqno") || "";
let destseqno = sessionStorage.getItem("destseqno") || "";
let srcbarcode = sessionStorage.getItem("srcbarcode") || "";
......@@ -273,9 +295,6 @@ export default {
self.$bus.emit("updateFinderSource");
//console.log(response);
this.$message.success("认定完成！");
if (type == "son") {
window.close();
}
});
},
/**
......@@ -284,7 +303,7 @@ export default {
* @return {*}
*/
cancelrdwc() {
this.isShowrdwcDialogBg = false;
this.isShowbzDialogBg = false;
this.isShowrdwcDialog = false;
},
/**
......@@ -338,17 +357,6 @@ export default {
this.$message.error("比中失败！");
});
// 更新电话
this.$axios({
method: "post",
url: "/api/user/update",
data: {
telephone: self.phone,
},
}).then((res) => {
//console.log(res);
});
this.isShowbzDialogBg = false;
this.isShowbzDialog = false;
},
......@@ -366,7 +374,7 @@ export default {
sessionStorage.getItem("destbarcode") || ""
);
this.$axios({
url: "/api/casestore/casebase",
url: "/api/casestore/casebase/detail",
method: "get",
params: {
barcode: destbarcode,
......@@ -399,7 +407,7 @@ export default {
this.$set(self.source, "asjbh", srcbarcode);
this.$axios({
method: "get",
url: "/api/casestore/casebase?barcode=" + srcbarcode,
url: "/api/casestore/casebase/detail?barcode=" + srcbarcode,
}).then((res) => {
if (res.data.code == 0 && res.data.message) {
let result = res.data.ret;
......@@ -460,7 +468,6 @@ export default {
Rdwc() {
//console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || "";
// 认定之前的操作
this.$axios({
method: "post",
......@@ -472,7 +479,8 @@ export default {
}).then((res) => {
//console.log(res);
if (!res.data.ret) {
this.isShowrdwcDialogBg = true;
this.isShowbzDialogBg = true;
// this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true;
} else {
// 执行认定完成
......@@ -559,6 +567,37 @@ export default {
</script>
<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 {
width: 100%;
height: 100%;
......
src/views/cxyrd/TT.vue
......@@ -1107,7 +1107,7 @@ export default {
this.souceDel = true;
this.souceDelText = this.$moment(
this.sourcedatas[i - 1].removeTime
).format("LLL");
).format("YYYY.MM.DD HH:mm");
} else {
this.souceDel = false;
}
......@@ -1136,7 +1136,7 @@ export default {
this.souceDel = true;
this.souceDelText = this.$moment(
this.sourcedatas[i + 1].removeTime
).format("LLL");
).format("YYYY.MM.DD HH:mm");
} else {
this.souceDel = false;
}
......@@ -1182,7 +1182,7 @@ export default {
this.souceDel = true;
this.souceDelText = this.$moment(
res.data.ret[0].removeFlag.removeTime
).format("LLL");
).format("YYYY.MM.DD HH:mm");
} else {
this.souceDel = false;
}
......@@ -1226,7 +1226,7 @@ export default {
this.souceDel = true;
this.souceDelText = this.$moment(
res.data.ret[0].removeFlag.removeTime
).format("LLL");
).format("YYYY.MM.DD HH:mm");
} else {
this.souceDel = false;
}
......@@ -1444,7 +1444,9 @@ export default {
val.clickLog = "1";
if (val.removeFlag == "1") {
this.targetDel = true;
this.targetDelText = this.$moment(val.removeTime).format("LLL");
this.targetDelText = this.$moment(val.removeTime).format(
"YYYY.MM.DD HH:mm"
);
} else {
this.targetDel = false;
}
......
src/views/cxyrd/modules/LLCandidate.vue
......@@ -16,30 +16,8 @@
<!-- 指纹下拉框-->
<div class="finger-dropdown">
<div class="fingerName">
<!-- <div @click="fingerDropdownChange">-->
<!-- <span>指纹</span><i style=" width: 1rem; height: 1rem" class="el-icon-caret-bottom"></i>-->
<span>指纹</span>
<span>{{ fingerShowType }}</span>
</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>
<el-input
class="input"
......@@ -74,25 +52,35 @@
>
<el-table-column label="排名" type="index" :width="width1">
</el-table-column>
<!-- <el-table-column label="排名" width="50"></el-table-column>-->
<el-table-column prop="score" label="得分" :width="width2">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag === 1">
<del>{{ scope.row.score }}</del>
</span>
<span v-else>
{{ scope.row.score }}
</span>
<div :class="{ lcurrte: targetBh == scope.row.destbarcode }">
<!-- 被删除-->
<span v-if="scope.row.removeFlag === 1">
<del>{{ scope.row.score }}</del>
</span>
<span v-else>
{{ scope.row.score }}
</span>
</div>
</template>
</el-table-column>
<el-table-column prop="destseqno" label="序号" :width="width3">
<template slot-scope="scope">
{{
scope.$index + 1 >= 9
? scope.$index + 1
: "0" + (scope.$index + 1)
}}
<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
: "0" + (scope.$index + 1)
}}
</span>
</template>
</el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto">
......@@ -113,96 +101,6 @@
>
</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>
</template>
......@@ -263,6 +161,8 @@ export default {
timer: null,
// 是否被删除
isDelete: false,
//目标表格点击
targetBh: "",
};
},
created() {
......@@ -1112,32 +1012,15 @@ export default {
*/
search() {
let self = this;
//console.info(this.select);
if (self.isDelete) return;
// if (self.input3 != "") {
// this.tableData = this.sourceTableData.filter(item => {
// return item.destbarcode == self.input3;
// });
// } 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);
let value = this.input3.trim();
if (value) {
this.tableData = this.sourceTableData.filter((item) => {
return item.destbarcode.indexOf(value) >= 0;
});
} else {
this.tableData = this.sourceTableData;
}
},
/**
* @description: 选中切换方法
......@@ -1146,6 +1029,13 @@ export default {
* @return {*}
*/
handleCurrentChange(val, old) {
if (!val) return;
// document
// .getElementsByClassName("lcurrte")[0]
// .parentElement.parentElement.parentElement.classList.remove(
// "current-row"
// );
this.targetBh = val.destbarcode;
let self = this;
if (self.isDelete) {
// 存储目标条码号
......@@ -1220,15 +1110,25 @@ export default {
checked(newValue, oldValue) {
if (newValue) {
this.tableData = this.sourceTableData;
// setTimeout(() => {
// document
// .getElementsByClassName("lcurrte")[0]
// .parentElement.parentElement.parentElement.classList.add(
// "current-row"
// );
// }, 100);
} else {
this.tableData = this.sourceTableData.filter((item) => {
return item.affirmstatus != 1;
return item.affirmstatus != 2 && item.affirmstatus != 3;
});
//console.log(this.tableData);
}
this.total = this.tableData.length;
},
},
props: {
fingerShowType: String,
},
};
const candidates = [
{
......@@ -1272,11 +1172,9 @@ const candidates = [
height: calc(100% - 40px);
background: #f6f8fa;
border-radius: 8px;
div {
display: inline-block;
}
.lt_cnadidate_search {
// width: 352px;
width: 100%;
......
src/views/cxyrd/modules/LLSrc.vue
......@@ -274,12 +274,14 @@ export default {
*/
switchZhangWen() {
this.fingerShowType = "掌纹";
this.$emit("switchName", this.fingerShowType);
},
/**
* 切换为指纹
*/
switchZhiWen() {
this.fingerShowType = "指纹";
this.$emit("switchName", this.fingerShowType);
},
/**
* @description: 比中与认定完成添加样式
......@@ -311,14 +313,17 @@ export default {
* @return {*}
*/
handleCurrentChange(val, old) {
if (!val) return;
let self = this;
// 发送请求
self.$store.commit("loading/setLoading", true);
self.qqid = val.qqid;
self.qid = val.qid;
// 被删除
if (val.removeFlag === 1) {
self.$bus.emit("deleteMessage", {
msg: "该条数据已删除！",
delTime: self.$moment(val.removeTime).format("YYYY.MM.DD HH:MM"),
delTime: self.$moment(val.removeTime).format("YYYY.MM.DD HH:mm"),
});
// 清空目标table表
// self.$bus.emit("initCandidate", []);
......@@ -332,7 +337,7 @@ export default {
// 请求该条码号的案件指纹图片
self.$axios
.post("/api/org/caseBybarcode/barcode", {
querytype: "2",
querytype: "3",
barcode: val.barcode,
qqid: self.qqid,
})
......@@ -380,7 +385,7 @@ export default {
//console.log(barcode);
self.$axios
.post("/api/org/caseBybarcode/barcode", {
querytype: "2",
querytype: "3",
barcode: barcode,
qqid: self.qqid,
})
......@@ -537,8 +542,9 @@ export default {
if (newValue) {
this.dataList = this.sourceDataList;
} else {
console.log(this.sourceDataList, 11111111);
this.dataList = this.sourceDataList.filter((item) => {
return item.affirmStatus != 1;
return item.affirmStatus != 1 && item.affirmStatus != 3;
});
//console.log(this.dataList);
}
......
src/views/login/modules/AccountsLogin.vue
......@@ -90,7 +90,7 @@ export default {
"Content-Type": "application/x-www-form-urlencoded",
},
}).then((res) => {
me.btnLoading = false;
me.btnLoading = false;
if (res.data.code == 200) {
localStorage.setItem("token", res.data.token);
localStorage.setItem("userInfo", JSON.stringify(res.data.userInfo));
......
src/views/zljc/Index.vue
......@@ -200,7 +200,10 @@
>
<template slot-scope="scope">
<div v-if="scope.row.inspectionFlag==2"><span>/</span></div>
<div v-else><span class="iconfont icon-shenhe1"></span></div>
<div
v-else
@click="goShenHe(scope.row)"
><span class="iconfont icon-shenhe1"></span></div>
</template>
</el-table-column>
</el-table>
......@@ -284,17 +287,15 @@ export default {
reqParam.inspectionFlag = this.formInline.inspectionFlag == null ? null : Number(this.formInline.inspectionFlag)
reqParam.codeDwCode = this.formInline.codeDwCode
reqParam.type = this.formInline.type
console.info("请求===>", reqParam);
// console.info("请求===>", reqParam);
this.$axios
.post("/api/zljc/queryAll", reqParam)
.then((response) => {
if (response.data.code === 0) {
console.log(response.data.ret)
// console.log(response.data.ret)
this.tableDate = response.data.ret.rows;
this.total = response.data.ret.total;
//console.info("查询结果===>", this.tableDate);
console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(response.data.message);
......@@ -315,6 +316,17 @@ export default {
console.log('submit!');
this.search()
},
goShenHe (val) {
// console.log('hang', val)
//跳转时页面
this.$router.push({
name: 'jcxq',
params: {
barcode: val.barcode,
id: val.personId,
}
})
},
// 格式化参数(开始时间，结束时间)
getParam () {
if (this.formInline.nysj !== null) {
......
src/views/zljc/jcxq.vue
<template>
<div class="jcxq">
<div :class="[ radio1==1 ? ' jcxq p1' : 'jcxq p2' ]">
<div class='fixedBox'>
<div class="head">
<div class="headLeft">
......@@ -14,36 +14,73 @@
<el-button class="bhg">不合格</el-button>
</div>
</div>
<div class="line"></div>
<div
class="line"
v-if="radio1==1"
>
<div></div>
</div>
<div
class='zwTip'
v-else
>
<div>
<div class='w88'></div>
<div class="w660">{{radio1==2?'左手':'右手'}}滚动指纹</div>
<div class="w48"></div>
<div class="w660">{{radio1==2?'左手':'右手'}}平面指纹</div>
<div class="w88"><span class="iconfont icon-baocun"></span>保存</div>
</div>
</div>
</div>
<div class="content">
<ryxx v-if="radio1==1"></ryxx>
<ryxx
v-if="radio1==1"
:rowData="rowData"
></ryxx>
<nyzw v-else>
</nyzw>
</div>
</div>
</template>
<script>
import ryxx from "./modules/ryxx.vue"
import nyzw from "./modules/nyzw.vue"
export default {
name: "jcxq",
components: {
ryxx,
nyzw,
},
created () {
console.log(this.$route.params, '跳转参数到详情页')
this.rowData.barcode = this.$route.params.barcode
this.rowData.id = this.$route.params.id
},
data () {
return {
radio1: '1',
radio1: '2',
rowData: {
barcode: '', // 人员条码号
id: '', // 人员id
}
}
}
}
</script>
<style lang="scss"scoped>
.p1 {
padding-top: 108px;
}
.p2 {
padding-top: 128px;
}
.jcxq {
position: relative;
width: 100%;
box-sizing: border-box;
height: 100%;
padding-top: 108px;
.fixedBox {
position: absolute;
top: 0;
......@@ -100,13 +137,58 @@ export default {
}
}
.line {
margin-top: 74px;
margin: 24px 0;
width: 100%;
height: 1px;
background: #eeeeee;
padding: 0 24px;
box-sizing: border-box;
div {
margin: 24px 0;
width: 100%;
height: 1px;
background: #eeeeee;
}
}
.zwTip {
margin-top: 24px;
padding: 0 24px;
box-sizing: border-box;
div {
height: 48px;
background: #f6f8fa;
display: flex;
.w88 {
width: 88px;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
vertical-align: middle;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
span {
font-size: 12px;
margin-right: 4px;
}
}
.w660 {
width: 660px;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
text-align: center;
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #282f3c;
}
.w48 {
width: 48px;
height: 100%;
}
}
}
.content {
width: 100%;
height: 100%;
overflow: auto;
}
......
src/views/zljc/modules/nyzw.vue 0 → 100644
<template>
<div>
<div>捺印</div>
<div>捺印</div>
<div>捺印</div>
<div>捺印</div>
<div>捺印</div>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss"scoped>
</style>
\ No newline at end of file
vue.config.js
/*
* @Author: your name
* @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
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -107,14 +107,14 @@ module.exports = {
}
},
"/login": {
// target: "http://www.meetfood.cn:2390/", // 登录
target: "http://192.168.128.121:8764/", // 登录
target: "http://www.meetfood.cn:2390/", // 登录
// target: "http://192.168.128.121:8764/", // 登录
// target: "http://192.168.128.114:8099", // 登录-马
ws: true,
changeOrigin: true,
pathRewrite: {
"^/login": ""
// "^/login": "/login"
// "^/login": ""
"^/login": "/login"
}
},
// "/system": {
......@@ -129,8 +129,8 @@ module.exports = {
"/security": {
//target: "http://192.168.128.106:8765", // 湖南-王
target: "http://192.168.128.121:8764", // 湖南-张
// target: "http://www.meetfood.cn:2390", // 湖南-王
// target: "http://192.168.128.121:8764", // 湖南-张
target: "http://www.meetfood.cn:2390", // 湖南-王
ws: true,
changeOrigin: true,
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