Skip to content

F
founder_vue
Commit bf5b8922 by chenqiang
Options

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

# Conflicts:
#	src/views/datav/index.vue
#	src/views/magl/index.vue
parents d30ba50f afddee55
Showing with 168 additions and 98 deletions
src/router/index.js
import Vue from "vue";
import VueRouter from "vue-router";
/*import Watermark from '@/utils/watermark';*/
import Watermark from '@/utils/watermark';
/*import Cookies from 'js-cookie'*/
/*import request from "@/api/interface/dictionaryCode.js";*/
/*import store from "../store";
......@@ -64,12 +64,14 @@ const router = new VueRouter({
});*/
router.afterEach((to) => {
if(to.path!='/login'){
/*request.getYhxx("").then(res => {
if (res.success === true) {
Watermark.set(res.data.rows.trueName==null?'':res.data.rows.trueName,res.data.rows.identitycard==null?'':res.data.rows.identitycard,res.data.rows.unitname==null?'':res.data.rows.unitname,res.data.rows.policemanid==null?'':res.data.rows.policemanid,res.data.rows.ip==null?'':res.data.rows.ip)
}
});*/
if (to.path != '/login') {
// request.getYhxx("").then(res => {
// if (res.success === true) {
// Watermark.set(res.data.rows.trueName == null ? '' : res.data.rows.trueName, res.data.rows.identitycard == null ? '' : res.data.rows.identitycard, res.data.rows.unitname == null ? '' : res.data.rows.unitname, res.data.rows.policemanid == null ? '' : res.data.rows.policemanid, res.data.rows.ip == null ? '' : res.data.rows.ip)
// }
// });
var userInfo = JSON.parse(sessionStorage.userInfo);
Watermark.set(userInfo.realname == null ? '' : userInfo.realname, userInfo.identitycard == null ? '' : userInfo.identitycard, userInfo.unitname == null ? '' : userInfo.unitname, (userInfo.ip == undefined || userInfo.ip == null) ? '' : userInfo.ip, "")
}
});
export default router;
src/views/magl/bndfasTs.vue
<template>
<ts-table :emitFormData="emitFormData" :emitUrl="emitUrl" :emitTableThead="emitTableThead" :emitPage="emitPage"></ts-table>
<ts-table :emitFormData="emitFormData"
:emitUrl="emitUrl"
:emitTableThead="emitTableThead"
:emitPage="emitPage"></ts-table>
</template>
<script>
import {
bndfasTsUrl,
bndfasTsFormData,
bndfasTsThead,
bndfasTsPageName,
}from '@/utils/params'
import tsTable from '@c/tsTable_components.vue'
export default {
name: "bndfasTs",
components:{
tsTable
},
data(){
return{
emitFormData:bndfasTsFormData,
emitUrl:bndfasTsUrl,
emitTableThead: bndfasTsThead,
emitPage:bndfasTsPageName,
}
}
import * as paramsData from '@/utils/params'
import utilTool from "@/utils/util.js";
import tsTable from '@c/tsTable_components.vue'
export default {
name: "bndfasTs",
components: {
tsTable
},
data() {
return {
emitFormData: paramsData.bndfasTsFormData,
emitUrl: paramsData.bndfasTsUrl,
emitTableThead: paramsData.bndfasTsThead,
emitPage: paramsData.bndfasTsPageName,
}
},
created() {
const queryParam = this.$route.query;
let startTime = new Date(parseInt(queryParam.time) + "-01-01 00:00:00");
startTime = utilTool.timeStampTurnTime(startTime);
let endTime = new Date((parseInt(queryParam.time) + 1) + "-01-01 00:00:00").setSeconds(-1);
endTime = utilTool.timeStampTurnTime(endTime);
switch (queryParam.id) {
//本年度发案数
case "maFaCount":
this.emitFormData = paramsData.bndfasTsFormData;
this.emitUrl = paramsData.bndfasTsUrl;
this.emitTableThead = paramsData.bndfasTsThead;
this.emitPage = paramsData.bndfasTsPageName;
break;
//本年度破案数
case "maPaCount":
this.emitFormData = paramsData.bndfasTsFormData;
this.emitUrl = paramsData.bndfasTsUrl;
this.emitTableThead = paramsData.bndfasTsThead;
this.emitPage = paramsData.bndfasTsPageName;
break;
//本年度命案未破数
case "maWpCount":
this.emitFormData = paramsData.bndfasTsFormData;
this.emitUrl = paramsData.bndfasTsUrl;
this.emitTableThead = paramsData.bndfasTsThead;
this.emitPage = paramsData.bndfasTsPageName;
break;
//本年度积案破案数
case "maJaPaCount":
this.emitFormData = paramsData.bndfasTsFormData;
this.emitUrl = paramsData.bndfasTsUrl;
this.emitTableThead = paramsData.bndfasTsThead;
this.emitPage = paramsData.bndfasTsPageName;
break;
//本年重大伤亡命案数
case "maZdswCount":
this.emitFormData = paramsData.bndfasTsFormData;
this.emitUrl = paramsData.bndfasTsUrl;
this.emitTableThead = paramsData.bndfasTsThead;
this.emitPage = paramsData.bndfasTsPageName;
break;
default:
this.emitFormData = paramsData.bndfasTsFormData;
this.emitUrl = paramsData.bndfasTsUrl;
this.emitTableThead = paramsData.bndfasTsThead;
this.emitPage = paramsData.bndfasTsPageName;
break;
};
this.emitFormData.larqQssj = startTime;
this.emitFormData.larqJssj = endTime;
}
}
</script>
<style scoped>
</style>
src/views/magl/sjfx.vue
......@@ -41,7 +41,7 @@
<div class="lNum">
<span class="num"
:style="{cursor:item.value!=0?'pointer':'inherit'}"
@click="toTs(item.id,item.value)"><i class="el-icon-loading zdyIcon"
@click="toTs(item)"><i class="el-icon-loading zdyIcon"
v-show="item.value==null"></i>{{item.value==null?'':item.value}}</span>
<span class="unstable">
同比{{item.type=='reduce'?'减少':'增加'}}
......@@ -142,7 +142,9 @@
<span class="pTitle">犯罪嫌疑人统计</span>
</div>
<div class="tj_wrap"
id="fzxyrtj" v-loading="fzxyrtjLoading" element-loading-text="拼命加载中"></div>
id="fzxyrtj"
v-loading="fzxyrtjLoading"
element-loading-text="拼命加载中"></div>
</div>
<!--第六行-->
<div class="line">
......@@ -235,7 +237,7 @@ export default {
},
data() {
return {
scroll:0,
scroll: 0,
date: '',
formData: glFormData,
slUrl: gl1URL1,//数量路径
......@@ -257,7 +259,7 @@ export default {
bndzadjpafxLoading: true,
fzxyrnldjxbhfswtjLoading: true,
shrnldjxbhfLoading: true,
fzxyrtjLoading:true,
fzxyrtjLoading: true,
areaDistributionLoading: true,//地域分布统计饼图loading
sendCaseTrendLoading: true,//发案趋势折线图loading
yearList: [{
......@@ -350,21 +352,36 @@ export default {
}
},
toTs(id, val) {
/**
* 年度案件统计（数据透视）
*/
toTs(statisticItem) {
let routeData;
if (val != 0) {
if (id == 'maFaCount') {
if (statisticItem.value != 0) {
if (statisticItem.id == 'maFaCount') {
routeData = this.$router.resolve({
path: "/bndfas"
path: "/bndfas",
query: {
id: statisticItem.id,
time: this.formData.year
}
});
} else if (id == 'maPaCount') {
} else if (statisticItem.id == 'maPaCount') {
routeData = this.$router.resolve({
path: "/bndpas"
path: "/bndpas",
query: {
id: statisticItem.id,
time: this.formData.year
}
});
} else {
routeData = this.$router.resolve({
path: "/bndpas"
path: "/bndpas",
query: {
id: statisticItem.id,
time: this.formData.year
}
});
}
window.open(routeData.href, "_blank");
......@@ -432,7 +449,7 @@ export default {
self.requestPost(JSON.stringify(self.formData), self.slUrl2).then(response => {
if (response.data.success === true) {
self.ajtjList.forEach(item => {
if (item.id == 'maPaCount') {
if (item.id == 'maPaCount') {
item.value = response.data.data.maPaCount;
item.num = response.data.data.maPaBdl;
item.type = response.data.data.maPaBdlUp;
......@@ -541,7 +558,7 @@ export default {
name: '发案数 / 月份',
type: 'value',
scale: true,
minInterval:50,
minInterval: 50,
},
grid: {
left: '20',
......@@ -648,7 +665,7 @@ export default {
{
type: 'value',
min: 0,
minInterval:50,
minInterval: 50,
axisLabel: {
formatter: '{value}'
}
......@@ -944,7 +961,7 @@ export default {
type: 'value',
name: '犯罪人数/年龄段分布',
min: 0,
minInterval:50,
minInterval: 50,
axisLabel: {
formatter: '{value}'
}
......@@ -1077,7 +1094,7 @@ export default {
type: 'value',
name: '受害人数 / 年龄段分布',
min: 0,
minInterval:50,
minInterval: 50,
axisLabel: {
formatter: '{value}'
}
......@@ -1305,7 +1322,7 @@ export default {
{
type: 'value',
min: 0,
minInterval:50,
minInterval: 50,
axisLabel: {
formatter: '{value}'
}
......@@ -1439,8 +1456,8 @@ export default {
},
/*工作台 end*/
fzxyrtjInit() {
let self=this;
self.fzxyrtjLoading=true;
let self = this;
self.fzxyrtjLoading = true;
self.requestPost(JSON.stringify(self.formData), "/matj/toXyrTztj").then(response => {
if (response.data.success === true) {
let data1 = response.data.data.total;
......@@ -1453,53 +1470,53 @@ export default {
let myChart = this.$echarts.init(document.getElementById('fzxyrtj'))
// 绘制图表
myChart.setOption({
dataset: {
source: [
['score', 'product'],
[data1, '总数'],
[data2, '抓获'],
[data3, '死亡'],
[data4, '在逃'],
[data5, '未成年'],
[data6, '精神病'],
],
},
tooltip: {
formatter: function (value) {
return value.data[1] + ":" + value.data[0];
},
},
grid: { containLabel: true },
xAxis: { name: '人数',min: 0, minInterval:30},
yAxis: {
type: 'category',
scale: true,
minInterval:50,
},
visualMap: {
orient: 'horizontal',
left: 'center',
min: 10,
max: 100,
/* text: ['High Score', 'Low Score'],*/
// Map the score column to color
dimension: 0,
inRange: {
color: ['#65B581', '#FFCE34', '#FD665F']
}
},
series: [
{
type: 'bar',
encode: {
// Map the "amount" column to X axis.
x: 'amount',
// Map the "product" column to Y axis
y: 'product'
}
}
]
}
dataset: {
source: [
['score', 'product'],
[data1, '总数'],
[data2, '抓获'],
[data3, '死亡'],
[data4, '在逃'],
[data5, '未成年'],
[data6, '精神病'],
],
},
tooltip: {
formatter: function (value) {
return value.data[1] + ":" + value.data[0];
},
},
grid: { containLabel: true },
xAxis: { name: '人数', min: 0, minInterval: 30 },
yAxis: {
type: 'category',
scale: true,
minInterval: 50,
},
visualMap: {
orient: 'horizontal',
left: 'center',
min: 10,
max: 100,
/* text: ['High Score', 'Low Score'],*/
// Map the score column to color
dimension: 0,
inRange: {
color: ['#65B581', '#FFCE34', '#FD665F']
}
},
series: [
{
type: 'bar',
encode: {
// Map the "amount" column to X axis.
x: 'amount',
// Map the "product" column to Y axis
y: 'product'
}
}
]
}
);
} else {
self.$message({
......@@ -1511,9 +1528,9 @@ export default {
});
},
handleScroll(){
handleScroll() {
this.scroll++;
if(this.scroll==1){
if (this.scroll == 1) {
this.bndajxzfafxInit();//本年度案件性质发案分析
this.bndzadjpafxInit();//本年度作案动机破案分析
this.fzxyrnldjxbhfswtjInit();//犯罪嫌疑人年龄段及性别划分、死亡统计
......@@ -1544,7 +1561,7 @@ export default {
/*工作台 end*/
this.bnfasjfxInit();//本年发案时间分析
this.bnqyfpaqkInit();//本年区域发、破案情况
window.addEventListener('mousewheel',this.handleScroll,false)
window.addEventListener('mousewheel', this.handleScroll, 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