Commit ab72e5de by yuhao

Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

parents 22e8f1aa 74afe10a
......@@ -43,6 +43,46 @@
"children":[]
},
{
"ids":"10300329",
"label":"银行卡号",
"codeType":"CODE_HCYPRW_XSLX",
"text":"银行卡号",
"pId":null,
"id":"0005",
"isParent":false,
"children":[]
},
{
"ids":"10300330",
"label":"人像线索",
"codeType":"CODE_HCYPRW_XSLX",
"text":"人像线索",
"pId":null,
"id":"0006",
"isParent":false,
"children":[]
},
{
"ids":"10300331",
"label":"指纹编号",
"codeType":"CODE_HCYPRW_XSLX",
"text":"指纹编号",
"pId":null,
"id":"0007",
"isParent":false,
"children":[]
},
{
"ids":"10300332",
"label":"DNA编号",
"codeType":"CODE_HCYPRW_XSLX",
"text":"DNA编号",
"pId":null,
"id":"0008",
"isParent":false,
"children":[]
},
{
"ids":"10300328",
"label":"其他线索",
"codeType":"CODE_HCYPRW_XSLX",
......
......@@ -152,4 +152,12 @@ export const deleteXs = params =>
//线索详情
export const queryXs = params =>
postform(`${base.alyIP}/hcyprw/queryXs`, params);
\ No newline at end of file
postform(`${base.alyIP}/hcyprw/queryXs`, params);
//研判要素导入
export const importExcel = params =>
postform(`${base.alyIP}/hcyprw/importExcel`, params);
//研判要素导出
export const downloadExcel = params =>
post(`${base.alyIP}/hcyprw/downloadExcel`, params);
......@@ -432,7 +432,6 @@
v-else-if="columnTitle.prop == 'xszmc'"
style="
cursor: pointer;
color: #096cc9;
font-size: 13px !important;
white-space: nowrap;
overflow: hidden;
......@@ -476,7 +475,7 @@
style="cursor: pointer; color: #096cc9"
@click="turnToEdit(scope.row, 'add')"
>
<i class="el-icon-edit-outline"></i> 登记为串并案
<i class="el-icon-edit-outline"></i> 确认串并线索
</span>
<span
style="cursor: pointer; color: #096cc9; margin-left: 20px"
......
......@@ -579,7 +579,6 @@
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="100"
align="center"
......@@ -686,7 +685,11 @@ export default {
tableDataLength: 0, //表格总数
talbeBhgCount: "", // 不合格
talbehgCount: "", // 合格
tableData: [], //表格数据
tableData: [
// {
// asjbh: '111111111111'
// }
], //表格数据
propdefaultFormThead: utils.deepClone(this.cxDefaultFormThead), //表格表头
excelHeader: "案件标注",
tableSelectItem: [],
......
......@@ -54,7 +54,11 @@
>
<!-- 判断二级菜单(有三级菜单)-->
<el-submenu :index="items.index" v-if="items.hasChildren" style="padding-left:18px !important">
<el-submenu
:index="items.index"
v-if="items.hasChildren"
style="padding-left: 18px !important"
>
<template slot="title">{{ items.label }}</template>
<el-menu-item
@click="goDetail(j)"
......@@ -177,8 +181,11 @@ export default {
console.log(path);
window.open(path, "_blank");
} else if (item.id == "cbypTxxxfx") {
let obj = JSON.parse(sessionStorage.getItem("userInfo"));
let path = `${this.$baseUrl.alyIP11}/hdfx/hdfx/toIframe?drrZjhm=${obj.identitycard}`;
let rxtoken = sessionStorage.getItem("rxtoken")
? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
: "";
let path = `http://xzxt-zhyy.dsj.xz/telephone/#/jump?token=${rxtoken}&path=/queryHdfx`;
window.open(path, "_blank");
} else if (item.id == "brainDzajSP") {
// let obj = JSON.parse(sessionStorage.getItem("userInfo"));
......@@ -194,21 +201,17 @@ export default {
item.id == "zcajfl" ||
item.id == "zczbgctj"
) {
let userToken = sessionStorage.getItem('userToken')
let appToken = sessionStorage.getItem('appToken')
let path = `${this.$baseUrl.alyIP10}?zjhm=${JSON.parse(sessionStorage.getItem("userInfo")).identitycard
}&path=/ajzbIndex&userToken=${userToken}&appToken=${appToken}`;
let userToken = sessionStorage.getItem("userToken");
let appToken = sessionStorage.getItem("appToken");
let path = `${this.$baseUrl.alyIP10}?zjhm=${
JSON.parse(sessionStorage.getItem("userInfo")).identitycard
}&path=/ajzbIndex&userToken=${userToken}&appToken=${appToken}`;
window.open(path, "_blank");
} else if (item.id == "zdryGl") {
this.$router.pushToTab({
path: "zdryGl",
});
} else if (item.id == "queryHd") {
// let obj = JSON.parse(sessionStorage.getItem("userInfo"));
// let account = Base64.encode(obj.identitycard);
// debugger;
// let path = `${this.$baseUrl.alyIP11}/hdfx/hdfx/toIframe?drrZjhm=${account}`;
// window.open(path, "_blank");
this.$router.push({
path: "/queryHd",
});
......
......@@ -39,7 +39,7 @@ const menuLayouts = [
path: "/bshcb",
name: "bshcb",
meta: {
title: '标识号串并'
title: '综合串并线索汇集'
},
component: () => import("@/views/cbyp/bshcb.vue")
},
......@@ -116,7 +116,7 @@ const menuLayouts = [
path: "/cbaAdd",
name: "cbaAdd",
meta: {
title: "登记为串并案",
title: "确认串并线索",
auth: 5
},
component: () => import("@/views/cbyp/cbaAdd.vue")
......
......@@ -202,7 +202,7 @@ export default [
name: "djwzba",
redirect: '/djwzba/xgaj',
meta: {
title: "登记为串并案",
title: "确认串并线索",
auth: 5
},
component: () => import("@/views/cbyp/cba/djwzba.vue"),
......
export default {
dateToStr(from) {
let date = new Date();
date.setTime(from);
let y = date.getFullYear();
let m = date.getMonth() + 1;
m = m < 10 ? "0" + m : m;
let d = date.getDate();
d = d < 10 ? "0" + d : d;
return y + '-' + m + '-' + d;
},
/**
* 时间戳转日期格式
* @param {Object} timeStamp
......
......@@ -290,7 +290,7 @@ export default {
Menu: [
{
id: "bshcb",
label: "标识号串并",
label: "综合串并线索汇集",
index: "bshcb",
auth: "M0101",
className: "iconfont iconrizhi",
......@@ -309,7 +309,7 @@ export default {
children: [
{
id: "bshcb",
label: "标识号串并",
label: "综合串并线索汇集",
index: "bshcb",
auth: "M0101",
className: "iconfont iconrizhi",
......@@ -317,7 +317,7 @@ export default {
},
{
id: "rgcb",
label: "人工串并",
label: "扩串研判",
index: "rgcb",
auth: "M0101",
className: "iconfont iconrizhi",
......
......@@ -214,7 +214,7 @@ export default {
Menu: [
{
id: "rgcb",
label: "人工串并",
label: "扩串研判",
index: "rgcb",
auth: "M0101",
className: "iconfont iconrizhi",
......
......@@ -232,6 +232,22 @@ export default {
placeholder: "请输入",
col: "15",
},
{
name: "痕迹物证",
id: "jyaq",
type: "text",
value: "",
placeholder: "请输入",
col: "15",
},
{
name: "人员轨迹",
id: "jyaq",
type: "text",
value: "",
placeholder: "请输入",
col: "15",
},
],
cxDefaultFormThead: [
{
......
......@@ -7,6 +7,10 @@
:propTitle="title"
:pageBs="pageBs"
ref="formCompontent"
@removePhoto="removePhoto"
:base64Transform="true"
:fileBase64="fileBase64"
@onBase64Transform="onBase64Transform"
>
</form-compontent>
</div>
......@@ -57,19 +61,46 @@ export default {
placeholder: "请输入",
col: "18",
},
{
name: "人像照片:",
id: "zpBase64s",
type: "photo",
value: "",
placeholder: "请输入",
col: "22",
},
],
},
],
formLabelAlign: {},
formLabelAlign: { zpBase64: "", xslx: "", xshm: "", xsms: "" },
result: "",
hcyprwXxzjbh: "",
fileBase64: {
zpBase64: "",
},
};
},
methods: {
onBase64Transform(p) {
debugger
this.fileBase64 = p;
},
removePhoto(item) {
let loading = this.$loading({
lock: true,
text: "正在删除...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
let id = item.id;
this.$set(this.formLabelAlign, id, "");
loading.close();
},
submit(params) {
if (this.$route.query.hcyprwXxzjbh) {
params.append("hcyprwXxzjbh", this.$route.query.hcyprwXxzjbh);
params.append("xxzjbh", this.$route.query.xxzjbh);
params.append("zpBase64", this.fileBase64.zpBase64s);
updateXs(params).then((res) => {
if (res.code === 200) {
this.$message.success("保存成功");
......@@ -85,6 +116,7 @@ export default {
});
} else {
params.append("hcyprwXxzjbh", this.$route.query.xxzjbh);
params.append("zpBase64", this.fileBase64.zpBase64s);
saveXs(params).then((res) => {
if (res.code === 200) {
this.$message.success("保存成功");
......@@ -109,14 +141,23 @@ export default {
});
var self = this;
let params = new FormData();
params.append("xxzjbh", this.$route.query.hcyprwXxzjbh);
params.append("xxzjbh", this.$route.query.xxzjbh);
queryXs(params).then((res) => {
var result = res.data.xs;
this.result = result;
self.propFormField.forEach((fieldItem) => {
if (fieldItem.data && fieldItem.data.length > 0) {
fieldItem.data.forEach((i) => {
this.$set(this.formLabelAlign, i.id, result[i.id]);
if (i.id === "zpBase64s") {
this.fileBase64["zpBase64s"] = result["zpBase64"];
this.$set(
this.formLabelAlign,
"zpBase64s",
"data:image/jpeg;base64," + result["zpBase64"]
);
} else {
this.$set(this.formLabelAlign, i.id, result[i.id]);
}
});
}
this.$forceUpdate();
......
......@@ -409,7 +409,10 @@
width: 1160px;
"
>
<div style="padding: 13px 20px; border-bottom: 1px solid #e4e4e4" v-if="!$route.query.isXswj">
<div
style="padding: 13px 20px; border-bottom: 1px solid #e4e4e4"
v-if="!$route.query.isXswj"
>
<span
style="
font-size: 18px;
......@@ -434,6 +437,60 @@
<template slot-scope="{ row }">
<span class="cz" @click="editXs(row)">修改</span>
<span class="cz" @click="delXs(row)">删除</span>
<span class="cz" @click="goDetailWrap(row)">GPS分析</span>
<span
class="cz"
v-if="
row.xslx == '0001' ||
row.xslx == '0003' ||
row.xslx == '0004' ||
row.xslx == '0005'
"
@click="goDetailWrap(row, 'nt')"
>脑图</span
>
<span
class="cz"
v-if="row.xslx == '0004' || row.xslx == '0001'"
@click="goDetailWrap(row, 'sk')"
>时空大数据分析</span
>
<span
class="cz"
v-if="row.xslx == '0005'"
@click="goDetailWrap(row, 'zjl')"
>资金流分析</span
>
<span
class="cz"
v-if="row.xslx == '0003'"
@click="goDetailWrap(row, 'hd')"
>话单分析</span
>
<span
class="cz"
v-if="row.xslx == '0003'"
@click="goDetailWrap(row, 'da')"
>档案</span
>
<span
class="cz"
v-if="row.xslx == '0006'"
@click="goDetailWrap(row, 'rxbd')"
>人像比对</span
>
<span
class="cz"
v-if="row.xslx == '0007' || row.xslx == '0008' && !row.isResult"
@click="goDetailWrap(row, 'fqbd')"
>发起比对</span
>
<span
class="cz"
v-if="(row.xslx == '0007' || row.xslx == '0008') && row.isResult"
@click="goDetailWrap(row, 'result')"
>比对结果</span
>
</template>
</el-table-column>
<el-table-column
......@@ -520,7 +577,10 @@
width: 1160px;
"
>
<div style="padding: 13px 20px; border-bottom: 1px solid #e4e4e4" v-if="!$route.query.isXxbc">
<div
style="padding: 13px 20px; border-bottom: 1px solid #e4e4e4"
v-if="!$route.query.isXxbc"
>
<span
style="
font-size: 18px;
......@@ -531,7 +591,11 @@
>线索挖掘</span
>
</div>
<div class="block" style="padding: 30px 50px 10px" v-if="!$route.query.isXxbc">
<div
class="block"
style="padding: 30px 50px 10px"
v-if="!$route.query.isXxbc"
>
<span
v-for="item in gzList"
:key="item.id"
......@@ -936,6 +1000,40 @@
</div>
</div>
</el-dialog>
<el-dialog
title="比对结果"
:visible.sync="dialogVisiblResult"
width="30%"
center
>
<div>
<div class="infoItem">
<span>现场勘验编号:</span>
</div>
<div class="infoItem">
<span>物证编号: 363323566532428</span>
</div>
<div class="infoItem">
<span>比中人姓名: 李达林</span>
</div>
<div class="infoItem">
<span>比中人身份证号: 542129199801082230</span>
</div>
<div class="infoItem">
<span>必中时间: 2018-07-12 15:07:50</span>
</div>
<div class="infoItem">
<span>比中单位: 西藏自治区拉萨公安局</span>
</div>
<div style="text-align: center; padding: 0 0 19px 0">
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisiblResult = false">取 消</el-button>
<el-button type="primary" @click="dialogVisiblResult = false">确 定</el-button>
</span>
</div>
</div>
</el-dialog>
</div>
</template>
......@@ -978,6 +1076,8 @@ export default {
},
data() {
return {
dialogVisiblResult:false,
xslxDict: [],
zczlbh: "",
fpbh: "",
sub: "",
......@@ -1600,8 +1700,110 @@ export default {
],
};
},
mounted() {},
mounted() {
axios.get(`JsonData/CODE_HCYPRW_XSLX.json`).then((res) => {
if (res.success === true) {
this.xslxDict = res.data.rows;
console.log(this.xslxDict);
}
});
},
methods: {
goDetailWrap(item, type) {
debugger
if (type == "nt") {
let type = "";
if (item.xslx == "0001") {
type = "KyRy";
} else if (item.xslx == "0003") {
type = "KySj";
} else if (item.xslx == "0004") {
type = "AjXx";
} else if (item.xslx == "0005") {
type = "YhkZc";
}
var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
var idcard = userInfo.identitycard;
var params = {
type: type,
kybh: item.xshm,
userId: idcard,
username: userInfo.userName,
trueName: userInfo.userName,
identitycard: userInfo.identitycard,
unitcode: userInfo.unitcode,
unitname: userInfo.unitname,
};
// var params = {type:'KySj',kybh:item.row.kyxshmYdhm, userId: '142302198901012417'}
this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
} else if (type == "sk") {
let identitycard = JSON.parse(
sessionStorage.getItem("userInfo")
).identitycard;
let key =
"maplogin" +
encrypt.creattimeBumderNYR(new Date()).split("-").join("");
let vi =
"map_vues" +
encrypt.creattimeBumderNYR(new Date()).split("-").join("");
let skjm = encrypt.skEncrypt(identitycard, key.trim(), vi.trim());
if (item.xslx == "0001") {
path = `${this.$baseUrl.alyIP9}/#/jumplogin?idcard=${skjm}&toType=yrzc&objectType=zjhm&objectValue=${item.xshm}`;
} else if (item.xslx == "0004") {
path = `${this.$baseUrl.alyIP9}/#/jumplogin?idcard=${skjm}&toType=yazc&objectType=yazc&objectValue=${item.xshm}`;
}
window.open(path, "_blank");
} else if (type == "zjl") {
let rxtoken = sessionStorage.getItem("rxtoken")
? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
: "";
let path = `http://xzxt-zhyy.dsj.xz/zjlfx/#/jump?path=/zjlfx&token=${encodeURIComponent(
rxtoken
)}`;
window.open(path, "_blank");
} else if (type == "hd") {
let rxtoken = sessionStorage.getItem("rxtoken")
? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
: "";
let path = `http://xzxt-zhyy.dsj.xz/telephone/#/jump?path=/queryHdfx&token${rxtoken}`;
window.open(path, "_blank");
} else if (type == "da") {
let path = `${
this.$baseUrl.alyIP14
}/#/jump?token=${base}&path=/sjdaIndex&cphm=${item.xshm}&zjhm=${
JSON.parse(sessionStorage.getItem("userInfo")).identitycard
}`;
window.open(path, "_blank");
} else if (type == "rxbd") {
let rxtoken = sessionStorage.getItem("rxtoken")
? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
: "";
let path = `http://xzxt-zhyy.dsj.xz/rxbd/#/jump?token=${rxtoken}&path=makeCompare`;
window.open(path, "_blank");
} else if (type == "fqbd") {
this.$set(item,'isResult',true)
this.$message("发起比对成功");
} else if (type == "result") {
debugger
this.dialogVisiblResult = true
}
},
toDetail(url, PARAMS) {
var temp_form = document.createElement("form");
temp_form.action = url;
temp_form.target = "_blank";
temp_form.method = "post";
temp_form.style.display = "none";
for (var x in PARAMS) {
var opt = document.createElement("textarea");
opt.name = x;
opt.value = PARAMS[x];
temp_form.appendChild(opt);
}
document.body.appendChild(temp_form);
temp_form.submit();
},
addXs() {
this.$router.pushToTab({
path: "/addHbypXs",
......@@ -1731,17 +1933,17 @@ export default {
});
},
godetail(item) {
let identitycard = JSON.parse(sessionStorage.getItem("userInfo")).identitycard;
let identitycard = JSON.parse(
sessionStorage.getItem("userInfo")
).identitycard;
let key =
"maplogin" + encrypt.creattimeBumderNYR(new Date()).split("-").join("");
let vi =
"map_vues" + encrypt.creattimeBumderNYR(new Date()).split("-").join("");
let skjm = encrypt.skEncrypt(
identitycard,
key.trim(),
vi.trim()
);
let rxtoken = sessionStorage.getItem("rxtoken") ? sessionStorage.getItem("rxtoken").replace(/\+/g,'%2B') : '';
let skjm = encrypt.skEncrypt(identitycard, key.trim(), vi.trim());
let rxtoken = sessionStorage.getItem("rxtoken")
? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
: "";
let path = "";
if (item.id == "hdfx" || item.id == "zjlfx") {
path = `${item.url}?token=${rxtoken}&path=${item.path}`;
......
......@@ -606,6 +606,7 @@ export default {
label: "专业研判任务审批",
index: "hpyprwSp",
auth: "M0302",
roles: ["C020201"],
className: "iconfont iconrizhi",
disabled: false,
},
......
......@@ -800,8 +800,7 @@ export default {
this.$router.pushToTab({
path: "/detailHbyp",
query: {
xxzjbh: scope.xxzjbh,
isXswj: true
xxzjbh: scope.xxzjbh
},
});
},
......
......@@ -267,20 +267,20 @@ export default {
this.initDate(this.unitList[index]);
},
goDetail(row, type) {
console.log(row)
console.log(type)
if (type == "unitName") {
this.formData.unitCode = row.unitCode;
this.initDate();
// this.initDate(row.unitCode);
// this.unitList.push(row.unitCode)
this.$router.pushToTab({
path: '/queryDwcztj',
query: {
unitCode: row.unitCode,
yymcdm: row.yymcdm ?? '',
djsjKssj: this.formData.djsjKssj ? util.dateToStr(this.formData.djsjKssj) : '',
djsjJssj: this.formData.djsjJssj ? util.dateToStr(this.formData.djsjJssj) : ''
}
})
// this.$router.pushToTab({
// path: '/queryDwcztj',
// query: {
// unitCode: row.unitCode,
// yymcdm: row.yymcdm ?? '',
// djsjKssj: this.formData.djsjKssj ? util.dateToStr(this.formData.djsjKssj) : '',
// djsjJssj: this.formData.djsjJssj ? util.dateToStr(this.formData.djsjJssj) : ''
// }
// })
} else {
let yymcdm = '';
for (let i in this.queryTypeList) {
......
......@@ -290,50 +290,50 @@ export default {
fzwdHeather: [
{
label: "行政区划",
prop: "",
prop: "xzqh",
},
{
label: "名称",
prop: "",
prop: "mc",
},
{
label: "经度",
prop: "",
prop: "jd",
},
{
label: "纬度",
prop: "",
prop: "wd",
},
{
label: "发现时间",
prop: "",
prop: "fxsj",
},
],
//六、0006 异常资金流动
yczjldHeather: [
{
label: "转出卡号",
prop: "",
prop: "zckh",
},
{
label: "转出银行",
prop: "",
prop: "zcyh",
},
{
label: "转入卡号",
prop: "",
prop: "zrkh",
},
{
label: "转入银行",
prop: "",
prop: "zryh",
},
{
label: "交易金额",
prop: "",
prop: "jyje",
},
{
label: "交易时间",
prop: "",
prop: "jysj",
},
],
// 七、0007 铁路
......@@ -936,7 +936,7 @@ export default {
self.tableList = self.ajfaHeather;
} else if (this.typeMx == "0021") {
self.tableList = self.ldxxHeather;
} else if (this.typeMx == "0022" || '0023') {
} else if (this.typeMx == "0022" || this.typeMx == '0023') {
self.tableList = self.saryHeather;
} else if (this.typeMx == "0024") {
self.tableList = self.ajfaHeather;
......
......@@ -195,16 +195,7 @@ export default {
type: "success",
callback: () => {
loading.close();
if (this.$route.query.module == "ztryyj") {
window.close();
window.opener.location.reload();
} else if (this.type == "fqzl") {
this.$router.push("wsqfbdzczl");
} else if (this.type == "xdzl") {
this.$router.push("queryAjlb");
} else {
this.$router.push("wfqdzczl");
}
this.$router.push("wfqdzczl");
},
});
} else {
......
......@@ -43,10 +43,7 @@
<el-button slot="trigger" size="mini" type="primary" v-if="show"
>选取文件</el-button
>
<el-button
size="mini"
v-if="show"
@click="submitUpload(scope.scope)"
<el-button size="mini" v-if="show" @click="submitUpload(scope.scope)"
>上传</el-button
>
<el-button
......@@ -145,7 +142,7 @@ export default {
pageBs: "queryZj",
pageASs: "queryZjQt",
cxFormData: {
username: JSON.parse(window.sessionStorage.getItem("userInfo"))
username: JSON.parse(window.sessionStorage.getItem("userInfo"))
.userName,
endTime: "",
startTime: "",
......@@ -294,10 +291,44 @@ export default {
hasChildren: false,
},
{
id: "kjdzxxbd",
id: "kjdzxxbdNew",
label: "空间电子信息比对",
newAuth: "M01",
index: "kjdzxxbd",
index: "kjdzxxbdNew",
className: "iconfont icongongnengfuwu",
hasChildren: true,
children: [
{
id: "tqajdzkjxx",
label: "提取案件电子空间信息",
index: "tqajdzkjxx",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
{
id: "sckjdzxx",
label: "上传空间电子信息",
index: "sckjdzxx",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
{
id: "kjdzxxbd",
label: "空间电子信息比对",
index: "kjdzxxbd",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
],
},
{
id: "zhcbfx",
label: "综合串并分析",
newAuth: "M01",
index: "zhcbfx",
className: "iconfont icongongnengfuwu",
hasChildren: false,
},
......
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