Commit cdbd1a9d by 张超军

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

parents f3749528 7664acf2
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" 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>退出 2</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="方正指掌纹-案件指纹" transform="translate(-1881.000000, -24.000000)" fill="#000000" fill-rule="nonzero">
<g id="编组-8" transform="translate(280.000000, 0.000000)">
<g id="退出-2" transform="translate(1600.000000, 23.000000)">
<rect id="矩形" opacity="0" x="0" y="0" width="16" height="16"></rect>
<path d="M11.8592593,2.1589054 C13.8539124,3.47150844 15.0385065,5.71335327 14.9990441,8.10094918 C14.942048,11.9259774 11.8122625,15 7.99952375,15 L7.89953061,15 C6.04192998,14.9778668 4.27039922,14.2133861 2.97986775,12.8769844 C1.68204585,11.5488708 0.969476392,9.75668919 1.00100335,7.89994769 C1.02540115,5.71940013 2.07117018,3.6765713 3.82580978,2.38190705 C4.04782363,2.20197713 4.3506053,2.15825962 4.61444288,2.26803927 C4.87828046,2.37781893 5.06069764,2.62342185 5.08957146,2.90774312 C5.11844528,3.19206439 4.98912722,3.46932993 4.75274625,3.62991624 C3.38756563,4.63700888 2.57417911,6.22650974 2.5558968,7.92294787 C2.53141389,9.3675181 3.08592603,10.7618259 4.09579127,11.7949764 C5.09911431,12.8338639 6.4764055,13.4280346 7.92052917,13.4449885 C9.36371183,13.4619634 10.7553378,12.9089361 11.7932638,11.9059772 C12.8319434,10.9020765 13.4260193,9.52443586 13.4431507,8.07994903 C13.4742959,6.22172408 12.5521338,4.47687912 10.9993182,3.45591496 C10.6703397,3.20821883 10.5909714,2.74723676 10.8181677,2.40376822 C11.045364,2.06029967 11.5006262,1.95301676 11.8572594,2.1589054 L11.8592593,2.1589054 Z M7.99952375,8.77795417 C7.56987566,8.77795417 7.22157707,8.42962913 7.22157707,7.99994843 L7.22157707,1.7779026 C7.22163402,1.34826218 7.56991594,1 7.99952376,1 C8.42913158,1 8.77741349,1.34826218 8.77747044,1.7779026 L8.77747044,7.99994843 C8.77747044,8.42995161 8.42849436,8.77795417 7.99952375,8.77795417 L7.99952375,8.77795417 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" 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>退出 (1)</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="方正指掌纹-案件指纹" transform="translate(-1881.000000, -44.000000)" fill-rule="nonzero">
<g id="编组-8" transform="translate(280.000000, 0.000000)">
<g id="退出-(1)" transform="translate(1600.000000, 43.000000)">
<rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
<path d="M11.8592593,2.1589054 C13.8539124,3.47150844 15.0385065,5.71335327 14.9990441,8.10094918 C14.942048,11.9259774 11.8122625,15 7.99952375,15 L7.89953061,15 C6.04192998,14.9778668 4.27039922,14.2133861 2.97986775,12.8769844 C1.68204585,11.5488708 0.969476392,9.75668919 1.00100335,7.89994769 C1.02540115,5.71940013 2.07117018,3.6765713 3.82580978,2.38190705 C4.04782363,2.20197713 4.3506053,2.15825962 4.61444288,2.26803927 C4.87828046,2.37781893 5.06069764,2.62342185 5.08957146,2.90774312 C5.11844528,3.19206439 4.98912722,3.46932993 4.75274625,3.62991624 C3.38756563,4.63700888 2.57417911,6.22650974 2.5558968,7.92294787 C2.53141389,9.3675181 3.08592603,10.7618259 4.09579127,11.7949764 C5.09911431,12.8338639 6.4764055,13.4280346 7.92052917,13.4449885 C9.36371183,13.4619634 10.7553378,12.9089361 11.7932638,11.9059772 C12.8319434,10.9020765 13.4260193,9.52443586 13.4431507,8.07994903 C13.4742959,6.22172408 12.5521338,4.47687912 10.9993182,3.45591496 C10.6703397,3.20821883 10.5909714,2.74723676 10.8181677,2.40376822 C11.045364,2.06029967 11.5006262,1.95301676 11.8572594,2.1589054 L11.8592593,2.1589054 Z M7.99952375,8.77795417 C7.56987566,8.77795417 7.22157707,8.42962913 7.22157707,7.99994843 L7.22157707,1.7779026 C7.22163402,1.34826218 7.56991594,1 7.99952376,1 C8.42913158,1 8.77741349,1.34826218 8.77747044,1.7779026 L8.77747044,7.99994843 C8.77747044,8.42995161 8.42849436,8.77795417 7.99952375,8.77795417 L7.99952375,8.77795417 Z" id="形状" fill="#595959"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
......@@ -23,7 +23,7 @@ export default [
{
path: "/Home",
name: "Home",
redirect: '/Home/htzwcj',
redirect: "/Home/htzwcj",
meta: {
title: "工作桌面",
auth: "5"
......@@ -35,44 +35,44 @@ export default [
name: "htzwcj",
hidden: true,
meta: {
title: '活体指纹采集',
auth: '5'
title: "活体指纹采集",
auth: "5"
},
component: () => import("@/views/htzwcj.vue"),
component: () => import("@/views/htzwcj.vue")
},
{
path: "/zzwcj",
name: "zzwcj",
hidden: false,
icon_d: '/img/zzwcj_d.png',
icon_a: '/img/zzwcj_a.png',
icon_d: "/img/zzwcj_d.png",
icon_a: "/img/zzwcj_a.png",
meta: {
title: '指掌纹采集',
auth: '5'
title: "指掌纹采集",
auth: "5"
},
component: () => import("@/views/zzwcj/Index.vue"),
component: () => import("@/views/zzwcj/Index.vue")
},
{
path: "/zzwlr",
name: "zzwlr",
hidden: false,
icon_d: '/img/zzwlr_d.png',
icon_a: '/img/zzwlr_a.png',
icon_d: "/img/zzwlr_d.png",
icon_a: "/img/zzwlr_a.png",
meta: {
title: '指掌纹录入',
auth: '5'
title: "指掌纹录入",
auth: "5"
},
component: () => import("@/views/zzwlr/Index.vue"),
component: () => import("@/views/zzwlr/Index.vue")
},
{
path: "/zwbj",
name: "zwbj",
hidden: false,
icon_d: '/img/zwbj_d.png',
icon_a: '/img/zwbj_a.png',
icon_d: "/img/zwbj_d.png",
icon_a: "/img/zwbj_a.png",
meta: {
title: '指纹编辑',
auth: '5'
title: "指纹编辑",
auth: "5"
},
component: () => import("@/views/Editor/Editor.vue")
},
......@@ -80,72 +80,74 @@ export default [
path: "/cxyrd",
name: "cxyrd",
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
icon_d: "/img/cxyrd_d.png",
icon_a: "/img/cxyrd_a.png",
meta: {
title: '查询与认定',
auth: '5'
title: "查询与认定",
auth: "5"
},
component: () => import("@/views/cxyrd/QueryConfirm.vue"),
component: () => import("@/views/cxyrd/QueryConfirm.vue")
},
{
path: "/zljc",
name: "zljc",
hidden: false,
icon_d: '/img/zljc_d.png',
icon_a: '/img/zljc_a.png',
icon_d: "/img/zljc_d.png",
icon_a: "/img/zljc_a.png",
meta: {
title: '质量检查',
auth: '5'
title: "质量检查",
auth: "5"
},
component: () => import("@/views/zljc/Index.vue"),
component: () => import("@/views/zljc/Index.vue")
},
{
path: "/daxx",
name: "daxx",
hidden: false,
icon_d: '/img/daxx_d.png',
icon_a: '/img/daxx_a.png',
icon_d: "/img/daxx_d.png",
icon_a: "/img/daxx_a.png",
meta: {
title: '档案信息',
auth: '5'
title: "档案信息",
auth: "5"
},
component: () => import("@/views/daxx/Index.vue"),
component: () => import("@/views/daxx/Index.vue")
},
{
path: "/AllPersonnelBaseIndex",
name: "AllPersonnelBaseIndex",
hidden: false,
icon_d: '/img/sszygl_d.png',
icon_a: '/img/sszygl_a.png',
icon_d: "/img/sszygl_d.png",
icon_a: "/img/sszygl_a.png",
meta: {
title: '数据资源管理',
auth: '5'
title: "数据资源管理",
auth: "5"
},
component: () => import("@/views/AllPersonnelBase/Index.vue"),
children: [
{
path: "/",
path: "/",
name: "AllPersonnelBase",
hidden: false,
meta: {
title: '全部人员库',
auth: '5'
title: "全部人员库",
auth: "5"
},
component: () => import("@/views/AllPersonnelBase/AllPersonnelBase.vue")
component: () =>
import("@/views/AllPersonnelBase/AllPersonnelBase.vue")
},
{
path: "qbalk",
path: "qbalk",
name: "qbalk",
hidden: false,
meta: {
title: '全部案例库',
auth: '5'
title: "全部案例库",
auth: "5"
},
component: () => import("@/views/AllPersonnelBase/AllPersonnelBase.vue")
},
component: () =>
import("@/views/AllPersonnelBase/AllPersonnelBase.vue")
}
]
},
}
]
},
{
......@@ -164,9 +166,26 @@ export default [
title: "首页",
auth: "5"
},
component: () => import("@/views/Home/Home.vue"),
component: () => import("@/views/Home/Home.vue")
},
{
path: "/confirm/LT",
name: "LT",
meta: {
title: "认定界面",
auth: "5"
},
component: () => import("@/views/cxyrd/LT.vue")
},
{
path: "/confirm/TT",
name: "TT",
meta: {
title: "认定界面",
auth: "5"
},
component: () => import("@/views/cxyrd/TT.vue")
}
// {
// path: "/Editor",
// name: "Editor",
......
......@@ -49,6 +49,7 @@
<div class="message">
<div class="circle"></div>
</div>
<div class="back" @click="goLogin"></div>
<div class="quit" @click="goLogin"></div>
</div>
</el-header>
......@@ -373,17 +374,31 @@ export default {
border: 1px solid #FFFFFF;
}
}
.back {
cursor: pointer;
width: 14px;
height: 12px;
display: flex;
background-image: url('../assets/img/Home/back_d.png');
background-size: 14px 12px;
background-position: center;
background-repeat: no-repeat;
&:hover {
background-image: url('../assets/img/Home/back_a.png');
}
margin-left: 25px;
}
.quit {
cursor: pointer;
width: 14px;
height: 12px;
display: flex;
background-image: url('../assets/img/Home/quit_d.png');
background-image: url('../assets/img/Home/back_d.png');
background-size: 14px 12px;
background-position: center;
background-repeat: no-repeat;
&:hover {
background-image: url('../assets/img/Home/quit_a.png');
background-image: url('../assets/img/Home/back_a.png');
}
margin-left: 25px;
}
......
......@@ -306,6 +306,7 @@ export default {
},
getBarcode() {
this.barcode = null;
if (this.selectionData.length === 0) {
this.$message.error("请选择需要复制条码号的数据!");
} else if (this.selectionData.length === 1) {
......@@ -358,7 +359,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "4600000777774684891335",
num: "100/100",
queryType: "lt",
status: "认定完成",
......@@ -371,7 +372,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000005555584891335",
num: "100/100",
queryType: "ll",
status: "认定完成",
......@@ -384,7 +385,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "4600000233333684891335",
num: "100/100",
queryType: "tl",
status: "认定完成",
......@@ -397,7 +398,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000000000054684891335",
num: "100/100",
queryType: "tt",
status: "认定完成",
......@@ -410,7 +411,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000001111154684891335",
num: "100/100",
queryType: "lt",
status: "认定完成",
......@@ -423,7 +424,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000002222254684891335",
num: "100/100",
queryType: "ll",
status: "认定完成",
......@@ -436,7 +437,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "460000033333354684891335",
num: "100/100",
queryType: "tl",
probability: "100",
......@@ -449,7 +450,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000004444454684891335",
num: "100/100",
queryType: "tt",
status: "认定完成",
......@@ -575,6 +576,15 @@ label {
color: #999999;
line-height: 22px;
}
b {
width: 64px;
height: 24px;
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
line-height: 24px;
}
.el-icon-arrow-down {
color: #999999;
border: #999999 1px solid;
......@@ -675,6 +685,7 @@ label {
right: 48px;
}
.confirm_header_search {
border: 1px saddlebrown solid;
}
.confirm_main {
width: 100%;
......
<template>
<div class="lt">
<div class="lt_header">头部工具</div>
<div class="lt_left">左侧源条码信息</div>
<div class="lt_main">
<div class="lt_main_middle">中部指纹对比区</div>
<!-- <div class="lt_main_footer">底部工具</div>-->
</div>
<div class="lt_right">右侧候选指纹信息</div>
</div>
</template>
<script>
export default {
// 正查 倒查 查重
name: "LT"
};
</script>
<style scoped>
div {
margin: 0;
padding: 0;
display: inline-block;
border: none;
}
.lt {
width: 100%;
height: 100%;
background-color: #ffffff;
/*padding: 24px;*/
}
.lt_header {
width: 100%;
height: 120px;
border: 1px saddlebrown solid;
}
.lt_left {
height: 880px;
width: 352px;
border: 1px saddlebrown solid;
}
.lt_right {
height: 880px;
width: 352px;
border: 1px saddlebrown solid;
}
.lt_main {
width: 1100px;
height: 880px;
border: 1px saddlebrown solid;
}
.lt_main_middle {
width: 1100px;
height: 756px;
border: 1px saddlebrown solid;
}
.lt_main_footer {
width: 1100px;
height: 88px;
border: 1px saddlebrown solid;
}
</style>
......@@ -9,13 +9,14 @@
<div class="display_style">
<span>条码号:</span>
<el-input
class="el_input"
v-model="params.barcode"
placeholder="请输入条码号"
></el-input>
</div>
<div class="display_style">
<span>用户ID:</span>
<el-select v-model="value">
<el-select class="el_select" v-model="value">
<el-option
v-for="item in options"
:key="item.value"
......@@ -27,18 +28,19 @@
</div>
<div class="display_style">
<span>查询ID:</span>
<el-input placeholder="请输入查询ID"></el-input>
<el-input class="el_input" placeholder="请输入查询ID"></el-input>
</div>
<div class="display_style">
<span>任务号:</span>
<el-input placeholder="请输入任务号"></el-input>
<el-input class="el_input" placeholder="请输入任务号"></el-input>
</div>
<div class="display_style">
<span>发送时间:</span>
<el-date-picker
v-model="startDate"
class="el_data_picker"
type="daterange"
range-separator=""
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
>
......@@ -141,7 +143,7 @@
class="mineral-table"
border
@selection-change="handleSelectionChange"
height="660"
height="490"
ref="confirmTable"
tooltip-effect="dark"
:data="tableData"
......@@ -155,7 +157,7 @@
<el-table-column
prop="barcode"
label="源号码号"
width="230"
width="235"
></el-table-column>
<el-table-column
prop="num"
......@@ -186,7 +188,7 @@
<el-table-column
prop="probability"
label="查重概率"
width="130"
width="100"
></el-table-column>
<el-table-column
prop="level"
......@@ -211,7 +213,7 @@
label="用户ID"
width="100"
></el-table-column>
<el-table-column width="150" label="操作">
<el-table-column width="140" label="操作">
<template slot-scope="scope">
<el-button
@click="edit(scope.row)"
......@@ -260,7 +262,7 @@ export default {
account: "00000000",
number: 15,
tableData: datas1,
columes: content,
// columes: content,
userId: "1111",
options: [
{
......@@ -292,20 +294,31 @@ export default {
};
},
methods: {
// 删除
del(row) {
// todo 删除确认
this.$message.success("删除成功");
console.info(row);
},
// 认定
edit(row) {
console.info(row);
// tt 查重
if (row.queryType === "tt") {
this.$router.push({ path: "/confirm/TT" });
}
// ll 串查 lt 正查 tl 倒查
else {
this.$router.push({ path: "/confirm/LT" });
}
},
// table表格选中获取数据
handleSelectionChange(val) {
this.selectionData = val;
console.info(this.selectionData);
},
// 复制条码号 获取选中条码值
getBarcode() {
this.barcode = null;
if (this.selectionData.length === 0) {
this.$message.error("请选择需要复制条码号的数据!");
} else if (this.selectionData.length === 1) {
......@@ -328,21 +341,25 @@ export default {
handleSizeChange() {},
handleCurrentChange() {},
clearParams() {}
// 清空筛选条件
clearParams() {
this.params.barcode = null;
}
}
};
const content = [
{ colume: "任务号", prop: "id", width: 100 },
{ colume: "源条码号", prop: "barcode", width: 230 },
{ colume: "候选个数", prop: "num", width: 100 },
// { colume: "查询类型", prop: "queryType", width: 100 },
{ colume: "状态", prop: "status", width: 100 },
{ colume: "查重概率", prop: "probability", width: 130 },
{ colume: "优先级", prop: "level", width: 100 },
{ colume: "认定时间", prop: "confirmDate", width: 200 },
{ colume: "发送时间", prop: "sendDate", width: 200 },
{ colume: "用户ID", prop: "userId", width: 100 }
];
// const content = [
// { colume: "任务号", prop: "id", width: 100 },
// { colume: "源条码号", prop: "barcode", width: 230 },
// { colume: "候选个数", prop: "num", width: 100 },
// // { colume: "查询类型", prop: "queryType", width: 100 },
// { colume: "状态", prop: "status", width: 100 },
// { colume: "查重概率", prop: "probability", width: 130 },
// { colume: "优先级", prop: "level", width: 100 },
// { colume: "认定时间", prop: "confirmDate", width: 200 },
// { colume: "发送时间", prop: "sendDate", width: 200 },
// { colume: "用户ID", prop: "userId", width: 100 }
// ];
// 数据
const datas1 = [
{
id: "116755",
......@@ -358,7 +375,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "4600000777774684891335",
num: "100/100",
queryType: "lt",
status: "认定完成",
......@@ -371,7 +388,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000005555584891335",
num: "100/100",
queryType: "ll",
status: "认定完成",
......@@ -384,7 +401,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "4600000233333684891335",
num: "100/100",
queryType: "tl",
status: "认定完成",
......@@ -397,7 +414,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000000000054684891335",
num: "100/100",
queryType: "tt",
status: "认定完成",
......@@ -410,7 +427,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000001111154684891335",
num: "100/100",
queryType: "lt",
status: "认定完成",
......@@ -423,7 +440,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000002222254684891335",
num: "100/100",
queryType: "ll",
status: "认定完成",
......@@ -436,7 +453,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "460000033333354684891335",
num: "100/100",
queryType: "tl",
probability: "100",
......@@ -449,7 +466,7 @@ const datas1 = [
},
{
id: "116755",
barcode: "46000002321654684891335",
barcode: "46000004444454684891335",
num: "100/100",
queryType: "tt",
status: "认定完成",
......@@ -559,7 +576,7 @@ div {
margin: 0;
padding: 0;
display: inline-block;
border: none;
/*border: none;*/
}
hr {
background-color: #eeeeee;
......@@ -575,6 +592,16 @@ label {
color: #999999;
line-height: 22px;
}
b {
width: 64px;
height: 24px;
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
line-height: 24px;
}
.el-icon-arrow-down {
color: #999999;
border: #999999 1px solid;
......@@ -589,7 +616,6 @@ label {
margin: 0;
padding: 0;
}
.el-button__inner {
width: 56px;
height: 16px;
......@@ -598,12 +624,10 @@ label {
color: #2e3846;
line-height: 16px;
}
.confirm_base {
height: 100%;
background-color: #ffffff;
padding: 24px;
margin: 24px;
}
.display_style {
display: inline-block;
......@@ -618,14 +642,26 @@ label {
margin: 0;
padding: 0;
}
.display_style .el-input {
.el_select {
width: 168px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
}
.display_style .el-select {
width: 168px;
.el_data_picker {
width: 256px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
}
.display_style .el-date-picker {
width: 200px;
.el_input {
width: 168px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
}
.el-button--text {
width: fit-content;
......@@ -675,20 +711,22 @@ label {
right: 48px;
}
.confirm_header_search {
width: 100%;
}
.confirm_main {
width: 100%;
height: 680px;
height: 60px;
}
.confirm_main_table {
margin: 16px 0 15px 0;
padding: 0;
width: 100%;
height: 680px;
height: 500px;
}
.confirm_footer_page {
position: absolute;
right: 48px;
bottom: 30px;
bottom: 24px;
height: 34px;
}
</style>
<template>
<div>TT</div>
</template>
<script>
export default {
name: "TT"
};
</script>
<style scoped></style>
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