Commit cc3f36c6 by lp784568205

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

parents a8e588f3 53e83da4
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2997,7 +2997,7 @@ export default {
this.pageBs == "hmdrylist" ||
this.pageBs == "lkyj" ||
this.pageBs == "queryAjcc" ||
this.pageBs == "queryAjcc"
this.pageBs == "queryJqcc"
) {
currentUrl = `${url.alyIP2}${this.cxUrl}`;
} else if (
......
......@@ -8,22 +8,22 @@ const menuLayouts = [
},
component: () => import("@/views/ajxscxbd/ajjs/queryAjlb.vue")
},
{
path: "/queryXczw",
name: "queryXczw",
meta: {
title: '现场指纹比中信息'
},
component: () => import("@/views/ajxscxbd/xczw/queryXczw.vue")
},
{
path: "/addZwbz",
name: "addZwbz",
meta: {
title: '现场指纹比中信息'
},
component: () => import("@/views/ajxscxbd/xczw//addZw.vue")
},
// {
// path: "/queryXczw",
// name: "queryXczw",
// meta: {
// title: '现场指纹比中信息'
// },
// component: () => import("@/views/ajxscxbd/xczw/queryXczw.vue")
// },
// {
// path: "/addZwbz",
// name: "addZwbz",
// meta: {
// title: '现场指纹比中信息'
// },
// component: () => import("@/views/ajxscxbd/xczw//addZw.vue")
// },
// {
// path: "/detailXczw",
// name: "detailXczw",
......@@ -32,22 +32,22 @@ const menuLayouts = [
// },
// component: () => import("@/views/ajxscxbd/xczw/detailXczw.vue")
// },
{
path: "/queryDnabz",
name: "queryDnabz",
meta: {
title: '现场DNA比中信息'
},
component: () => import("@/views/ajxscxbd/xcdna/queryDnabz.vue")
},
{
path: "/addDnabz",
name: "addDnabz",
meta: {
title: '现场DNA比中信息'
},
component: () => import("@/views/ajxscxbd/xcdna/addDnabz.vue")
},
// {
// path: "/queryDnabz",
// name: "queryDnabz",
// meta: {
// title: '现场DNA比中信息'
// },
// component: () => import("@/views/ajxscxbd/xcdna/queryDnabz.vue")
// },
// {
// path: "/addDnabz",
// name: "addDnabz",
// meta: {
// title: '现场DNA比中信息'
// },
// component: () => import("@/views/ajxscxbd/xcdna/addDnabz.vue")
// },
// {
// path: "/detailDnabz",
// name: "detailDnabz",
......@@ -64,46 +64,46 @@ const menuLayouts = [
// },
// component: () => import("@/views/ajxscxbd/xcystr/detailXcystr.vue")
// },
{
path: "/queryXcystrCase",
name: "queryXcystrCase",
meta: {
title: '现场YSTR案件比对'
},
component: () => import("@/views/ajxscxbd/xcystr/queryXcystrCase.vue")
},
{
path: "/queryXcystrPeople",
name: "queryXcystrPeople",
meta: {
title: '现场YSTR人员比对'
},
component: () => import("@/views/ajxscxbd/xcystr/queryXcystrPeople.vue")
},
{
path: "/addYstrbz",
name: "addYstrbz",
meta: {
title: 'ystr比中信息'
},
component: () => import("@/views/ajxscxbd/xcystr/addYstrbz.vue")
},
{
path: "/queryXcrx",
name: "queryXcrx",
meta: {
title: '现场人像串查信息'
},
component: () => import("@/views/ajxscxbd/xcrx/queryXcrx.vue")
},
{
path: "/addRxbz",
name: "addRxbz",
meta: {
title: '现场人像串查信息'
},
component: () => import("@/views/ajxscxbd/xcrx/addRxbz.vue")
},
// {
// path: "/queryXcystrCase",
// name: "queryXcystrCase",
// meta: {
// title: '现场YSTR案件比对'
// },
// component: () => import("@/views/ajxscxbd/xcystr/queryXcystrCase.vue")
// },
// {
// path: "/queryXcystrPeople",
// name: "queryXcystrPeople",
// meta: {
// title: '现场YSTR人员比对'
// },
// component: () => import("@/views/ajxscxbd/xcystr/queryXcystrPeople.vue")
// },
// {
// path: "/addYstrbz",
// name: "addYstrbz",
// meta: {
// title: 'ystr比中信息'
// },
// component: () => import("@/views/ajxscxbd/xcystr/addYstrbz.vue")
// },
// {
// path: "/queryXcrx",
// name: "queryXcrx",
// meta: {
// title: '现场人像串查信息'
// },
// component: () => import("@/views/ajxscxbd/xcrx/queryXcrx.vue")
// },
// {
// path: "/addRxbz",
// name: "addRxbz",
// meta: {
// title: '现场人像串查信息'
// },
// component: () => import("@/views/ajxscxbd/xcrx/addRxbz.vue")
// },
// {
// path: "/detailXcrx",
// name: "detailXcrx",
......@@ -112,22 +112,22 @@ const menuLayouts = [
// },
// component: () => import("@/views/ajxscxbd/xcrx/detailXcrx.vue")
// },
{
path: "/queryXczj",
name: "queryXczj",
meta: {
title: '现场足迹串查信息'
},
component: () => import("@/views/ajxscxbd/xczj/queryXczj.vue")
},
{
path: "/addZjbd",
name: "addZjbd",
meta: {
title: '现场足迹串查信息'
},
component: () => import("@/views/ajxscxbd/xczj/addZjbd.vue")
},
// {
// path: "/queryXczj",
// name: "queryXczj",
// meta: {
// title: '现场足迹串查信息'
// },
// component: () => import("@/views/ajxscxbd/xczj/queryXczj.vue")
// },
// {
// path: "/addZjbd",
// name: "addZjbd",
// meta: {
// title: '现场足迹串查信息'
// },
// component: () => import("@/views/ajxscxbd/xczj/addZjbd.vue")
// },
// {
// path: "/detailXczj",
// name: "detailXczj",
......@@ -144,22 +144,22 @@ const menuLayouts = [
// },
// component: () => import("@/views/ajxscxbd/xczj/detailXczjdc.vue")
// },
{
path: "/queryRxbd",
name: "queryRxbd",
meta: {
title: '现场人像比对'
},
component: () => import("@/views/ajxscxbd/rxbd/queryRxbd.vue")
},
{
path: "/addRxbd",
name: "addRxbd",
meta: {
title: '人像比对信息'
},
component: () => import("@/views/ajxscxbd/rxbd/addRxbd.vue")
},
// {
// path: "/queryRxbd",
// name: "queryRxbd",
// meta: {
// title: '现场人像比对'
// },
// component: () => import("@/views/ajxscxbd/rxbd/queryRxbd.vue")
// },
// {
// path: "/addRxbd",
// name: "addRxbd",
// meta: {
// title: '人像比对信息'
// },
// component: () => import("@/views/ajxscxbd/rxbd/addRxbd.vue")
// },
// {
// path: "/detailRxbd",
// name: "detailRxbd",
......
......@@ -29,7 +29,7 @@
prop=""
label="操作">
<template slot-scope="scope">
<el-button v-if="scope.row.bdzt == '0'" type="text" @click="sendBdjg(scope.row)">发送任务</el-button>
<el-button type="text" @click="sendBdjg(scope.row)">发送任务</el-button>
<el-button v-if="scope.row.bdzt == '1' || scope.row.bdzt == '3'" type="text" @click="seeResult(scope.row)">查看结果</el-button>
</template>
</el-table-column>
......@@ -121,8 +121,8 @@
this.loading = true
post(`${url.alyIP}${this.Url2}`, param).then(
(res) => {
this.loading = false
if (res.success) {
this.loading = false
this.getXczwlb()
}
})
......@@ -217,5 +217,28 @@
border-top: 0
}
}
::v-deep .el-table .cell .edit{
font-size: 14px;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 22px;
color: #007AFF;
cursor: pointer;
}
::v-deep .el-pagination__sizes{
top: 12px;
right: 152px;
width: 110px;
}
::v-deep .el-drawer__body{
.flTtitle{
font-size: 15px;
font-weight: bold;
line-height: 21px;
color: #363636;
margin: 16px 12px 14px 0;
display: inline-block;
}
}
}
</style>
......@@ -11,8 +11,8 @@
<p><span>比中状态: </span>{{ getBdzt(item.bdzt) }}</p>
<p><span>认定数量: </span>{{ item.rdCount }}</p>
<p><span>比对时间: </span>{{ item.zpJlsj }}</p>
<el-button type="primary" size="small" @click="sendBdjg(item)">发送比对任务</el-button>
<el-button v-if="item.bdzt == '1' || item.bdzt == '3'" type="primary" size="small" @click="seeResult(item)">查看结果</el-button>
<el-button v-if="item.bdzt == '0'" type="primary" size="small" @click="sendBdjg(item)">发送比对任务</el-button>
</div>
</li>
</ul>
......@@ -73,8 +73,8 @@
post(`${url.alyIP}${this.Url2}`, param).then(
(res) => {
if (res.success) {
this.getXczwlb()
this.loading = false
this.getXczwlb()
}
})
},
......
......@@ -24,7 +24,7 @@
prop=""
label="操作">
<template slot-scope="scope">
<el-button v-if="scope.row.bdzt == '0'" type="text" @click="sendBdjg(scope.row)">发送任务</el-button>
<el-button type="text" @click="sendBdjg(scope.row)">发送任务</el-button>
<el-button v-if="scope.row.bdzt == '1' || scope.row.bdzt == '3'" type="text" @click="seeResult(scope.row)">查看结果</el-button>
</template>
</el-table-column>
......@@ -190,5 +190,20 @@
border-top: 0
}
}
::v-deep .el-pagination__sizes{
top: 12px;
right: 152px;
width: 110px;
}
::v-deep .el-drawer__body{
.flTtitle{
font-size: 15px;
font-weight: bold;
line-height: 21px;
color: #363636;
margin: 16px 12px 14px 0;
display: inline-block;
}
}
}
</style>
......@@ -10,8 +10,8 @@
<p><span>物证编号: </span>{{ item.wzbh }}</p>
<p><span>比中状态: </span>{{ getBdzt(item.bdzt) }}</p>
<p><span>比对时间: </span>{{ item.zpJlsj }}</p>
<el-button type="primary" size="small" @click="sendBdjg(item)">发送比对任务</el-button>
<el-button v-if="item.bdzt == '1' || item.bdzt == '3'" type="primary" size="small" @click="seeResult(item)">查看结果</el-button>
<el-button v-if="item.bdzt == '0'" type="primary" size="small" @click="sendBdjg(item)">发送比对任务</el-button>
</div>
</li>
</ul>
......@@ -88,8 +88,8 @@
post(`${url.alyIP}${this.Url2}`, param).then(
(res) => {
if (res.success) {
this.getXczwlb()
this.loading = false
this.getXczwlb()
}
})
},
......@@ -180,8 +180,28 @@
}
}
}
li:nth-child(1), li:nth-child(2){
border-top: 0
}
::v-deep .el-table .cell .edit{
font-size: 14px;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 22px;
color: #007AFF;
cursor: pointer;
}
::v-deep .el-pagination__sizes{
top: 12px;
right: 152px;
width: 110px;
}
::v-deep .el-drawer__body{
.flTtitle{
font-size: 15px;
font-weight: bold;
line-height: 21px;
color: #363636;
margin: 16px 12px 14px 0;
display: inline-block;
}
}
}
......
<template>
<div class="xczzw-info">
<div class="xczzw-info Content">
<ul v-if="dataBase.length > 0" v-loading="loading">
<li v-for="(item, index) in dataBase" :key="index">
<div class="left">
......@@ -10,8 +10,8 @@
<p><span>物证编号: </span>{{ item.wzbh }}</p>
<p><span>比中状态: </span>{{ getBdzt(item.bdzt) }}</p>
<p><span>比对时间: </span>{{ item.djsj }}</p>
<el-button type="primary" size="small" @click="sendBdjg(item)">发送比对任务</el-button>
<el-button v-if="item.bdzt == '1' || item.bdzt == '3'" type="primary" size="small" @click="seeResult(item)">查看结果</el-button>
<el-button v-if="item.bdzt == '0'" type="primary" size="small" @click="sendBdjg(item)">发送比对任务</el-button>
</div>
</li>
</ul>
......@@ -211,12 +211,6 @@
}
}
}
li:nth-child(1){
border-top: 0
}
li:nth-child(2){
border-top: 0
}
}
.antherUl{
height: 275px;
......@@ -224,5 +218,28 @@
text-align: center;
font-size: 14px;
}
::v-deep .el-table .cell .edit{
font-size: 14px;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 22px;
color: #007AFF;
cursor: pointer;
}
::v-deep .el-pagination__sizes{
top: 12px;
right: 152px;
width: 110px;
}
::v-deep .el-drawer__body{
.flTtitle{
font-size: 15px;
font-weight: bold;
line-height: 21px;
color: #363636;
margin: 16px 12px 14px 0;
display: inline-block;
}
}
}
</style>
\ No newline at end of file
......@@ -161,25 +161,5 @@
::v-deep .is-active{
background-color: #fff;
}
::v-deep .el-tabs__content{
// border: 1px solid #E4E7ED;
border-left: 0;
height: 275px;
overflow-y: scroll;
}
::-webkit-scrollbar {
width: 7px;
height: 7px;
} /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
::-webkit-scrollbar-track {
background-color: linear-gradient(#0d1d36, #134792);
} /*定义滚动条轨道 内阴影+圆角*/
::-webkit-scrollbar-thumb {
background-color: #D9D9DA;
border-radius: 6px;
} /*定义滑块 内阴影+圆角*/
// .el-dialog{
// z-index: 9999999999;
// }
}
</style>
\ No newline at end of file
<template>
<el-table
v-loading="loading"
:data="tableData"
style="width: 100%">
<el-table-column
prop="xm"
label="姓名"
width="180">
</el-table-column>
<el-table-column
prop="cyzjZjhm"
label="身份证号"
width="180">
</el-table-column>
<el-table-column
prop=""
label="照片">
<template slot-scope="scope">
<el-image style="width: 60px;" :src="'data:image/jpeg;base64,' + scope.row.ryzp"></el-image>
</template>
</el-table-column>
<el-table-column
prop="xbdmStr"
label="性别">
</el-table-column>
<el-table-column
prop="gjdmStr"
label="户籍地">
</el-table-column>
<el-table-column
prop="bz"
label="信息来源">
</el-table-column>
</el-table>
<div>
<el-table
v-loading="loading"
:data="tableData"
style="width: 100%">
<el-table-column
prop="xm"
label="姓名"
width="100">
</el-table-column>
<el-table-column
prop="cyzjZjhm"
label="身份证号"
width="180">
</el-table-column>
<!-- <el-table-column
prop=""
label="照片">
<template slot-scope="scope">
<el-image style="width: 60px;" :src="'data:image/jpeg;base64,' + scope.row.ryzp"></el-image>
</template>
</el-table-column> -->
<el-table-column
prop="xbdmStr"
label="性别"
width="100">
</el-table-column>
<el-table-column
prop="gjdmStr"
label="户籍地"
width="180">
</el-table-column>
<el-table-column
prop="bz"
label="信息来源">
</el-table-column>
<el-table-column
prop="rdzt"
label="认定标识"
width="120">
<template slot-scope="scope">
<span>{{ getRdbs(scope.row.rdzt) }}</span>
</template>
</el-table-column>
<el-table-column
prop=""
label="操作"
width="80">
<template slot-scope="scope">
<el-button @click="rending(scope.row)" type="text">认定</el-button>
</template>
</el-table-column>
</el-table>
<el-dialog title="身份认定" :visible.sync="dialogFormVisible">
<el-form :model="form" style="margin-top: 20px;">
<el-form-item label="备注:" :label-width="formLabelWidth">
<el-input type="textarea" v-model="form.name" autocomplete="off" style="width: 98%"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="areyouSure">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -45,9 +76,16 @@
},
data() {
return {
formLabelWidth: '60px',
dialogFormVisible: false,
tableData: [],
Url: '/Rxbzrw/selectDcsflist',
loading: false
rdUrl: '/Rxbzrw/updateDcsfrd',
loading: false,
form: {
name: ''
},
redingData: {}
};
},
props: {
......@@ -65,6 +103,39 @@
this.loading = false
});
},
rending(data) {
this.dialogFormVisible = true
console.log('data', data)
this.redingData = data
},
getRdbs(type) {
// 0-未比对 1-已比对 2-比对中 3-已认定
let text = ''
switch (type) {
case '0':
text = '未认定'
break
case '1':
text = '已认定'
break
}
return text
},
areyouSure() {
const param = {
rybh: this.rybh,
zjhm: this.redingData.cyzjZjhm,
bdzt: '1',
bz: this.form.name
}
post(`${url.alyIP}${this.rdUrl}`, param).then(
(res) => {
if (res.success) {
this.dialogFormVisible = true
this.getDcsfxx()
}
});
}
},
created() {
},
......
......@@ -32,7 +32,7 @@
label="操作"
width="150">
<template slot-scope="scope">
<el-button v-if="scope.row.bdzt == '0'" @click="sendBdjg(scope.row)" type="text" size="small">发起比对</el-button>
<el-button @click="sendBdjg(scope.row)" type="text" size="small">发起比对</el-button>
<el-button v-if="scope.row.bdzt == '1' || scope.row.bdzt == '3'" type="text" size="small" @click="showBdjg(scope.row.bdrwbh)">比对结果</el-button>
</template>
</el-table-column>
......@@ -103,7 +103,7 @@
sendBdjg(item) {
// console.log('item', item)
const param = {
ythrybh: item.asjxgrybh,
ythrybh: this.rybh,
xxzjbh: item.xxzjbh,
zp: item.ryzpDzwjnr
}
......@@ -111,8 +111,8 @@
post(`${url.alyIP}${this.Url2}`, param).then(
(res) => {
if (res.success) {
this.getList()
this.loading = false
this.getList()
}
})
},
......
......@@ -35,7 +35,7 @@
label="操作"
width="150">
<template slot-scope="scope">
<el-button v-if="scope.row.bdzt == '0'" @click="sendBdjg(scope.row)" type="text" size="small">发起比对</el-button>
<el-button @click="sendBdjg(scope.row)" type="text" size="small">发起比对</el-button>
<el-button v-if="scope.row.bdzt == '1' || scope.row.bdzt == '3'" type="text" size="small" @click="showBdjg(scope.row.bdrwbh)">比对结果</el-button>
</template>
</el-table-column>
......@@ -121,9 +121,8 @@
},
// 比对
sendBdjg(item) {
// console.log('item', item)
const param = {
ythrybh: item.asjxgrybh,
ythrybh: this.rybh,
xxzjbh: item.xxzjbh
}
this.loading = true
......
......@@ -35,7 +35,7 @@
label="操作"
width="150">
<template slot-scope="scope">
<el-button v-if="scope.row.bdzt == '0'" @click="sendBdjg(scope.row)" type="text" size="small">发起比对</el-button>
<el-button @click="sendBdjg(scope.row)" type="text" size="small">发起比对</el-button>
<el-button v-if="scope.row.bdzt == '1' || scope.row.bdzt == '3'" type="text" size="small" @click="showBdjg(scope.row.bdrwbh)">比对结果</el-button>
</template>
</el-table-column>
......@@ -154,7 +154,7 @@
sendBdjg(item) {
// console.log('item', item)
const param = {
ythrybh: item.asjxgrybh,
ythrybh: this.rybh,
xxzjbh: item.xxzjbh
}
this.loading = true
......
......@@ -18,6 +18,7 @@
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { loginByZjhm } from "@/api/index";
export default {
name: "queryAjcc",
components: {
......@@ -30,18 +31,28 @@ export default {
cxFormData: {
limit: 10,
page: 1,
grade: '',
unitcode: '',
asjbh: '',
ajmc: '',
ajfl: ['05001000','03080700','06013900','04000900','06080100','06080200','06012400','06012300','05001100',],
larqStart: '',
larqEnd: '',
asjfsddXzqhmc: '',
jyaq: '',
asjfssjAsjfskssj: '',
asjfssjAsjfsjssj: '',
bzzt: '',
grade: "",
unitcode: "",
asjbh: "",
ajmc: "",
ajfl: [
"05001000",
"03080700",
"06013900",
"04000900",
"06080100",
"06080200",
"06012400",
"06012300",
"05001100",
],
larqStart: "",
larqEnd: "",
asjfsddXzqhmc: "",
jyaq: "",
asjfssjAsjfskssj: "",
asjfssjAsjfsjssj: "",
bzzt: "",
},
cxQueryField: [
{
......@@ -50,27 +61,27 @@ export default {
type: "select",
selectData: [
{
name: '省级',
value: 'S',
name: "省级",
value: "S",
},
{
name: '地市',
value: 'D',
name: "地市",
value: "D",
},
{
name: '县级',
value: 'X',
name: "县级",
value: "X",
},
{
name: '科所级',
value: 'K',
name: "科所级",
value: "K",
},
],
value: "",
placeholder: "",
col: "3",
},
{
name: "单位",
id: "unitcode",
......@@ -212,9 +223,21 @@ export default {
},
created() {
this.$store.commit("user/SET_Menu", this.Menu);
this.login();
// debugger;
},
methods: {
login() {
let zjhm;
try {
zjhm = JSON.parse(
window.sessionStorage.getItem("userInfo")
).identitycard;
} catch (e) {
this.$message.error("请重新登录");
}
loginByZjhm({ zjhm });
},
sprops(data) {
debugger;
let params = {
......
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