Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
b4c29340 by 任超
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents 13fd66c6 a43c33ea
Expand all
Inline Side-by-side
Showing 4 changed files with 42 additions and 82 deletions
...@@ -41,41 +41,6 @@ export default { ...@@ -41,41 +41,6 @@ export default {
41 宁强县: [106.25958, 32.82881, 20], 41 宁强县: [106.25958, 32.82881, 20],
42 略阳县: [106.15399, 33.33009, 20], 42 略阳县: [106.15399, 33.33009, 20],
43 }; 43 };
44 let seriesData = [
45 {
46 name: '汉台区',
47 },
48 {
49 name: '南郑区',
50 },
51 {
52 name: '城固县',
53 },
54 {
55 name: '洋县',
56 },
57 {
58 name: '西乡县',
59 },
60 {
61 name: '镇巴县',
62 },
63 {
64 name: '勉县',
65 },
66 {
67 name: '留坝县',
68 },
69 {
70 name: '佛坪县',
71 },
72 {
73 name: '宁强县',
74 },
75 {
76 name: '略阳县'
77 }
78 ];
79 let convertData = function (data) { 44 let convertData = function (data) {
80 let scatterData = []; 45 let scatterData = [];
81 for (var i = 0; i < data.length; i++) { 46 for (var i = 0; i < data.length; i++) {
...@@ -90,7 +55,6 @@ export default { ...@@ -90,7 +55,6 @@ export default {
90 return scatterData; 55 return scatterData;
91 }; 56 };
92 this.options = { 57 this.options = {
93 backgroundColor: 'rgba(0,0,0,1)',
94 showLegendSymbol: true, 58 showLegendSymbol: true,
95 tooltip: { 59 tooltip: {
96 trigger: 'item', 60 trigger: 'item',
...@@ -126,7 +90,23 @@ export default { ...@@ -126,7 +90,23 @@ export default {
126 color: '#737373' 90 color: '#737373'
127 } 91 }
128 }, 92 },
129 93 geo: {
94 aspectScale: 1, //长宽比
95 zoom: 1.1,
96 mapType: '汉中市', // 自定义扩展图表类型
97 top: '15%',
98 left: '10%',
99 map: '汉中市',
100 itemStyle: {
101 normal: {//阴影
102 areaColor: '#02D9FD ',
103 shadowColor: '#01271F',
104 borderWidth: 0,
105 shadowOffsetX: 2,
106 shadowOffsetY: 25
107 }
108 }
109 },
130 series: [ 110 series: [
131 { 111 {
132 type: 'map', 112 type: 'map',
...@@ -137,22 +117,26 @@ export default { ...@@ -137,22 +117,26 @@ export default {
137 left: '10%', 117 left: '10%',
138 itemStyle: { 118 itemStyle: {
139 normal: { 119 normal: {
140 areaColor: 'rgba(19,54,162, .5)', 120 areaColor: 'rgba(19,54,162,.5)',
141 borderColor: 'rgba(0,242,252,.3)', 121 borderColor: 'rgba(0,242,252,.5)',
142 borderWidth: 1, 122 borderWidth: 2,
143 shadowBlur: 7, 123 shadowBlur: 7,
144 shadowColor: '#00f2fc', 124 borderColor:'rgba(19,54,162,.1)',
125 shadowColor: '#44f2fc',
145 }, 126 },
146 emphasis: { 127 emphasis: {
147 areaColor: '#4f7fff', 128 areaColor: '#4f7fff',
148 borderColor: 'rgba(0,242,252,.6)', 129 borderColor: 'rgba(0,242,252,.5)',
149 borderWidth: 2, 130 borderWidth: 2,
150 shadowBlur: 10, 131 shadowBlur: 10,
151 shadowColor: '#00f2fc', 132 shadowColor: '#00f2fc',
152 }, 133 },
153 }, 134 },
154 label: { 135 label: {
155 formatter: params => `${params.name}`, 136
137 formatter: params => {
138 return `${params.data.name}\n${params.data.value+"个"}`;
139 },
156 show: true, 140 show: true,
157 position: 'insideRight', 141 position: 'insideRight',
158 textStyle: { 142 textStyle: {
...@@ -166,39 +150,7 @@ export default { ...@@ -166,39 +150,7 @@ export default {
166 } 150 }
167 }, 151 },
168 data: newData, 152 data: newData,
169 },
170 {
171 name: 'MAP',
172 type: 'map3D',
173 map: name,
174 label: {
175 show: true,
176 textStyle: {
177 color: '#fff',
178 },
179 formatter: (params) => {
180 if (newData.find((ele) => ele.name == params.name)) {
181 return params.name + '\n' + newData.find((ele) => ele.name == params.name).value;
182 } else {
183 return params.name;
184 } 153 }
185 },
186 borderRadius: 4,
187 },
188 itemStyle: {
189 color: '#144a69',
190 // shadowColor: 'rgba(0,243,255,0.2)',
191 // shadowOffsetY: 5,
192 // shadowBlur: 10,
193 borderColor: '#06767c',
194 borderWidth: 1,
195 // opacity: 1,
196 },
197
198 aspectScale: 0.9, //长宽比
199 selectedMode: false, //是否允许选中多个区域
200 data: newData,
201 },
202 ], 154 ],
203 }; 155 };
204 // 重新选择区域 156 // 重新选择区域
......
...@@ -7,11 +7,18 @@ ...@@ -7,11 +7,18 @@
7 display: flex; 7 display: flex;
8 position: relative; 8 position: relative;
9 top: -2px; 9 top: -2px;
10
11 b { 10 b {
12 @include flex-center; 11 font-weight: 200;
13 flex: 1; 12 display: inline-block;
14 width: 100%; 13 position: relative;
14 font-size: 24px;
15 top: -11px;
16 width: 38%;
17 height: 40px;
18 margin-left: 28px;
19 // @include flex-center;
20 display: flex;
21 justify-content: center;
15 } 22 }
16 } 23 }
17 24
...@@ -28,7 +35,7 @@ ...@@ -28,7 +35,7 @@
28 } 35 }
29 36
30 .dialog_footer { 37 .dialog_footer {
31 margin-top: 8px; 38 margin-bottom: 8px;
32 @include flex-center; 39 @include flex-center;
33 } 40 }
34 41
...@@ -72,6 +79,9 @@ ...@@ -72,6 +79,9 @@
72 background-size: 100% 100%; 79 background-size: 100% 100%;
73 right: 40px; 80 right: 40px;
74 top: 33px; 81 top: 33px;
82 &:hover{
83 box-shadow: inset 0px 0px 12px 0px #02D9FD;
84 }
75 } 85 }
76 86
77 .el-dialog__close { 87 .el-dialog__close {
......
...@@ -89,7 +89,6 @@ export default { ...@@ -89,7 +89,6 @@ export default {
89 methods: { 89 methods: {
90 // 初始化数据 90 // 初始化数据
91 queryClick () { 91 queryClick () {
92 // this.$startLoading();
93 getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => { 92 getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => {
94 // this.$endLoading(); 93 // this.$endLoading();
95 let { records, total } = res.result 94 let { records, total } = res.result
...@@ -103,7 +102,6 @@ export default { ...@@ -103,7 +102,6 @@ export default {
103 cancelButtonText: '取消', 102 cancelButtonText: '取消',
104 type: 'warning' 103 type: 'warning'
105 }).then(() => { 104 }).then(() => {
106 this.$startLoading()
107 refreshDictCache().then(res => { 105 refreshDictCache().then(res => {
108 if (res.code == 200) { 106 if (res.code == 200) {
109 let refech = this.$store.dispatch('dict/generateDic') 107 let refech = this.$store.dispatch('dict/generateDic')
......