From 03ab12b4ff251e4f7facd0e441fd56b04bab8862 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 31 Mar 2023 17:13:50 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs
---
src/views/home/components/leftContainer.vue | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 insertions(+), 21 deletions(-)
diff --git a/src/views/home/components/leftContainer.vue b/src/views/home/components/leftContainer.vue
index 6f3cc6e..1b81efd 100644
--- a/src/views/home/components/leftContainer.vue
+++ b/src/views/home/components/leftContainer.vue
@@ -45,10 +45,10 @@
<defs>
<path id="border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
d="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
- c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
- c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
- c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
- c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
+ c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
+ c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
+ c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
+ c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
fill="transparent" />
<radialGradient id="border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c" cx="50%" cy="50%" r="50%">
<stop offset="0%" stop-color="#fff" stop-opacity="1" />
@@ -58,10 +58,10 @@
<circle cx="0" cy="0" r="150" fill="url(#border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c)">
<animateMotion dur="8s"
path="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
- c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
- c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
- c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
- c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
+ c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
+ c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
+ c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
+ c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
rotate="auto" repeatCount="indefinite" />
</circle>
</mask>
@@ -131,7 +131,8 @@
</div>
<el-dialog title="学校" :modal="false" :visible.sync="xxPopupShow" :before-close="landBeforeClose"
- :close-on-click-modal="true" class="land-details-box">
+ :close-on-click-modal="true" class="land-details-box" v-loading="landLoading" element-loading-text="拼命加载中"
+ element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
<el-table :data="xxArr" style="width: 100%"
:header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
:cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
@@ -175,6 +176,7 @@
data () {
return {
tabType: 0,
+ landLoading: false,
peopletype: 0,
tabTypeTwo: 0,
tabTypeThree: 0,
@@ -234,6 +236,7 @@
}
})
},
+
methods: {
rowClick (row) {
if (row.x == '' || row.y == '') {
@@ -376,7 +379,7 @@
text: '拼命加载中',
color: '#c23531',
textColor: '#FFF',
- maskColor: 'rgba(17, 38, 163, 0.6)',
+ maskColor: 'rgba(0, 0, 0, 0.2)',
zlevel: 0,
})
setTimeout(() => {
@@ -418,7 +421,7 @@
text: '拼命加载中',
color: '#c23531',
textColor: '#FFF',
- maskColor: 'rgba(17, 38, 163, 1)',
+ maskColor: 'rgba(0, 0, 0, 0.2)',
zlevel: 0,
})
setTimeout(() => {
@@ -547,6 +550,7 @@
backBegin () {
this.dataDeep = 1
this.initPersonEcharts()
+ this.$parent.getAllPoliceStationCenter()
},
/**
@@ -596,7 +600,7 @@
text: '拼命加载中',
color: '#c23531',
textColor: '#FFF',
- maskColor: 'rgba(17, 38, 163, 0.6)',
+ maskColor: 'rgba(0, 0, 0, 0.2)',
zlevel: 0,
})
setTimeout(() => {
@@ -661,15 +665,17 @@
{
data: y1Date,
type: 'bar',
- barWidth: '24%',
+ // barWidth: '10%',
+ barCategoryGap: '80%',
zlevel: 2,
+ // cursor: 'default',
itemStyle: {
normal: {
// barBorderRadius: [0, 30, 30, 0],
// color: function (params) {
- // var num = myColor.length
- // return myColor[params.dataIndex % num]
- // },
+ // var num = myColor.length
+ // return myColor[params.dataIndex % num]
+ // },
color: '#ed7c2f',
label: {
show: true, //开启显示
@@ -704,6 +710,37 @@
bottom: '2%',
containLabel: true
},
+ // dataZoom: [
+ // {
+ // type: "inside",
+ // startValue: 0,
+ // endValue: 8,
+ // minValueSpan: 2,
+ // maxValueSpan: 2,
+ // yAxisIndex: [0],
+ // zoomOnMouseWheel: false, // 关闭滚轮缩放
+ // moveOnMouseWheel: true, // 开启滚轮平移
+ // moveOnMouseMove: true // 鼠标移动能触发数据窗口平移
+ // },
+ // {
+ // type: 'slider',
+ // realtime: true,
+ // startValue: 0,
+ // endValue: 8,
+ // width: '3.5',
+ // height: '80%',
+ // yAxisIndex: [0], // 控制y轴滚动
+ // fillerColor: "rgba(154, 181, 215, 1)", // 滚动条颜色
+ // borderColor: "rgba(17, 100, 210, 0.12)",
+ // backgroundColor: '#cfcfcf',//两边未选中的滑动条区域的颜色
+ // handleSize: 0, // 两边手柄尺寸
+ // showDataShadow: false,//是否显示数据阴影 默认auto
+ // showDetail: false, // 拖拽时是否展示滚动条两侧的文字
+ // top: '1%',
+ // right: '5',
+ // }
+
+ // ]
}
},
@@ -829,7 +866,11 @@
console.log('clickHouseChart', params)
if (params.name == '学校') {
this.xxPopupShow = true
- this.xxArr = schoolJSON
+ this.landLoading = true
+ setTimeout(() => {
+ this.landLoading = false
+ this.xxArr = schoolJSON
+ }, 1000)
}
})
},
@@ -855,7 +896,7 @@
text: '拼命加载中',
color: '#c23531',
textColor: '#FFF',
- maskColor: 'rgba(17, 38, 163, 0.6)',
+ maskColor: 'rgba(0, 0, 0, 0.2)',
zlevel: 0,
})
setTimeout(() => {
@@ -1050,16 +1091,16 @@
* @return {*}
*/
initLandEcharts (landData) {
+ this.disposeLandEchart()
var chartDom = document.getElementById('landEcharts')
landMyChart = this.$echarts.init(chartDom)
-
landMyChart.showLoading({
text: '拼命加载中',
color: '#c23531',
textColor: '#FFF',
- maskColor: 'rgba(17, 38, 163, 0.6)',
+ maskColor: 'rgba(0, 0, 0, 0.2)',
zlevel: 0,
})
setTimeout(() => {
@@ -1132,7 +1173,9 @@
landMyChart.dispose()
landMyChart.off('click')
}
- }
+ },
+
+
},
destroyed () {
--
Gitblit v1.9.3