Commit a2a25275 by 王晓强

带出人员标签

parent 7a9bbd94
...@@ -62,15 +62,15 @@ axios.interceptors.request.use( ...@@ -62,15 +62,15 @@ axios.interceptors.request.use(
// response 响应拦截器 // response 响应拦截器
axios.interceptors.response.use( axios.interceptors.response.use(
response => { response => {
console.log('响应拦截器查看',response); // console.log('响应拦截器查看',response);
const status = response.data.code; const status = response.data.code;
console.log('=====', status); // console.log('=====', status);
const message = response.data.message; const message = response.data.message;
var relUrlIp = window.location.host.substring( var relUrlIp = window.location.host.substring(
0, 0,
window.location.host.length - 5 window.location.host.length - 5
); );
console.log('88888', window.location.host); // console.log('88888', window.location.host);
var self = this var self = this
if (status == "401") { if (status == "401") {
MessageBox.confirm("系统登录超时,请重新登录", "提示", { MessageBox.confirm("系统登录超时,请重新登录", "提示", {
...@@ -110,7 +110,7 @@ axios.interceptors.response.use( ...@@ -110,7 +110,7 @@ axios.interceptors.response.use(
message:error.message, message:error.message,
type:'error' type:'error'
}) })
console.log('0000000000000000'); // console.log('0000000000000000');
return Promise.reject(new Error(error)); return Promise.reject(new Error(error));
} }
); );
......
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
}; };
}, },
activated() { activated() {
console.log("11111111111111111111111111111111"); // console.log("11111111111111111111111111111111");
}, },
methods: { methods: {
initPieZdrwtxz(data) { initPieZdrwtxz(data) {
...@@ -654,13 +654,13 @@ export default { ...@@ -654,13 +654,13 @@ export default {
name: "现有重点人(未化解)", name: "现有重点人(未化解)",
type: "line", type: "line",
// type: "bar", // type: "bar",
stack: "业务",//折叠显示 // stack: "业务",//折叠显示
// data: ["2", "6", "12", "9", "2", '23', '15', "6", "12", "9", "2", '23', '15'], // data: ["2", "6", "12", "9", "2", '23', '15', "6", "12", "9", "2", '23', '15'],
data: data.whj, data: data.whj,
barWidth : 25, barWidth : 25,
//显示颜色 //显示颜色
itemStyle:{ itemStyle:{
normal:{color:"#5087ec"} normal:{color:"red"}
}, },
label: { // 图形上的文本标签 label: { // 图形上的文本标签
show: false, show: false,
...@@ -673,7 +673,7 @@ export default { ...@@ -673,7 +673,7 @@ export default {
name: "新增", name: "新增",
type: "line", type: "line",
// type: "bar", // type: "bar",
stack: "业务", // stack: "业务",
// data: ["8", "23", "49", "7", "16", '12', '10', "36", "12", "9", "32", '23', '5'], // data: ["8", "23", "49", "7", "16", '12', '10', "36", "12", "9", "32", '23', '5'],
data: data.xz, data: data.xz,
barWidth : 25, barWidth : 25,
...@@ -684,14 +684,14 @@ export default { ...@@ -684,14 +684,14 @@ export default {
color: '#eee' color: '#eee'
}, },
itemStyle:{ itemStyle:{
normal:{color:"#68bbc4"} normal:{color:"#4bd277"}
} }
}, },
{ {
name: "涉稳重点人(已化解)", name: "涉稳重点人(已化解)",
type: "line", type: "line",
// type: "bar", // type: "bar",
stack: "业务", // stack: "业务",
// data: ["8", "23", "49", "7", "16", '12', '10', "36", "12", "9", "32", '23', '5'], // data: ["8", "23", "49", "7", "16", '12', '10', "36", "12", "9", "32", '23', '5'],
data: data.yhj, data: data.yhj,
barWidth : 25, barWidth : 25,
...@@ -702,7 +702,7 @@ export default { ...@@ -702,7 +702,7 @@ export default {
color: '#eee' color: '#eee'
}, },
itemStyle:{ itemStyle:{
normal:{color:"#4bd277"} normal:{color:"#68bbc4"}
} }
} }
] ]
...@@ -710,7 +710,7 @@ export default { ...@@ -710,7 +710,7 @@ export default {
zdrzsfxoption && zdrzsfxChart.setOption(zdrzsfxoption); zdrzsfxoption && zdrzsfxChart.setOption(zdrzsfxoption);
}, },
initBarQtzsfx(data) { initBarQtzsfx(data) {
// console.log(data); console.log(data);
var qtzsfxChartDom = document.getElementById("qtzsfx"); var qtzsfxChartDom = document.getElementById("qtzsfx");
var qtzsfxChart = echarts.init(qtzsfxChartDom); var qtzsfxChart = echarts.init(qtzsfxChartDom);
...@@ -863,7 +863,7 @@ export default { ...@@ -863,7 +863,7 @@ export default {
}, },
scale: true, //自适应 scale: true, //自适应
// min:0, //取0为最小刻度 // min:0, //取0为最小刻度
// max: 120, //取100为最大刻度 // max: 90, //取100为最大刻度
}, },
// tooltip: { // tooltip: {
// position: ['70%', '70%'], // position: ['70%', '70%'],
...@@ -876,83 +876,82 @@ export default { ...@@ -876,83 +876,82 @@ export default {
}, },
series: [ series: [
{ {
name: "现有重点人(未化解)", name: "现有群体(未化解)",
type: "line", type: "line",
// type: "bar", // type: "bar",
stack: "业务",//折叠显示 // stack: "业务",//折叠显示
// data: ["2", "6", "12", "9", "2", '23', '15', "6", "12", "9", "2", '23', '15'], // data: ["2", "6", "12", "9", "2", '23', '15', "6", "12", "9", "2", '23', '15'],
data: data.whj, data: data.whj,
barWidth : 25, barWidth : 25,
//显示颜色 //显示颜色
itemStyle:{ itemStyle:{
normal:{color:"#5087ec"} normal:{color:"red"}
}, },
label: { // 图形上的文本标签 label: { // 图形上的文本标签
show: false, show: false,
position: 'insideTop', // 相对位置 position: 'insideTop', // 相对位置
rotate: 0, // 旋转角度 rotate: 0, // 旋转角度
color: '#eee' color: '#eee'
} }
},
{
name: "新增",
type: "line",
// type: "bar",
stack: "业务",
// data: ["8", "23", "49", "7", "16", '12', '10', "36", "12", "9", "32", '23', '5'],
data: data.xz,
barWidth : 25,
label: { // 图形上的文本标签
show: false,
position: 'insideTop', // 相对位置
rotate: 0, // 旋转角度
color: '#eee'
},
itemStyle:{
normal:{color:"#68bbc4"}
}
},
{
name: "涉稳重点人(已化解)",
type: "line",
// type: "bar",
stack: "业务",
// data: ["8", "23", "49", "7", "16", '12', '10', "36", "12", "9", "32", '23', '5'],
data: data.yhj,
barWidth : 25,
label: { // 图形上的文本标签
show: false,
position: 'insideTop', // 相对位置
rotate: 0, // 旋转角度
color: '#eee'
}, },
itemStyle:{ {
normal:{color:"#4bd277"} name: "新增",
type: "line",
// type: "bar",
// stack: "业务",
// data: ["8", "23", "49", "7", "16", '12', '10', "36", "12", "9", "32", '23', '5'],
data: data.xz,
barWidth : 25,
label: { // 图形上的文本标签
show: false,
position: 'insideTop', // 相对位置
rotate: 0, // 旋转角度
color: '#eee'
},
itemStyle:{
normal:{color:"#4bd277"}
}
},
{
name: "涉稳群体(已化解)",
type: "line",
// type: "bar",
// stack: "业务",
// data: ["8", "23", "49", "7", "16", '12', '10', "36", "12", "9", "32", '23', '5'],
data: data.yhj,
barWidth : 25,
label: { // 图形上的文本标签
show: false,
position: 'insideTop', // 相对位置
rotate: 0, // 旋转角度
color: '#eee'
},
itemStyle:{
normal:{color:"#68bbc4"}
}
} }
}
] ]
}; };
qtzsfxoption && qtzsfxChart.setOption(qtzsfxoption); qtzsfxoption && qtzsfxChart.setOption(qtzsfxoption);
}, },
queryZdrwtxz() { queryZdrwtxz() {
let params = new FormData(); let params = new FormData();
post("/xqapi/swtj/zdrWtxz", params).then((res) => { post("/xqapi/swtj/zdrWtxz", params).then((res) => {
if (res.code == "200") { if (res.code == "200") {
// this.tableData = res.data.rows; // this.tableData = res.data.rows;
// this.tableDataLength = res.data.count; // this.tableDataLength = res.data.count;
this.initPieZdrwtxz(res.data.data) this.initPieZdrwtxz(res.data.data)
}else if(res.code == "202") { }else if(res.code == "202") {
this.$notify.error({ this.$notify.error({
title: "登录超时!", title: "登录超时!",
message: res.msg, message: res.msg,
}); });
this.$router.replace({ path: "/Login/swptLogin" }); this.$router.replace({ path: "/Login/swptLogin" });
} else { } else {
console.log(res.message); this.$notify.error({
this.$notify.error({ title: "系统异常",
title: "系统异常", message: res.msg,
message: res.msg, });
});
} }
}); });
}, },
...@@ -968,7 +967,6 @@ export default { ...@@ -968,7 +967,6 @@ export default {
}); });
this.$router.replace({ path: "/Login/swptLogin" }); this.$router.replace({ path: "/Login/swptLogin" });
} else { } else {
console.log(res.message);
this.$notify.error({ this.$notify.error({
title: "系统异常", title: "系统异常",
message: res.msg, message: res.msg,
...@@ -988,7 +986,6 @@ export default { ...@@ -988,7 +986,6 @@ export default {
}); });
this.$router.replace({ path: "/Login/swptLogin" }); this.$router.replace({ path: "/Login/swptLogin" });
} else { } else {
console.log(res.message);
this.$notify.error({ this.$notify.error({
title: "系统异常", title: "系统异常",
message: res.msg, message: res.msg,
...@@ -1008,7 +1005,6 @@ export default { ...@@ -1008,7 +1005,6 @@ export default {
}); });
this.$router.replace({ path: "/Login/swptLogin" }); this.$router.replace({ path: "/Login/swptLogin" });
} else { } else {
console.log(res.message);
this.$notify.error({ this.$notify.error({
title: "系统异常", title: "系统异常",
message: res.msg, message: res.msg,
...@@ -1028,7 +1024,6 @@ export default { ...@@ -1028,7 +1024,6 @@ export default {
}); });
this.$router.replace({ path: "/Login/swptLogin" }); this.$router.replace({ path: "/Login/swptLogin" });
} else { } else {
console.log(res.message);
this.$notify.error({ this.$notify.error({
title: "系统异常", title: "系统异常",
message: res.msg, message: res.msg,
......
...@@ -1091,23 +1091,23 @@ ...@@ -1091,23 +1091,23 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<div v-if="zpList.length > 0" style="width: 150px; height: 185px; margin-top:10px;margin-left:20px;"> <div v-if="zpList.length > 0" style="width: 160px; height: 220px; margin-top:25px;margin-left:20px;">
<el-carousel> <el-carousel>
<el-carousel-item v-for="(item, i) in zpList" :key="i"> <el-carousel-item v-for="(item, i) in zpList" :key="i">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="top-start" trigger="click"> <!--trigger属性值:hover、click、focus 和 manual--> <el-popover placement="top-start" trigger="click"> <!--trigger属性值:hover、click、focus 和 manual-->
<a :href="item.fileCode" target="_blank" title="查看最大化图片"> <a :href="item.fileCode" target="_blank" title="查看最大化图片">
<img :src="item.fileCode" style="width: 300px;height: 300px"> <img :src="item.fileCode" style="width: 400px;height: 400px">
</a> </a>
<img slot="reference" :src="item.fileCode" style="width: 130px; height: 175px; cursor:pointer"> <img slot="reference" :src="item.fileCode" style="width: 155px; height: 210px; cursor:pointer">
</el-popover> </el-popover>
</template> </template>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
<div v-else style="width: 150px; height: 185px; margin-top:10px;margin-left:20px;"> <div v-else style="width: 160px; height: 220px; margin-top:25px;margin-left:20px;">
<el-image <el-image
style="width: 150px; height: 185px; margin-top:10px;margin-left:20px;" style="width: 155px; height: 210px; margin-top:10px;margin-left:20px;"
:src="perLogo" :src="perLogo"
></el-image> ></el-image>
</div> </div>
...@@ -1141,18 +1141,17 @@ ...@@ -1141,18 +1141,17 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="联系电话:"> <el-form-item label="联系电话1:">
<span> {{ XQZdrDiolog.lxdh }}</span> <span> {{ XQZdrDiolog.lxdh }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="民族:"> <el-form-item label="联系电话2:">
<div v-for="(v, i) in rkmzdmList" :key="i"> <span> {{ XQZdrDiolog.lxdh2 }}</span>
<span v-if="XQZdrDiolog.mzdm === v.id">{{v.text}}</span>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="政治面貌:"> <el-form-item label="政治面貌:">
...@@ -1170,6 +1169,15 @@ ...@@ -1170,6 +1169,15 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="民族:">
<div v-for="(v, i) in rkmzdmList" :key="i">
<span v-if="XQZdrDiolog.mzdm === v.id">{{v.text}}</span>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="18" :offset="0"> <el-col :span="18" :offset="0">
<el-form-item label="户籍地址:" > <el-form-item label="户籍地址:" >
<span> {{ XQZdrDiolog.hjdDzxz }}</span> <span> {{ XQZdrDiolog.hjdDzxz }}</span>
...@@ -1183,6 +1191,13 @@ ...@@ -1183,6 +1191,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="18" :offset="0">
<el-form-item label="人员标签:">
<span> {{ XQZdrDiolog.bqxxmc }}</span>
</el-form-item>
</el-col>
</el-row>
</el-col> </el-col>
</el-row> </el-row>
...@@ -1253,6 +1268,20 @@ ...@@ -1253,6 +1268,20 @@
<el-row> <el-row>
<el-col :span="20" :offset="2"> <el-col :span="20" :offset="2">
<el-form-item label="车牌信息:">
<span> {{ XQZdrDiolog.cph }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20" :offset="2">
<el-form-item label="房产信息:">
<span> {{ XQZdrDiolog.fcxx }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20" :offset="2">
<el-form-item label="备注:"> <el-form-item label="备注:">
<span> {{ XQZdrDiolog.bz }}</span> <span> {{ XQZdrDiolog.bz }}</span>
</el-form-item> </el-form-item>
...@@ -2159,6 +2188,7 @@ export default { ...@@ -2159,6 +2188,7 @@ export default {
this.gzzbqkListZdr = res.data.swgzzb; this.gzzbqkListZdr = res.data.swgzzb;
this.XQdialogZdrVisible = true; this.XQdialogZdrVisible = true;
this.ryid = res.data.ryid[0].id; this.ryid = res.data.ryid[0].id;
this.XQZdrDiolog.bqxxmc = res.data.ryid[0].bqxxmc;
this.zpList = res.data.zpList; this.zpList = res.data.zpList;
} else if(res.code == "202") { } else if(res.code == "202") {
this.$notify.error({ this.$notify.error({
......
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