diff --git a/src/utils/request.js b/src/utils/request.js index 917b89a..0d8e94d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -86,13 +86,13 @@ service.interceptors.response.use( }, error => { if (error.response.status == '404') { - MessageBox.alert('登录失效,请重新登录', { - confirmButtonText: '确定', - callback: action => { - sessionStorage.clear() - location.reload() - } - }) + // MessageBox.alert('登录失效,请重新登录', { + // confirmButtonText: '确定', + // callback: action => { + // sessionStorage.clear() + // location.reload() + // } + // }) // } // console.info('error:' + error.response.status) // if (error.response.status == '302') { diff --git a/src/views/map/js/mapboxCzks.js b/src/views/map/js/mapboxCzks.js index fd0cdad..81c7e0c 100644 --- a/src/views/map/js/mapboxCzks.js +++ b/src/views/map/js/mapboxCzks.js @@ -3,8 +3,8 @@ export default function loadMapBox() { redList: initMapDataRed(), orangeList: initMapDataOrange(), yellowList: initMapDataYellow(), - blueList: initMapDataBlue() - // wallList: initWallData() + blueList: initMapDataBlue(), + wallList: initWallData() } } @@ -2205,301 +2205,41 @@ function initMapDataBlue() { } /** - * 一公司外墙标注点 + * 沧州矿石外墙标注点 */ function initWallData() { const varList = [] - // 堆料场封闭区 + // 东区 let formData = {} formData['position'] = [ - { - 'x': 118.49908692664383, - 'y': 38.92674633526445, - 'z': 0 - }, - { - 'x': 118.50709463008508, - 'y': 38.93241383749963, - 'z': 0 - }, - { - 'x': 118.5109160086412, - 'y': 38.93427464015057, - 'z': 0 - }, - { - 'x': 118.51154442848754, - 'y': 38.933743670613914, - 'z': 0 - }, - { - 'x': 118.51438664627874, - 'y': 38.93573179324845, - 'z': 0 - }, - { - 'x': 118.51494111503344, - 'y': 38.93598236111987, - 'z': 0 - }, - { - 'x': 118.51496583099744, - 'y': 38.93599780059429, - 'z': 0 - }, - { - 'x': 118.51706254083413, - 'y': 38.934191788113246, - 'z': 0 - }, - { - 'x': 118.51785638013116, - 'y': 38.93474077745899, - 'z': 0 - }, - { - 'x': 118.52187271909214, - 'y': 38.93146189937477, - 'z': 0 - }, - { - 'x': 118.52067381367125, - 'y': 38.93063002399223, - 'z': 0 - }, - { - 'x': 118.52175019424513, - 'y': 38.929657218254974, - 'z': 0 - }, - { - 'x': 118.52143553143115, - 'y': 38.92942704368537, - 'z': 0 - }, - { - 'x': 118.52153293482945, - 'y': 38.92933321994022, - 'z': 0 - }, - { - 'x': 118.50751707362738, - 'y': 38.919471351829806, - 'z': 0 - }, - { - 'x': 118.50676482775175, - 'y': 38.92012242323175, - 'z': 0 - }, - { - 'x': 118.50650314876431, - 'y': 38.91993500264998, - 'z': 0 - }, - { - 'x': 118.50618003560737, - 'y': 38.92021037890844, - 'z': 0 - }, - { - 'x': 118.50528933821167, - 'y': 38.919584429812, - 'z': 0 - }, - { - 'x': 118.5052057521309, - 'y': 38.91957951693426, - 'z': 0 - }, - { - 'x': 118.50499783472156, - 'y': 38.91945732725243, - 'z': 0 - }, - { - 'x': 118.50498698552595, - 'y': 38.91945366509456, - 'z': 0 - }, - { - 'x': 118.50218679739068, - 'y': 38.92188495533001, - 'z': 0 - }, - { - 'x': 118.50354236701541, - 'y': 38.922843166531955, - 'z': 0 - }, - { - 'x': 118.50264850567008, - 'y': 38.92361310799775, - 'z': 0 - }, - { - 'x': 118.50262783433566, - 'y': 38.92366208577409, - 'z': 0 - } + { 'x': 117.92535294644314, 'y': 38.364284982261594, 'z': 0 }, + { 'x': 117.9248491434382, 'y': 38.3648413920849, 'z': 0 }, + { 'x': 117.92285911706301, 'y': 38.36396961169537, 'z': 0 }, + { 'x': 117.91697357437154, 'y': 38.3721035472611, 'z': 0 }, + { 'x': 117.90236646616391, 'y': 38.36533439173905, 'z': 0 }, + { 'x': 117.90855340915424, 'y': 38.35718494637525, 'z': 0 }, + { 'x': 117.92223545394332, 'y': 38.363410215763295, 'z': 0 }, + { 'x': 117.92261603249077, 'y': 38.36303647919584, 'z': 0 }, + { 'x': 117.92535294644314, 'y': 38.364284982261594, 'z': 0 } ] + formData['type'] = 'wall' formData['color'] = 'rgba(201,118,243,0)' formData['stretchHeight'] = 20 // 拉伸高度 formData['strokeColor'] = 'rgba(201,118,243,1)' // 边线颜色 varList.push(formData) - // 边界1 + // 西区 formData = {} - formData['position'] = [ - { - 'x': 118.49369150973368, - 'y': 38.9258611450745, - 'z': 0 - }, - { - 'x': 118.49914655488551, - 'y': 38.921178621227156, - 'z': 0 - }, - { - 'x': 118.49616873591397, - 'y': 38.91499078490529, - 'z': 0 - }, - { - 'x': 118.48818760178409, - 'y': 38.91724759252874, - 'z': 0 - }, - { - 'x': 118.48805794433629, - 'y': 38.91695612812173, - 'z': 0 - }, - { - 'x': 118.49631381282053, - 'y': 38.9144597442411, - 'z': 0 - }, - { - 'x': 118.49956701356942, - 'y': 38.92068705099419, - 'z': 0 - }, - { - 'x': 118.50265294770625, - 'y': 38.91801778339131, - 'z': 0 - }, - { - 'x': 118.50504615933207, - 'y': 38.91802090940912, - 'z': 0 - }, - { - 'x': 118.50516568018304, - 'y': 38.914749446491136, - 'z': 0 - }, - { - 'x': 118.49705735720369, - 'y': 38.91463327155724, - 'z': 0 - }, - { - 'x': 118.49709241560284, - 'y': 38.91437972045147, - 'z': 0 - }, - { - 'x': 118.50576491655738, - 'y': 38.91437032999765, - 'z': 0 - }, - { - 'x': 118.5056175178713, - 'y': 38.91611054598518, - 'z': 0 - }, - { - 'x': 118.50686024155836, - 'y': 38.91621014457138, - 'z': 0 - }, - { - 'x': 118.50666787729635, - 'y': 38.918384442186046, - 'z': 0 - }, - { - 'x': 118.52376206665534, - 'y': 38.93036024915689, - 'z': 0 - }, - { - 'x': 118.51566995886793, - 'y': 38.9367562504355, - 'z': 0 - }, - { - 'x': 118.49408380459265, - 'y': 38.92605596823008, - 'z': 0 - } - ] + formData['position'] = [{ 'x': 117.85243532889035, 'y': 38.33917876665945, 'z': 0 }, + { 'x': 117.86003819810276, 'y': 38.332304146559, 'z': 0 }, { 'x': 117.87826028277252, 'y': 38.34439147684976, 'z': 0 }, + { 'x': 117.87748121539931, 'y': 38.34506254355439, 'z': 0 }, { 'x': 117.87779296951499, 'y': 38.345239954268, 'z': 0 }, + { 'x': 117.87527303683862, 'y': 38.34745071393718, 'z': 0 }, { 'x': 117.87944330422428, 'y': 38.349420320982766, 'z': 0 }, + { 'x': 117.8769027964796, 'y': 38.35277636593639, 'z': 0 }, { 'x': 117.87206291446817, 'y': 38.350448063776966, 'z': 0 }, + { 'x': 117.87099326709574, 'y': 38.35134213583073, 'z': 0 }, { 'x': 117.85243532889035, 'y': 38.33917876665945, 'z': 0 }] + formData['type'] = 'wall' formData['color'] = 'rgba(201,118,243,0)' formData['stretchHeight'] = 20 // 拉伸高度 formData['strokeColor'] = 'rgba(201,118,243,1)' // 边线颜色 varList.push(formData) - - // 边界2 - formData = {} - formData['position'] = [ - { - 'x': 118.4935643706221, - 'y': 38.92593480442542, - 'z': 0 - }, - { - 'x': 118.4812265932153, - 'y': 38.93684773053772, - 'z': 0 - }, - { - 'x': 118.4871945506674, - 'y': 38.940972194113904, - 'z': 0 - }, - { - 'x': 118.48893358084861, - 'y': 38.939479140514266, - 'z': 0 - }, - { - 'x': 118.48816633614166, - 'y': 38.938893723590894, - 'z': 0 - }, - { - 'x': 118.49150740330485, - 'y': 38.93591938241312, - 'z': 0 - }, - { - 'x': 118.48702091366398, - 'y': 38.93292610249116, - 'z': 0 - }, - { - 'x': 118.49446578606863, - 'y': 38.92660530871618, - 'z': 0 - } - ] - formData['color'] = 'rgba(201,118,243,0)' - formData['stretchHeight'] = 20 // 拉伸高度 - formData['strokeColor'] = 'rgba(201,118,243,1)' // 边线颜色 - varList.push(formData) - return varList }