Commit 96a9eb07bf39911860b2a7781be8ef44404d95f0

Authored by 2c2c2c
1 parent f4c1965a

投放点区域,改为动态获取

trash-ui/src/api/dict.js
1 import requestRemote from '@/utils/requestRemote' 1 import requestRemote from '@/utils/requestRemote'
2 - 2 +
3 export function getTruckList(params) { 3 export function getTruckList(params) {
4 return requestRemote({ 4 return requestRemote({
5 url: ' /api/gpsservice/cs/basevehicle/simplelist', 5 url: ' /api/gpsservice/cs/basevehicle/simplelist',
6 - method: 'get', 6 + method: 'get',
7 params:params 7 params:params
8 }); 8 });
9 -}  
10 -//license/ 先留一下免得又改 9 +}
  10 +//license/ 先留一下免得又改
11 export function constructionLicenseById(id) { 11 export function constructionLicenseById(id) {
12 return requestRemote({ 12 return requestRemote({
13 url: '/api/siteservice/cs/constructionsites/'+id, 13 url: '/api/siteservice/cs/constructionsites/'+id,
14 method: 'get', 14 method: 'get',
15 }); 15 });
16 } 16 }
17 - 17 +
18 18
19 export function constructionById(id) { 19 export function constructionById(id) {
20 return requestRemote({ 20 return requestRemote({
@@ -58,23 +58,23 @@ export function earthsitesList(data) { @@ -58,23 +58,23 @@ export function earthsitesList(data) {
58 method: 'post', 58 method: 'post',
59 data: data 59 data: data
60 }); 60 });
61 -}  
62 - 61 +}
  62 +
63 export function constructionsitesLedgerList(data) { 63 export function constructionsitesLedgerList(data) {
64 return requestRemote({ 64 return requestRemote({
65 url: '/api/siteservice/cs/constructionsites/ledger/list', 65 url: '/api/siteservice/cs/constructionsites/ledger/list',
66 method: 'post', 66 method: 'post',
67 data: data 67 data: data
68 }); 68 });
69 -}  
70 - 69 +}
  70 +
71 export function earthsitesLedgerList(data) { 71 export function earthsitesLedgerList(data) {
72 return requestRemote({ 72 return requestRemote({
73 url: '/api/siteservice/cs/earthsites/ledger/list', 73 url: '/api/siteservice/cs/earthsites/ledger/list',
74 method: 'post', 74 method: 'post',
75 data: data 75 data: data
76 }); 76 });
77 -} 77 +}
78 78
79 export function updateEarthsites(data) { 79 export function updateEarthsites(data) {
80 return requestRemote({ 80 return requestRemote({
@@ -83,7 +83,7 @@ export function updateEarthsites(data) { @@ -83,7 +83,7 @@ export function updateEarthsites(data) {
83 data: data 83 data: data
84 }); 84 });
85 } 85 }
86 - 86 +
87 87
88 export function companyList(data) { 88 export function companyList(data) {
89 return requestRemote({ 89 return requestRemote({
@@ -142,14 +142,14 @@ export function getConstructionTruck(id) { @@ -142,14 +142,14 @@ export function getConstructionTruck(id) {
142 url: '/api/siteservice/cs/unitetransport/bysite/' + id, 142 url: '/api/siteservice/cs/unitetransport/bysite/' + id,
143 method: 'get', 143 method: 'get',
144 }); 144 });
145 -} 145 +}
146 146
147 export function getTruckInfo(id) { 147 export function getTruckInfo(id) {
148 return requestRemote({ 148 return requestRemote({
149 url: '/api/gpsservice/cs/basevehicle/' + id, 149 url: '/api/gpsservice/cs/basevehicle/' + id,
150 method: 'get', 150 method: 'get',
151 }); 151 });
152 -} 152 +}
153 153
154 export function getCompanyInfo(id) { 154 export function getCompanyInfo(id) {
155 return requestRemote({ 155 return requestRemote({
@@ -179,15 +179,15 @@ export function getUsers(data){ @@ -179,15 +179,15 @@ export function getUsers(data){
179 method: 'post', 179 method: 'post',
180 data:data 180 data:data
181 }) 181 })
182 -} 182 +}
183 183
184 export function getAuth() { 184 export function getAuth() {
185 return requestRemote({ 185 return requestRemote({
186 url: '/api/gpsservice/cs/authority', 186 url: '/api/gpsservice/cs/authority',
187 method: 'get', 187 method: 'get',
188 }); 188 });
189 -}  
190 - 189 +}
  190 +
191 191
192 192
193 export function getDict(params) { 193 export function getDict(params) {
@@ -205,3 +205,13 @@ export function getSupervision(params) { @@ -205,3 +205,13 @@ export function getSupervision(params) {
205 params: params 205 params: params
206 }); 206 });
207 } 207 }
  208 +
  209 +/**
  210 + * 投放点获取区域数据
  211 + */
  212 +export function getAreaList() {
  213 + return requestRemote({
  214 + url: '/api/siteservice/v1/sites/tree/auth?type=4',
  215 + method: 'get'
  216 + });
  217 +}
trash-ui/src/views/unit/dropPointInfo/index.vue
@@ -302,7 +302,7 @@ import { @@ -302,7 +302,7 @@ import {
302 updateDropPointInfo, 302 updateDropPointInfo,
303 exportDropPointInfo 303 exportDropPointInfo
304 } from "@/api/unit/dropPointInfo"; 304 } from "@/api/unit/dropPointInfo";
305 -import {getAreaList} from "@/api/casefile/remoteServer"; 305 +import {getAreaList} from "@/api/dict"
306 import AMapLoader from "@amap/amap-jsapi-loader"; 306 import AMapLoader from "@amap/amap-jsapi-loader";
307 import Treeselect from "@riophae/vue-treeselect"; 307 import Treeselect from "@riophae/vue-treeselect";
308 308
@@ -401,159 +401,7 @@ export default { @@ -401,159 +401,7 @@ export default {
401 {required: true, message: "请点击坐标点按钮选择坐标点", trigger: "blur"} 401 {required: true, message: "请点击坐标点按钮选择坐标点", trigger: "blur"}
402 ] 402 ]
403 }, 403 },
404 - areas: [  
405 - {  
406 - name: "芙蓉区",  
407 - streets: [  
408 - {code: "FR01", name: "湘湖"},  
409 - {code: "FR02", name: "定王台街道"},  
410 - {code: "FR03", name: "韭菜园街道"},  
411 - {code: "FR04", name: "文艺路街道"},  
412 - {code: "FR05", name: "朝阳街道"},  
413 - {code: "FR06", name: "五里牌街道"},  
414 - {code: "FR07", name: "马王堆街道"},  
415 - {code: "FR08", name: "荷花园街道"},  
416 - {code: "FR09", name: "东屯渡街道"},  
417 - {code: "FR10", name: "火星街道"},  
418 - {code: "FR11", name: "东岸街道"},  
419 - {code: "FR12", name: "马坡岭街道"},  
420 - {code: "FR13", name: "东湖街道"}  
421 - ]  
422 - },  
423 - {  
424 - name: "天心区",  
425 - streets: [  
426 - {code: "TX01", name: "坡子街街道"},  
427 - {code: "TX02", name: "城南路街道"},  
428 - {code: "TX03", name: "裕南街街道"},  
429 - {code: "TX04", name: "赤岭路街道"},  
430 - {code: "TX05", name: "金盆岭街道"},  
431 - {code: "TX06", name: "新开铺街道"},  
432 - {code: "TX07", name: "文源街道"},  
433 - {code: "TX08", name: "桂花坪街道"},  
434 - {code: "TX09", name: "青园街道"},  
435 - {code: "TX10", name: "黑石铺街道"},  
436 - {code: "TX11", name: "大托铺街道"},  
437 - {code: "TX12", name: "先锋街道"},  
438 - {code: "TX13", name: "南托街道"},  
439 - {code: "TX14", name: "暮云街道"}  
440 - ]  
441 - },  
442 - {  
443 - name: "开福区",  
444 - streets: [  
445 - {code: "KF01", name: "望麓园街道"},  
446 - {code: "KF02", name: "清水塘街道"},  
447 - {code: "KF03", name: "湘雅路街道"},  
448 - {code: "KF04", name: "伍家岭街道"},  
449 - {code: "KF05", name: "新河街道"},  
450 - {code: "KF06", name: "东风路街道"},  
451 - {code: "KF07", name: "通泰街街道"},  
452 - {code: "KF08", name: "四方坪街道"},  
453 - {code: "KF09", name: "芙蓉北路街道"},  
454 - {code: "KF10", name: "洪山街道"},  
455 - {code: "KF11", name: "月湖街道"},  
456 - {code: "KF12", name: "浏阳河街道"},  
457 - {code: "KF13", name: "秀峰街道"},  
458 - {code: "KF14", name: "捞刀河街道"},  
459 - {code: "KF15", name: "沙坪街道"},  
460 - {code: "KF16", name: "青竹湖街道"}  
461 - ]  
462 - },  
463 - {  
464 - name: "雨花区",  
465 - streets: [  
466 - {code: "YH01", name: "雨花亭街道"},  
467 - {code: "YH02", name: "高桥街道"},  
468 - {code: "YH03", name: "左家塘街道"},  
469 - {code: "YH04", name: "侯家塘街道"},  
470 - {code: "YH05", name: "砂子塘街道"},  
471 - {code: "YH06", name: "东塘街道"},  
472 - {code: "YH07", name: "圭塘街道"},  
473 - {code: "YH08", name: "黎托街道"},  
474 - {code: "YH09", name: "洞井街道"},  
475 - {code: "YH10", name: "井湾子街道"},  
476 - {code: "YH11", name: "东山街道"},  
477 - {code: "YH12", name: "同升街道"},  
478 - {code: "YH13", name: "跳马镇"}  
479 - ]  
480 - },  
481 - {  
482 - name: "长沙县",  
483 - streets: [  
484 - {code: "CS01", name: "星沙街道"},  
485 - {code: "CS02", name: "湘龙街道"},  
486 - {code: "CS03", name: "泉塘街道"},  
487 - {code: "CS04", name: "榔梨街道"}  
488 - ]  
489 - },  
490 - {  
491 - name: "望城",  
492 - streets: [  
493 - {code: "WC01", name: "丁字湾街道"},  
494 - {code: "WC02", name: "书堂山街道"},  
495 - {code: "WC03", name: "高塘岭街道"},  
496 - {code: "WC04", name: "喻家坡街道"},  
497 - {code: "WC05", name: "白沙洲街道"},  
498 - {code: "WC06", name: "大泽湖街道"},  
499 - {code: "WC07", name: "月亮岛街道"},  
500 - {code: "WC08", name: "廖家坪街道"}  
501 - ]  
502 - },  
503 - {  
504 - name: "浏阳",  
505 - streets: [  
506 - {code: "LY01", name: "淮川街道"},  
507 - {code: "LY02", name: "集里街道"},  
508 - {code: "LY03", name: "荷花街道"},  
509 - {code: "LY04", name: "关口街道"}  
510 - ]  
511 - },  
512 - {  
513 - name: "宁乡",  
514 - streets: [  
515 - {code: "NX01", name: "玉潭街道"},  
516 - {code: "NX02", name: "城郊街道"},  
517 - {code: "NX03", name: "历经铺街道"},  
518 - {code: "NX04", name: "白马桥街道"},  
519 - {code: "NX05", name: "煤炭坝镇"},  
520 - {code: "NX06", name: "双凫铺镇"},  
521 - {code: "NX07", name: "双江口镇"},  
522 - {code: "NX08", name: "回龙铺镇"},  
523 - {code: "NX09", name: "夏铎铺镇"},  
524 - {code: "NX10", name: "历经铺镇"}  
525 - ]  
526 - },  
527 - {  
528 - name: "湘江新区",  
529 - streets: [  
530 - {code: "XJ01", name: "岳麓街道"},  
531 - {code: "XJ02", name: "桔子洲街道"},  
532 - {code: "XJ03", name: "望月湖街道"},  
533 - {code: "XJ04", name: "银盆岭街道"},  
534 - {code: "XJ05", name: "观沙岭街道"},  
535 - {code: "XJ06", name: "西湖街道"},  
536 - {code: "XJ07", name: "望城坡街道"},  
537 - {code: "XJ08", name: "望岳街道"},  
538 - {code: "XJ09", name: "咸嘉湖街道"},  
539 - {code: "XJ10", name: "梅溪湖街道"},  
540 - {code: "XJ11", name: "天顶街道"},  
541 - {code: "XJ12", name: "坪塘街道"},  
542 - {code: "XJ13", name: "洋湖街道"},  
543 - {code: "XJ14", name: "含浦街道"},  
544 - {code: "XJ15", name: "学士街道"},  
545 - {code: "XJ16", name: "莲花镇"},  
546 - {code: "XJ17", name: "雨敞坪镇"},  
547 - {code: "XJ18", name: "麓谷街道"},  
548 - {code: "XJ19", name: "东方红街道"},  
549 - {code: "XJ20", name: "白马街道"},  
550 - {code: "XJ21", name: "雷锋街道"},  
551 - {code: "XJ22", name: "黄金园街道"},  
552 - {code: "XJ23", name: "金山桥街道"},  
553 - {code: "XJ24", name: "白箬铺镇"}  
554 - ]  
555 - }  
556 - ], 404 + areas: [],
557 streets:[], 405 streets:[],
558 // 地图 406 // 地图
559 map: null, 407 map: null,
@@ -565,6 +413,26 @@ export default { @@ -565,6 +413,26 @@ export default {
565 }; 413 };
566 }, 414 },
567 created() { 415 created() {
  416 + getAreaList().then(response => {
  417 + if(response==null || response.length===0){
  418 + this.$message.error("获取区域列表失败");
  419 + return;
  420 + }
  421 + const data = response;
  422 + for (let dataKey in data) {
  423 + if(data[dataKey].level === '3'){
  424 + this.areas.push({name:data[dataKey].name,id:data[dataKey].id, streets:[]})
  425 + }
  426 + }
  427 + for(let dataKey in data){
  428 + for(let areas1Key in this.areas){
  429 + if(data[dataKey].pid === this.areas[areas1Key].id){
  430 + this.areas[areas1Key].streets.push({code:data[dataKey].id, name:data[dataKey].name})
  431 + }
  432 + }
  433 + }
  434 + });
  435 +
568 this.getList(); 436 this.getList();
569 // this.initAMap(); 437 // this.initAMap();
570 }, 438 },