Commit 84e23cb0 by hd

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

parents 27695fb5 405aaa0d
......@@ -23,13 +23,14 @@ if (
base.alyIP5 = 'http://74.6.54.169:8003' // 画像工厂 案件
base.alyIP6 = 'http://74.6.54.163:9002' // 画像工厂 案件
base.alyIP7 = 'http://74.6.54.173:8006' // 脑图审批
base.alyIP8 = 'http://74.6.54.164:9003' //案件标注
base.alyIP8 = 'http://74.6.54.164:9003' //旧版案件标注
base.alyIP9 = 'http://74.6.54.165:9005' // 时空;
base.alyIP10 = 'http://74.6.54.163:9001' // 案件侦办
base.alyIP11 = 'http://74.6.54.173:8004' // 话单分析
base.alyIP13 = '/apiXssp' // 线索审批管理平台
base.alyIP14 = 'http://74.6.54.163:9002' // 西藏 人档车档
base.alyIP15 = 'http://65.26.2.252:8006' // 全国在逃
base.alyIP16 = 'http://74.6.54.163:8080' //新版案件标注
} else {
//------------------------------服务器路径**测试**----------------------------------
base.alyIP = "/apialy";
......@@ -46,6 +47,7 @@ if (
base.alyIP13 = '/apiXssp' // 线索审批管理平台
base.alyIP14 = 'http://74.6.54.163:9002' // 西藏 人档车档
base.alyIP15 = 'http://65.26.2.252:8006' // 全国在逃
base.alyIP16 = 'http://74.6.54.163:8080' //新版案件标注
}
export default base;
......@@ -102,4 +102,9 @@ export const getZbzzByYhjh = params =>
// 1.2.3.4 用户警号提取
export const getWfqdzczlListNew = params =>
post(`${base.alyIP}/zczl/getWfqdzczlListNew`, params);
\ No newline at end of file
post(`${base.alyIP}/zczl/getWfqdzczlListNew`, params);
//认定
export const rdXsglbsh = params =>
post(`${base.alyIP}/xshb/rdXsglbsh`, params);
......@@ -58,7 +58,7 @@
v-for="i in item.data"
:key="i.prop"
>
<span class="label" :style="{ width: labelWidth }">{{
<span class="label" style="width: 90px">{{
i.label
}}</span>
<span
......@@ -77,9 +77,60 @@
</div>
</span>
<span
v-if="i.prop == 'asjbh'"
class="cont"
:style="{ width: `calc(100% - 90px)` }"
>
<span>{{ pageData[item.objStr][index].asjbh }}</span>
<el-popover placement="right" trigger="click">
<div>
<ul
class="popUl"
style="position: absolute; left: -1px; top: -30px"
>
<li>
<span>{{
pageData[item.objStr][index].asjbh
}}</span>
</li>
<li
@click="
ychyLink(
'ajzb',
pageData[item.objStr][index].asjbh
)
"
>
<i class="el-icon-coin"></i
><span>案件侦办</span>
</li>
<li
@click="
ychyLink(
'skzz',
pageData[item.objStr][index].asjbh
)
"
>
<i class="el-icon-link"></i>
<span>时空作战</span>
</li>
</ul>
</div>
<img
slot="reference"
src="../assets/img/asjxx_ychy.png"
style="width: 20px; cursor: pointer"
/>
</el-popover>
</span>
<span
v-if="
item.objStr &&
(i.prop != 'spflwsfjssss' || i.prop != 'zpflwsfjssss')
(i.prop != 'spflwsfjssss' ||
i.prop != 'zpflwsfjssss') &&
i.prop != 'asjbh'
"
class="cont"
:style="{ width: `calc(100% - ${labelWidth})` }"
......@@ -236,6 +287,17 @@ export default {
imgArr: Array,
},
methods: {
ychyLink(type, asjbh) {
if (type == "ajzb") {
let path = `${this.$baseUrl.alyIP10}/jump?zjhm=${
JSON.parse(sessionStorage.getItem("userInfo")).identitycard
}&path=/ajzb?id=${asjbh}`;
window.open(path, "_blank");
} else {
let path = `${this.$baseUrl.alyIP9}/#/JumpPage/admin/admin/${asjbh}`;
window.open(path, "_blank");
}
},
preview(photoData) {
this.url = photoData.src;
this.$refs.image.clickHandler();
......@@ -253,6 +315,16 @@ export default {
};
</script>
<style lang="scss" scoped>
.popUl {
ul {
li {
i {
margin-right: 15px;
color: #3f95e6;
}
}
}
}
#PhotoNew {
border: 0px solid rgba(0, 0, 0, 0.18);
.el-image {
......
......@@ -380,8 +380,7 @@ export default {
console.log(path);
window.open(path, "_blank");
} else if (this.pages == "queryTdyp") {
// let path = `http://39.99.155.173:9003/#/ajbzDetail?asjbh=${this.form.asjbh}`;
let path = `${base.alyIP8}/#/ajbzDetail?asjbh=${this.form.asjbh}`;
let path = `${base.alyIP16}/#/ssoLogin?jssionId=${JSON.parse(sessionStorage.getItem("userInfo")).userName}&type=ajbzDetailHN&$asjbh=${this.form.asjbh}`;
window.open(path, "_blank");
} else if (this.pages == "querySdtdyp") {
// let path = `http://39.99.155.173:9003/#/ajbzDetail?asjbh=${this.form.asjbh}`;
......
......@@ -98,6 +98,23 @@
>
</el-input>
</div>
<div
v-if="item.type == 'textFz'"
style="display: flex; align-items: center"
>
<el-input
:placeholder="item.placeholder"
v-model="formLabelAlign[item.id]"
:disabled="item.disabled"
:class="item.input"
>
<template slot="append"
><span
>分钟</span
></template
>
</el-input>
</div>
<div
v-if="item.type == 'textTqs'"
style="display: flex; align-items: center; width: 600px"
......
......@@ -1153,6 +1153,15 @@
<div v-else-if="columnTitle.prop == 'xnpgPgsj'">
<span>{{ scope.row.xnpgKssj + "/" + scope.row.xnpgJssj }}</span>
</div>
<div v-else-if="columnTitle.prop == 'yjdj'">
<span style="color: red" v-if="scope.row.yjdj == 'A'">A</span>
<span v-else-if="scope.row.yjdj == 'B'" style="color: orange"
>B</span
>
<span v-else-if="scope.row.yjdj == 'C'" style="color: green"
>C</span
>
</div>
<div
v-else-if="
columnTitle.prop == 'zjhm' && pageASs == 'adjustZdxxgl'
......@@ -2664,6 +2673,7 @@
:default-sort="{ prop: 'date', order: 'descending' }"
@sort-change="sortChange"
@row-click="rowClick"
indent=20
>
<el-table-column
type="selection"
......@@ -3459,7 +3469,7 @@ export default {
if (this.pageBs == "queryMenu") {
selectMenuList({
code: "",
limit: 10,
limit: 100,
page: 1,
name: "",
parentId: tree.id,
......@@ -4487,9 +4497,9 @@ export default {
}
}
);
// this.$nextTick(() => {
// this.$refs.itsmDataTable.doLayout();
// });
this.$nextTick(() => {
this.$refs.itsmDataTable.doLayout();
});
} else if (self.pageBs == "bjzycx") {
jsonStr.push(self.formData);
let form = new FormData();
......@@ -4517,9 +4527,9 @@ export default {
self.closeLoading();
}
});
// this.$nextTick(() => {
// this.$refs.itsmDataTable.doLayout();
// });
this.$nextTick(() => {
this.$refs.itsmDataTable.doLayout();
});
} else if (self.pageBs == "queryDzrygl") {
let formDatas = new FormData();
for (let i in self.formData) {
......@@ -4553,16 +4563,13 @@ export default {
self.closeLoading();
}
});
// this.$nextTick(() => {
// this.$refs.itsmDataTable.doLayout();
// });
this.$nextTick(() => {
this.$refs.itsmDataTable.doLayout();
});
} else {
// debugger;
self.doQueryRequest(json).then((response) => {
if (response.success === true) {
// // debugger
if (self.pageBs == "queryJqcc" || self.pageBs == "queryAjcc") {
debugger;
response.data.rows.forEach((item, index) => {
getKyxsList({
glxxXxzjbh:
......@@ -4602,6 +4609,9 @@ export default {
if (item.ajlbMc) {
item.ajlbMc = item.ajlbMc.split("#");
}
if (item.mxYjzq) {
item.mxYjzq = item.mxYjzq + "分钟";
}
if (item.sabqTxt) {
item.sabqTxt = item.sabqTxt
.split("#")
......@@ -4879,9 +4889,9 @@ export default {
self.closeLoading();
}
});
// this.$nextTick(() => {
// this.$refs.itsmDataTable.doLayout();
// });
this.$nextTick(() => {
this.$refs.itsmDataTable.doLayout();
});
}
}
}
......@@ -5067,9 +5077,26 @@ export default {
</script>
<style>
@import url("../assets/iconfont/iconfont.css");
.el-table__indent {
padding-left: 60px !important;
/deep/ .el-table {
overflow: auto;
}
/* .el-table__header-wrapper,
.el-table__body-wrapper,
.el-table__footer-wrapper {
overflow: visible;
} */
/deep/ .el-table__body-wrapper {
overflow-x: visible !important;
}
/* 这个是为了解决前面样式覆盖之后伪类带出来的竖线 */
/deep/ .el-table::after {
position: relative;
}
/deep/ .el-table__fixed-left {
right: 7px !important;
}
.rightContent .el-textarea__inner,
#formCommonPage .el-textarea__inner {
height: 100px;
......
......@@ -654,7 +654,7 @@ const ajxx = [
name: "立案日期:",
disabled: true,
id: "larq",
type: "dateVal",
type: "dates",
value: "",
placeholder: "请输入",
col: "2",
......
......@@ -201,7 +201,6 @@ import { getApproveUsers, saveSpxx } from "@/api/brainPhoto.js";
import secret from "@/utils/secret";
import base from "@/api/base";
import rightContent from "@c/ptCxForm_components.vue";
// import SearchGraph from "@c/searchRight.vue";
export default {
components: {
rightContent,
......@@ -363,9 +362,9 @@ export default {
disabled: false,
},
{
id: "queryZj",
id: "brainDzajSP",
label: "审批侦办",
index: "queryZj",
index: "brainDzajSP",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
......
......@@ -47,7 +47,7 @@ export default {
},
methods: {
goDetail() {
let path = `${this.$baseUrl.alyIP9}/#/JumpPage/admin/admin/${this.form.zjhm}`;
let path = `${this.$baseUrl.alyIP9}/#/JumpPage/admin/admin`;
// let path = `${this.$baseUrl.alyIP12}/#/jumppage/admin/founder15/${this.form.zjhm}`;
window.open(path, "_blank");
},
......
......@@ -4,7 +4,7 @@
:cxQueryField="cxQueryField"
:pageObject="pageObject"
:pageFooterProps="pageFooterProps"
labelWidth="110px"
labelWidth="100px"
title="合成研判任务详情"
>
</right-content>
......@@ -690,7 +690,7 @@ import {
getUserListWithoutYhz,
zyyppg,
queryDbList,
saveOneFkfj,
saveOneFkfj,
queryFkByDbBh,
queryFkList,
getWfqdzczlListNew,
......
......@@ -43,7 +43,7 @@ export default {
col: "2",
},
{
name: "适用范围:",
name: "预警对象:",
id: "mxSyfw",
type: "codeTree",
prop: "checkEmpty",
......@@ -54,7 +54,7 @@ export default {
codeTree: "CODE_YJMX_SYFW",
},
{
name: "模型代码:",
name: "预警条件:",
id: "mxCode",
type: "codeTree",
prop: "checkEmpty",
......@@ -63,10 +63,30 @@ export default {
multiple: true,
col: "2",
codeOptions: [],
codeTree: "CODE_ALL", //监测预警模型所有字典码
codeTree: "CODE_ALL", //监测预警模型所有字典码
},
{
name: "模型描述:",
name: "预警周期:",
id: "mxYjzq",
type: "textFz",
prop: "number",
value: "",
placeholder: "请输入时间",
col: "2",
},
{
prop: "checkEmpty",
name: "预警方式:",
id: "mxYjfsdm",
type: "setValue",
codeTree: "",
codeOptions: [{ label: "自动预警", value: "01" }],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "预警处置:",
id: "mxMs",
type: "textarea",
value: "",
......@@ -84,11 +104,11 @@ export default {
},
methods: {
getDialogSeletesd(label) {
debugger
debugger;
if (label == "证件号码" || label == "标识号码") {
this.mxSyfwTxt = label;
}else{
this.mxCodeTxt = label
} else {
this.mxCodeTxt = label;
}
},
submit(params) {
......@@ -105,9 +125,9 @@ export default {
}
},
addSubmit(params, loading) {
debugger
debugger;
params.append("mxSyfwTxt", this.mxSyfwTxt);
params.append("mxTxt", this.mxCodeTxt.split(',').reverse().toString());
params.append("mxTxt", this.mxCodeTxt.split(",").reverse().toString());
addJcyjMx(params).then((res) => {
if (res.success && res.code == 200) {
this.$alert("保存成功!", "提示", {
......@@ -115,19 +135,20 @@ export default {
type: "success",
callback: () => {
loading.close();
this.$router.push("yjmxgl");
window.opener.location.reload();
window.close();
},
});
} else {
this.$message.error(res.message);
loading.close();
loading.close();
}
});
},
editSubmit(params, loading) {
// params.append("unitname", this.unitname);
params.append("mxSyfwTxt", this.mxSyfwTxt);
params.append("mxTxt", this.mxCodeTxt.split(',').reverse().toString());
params.append("mxTxt", this.mxCodeTxt.split(",").reverse().toString());
params.append("xxzjbh", this.xxzjbh);
updateJcyjMx(params).then((res) => {
if (res.success && res.code == 200) {
......@@ -136,12 +157,13 @@ export default {
type: "success",
callback: () => {
loading.close();
this.$router.push("yjmxgl");
window.opener.location.reload();
window.close();
},
});
} else {
this.$message.error(res.message);
loading.close();
loading.close();
}
});
},
......
......@@ -13,9 +13,7 @@
<script>
import rightContent from "@c/PersonInfor.vue";
import {
getJcyjMxById
} from "@/api/jcyjzxt/yjmxgl.js";
import { getJcyjMxById } from "@/api/jcyjzxt/yjmxgl.js";
export default {
name: "userDetail",
components: {
......@@ -35,17 +33,27 @@ export default {
col: "3",
},
{
label: "适用范围:",
label: "预警对象:",
prop: "mxSyfwTxt",
col: "3",
},
{
label: "模型代码:",
label: "预警条件:",
prop: "mxTxt",
col: "3",
},
{
label: "模型描述:",
label: "预警周期",
col: "3",
prop: "mxYjzq",
},
{
label: "预警方式",
col: "3",
prop: "mxYjfsdmStr",
},
{
label: "预警处置:",
prop: "mxMs",
col: "6",
},
......@@ -64,6 +72,9 @@ export default {
xxzjbh: this.$route.query.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
if (res.data.mx.mxYjzq) {
res.data.mx.mxYjzq = res.data.mx.mxYjzq + "分钟";
}
this.pageObject = res.data.mx;
}
this.Loading.close();
......
......@@ -53,7 +53,7 @@ export default {
col: "3",
},
{
name: "适用范围",
name: "预警对象",
id: "mxSyfw",
type: "codeTreeDialog",
props: "checkEmpty",
......@@ -64,7 +64,7 @@ export default {
codeTree: "CODE_YJMX_SYFW",
},
{
name: "模型代码",
name: "预警条件",
id: "mxCode",
type: "codeTreeDialog",
props: "checkEmpty",
......@@ -83,15 +83,23 @@ export default {
},
{
label: "适用范围",
label: "预警对象",
prop: "mxSyfwTxt",
},
{
label: "模型代码",
label: "预警条件",
prop: "mxTxt",
},
{
label: "模型描述",
label: "预警周期",
prop: "mxYjzq",
},
{
label: "预警方式",
prop: "mxYjfsdmStr",
},
{
label: "预警处置",
prop: "mxMs",
},
],
......
......@@ -106,7 +106,7 @@
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { getGnyxFxjg } from "@/api/fzjc.js";
import { get, post, postform } from "@/utils/http.js";
import { post } from "@/utils/http.js";
import qs from "qs";
export default {
name: "queryGnxnpg",
......@@ -270,9 +270,9 @@ export default {
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
post(`${this.$baseUrl.alyIP}${this.cxUrl}`, qs.stringify(params)).then(
debugger;
post(`${this.$baseUrl.alyIP}${this.cxUrl}`,params).then(
(res) => {
debugger;
if (res.code === 200) {
require.ensure([], () => {
const { export_json_to_excel } = require("@/utils/Export2Excel");
......
......@@ -13,12 +13,17 @@
<template slot="cxyhz">
<el-tooltip placement="top">
<div slot="content">
预警等级<br>
A:团伙案件数量和人员数量都大于等于3;<br>
B:团伙案件数量或人员数量有一个等于2;<br>
C:团伙案件数量或人员数量有一个等于1;
预警等级<br />
<span style="color: red">A:团伙案件数量和人员数量都大于等于3;</span
><br />
<span style="color: orange"
>B:团伙案件数量或人员数量有一个等于2;</span
><br />
<span style="color: green"
>C:团伙案件数量或人员数量有一个等于1;</span
>
</div>
<span style="margin-left: 20px;cursor: pointer;">等级说明</span>
<span style="margin-left: 20px; cursor: pointer">等级说明</span>
</el-tooltip>
</template>
<template #btnGroup="scope">
......@@ -49,6 +54,7 @@ export default {
ajlbdm: "",
larqkssj: "",
larqjssj: "",
yjdj:''
},
cxQueryField: [
{
......@@ -77,6 +83,20 @@ export default {
value: "",
col: "3",
},
{
name: "预警等级",
id: "yjdj",
type: "radio",
value: "1",
placeholder: "",
col: "3",
radioData: [
{ label: "全部", val: "" },
{ label: "A", val: "A" },
{ label: "B", val: "B" },
{ label: "C", val: "C" },
],
},
],
cxDefaultFormThead: [
{
......@@ -85,39 +105,37 @@ export default {
prop: "asjbh",
width: "250",
},
{
label: "预警等级",
prop: "yjdj",
},
{
label: "案件名称",
prop: "ajmc",
width: "200"
width: "200",
},
{
label: "立案日期",
prop: "larq",
width: "200"
width: "200",
},
{
label: "立案单位",
prop: "ladwGajgmc",
width: "200"
width: "200",
},
{
label: "现场勘验编号",
prop: "xckybh",
toInfor: true
toInfor: true,
// width: "200"
},
{
label: "简要案情",
prop: "jyaq"
prop: "jyaq",
// toInfor: true,
// width: "200"
},
{
label: "预警等级",
prop: "yjdj"
// toInfor: true,
// width: "200"
}
// {
// label: "案事件来源",
// prop: "asjlydmStr",
......@@ -178,7 +196,7 @@ export default {
id: scope.row.thbh,
type: "group",
};
let childrenDz = this.$baseUrl.alyIP3 + '/thyp/getAccompliceBythId'
let childrenDz = this.$baseUrl.alyIP3 + "/thyp/getAccompliceBythId";
let obj = {
childrenXhrStr: childrenDz,
photoXhrStr: null,
......@@ -187,7 +205,7 @@ export default {
type: "person",
id: scope.row.thbh,
name: scope.row.thbh,
zdyjd: 'zdyjd',
zdyjd: "zdyjd",
children: true,
},
nodeClickBoo: false,
......
......@@ -15,24 +15,22 @@
<template slot="cxyhz">
<el-tooltip placement="top">
<div slot="content">
预警等级<br>
A:团伙案件数量和人员数量都大于等于3;<br>
B:团伙案件数量或人员数量有一个等于2;<br>
C:团伙案件数量或人员数量有一个等于1;
预警等级<br />
<span style="color: red">A:团伙案件数量和人员数量都大于等于3;</span
><br />
<span style="color: orange"
>B:团伙案件数量或人员数量有一个等于2;</span
><br />
<span style="color: green"
>C:团伙案件数量或人员数量有一个等于1;</span
>
</div>
<span style="margin-left: 20px;cursor: pointer;">等级说明</span>
<span style="margin-left: 20px; cursor: pointer">等级说明</span>
</el-tooltip>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="toNt(scope.scope)"> 脑图</span>
<span class="hbyp" @click="toThfxKsh(scope.scope)">可视化分析</span>
<!-- <span
class="hbyp"
@click="rygz(scope.scope)"
v-if="scope.scope.row.gzryZjhm == 0"
><i class="el-icon-plus"></i> 关注</span
>
<span class="hbyp gzClass" v-else> 已关注</span> -->
</template>
</right-content>
</div>
......@@ -45,7 +43,7 @@ import secret from "@/utils/secret";
export default {
name: "queryHbyp",
components: {
rightContent
rightContent,
},
data() {
return {
......@@ -56,7 +54,8 @@ export default {
limit: 10,
page: 1,
xm: "",
zjhm: ""
zjhm: "",
yjdj: "",
},
cxQueryField: [
{
......@@ -74,7 +73,21 @@ export default {
value: "",
placeholder: "请输入",
col: "3",
}
},
{
name: "预警等级",
id: "yjdj",
type: "radio",
value: "1",
placeholder: "",
col: "3",
radioData: [
{ label: "全部", val: "" },
{ label: "A", val: "A" },
{ label: "B", val: "B" },
{ label: "C", val: "C" },
],
},
],
cxDefaultFormThead: [
{
......@@ -82,13 +95,19 @@ export default {
prop: "zhfzxyrXm",
},
{
label: "预警等级",
prop: "yjdj",
},
{
label: "性别",
prop: "zhfzxyrXbdm",
width: 120,
},
{
label: "身份证号",
prop: "zhfzxyrCyzjZjhm",
toInfor: true
toInfor: true,
width: 200,
},
{
label: "民族",
......@@ -98,11 +117,6 @@ export default {
label: "户籍地",
prop: "zhfzxyrHjdzXzqhdm",
},
{
label: "预警等级",
prop: "yjdj",
width: 300,
}
// {
// label: "团伙编号",
// prop: "thbh",
......@@ -143,7 +157,7 @@ export default {
);
let path = `${
this.$baseUrl.alyIP14
}/#/jump?token=${base}&path=/rydaIndex/ryGl&zjhms=${scope.zjhm}&zjhm=${
}/#/jump?token=${base}&path=/rydaIndex/ryGl&zjhms=${scope.zhfzxyrCyzjZjhm}&zjhm=${
JSON.parse(sessionStorage.getItem("userInfo")).identitycard
}`;
window.open(path, "_blank");
......@@ -153,7 +167,7 @@ export default {
id: scope.row.thbh,
type: "group",
};
let childrenDz = this.$baseUrl.alyIP3 + '/thyp/getAccompliceBythId'
let childrenDz = this.$baseUrl.alyIP3 + "/thyp/getAccompliceBythId";
let obj = {
childrenXhrStr: childrenDz,
photoXhrStr: null,
......@@ -162,7 +176,7 @@ export default {
type: "person",
id: scope.row.thbh,
name: scope.row.thbh,
zdyjd: 'zdyjd',
zdyjd: "zdyjd",
children: true,
},
nodeClickBoo: false,
......@@ -189,10 +203,11 @@ export default {
// let path = `http://39.99.155.173:8007/naotuBox?type=hnDxzp&kybh=${scope.row.asjbh}`;
// window.open(path, "_blank");
// ?userId=142302198901012417
debugger
var obj = JSON.parse(sessionStorage.getItem("userInfo"));
var params = {
type: "KyRy",
kybh: scope.row.zjhm,
kybh: scope.row.zhfzxyrCyzjZjhm,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
......@@ -200,9 +215,7 @@ export default {
unitcode: obj.unitcode,
unitname: obj.unitname,
};
console.log(params);
this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
// this.toDetail("http://39.99.155.173:8007/naotuBox", params);
},
toDetail(url, PARAMS) {
var temp_form = document.createElement("form");
......
......@@ -91,7 +91,10 @@ export default {
],
},
],
formLabelAlign: {},
formLabelAlign: {
x: '',
y: '',
},
glxxXxzjbh: "",
xxzjbh: "",
};
......@@ -102,8 +105,8 @@ export default {
},
parentAndChilenEvent(data1, data2) {
this.isShowMap = false;
this.formLabelAlign.x = data1;
this.formLabelAlign.y = data2;
this.$set(this.formLabelAlign, "x", data1);
this.$set(this.formLabelAlign, "y", data2);
},
showJyDialog(id) {
if (id == "x" || id == "y") {
......
......@@ -180,7 +180,7 @@ export default {
self.$RenderLayer(renderParamsPoint);
/**将中心点调整到定位的点 */
self.$Map.getView().setCenter([parseFloat(x), parseFloat(y)]);
self.extent = [parseFloat(x),parseFloat(y)]
self.extent = [parseFloat(x), parseFloat(y)];
}
},
setPoint() {
......@@ -200,7 +200,7 @@ export default {
self
.$getInteractions({ layerId: "poisearch_draw" })
.on("drawend", function (e) {
self.$removeLayer({layerId: 'point'})
self.$removeLayer({ layerId: "point" });
self.extent = e.feature.getGeometry().getCoordinates();
// self.$getInteractions({ layerId: "poisearch_draw" }).setActive(false);
self.$clearLayer({ layerId: "poisearch_draw" });
......@@ -233,6 +233,7 @@ export default {
}
},
wd(val) {
debugger;
this.emitWd = val;
if (val != "" && val != null) {
this.extent[1] = val;
......@@ -240,9 +241,10 @@ export default {
},
},
mounted() {
debugger
setTimeout(() => {
this.pointCograph(this.jd,this.wd)
}, 3000);
this.pointCograph(this.emitJd,this.emitWd)
}, 5000);
},
};
</script>
......
......@@ -18,7 +18,7 @@
<template #btnGroup="scope">
<span class="hbyp" @click="toXg(scope.scope)">修改</span>
<span class="hbyp" @click="toDelete(scope.scope)">删除</span>
<span class="hbyp" @click="toZbaj(scope.scope)">周边案件</span>
<span class="hbyp" @click="toZbaj(scope.scope)">周边检索</span>
</template>
</right-content>
</div>
......@@ -143,7 +143,7 @@ export default {
debugger;
let path =
this.$baseUrl.alyIP9 +
"/#/JumpPage/admin/admin/SpaceTimeCombat/SmartControl?x=" +
"/#/loginTSFX/admin/admin?x=" +
scope.row.x +
"&y=" +
scope.row.y +
......
......@@ -119,7 +119,7 @@ export default {
type: "success",
callback: () => {
loading.close();
this.$router.push("queryRole");
this.$router.push("queryMenu");
},
});
} else {
......
......@@ -285,7 +285,7 @@ export default {
});
},
dele(obj) {
this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
this.$confirm("此操作将永久删除该菜单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
......@@ -299,7 +299,7 @@ export default {
type: "success",
message: "删除成功",
});
this.$refs.rightContent.doQuery("yes");
this.$router.go(0)
}
});
})
......
......@@ -104,7 +104,7 @@ import { updateUserMm } from "@/api/userAuth/role.js";
export default {
data() {
return {
header: "个人中心",
header: "用户管理",
userInfo: {},
rolesArr: [],
userArr: [],
......
......@@ -291,7 +291,7 @@ export default {
});
},
dele(obj) {
this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
this.$confirm("此操作将永久删除该角色, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
......@@ -305,7 +305,7 @@ export default {
type: "success",
message: "删除成功",
});
this.$refs.rightContent.doQuery("yes");
this.$router.go(0)
}
});
})
......
......@@ -170,7 +170,6 @@ export default {
},
created() {
this.$store.commit("user/SET_Menu", this.Menu);
this.$store.commit("user/SET_Header", this.header);
this.$store.commit("user/SET_LeftMenu", this.leftMenus);
},
methods: {
......
......@@ -237,7 +237,6 @@ export default {
},
created() {
this.$store.commit("user/SET_Menu", this.Menu);
this.$store.commit("user/SET_Header", this.header);
this.identitycard = JSON.parse(
sessionStorage.getItem("userInfo")
).identitycard;
......
......@@ -470,6 +470,13 @@ export default {
{ value: "1", name: "人力情报线索" },
{ value: "2", name: "有组织犯罪线索" },
{ value: "3", name: "阵地关联线索" },
{ value: "4", name: "阵地控制线索" },
{ value: "5", name: "高危对象线索" },
{ value: "6", name: "发现群体线索" },
{ value: "7", name: "工作发现线索" },
{ value: "8", name: "监测预警线索" },
{ value: "9", name: "技术比对多身份线索" },
{ value: "10", name: "名次纳入视线人员线索" },
],
},
{
......@@ -825,7 +832,7 @@ export default {
xslx: "zdqb",
},
});
}else {
} else {
this.$router.pushToTab({
path: "/djgzxs",
query: {
......@@ -869,6 +876,13 @@ export default {
{ value: "1", name: "人力情报线索" },
{ value: "2", name: "有组织犯罪线索" },
{ value: "3", name: "阵地关联线索" },
{ value: "4", name: "阵地控制线索" },
{ value: "5", name: "高危对象线索" },
{ value: "6", name: "发现群体线索" },
{ value: "7", name: "工作发现线索" },
{ value: "8", name: "监测预警线索" },
{ value: "9", name: "技术比对多身份线索" },
{ value: "10", name: "名次纳入视线人员线索" },
],
},
{
......@@ -981,6 +995,13 @@ export default {
{ value: "1", name: "人力情报线索" },
{ value: "2", name: "有组织犯罪线索" },
{ value: "3", name: "阵地关联线索" },
{ value: "4", name: "阵地控制线索" },
{ value: "5", name: "高危对象线索" },
{ value: "6", name: "发现群体线索" },
{ value: "7", name: "工作发现线索" },
{ value: "8", name: "监测预警线索" },
{ value: "9", name: "技术比对多身份线索" },
{ value: "10", name: "名次纳入视线人员线索" },
],
},
{
......@@ -1147,6 +1168,13 @@ export default {
{ value: "1", name: "人力情报线索" },
{ value: "2", name: "有组织犯罪线索" },
{ value: "3", name: "阵地关联线索" },
{ value: "4", name: "阵地控制线索" },
{ value: "5", name: "高危对象线索" },
{ value: "6", name: "发现群体线索" },
{ value: "7", name: "工作发现线索" },
{ value: "8", name: "监测预警线索" },
{ value: "9", name: "技术比对多身份线索" },
{ value: "10", name: "名次纳入视线人员线索" },
],
},
{
......
<template>
<div id="formCommonPage">
<div id="djgzxs">
<div class="groupTitleBox">
<img src="~@/assets/img/login/jinhui.png" alt="" />
<span class="groupTitle">{{ propTitle }}</span>
......@@ -343,16 +343,13 @@
<div class="title">关联关系管理</div>
<div style="margin: -20px 0 0 38px">
<div class="zczz">
<div class="xzs" @click="glgxAdd">
<i class="el-icon-plus"></i>
新增
</div>
<el-table
v-loading="loadingGlgx"
:data="glgXList1"
border
stripe
style="width: 100%"
max-height="410"
>
<el-table-column
v-for="(glgxItem, index) in glgxlList"
......@@ -362,6 +359,14 @@
align="center"
>
<template slot-scope="scope">
<div v-if="glgxItem.lable == '操作'">
<span
@click="rdBtn(scope)"
:class="scope.row.rdjg != '0' ? 'disEdit' : 'edit'"
>
认定
</span>
</div>
<div v-if="glgxItem.toInr">
<span
style="color: #0061f7; cursor: pointer"
......@@ -376,25 +381,8 @@
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<span
style="margin-right: 10px"
class="anList"
@click="GlgxXq(scope)"
>查看详情</span
>
<span
style="margin-right: 10px"
class="anList"
@click="detailGlgx(scope)"
>修改</span
>
<span class="anList" @click="eleteGlgx(scope)">删除</span>
</template>
</el-table-column>
</el-table>
<div>
<!-- <div>
<el-pagination
background
@size-change="handleSizeChange1"
......@@ -406,7 +394,7 @@
:total="tableDataLength1"
>
</el-pagination>
</div>
</div> -->
</div>
</div>
</div>
......@@ -668,6 +656,23 @@
></zczl>
</el-drawer>
<adjust-xsbks ref="xsbk" v-show="false"></adjust-xsbks>
<el-dialog title="关联关系认定" :visible.sync="dialogVisible" width="50%">
<el-form ref="form" :model="rdForm" label-width="80px" style="width: 80%">
<el-form-item label="认定结果">
<el-radio v-model="rdForm.rdjg" label="1">已认定</el-radio>
<el-radio v-model="rdForm.rdjg" label="2">认定不通过</el-radio>
</el-form-item>
<el-form-item label="认定原因">
<el-input type="textarea" v-model="rdForm.rdyy"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false" size="small">取 消</el-button>
<el-button type="primary" @click="submitRd" size="small"
>确 定</el-button
>
</span>
</el-dialog>
</div>
</template>
......@@ -682,6 +687,7 @@ import {
getHcglxyrList,
getHcglasjList,
getWfqdzczlListNew,
rdXsglbsh,
} from "@/api/xshb/xshb.js";
import { zlToDelete, zlTqsp } from "@/api/zczl/zczl.js";
import { getZdxsByxxzjbh } from "@/api/zdxsxx.js";
......@@ -698,6 +704,12 @@ export default {
},
data() {
return {
scopeObj: {},
rdForm: {
rdyy: "",
rdjg: "",
},
dialogVisible: false,
ryList: [],
tgzList: [],
xslx: "",
......@@ -1180,24 +1192,32 @@ export default {
glgxlList: [
{
lable: "标识号类型",
prop: "bshlxstr",
prop: "bshlxStr",
toInr: true,
},
{
lable: "标识号码",
prop: "bshvalue",
},
// {
// lable: "关联依据",
// prop: "glyj",
// },
{
lable: "关联时间",
prop: "djsj",
lable: "认定结果",
prop: "rdjgStr",
},
{
lable: "认定原因",
prop: "rdyy",
},
{
lable: "录入人",
prop: "xxdjryXm",
lable: "认定时间",
prop: "rdsj",
},
{
lable: "身份证号",
prop: "glsfzh",
},
{
lable: "操作",
prop: "cz",
},
],
xdzlxlList: [
......@@ -1378,6 +1398,31 @@ export default {
this.getWfqdzczlListNew();
},
methods: {
submitRd() {
rdXsglbsh({
...this.scopeObj,
...this.rdForm,
}).then((res) => {
if (res.code == 200) {
this.getXsglbshList();
this.dialogVisible = false;
this.$message("认定成功");
}
});
},
rdBtn(scope) {
if (scope.row.rdjg != "0") {
} else {
this.dialogVisible = true;
this.scopeObj = {
bshlx: scope.row.bshlx,
bshvalue: scope.row.bshvalue,
glsfzh: scope.row.glsfzh,
glxxzjbh: scope.row.glxxzjbh,
xslxdm: scope.row.xslxdm,
};
}
},
toIxdzl(scope) {
debugger;
this.sub = "PJ";
......@@ -1996,9 +2041,12 @@ export default {
.v-modal {
z-index: 10 !important;
}
#formCommonPage .el-drawer__body {
flex: 1;
padding: 0 30px;
#djgzxs .el-drawer__body {
flex: 1;
padding: 0 30px;
}
#djgzxs .el-form-item {
margin-bottom: unset !important;
}
</style>
......@@ -2007,6 +2055,14 @@ export default {
$-header-bg: #1a81e1;
$-header-height: 60px;
$-header-fontSize: 18px;
.disEdit {
color: #606266;
cursor: no-drop;
}
.edit {
color: #1a81e1;
cursor: pointer;
}
.prive_picture {
z-index: 999;
background: rgba(0, 0, 0, 0.5);
......@@ -2061,7 +2117,7 @@ $-header-fontSize: 18px;
height: 178px;
display: block;
}
#formCommonPage {
#djgzxs {
width: 100% !important;
.subTitle {
div {
......@@ -2583,11 +2639,11 @@ $-header-fontSize: 18px;
}
}
}
#formCommonPage .el-input.is-disabled /deep/ .el-input__inner {
#djgzxs .el-input.is-disabled /deep/ .el-input__inner {
color: #606266 !important;
background-color: #f1f3f4 !important;
}
#formCommonPage /deep/ .zdyInputW .el-select .is-disabled .el-input__inner {
#djgzxs /deep/ .zdyInputW .el-select .is-disabled .el-input__inner {
color: #606266 !important;
background-color: #f1f3f4 !important;
}
......
......@@ -219,110 +219,6 @@ export default {
},
],
leftMenus: [
//左侧导航(模块第一个页面需要)
// {
// id: "cbxsz",
// label: "综合串并分析",
// newAuth: "M01",
// index: "2",
// className: "iconfont icongongnengfuwu",
// hasChildren: true,
// children: [
// {
// id: "bshcb",
// label: "标识号串并",
// index: "bshcb",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
// {
// id: "rgcb",
// label: "人工串并",
// index: "rgcb",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
// {
// id: "xkcb",
// label: "现勘串并",
// index: "xkcb",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
// ],
// },
// {
// id: "xlaj",
// label: "系列案件",
// newAuth: "M01",
// index: "3",
// className: "iconfont icongongnengfuwu",
// hasChildren: true,
// children: [
// {
// id: "wdxlaj",
// label: "我的系列案件",
// index: "wdxlaj",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
// {
// id: "xqxlaj",
// label: "辖区系列案件",
// index: "xqxlaj",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
// ],
// },
// {
// id: "xxgl",
// label: "信息管理",
// newAuth: "M01",
// index: "4",
// className: "iconfont icongongnengfuwu",
// hasChildren: true,
// children: [
// {
// id: "bshxx",
// label: "标识号信息",
// index: "bshxx",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
// {
// id: "ajfl",
// label: "案件分类",
// index: "ajfl",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
// {
// id: "wscdaj",
// label: "我收藏的案件",
// index: "wscdaj",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
// ],
// },
// {
// id: "gtgxrFx",
// label: "共同关系分析",
// newAuth: "M01",
// index: "gtgxrFx",
// className: "iconfont icongongnengfuwu",
// hasChildren: false,
// },
{
id: "queryQt",
label: "群体发现分析",
......
......@@ -62,16 +62,12 @@ export default {
prop: "ajmc",
},
{
label: "案件类别",
prop: "ajzlb",
label: "小案类别",
prop: "zatzJyqk",
},
{
label: "次案类别",
prop: "ajxzlb",
},
{
label: "次类案类别",
prop: "xalbdmbcms",
label: "细案类别",
prop: "ajxlb",
},
{
label: "案件中出现的标识号",
......
......@@ -162,7 +162,7 @@ export default {
codeTree: "",
codeOptions: [
{ label: "QQ号", value: "qq" },
{ label: "微信号", value: "vx" },
{ label: "微信号", value: "wx" },
],
value: "",
placeholder: "请输入",
......
......@@ -184,7 +184,7 @@ export default {
var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
var idcard = userInfo.identitycard;
var params = {
type: scope.row.fwbshLb,
type: scope.row.fwbshLb == 'qq' ? 'KyQq' : 'KyWx',
kybh: scope.row.fwbshHm,
userId: idcard,
username: userInfo.userName,
......
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