Skip to content

F
founder_vue
Commit 547f2a6a by 薛文刚
Options

bug

parent 9dda3bc1
Showing with 258 additions and 70 deletions
public/JsonData/CODE_SHCE_RYBQ.json
......@@ -33,6 +33,16 @@
"children":[]
},
{
"ids":"1045349",
"label":"一般涉恶团伙",
"codeType":"CODE_SHCE_RYBQ",
"text":"一般涉恶团伙",
"pId":null,
"id":"013",
"isParent":false,
"children":[]
},
{
"ids":"1045340",
"label":"被举报人员",
"codeType":"CODE_SHCE_RYBQ",
......@@ -121,16 +131,6 @@
"id":"012",
"isParent":false,
"children":[]
},
{
"ids":"1045349",
"label":"一般涉恶团伙",
"codeType":"CODE_SHCE_RYBQ",
"text":"一般涉恶团伙",
"pId":null,
"id":"013",
"isParent":false,
"children":[]
}
]
},
......
src/views/caseFocusOnPerson/personBasicInStatistics.vue
<template>
<div class="Echarts">
<div class="title">重点关注人员数量统计</div>
<div class="subTitle">重点人员总数：</div>
<div class="total">
<div class="all">{{total}}</div>
<div class="itemTotal"
v-for="(item,index) in totalList"
:key="index">
<div class="itemColor"
:style="{background: item.color}"></div>
<div class="itemName">{{item.name}}</div>
<div class="itemnum">{{item.total}}</div>
</div>
</div>
<div class="ecTitle">关注人数 / 案例类型</div>
<div id="main"
style="width: 100%;height:500px;margin-top: 50px"></div>
style="width: 100%;height:525px;"></div>
</div>
</template>
......@@ -15,8 +29,31 @@ export default {
nameList: [],
rycountList: [],
myChart: null,
max: 40,
minInterval: 10
max: '',
minInterval: 10,
total: '',
totalList: [
{
color: '#FF524D',
total: '',
name: '高危'
},
{
color: '#AB4EFF',
total: '',
name: '中度'
},
{
color: '#FFA453',
total: '',
name: '一般'
},
{
color: '#4093FF',
total: '',
name: '低危'
}
]
};
},
methods: {
......@@ -24,14 +61,14 @@ export default {
// 指定图表的配置项和数据
let option = {
backgroundColor: "#FFFFFF",
title: {
text: "各省重点关注人员案件类别统计",
left: "center",
textStyle: {
fontSize: 30,
fontWeight: "normal"
}
},
// title: {
// text: "各省重点关注人员案件类别统计",
// left: "center",
// textStyle: {
// fontSize: 30,
// fontWeight: "normal"
// }
// },
xAxis: {
type: "category",
data: this.nameList,
......@@ -45,25 +82,32 @@ export default {
},
interval: 0
},
"axisTick": {
"show": false //隐藏y轴刻度线
},
},
tooltip: {},
yAxis: {
type: "value",
name: "重点关注人员总数",
nameLocation: "middle",
// nameLocation: "middle",
nameTextStyle: {
color: "rgba(10, 10, 10, 1)",
color: "#999999",
fontStyle: "normal",
fontWeight: "normal",
fontFamily: "sans-serif",
align: "center",
verticalAlign: "bottom",
lineHeight: 56,
lineHeight: 68,
fontSize: 15
},
"axisLine": {
"show": false //隐藏y轴
},
"axisTick": {
"show": false //隐藏y轴刻度线
},
minInterval: this.minInterval,
max: this.max
},
series: [
{
......@@ -75,21 +119,24 @@ export default {
color: function (params) {
// build a color map as your need.
var colorList = [
"#FF6666",
"#FF9966",
"#FF6666",
"#E87C25",
"#27727B",
"#FE8463",
"#9BCA63",
"#FAD860",
"#F3A43B",
"#60C0DD",
"#D7504B",
"#C6E579",
"#F4E001",
"#F0805A",
"#26C0C0"
"#FF524D",
"#FF524D",
"#FF524D",
"#FF524D",
"#FF524D",
"#FF524D",
"#FF524D",
"#FF524D",
"#FF524D",
"#AB4EFF",
"#FFA453",
"#FFA453",
"#FFA453",
"#FFA453",
"#4093FF",
"#4093FF",
"#4093FF",
'#C3C8CD'
];
return colorList[params.dataIndex];
}
......@@ -97,12 +144,13 @@ export default {
}
}
],
barWidth: 50
barWidth: 24
};
// 使用刚指定的配置项和数据显示图表。
this.myChart.setOption(option);
},
getEchartsData (myChart) {
var self = this
getAjlbGs({})
.then(res => {
console.log(res);
......@@ -122,6 +170,25 @@ export default {
this.rycountList = rycountList;
myChart.hideLoading();
this.myEcharts();
debugger
var num = 0
var num2 = 0
var num3 = 0
for (var i = 0; i < 9; i++) {
num += self.rycountList[i]
}
for (var i = 10; i < 14; i++) {
num2 += self.rycountList[i]
}
for (var i = 14; i < 17; i++) {
num3 += self.rycountList[i]
}
debugger
this.totalList[0].total = num
this.totalList[1].total = this.rycountList[9]
this.totalList[2].total = num2
this.totalList[3].total = num3
this.total = num + num2 + num3 + this.rycountList[9]
})
.catch(err => {
console.log(err);
......@@ -141,4 +208,85 @@ export default {
};
</script>
<style scoped></style>
<style scoped lang="scss">
.Echarts {
width: 1612px;
height: 800px;
background: #ffffff;
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.12);
border-radius: 12px;
margin-left: 20px;
margin-top: 20px;
.title {
font-size: 20px;
font-family: Microsoft YaHei;
font-weight: bold;
line-height: 26px;
color: #333333;
opacity: 1;
margin-left: 32px;
padding-top: 24px;
}
.subTitle {
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 19px;
color: #999999;
opacity: 1;
margin-left: 32px;
padding-top: 32px;
}
.total {
display: flex;
align-items: center;
.all {
height: 44px;
font-size: 36px;
font-family: DIN;
font-weight: bold;
line-height: 44px;
color: #333333;
margin-left: 32px;
padding-top: 8px;
}
.itemTotal {
display: flex;
align-items: center;
margin-left: 54px;
.itemColor {
width: 13px;
height: 13px;
border-radius: 2px;
margin-left: 40px;
}
.itemName {
font-size: 13px;
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 17px;
color: #999999;
margin-left: 6px;
}
.itemnum {
font-size: 19px;
font-family: DIN;
font-weight: 500;
line-height: 23px;
color: #343a3f;
opacity: 1;
margin-left: 12px;
}
}
}
.ecTitle {
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 19px;
color: #999999;
margin-left: 32px;
padding-top: 32px;
}
}
</style>
src/views/caseFocusOnPerson/personBasicInform.vue
......@@ -138,7 +138,7 @@ export default {
{ name: "一般", value: "y" },
{ name: "低危", value: "d" }
],
col: "5"
col: "3"
},
{
name: "关注人员",
......@@ -151,6 +151,42 @@ export default {
{ name: "我关注的", value: "1" }
],
col: "3"
},
{
name: "是否判决",
id: "sfpjPdbz",
type: "radios",
value: "",
placeholder: "",
radioData: [
{ name: "是", value: "1" },
{ name: "否", value: "0" }
],
col: "3"
},
{
name: "是否服刑",
id: "sffxPdbz",
type: "radios",
value: "",
placeholder: "",
radioData: [
{ name: "是", value: "1" },
{ name: "否", value: "0" }
],
col: "3"
},
{
name: "是否刑满释放",
id: "sfxmsfPdbz",
type: "radios",
value: "",
placeholder: "",
radioData: [
{ name: "是", value: "1" },
{ name: "否", value: "0" }
],
col: "3"
}
],
defaultFormThead: [
......@@ -196,11 +232,6 @@ export default {
width: "150px"
},
{
label: "是否刑满释放",
prop: "sfxmsfPdbz",
width: "150px"
},
{
label: "是否判决",
prop: "sfpjPdbz",
width: "150px"
......@@ -209,7 +240,12 @@ export default {
label: "是否服刑",
prop: "sffxPdbz",
width: "150px"
}
},
{
label: "是否刑满释放",
prop: "sfxmsfPdbz",
width: "150px"
},
],
/*所有表头数据*/
AllformThead: [
......
src/views/caseInforCollet/caseConfig.vue
......@@ -1213,7 +1213,8 @@ export default {
else if (item.type == "datearea") {
if (self.propSt) {
if (self.formLabelAlign[item.id]) {
if (this.propTq) {
debugger
if (self.propTq) {
params.append(self.propSt + "." + item.id_1, self.formLabelAlign[item.id][0]);
params.append(self.propSt + "." + item.id_2, self.formLabelAlign[item.id][1]);
} else {
......
src/views/caseInforCollet/caseShow.vue
......@@ -6,6 +6,7 @@
:formLabelAlign="formLabelAlign"
@selfDefineEvent='callSelfDefineEvent'
:propSt="st"
:propTq='isTq'
@submit='showSubmit'
:innerstyle="innerstyle"
:outstyle="outstyle"
......@@ -1303,7 +1304,8 @@ export default {
outstyle: {
background: "#F2F2F2"
},
navIndex: ''
navIndex: '',
isTq: true
};
},
created () {
......
src/views/xsForm/formCommonPage.vue
......@@ -535,7 +535,7 @@
margin-left: 56px;
line-hight: 40px;
"
v-if="propQuery.content">
v-if="propQuery.total > 0">
<i class="el-icon-info"
style="color:#F56C6C;margin-right:12px"></i>
<span style="color: #222222;">发现 <span style="color:#F56C6C">{{propQuery.content}}</span> 相关线索 {{ propQuery.total }} 条</span>
......@@ -547,7 +547,7 @@
">点击查看</span>
</div>
</div>
<div v-else-if="item4.type == 'textss'"
<div v-else-if="item4.type == 'textmessage'"
style="display: flex">
<el-input :placeholder="item4.placeholder"
v-model="reakData[item4.id]"
......
src/views/xsSearch/queryPages/queryrightcommon.vue
......@@ -564,7 +564,7 @@
<el-button plain
size="mini"
@click="doCallform"
v-if="xzButton && queryLb != 'kp'"
v-if="xzButton && queryLb != 'kp' && selectQueryPath != 'zbaj/getAjzbList'"
type="primary"
style="margin-right: 6px;font-size: 12px;background:#FE9200;padding: 7px 28px;border-radius: 4px;color:#fff;border: 1px solid rgb(254, 146, 0);">
<i class=" iconfont icontianjia"
......@@ -694,7 +694,7 @@
style="cursor: pointer; color:#096CC9;font-size:13px !important;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
{{ scope.row[columnTitle.prop] }}
</div>
<div v-else-if="theadInddex == 0 && columnTitle.prop == 'xm'"
<div v-else-if="theadInddex == 0 && columnTitle.prop == 'xm' && $route.path == '/gzryQuery'"
@click="goDetailGzry(scope.row)"
style="cursor: pointer; color:#096CC9;font-size:13px !important;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
{{ scope.row[columnTitle.prop] }}
......@@ -1527,11 +1527,11 @@ export default {
id: "laAjmc",
value: ""
},
{
title: "案件类别",
id: "laAjlb",
value: ""
},
// {
// title: "案件类别",
// id: "laAjlb",
// value: ""
// },
{
title: "涉案公职人员数",
id: "bhsrs",
......@@ -1683,12 +1683,12 @@ export default {
}
]
},
{
title: "案件类别",
id: "ajlbdm",
value: "",
col: 5
},
// {
// title: "案件类别",
// id: "ajlbdm",
// value: "",
// col: 5
// },
{
id: "group",
col: 1,
......@@ -3190,6 +3190,7 @@ export default {
console.log(this.formData);
post(`${base.alyIP}/${this.selectQueryPath}`, this.formData)
.then(res => {
debugger
console.log(res);
this.tableData = {};
if (res.success && res.data != {}) {
......@@ -3231,7 +3232,7 @@ export default {
count: res.data.total || 0,
data: res.data.rows
};
if (res.data.rows[0]['xxscPdbz']) {
if (this.selectQueryPath == 'jlaj/getJlajList') {
this.isDqjdspbz = true;
this.isjlaj = true;
}
......@@ -3371,7 +3372,7 @@ export default {
var path = this.$route.path
if (path == '/gzryQuery') {
window.open(`${self.CommonConfig.AddRouterPath}`, "_blank");
} else if (self.isjlaj) {
} else if (this.selectQueryPath == 'jlaj/getJlajList') {
this.$router.pushToTab('casemanageInput');
} else {
window.open(`${self.CommonConfig.AddRouterPath}?navIndex=${self.navIndex}`, "_blank");
......
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