Commit 371ed0a7 by zhangzhijie

Merge remote-tracking branch 'origin/dev_xzxt_huNan' into dev_xzxt_huNan

parents b91a42cd d2b3cabb
import service from "axios";
import Message from "element-ui";
import { Message, MessageBox } from "element-ui";
import url from "@/api/base";
// axios 配置
......@@ -25,35 +25,35 @@ service.defaults.headers = {
"appToken": appToken,
};
var relUrlIp = window.location.host.substring(
0,
window.location.host.length - 5
0,
window.location.host.length - 5
);
// response 拦截器
service.interceptors.response.use(
response => {
let data = response.data;
if (data.code == 20004||data.code == 202) {
if (data.code == 20004 || data.code == 202) {
if (!window.tiplock) {
window.tiplock = true;
// if(relUrlIp=='133.8.5.67'||relUrlIp=='26.3.13.120'){
// window.open(url.eqMhUrl,'_self');
// }else{
// window.open(url.eqMhUrl,'_self');
// }
MessageBox.confirm("系统登录超时,请重新登录", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
// if(relUrlIp=='133.8.5.67'||relUrlIp=='26.3.13.120'){
// window.open(url.eqMhUrl,'_self');
// }else{
// window.open(url.eqMhUrl,'_self');
// }
MessageBox.confirm("系统登录超时,请重新登录", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
window.open(url.eqMhUrl, '_self');
})
.then(() => {
window.close();
})
}
}
}
return data;
},
function(error) {
function (error) {
Message.Message({
type: "error",
message: error
......
......@@ -16484,16 +16484,16 @@ let rydaPropLeftMenu = [
},
{
id: 'ryJstx',
label: '即时通讯',
label: '虚拟身份',
index: '8',
className: ''
},
{
id: 'ryHlw',
label: '互联网',
index: '9',
className: ''
},
// {
// id: 'ryHlw',
// label: '互联网',
// index: '9',
// className: ''
// },
{
id: 'dswtz',
label: '多生物特征',
......
......@@ -72,43 +72,13 @@
></table-component>
</div>
<div class="con-wrap" id="zf">
<div class="name">租房登记 ({{ zfdjTableData.length }}</div>
<el-table
ref="multipleTable"
:data="zfdjTableData"
tooltip-effect="dark"
style="width: 100%"
>
<el-table-column type="selection" width="80"> </el-table-column>
<el-table-column prop="xm" label="姓名" >
</el-table-column>
<el-table-column prop="zjlx" label="证件种类">
</el-table-column>
<el-table-column prop="zjhm" label="证件号码">
</el-table-column>
<el-table-column prop="zkdh" label="租客电话" >
</el-table-column>
<el-table-column prop="xb" label="性别">
</el-table-column>
<el-table-column prop="xl" label="学历" >
</el-table-column>
<el-table-column prop="hjd" label="户籍地">
</el-table-column>
<el-table-column prop="jzdz" label="居住地址" >
</el-table-column>
<el-table-column label="详情">
<!-- <template
><i
class="el-icon-document"
style="
color: rgb(64, 158, 255);
font-size: 18px;
cursor: pointer;
"
></i
></template> -->
</el-table-column>
</el-table>
<table-component
:DefaultAjFormThead="zfdjFormThead"
:propQueryData="zfdjQueryData"
:cxUrl="zfdjCxUrl"
:tableName="zfdjTableName"
:cxSj="cxSj"
></table-component>
</div>
</div>
</div>
......@@ -165,24 +135,30 @@ export default {
zsTableName: "住宿登记",
zhrkFormThead: [
{
label: "姓名",
prop: "xm",
},
{
label: "证件号码",
prop: "zjhm",
width: 230,
},
{
label: "性别",
prop: "xbdm",
prop: "xb",
width: 50,
},
{
label: "户籍地行政区划",
prop: "hjdqh",
},
{
label: "民族",
prop: "mzdm",
label: "户籍地详址",
prop: "hjdxz",
},
{
label: "现住址",
prop: "xzzDzmc",
label: "现住址详址",
prop: "xzzxz",
},
{
label: "暂住地详址",
prop: "zzdxz",
},
],
zhrkQueryData: {
......@@ -273,18 +249,7 @@ export default {
wbdz: "内蒙古自治区呼和浩特市新城区爱民街274号附件",
},
],
zfdjTableData: [
// {
// // xm: "周玉华",
// // zjlx: "居民身份证",
// // zjhm: "480524197312225277",
// // zkdh: "17625277131",
// // xb: "男",
// // xl: "初中",
// // hjd: "湖南省唯回县横板标镇礼4村11组20E",
// // jzdz: "内蒙古自治区呼和浩特市新城区坤和爱尚街",
// },
],
zfdjTableData: [],
tableData: [
{
xm: "周玉华",
......@@ -440,6 +405,52 @@ export default {
},
],
},
//租房信息
zfdjFormThead: [
{
label: "房东姓名",
prop: "xm",
},
{
label: "证件号码",
prop: "zjhm",
},
{
label: "房东性别",
prop: "xb",
},
{
label: "房东联系电话",
prop: "lxdh",
},
{
label: "月租金",
prop: "czyz",
},
{
label: "实际居住人数",
prop: "sjzzrs",
},
{
label: "户型",
prop: "hx",
},
{
label: "出租时间",
prop: "czsj",
},
{
label: "出租终止时间",
prop: "czzzsj",
},
],
zfdjQueryData: {
objectValue: sessionStorage.getItem("zjhm"),
page: 1,
limit: 5,
},
zfdjCxUrl: "/daapi/getCzfwxx",
zfdjTableName: "租房登记",
};
},
watch: {
......@@ -453,6 +464,7 @@ export default {
this.cxSj = [this.sj, new Date()];
},
methods: {
getzfdjInfo() {},
haflYear() {
var timeStamp = new Date().getTime();
var halfYear = (365 / 2) * 24 * 3600 * 1000;
......
<template>
<div class="ryDj">
<div class="top">
<div class="lf">
<span>时间:</span>
<div class="inl">
<el-date-picker
v-model="cxSj"
type="datetimerange"
:picker-options="pickerOptions"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
align="right"
>
</el-date-picker>
</div>
</div>
</div>
<div class="con">
<!-- <div class="left">
<div style="margin: 15px">
<el-input
size="small"
placeholder="输入关键词查找"
suffix-icon="el-icon-search"
v-model="filterText"
>
</el-input>
</div>
<div style="margin: 15px">
<el-tree
class="filter-tree"
:data="data"
:props="defaultProps"
default-expand-all
:filter-node-method="filterNode"
ref="tree"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ node.label }}</span>
</span>
</el-tree>
</div>
</div> -->
<div class="right">
<div class="con-wrap">
<table-component
......@@ -95,37 +53,6 @@
ref="rightContent"
></table-component>
</div>
<div class="con-wrap">
<div class="name">关联物品 ({{ glwpTableData.length }}</div>
<el-table
ref="multipleTable"
:data="glwpTableData"
tooltip-effect="dark"
style="width: 100%"
>
<el-table-column type="selection" width="80"> </el-table-column>
<el-table-column prop="wplx" label="物品类型" >
</el-table-column>
<el-table-column prop="pp" label="品牌">
</el-table-column>
<el-table-column prop="xh" label="型号">
</el-table-column>
<el-table-column prop="jz" label="价值">
</el-table-column>
<el-table-column label="详情">
<template
><i
class="el-icon-document"
style="
color: rgb(64, 158, 255);
font-size: 18px;
cursor: pointer;
"
></i
></template>
</el-table-column>
</el-table>
</div>
<el-dialog title="补录关系" :visible.sync="bqDialogShow" width="30%">
<div v-loading="loading" style="margin: 20px; z-index: 2006">
<el-form :model="formDataBlbq">
......@@ -266,106 +193,6 @@ export default {
children: "children",
label: "label",
},
pickerOptions: {
shortcuts: [
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
let year = start.getFullYear();
let month = start.getMonth();
if (month === 0) {
month = 12;
year = year - 1;
}
if (month < 0) {
month = 12 + month;
year = year - 1;
}
if (month < 10 && month > 0) {
month = "0" + month;
}
let firstDayOfPreMonth =
year + "-" + month + "-" + start.getDate();
firstDayOfPreMonth = new Date(firstDayOfPreMonth);
picker.$emit("pick", [firstDayOfPreMonth, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
let year = start.getFullYear();
let month = start.getMonth() - 2;
if (month === 0) {
month = 12;
year = year - 1;
}
if (month < 0) {
month = 12 + month;
year = year - 1;
}
if (month < 10 && month > 0) {
month = "0" + month;
}
let firstDayOfPreMonth =
year + "-" + month + "-" + start.getDate();
firstDayOfPreMonth = new Date(firstDayOfPreMonth);
picker.$emit("pick", [firstDayOfPreMonth, end]);
},
},
{
text: "最近六个月",
onClick(picker) {
const end = new Date();
const start = new Date();
let year = start.getFullYear();
let month = start.getMonth() - 5;
if (month === 0) {
month = 12;
year = year - 1;
}
if (month < 0) {
month = 12 + month;
year = year - 1;
}
if (month < 10 && month > 0) {
month = "0" + month;
}
let firstDayOfPreMonth =
year + "-" + month + "-" + start.getDate();
firstDayOfPreMonth = new Date(firstDayOfPreMonth);
picker.$emit("pick", [firstDayOfPreMonth, end]);
},
},
{
text: "最近一年",
onClick(picker) {
const end = new Date();
const start = new Date();
let year = start.getFullYear();
let month = start.getMonth() - 11;
if (month === 0) {
month = 12;
year = year - 1;
}
if (month < 0) {
month = 12 + month;
year = year - 1;
}
if (month < 10 && month > 0) {
month = "0" + month;
}
let firstDayOfPreMonth =
year + "-" + month + "-" + start.getDate();
firstDayOfPreMonth = new Date(firstDayOfPreMonth);
picker.$emit("pick", [firstDayOfPreMonth, end]);
},
},
],
},
cxSj: [],
sj: "",
hyFormThead: [
......
......@@ -99,109 +99,13 @@
></table-component>
</div>
<div class="con-wrap">
<div class="name">客运信息 ({{ dzwlxxTableData.length }})</div>
<el-table
ref="multipleTable"
:data="dzwlxxTableData"
tooltip-effect="dark"
style="width: 100%"
>
<el-table-column type="selection" width="80"> </el-table-column>
<el-table-column prop="csbh" label="场所编号">
</el-table-column>
<el-table-column prop="imsi" label="IMSI">
</el-table-column>
<el-table-column prop="jd" label="经度">
</el-table-column>
<el-table-column prop="wd" label="纬度">
</el-table-column>
<el-table-column prop="jhsj" label="截获时间">
</el-table-column>
<el-table-column prop="jwddz" label="经纬度地址" >
</el-table-column>
<el-table-column label="详情" >
<template
><i
class="el-icon-document"
style="
color: rgb(64, 158, 255);
font-size: 18px;
cursor: pointer;
"
></i
></template>
</el-table-column>
</el-table>
</div>
<div class="con-wrap">
<div class="name">出租车信息 ({{ jsltTableData.length }})</div>
<el-table
ref="multipleTable"
:data="jsltTableData"
tooltip-effect="dark"
style="width: 100%"
>
<el-table-column type="selection" width="80"> </el-table-column>
<el-table-column prop="rzzh" label="认证账号" >
</el-table-column>
<el-table-column prop="zxy" label="子协议">
</el-table-column>
<el-table-column prop="yhm" label="用户名">
</el-table-column>
<el-table-column prop="dz" label="动作">
</el-table-column>
<el-table-column prop="sjy" label="数据源">
</el-table-column>
<el-table-column prop="jhsj" label="截获时间" >
</el-table-column>
<el-table-column label="详情">
<!-- <template
><i
class="el-icon-document"
style="
color: rgb(64, 158, 255);
font-size: 18px;
cursor: pointer;
"
></i
></template> -->
</el-table-column>
</el-table>
</div>
<div class="con-wrap">
<div class="name">硬件特征信息 ({{ yjtzxxTableData.length }})</div>
<el-table
ref="multipleTable"
:data="yjtzxxTableData"
tooltip-effect="dark"
style="width: 100%"
>
<el-table-column type="selection" width="80"> </el-table-column>
<el-table-column prop="imsi" label="IMSI">
</el-table-column>
<el-table-column prop="zxy" label="子协议">
</el-table-column>
<el-table-column prop="yhm" label="用户名" >
</el-table-column>
<el-table-column prop="dz" label="动作" >
</el-table-column>
<el-table-column prop="sjy" label="数据源" >
</el-table-column>
<el-table-column prop="jhsj" label="截获时间">
</el-table-column>
<el-table-column label="详情" >
<template
><i
class="el-icon-document"
style="
color: rgb(64, 158, 255);
font-size: 18px;
cursor: pointer;
"
></i
></template>
</el-table-column>
</el-table>
<table-component
:DefaultAjFormThead="wbFormThead"
:propQueryData="wbQueryData"
:cxUrl="wbCxUrl"
:tableName="wbTableName"
:cxSj="cxSj"
></table-component>
</div>
</div>
</div>
......@@ -447,32 +351,32 @@ export default {
},
{
label: "车次",
prop: "dd"
prop: "dd",
},
{
label: "车厢号",
prop: "cxh"
prop: "cxh",
},
{
label: "座位号",
prop: "wz"
prop: "wz",
},
{
label: "发车时间",
prop: "kssj"
prop: "kssj",
},
{
label: "始发站",
prop: "sfd"
prop: "sfd",
},
{
label: "目的地",
prop: "mdd"
prop: "mdd",
},
{
label: "行程信息",
prop: "xcxx"
}
prop: "xcxx",
},
],
mhQueryData: {
objectValue: sessionStorage.getItem("zjhm"),
......@@ -489,6 +393,60 @@ export default {
mhTableName: "航班信息",
fjTableName: "铁路信息",
cxSj: [],
//滴滴出行记录
wbFormThead: [
{
label: "车主姓名",
prop: "xm",
},
{
label: "车主证件号码",
prop: "zjhm",
},
{
label: "车主手机号码",
prop: "sjhm",
},
{
label: "车牌号码",
prop: "hphm",
},
{
label: "车辆类型",
prop: "cllx",
},
{
label: "始发地",
prop: "sfd",
},
{
label: "目的地",
prop: "clmddlx",
},
{
label: "里程",
prop: "distance",
},
{
label: "乘客电话",
prop: "passengerphone",
},
{
label: "出发时间",
prop: "kssj",
},
{
label: "到达时间",
prop: "jssj",
},
],
wbQueryData: {
objectValue: sessionStorage.getItem("zjhm"),
page: 1,
limit: 5,
},
wbCxUrl: "/daapi/getCzcxx",
wbTableName: "滴滴出行记录",
};
},
watch: {
......
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