Skip to content

F
founder_vue
Commit f20ca0c9 by liyuhang19990520
Options

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

parents a9099e6e a8369cf3
Showing with 805 additions and 408 deletions
src/icons/group-item.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="13px" viewBox="0 0 16 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>chengyuan备份 3</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编辑用户权限-无角色备份" transform="translate(-1266.000000, -166.000000)" fill="#333333" fill-rule="nonzero">
<g id="chengyuan备份-3" transform="translate(1266.000000, 166.000000)">
<path d="M15.9953288,12.2075065 C15.7038337,10.0524917 14.4494104,8.22413571 12.7374869,7.32798773 C13.48795,6.74565855 13.9480741,5.87176072 13.9480741,4.93183076 C13.9480741,3.45213244 12.8198931,2.16534066 11.2661579,1.87267655 C10.9728646,1.81792212 10.6952782,2.00366335 10.6393316,2.28761774 C10.5828712,2.57209291 10.7731705,2.84633193 11.0633077,2.90108636 C12.1146423,3.0996138 12.8773994,3.9535601 12.8773994,4.93183076 C12.8773994,5.78665701 12.2857851,6.56262901 11.404107,6.86691203 C11.1736413,6.87809996 10.9687911,7.03288132 10.9101471,7.26290736 C10.839044,7.54380887 11.0131411,7.82828404 11.3001589,7.89837472 C13.0045042,8.31444727 14.365628,9.82756573 14.8237336,11.7521235 L1.09942782,11.7521235 C1.33103117,9.66560111 2.92502443,7.90194842 5.06009831,7.45579595 C5.31122519,7.40335813 5.4833405,7.18642359 5.48348728,6.94490433 C5.48680848,6.72870607 5.35249249,6.52446793 5.13327484,6.44527246 C4.01764469,6.04311748 3.26848439,4.99423537 3.26848439,3.83534158 C3.26848439,2.29833878 4.54619284,1.0478584 6.11717622,1.0478584 C7.68764583,1.0478584 8.96535427,2.2983388 8.96535427,3.83534158 C8.96535427,4.98778839 8.22443273,6.03133693 7.11959191,6.43839449 C7.07984759,6.45128845 7.04182808,6.46876174 7.00628572,6.49027562 C7.00470769,6.4912274 7.00311131,6.49216122 7.00153328,6.49313097 C6.99725793,6.49578877 6.99303761,6.49850047 6.98883565,6.50126602 C6.98474379,6.50392382 6.98068861,6.50661755 6.97670685,6.5093831 C6.97511046,6.51049651 6.97355078,6.51162787 6.97197276,6.51275924 C6.90857634,6.55769055 6.85708855,6.61503095 6.81978465,6.67996765 C6.81971126,6.6800754 6.81965621,6.68020111 6.81958282,6.68030886 C6.81536252,6.68767171 6.81132569,6.69512434 6.80747236,6.70266676 C6.80732558,6.70297204 6.80716043,6.70327733 6.80701363,6.70358263 C6.80316031,6.71116097 6.79950882,6.71881116 6.79604082,6.72655112 C6.79600411,6.72664092 6.79596743,6.7267307 6.79593072,6.7268205 C6.7537643,6.82106491 6.73974553,6.92744904 6.75996633,7.03309688 C6.76020487,7.03433599 6.76038836,7.0355751 6.76064525,7.03679626 C6.76183794,7.04279428 6.76321413,7.04877434 6.76464537,7.05477238 C6.76526924,7.05746611 6.76585641,7.06015983 6.76653535,7.06283559 C6.76780144,7.06779205 6.76921433,7.07274849 6.77062721,7.07770495 C6.77163641,7.0812427 6.77260892,7.08479842 6.77370986,7.08831822 C6.77510439,7.09286163 6.77664573,7.09740505 6.77818707,7.10194845 C6.77943481,7.10562988 6.7806642,7.10931131 6.7820037,7.11295681 C6.78262757,7.11466283 6.78314135,7.11638681 6.78378358,7.11809285 C6.78488452,7.12100208 6.78613227,7.12380354 6.78728826,7.12669481 C6.78870116,7.13025054 6.79011403,7.13378829 6.79160032,7.13729013 C6.79352698,7.14186946 6.7955454,7.14639491 6.7976005,7.15088446 C6.79906843,7.15409898 6.80055471,7.15731349 6.80209605,7.16051003 C6.8044264,7.16535874 6.80683014,7.17015356 6.80930727,7.17491248 C6.81066512,7.17751641 6.8120413,7.18010238 6.81343584,7.18268837 C6.81626161,7.18791419 6.81916079,7.19306819 6.82215169,7.1981683 C6.82332604,7.20016166 6.82450038,7.20211909 6.82569308,7.2040945 C6.82903264,7.20960765 6.83242722,7.21506693 6.83595027,7.22041846 C6.83694113,7.2219449 6.83796868,7.22345339 6.83897789,7.22496186 C6.84275782,7.23058277 6.8465928,7.23613183 6.85057458,7.24159112 C6.85154708,7.24292003 6.85253795,7.24423097 6.85352879,7.24555988 C6.85758397,7.25100121 6.86169418,7.25638866 6.86593284,7.26165038 C6.86712554,7.2631409 6.86835492,7.26459552 6.86958433,7.26606809 C6.87365785,7.27102455 6.87778641,7.27590916 6.88202508,7.28068602 C6.88374991,7.28264345 6.88554813,7.28454703 6.88730964,7.28648651 C6.89108957,7.29061688 6.8948695,7.29471134 6.89877787,7.29871602 C6.90143849,7.30144567 6.90417253,7.30410347 6.9068882,7.3067972 C6.90997086,7.30983213 6.91305353,7.31286705 6.91620959,7.31583015 C6.92011797,7.31949361 6.92411809,7.32303138 6.92813656,7.32658708 C6.93019166,7.32840085 6.93224678,7.33025054 6.93433857,7.3320284 C6.93962313,7.33655386 6.9450545,7.34095361 6.95054089,7.34528153 C6.95144,7.34598189 6.95230241,7.34671817 6.95320152,7.34740059 C6.99900107,7.38308344 7.05135128,7.41172671 7.10889431,7.43142681 C7.10913285,7.43151661 7.10937139,7.43158844 7.10962827,7.43167822 C7.11709639,7.43422827 7.12465625,7.43661671 7.13230785,7.43886147 C7.13340879,7.43918473 7.13449139,7.43949002 7.13559235,7.4397953 C7.14256504,7.44178866 7.14957442,7.44367426 7.15667557,7.44539825 C7.15834534,7.44581129 7.16001512,7.4461884 7.1616849,7.44656554 C7.16607035,7.44758914 7.17041911,7.44872052 7.17485961,7.44965434 C8.94504171,7.81855082 10.3837642,9.09769243 10.9300743,10.7866392 C11.0022233,11.0097154 11.2129086,11.1524648 11.44031,11.1524648 C11.4936327,11.1524648 11.5480013,11.1447967 11.6018561,11.1278981 C11.8836445,11.0409088 12.0399612,10.7461974 11.950564,10.470432 C11.4163826,8.81781456 10.1768588,7.48930597 8.5900034,6.80281948 C9.48529658,6.08711507 10.0361023,5.00172402 10.0361023,3.83534169 C10.0361023,1.72067884 8.27795723,0 6.11724956,0 C3.9560281,0 2.19788307,1.72067884 2.19788307,3.83534169 C2.19788307,5.00492058 2.75133104,6.09261027 3.65067939,6.8081351 C1.47846683,7.74977098 0,9.88803086 0,12.2760708 C0,12.565664 0.239438456,12.8 0.535337318,12.8 L15.0736678,12.8 C15.1427892,12.8 15.2087728,12.7870701 15.2693985,12.7637784 C15.330226,12.7871958 15.3960445,12.8 15.4641934,12.8 C15.4872033,12.8 15.5112407,12.7984556 15.5347644,12.7954027 C15.8280393,12.757529 16.0340272,12.4940469 15.9953288,12.2075065 Z" id="路径"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/views/SystemManage/GroupManage.vue
......@@ -52,7 +52,7 @@
<el-input
v-model="searchParams.unitcode"
class="search-info"
placeholder="请输入用户名"
placeholder="请输入单位代码"
></el-input>
</div>
<div class="search-item">
......@@ -64,9 +64,9 @@
<!-- >-->
<!-- </el-select>-->
<el-input
v-model="searchParams.roleId"
v-model="searchParams.rolename"
class="search-info"
placeholder="请输入用户名"
placeholder="请输入角色名"
></el-input>
</div>
<div class="btn" @click="search">筛选用户组</div>
......@@ -113,14 +113,47 @@
</el-table-column>
<el-table-column prop="groupname" label="用户组" :width="width1">
</el-table-column>
<el-table-column prop="rolename" label="组角色" :width="width2">
<!-- <div class="tags" v-for="item in rolenames">-->
<!-- {{ item }}-->
<!-- </div>-->
<el-table-column
prop="rolename"
label="组角色"
:width="width2"
show-overflow-tooltip
>
<template slot-scope="scope">
<div
class="tags"
v-for="item in scope.row.rolename &&
scope.row.rolename.split(',')"
>
{{ item }}
</div>
</template>
</el-table-column>
<el-table-column :width="btnwidth">
<div class="set-btn" @click="setRole">
角色设置
</div>
</el-table-column>
<el-table-column prop="username" label="组成员" :width="width3">
</el-table-column
><el-table-column prop="status" label="启用状态" :width="width3">
<template slot-scope="scope">
<div class="group-item">
<svg-icon
style="width: 1rem;height: .8125rem;margin-bottom: -0.0625rem;"
icon-class="group-item"
/>
{{ scope.row.username.split(",").length }}
</div>
<!-- <div class="set-btn">-->
<!-- 用户设置-->
<!-- </div>-->
</template>
</el-table-column>
<el-table-column>
<div class="set-btn" :width="btnwidth" @click="setUser">
用户设置
</div>
</el-table-column>
<el-table-column prop="status" label="启用状态" :width="width3">
<template slot-scope="scope">
<div v-if="scope.row.status === '0'" class="circle-red"></div>
<div v-if="scope.row.status === '1'" class="circle-blue"></div>
......@@ -163,9 +196,9 @@
@current-change="handleCurrPageChange"
:current-page="searchParams.page.page"
:page-sizes="[10, 20, 50, 100]"
:page-size="Tpage"
:page-size="searchParams.page.total"
layout="prev, pager, next"
:total="searchParams.page.total"
:total="searchParams.page.count"
>
</el-pagination>
</div>
......@@ -213,7 +246,7 @@
v-model="addFormParams.userId"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="加入组角色:" prop="roleId">
<el-form-item class="info-item" label="加入组角色:">
<el-input
placeholder="请选择组角色"
class="input-info"
......@@ -281,14 +314,13 @@
v-model="editFormParams.userId"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="加入组角色:" prop="roleId">
<el-form-item class="info-item" label="加入组角色:">
<el-input
placeholder="请选择组角色"
class="input-info"
v-model="editFormParams.roleId"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
<el-radio-group class="radio-info" v-model="editFormParams.status">
<el-radio :label="'1'">启用</el-radio>
......@@ -307,21 +339,46 @@
</el-form>
</div>
</div>
<!-- 角色设置 -->
<el-dialog :title="title.roletitle" :visible.sync="visible.setRoleVisible">
<div slot="title">
<img class="title-img" :src="src" alt="" />
<span>{{ title.roletitle }}</span>
</div>
</el-dialog>
<!-- 用户设置 -->
<el-dialog
class="dialog"
:title="title.usertitle"
:visible.sync="visible.setUserVisible"
>
<div slot="title">
<img class="title-img" :src="src" alt="" />
<span>{{ title.usertitle }}</span>
</div>
<div class="user-dialog">
<div class="header">1</div>
<div class="user-table">2</div>
</div>
</el-dialog>
</el-container>
</template>
<script>
import "@/icons/ic_add.svg";
import "@/icons/group-item.svg";
// import "@/assets/imp/police-badge.png";
export default {
name: "GroupManage",
created() {
let w1 = 1920;
let w2 = window.innerWidth;
this.height = (this.height * w2) / w1;
this.width1 = (this.width1 * w2) / w1;
this.width2 = (this.width2 * w2) / w1;
this.width3 = (this.width3 * w2) / w1;
this.btnwidth = (this.btnwidth * w2) / w1;
},
data() {
// 组名
......@@ -357,10 +414,14 @@ export default {
}
};
return {
width3: 300,
width2: 600,
width3: 110,
width2: 400,
width1: 200,
height: 1080,
height: 565,
btnwidth: 150,
title: { roletitle: "角色设置", usertitle: "用户设置" },
visible: { setRoleVisible: false, setUserVisible: false },
src: require("@/assets/img/police-badge.png"),
// 选中数据
multipleSelection: [],
isShowTip: false, //批量操作提示
......@@ -443,12 +504,14 @@ export default {
},
methods: {
clear() {
console.info("清空方法");
},
// 搜索方式
searchStyle(val) {
// console.log(val, '搜索方式')
this.searchOptions = val;
this.searchParams.page.page = 1; //必填
this.searchParams.page.total = 20; //必填
this.searchParams.groupname = "";
this.searchParams.username = "";
this.searchParams.truename = "";
this.searchParams.unitcode = "";
this.searchParams.rolename = "";
this.search();
},
// 清除所有选项
toggleSelection(rows) {
......@@ -489,6 +552,13 @@ export default {
open() {
this.isShowAddUserDialog = true;
this.isShowAddUserDialogBg = true;
this.addFormParams.groupname = "";
this.addFormParams.groupdesc = "";
this.addFormParams.userId = "";
this.addFormParams.username = "";
this.addFormParams.status = "1";
this.addFormParams.roleId = "";
this.addFormParams.rolename = "";
},
// 关闭新增弹窗
canceladd() {
......@@ -521,13 +591,20 @@ export default {
this.isShowEditGroupDialog = false;
this.isShowEditGroupDialogBg = false;
},
// 打开用户设置弹窗
setUser() {
this.visible.setUserVisible = true;
},
// 打开角色弹窗
setRole() {
this.visible.setRoleVisible = true;
},
// 新增用户组
submitForm(formName) {
this.$refs.addFormParams.validate(valid => {
console.info(valid);
if (valid) {
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
var usergroup = new URLSearchParams();
usergroup.append("groupname", this.addFormParams.groupname);
usergroup.append("groupdesc", this.addFormParams.groupdesc);
......@@ -539,13 +616,17 @@ export default {
this.$axios
.post("/login/usergroup/saveusergroup", usergroup)
.then(res => {
this.search();
console.log(res);
this.$message.success(res.data.message);
if (res.data.message === "用户组名已存在,请修改用户组名!") {
this.$message.error(res.data.message);
} else {
this.search();
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
this.$message.success(res.data.message);
}
})
.catch(failResponse => {});
} else {
this.$message.error("数据提交失败！请联系管理员");
return false;
}
});
......@@ -567,11 +648,15 @@ export default {
this.$axios
.post("/login/usergroup/update", usergroup)
.then(res => {
this.search();
console.log(res);
this.isShowEditGroupDialog = false;
this.isShowEditGroupDialogBg = false;
this.$message.success(res.data.message);
if (res.data.message === "用户组名已存在,请重新修改用户组名!") {
this.$message.error(res.data.message);
} else {
this.search();
console.log(res);
this.isShowEditGroupDialog = false;
this.isShowEditGroupDialogBg = false;
this.$message.success(res.data.message);
}
})
.catch(failResponse => {});
} else {
......@@ -599,29 +684,17 @@ export default {
})
.catch(failResponse => {});
},
// edit() {
// var usergroup1 = new URLSearchParams();
// usergroup1.append("Id", "2");
// usergroup1.append("groupname", "修改组名");
// usergroup1.append("groupdesc", "修改组描述");
// usergroup1.append("userId", ""); // userId(多个用户id之间用逗号隔开),
// usergroup1.append("username", ""); // username(多个用户名之间用逗号隔开),
// usergroup1.append("roleId", ""); // roleId(多个角色id之间用逗号隔开),
// this.$axios
// .post("/login/usergroup/update", usergroup1)
// .then(res => {
// console.log(res);
// this.$message.success(res.message);
// })
// .catch(failResponse => {});
// },
// 搜索
search() {
console.info("用户组筛选条件=====>", this.searchParams);
var usergroup = new URLSearchParams();
usergroup.append("page", this.searchParams.page.page); //必填
usergroup.append("total", this.searchParams.page.total); //必填
usergroup.append("groupname", this.searchParams.groupname);
usergroup.append("username", this.searchParams.username);
usergroup.append("truename", this.searchParams.truename);
usergroup.append("unitcode", this.searchParams.unitcode);
usergroup.append("rolename", this.searchParams.rolename);
// todo 多条件筛选
this.$axios
.post("/login/usergroup/queryUserGroupList", usergroup)
......
src/views/SystemManage/UserManage.vue
......@@ -14,46 +14,41 @@
</div>
<div class="search-item">
<div class="label">姓名：</div>
<el-select
<el-input
class="search-info"
v-model="searchParams.truename"
placeholder="请输入并选择"
>
</el-select>
placeholder="请输入姓名"
/>
</div>
<div class="search-item">
<div class="label">用户组：</div>
<el-select
<el-input
class="search-info"
v-model="searchParams.usergroup"
placeholder="请输入并选择"
>
</el-select>
v-model="searchParams.groupname"
placeholder="请输入用户组名"
/>
</div>
<div class="search-item">
<div class="label">单位代码：</div>
<el-select
<el-input
class="search-info"
v-model="searchParams.unitcode"
placeholder="请输入并选择"
>
</el-select>
placeholder="请输入单位代码"
/>
</div>
<div class="search-item">
<div class="label">角色：</div>
<el-select
<el-input
class="search-info"
v-model="searchParams.role"
placeholder="请输入并选择"
>
<el-option label="1" value="1"> </el-option>
</el-select>
v-model="searchParams.roleName"
placeholder="请输入角色"
/>
</div>
<div class="search-item">
<div class="label">权限：</div>
<el-input
class="search-info"
v-model="searchParams.auth"
v-model="searchParams.permissionname"
placeholder="请输入权限"
></el-input>
</div>
......@@ -110,7 +105,12 @@
</el-table-column>
<el-table-column prop="unitname" label="所属单位" :width="width2">
</el-table-column>
<el-table-column prop="roleName" label="角色" :width="width4">
<el-table-column
prop="roleName"
label="角色"
:width="width4"
show-overflow-tooltip
>
<template slot-scope="scope">
<div
class="tags"
......@@ -121,9 +121,20 @@
</div>
</template>
</el-table-column>
<el-table-column prop="groupid_list" label="权限" :width="width5">
<el-table-column
prop="groupid_list"
label="权限"
:width="width5"
show-overflow-tooltip
>
<template slot-scope="scope">
<div v-for="item in scope.row.permissionname">{{ item }}/</div>
<div
v-for="(item, index) in scope.row.permissionname &&
scope.row.permissionname.split(',')"
>
{{ index > 0 ? "/" : "" }}
{{ item }}
</div>
</template>
</el-table-column>
<el-table-column prop="status" label="启用状态" :width="width1">
......@@ -169,9 +180,9 @@
@current-change="handleCurrPageChange"
:current-page="searchParams.page.page"
:page-sizes="[10, 20, 50, 100]"
:page-size="Tpage"
:page-size="searchParams.page.total"
layout="prev, pager, next"
:total="searchParams.page.total"
:total="searchParams.page.count"
>
</el-pagination>
</div>
......@@ -257,7 +268,7 @@
</el-form-item>
<el-form-item class="info-item" label="加入角色:">
<el-input
placeholder="请输入手机号码"
placeholder="请选择角色"
class="input-info"
v-model="addFormParams.role"
></el-input>
......@@ -276,13 +287,6 @@
>提交</el-button
>
<el-button class="cancel" @click="canceladd">取消</el-button>
<!-- <div class="add" @click="submitForm('addFormParams')">确定</div>-->
<!-- &lt;!&ndash; <div class="add" @click="add">确定</div>&ndash;&gt;-->
<!-- <div class="cancel" @click="canceladd">取消</div>-->
<!-- <div class="cancel" @click="resetForm('addFormParams')">-->
<!-- zhikong-->
<!-- </div>-->
</el-form-item>
</el-form>
</div>
......@@ -336,22 +340,6 @@
v-model="editFormParams.policemanid"
></el-input>
</el-form-item>
<!-- <el-form-item class="info-item" label="密码:" prop="password">-->
<!-- <el-input-->
<!-- type="password"-->
<!-- placeholder="请输入密码"-->
<!-- class="input-info"-->
<!-- v-model="editFormParams.password"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="info-item" label="确认密码:" prop="okpassword">-->
<!-- <el-input-->
<!-- placeholder="请确认密码"-->
<!-- type="password"-->
<!-- class="input-info"-->
<!-- v-model="editFormParams.okpassword"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item class="info-item" label="手机号码:" prop="telphone">
<el-input
placeholder="请输入手机号码"
......@@ -368,7 +356,7 @@
</el-form-item>
<el-form-item class="info-item" label="加入角色:">
<el-input
placeholder="请输入手机号码"
placeholder="请选择角色"
class="input-info"
v-model="editFormParams.role"
></el-input>
......@@ -387,13 +375,6 @@
>修改</el-button
>
<el-button class="cancel" @click="canceledit">取消</el-button>
<!-- <div class="add" @click="submitForm('addFormParams')">确定</div>-->
<!-- &lt;!&ndash; <div class="add" @click="add">确定</div>&ndash;&gt;-->
<!-- <div class="cancel" @click="canceladd">取消</div>-->
<!-- <div class="cancel" @click="resetForm('addFormParams')">-->
<!-- zhikong-->
<!-- </div>-->
</el-form-item>
</el-form>
</div>
......@@ -523,7 +504,7 @@ export default {
width3: 200,
width2: 250,
width1: 140,
height: 1080,
height: 680,
// 新增对象
addFormParams: {
username: "", //用户名
......@@ -541,16 +522,16 @@ export default {
editFormParams: {
userId: "",
username: "", //用户名
password: "1", //密码
okpassword: "1", // 确认密码
password: "", //密码
okpassword: "", // 确认密码
truename: "", //用户真实姓名
policemanid: "A1111", //警号
telphone: "17323245432", //用户电话
unitcode: "3700000", //单位代码
unitname: "北京市海淀区公安局分局", //单位名称
policemanid: "", //警号
telphone: "", //用户电话
unitcode: "", //单位代码
unitname: "", //单位名称
group: "", // 用户组
role: "", // 角色
status: "1" // 启用状态
status: "" // 启用状态
},
addrules: {
password: [
......@@ -614,10 +595,10 @@ export default {
searchParams: {
username: "",
truename: "",
usergroup: "",
unitcode: "",
role: "",
auth: "",
roleName: "",
permissionname: "",
groupname: "",
page: {
total: 10,
count: 0,
......@@ -636,30 +617,8 @@ export default {
isShowEditUserDialogBg: false,
// 是否展示编辑框
isShowEditUserDialog: false,
tableData: [],
tableData: []
// tableData: data1,
options: [
{
value: "选项1",
label: "黄金糕"
},
{
value: "选项2",
label: "双皮奶"
},
{
value: "选项3",
label: "蚵仔煎"
},
{
value: "选项4",
label: "龙须面"
},
{
value: "选项5",
label: "北京烤鸭"
}
]
};
},
computed: {
......@@ -678,8 +637,6 @@ export default {
this.$refs.addFormParams.validate(valid => {
console.log(valid);
if (valid) {
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
console.info("addFormParams=====>", this.addFormParams);
var user = new URLSearchParams();
user.append("username", this.addFormParams.username);
......@@ -700,8 +657,15 @@ export default {
this.$axios
.post("/login/user/saveuser", user)
.then(res => {
this.$message.success(res.data.message);
this.search();
if (res.data.message === "用户名已存在,请修改用户名!") {
this.$message.error(res.data.message);
} else {
console.info(res);
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
this.$message.success(res.data.message);
this.search();
}
})
.catch(failResponse => {});
} else {
......@@ -740,9 +704,13 @@ export default {
this.$axios
.post("/login/user/update", user)
.then(res => {
this.$message.success("修改成功");
console.log("修改的返回值：", res);
this.search();
if (res.data.message === "用户名已存在,请修改用户名!") {
this.$message.error(res.data.message);
} else {
this.$message.success("修改成功");
console.log("修改的返回值：", res);
this.search();
}
})
.catch(failResponse => {});
} else {
......@@ -758,17 +726,25 @@ export default {
this.$refs[formName].resetFields();
},
clear() {
console.info("清空方法");
this.searchParams.roleName = "";
this.searchParams.groupname = "";
this.searchParams.truename = "";
this.searchParams.unitcode = "";
this.searchParams.page.page = 1;
this.searchParams.page.total = 10;
this.searchParams.username = "";
this.searchParams.permissionname = "";
this.search();
},
search() {
console.info("搜索用户列表");
var user = new URLSearchParams();
// user.append("username", this.searchParams.username);
// user.append("truename", this.searchParams.truename);
// user.append("unitcode", this.searchParams.unitcode);
// user.append("role", this.searchParams.role);
// user.append("page", this.searchParams.page.page);
// user.append("total", this.searchParams.page.total);
user.append("username", this.searchParams.username);
user.append("truename", this.searchParams.truename);
user.append("roleName", this.searchParams.roleName);
user.append("unitcode", this.searchParams.unitcode);
user.append("permissionname", this.searchParams.permissionname);
user.append("groupname", this.searchParams.groupname);
user.append("page", this.searchParams.page.page);
user.append("total", this.searchParams.page.total);
// todo 多条件筛选
......@@ -827,7 +803,19 @@ export default {
open() {
this.isShowAddUserDialog = true;
this.isShowAddUserDialogBg = true;
this.resetForm("addFormParams");
(this.addFormParams.username = ""), //用户名
(this.addFormParams.password = ""), //密码
(this.addFormParams.okpassword = ""), // 确认密码
(this.addFormParams.truename = ""), //用户真实姓名
(this.addFormParams.policemanid = ""), //警号
(this.addFormParams.telphone = ""), //用户电话
(this.addFormParams.unitcode = ""), //单位代码
(this.addFormParams.unitname = ""), //单位名称
(this.addFormParams.group = ""), // 用户组
(this.addFormParams.role = ""), // 角色
(this.addFormParams.status = "1"); // 启用状态
// this.resetForm("addFormParams");
},
// 打开编辑弹窗
openedit(id) {
......@@ -869,49 +857,6 @@ export default {
this.isShowEditUserDialog = false;
this.isShowEditUserDialogBg = false;
},
// // 新增方法
// add() {
// this.isShowAddUserDialog = false;
// this.isShowAddUserDialogBg = false;
// var user = new URLSearchParams();
// user.append("username", this.addFormParams.username);
// user.append("truename", this.addFormParams.truename);
// user.append("unitname", this.addFormParams.unitname);
// user.append("unitcode", this.addFormParams.unitcode);
// user.append("password", this.addFormParams.password);
// user.append("policemanid", this.addFormParams.policemanid);
// user.append("telphone", this.addFormParams.telphone);
// user.append("status", this.addFormParams.status);
//
// user.append("usergroup", this.searchParams.usergroup); // 警号
// user.append("role", this.addFormParams.role);
// // user.append("username", "测试用户名");
// // user.append("truename", "测试姓名");
// // user.append("unitname", "测试unitname");
// // user.append("unitcode", "测试unitcode");
// // user.append("password", "123456");
// // user.append("identitycard", "170730");
// // user.append("policemanid", "测试警号");
// // user.append("telphone", "17000000000");
// // user.append("status", "0");
// // user.append("sex", "0");
// // user.append("grade", "S"); // grade (S省级;D地市级;X区县级;K科所队),
// // user.append("roleName", "");
// user.append("groupid_coll", "");
// user.append("groupid_list", "");
// user.append("groupid_edit", "");
// user.append("groupid_admin", "");
//
// console.info(this.addFormParams);
// console.info(user);
// this.$axios
// .post("/login/user/saveuser", user)
// .then(res => {
// console.log(res);
// this.$message.success(res.message);
// })
// .catch(failResponse => {});
// },
edit() {
console.info("编辑方法");
// 根据主键查询用户基本信息
......
src/views/SystemManage/scss/group.scss
......@@ -142,6 +142,29 @@
.circle-blue{
width: 8px; height: 8px; background-color:#055FE7; border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%;
}
.group-item{
width: 70px;
height: 24px;
background: #F0F3F6;
border-radius: 12px;
font-size: 16px;
font-weight: bold;
color: #282F3C;
line-height: 24px;
text-align: center;
margin-right: 12px;
}
.set-btn{
width: 56px;
height: 22px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055FE7;
line-height: 22px;
cursor: pointer;
//position: absolute;
//right: 100px;
}
}
.footer {
......@@ -208,6 +231,27 @@
}
.dialog{
width: 823px;
padding: 0;
.title-img{
width: 21px;
height: 21px;
margin-right:8px;
}
.user-dialog{
.header{
//border: saddlebrown 1px solid;
width: 823px;
height: 40px;
}
.user-table{}
}
}
/deep/ .el-dialog{
width: 823px;
}
//新增用户 背景
.addUserDialogBg {
......
src/views/cxyrd/QueryConfirm.vue
......@@ -8,26 +8,54 @@
<div class="width100 margin_top24_bottom24">
<div class="display_style">
<span>条码号：</span>
<el-input class="el_input" v-model="reqParam.contrastCustomSearchReq.barcode" placeholder="请输入条码号"></el-input>
<el-input
class="el_input"
v-model="reqParam.contrastCustomSearchReq.barcode"
placeholder="请输入条码号"
></el-input>
</div>
<div class="display_style">
<span>用户ID：</span>
<el-select class="el_select" v-model="reqParam.contrastCustomSearchReq.userid" @change="selectUserInfo">
<el-option v-for="item in userOption" :key="item.userid" :label="item.userdesc" :value="item.userid">
<span>用户：</span>
<el-select
class="el_select"
v-model="reqParam.contrastCustomSearchReq.userid"
@change="selectUserInfo"
>
<el-option
v-for="item in userOption"
:key="item.userid"
:label="item.userdesc"
:value="item.userid"
>
</el-option>
</el-select>
</div>
<div class="display_style">
<span>查询ID：</span>
<el-input class="el_input" placeholder="请输入查询ID" v-model="reqParam.contrastCustomSearchReq.qqid"></el-input>
<el-input
class="el_input"
placeholder="请输入查询ID"
v-model="reqParam.contrastCustomSearchReq.qqid"
></el-input>
</div>
<div class="display_style">
<span>任务号：</span>
<el-input class="el_input" placeholder="请输入任务号" v-model="reqParam.contrastCustomSearchReq.qid"></el-input>
<el-input
class="el_input"
placeholder="请输入任务号"
v-model="reqParam.contrastCustomSearchReq.qid"
></el-input>
</div>
<div class="display_style send_time">
<span>发送时间：</span>
<el-date-picker v-model="startEndDate" class="el_data_picker" type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间">
<el-date-picker
v-model="startEndDate"
class="el_data_picker"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
>
</el-date-picker>
</div>
<!-- <div class="display_style">-->
......@@ -51,11 +79,15 @@
<div class="display_style">
<label>查询类型：</label>
<div v-for="(btn, index) in queryTypeBtns" :key="index">
<div class="btn" @click="getQueryType(btn, 'querytypes')" :class="[
<div
class="btn"
@click="getQueryType(btn, 'querytypes')"
:class="[
reqParam.contrastCustomSearchReq.querytypes.includes(btn.value)
? 'btn-active'
: ''
]">
]"
>
{{ btn.name }}
</div>
</div>
......@@ -63,11 +95,15 @@
<div class="display_style">
<label>优先级：</label>
<div v-for="(btn, index) in queryClassBtns" :key="index">
<div class="btn" @click="getQueryType(btn, 'queryclasss')" :class="[
<div
class="btn"
@click="getQueryType(btn, 'queryclasss')"
:class="[
reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value)
? 'btn-active'
: ''
]">
]"
>
{{ btn.name }}
</div>
</div>
......@@ -75,17 +111,23 @@
<div class="display_style">
<label>是否远程：</label>
<div v-for="(btn, index) in remoteFlagBtns" :key="index">
<div class="btn" @click="getQueryType(btn, 'remoteflags')" :class="[
<div
class="btn"
@click="getQueryType(btn, 'remoteflags')"
:class="[
reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value)
? 'btn-active'
: ''
]">
]"
>
{{ btn.name }}
</div>
</div>
</div>
<div class="display_style">
<el-checkbox><span>显示"{{ account }}"发查询用户查询</span></el-checkbox>
<el-checkbox
><span>显示"{{ account }}"发查询用户查询</span></el-checkbox
>
</div>
</div>
<div class="width100 margin_top24_bottom24 display_style">
......@@ -93,11 +135,15 @@
<!-- -1：无效；0：等待比对；1：正在比对；9：比对出错；10：比对完成（等待认定）；11：正在认定；19：认定出错；20：认定完成（等待复核）；21：正在复核；29：复核出错；30；复合完成；99：标记删除-->
<div class="btn" @click="allQueryType()">全部</div>
<div v-for="(btn, index) in queryStateBtns" :key="index">
<div class="btn" @click="getQueryType(btn, 'querystates')" :class="[
<div
class="btn"
@click="getQueryType(btn, 'querystates')"
:class="[
reqParam.contrastCustomSearchReq.querystates.includes(btn.value)
? 'btn-active'
: ''
]">
]"
>
{{ btn.name }}
</div>
</div>
......@@ -113,7 +159,14 @@
全部数据&nbsp>
<!-- <span>共找到{{ reqParam.page.total }}条</span>-->
</div>
<el-tag style="margin-right: 10px;" :key="index" v-for="(tag, index) in dynamicTags" closable :disable-transitions="false" @close="handleClose(tag)">
<el-tag
style="margin-right: 10px;"
:key="index"
v-for="(tag, index) in dynamicTags"
closable
:disable-transitions="false"
@close="handleClose(tag)"
>
{{ tag.name }}
</el-tag>
</div>
......@@ -124,8 +177,15 @@
<el-dropdown trigger="click">
<el-button type="info">自定义列</el-button>
<el-dropdown-menu slot="dropdown">
<el-checkbox-group v-model="checkedProps" @change="changeCheckbox">
<el-checkbox v-for="(item, index) in defaultTableProps" :label="item.prop" :key="index">
<el-checkbox-group
v-model="checkedProps"
@change="changeCheckbox"
>
<el-checkbox
v-for="(item, index) in defaultTableProps"
:label="item.prop"
:key="index"
>
{{ item.colume }}
</el-checkbox>
</el-checkbox-group>
......@@ -134,7 +194,13 @@
</div>
<!-- 自定义列 止 -->
<!-- 复制条码号 起 -->
<el-button type="info" v-clipboard:copy="barcode" @click="getBarcode" v-clipboard:success="onCopy" v-clipboard:error="onError">
<el-button
type="info"
v-clipboard:copy="barcode"
@click="getBarcode"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
>
复制条码
</el-button>
<!-- 复制条码号 止 -->
......@@ -142,45 +208,99 @@
<!-- <el-button>发查询</el-button>-->
</div>
</div>
<el-tag style="width:100%;color:#666666;margin-top:1rem;" v-show="isShowTip">
<el-tag
style="width:100%;color:#666666;margin-top:1rem;"
v-show="isShowTip"
>
<i class="el-icon-info" style="color:#055FE7;font-size:.9375rem"></i>
已选择
<span style="color:#055FE7">{{ selectionData.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link type="primary" :underline="false" style="margin-left:1.25rem;" @click="toggleSelection()">清除</el-link>
<el-link
type="primary"
:underline="false"
style="margin-left:1.25rem;"
@click="toggleSelection()"
>清除</el-link
>
</el-tag>
<div class="confirm_main_table">
<el-table style="width: 100%; max-height: 31.25rem" :height="height" class="mineral-table" border @selection-change="handleSelectionChange" ref="confirmTable" tooltip-effect="dark" :data="list" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="queryId" @row-click="confirm" @expand-change="hadnlExpandChange">
<el-table-column type="selection" height width="auto" v-if="isSelected"></el-table-column>
<el-table
style="width: 100%; max-height: 31.25rem"
:height="height"
class="mineral-table"
border
@selection-change="handleSelectionChange"
ref="confirmTable"
tooltip-effect="dark"
:data="list"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
row-key="queryId"
@row-click="confirm"
@expand-change="hadnlExpandChange"
>
<el-table-column
type="selection"
height
width="auto"
v-if="isSelected"
></el-table-column>
<el-table-column prop="" label="任务号/查询号" :width="cxyrdWidth1">
<template slot-scope="scope">
<svg-icon style="width: .875rem;height: .6875rem;margin-bottom: .125rem ;margin-left: .3125rem ;" v-if="scope.row.children || scope.row.children === null" icon-class="tree_f">
<svg-icon
style="width: .875rem;height: .6875rem;margin-bottom: .125rem ;margin-left: .3125rem ;"
v-if="scope.row.children || scope.row.children === null"
icon-class="tree_f"
>
</svg-icon>
<svg-icon style="width: .8125rem;height: .375rem;margin: 0 0 .1875rem 0 ;" v-else-if="!scope.row.children || scope.row.children !== null" icon-class="tree_c"></svg-icon>
<svg-icon
style="width: .8125rem;height: .375rem;margin: 0 0 .1875rem 0 ;"
v-else-if="!scope.row.children || scope.row.children !== null"
icon-class="tree_c"
></svg-icon>
{{
scope.row.children || scope.row.children === null
? scope.row.qid
: scope.row.qqid
}}
<div v-show="scope.row.children && scope.row.children !== null" class="children-count">
<div
v-show="scope.row.children && scope.row.children !== null"
class="children-count"
>
{{ scope.row.children ? scope.row.children.length : 0 }}
</div>
</template>
</el-table-column>
<el-table-column v-for="(item, index) in tableProps" show-overflow-tooltip :key="index" :label="item.colume" :prop="item.prop" :width="item.width">
<el-table-column
v-for="(item, index) in tableProps"
show-overflow-tooltip
:key="index"
:label="item.colume"
:prop="item.prop"
:width="item.width"
>
<template slot-scope="scope">
<template v-if="item.prop === 'querytype'">
<div v-if="scope.row.querytype === '3'" style="color: #FFA219">
{{ scope.row.queryTypeName }}
</div>
<div v-else-if="scope.row.querytype === '0'" style="color: #005FE7">
<div
v-else-if="scope.row.querytype === '0'"
style="color: #005FE7"
>
{{ scope.row.queryTypeName }}
</div>
<div v-else-if="scope.row.querytype === '1'" style="color:#E60012 ">
<div
v-else-if="scope.row.querytype === '1'"
style="color:#E60012 "
>
{{ scope.row.queryTypeName }}
</div>
<div v-else-if="scope.row.querytype === '2'" style="color:#08BD9E">
<div
v-else-if="scope.row.querytype === '2'"
style="color:#08BD9E"
>
{{ scope.row.queryTypeName }}
</div>
<div v-else>
......@@ -218,19 +338,40 @@
}}
</template>
<template v-else>
{{ dataFormat(scope.row, item.prop) }}</template>
{{ dataFormat(scope.row, item.prop) }}</template
>
</template>
</el-table-column>
<el-table-column width="auto" label="操作" align="left">
<template slot-scope="scope">
<div class="img" @click="edit(scope.row)" type="text" style="font-size:1.5rem" v-if="scope.row.barcode">
<div
class="img"
@click="edit(scope.row)"
type="text"
style="font-size:1.5rem"
v-if="scope.row.barcode"
>
<i>
<img style="width:1rem;height:1rem;cursor: pointer;" :src="editUrl" alt />
<img
style="width:1rem;height:1rem;cursor: pointer;"
:src="editUrl"
alt
/>
</i>
</div>
<div v-if="scope.row.barcode" class="img" @click.stop="delOne(scope.row.qqid)" type="text" style="font-size:1.5rem">
<div
v-if="scope.row.barcode"
class="img"
@click.stop="delOne(scope.row.qqid)"
type="text"
style="font-size:1.5rem"
>
<i>
<img style="width:.75rem;height:.875rem;cursor: pointer;" :src="delUrl" alt />
<img
style="width:.75rem;height:.875rem;cursor: pointer;"
:src="delUrl"
alt
/>
</i>
</div>
</template>
......@@ -239,11 +380,23 @@
</div>
</div>
<div class="footer">
<span class="count">共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
<span class="count"
>共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
Tpage
}}页</span>
}}页</span
>
<div class="page">
<el-pagination class="paging" background @size-change="handleSizeChange" @current-change="handleCurrPageChange" :current-page="reqParam.page.currPage" :page-sizes="[10, 20, 50, 100]" :page-size="reqParam.page.pageSize" layout="prev, pager, next" :total="reqParam.page.total">
<el-pagination
class="paging"
background
@size-change="handleSizeChange"
@current-change="handleCurrPageChange"
:current-page="reqParam.page.currPage"
:page-sizes="[10, 20, 50, 100]"
:page-size="reqParam.page.pageSize"
layout="prev, pager, next"
:total="reqParam.page.total"
>
</el-pagination>
</div>
</div>
......@@ -254,7 +407,7 @@
</template>
<script>
import zoom from '@/utils/autosize';
import zoom from "@/utils/autosize";
import "@/icons/tree_f.svg";
import "@/icons/tree_c.svg";
import moment from "moment";
......@@ -264,7 +417,7 @@ import "@/icons/tree_c.svg";
export default {
name: "QueryConfirm",
components: { SvgIcon },
data () {
data() {
return {
isShowTip: false, //批量操作提示
// selectionData: [], // 表单选择项目
......@@ -280,7 +433,7 @@ export default {
qid: null,
sendTimeStart: null,
sendTimeEnd: null,
userid: null,
username: null,
querytypes: [],
querystates: [],
remoteflags: [],
......@@ -357,28 +510,28 @@ export default {
expanded: false, // 展开标志
historyDialogVisible: false,
cxyrdWidth1: 200,
height: 450,
height: 450
// cxyrdWidth1: sessionStorage.getItem('cxyrdWidth1'),
// height: sessionStorage.getItem('tableHeight')
};
},
created () {
let self = this
let w1 = 1920
let h1 = 450
let w2 = window.innerWidth
this.height = h1 * w2 / w1
this.cxyrdWidth1 = this.cxyrdWidth1 * w2 / w1
created() {
let self = this;
let w1 = 1920;
let h1 = 450;
let w2 = window.innerWidth;
this.height = (h1 * w2) / w1;
this.cxyrdWidth1 = (this.cxyrdWidth1 * w2) / w1;
content.forEach((item) => {
content.forEach(item => {
// console.log(item);
self.$set(item, 'width', item.width * w2 / w1)
})
self.$set(item, "width", (item.width * w2) / w1);
});
console.log(content);
},
watch: {
// 批量处理
checkedProps (val) {
checkedProps(val) {
this.tableProps = this.defaultTableProps.filter(
i => val.indexOf(i.prop) >= 0
);
......@@ -388,7 +541,7 @@ export default {
},
computed: {
// 计算总页数
Tpage () {
Tpage() {
return (
Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1
);
......@@ -396,7 +549,7 @@ export default {
},
methods: {
// 获取认定列表
search () {
search() {
this.getParam();
// console.info("请求===>", this.reqParam.contrastCustomSearchReq);
this.$axios
......@@ -414,7 +567,7 @@ export default {
});
},
// 格式化参数
getParam () {
getParam() {
if (this.startEndDate !== null) {
this.reqParam.contrastCustomSearchReq.sendTimeStart = moment(
this.startEndDate[0]
......@@ -425,20 +578,20 @@ export default {
}
},
// 选择用户下拉框变化时 当前页为1
selectUserInfo () {
selectUserInfo() {
this.reqParam.page.currPage = 1;
console.info(
"当前选中的用户为-------->",
this.reqParam.contrastCustomSearchReq.userid
this.reqParam.contrastCustomSearchReq.username
);
this.search();
},
// 清空用户id
clearUser () {
this.reqParam.contrastCustomSearchReq.userid = null;
clearUser() {
this.reqParam.contrastCustomSearchReq.username = null;
},
// 获取用户信息
getUserInfo (val) {
getUserInfo(val) {
var userInfo = [];
val.forEach(item => {
var user = {};
......@@ -458,18 +611,18 @@ export default {
// console.info("用户信息==>", this.userOption);
},
// 用户信息去重
unique (arr) {
unique(arr) {
// 需要唯一标识来对数组进行过滤
// 定义常量res，值为一个map对象实例
const res = new Map();
// 返回arr数组过滤后对结果，结果为一个数组 过滤条件是对象中的value值
// 如果res中没有某个键，就设置这个键为1
return arr.filter(
arr => !res.has(arr.userid) && res.set(arr.userid, arr.userid)
arr => !res.has(arr.username) && res.set(arr.username, arr.username)
);
},
// 多条件查询 获取查询条件
getQueryType (data, type) {
getQueryType(data, type) {
let { name, value } = data;
let list = this.reqParam.contrastCustomSearchReq[type];
if (list.includes(value)) {
......@@ -487,7 +640,7 @@ export default {
this.search();
},
// 格式化
dataFormat (row, prop) {
dataFormat(row, prop) {
// colnum为使用了formatter的列
// clonum.property为当前列的prop值
// row为当前行，是一个类数组对象，可通过[]拿值
......@@ -498,7 +651,7 @@ export default {
}
},
// 优先级格式化
queryClassFormat (row, colnum) {
queryClassFormat(row, colnum) {
let prop = colnum.property;
let showProp = null;
for (let i = 0; i < this.queryClassList.length; i++) {
......@@ -508,7 +661,7 @@ export default {
return showProp;
},
// 多选删除
delMore () {
delMore() {
// 检查table选择的数据 如果没有选择则不可以删除
if (this.selectionData.length === 0) {
this.$message.error("请选择需要删除的数据！");
......@@ -522,7 +675,7 @@ export default {
this.doDelete(qqid);
},
// 单选删除
delOne (val) {
delOne(val) {
// 将传入的qqid转为数组
let qqid = [];
qqid.push(val);
......@@ -530,7 +683,7 @@ export default {
this.doDelete(qqid);
},
// 请求删除接口
doDelete (qqid) {
doDelete(qqid) {
// 删除确认提示
this.$confirm("是否确定删除已选择的数据?", "提示", {
confirmButtonText: "确定",
......@@ -557,7 +710,7 @@ export default {
});
},
// 认定
confirm (row) {
confirm(row) {
// tt 查重 0
if (row.querytype === "0") {
console.log(row);
......@@ -626,9 +779,9 @@ export default {
}
},
// 编辑
edit () { },
edit() {},
// 展开或关闭行
hadnlExpandChange (row, expanded) {
hadnlExpandChange(row, expanded) {
// 获取展开标志
this.expanded = expanded;
// 获取下标
......@@ -679,7 +832,7 @@ export default {
}
},
// table表格选中获取数据
handleSelectionChange (val) {
handleSelectionChange(val) {
this.selectionData = val;
console.log(this.selectionData);
if (this.selectionData.length) {
......@@ -689,7 +842,7 @@ export default {
}
},
// 复制条码号 获取选中条码值
getBarcode () {
getBarcode() {
let self = this;
this.barcode = [];
// if (this.selectionData.length === 0) {
......@@ -710,7 +863,7 @@ export default {
}
},
// 复制成功时的回调函数
onCopy (e) {
onCopy(e) {
console.info(this.barcode);
this.$message({
type: "success",
......@@ -719,27 +872,27 @@ export default {
});
},
// 复制失败时的回调函数
onError (e) {
onError(e) {
this.$message.error("抱歉，复制条码号失败！");
},
// 自定义展示列 多选框
changeCheckbox () {
changeCheckbox() {
// console.info("默认", this.defaultTableProps);
// console.info("table", this.tableProps);
// console.info("选中", this.checkedProps);
},
// 当期页发生变化
handleCurrPageChange: function (val) {
handleCurrPageChange: function(val) {
this.reqParam.page.currPage = val;
this.search();
},
// 每页展示数量发生变化
handleSizeChange: function (val) {
handleSizeChange: function(val) {
this.reqParam.page.pageSize = val;
this.search();
},
// 标签关闭 isTag：是否为标签点击
handleClose (tag) {
handleClose(tag) {
let { type, value } = tag;
this.dynamicTags = this.dynamicTags.filter(item => item.value !== value);
this.reqParam.contrastCustomSearchReq[
......@@ -750,7 +903,7 @@ export default {
this.search();
},
// 标签生成
tagClick (name) {
tagClick(name) {
if (this.dynamicTags.indexOf(name) === -1) {
this.dynamicTags.push(name);
} else {
......@@ -758,7 +911,7 @@ export default {
}
},
// 全部状态
allQueryType () {
allQueryType() {
let newdynamicTags = [];
this.dynamicTags.forEach((item, index) => {
if (item.type !== "querystates") {
......@@ -770,17 +923,17 @@ export default {
this.reqParam.contrastCustomSearchReq.querytypes = [];
this.search();
},
showHistory () {
showHistory() {
this.historyDialogVisible = true;
},
// 全部数据
clearAll () {
clearAll() {
this.dynamicTags = [];
this.clearParams();
this.search();
},
// 清空筛选条件
clearParams () {
clearParams() {
// this.remoteFlag = null;
this.startEndDate = null;
this.reqParam.page.currPage = 1;
......@@ -791,7 +944,7 @@ export default {
this.reqParam.contrastCustomSearchReq.qid = null;
this.reqParam.contrastCustomSearchReq.sendTimeStart = null;
this.reqParam.contrastCustomSearchReq.sendTimeEnd = null;
this.reqParam.contrastCustomSearchReq.userid = null;
this.reqParam.contrastCustomSearchReq.username = null;
this.reqParam.contrastCustomSearchReq.querytypes = [];
this.reqParam.contrastCustomSearchReq.querystates = [];
this.reqParam.contrastCustomSearchReq.remoteflags = [];
......@@ -803,7 +956,7 @@ export default {
// this.tableProps = this.defaultTableProps;
// },
// 批量操作
batch () {
batch() {
this.isSelected = !this.isSelected;
},
/**
......@@ -811,7 +964,7 @@ export default {
* @param {*}
* @return {*}
*/
toggleSelection (rows) {
toggleSelection(rows) {
if (rows) {
rows.forEach(row => {
this.$refs.confirmTable.toggleRowSelection(row);
......@@ -822,7 +975,7 @@ export default {
console.log(this.selectionData);
}
},
mounted () {
mounted() {
console.log(this.height);
// console.log(window.innerHeight);
// console.log(window.innerWidth);
......@@ -837,11 +990,7 @@ export default {
}
};
// 用户ID 下拉的数据
const users = [
{ userdesc: "张三", userid: 4567 },
{ userdesc: "李四", userid: 1111 },
{ userdesc: "赵6", userid: 3333 }
];
const users = [{ username: "张三" }, { username: "李四" }, { username: "赵6" }];
const content = [
// { colume: "任务号", prop: "aid", width: 100 },
// { colume: "查询号", prop: "qqid", width: 100 },
......@@ -853,7 +1002,7 @@ const content = [
{ colume: "优先级", prop: "queryclass", width: 100 },
{ colume: "认定时间", prop: "affirmtime", width: 200 },
{ colume: "发送时间", prop: "requestdatetime", width: 200 },
{ colume: "用户ID", prop: "userdesc", width: 100 }
{ colume: "用户名", prop: "username", width: 100 }
];
// 数据
const datas1 = [
......@@ -1183,7 +1332,7 @@ const setQueryClass = [
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #DADDE0;
background-color: #dadde0;
border-radius: 3px;
}
div {
......@@ -1297,7 +1446,7 @@ b {
.send_time {
display: flex;
align-items: center;
/deep/.el-input__icon {
height: 32px;
}
......
src/views/cxyrd/TT.vue
......@@ -17,7 +17,10 @@
<div class="source-top">
<div class="barcode">任务号：{{ qid }}</div>
<div class="count">
<img src="../../assets/img/TT/ttcount.png" style="width: .875rem;height: .875rem;margin:0 .3125rem .1875rem 0" />已认定：{{ rdcount }}条
<img
src="../../assets/img/TT/ttcount.png"
style="width: .875rem;height: .875rem;margin:0 .3125rem .1875rem 0"
/>已认定：{{ rdcount }}条
<!-- />已认定：{{ qid }}条-->
</div>
</div>
......@@ -32,32 +35,58 @@
<div class="label">
查询ID：
</div>
<div class="value" :class="{
<div
class="value"
:class="{
bz:
item.affirmStatus === '2' || item.affirmStatus === '3',
rd: item.affirmStatus === '1'
}">
}"
>
{{ currentQqid }}
</div>
</div>
<div class="source">
<div class="label">源条码号：</div>
<div class="value" :class="{
<div
class="value"
:class="{
bz:
item.affirmStatus === '2' || item.affirmStatus === '3',
rd: item.affirmStatus === '1'
}">
}"
>
{{ sourcebarcode }}
</div>
</div>
<div class="more">
<div class="last">
<img v-show="index === 0" @click="last(index)" style=" cursor: pointer;" src="../../assets/img/TT/last.png" />
<img v-show="index > 0" style=" cursor: pointer;" src="../../assets/img/TT/last-active.png" @click="last(index)" />
<img
v-show="index === 0"
@click="last(index)"
style=" cursor: pointer;"
src="../../assets/img/TT/last.png"
/>
<img
v-show="index > 0"
style=" cursor: pointer;"
src="../../assets/img/TT/last-active.png"
@click="last(index)"
/>
</div>
<div class="next">
<img v-show="index === sourcedatas.length - 1" style=" cursor: pointer;" src="../../assets/img/TT/next.png" @click="next(index)" />
<img v-show="index < sourcedatas.length - 1" style=" cursor: pointer;" src="../../assets/img/TT/next-active.png" @click="next(index)" />
<img
v-show="index === sourcedatas.length - 1"
style=" cursor: pointer;"
src="../../assets/img/TT/next.png"
@click="next(index)"
/>
<img
v-show="index < sourcedatas.length - 1"
style=" cursor: pointer;"
src="../../assets/img/TT/next-active.png"
@click="next(index)"
/>
</div>
</div>
</div>
......@@ -67,7 +96,11 @@
</div>
<!--指纹 掌纹 人像 按钮组-->
<div class="btns">
<div class="btn" :class="{ active: isFinger === true }" @click="finger">
<div
class="btn"
:class="{ active: isFinger === true }"
@click="finger"
>
指纹
</div>
<div class="btn" :class="{ active: isPlam === true }" @click="plam">
......@@ -79,20 +112,48 @@
<br />
<!--滚动 平面 切换-->
<div v-show="isFinger" class="menu middle">
<div class="menu-item" :class="{ active: activeIndex === 1 }" @click="handleSelect(1)">
<div
class="menu-item"
:class="{ active: activeIndex === 1 }"
@click="handleSelect(1)"
>
滚动
</div>
<div class="menu-item" :class="{ active: activeIndex === 2 }" @click="handleSelect(2)">
<div
class="menu-item"
:class="{ active: activeIndex === 2 }"
@click="handleSelect(2)"
>
平面
</div>
</div>
</div>
<!-- 目标数据 -->
<div class="dest-data">
<el-table highlight-current-row :data="tableData" ref="singleTable" class="dest-table" :height="height" @current-change="handleCurrentChange" :row-class-name="tableRowClassName">
<el-table-column label="排名" type="index" :width="width1"></el-table-column>
<el-table-column prop="score" label="得分" :width="width1"></el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto"></el-table-column>
<el-table
highlight-current-row
:data="tableData"
ref="singleTable"
class="dest-table"
:height="height"
@current-change="handleCurrentChange"
:row-class-name="tableRowClassName"
>
<el-table-column
label="排名"
type="index"
:width="width1"
></el-table-column>
<el-table-column
prop="score"
label="得分"
:width="width1"
></el-table-column>
<el-table-column
prop="destbarcode"
label="目标条码号"
width="auto"
></el-table-column>
</el-table>
</div>
</div>
......@@ -115,14 +176,24 @@
<div class="outside">
<!-- 源 左手 滚动 -->
<div v-for="(item, index) in sourceFingersLeftR">
<div class="finger-img" @dblclick="
<div
class="finger-img"
@dblclick="
showDetail(item, index, 'sourceFingersLeftR')
">
<img v-if="fingerLoading" class="img" src="@/assets/img/fingerprint.gif" />
"
>
<img
v-if="fingerLoading"
class="img"
src="@/assets/img/fingerprint.gif"
/>
<div v-else>
<!-- 有指纹图片 -->
<img v-if="item.img" :src="'data:image/jpeg;base64,' + item.img" />
<div v-else>暂无数据</div>
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
/>
<div v-else>未查到相关记录</div>
</div>
</div>
<div class="label">{{ item.name }}</div>
......@@ -131,14 +202,24 @@
<div class="outside">
<!-- 左手 滚动 目标 -->
<div v-for="(item, index) in destFingersLeftR">
<div class="finger-img" @dblclick="
<div
class="finger-img"
@dblclick="
showDetail(item, index, 'destFingersLeftR')
">
<img v-if="fingerLoading" class="img" src="@/assets/img/fingerprint.gif" />
"
>
<img
v-if="fingerLoading"
class="img"
src="@/assets/img/fingerprint.gif"
/>
<div v-else>
<!-- 有指纹图片 -->
<img v-if="item.img" :src="'data:image/jpeg;base64,' + item.img" />
<div v-else>暂无数据</div>
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
/>
<div v-else>未查到相关记录</div>
</div>
</div>
<div class="label">{{ item.name }}</div>
......@@ -149,15 +230,25 @@
<div class="hands">右手</div>
<div class="outside">
<div v-for="(item, index) in sourceFingersRightR">
<div class="finger-img" @dblclick="
<div
class="finger-img"
@dblclick="
showDetail(item, index, 'sourceFingersRightR')
">
<img v-if="fingerLoading" class="img" src="@/assets/img/fingerprint.gif" />
"
>
<img
v-if="fingerLoading"
class="img"
src="@/assets/img/fingerprint.gif"
/>
<div v-else>
<!-- 有指纹图片 -->
<img v-if="item.img" :src="'data:image/jpeg;base64,' + item.img" />
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
<div v-else>未查到相关记录</div>
</div>
</div>
<div class="label">{{ item.name }}</div>
......@@ -165,15 +256,25 @@
</div>
<div class="outside">
<div v-for="(item, index) in destFingersRightR">
<div class="finger-img" @dblclick="
<div
class="finger-img"
@dblclick="
showDetail(item, index, 'destFingersRightR')
">
<img v-if="fingerLoading" class="img" src="@/assets/img/fingerprint.gif" />
"
>
<img
v-if="fingerLoading"
class="img"
src="@/assets/img/fingerprint.gif"
/>
<div v-else>
<!-- 有指纹图片 -->
<img v-if="item.img" :src="'data:image/jpeg;base64,' + item.img" />
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
<div v-else>未查到相关记录</div>
</div>
</div>
<div class="label">{{ item.name }}</div>
......@@ -193,14 +294,24 @@
<div class="outside">
<!-- 源 左手 滚动 -->
<div v-for="(item, index) in sourceFingersLeftL">
<div class="finger-img" @dblclick="
<div
class="finger-img"
@dblclick="
showDetail(item, index, 'sourceFingersLeftL')
">
<img v-if="fingerLoading" class="img" src="@/assets/img/fingerprint.gif" />
"
>
<img
v-if="fingerLoading"
class="img"
src="@/assets/img/fingerprint.gif"
/>
<div v-else>
<!-- 有指纹图片 -->
<img v-if="item.img" :src="'data:image/jpeg;base64,' + item.img" />
<div v-else>暂无数据</div>
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
/>
<div v-else>未查到相关记录</div>
</div>
</div>
<div class="label">{{ item.name }}</div>
......@@ -209,15 +320,25 @@
<div class="outside">
<!-- 左手 滚动 目标 -->
<div v-for="(item, index) in destFingersLeftL">
<div class="finger-img" @dblclick="
<div
class="finger-img"
@dblclick="
showDetail(item, index, 'destFingersLeftL')
">
<img v-if="fingerLoading" class="img" src="@/assets/img/fingerprint.gif" />
"
>
<img
v-if="fingerLoading"
class="img"
src="@/assets/img/fingerprint.gif"
/>
<div v-else>
<!-- 有指纹图片 -->
<img v-if="item.img" :src="'data:image/jpeg;base64,' + item.img" />
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
<div v-else>未查到相关记录</div>
</div>
</div>
<div class="label">{{ item.name }}</div>
......@@ -228,15 +349,25 @@
<div class="hands">右手</div>
<div class="outside">
<div v-for="(item, index) in sourceFingersRightL">
<div class="finger-img" @dblclick="
<div
class="finger-img"
@dblclick="
showDetail(item, index, 'sourceFingersRightL')
">
<img v-if="fingerLoading" class="img" src="@/assets/img/fingerprint.gif" />
"
>
<img
v-if="fingerLoading"
class="img"
src="@/assets/img/fingerprint.gif"
/>
<div v-else>
<!-- 有指纹图片 -->
<img v-if="item.img" :src="'data:image/jpeg;base64,' + item.img" />
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
<div v-else>未查到相关记录</div>
</div>
</div>
<div class="label">{{ item.name }}</div>
......@@ -244,15 +375,25 @@
</div>
<div class="outside">
<div v-for="(item, index) in destFingersRightL">
<div class="finger-img" @dblclick="
<div
class="finger-img"
@dblclick="
showDetail(item, index, 'destFingersRightL')
">
<img v-if="fingerLoading" class="img" src="@/assets/img/fingerprint.gif" />
"
>
<img
v-if="fingerLoading"
class="img"
src="@/assets/img/fingerprint.gif"
/>
<div v-else>
<!-- 有指纹图片 -->
<img v-if="item.img" :src="'data:image/jpeg;base64,' + item.img" />
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
<div v-else>未查到相关记录</div>
</div>
</div>
<div class="label">{{ item.name }}</div>
......@@ -277,11 +418,19 @@
<div class="detail" v-show="isShowDetail">
<div class="head-title">拇指</div>
<div class="finger">
<img v-if="sourceImgdetail" :src="'data:image/jpeg;base64,' + sourceImgdetail" style="width: 28rem;height: 28rem;" />
<img
v-if="sourceImgdetail"
:src="'data:image/jpeg;base64,' + sourceImgdetail"
style="width: 28rem;height: 28rem;"
/>
<div v-else>没有指纹详情</div>
</div>
<div class="finger">
<img v-if="destImgdetail" :src="'data:image/jpeg;base64,' + destImgdetail" style="width: 28rem;height: 28rem;" />
<img
v-if="destImgdetail"
:src="'data:image/jpeg;base64,' + destImgdetail"
style="width: 28rem;height: 28rem;"
/>
<div v-else>没有指纹详情</div>
</div>
</div>
......@@ -352,7 +501,11 @@
</div>
<div class="bzitem">
<div class="bzname">比中人联系电话：</div>
<el-input class="bzphone" v-model="phone" placeholder="请输入内容"></el-input>
<el-input
class="bzphone"
v-model="phone"
placeholder="请输入内容"
></el-input>
<div class="input-error" v-show="isPhoneError">
<!-- <img src="@/assets/img/inputerror.png" alt=""> -->
<svg-icon icon-class="error" class="icon" />
......@@ -365,7 +518,12 @@
<div class="line"></div>
<div class="bzfooter">
<div class="footer-title">备注</div>
<el-input type="textarea" :rows="5" placeholder="在此输入备注信息" v-model="textarea">
<el-input
type="textarea"
:rows="5"
placeholder="在此输入备注信息"
v-model="textarea"
>
</el-input>
</div>
<div class="bzbtns">
......@@ -375,7 +533,11 @@
</div>
</div>
<!-- 认定完成确认框 -->
<div class="rdwcDialog" v-show="isShowrdwcDialogBg" @click="cancelrdwc"></div>
<div
class="rdwcDialog"
v-show="isShowrdwcDialogBg"
@click="cancelrdwc"
></div>
<div class="rdwccontent" v-show="isShowrdwcDialog">
<div class="title">当前候选未全部查看，是否确认认定完成？</div>
<div class="rdwcbtns">
......@@ -402,7 +564,7 @@ export default {
swiper,
swiperSlide
},
data () {
data() {
return {
width1: 50,
height: 150,
......@@ -536,12 +698,12 @@ export default {
colors: 1
};
},
created () {
let w1 = 1920
let w2 = window.innerWidth
created() {
let w1 = 1920;
let w2 = window.innerWidth;
this.height = this.height * w2 / w1
this.width1 = this.width1 * w2 / w1
this.height = (this.height * w2) / w1;
this.width1 = (this.width1 * w2) / w1;
this.dataType = this.$route.query.type;
this.qid = this.$route.query.qid;
......@@ -552,7 +714,7 @@ export default {
console.log("源qqid====>", this.currentQqid);
},
watch: {
phone (newValue, oldValue) {
phone(newValue, oldValue) {
if (newValue.length < 7) {
this.isPhoneError = true;
document
......@@ -568,7 +730,7 @@ export default {
},
methods: {
// 滚动平面选择切换
handleSelect (index) {
handleSelect(index) {
this.activeIndex = index;
console.info(this.activeIndex);
if (index === 1) {
......@@ -579,7 +741,7 @@ export default {
}
},
// 获取上一条
last (index) {
last(index) {
if (index > 0) {
let i = index;
this.currentQqid = this.sourcedatas[i - 1].qqid;
......@@ -603,7 +765,7 @@ export default {
console.info(this.sourcebarcode);
},
// 获取下一条
next (index) {
next(index) {
if (index < this.sourcedatas.length - 1) {
let i = index;
this.currentQqid = this.sourcedatas[i + 1].qqid;
......@@ -626,7 +788,7 @@ export default {
console.info(this.sourcebarcode);
},
// 获取源数据
getSourceList () {
getSourceList() {
let me = this;
if (me.dataType == "father") {
me.$axios
......@@ -679,7 +841,7 @@ export default {
console.log("源barcode====>", this.sourcebarcode);
},
// 获取候选列表
getMatchcandList () {
getMatchcandList() {
let me = this;
if (me.currentQqid !== null) {
me.$axios
......@@ -699,14 +861,14 @@ export default {
},
// 获取源平面指纹图
getSourcePlainFingerPrintDetail (barcode) {
getSourcePlainFingerPrintDetail(barcode) {
let self = this;
// 平面
this.$axios
.post("/api/org/plainByBarcode/barcode", {
barcode: this.sourcebarcode
})
.then(function (response) {
.then(function(response) {
if (response.data.code === 0) {
console.info("源plan", response.data.ret);
response.data.ret.forEach((element, index) => {
......@@ -725,19 +887,22 @@ export default {
// 去掉加载状态
self.fingerLoading = false;
});
} else if (response.data.code === 4) {
// 去掉加载状态
self.fingerLoading = false;
}
})
.catch(function (error) {
.catch(function(error) {
console.log(error);
});
},
// 获取源滚动指纹图
getSourceRollFingerPrintDetail (barcode) {
getSourceRollFingerPrintDetail(barcode) {
let self = this;
// 滚动 源数据
this.$axios
.post("/api/org/rollByBarcode/barcode", { barcode: barcode })
.then(function (response) {
.then(function(response) {
if (response.data.code === 0) {
console.info("源roll", response.data.ret);
response.data.ret.forEach((element, index) => {
......@@ -756,22 +921,24 @@ export default {
});
// 去掉加载状态
self.fingerLoading = false;
} else if (response.data.code === 4) {
// 去掉加载状态
self.fingerLoading = false;
}
console.log(response);
})
.catch(function (error) {
.catch(function(error) {
console.log(error);
});
},
// 获取目标的滚动指纹图
getDestRollFingerPrintDetail (barcode) {
getDestRollFingerPrintDetail(barcode) {
let self = this;
// 平面 目标
this.$axios
.post("/api/org/plainByBarcode/barcode", {
barcode: this.destbarcode
})
.then(function (response) {
.then(function(response) {
if (response.data.code === 0) {
console.info("目标plan", response.data.ret);
response.data.ret.forEach((element, index) => {
......@@ -787,22 +954,25 @@ export default {
item.img = element.image;
}
});
// 去掉加载状态
self.fingerLoading = false;
});
// 去掉加载状态
self.fingerLoading = false;
} else if (response.data.code === 4) {
// 去掉加载状态
self.fingerLoading = false;
}
})
.catch(function (error) {
.catch(function(error) {
console.log(error);
});
},
// 获取目标的平面指纹图
getDestPlainFingerPrintDetail (barcode) {
getDestPlainFingerPrintDetail(barcode) {
let self = this;
// 滚动 目标数据
this.$axios
.post("/api/org/rollByBarcode/barcode", { barcode: this.destbarcode })
.then(function (response) {
.then(function(response) {
if (response.data.code === 0) {
response.data.ret.forEach((element, index) => {
console.info("目标roll", response.data.ret);
......@@ -818,24 +988,26 @@ export default {
item.img = element.image;
}
});
// 去掉加载状态
self.fingerLoading = false;
});
}); // 去掉加载状态
self.fingerLoading = false;
} else if (response.data.code === 4) {
// 去掉加载状态
self.fingerLoading = false;
}
console.log(response);
})
.catch(function (error) {
.catch(function(error) {
console.log(error);
});
},
// 目标数据table的选中事件
handleCurrentChange (val) {
handleCurrentChange(val) {
this.destbarcode = val.destbarcode;
console.info("destbarcode", this.destbarcode);
this.$bus.emit("ccbarcode", this.destbarcode);
},
// 比中与认定完成添加样式
tableRowClassName ({ row, column, rowIndex, columnIndex }) {
tableRowClassName({ row, column, rowIndex, columnIndex }) {
// 比中的行
if (row.affirmstatus === "2" || row.affirmstatus === "3") {
console.log(row);
......@@ -851,7 +1023,7 @@ export default {
}
},
//比中
Bz () {
Bz() {
this.isShowbzDialogBg = true;
this.isShowbzDialog = true;
console.info("比中弹窗");
......@@ -861,7 +1033,7 @@ export default {
// this.userdesc = sessionStorage.getItem("userdesc");
},
// 获取用户信息
getUserInfo (id = 1) {
getUserInfo(id = 1) {
let self = this;
this.$axios({
method: "post",
......@@ -892,12 +1064,12 @@ export default {
* @param {*}
* @return {*}
*/
cancelrdwc () {
cancelrdwc() {
this.isShowrdwcDialogBg = false;
this.isShowrdwcDialog = false;
},
// 认定完成
Rdwc () {
Rdwc() {
console.info("认定完成");
// 认定之前的操作
......@@ -915,7 +1087,7 @@ export default {
});
},
// 确认认定完成
confirmrdwc () {
confirmrdwc() {
let self = this;
this.isShowrdwcDialogBg = false;
this.isShowrdwcDialog = false;
......@@ -940,30 +1112,30 @@ export default {
});
},
// 指纹可见
finger () {
finger() {
this.isFinger = true;
this.isPlam = false;
this.isFace = false;
},
// 掌纹可见
plam () {
plam() {
this.isPlam = true;
this.isFinger = false;
this.isFace = false;
},
// 人像可见
face () {
face() {
this.isFace = true;
this.isFinger = false;
this.isPlam = false;
},
// 取消比中
cancelbz () {
cancelbz() {
this.isShowbzDialogBg = false;
this.isShowbzDialog = false;
},
// 确认比中
confirmbz () {
confirmbz() {
let self = this;
console.log("比中");
let querytype = 0;
......@@ -987,7 +1159,7 @@ export default {
self.isShowbzDialog = false;
},
// 展示详情
showDetail (fingerData, index, name) {
showDetail(fingerData, index, name) {
console.info("指纹详情==》", fingerData);
console.info("指纹详情", index);
console.info(name);
......@@ -1027,12 +1199,12 @@ export default {
this.destImgdetail = destimg;
},
// 取消详情
cancelDetail () {
cancelDetail() {
this.isShowDetail = false;
this.isShowDetailBg = false;
},
// 清空源指纹图
clearsource () {
clearsource() {
(this.sourceFingersLeftR = [
{ name: "拇", code: 6, img: null },
{ name: "食", code: 7, img: null },
......@@ -1063,7 +1235,7 @@ export default {
]);
},
// 清空目标指纹图
cleardest () {
cleardest() {
(this.destFingersLeftR = [
{ name: "拇", code: 6, img: null },
{ name: "食", code: 7, img: null },
......@@ -1093,7 +1265,7 @@ export default {
{ name: "小", code: 15, img: null }
]);
},
scrollFunc (e) {
scrollFunc(e) {
e = e || window.event;
if (this.flag) {
return 0;
......@@ -1124,7 +1296,7 @@ export default {
}
}
},
mounted () {
mounted() {
this.finger();
this.$bus.on("ccbarcode", code => {
this.cleardest();
......
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