Skip to content

F
founder_vue
Commit 80a23fae by 米嘉伟
Options

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

parents 820baff9 3fc556b5
Showing with 663 additions and 126 deletions
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/SvgIcon/index.vue 0 → 100644
<template>
<svg :class="svgClass" aria-hidden="true" v-on="$listeners">
<use :xlink:href="iconName" />
</svg>
</template>
<script>
export default {
name: "SvgIcon",
props: {
iconClass: {
type: String,
required: true
},
className: {
type: String,
default: ""
}
},
computed: {
iconName() {
return `#icon-${this.iconClass}`;
},
svgClass() {
if (this.className) {
return "svg-icon " + this.className;
} else {
return "svg-icon";
}
},
styleExternalIcon() {
return {
mask: `url(${this.iconClass}) no-repeat 50% 50%`,
"-webkit-mask": `url(${this.iconClass}) no-repeat 50% 50%`
};
}
}
};
</script>
<style scoped>
.svg-icon {
width: 1.5em;
height: 1.5em;
vertical-align: -0.15em;
fill: currentColor;
overflow: hidden;
}
.svg-external-icon {
background-color: currentColor;
mask-size: cover !important;
display: inline-block;
}
</style>
src/icons/index.js 0 → 100644
import Vue from "vue";
import SvgIcon from "@/components/SvgIcon"; // svg组件
// 注册为全局组件
Vue.component("svg-icon", SvgIcon);
const req = require.context("./svg", false, /\.svg$/);
const requireAll = requireContext => requireContext.keys().map(requireContext);
requireAll(req);
src/main.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 14:39:52 * @Date: 2021-09-07 14:39:52
* @LastEditTime: 2021-09-22 15:58:14 * @LastEditTime: 2021-09-28 09:31:22
* @LastEditors: your name * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\main.js * @FilePath: \指纹系统\founder_vue\src\main.js
*/ */
...@@ -22,6 +22,12 @@ import "./assets/css/el-table-style.css"; ...@@ -22,6 +22,12 @@ import "./assets/css/el-table-style.css";
import VueClipboard from "vue-clipboard2"; import VueClipboard from "vue-clipboard2";
import VueBus from 'vue-bus'; import VueBus from 'vue-bus';
//引入svg组件
import IconSvg from './utils/IconSvg.vue'
// //全局注册svg-icon
Vue.component('svg-icon', IconSvg)
Vue.prototype.$driver = new Driver({ Vue.prototype.$driver = new Driver({
className: "scoped-class", // className to wrap driver.js popover className: "scoped-class", // className to wrap driver.js popover
animate: true, // Animate while changing highlighted element animate: true, // Animate while changing highlighted element
......
src/router/modules/index.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-09-09 17:39:31 * @LastEditTime: 2021-09-28 09:47:41
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
......
src/utils/IconSvg.vue 0 → 100644
<!--
* @Author: your name
* @Date: 2021-09-28 09:30:35
* @LastEditTime: 2021-09-28 10:12:45
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\utils\IconSvg.vue
-->
<template>
<svg class="svg-icon" aria-hidden="true" v-on="$listeners">
<use :xlink:href="iconName" />
</svg>
</template>
<script>
export default {
name: "icon-svg",
props: {
iconClass: {
type: String,
required: true
},
className: {
type: String,
default: ""
}
},
computed: {
iconName () {
return `#icon-${this.iconClass}`;
},
svgClass () {
if (this.className) {
return "svg-icon " + this.className;
} else {
return "svg-icon";
}
}
}
};
</script>
<style>
.svg-icon {
width: 100%;
height: 100%;
fill: currentColor;
overflow: hidden;
}
</style>
\ No newline at end of file
src/views/Home.vue
...@@ -207,11 +207,19 @@ export default { ...@@ -207,11 +207,19 @@ export default {
overflow: hidden; overflow: hidden;
display: flex; display: flex;
} }
/deep/.el-menu.el-menu--inline {
.el-menu-item {
padding-left: 50px !important;
}
.el-menu-item.is-active {
padding-left: 46px !important;
}
}
.el-menu-vertical-demo:not(.el-menu--collapse) { .el-menu-vertical-demo:not(.el-menu--collapse) {
.el-submenu, .el-menu-item { .el-submenu, .el-menu-item {
img { img {
width: 16px; // width: 16px;
height: 14px; height: 16px;
} }
span { span {
margin-left: 16px; margin-left: 16px;
...@@ -221,8 +229,8 @@ export default { ...@@ -221,8 +229,8 @@ export default {
.el-menu--collapse { .el-menu--collapse {
.el-submenu, .el-menu-item { .el-submenu, .el-menu-item {
img { img {
width: 16px; // width: 16px;
height: 14px; height: 16px;
} }
} }
/deep/.el-submenu__title { /deep/.el-submenu__title {
...@@ -264,6 +272,9 @@ export default { ...@@ -264,6 +272,9 @@ export default {
box-sizing: border-box; box-sizing: border-box;
background-color: #15243C !important; background-color: #15243C !important;
border-left: 4px solid #148BE0; border-left: 4px solid #148BE0;
img {
margin-left: -4px;
}
} }
.search { .search {
width: 100%; width: 100%;
......
src/views/cxyrd/LT.vue
<template> <template>
<div class="lt"> <div class="lt">
<div class="lt_header"> <div class="header">
<div class="lt_header_label">正查</div> <div class="label">正查</div>
<div class="tt_header_button"> <div class="btns">
<el-button @click="Bz">比中</el-button> <div class="bz-btn" @click="Bz">比中</div>
<el-button @click="Rdwc">认定完成</el-button> <div class="rd-btn" @click="Rdwc">认定完成</div>
</div> </div>
</div> </div>
<div class="lt_main"> <div class="lt_main">
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<script> <script>
import LTSrc from "./modules/LTSrc.vue"; import LTSrc from "./modules/LTSrc.vue";
import LTCandidate from "./modules/LTCandidate.vue"; import LTCandidate from "./modules/LTCandidate.vue";
import ImageEd from "../../components/ImageEd.vue" import ImageEd from "../../components/ImageEd.vue";
export default { export default {
// 正查 倒查 查重 // 正查 倒查 查重
name: "LT", name: "LT",
...@@ -36,12 +36,12 @@ export default { ...@@ -36,12 +36,12 @@ export default {
LTCandidate, LTCandidate,
ImageEd ImageEd
}, },
data () { data() {
return { return {
srcDataList: null srcDataList: null
}; };
}, },
created () { created() {
this.srcDataList = this.$route.query.rowData; this.srcDataList = this.$route.query.rowData;
console.log("源数据src====>", this.srcDataList); console.log("源数据src====>", this.srcDataList);
console.log(this.srcDataList.barcode); console.log(this.srcDataList.barcode);
...@@ -52,21 +52,21 @@ export default { ...@@ -52,21 +52,21 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
Bz () { Bz() {
let self = this let self = this;
console.log('比中'); console.log("比中");
let affirmState = '比中' let affirmState = "比中";
let srcseqno = sessionStorage.getItem('srcseqno') || '' let srcseqno = sessionStorage.getItem("srcseqno") || "";
let destseqno = sessionStorage.getItem('destseqno') || '' let destseqno = sessionStorage.getItem("destseqno") || "";
let srcbarcode = sessionStorage.getItem('srcbarcode') || '' let srcbarcode = sessionStorage.getItem("srcbarcode") || "";
let destbarcode = sessionStorage.getItem('destbarcode') || '' let destbarcode = sessionStorage.getItem("destbarcode") || "";
let qqid = sessionStorage.getItem('qqid') || '' let qqid = sessionStorage.getItem("qqid") || "";
let qid = sessionStorage.getItem('qid') || '' let qid = sessionStorage.getItem("qid") || "";
// 2：正查 // 2：正查
let querytype = 2 let querytype = 2;
this.$axios({ this.$axios({
method: 'post', method: "post",
url: '/api/matchcand/affirm/hit', url: "/api/matchcand/affirm/hit",
data: { data: {
affirmState, affirmState,
srcseqno, srcseqno,
...@@ -79,9 +79,9 @@ export default { ...@@ -79,9 +79,9 @@ export default {
} }
}).then(response => { }).then(response => {
// 跟新列表数据 // 跟新列表数据
self.$bus.emit('updateFinderSource') self.$bus.emit("updateFinderSource");
console.log(response); console.log(response);
}) });
}, },
/** /**
* @description: 认定完成 * @description: 认定完成
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
Rdwc () { Rdwc () {
let self = this let self = this
console.log('认定完成'); console.log('认定完成');
let affirmState = 1 // let affirmState = 1
let srcseqno = sessionStorage.getItem('srcseqno') || '' let srcseqno = sessionStorage.getItem('srcseqno') || ''
let destseqno = sessionStorage.getItem('destseqno') || '' let destseqno = sessionStorage.getItem('destseqno') || ''
let srcbarcode = sessionStorage.getItem('srcbarcode') || '' let srcbarcode = sessionStorage.getItem('srcbarcode') || ''
...@@ -99,12 +99,12 @@ export default { ...@@ -99,12 +99,12 @@ export default {
let qqid = sessionStorage.getItem('qqid') || '' let qqid = sessionStorage.getItem('qqid') || ''
let qid = sessionStorage.getItem('qid') || '' let qid = sessionStorage.getItem('qid') || ''
// 2：正查 // 2：正查
let querytype = 2 let querytype = 2;
this.$axios({ this.$axios({
method: 'post', method: "post",
url: '/api/matchcand/affirm/finish', url: "/api/matchcand/affirm/finish",
data: { data: {
affirmState, // affirmState,
srcseqno, srcseqno,
destseqno, destseqno,
srcbarcode, srcbarcode,
...@@ -115,11 +115,11 @@ export default { ...@@ -115,11 +115,11 @@ export default {
} }
}).then(response => { }).then(response => {
// 跟新列表数据 // 跟新列表数据
self.$bus.emit('updateFinderSource') self.$bus.emit("updateFinderSource");
console.log(response); console.log(response);
}) });
} }
}, }
}; };
</script> </script>
...@@ -140,6 +140,49 @@ div { ...@@ -140,6 +140,49 @@ div {
flex-direction: column; flex-direction: column;
} }
.header {
height: 59px;
flex-grow: 1;
display: flex;
flex-direction: row;
justify-content: space-between;
.label {
align-self: flex-start;
width: 32px;
height: 22px;
font-size: 16px;
font-weight: bold;
color: #333333;
line-height: 22px;
margin-top: 14px;
}
}
.btns {
align-self: flex-end;
margin-right: 50px;
margin-bottom: 13px;
color: #ffffff;
font-size: 14px;
line-height: 22px;
.bz-btn {
width: 96px;
height: 32px;
background: #ff0039;
border-radius: 4px;
margin-right: 16px;
text-align: center;
line-height: 32px;
}
.rd-btn {
width: 96px;
height: 32px;
background: #055fe7;
border-radius: 4px;
text-align: center;
line-height: 32px;
}
}
.lt_header { .lt_header {
height: 59px; height: 59px;
flex-grow: 1; flex-grow: 1;
...@@ -195,7 +238,7 @@ div { ...@@ -195,7 +238,7 @@ div {
/deep/ .current-row { /deep/ .current-row {
td { td {
background: #F5F5F7 !important; background: #f5f5f7 !important;
} }
} }
</style> </style>
src/views/cxyrd/QueryConfirm.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
v-for="tag in dynamicTags" v-for="tag in dynamicTags"
closable closable
:disable-transitions="false" :disable-transitions="false"
@close="handleClose(tag)" @close="handleClose(tag, true)"
> >
{{ tag }} {{ tag }}
</el-tag> </el-tag>
...@@ -325,7 +325,7 @@ export default { ...@@ -325,7 +325,7 @@ export default {
queryclasss: [] queryclasss: []
} }
}, },
list: null, list: [],
currentPage: 5, currentPage: 5,
startEndDate: null, startEndDate: null,
account: "00000000", account: "00000000",
...@@ -398,21 +398,19 @@ export default { ...@@ -398,21 +398,19 @@ export default {
search() { search() {
this.getParam(); this.getParam();
console.info("请求===>", this.reqParam.contrastCustomSearchReq); console.info("请求===>", this.reqParam.contrastCustomSearchReq);
this.$axios
// this.$axios .post("/api/queryque/standardQid", this.reqParam)
// .post("/api/queryque/standardQid", this.reqParam) .then(response => {
// .then(response => { if (response.data.code === 0) {
// if (response.data.code === 0) { this.list = response.data.ret.list;
// this.list = response.data.ret.list; this.reqParam.page.total = response.data.ret.total;
// this.reqParam.page.total = response.data.ret.total; console.info("查询结果===>", this.list);
// console.info("查询结果===>", this.list); this.userInfo = this.getUserInfo(this.list);
// } else {
// this.userInfo = this.getUserInfo(this.list); this.$message.error(response.data.message);
// } else { }
// this.$message.error(response.data.message); // console.info(JSON.stringify(this.list));
// } });
// console.info(JSON.stringify(this.list));
// });
}, },
// 格式化参数 // 格式化参数
getParam() { getParam() {
...@@ -428,18 +426,34 @@ export default { ...@@ -428,18 +426,34 @@ export default {
// 选择用户下拉框变化时 当前页为1 // 选择用户下拉框变化时 当前页为1
selectUserInfo() { selectUserInfo() {
this.reqParam.page.currPage = 1; this.reqParam.page.currPage = 1;
console.info(
"当前选中的用户为-------->",
this.reqParam.contrastCustomSearchReq.userid
);
this.search();
},
clearUser() {
this.reqParam.contrastCustomSearchReq.userid = null;
}, },
// 获取用户信息 // 获取用户信息
getUserInfo(val) { getUserInfo(val) {
var userInfo = []; var userInfo = [];
val.forEach((item, index) => { val.forEach(item => {
var user = {}; var user = {};
user.userid = item.userid; user.userid = item.userid;
user.userdesc = item.userdesc; user.userdesc = item.userdesc;
userInfo.push(user); userInfo.push(user);
if (item.children) {
item.children.forEach(ite => {
var use = {};
use.userid = ite.userid;
use.userdesc = ite.userdesc;
userInfo.push(use);
});
}
}); });
this.userOption = this.unique(userInfo); this.userOption = this.unique(userInfo);
console.info("用户信息==>", this.userOption); // console.info("用户信息==>", this.userOption);
}, },
// 用户信息去重 // 用户信息去重
unique(arr) { unique(arr) {
...@@ -484,9 +498,8 @@ export default { ...@@ -484,9 +498,8 @@ export default {
} }
); );
// 删除标签 // 删除标签
this.handleClose(val.queryTypeName); this.handleClose(val.queryTypeName, false);
} }
console.info("querytypeBtns===========", this.queryTypeBtns);
this.search(); this.search();
}, },
// 多条件查询 获取优先级 // 多条件查询 获取优先级
...@@ -523,9 +536,8 @@ export default { ...@@ -523,9 +536,8 @@ export default {
} }
); );
// 删除标签 // 删除标签
this.handleClose(val.queryClassName); this.handleClose(val.queryClassName, false);
} }
console.info("queryClassBtns===========", this.queryClassBtns);
this.search(); this.search();
}, },
// 多条件查询 获取是否远程 // 多条件查询 获取是否远程
...@@ -548,6 +560,7 @@ export default { ...@@ -548,6 +560,7 @@ export default {
this.reqParam.contrastCustomSearchReq.querystates.push(val.querystate); this.reqParam.contrastCustomSearchReq.querystates.push(val.querystate);
// 添加标签 // 添加标签
this.tagClick(val.queryStateName); this.tagClick(val.queryStateName);
this.search();
} else { } else {
// 传入的值为true 当前值的状态是选中的 所以需要修改为false 变为未选中 // 传入的值为true 当前值的状态是选中的 所以需要修改为false 变为未选中
// 清除掉搜索请求参数里的值 // 清除掉搜索请求参数里的值
...@@ -568,9 +581,8 @@ export default { ...@@ -568,9 +581,8 @@ export default {
} }
); );
// 删除标签 // 删除标签
this.handleClose(val.queryStateName); this.handleClose(val.queryStateName, false);
} }
console.info("queryStateBtns===========", this.queryStateBtns);
this.search(); this.search();
}, },
// 格式化 // 格式化
...@@ -649,7 +661,12 @@ export default { ...@@ -649,7 +661,12 @@ export default {
console.info(row.querytype); console.info(row.querytype);
// tt 查重 0 // tt 查重 0
if (row.querytype === "0") { if (row.querytype === "0") {
this.$router.push({ path: "/confirm/TT", query: { rowData: row } }); // this.$router.push({ path: "/confirm/TT", query: { rowData: row } });
let routeUrl = this.$router.resolve({
path: "/confirm/TT",
query: { rowData: row }
});
window.open(routeUrl.href, "_blank");
} // tl 倒查 1 } // tl 倒查 1
else if (row.querytype === "1") { else if (row.querytype === "1") {
// this.$router.push({ path: "/confirm/TL", query: { rowData: row } }); // this.$router.push({ path: "/confirm/TL", query: { rowData: row } });
...@@ -717,9 +734,63 @@ export default { ...@@ -717,9 +734,63 @@ export default {
this.reqParam.page.pageSize = val; this.reqParam.page.pageSize = val;
this.search(); this.search();
}, },
// 标签关闭 // 标签关闭 isTag：是否为标签点击
handleClose(tag) { handleClose(tag, isTag) {
this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1); if (isTag) {
var state = null;
var type = null;
// 获取查询类型的状态 并在请求中删除
this.queryTypeBtns.forEach(item => {
if (item.queryTypeName.indexOf(tag) > -1) {
state = item.querytype;
type = "querytype";
}
});
// 获取优先级的状态 并在请求中删除
this.queryClassBtns.forEach(item => {
if (item.queryClassName.indexOf(tag) > -1) {
state = item.queryclass;
type = "queryclase";
}
});
// 获取状态的状态 并在请求中删除
this.queryStateBtns.forEach(item => {
if (item.queryStateName.indexOf(tag) > -1) {
state = item.querystate;
type = "querystate";
}
});
// 获取优先级的状态 并在请求中删除
this.remoteFlagBtns.forEach(item => {
if (item.remoteFlagName.indexOf(tag) > -1) {
state = item.remoteflag;
type = "remoteflag";
}
});
console.info("当前要关闭的标签值====>", type, state);
if (type === "querytype") {
this.reqParam.contrastCustomSearchReq.querytypes.splice(
this.reqParam.contrastCustomSearchReq.querytypes.indexOf(state)
);
} else if (type === "queryclase") {
this.reqParam.contrastCustomSearchReq.queryclasss.splice(
this.reqParam.contrastCustomSearchReq.queryclasss.indexOf(state)
);
} else if (type === "querystate") {
this.reqParam.contrastCustomSearchReq.querystates.splice(
this.reqParam.contrastCustomSearchReq.querystates.indexOf(state)
);
} else {
console.info("是否远程！");
// this.reqParam.contrastCustomSearchReq.remoteflags.splice(
// this.reqParam.contrastCustomSearchReq.remoteflags.indexOf(state)
// );
}
this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
} else {
this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
}
this.search();
}, },
// 标签生成 // 标签生成
tagClick(name) { tagClick(name) {
...@@ -728,7 +799,6 @@ export default { ...@@ -728,7 +799,6 @@ export default {
} else { } else {
this.$message.error("该筛选条件已存在！请重新选择！"); this.$message.error("该筛选条件已存在！请重新选择！");
} }
console.info("dynamicTags===>", this.dynamicTags);
}, },
// 清空筛选条件 // 清空筛选条件
clearParams() { clearParams() {
...@@ -1254,3 +1324,15 @@ b { ...@@ -1254,3 +1324,15 @@ b {
height: 34px; height: 34px;
} }
</style> </style>
<style>
.el-table__expand-icon {
position: absolute;
right: 20px;
cursor: pointer;
color: #b51f1f;
transition: transform 0.2s ease-in-out;
height: 20px;
border: black 1px solid;
margin: 0;
}
</style>
src/views/cxyrd/TL.vue
<template> <template>
<div class="tl"> <div class="tl">
<div class="header"> <div class="header">
<div class="header-label">倒查</div> <div class="label">倒查</div>
<div class="btns"> <div class="btns">
<div class="bz-btn" @click="Bz">比中</div> <div class="bz-btn" @click="Bz">比中</div>
<div class="rd-btn" @click="Rdwc">认定完成</div> <div class="rd-btn" @click="Rdwc">认定完成</div>
...@@ -18,6 +18,68 @@ ...@@ -18,6 +18,68 @@
<t-l-candidate></t-l-candidate> <t-l-candidate></t-l-candidate>
</div> </div>
</div> </div>
<el-dialog
class="bz-dialog"
title="比中"
:visible.sync="isDialogShow"
:modal-append-to-body="false"
>
<div class="tl">
<div class="type">
<div class="outside">
<div class="label">查询类型：</div>
<div class="content">倒查</div>
<div class="label">人员编号：</div>
<div class="content">R1231231231231231231</div>
<div class="label">指位：</div>
<div class="content">平面-右拇</div>
</div>
<div class="outside">
<div class="label">查询类型：</div>
<div class="content">倒查</div>
<div class="label">人员编号：</div>
<div class="content">R1231231231231231231</div>
<div class="label">指位：</div>
<div class="content">平面-右拇</div>
</div>
</div>
<div class="other">
<div class="outside">
<div class="label">比中单位：</div>
<div class="content">北京市朝阳区公安局分局</div>
<div class="label">单位代码：</div>
<div class="content">123123123123</div>
<div class="label">比中时间：</div>
<div class="content">2021-09-23 14:54</div>
</div>
<div class="outside">
<div class="label">比中人：</div>
<div class="content">张XX</div>
<div class="label">比中人身份证号：</div>
<div class="content">412************016</div>
<div class="label">比中人联系电话：</div>
<!-- todo 电话长度校验-->
<div class="content">110</div>
</div>
</div>
<div class="remark">
<div class="label">备注</div>
<el-input
class="remark-input"
type="textarea"
placeholder="在此输入备注信息"
:rows="4"
v-model="text"
>
</el-input>
</div>
<div class="btns">
<div class="ok-btn">确认</div>
<div class="close-btn">取消</div>
</div>
</div>
</el-dialog>
<!-- <div v-show="dialog" class="popContainer" @click="hideDialog"></div>-->
</div> </div>
</template> </template>
...@@ -32,12 +94,19 @@ export default { ...@@ -32,12 +94,19 @@ export default {
TLSrc, TLSrc,
TLCandidate TLCandidate
}, },
data() {
return { isDialogShow: false, dialog: false, text: "" };
},
methods: { methods: {
Bz() { Bz() {
console.info("比中"); console.info("比中");
this.isDialogShow = true;
}, },
Rdwc() { Rdwc() {
console.info("认定完成"); console.info("认定完成");
},
hideDialog() {
this.dialog = true;
} }
} }
}; };
...@@ -65,16 +134,18 @@ div { ...@@ -65,16 +134,18 @@ div {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
.label {
align-self: flex-start;
width: 32px;
height: 22px;
font-size: 16px;
font-weight: bold;
color: #333333;
line-height: 22px;
margin-top: 14px;
}
} }
.header-label {
align-self: flex-start;
width: 32px;
height: 22px;
font-size: 16px;
font-weight: bold;
color: #333333;
line-height: 22px;
}
.btns { .btns {
align-self: flex-end; align-self: flex-end;
margin-right: 50px; margin-right: 50px;
...@@ -103,9 +174,7 @@ div { ...@@ -103,9 +174,7 @@ div {
.main { .main {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
.main-left { .main-left {
width: 352px; width: 352px;
//border: none; //border: none;
...@@ -121,4 +190,104 @@ div { ...@@ -121,4 +190,104 @@ div {
width: 360px; width: 360px;
} }
} }
.bz-dialog {
.tl {
width: 763px;
height: 634px;
.type {
display: flex;
width: 763px;
height: 160px;
background: rgba(230, 0, 18, 0.04);
}
.other {
display: flex;
width: 763px;
height: 160px;
//background: rgba(230, 0, 18, 0.04);
}
.remark {
display: flex;
flex-direction: column;
width: 763px;
height: 120px;
padding-top: 16px;
.label {
width: 28px;
height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
line-height: 19px;
}
}
.btns {
width: 763px;
height: 40px;
text-align: center;
margin-top: 30px;
.ok-btn {
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
color: #2e3846;
font-size: 14px;
line-height: 40px;
text-align: center;
margin-right: 24px;
}
.close-btn {
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
color: #ffffff;
font-size: 14px;
line-height: 40px;
text-align: center;
}
}
}
}
.outside {
width: 381px;
height: 148px;
padding-top: 12px;
padding-left: 30px;
//padding: 24px 0 24px 30px;
.label {
width: 118px;
height: 22px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 22px;
}
.content {
width: 161px;
height: 22px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 22px;
margin: 12px 30px 12px 30px;
}
}
//遮罩层
//.popContainer {
// position: fixed;
// top: 0;
// left: 0;
// right: 0;
// bottom: 0;
// background: rgba(255, 255, 255, 0.1);
//}
</style>
<style scoped>
.remark-input {
width: 763px;
/*background: #f6f8fa;*/
}
</style> </style>
src/views/cxyrd/TT.vue
<template> <template>
<div class="tt"> <div class="tt">
<div class="tt_header"> <div class="header">
<div class="tt_header_label"> <div class="label">
查重 查重
</div> </div>
<div class="tt_header_button"> <div class="btns">
<el-button>比中</el-button> <div class="bz-btn">比中</div>
<el-button>认定完成</el-button> <div class="rd-btn">认定完成</div>
</div> </div>
</div> </div>
<div class="tt_main"> <div class="tt_main">
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
div { div {
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -108,19 +108,41 @@ div { ...@@ -108,19 +108,41 @@ div {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.tt_header { .header {
height: 32px; height: 32px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
.label {
align-self: flex-start;
width: 100px;
}
} }
.tt_header .tt_header_label {
align-self: flex-start; .btns {
width: 100px;
}
.tt_header .tt_header_button {
align-self: flex-end; align-self: flex-end;
margin-right: 50px; margin-right: 50px;
margin-top: 18px;
color: #ffffff;
font-size: 14px;
line-height: 22px;
.bz-btn {
width: 96px;
height: 32px;
background: #ff0039;
border-radius: 4px;
margin-right: 16px;
text-align: center;
line-height: 32px;
}
.rd-btn {
width: 96px;
height: 32px;
background: #055fe7;
border-radius: 4px;
text-align: center;
line-height: 32px;
}
} }
.tt_main .tt_main_top { .tt_main .tt_main_top {
width: 100%; width: 100%;
......
src/views/cxyrd/modules/LTCandidate.vue
<template> <template>
<div class="lt_candidate"> <div class="lt_candidate">
<div class="lt_cnadidate_search"> <div class="lt_cnadidate_search">
<el-dropdown trigger="click">
<div class="label">
指纹
<i
style=" width: 16px; height: 16px"
class="el-icon-caret-bottom"
></i>
</div>
<el-dropdown-menu slot="dropdown">
<div class="label" @click="choose(1)">指纹</div>
<div class="label" @click="choose(2)">掌纹</div>
</el-dropdown-menu>
</el-dropdown>
<el-input <el-input
placeholder="请输入内容" class="input"
v-model="input3" v-model="input3"
class="input-with-select" placeholder="请输入条码号/指位"
> ></el-input>
<el-select v-model="select" slot="prepend" placeholder="请选择"> <div class="btn">筛选</div>
<el-option label="指纹" value="1"></el-option> <div class="checked">
<el-option label="掌纹" value="2"></el-option> <el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</el-select> </div>
<el-button slot="append" @click="search">筛选</el-button> <!-- <el-input-->
</el-input> <!-- placeholder="请输入内容"-->
</div> <!-- v-model="input3"-->
<div class="lt_cnadidate_checked"> <!-- class="input-with-select"-->
<el-checkbox v-model="checked">显示已比中候选</el-checkbox> <!-- >-->
<!-- <el-select v-model="select" slot="prepend" placeholder="请选择">-->
<!-- <el-option label="指纹" value="1"></el-option>-->
<!-- <el-option label="掌纹" value="2"></el-option>-->
<!-- </el-select>-->
<!-- <el-button slot="append" @click="search">筛选</el-button>-->
<!-- </el-input>-->
</div> </div>
<div class="lt_candidate_number"> <div class="lt_candidate_number">
<el-table <el-table
...@@ -248,14 +268,18 @@ export default { ...@@ -248,14 +268,18 @@ export default {
tableRowClassName({ row, column, rowIndex, columnIndex }) { tableRowClassName({ row, column, rowIndex, columnIndex }) {
console.log(row); console.log(row);
// 比中的行 // 比中的行
if (row.affirmStatus == 2) { if (row.affirmstatus == 2 || row.affirmstatus == 3) {
console.log(row); console.log(row);
return "Bizhong"; return "Bizhong"
} else if (row.affirmStatus == 1) { } else if (row.affirmstatus == 1) {
// 认定完成的行 // 认定完成的行
console.log(row); console.log(row);
return "Identification"; return "Identification";
} }
// 浏览过的
if (row.clickLog == 1) {
return "looked"
}
}, },
/** /**
* @description: 切换指位选择 * @description: 切换指位选择
...@@ -1061,6 +1085,9 @@ export default { ...@@ -1061,6 +1085,9 @@ export default {
self.$bus.emit("changImageEditTarget", response.data.ret.image); self.$bus.emit("changImageEditTarget", response.data.ret.image);
}); });
} }
},
choose(val) {
console.info(val);
} }
}, },
watch: { watch: {
...@@ -1121,14 +1148,43 @@ const candidates = [ ...@@ -1121,14 +1148,43 @@ const candidates = [
display: inline-block; display: inline-block;
} }
.lt_cnadidate_search { .lt_cnadidate_search {
width: 100%; width: 352px;
height: 48px; height: 60px;
} background: #ffffff;
.lt_cnadidate_checked { .label {
width: 100%; width: 60px;
height: 31px; height: 24px;
display: flex; font-size: 16px;
justify-content: flex-end; font-family: MicrosoftYaHei;
color: #1a1a1a;
line-height: 24px;
i {
margin: 0;
}
}
.input {
width: 235px;
height: 32px;
background: #ffffff;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border: 1px solid #e6e6e8;
margin-left: 10px;
}
.btn {
width: 44px;
height: 32px;
background: #006aff;
border-radius: 0px 4px 4px 0px;
line-height: 32px;
color: #ffffff;
text-align: center;
}
.checked {
display: flex;
justify-content: flex-end;
margin-top: 4px;
}
} }
.lt_candidate_number { .lt_candidate_number {
width: 100%; width: 100%;
...@@ -1220,5 +1276,10 @@ const candidates = [ ...@@ -1220,5 +1276,10 @@ const candidates = [
color: #055fe7; color: #055fe7;
} }
} }
.looked {
.cell {
color: #999;
}
}
} }
</style> </style>
src/views/cxyrd/modules/LTSrc.vue
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
* @param {*} rowIndex * @param {*} rowIndex
* @param {*} columnIndex * @param {*} columnIndex
* @return {*} * @return {*}
*/ */
tableRowClassName ({ row, column, rowIndex, columnIndex }) { tableRowClassName ({ row, column, rowIndex, columnIndex }) {
// 比中的行 // 比中的行
if (row.affirmStatus == 2 || row.affirmStatus == 3) { if (row.affirmStatus == 2 || row.affirmStatus == 3) {
...@@ -90,6 +90,10 @@ export default { ...@@ -90,6 +90,10 @@ export default {
console.log(row); console.log(row);
return "Identification" return "Identification"
} }
// 浏览过的
if(row.clickLog == 1) {
return "looked"
}
}, },
/** /**
* @description: 选择切换 * @description: 选择切换
...@@ -129,7 +133,7 @@ export default { ...@@ -129,7 +133,7 @@ export default {
getDetailData () { getDetailData () {
let self = this let self = this
this.$axios this.$axios
.post("/api/queryque/standardAll", {}) .post("/api/queryque/standardAll", {contrastCustomSearchReq:{querytype: "2"}})
.then(response => { .then(response => {
console.log(response); console.log(response);
self.sourceDataList = response.data.ret self.sourceDataList = response.data.ret
...@@ -193,7 +197,7 @@ export default { ...@@ -193,7 +197,7 @@ export default {
* @param {*} newValue * @param {*} newValue
* @param {*} oldValue * @param {*} oldValue
* @return {*} * @return {*}
*/ */
checked(newValue, oldValue) { checked(newValue, oldValue) {
console.log(newValue); console.log(newValue);
if(newValue) { if(newValue) {
...@@ -286,6 +290,11 @@ const datas = [ ...@@ -286,6 +290,11 @@ const datas = [
color: #055FE7; color: #055FE7;
} }
} }
.looked {
.cell {
color: #999;
}
}
.finger_print_number { .finger_print_number {
width: 100%; width: 100%;
height: 40px; height: 40px;
......
src/views/cxyrd/modules/TLCandidate.vue
...@@ -38,7 +38,8 @@ export default { ...@@ -38,7 +38,8 @@ export default {
data() { data() {
return { return {
input3: "", input3: "",
tableData: "" tableData: [],
checked: ""
}; };
}, },
methods: { methods: {
......
src/views/cxyrd/modules/TLSrc.vue
<template> <template>
<div class="tl-src"> <div class="tl-src">
<div class="top"> <div class="top">
<label>任务号:</label> <label>任务号:{{ rwh }}</label>
<el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox> <el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox>
</div> </div>
<div class="main"> <div class="main">
...@@ -118,6 +118,7 @@ export default { ...@@ -118,6 +118,7 @@ export default {
}, },
data() { data() {
return { return {
rwh: 21,
checked: true, checked: true,
tableData: null, tableData: null,
options: "展开", options: "展开",
...@@ -165,6 +166,9 @@ export default { ...@@ -165,6 +166,9 @@ export default {
div { div {
display: inline-block; display: inline-block;
} }
label {
margin-right: 67px;
}
.tl-src { .tl-src {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
vue.config.js
...@@ -60,13 +60,13 @@ module.exports = { ...@@ -60,13 +60,13 @@ module.exports = {
"/api": { "/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.213:8099/", // 张 认定 // target: "http://172.18.108.213:8099/", // 张 认定
target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api': '/api' "^/api": "/api"
} }
}, }
// 阿里 // 阿里
// "/api": { // "/api": {
// target: "http://47.92.225.109:9101/", // 张 认定 // target: "http://47.92.225.109:9101/", // 张 认定
...@@ -76,10 +76,26 @@ module.exports = { ...@@ -76,10 +76,26 @@ module.exports = {
// '^/api': '/api' // '^/api': '/api'
// } // }
// } // }
}
},
}, },
css: { css: {
sourceMap: process.env.NODE_ENV === "development" ? true : false // 在开发环境下开启 CSS sourcemaps sourceMap: process.env.NODE_ENV === "development" ? true : false // 在开发环境下开启 CSS sourcemaps
} }
// chainWebpack(config) {
// config.module
// .rule("svg")
// .exclude.add(resolve("src/icons"))
// .end();
// config.module
// .rule("icons")
// .test(/\.svg$/)
// .include.add(resolve("src/icons"))
// .end()
// .use("svg-sprite-loader")
// .loader("svg-sprite-loader")
// .options({
// symbolId: "icon-[name]"
// })
// .end();
// }
}; };
yarn.lock
This source diff could not be displayed because it is too large. You can view the blob instead.
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