Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
1ac433d1 by 田浩浩
Options

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

2 parents 79f564b9 88ce3f18
Inline Side-by-side
Showing 45 changed files with 249 additions and 112 deletions
...@@ -364,8 +364,9 @@ ...@@ -364,8 +364,9 @@
364 分摊土地面积： <br /> 364 分摊土地面积： <br />
365 <p class="label-detail">（FTTDMJ）</p> 365 <p class="label-detail">（FTTDMJ）</p>
366 </span> 366 </span>
367 <el-input :disabled="$store.state.business.Edit" : 999999999999999, min: 0, precision: 3 }" 367 <el-input :disabled="$store.state.business.Edit"
368 placeholder="分摊土地面积" type="number" v-model.number="ruleForm.fttdmj"></el-input> 368 v-only-number="{ max: 999999999999999, min: 0, precision: 3 }" placeholder="分摊土地面积" type="number"
369 v-model.number="ruleForm.fttdmj"></el-input>
369 </el-form-item> 370 </el-form-item>
370 </el-col> 371 </el-col>
371 </el-row> 372 </el-row>
......
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
68 }, 68 },
69 // 如果需要自定义 tooltip样式，需要使用formatter 69 // 如果需要自定义 tooltip样式，需要使用formatter
70 formatter: params => { 70 formatter: params => {
71 return `<div style="">${params.name}:${params.value+"个"}</div>` 71 return `<div style="">${params.name}:${params.value + "个"}</div>`
72 } 72 }
73 }, 73 },
74 visualMap: { 74 visualMap: {
...@@ -90,23 +90,23 @@ export default { ...@@ -90,23 +90,23 @@ export default {
90 color: '#737373' 90 color: '#737373'
91 } 91 }
92 }, 92 },
93 geo: { 93 geo: {
94 aspectScale: 1, //长宽比 94 aspectScale: 1, //长宽比
95 zoom: 1.1, 95 zoom: 1.1,
96 mapType: '汉中市', // 自定义扩展图表类型 96 mapType: '汉中市', // 自定义扩展图表类型
97 top: '15%', 97 top: '15%',
98 left: '10%', 98 left: '10%',
99 map: '汉中市', 99 map: '汉中市',
100 itemStyle: { 100 itemStyle: {
101 normal: {//阴影 101 normal: {//阴影
102 areaColor: '#02D9FD ', 102 areaColor: '#02D9FD ',
103 shadowColor: '#01271F', 103 shadowColor: '#01271F',
104 borderWidth: 0, 104 borderWidth: 0,
105 shadowOffsetX: 2, 105 shadowOffsetX: 2,
106 shadowOffsetY: 25 106 shadowOffsetY: 25
107 } 107 }
108 } 108 }
109 }, 109 },
110 series: [ 110 series: [
111 { 111 {
112 type: 'map', 112 type: 'map',
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
121 borderColor: 'rgba(0,242,252,.5)', 121 borderColor: 'rgba(0,242,252,.5)',
122 borderWidth: 2, 122 borderWidth: 2,
123 shadowBlur: 7, 123 shadowBlur: 7,
124 borderColor:'rgba(19,54,162,.1)', 124 borderColor: 'rgba(19,54,162,.1)',
125 shadowColor: '#44f2fc', 125 shadowColor: '#44f2fc',
126 }, 126 },
127 emphasis: { 127 emphasis: {
...@@ -133,9 +133,8 @@ export default { ...@@ -133,9 +133,8 @@ export default {
133 }, 133 },
134 }, 134 },
135 label: { 135 label: {
136 136 formatter: params => {
137 formatter: params => { 137 return `${params.name}\n${params.value+"个"}`;
138 return `${params.data.name}\n${params.data.value+"个"}`;
139 }, 138 },
140 show: true, 139 show: true,
141 position: 'insideRight', 140 position: 'insideRight',
......
1 <template>
2 <Echart :options="options" id="centreLeft1Chart" :key="key" height="225px" width="80%"></Echart>
3 </template>
4 <script>
5 import Echart from '@/common/echart'
6 export default {
7 components: {
8 Echart,
9 },
10 data() {
11 return {
12 key:0
13 }
14 },
15 props: {
16 cdata: {
17 type: Object,
18 default: () => ({})
19 },
20 },
21 watch: {
22 cdata: {
23 handler (newData) {
24 console.log("newData",newData);
25 this.options = {
26 grid: {
27 right:"1%",
28 bottom:"4%"
29 },
30 color: [
31 "#37a2da",
32 "#32c5e9",
33 "#9fe6b8",
34 "#ffdb5c",
35 "#ff9f7f",
36 "#fb7293",
37 "#e7bcf3",
38 "#8378ea"
39 ],
40 tooltip: {
41 trigger: "item",
42 formatter: "{a} <br/>{b} : {c} ({d}%)"
43 },
44 toolbox: {
45 show: true
46 },
47 calculable: true,
48 series: [
49 {
50 name: "业务量",
51 type: "pie",
52 radius: [40,100],
53 roseType: "area",
54 data: newData.seriesData
55 }
56 ],
57
58 }
59 this.key++
60 },
61 immediate: true,
62 deep: true
63 }
64 }
65 };
66 </script>
67
68 <style lang="scss" scoped>
69 #centreLeft1Chart {
70 margin-bottom: 10px;
71 margin-left: 60px;
72 }
73 </style>
1 <template>
2 <div>
3 <Chart :cdata="cdata" />
4 </div>
5 </template>
6
7 <script>
8 import Chart from "./Chart";
9 import work from "@/api/work";
10 export default {
11 data () {
12 return {
13 cdata: {
14 seriesData: [],
15 },
16 };
17 },
18 components: {
19 Chart,
20 },
21 mounted () {
22 this.getdjywltotal();
23
24
25 },
26 methods: {
27 // 获取登记业务量玫瑰图数据
28 async getdjywltotal () {
29 try {
30 let p = {
31 DJLX: "",
32 QLLX: "",
33 XZQDM: "",
34 };
35 let res = await work.getdjywltotal(p);
36 console.log("res",res);
37 // 遍历修改数组键，作为echars图表的参数
38 res.result.map((item) => {
39 return (
40 this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
41 )
42 });
43 } catch (error) {
44 console.log(error);
45 }
46
47
48 },
49 },
50 };
51 </script>
52
53 <style lang="scss" scoped>
54 </style>
...@@ -7,11 +7,11 @@ export default { ...@@ -7,11 +7,11 @@ export default {
7 components: { 7 components: {
8 Echart, 8 Echart,
9 }, 9 },
10 data() { 10 data () {
11 return { 11 return {
12 key:0 12 key: 0
13 } 13 }
14 }, 14 },
15 props: { 15 props: {
16 cdata: { 16 cdata: {
17 type: Object, 17 type: Object,
...@@ -21,11 +21,10 @@ export default { ...@@ -21,11 +21,10 @@ export default {
21 watch: { 21 watch: {
22 cdata: { 22 cdata: {
23 handler (newData) { 23 handler (newData) {
24 console.log("newData",newData);
25 this.options = { 24 this.options = {
26 grid: { 25 grid: {
27 right:"1%", 26 right: "1%",
28 bottom:"4%" 27 bottom: "4%"
29 }, 28 },
30 color: [ 29 color: [
31 "#37a2da", 30 "#37a2da",
...@@ -49,14 +48,14 @@ export default { ...@@ -49,14 +48,14 @@ export default {
49 { 48 {
50 name: "业务量", 49 name: "业务量",
51 type: "pie", 50 type: "pie",
52 radius: [40,100], 51 radius: [0,100],
53 roseType: "area", 52 roseType: "area",
54 data: newData.seriesData 53 data: newData.seriesData
55 } 54 }
56 ], 55 ],
57 56
58 } 57 }
59 this.key++ 58 this.key++
60 }, 59 },
61 immediate: true, 60 immediate: true,
62 deep: true 61 deep: true
......
...@@ -19,7 +19,7 @@ export default { ...@@ -19,7 +19,7 @@ export default {
19 Chart, 19 Chart,
20 }, 20 },
21 mounted () { 21 mounted () {
22 this.getdjywltotal(); 22 this.getdjywltotal();
23 23
24 24
25 }, 25 },
...@@ -33,16 +33,17 @@ export default { ...@@ -33,16 +33,17 @@ export default {
33 XZQDM: "", 33 XZQDM: "",
34 }; 34 };
35 let res = await work.getdjywltotal(p); 35 let res = await work.getdjywltotal(p);
36 console.log("res",res);
37 // 遍历修改数组键，作为echars图表的参数 36 // 遍历修改数组键，作为echars图表的参数
38 res.result.map((item) => { 37 res.result.map((item) => {
38
39 return ( 39 return (
40 this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal }) 40 this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
41
41 ) 42 )
42 }); 43 });
43 } catch (error) { 44 } catch (error) {
44 console.log(error); 45 console.log(error);
45 } 46 }
46 47
47 48
48 }, 49 },
...@@ -51,4 +52,5 @@ export default { ...@@ -51,4 +52,5 @@ export default {
51 </script> 52 </script>
52 53
53 <style lang="scss" scoped> 54 <style lang="scss" scoped>
55
54 </style> 56 </style>
......
...@@ -184,91 +184,91 @@ export const asyncRoutes = [ ...@@ -184,91 +184,91 @@ export const asyncRoutes = [
184 children: [ 184 children: [
185 { 185 {
186 path: 'tdsyq', 186 path: 'tdsyq',
187 component: () => import('@/views/business-info/tdsyq/index'), 187 component: () => import('@/views/bdcsj/tdsyq/index'),
188 name: 'tdsyq', 188 name: 'tdsyq',
189 meta: { title: '土地所有权' } 189 meta: { title: '土地所有权' }
190 }, 190 },
191 { 191 {
192 path: 'jsydzjdsyq', 192 path: 'jsydzjdsyq',
193 component: () => import('@/views/business-info/jsydzjdsyq/index'), 193 component: () => import('@/views/bdcsj/jsydzjdsyq/index'),
194 name: 'jsydzjdsyq', 194 name: 'jsydzjdsyq',
195 meta: { title: '建设用地、宅基地使用权' } 195 meta: { title: '建设用地、宅基地使用权' }
196 }, 196 },
197 { 197 {
198 path: 'fdcqdz', 198 path: 'fdcqdz',
199 component: () => import('@/views/business-info/fdcqdz/index'), 199 component: () => import('@/views/bdcsj/fdcqdz/index'),
200 name: 'fdcqdz', 200 name: 'fdcqdz',
201 meta: { title: '房地产权（项目内多幢房屋）' } 201 meta: { title: '房地产权（项目内多幢房屋）' }
202 }, 202 },
203 { 203 {
204 path: 'fdcqyz', 204 path: 'fdcqyz',
205 component: () => import('@/views/business-info/fdcqyz/index'), 205 component: () => import('@/views/bdcsj/fdcqyz/index'),
206 name: 'fdcqyz', 206 name: 'fdcqyz',
207 meta: { title: '房地产权（独幢、层、套、间、房屋）' } 207 meta: { title: '房地产权（独幢、层、套、间、房屋）' }
208 }, 208 },
209 { 209 {
210 path: 'fdcqqfsyq', 210 path: 'fdcqqfsyq',
211 component: () => import('@/views/business-info/fdcqqfsyq/index'), 211 component: () => import('@/views/bdcsj/fdcqqfsyq/index'),
212 name: 'fdcqqfsyq', 212 name: 'fdcqqfsyq',
213 meta: { title: '建筑物区分所有权业主共有部分' } 213 meta: { title: '建筑物区分所有权业主共有部分' }
214 }, 214 },
215 { 215 {
216 path: 'hysyq', 216 path: 'hysyq',
217 component: () => import('@/views/business-info/hysyq/index'), 217 component: () => import('@/views/bdcsj/hysyq/index'),
218 name: 'hysyq', 218 name: 'hysyq',
219 meta: { title: '海域(含无居民海岛)使用权' } 219 meta: { title: '海域(含无居民海岛)使用权' }
220 }, 220 },
221 { 221 {
222 path: 'gzwsyq', 222 path: 'gzwsyq',
223 component: () => import('@/views/business-info/gzwsyq/index'), 223 component: () => import('@/views/bdcsj/gzwsyq/index'),
224 name: 'gzwsyq', 224 name: 'gzwsyq',
225 meta: { title: '构（建）筑物所有权' } 225 meta: { title: '构（建）筑物所有权' }
226 }, 226 },
227 { 227 {
228 path: 'nydsyq', 228 path: 'nydsyq',
229 component: () => import('@/views/business-info/nydsyq/index'), 229 component: () => import('@/views/bdcsj/nydsyq/index'),
230 name: 'nydsyq', 230 name: 'nydsyq',
231 meta: { title: '农用地使用权（非林地）' } 231 meta: { title: '农用地使用权（非林地）' }
232 }, 232 },
233 { 233 {
234 path: 'lq', 234 path: 'lq',
235 component: () => import('@/views/business-info/lq/index'), 235 component: () => import('@/views/bdcsj/lq/index'),
236 name: 'lq', 236 name: 'lq',
237 meta: { title: '林权' } 237 meta: { title: '林权' }
238 }, 238 },
239 { 239 {
240 path: 'zxdj', 240 path: 'zxdj',
241 component: () => import('@/views/business-info/zxdj/index'), 241 component: () => import('@/views/bdcsj/zxdj/index'),
242 name: 'zxdj', 242 name: 'zxdj',
243 meta: { title: '注销登记' } 243 meta: { title: '注销登记' }
244 }, 244 },
245 { 245 {
246 path: 'yydj', 246 path: 'yydj',
247 component: () => import('@/views/business-info/yydj/index'), 247 component: () => import('@/views/bdcsj/yydj/index'),
248 name: 'yydj', 248 name: 'yydj',
249 meta: { title: '异议登记' } 249 meta: { title: '异议登记' }
250 }, 250 },
251 { 251 {
252 path: 'ygdj', 252 path: 'ygdj',
253 component: () => import('@/views/business-info/ygdj/index'), 253 component: () => import('@/views/bdcsj/ygdj/index'),
254 name: 'ygdj', 254 name: 'ygdj',
255 meta: { title: '预告登记' } 255 meta: { title: '预告登记' }
256 }, 256 },
257 { 257 {
258 path: 'Cfdj', 258 path: 'Cfdj',
259 component: () => import('@/views/business-info/Cfdj/index'), 259 component: () => import('@/views/bdcsj/cfdj/index'),
260 name: 'Cfdj', 260 name: 'Cfdj',
261 meta: { title: '查封登记' } 261 meta: { title: '查封登记' }
262 }, 262 },
263 { 263 {
264 path: 'dyaq', 264 path: 'dyaq',
265 component: () => import('@/views/business-info/dyaq/index'), 265 component: () => import('@/views/bdcsj/dyaq/index'),
266 name: 'dyaq', 266 name: 'dyaq',
267 meta: { title: '抵押权登记' } 267 meta: { title: '抵押权登记' }
268 }, 268 },
269 { 269 {
270 path: 'dyiq', 270 path: 'dyiq',
271 component: () => import('@/views/business-info/dyiq/index'), 271 component: () => import('@/views/bdcsj/dyiq/index'),
272 name: 'dyiq', 272 name: 'dyiq',
273 meta: { title: '地役权登记' } 273 meta: { title: '地役权登记' }
274 } 274 }
......
...@@ -283,6 +283,24 @@ table td { ...@@ -283,6 +283,24 @@ table td {
283 283
284 // 时间选择框样式 284 // 时间选择框样式
285 .el-date-picker { 285 .el-date-picker {
286 background: url("~@/image/slbg.png") no-repeat;
287 background-size: 100% 100%;
288 padding-top: 13px;
289 padding-bottom: 13px;
290 border: none;
291 margin-top: 5px !important;
292
293 table {
294 background: url("~@/image/rqjx.png") no-repeat;
295 background-size: 100% 100%;
296 padding: 8px;
297 }
298
299 table td {
300 box-sizing: border-box;
301 border-bottom: 0px solid #074487 !important;
302 }
303
286 .el-input__inner { 304 .el-input__inner {
287 background-color: #031a46; 305 background-color: #031a46;
288 } 306 }
...@@ -299,18 +317,27 @@ table td { ...@@ -299,18 +317,27 @@ table td {
299 background-color: #074487; 317 background-color: #074487;
300 } 318 }
301 319
302 background-color: #031a46; 320 .el-date-picker__header {
321 margin-bottom: 0px;
322 }
303 323
304 .el-date-picker__header-label { 324 .el-date-picker__header-label {
305 color: #A6CFD6; 325 color: #A6CFD6;
306 } 326 }
307 327
308 .el-picker-panel__content { 328 .el-picker-panel__content {
309 background-color: #074487; 329 padding-top: 0px;
330 margin-top: 0px;
310 331
311 .disabled { 332 .disabled {
312 background-color: #074487; 333 background-color: #074487;
313 334
335 div {
336 span {
337 color: rgba(172, 239, 250, .5)
338 }
339 }
340
314 } 341 }
315 } 342 }
316 343
...@@ -324,7 +351,7 @@ table td { ...@@ -324,7 +351,7 @@ table td {
324 } 351 }
325 352
326 .el-date-table td span { 353 .el-date-table td span {
327 color: #A6CFD6; 354 color: #DBFAFF
328 } 355 }
329 356
330 .el-date-table td.current:not(.disabled) span { 357 .el-date-table td.current:not(.disabled) span {
...@@ -419,7 +446,7 @@ table td { ...@@ -419,7 +446,7 @@ table td {
419 446
420 [class^="el-icon-"], 447 [class^="el-icon-"],
421 [class*=" el-icon-"] { 448 [class*=" el-icon-"] {
422 display: none; 449 // display: none;
423 } 450 }
424 451
425 .el-range-separator { 452 .el-range-separator {
......
...@@ -7,7 +7,7 @@ class data extends filter { ...@@ -7,7 +7,7 @@ class data extends filter {
7 return [ 7 return [
8 { 8 {
9 label: "行政区", 9 label: "行政区",
10 width: 80, 10 width: 80,
11 render: (h, scope) => { 11 render: (h, scope) => {
12 return ( 12 return (
13 <div> 13 <div>
...@@ -18,7 +18,7 @@ class data extends filter { ...@@ -18,7 +18,7 @@ class data extends filter {
18 }, 18 },
19 { 19 {
20 label: "权属状态", 20 label: "权属状态",
21 width: 80, 21 width: 80,
22 render: (h, scope) => { 22 render: (h, scope) => {
23 return ( 23 return (
24 <div> 24 <div>
...@@ -26,10 +26,10 @@ class data extends filter { ...@@ -26,10 +26,10 @@ class data extends filter {
26 </div> 26 </div>
27 ) 27 )
28 }, 28 },
29 }, 29 },
30 { 30 {
31 label: "权利类型", 31 label: "权利类型",
32 width: 80, 32 width: 80,
33 render: (h, scope) => { 33 render: (h, scope) => {
34 return ( 34 return (
35 <div> 35 <div>
...@@ -40,7 +40,7 @@ class data extends filter { ...@@ -40,7 +40,7 @@ class data extends filter {
40 }, 40 },
41 { 41 {
42 label: "登记类型", 42 label: "登记类型",
43 width: 80, 43 width: 80,
44 render: (h, scope) => { 44 render: (h, scope) => {
45 return ( 45 return (
46 <div> 46 <div>
...@@ -57,11 +57,12 @@ class data extends filter { ...@@ -57,11 +57,12 @@ class data extends filter {
57 { 57 {
58 label: "不动产单元号", 58 label: "不动产单元号",
59 prop: "BDCDYH", 59 prop: "BDCDYH",
60 width: 150, 60 width: 150,
61 }, 61 },
62 { 62 {
63 label: "不动产权证号", 63 label: "不动产权证号",
64 prop: "BDCQZH" 64 prop: "BDCQZH",
65 width: 150,
65 }, 66 },
66 { 67 {
67 label: "权利人", 68 label: "权利人",
...@@ -74,13 +75,13 @@ class data extends filter { ...@@ -74,13 +75,13 @@ class data extends filter {
74 { 75 {
75 label: "使用权面积", 76 label: "使用权面积",
76 prop: "SYQMJ", 77 prop: "SYQMJ",
77 width: 90, 78 width: 90,
78 }, 79 },
79 { 80 {
80 label: "坐落", 81 label: "坐落",
81 prop: "zl" 82 prop: "zl"
82 }, 83 },
83 84
84 { 85 {
85 label: "登记时间", 86 label: "登记时间",
86 width: 140, 87 width: 140,
......
...@@ -36,11 +36,13 @@ class data extends filter { ...@@ -36,11 +36,13 @@ class data extends filter {
36 }, 36 },
37 { 37 {
38 label: "不动产单元号", 38 label: "不动产单元号",
39 prop: "BDCDYH" 39 prop: "BDCDYH",
40 width: 150,
40 }, 41 },
41 { 42 {
42 label: "不动产权证号", 43 label: "不动产权证号",
43 prop: "BDCQZH" 44 prop: "BDCQZH",
45 width: 150,
44 }, 46 },
45 { 47 {
46 label: "地籍号", 48 label: "地籍号",
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 </p> 18 </p>
19 <p> 19 <p>
20 <span>成功率</span> 20 <span>成功率</span>
21 <span class="cg">{{qxcgl}}</span> 21 <span class="cg">{{ qxcgl }}</span>
22 </p> 22 </p>
23 </div> 23 </div>
24 </div> 24 </div>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 </p> 41 </p>
42 <p> 42 <p>
43 <span>成功率</span> 43 <span>成功率</span>
44 <span class="cg">{{stcgl}}</span> 44 <span class="cg">{{ stcgl }}</span>
45 </p> 45 </p>
46 </div> 46 </div>
47 </div> 47 </div>
...@@ -66,8 +66,8 @@ export default { ...@@ -66,8 +66,8 @@ export default {
66 stsuccess: "", 66 stsuccess: "",
67 qxjrl: "", 67 qxjrl: "",
68 stjrl: "", 68 stjrl: "",
69 qxcgl:"", 69 qxcgl: "",
70 stcgl:"" 70 stcgl: ""
71 }; 71 };
72 }, 72 },
73 mounted () { 73 mounted () {
...@@ -76,10 +76,10 @@ export default { ...@@ -76,10 +76,10 @@ export default {
76 components: { columnar }, 76 components: { columnar },
77 computed: { 77 computed: {
78 qxjrlList: function () { 78 qxjrlList: function () {
79 return this.qxjrl.toString().split(""); 79 return this.qxjrl && this.qxjrl.toString().split("");
80 }, 80 },
81 stjrlList: function () { 81 stjrlList: function () {
82 return this.stjrl.toString().split(""); 82 return this.stjrl && this.stjrl.toString().split("");
83 }, 83 },
84 }, 84 },
85 methods: { 85 methods: {
...@@ -92,9 +92,8 @@ export default { ...@@ -92,9 +92,8 @@ export default {
92 XZQDM: "", 92 XZQDM: "",
93 }; 93 };
94 let res = await work.getsthjqxjrtotal(p); 94 let res = await work.getsthjqxjrtotal(p);
95 console.log("res",res); 95 this.stjrl=res.result.stsum
96 this.stjrl=res.result.sum 96 this.qxjrl=res.result.qxsum
97 this.qxjrl=res.result.sum
98 this.qxerrer=Number(res.result.qxjrerrer) 97 this.qxerrer=Number(res.result.qxjrerrer)
99 this.sterrer=Number(res.result.sthjerrer) 98 this.sterrer=Number(res.result.sthjerrer)
100 if(res.result.sum=="0"){ 99 if(res.result.sum=="0"){
...@@ -105,8 +104,8 @@ export default { ...@@ -105,8 +104,8 @@ export default {
105 let stcgl=Number(res.result.sthjsuccess)/this.qxjrl*100 104 let stcgl=Number(res.result.sthjsuccess)/this.qxjrl*100
106 this.qxcgl=qxcglnum.toFixed(2)+"%"; 105 this.qxcgl=qxcglnum.toFixed(2)+"%";
107 this.stcgl=stcgl.toFixed(2)+"%"; 106 this.stcgl=stcgl.toFixed(2)+"%";
108 }
109 107
108 }
110 } catch (error) { 109 } catch (error) {
111 this.$refs.msg.messageShow(); 110 this.$refs.msg.messageShow();
112 } 111 }
......
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
107 groupId: item.recType, 107 groupId: item.recType,
108 }); 108 });
109 }); 109 });
110 this.$nextTick(() => { 110 res.length && this.$nextTick(() => {
111 // 初始化图表 111 // 初始化图表
112 this.echartInit(); 112 this.echartInit();
113 this.barChartInit(res[0].recType); 113 this.barChartInit(res[0].recType);
...@@ -209,15 +209,6 @@ export default { ...@@ -209,15 +209,6 @@ export default {
209 }); 209 });
210 //补全无数据行政区后的结果数组 210 //补全无数据行政区后的结果数组
211 let dealArr = [...this.dicData["A20"]]; 211 let dealArr = [...this.dicData["A20"]];
212 // //行政区代码过滤
213 // res.length > 0 &&
214 // res.forEach((item) => {
215 // xzqArr.push(
216 // this.dicData["A20"].filter((i) => {
217 // return i.DCODE == item.qxdm;
218 // })[0].DNAME
219 // );
220 // });
221 let myChartBar = this.$echarts.init( 212 let myChartBar = this.$echarts.init(
222 document.getElementById("myChart-bar") 213 document.getElementById("myChart-bar")
223 ); 214 );
......
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
124 }); 124 });
125 this.$nextTick(() => { 125 this.$nextTick(() => {
126 // 初始化图表 126 // 初始化图表
127 this.echartInit(); 127 this.chartData.length && this.echartInit();
128 }); 128 });
129 }, 129 },
130 // 重置 130 // 重置
...@@ -144,6 +144,7 @@ export default { ...@@ -144,6 +144,7 @@ export default {
144 color: ["#fff", "#ff6e6e", "#3f99ff", "#ffaf48"], 144 color: ["#fff", "#ff6e6e", "#3f99ff", "#ffaf48"],
145 tooltip: { 145 tooltip: {
146 trigger: "axis", 146 trigger: "axis",
147 formatter: '{b}<br/>{a0}：{c0}个<br/>{a1}：{c1}个<br/>{a2}：{c2}%',
147 axisPointer: { 148 axisPointer: {
148 type: "cross", 149 type: "cross",
149 crossStyle: { 150 crossStyle: {
...@@ -153,6 +154,7 @@ export default { ...@@ -153,6 +154,7 @@ export default {
153 }, 154 },
154 legend: { 155 legend: {
155 data: ["成功", "失败", "成功率"], 156 data: ["成功", "失败", "成功率"],
157 top: '16',
156 textStyle: { 158 textStyle: {
157 show: true, 159 show: true,
158 color: "#fff", 160 color: "#fff",
...@@ -217,12 +219,12 @@ export default { ...@@ -217,12 +219,12 @@ export default {
217 }, 219 },
218 { 220 {
219 type: "value", 221 type: "value",
220 name: "成功率/%", 222 name: "成功率",
221 nameTextStyle: { 223 nameTextStyle: {
222 color: "#fff", 224 color: "#fff",
223 fontSize: "16", 225 fontSize: "16",
224 }, 226 },
225 splitNumber:4, 227 splitNumber:2,
226 axisLabel: { 228 axisLabel: {
227 formatter: "{value} %", 229 formatter: "{value} %",
228 textStyle: { 230 textStyle: {
...@@ -238,11 +240,6 @@ export default { ...@@ -238,11 +240,6 @@ export default {
238 name: "成功", 240 name: "成功",
239 type: "bar", 241 type: "bar",
240 barMaxWidth: '60', 242 barMaxWidth: '60',
241 tooltip: {
242 valueFormatter: function (value) {
243 return value + " ml";
244 },
245 },
246 data: this.chartData.map((item) => { 243 data: this.chartData.map((item) => {
247 return item.success; 244 return item.success;
248 }), 245 }),
...@@ -251,11 +248,6 @@ export default { ...@@ -251,11 +248,6 @@ export default {
251 name: "失败", 248 name: "失败",
252 type: "bar", 249 type: "bar",
253 barMaxWidth: '60', 250 barMaxWidth: '60',
254 tooltip: {
255 valueFormatter: function (value) {
256 return value + " ml";
257 },
258 },
259 data: this.chartData.map((item) => { 251 data: this.chartData.map((item) => {
260 return item.failure; 252 return item.failure;
261 }), 253 }),
...@@ -265,11 +257,6 @@ export default { ...@@ -265,11 +257,6 @@ export default {
265 type: "line", 257 type: "line",
266 barMaxWidth: '60', 258 barMaxWidth: '60',
267 yAxisIndex: 1, 259 yAxisIndex: 1,
268 tooltip: {
269 valueFormatter: function (value) {
270 return value + "%";
271 },
272 },
273 data: this.chartData.map((item) => { 260 data: this.chartData.map((item) => {
274 return item.rate; 261 return item.rate;
275 }), 262 }),
......
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
120 this.chartData = res; 120 this.chartData = res;
121 this.$nextTick(() => { 121 this.$nextTick(() => {
122 // 初始化图表 122 // 初始化图表
123 this.echartInit(this.chartData) 123 this.chartData.length && this.echartInit(this.chartData)
124 }); 124 });
125 }, 125 },
126 // 重置 126 // 重置
......
...@@ -18,14 +18,16 @@ ...@@ -18,14 +18,16 @@
18 </el-col> 18 </el-col>
19 <el-col :span="6"> 19 <el-col :span="6">
20 <el-form-item label="汇交时间" prop="exchangeStartTime"> 20 <el-form-item label="汇交时间" prop="exchangeStartTime">
21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 21 <el-date-picker type="date" class="width100" placeholder="开始日期" clearable
22 clearable v-model="form.exchangeStartTime" value-format="yyyy-MM-dd"></el-date-picker> 22 :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
23 value-format="yyyy-MM-dd"></el-date-picker>
23 </el-form-item> 24 </el-form-item>
24 </el-col> 25 </el-col>
25 <el-col :span="6"> 26 <el-col :span="6">
26 <el-form-item label="至" prop="exchangeStartTime" label-width="35px"> 27 <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 28 <el-date-picker type="date" class="width100" placeholder="结束日期" clearable
28 clearable v-model="form.exchangeEndTime" value-format="yyyy-MM-dd"></el-date-picker> 29 :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime"
30 value-format="yyyy-MM-dd"></el-date-picker>
29 </el-form-item> 31 </el-form-item>
30 </el-col> 32 </el-col>
31 <el-col :span="6"> 33 <el-col :span="6">
......