weizhibiaoji
This commit is contained in:
parent
92f92f7ab2
commit
2d3b9fa8fe
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -1 +1 @@
|
|||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":595.704536459409,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[356.142938159639,312.765509844758,9.54757454013452,236.535289082211,0,0,0,297.852268229704,0,0,0,9.59968921868131]},"children":[{"boundingVolume":{"box":[303.364073609289,298.613287622177,9.56152811069931,183.752693394624,0,0,0,282.546789621777,0,0,0,9.56152830104383]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[356.285654105027,298.882404411347,4.00000276585068,236.363624291453,0,0,0,282.277672832606,0,0,0,4.0000029561952]},"content":{"uri":"NoLod_1.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":595.704536459409,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":565.122271853033,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[389.897458486375,346.064307586988,9.54858029820025,236.536965355626,0,0,0,282.561135926517,0,0,0,9.60397441778332]},"children":[{"boundingVolume":{"box":[337.117622375488,346.053848266602,9.56152819850549,183.75267791748,0,0,0,282.546798706055,0,0,0,9.56152821323765]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[390.039215087891,346.3229637146,5.1301535964012,236.363616943359,0,0,0,282.277683258057,0,0,0,5.13015371561051]},"content":{"uri":"NoLod_1.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":565.122271853033,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"3F2","sphere":[-2177990.55159353,4388520.82482806,4070165.95084931,98.2805817423099],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F2","sphere":[-2177990.55159353,4388520.82482806,4070165.95084931,98.2805817423099],"type":"node"},{"children":[{"id":"76dc611d6ebaafc66cc0879c71b5db5c","name":"5F2","sphere":[-2178018.19592338,4388493.52243597,4070183.47604041,52.658680827538],"type":"element"}],"id":"812b4ba287f5ee0bc9d43bbf5bbe87fb","name":"5F2","sphere":[-2178018.19592338,4388493.52243597,4070183.47604041,52.658680827538],"type":"node"},{"children":[{"id":"979d472a84804b9f647bc185a877a8b5","name":"6F2","sphere":[-2178092.31431459,4388463.01064338,4070173.8281086,54.0880590883472],"type":"element"}],"id":"045117b0e0a11a242b9765e79cbf113f","name":"6F2","sphere":[-2178092.31431459,4388463.01064338,4070173.8281086,54.0880590883472],"type":"node"},{"children":[{"id":"ef0d3930a7b6c95bd2b32ed45989c61f","name":"9F2","sphere":[-2178088.64837065,4388386.62817351,4070257.58810462,102.996425270702],"type":"element"}],"id":"f7664060cc52bc6f3d620bcedc94a4b6","name":"9F2","sphere":[-2178088.64837065,4388386.62817351,4070257.58810462,102.996425270702],"type":"node"},{"children":[{"id":"4f6ffe13a5d75b2d6a3923922b3922e5","name":"19F2","sphere":[-2177939.26175537,4388461.63550987,4070257.03559499,85.0903285056918],"type":"element"}],"id":"0bb4aec1710521c12ee76289d9440817","name":"19F2","sphere":[-2177939.26175537,4388461.63550987,4070257.03559499,85.0903285056918],"type":"node"},{"children":[{"id":"51d92be1c60d1db1d2e5e7a07da55b26","name":"20F2","sphere":[-2177923.58514316,4388508.23938818,4070215.02245354,92.5554292477211],"type":"element"}],"id":"75fc093c0ee742f6dddaa13fff98f104","name":"20F2","sphere":[-2177923.58514316,4388508.23938818,4070215.02245354,92.5554292477211],"type":"node"},{"children":[{"id":"7dcd340d84f762eba80aa538b0c527f7","name":"22F2","sphere":[-2177900.34989023,4388486.5580097,4070249.85358043,37.9972505284336],"type":"element"}],"id":"e2230b853516e7b05d79744fbd4c9c13","name":"22F2","sphere":[-2177900.34989023,4388486.5580097,4070249.85358043,37.9972505284336],"type":"node"},{"children":[{"id":"cdc0d6e63aa8e41c89689f54970bb35f","name":"27F2","sphere":[-2177926.48705943,4388399.42351375,4070330.84871084,58.1654081661628],"type":"element"}],"id":"605ff764c617d3cd28dbbdd72be8f9a2","name":"27F2","sphere":[-2177926.48705943,4388399.42351375,4070330.84871084,58.1654081661628],"type":"node"},{"children":[{"id":"4a47d2983c8bd392b120b627e0e1cab4","name":"35F2","sphere":[-2177814.95696349,4388428.91232476,4070356.90359603,18.0628195832909],"type":"element"}],"id":"2dea61eed4bceec564a00115c4d21334","name":"35F2","sphere":[-2177814.95696349,4388428.91232476,4070356.90359603,18.0628195832909],"type":"node"},{"children":[{"id":"4b04a686b0ad13dce35fa99fa4161c65","name":"36F2","sphere":[-2177865.38965711,4388396.49310009,4070365.87514297,54.326219108471],"type":"element"}],"id":"a1d33d0dfec820b41b54430b50e96b5c","name":"36F2","sphere":[-2177865.38965711,4388396.49310009,4070365.87514297,54.326219108471],"type":"node"},{"children":[{"id":"5ec91aac30eae62f4140325d09b9afd0","name":"37F2","sphere":[-2177871.65091746,4388390.63262586,4070367.77224487,16.9908906881913],"type":"element"}],"id":"ce78d1da254c0843eb23951ae077ff5f","name":"37F2","sphere":[-2177871.65091746,4388390.63262586,4070367.77224487,16.9908906881913],"type":"node"},{"children":[{"id":"b55ec28c52d5f6205684a473a2193564","name":"46F2","sphere":[-2177793.83587211,4388409.21686131,4070391.36816342,85.9242024479644],"type":"element"}],"id":"a4300b002bcfb71f291dac175d52df94","name":"46F2","sphere":[-2177793.83587211,4388409.21686131,4070391.36816342,85.9242024479644],"type":"node"}]}
|
||||
{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"3F2","sphere":[-2178007.92233384,4388479.89502722,4070200.55765845,83.352169741292],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F2","sphere":[-2178007.92233384,4388479.89502722,4070200.55765845,83.352169741292],"type":"node"},{"children":[{"id":"903ce9225fca3e988c2af215d4e544d3","name":"5F2","sphere":[-2178034.90330191,4388451.25591037,4070219.8671112,52.6618510077445],"type":"element"}],"id":"2723d092b63885e0d7c260cc007e8b9d","name":"5F2","sphere":[-2178034.90330191,4388451.25591037,4070219.8671112,52.6618510077445],"type":"node"},{"children":[{"id":"e4a6222cdb5b34375400904f03d8e6a5","name":"6F2","sphere":[-2178109.02174374,4388420.74410889,4070210.21917055,54.0921763180839],"type":"element"}],"id":"091d584fced301b442654dd8c23b3fc9","name":"6F2","sphere":[-2178109.02174374,4388420.74410889,4070210.21917055,54.0921763180839],"type":"node"},{"children":[{"id":"58238e9ae2dd305d79c2ebc8c1883422","name":"9F2","sphere":[-2178105.35585494,4388344.36168349,4070293.97915433,103.005372266938],"type":"element"}],"id":"a8c88a0055f636e4a163a5e3d16adab7","name":"9F2","sphere":[-2178105.35585494,4388344.36168349,4070293.97915433,103.005372266938],"type":"node"},{"children":[{"id":"eed5af6add95a9a6f1252739b1ad8c24","name":"18F2","sphere":[-2177975.6227979,4388393.61238092,4070319.87243831,99.7313442223141],"type":"element"}],"id":"bbcbff5c1f1ded46c25d28119a85c6c2","name":"18F2","sphere":[-2177975.6227979,4388393.61238092,4070319.87243831,99.7313442223141],"type":"node"},{"children":[{"id":"4e4b5fbbbb602b6d35bea8460aa8f8e5","name":"19F2","sphere":[-2177955.96927645,4388419.36894494,4070293.4266701,85.0971145703085],"type":"element"}],"id":"f4be00279ee2e0a53eafdaa94a151e2c","name":"19F2","sphere":[-2177955.96927645,4388419.36894494,4070293.4266701,85.0971145703085],"type":"node"},{"children":[{"id":"26408ffa703a72e8ac0117e74ad46f33","name":"20F2","sphere":[-2177933.90910301,4388469.14043082,4070251.41352803,80.6009894635723],"type":"element"}],"id":"3871bd64012152bfb53fdf04b401193f","name":"20F2","sphere":[-2177933.90910301,4388469.14043082,4070251.41352803,80.6009894635723],"type":"node"},{"children":[{"id":"b137fdd1f79d56c7edf3365fea7520f2","name":"22F2","sphere":[-2177917.05730311,4388444.29144914,4070286.24466442,37.9993622872519],"type":"element"}],"id":"e7f8a7fb0b77bcb3b283af5be021448f","name":"22F2","sphere":[-2177917.05730311,4388444.29144914,4070286.24466442,37.9993622872519],"type":"node"},{"children":[{"id":"02a32ad2669e6fe298e607fe7cc0e1a0","name":"27F2","sphere":[-2177943.19448482,4388357.1569867,4070367.23976995,58.170187417797],"type":"element"}],"id":"6e7b33fdea3adc80ebd648fffb665bb8","name":"27F2","sphere":[-2177943.19448482,4388357.1569867,4070367.23976995,58.170187417797],"type":"node"},{"children":[{"id":"92262bf907af914b95a0fc33c3f33bf6","name":"35F2","sphere":[-2177831.66433872,4388386.64577077,4070393.29468541,18.0637092343881],"type":"element"}],"id":"621461af90cadfdaf0e8d4cc25129f91","name":"35F2","sphere":[-2177831.66433872,4388386.64577077,4070393.29468541,18.0637092343881],"type":"node"},{"children":[{"id":"a34bacf839b923770b2c360eefa26748","name":"36F2","sphere":[-2177882.09710314,4388354.22654061,4070402.26621945,54.3301495968844],"type":"element"}],"id":"b8c37e33defde51cf91e1e03e51657da","name":"36F2","sphere":[-2177882.09710314,4388354.22654061,4070402.26621945,54.3301495968844],"type":"node"},{"children":[{"id":"ffeed84c7cb1ae7bf4ec4bd78275bb98","name":"37F2","sphere":[-2177888.35831236,4388348.366094,4070404.16329967,16.9920151913468],"type":"element"}],"id":"6a2feef8ed6a9fe76d6b3f30f02150b4","name":"37F2","sphere":[-2177888.35831236,4388348.366094,4070404.16329967,16.9920151913468],"type":"node"},{"children":[{"id":"b24d516bb65a5a58079f0f3526c87c57","name":"46F2","sphere":[-2177810.54320935,4388366.95017697,4070427.75932787,85.9274108948825],"type":"element"}],"id":"2b6d65b9a9445c4271ab9076ead5605a","name":"46F2","sphere":[-2177810.54320935,4388366.95017697,4070427.75932787,85.9274108948825],"type":"node"},{"children":[{"id":"50905d7b2216bfeccb5b41016357176b","name":"48F2","sphere":[-2177897.68587871,4388386.4812781,4070372.10657321,71.5069018864376],"type":"element"}],"id":"da11e8cd1811acb79ccf0fd62cd58f86","name":"48F2","sphere":[-2177897.68587871,4388386.4812781,4070372.10657321,71.5069018864376],"type":"node"}]}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":343.400276097469,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[324.029839524999,278.062370271422,3.87435563933104,163.097446464468,0,0,0,171.700138048735,0,0,0,3.90175877697766]},"children":[{"boundingVolume":{"box":[324.025030627047,281.278499051924,3.88339662551878,163.091736376866,0,0,0,168.470487220405,0,0,0,3.88339710235596]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":343.400276097469,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":336.964543135371,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[357.784469548264,328.724147001049,10.247156701982,163.099004372605,0,0,0,168.482271567686,0,0,0,10.2785572530702]},"children":[{"boundingVolume":{"box":[357.77855682373,328.719047546387,10.2551507949829,163.091743469238,0,0,0,168.470497131348,0,0,0,10.2551507949829]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":336.964543135371,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"3F3","sphere":[-2178004.4480921,4388509.48223744,4070170.75284379,37.8158730254857],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F3","sphere":[-2178004.4480921,4388509.48223744,4070170.75284379,37.8158730254857],"type":"node"},{"children":[{"id":"3def184ad8f4755ff269862ea77393dd","name":"5F3","sphere":[-2178017.55118733,4388492.22313684,4070182.26295788,49.1270677174316],"type":"element"}],"id":"92cc227532d17e56e07902b254dfad10","name":"5F3","sphere":[-2178017.55118733,4388492.22313684,4070182.26295788,49.1270677174316],"type":"node"},{"children":[{"id":"6f3ef77ac0e3619e98159e9b6febf557","name":"9F3","sphere":[-2178091.13483557,4388390.62830607,4070260.90989059,115.231797431001],"type":"element"}],"id":"96da2f590cd7246bbde0051047b0d6f7","name":"9F3","sphere":[-2178091.13483557,4388390.62830607,4070260.90989059,115.231797431001],"type":"node"},{"children":[{"id":"8e98d81f8217304975ccb23337bb5761","name":"19F3","sphere":[-2177939.2532313,4388461.6183312,4070257.01955675,85.0439865708208],"type":"element"}],"id":"d947bf06a885db0d477d707121934ff8","name":"19F3","sphere":[-2177939.2532313,4388461.6183312,4070257.01955675,85.0439865708208],"type":"node"},{"children":[{"id":"a01a0380ca3c61428c26a231f0e49a09","name":"27F3","sphere":[-2177926.4870592,4388399.4235148,4070330.84871244,58.1654150709507],"type":"element"}],"id":"fb7b9ffa5462084c5f4e7e85a093e6d7","name":"27F3","sphere":[-2177926.4870592,4388399.4235148,4070330.84871244,58.1654150709507],"type":"node"},{"children":[{"id":"26337353b7962f533d78c762373b3318","name":"36F3","sphere":[-2177865.34703531,4388396.40720704,4070365.79494946,54.0936575017199],"type":"element"}],"id":"fccb60fb512d13df5083790d64c4d5dd","name":"36F3","sphere":[-2177865.34703531,4388396.40720704,4070365.79494946,54.0936575017199],"type":"node"}]}
|
||||
{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"3F3","sphere":[-2178021.15550169,4388467.21569759,4070207.14390516,37.8184137106865],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F3","sphere":[-2178021.15550169,4388467.21569759,4070207.14390516,37.8184137106865],"type":"node"},{"children":[{"id":"1385974ed5904a438616ff7bdb3f7439","name":"5F3","sphere":[-2178034.25856506,4388449.95661114,4070218.6540292,49.1301752095281],"type":"element"}],"id":"f0935e4cd5920aa6c7c996a5ee53a70f","name":"5F3","sphere":[-2178034.25856506,4388449.95661114,4070218.6540292,49.1301752095281],"type":"node"},{"children":[{"id":"555d6702c950ecb729a966504af0a635","name":"9F3","sphere":[-2178107.73155061,4388348.13851609,4070297.59853787,114.548347557304],"type":"element"}],"id":"eae27d77ca20db309e056e3d2dcd7d69","name":"9F3","sphere":[-2178107.73155061,4388348.13851609,4070297.59853787,114.548347557304],"type":"node"},{"children":[{"id":"9de6d14fff9806d4bcd1ef555be766cd","name":"19F3","sphere":[-2177955.96075219,4388419.35176666,4070293.41063165,85.0507730366142],"type":"element"}],"id":"3fe94a002317b5f9259f82690aeea4cd","name":"19F3","sphere":[-2177955.96075219,4388419.35176666,4070293.41063165,85.0507730366142],"type":"node"},{"children":[{"id":"9a96876e2f8f3dc4f3cf45f02c61c0c1","name":"27F3","sphere":[-2177943.19448506,4388357.1569872,4070367.23977041,58.1701896369813],"type":"element"}],"id":"0deb1c54814305ca9ad266f53bc82511","name":"27F3","sphere":[-2177943.19448506,4388357.1569872,4070367.23977041,58.1701896369813],"type":"node"},{"children":[{"id":"16c222aa19898e5058938167c8ab6c57","name":"36F3","sphere":[-2177882.05448134,4388354.14064757,4070402.18602594,54.0975847510832],"type":"element"}],"id":"2d6cc4b2d139a53512fb8cbb3086ae2e","name":"36F3","sphere":[-2177882.05448134,4388354.14064757,4070402.18602594,54.0975847510832],"type":"node"},{"children":[{"id":"6a10bbd480e4c5573d8f3af73ae0454b","name":"48F3","sphere":[-2177897.67351761,4388386.48740006,4070372.1065843,71.4845002273829],"type":"element"}],"id":"b2f627fff19fda463cb386442eac2b3d","name":"48F3","sphere":[-2177897.67351761,4388386.48740006,4070372.1065843,71.4845002273829],"type":"node"}]}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":278.693183648866,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[363.832392141339,269.281378764892,7.72546847350895,124.19165375887,0,0,0,139.346591824433,0,0,0,7.74768337141722]},"children":[{"boundingVolume":{"box":[363.827812569862,269.27685471419,7.72822928428646,124.186660797842,0,0,0,139.338564277459,0,0,0,7.72822928428651]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":278.693183648866,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":278.695851911791,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[397.069762842497,316.722444287501,10.2484747692943,124.710268375929,0,0,0,139.347925955895,0,0,0,10.2739412290975]},"children":[{"boundingVolume":{"box":[397.065536499023,316.717399597168,10.2551493644714,124.70246887207,0,0,0,139.338569641113,0,0,0,10.2551503181458]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":278.695851911791,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"3F4","sphere":[-2178004.43956859,4388509.46506047,4070170.73680665,37.7691703621565],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F4","sphere":[-2178004.43956859,4388509.46506047,4070170.73680665,37.7691703621565],"type":"node"},{"children":[{"id":"3def184ad8f4755ff269862ea77393dd","name":"5F4","sphere":[-2178017.58412598,4388492.28951423,4070182.32492992,49.3065889758152],"type":"element"}],"id":"92cc227532d17e56e07902b254dfad10","name":"5F4","sphere":[-2178017.58412598,4388492.28951423,4070182.32492992,49.3065889758152],"type":"node"},{"children":[{"id":"6f3ef77ac0e3619e98159e9b6febf557","name":"9F4","sphere":[-2178087.99756234,4388390.28156348,4070257.99677957,118.076953969758],"type":"element"}],"id":"96da2f590cd7246bbde0051047b0d6f7","name":"9F4","sphere":[-2178087.99756234,4388390.28156348,4070257.99677957,118.076953969758],"type":"node"},{"children":[{"id":"8e98d81f8217304975ccb23337bb5761","name":"36F4","sphere":[-2177866.50562306,4388396.58262258,4070365.06925232,57.571597709858],"type":"element"}],"id":"d947bf06a885db0d477d707121934ff8","name":"36F4","sphere":[-2177866.50562306,4388396.58262258,4070365.06925232,57.571597709858],"type":"node"}]}
|
||||
{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"3F4","sphere":[-2178021.14697818,4388467.19852062,4070207.12786802,37.7717104975045],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F4","sphere":[-2178021.14697818,4388467.19852062,4070207.12786802,37.7717104975045],"type":"node"},{"children":[{"id":"1385974ed5904a438616ff7bdb3f7439","name":"5F4","sphere":[-2178034.29150272,4388450.02298842,4070218.7160019,49.3096979140043],"type":"element"}],"id":"f0935e4cd5920aa6c7c996a5ee53a70f","name":"5F4","sphere":[-2178034.29150272,4388450.02298842,4070218.7160019,49.3096979140043],"type":"node"},{"children":[{"id":"555d6702c950ecb729a966504af0a635","name":"9F4","sphere":[-2178105.06564769,4388348.00088756,4070294.21066394,114.17428148524],"type":"element"}],"id":"eae27d77ca20db309e056e3d2dcd7d69","name":"9F4","sphere":[-2178105.06564769,4388348.00088756,4070294.21066394,114.17428148524],"type":"node"},{"children":[{"id":"9de6d14fff9806d4bcd1ef555be766cd","name":"36F4","sphere":[-2177882.35330406,4388354.74270343,4070401.4603337,55.9451537436284],"type":"element"}],"id":"3fe94a002317b5f9259f82690aeea4cd","name":"36F4","sphere":[-2177882.35330406,4388354.74270343,4070401.4603337,55.9451537436284],"type":"node"},{"children":[{"id":"1a5b1e4daae265b790965a275b53ae50","name":"48F4","sphere":[-2177895.97657632,4388383.00563185,4070368.8672951,61.8938753636776],"type":"element"}],"id":"b9228e0962a78b84f3d5d92f4faa000b","name":"48F4","sphere":[-2177895.97657632,4388383.00563185,4070368.8672951,61.8938753636776],"type":"node"}]}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":278.692754674703,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[363.774077226291,269.281165299471,4.54860665649176,124.133294112864,0,0,0,139.346377337351,0,0,0,4.57081267703325]},"children":[{"boundingVolume":{"box":[363.378983629785,269.276851720405,4.55238962173455,123.737783374129,0,0,0,139.338561283675,0,0,0,4.55239057540894]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":278.692754674703,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":278.695026597008,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[396.634482032154,316.722034023143,5.19931715121493,124.246999860508,0,0,0,139.347513298504,0,0,0,5.22471033455804]},"children":[{"boundingVolume":{"box":[396.630462646484,316.717384338379,5.20595502853392,124.239837646484,0,0,0,139.338554382324,0,0,0,5.20595598220825]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":278.695026597008,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"5F5","sphere":[-2178018.36066188,4388493.84916414,4070183.76317206,52.9072938049052],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"5F5","sphere":[-2178018.36066188,4388493.84916414,4070183.76317206,52.9072938049052],"type":"node"},{"children":[{"id":"42a0e188f5033bc65bf8d78622277c4e","name":"9F5","sphere":[-2178096.34707353,4388374.24784086,4070266.94915365,60.2804319637103],"type":"element"}],"id":"6974ce5ac660610b44d9b9fed0ff9548","name":"9F5","sphere":[-2178096.34707353,4388374.24784086,4070266.94915365,60.2804319637103],"type":"node"}]}
|
||||
{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"5F5","sphere":[-2178035.06800555,4388451.58254205,4070220.15417589,52.9101966961065],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"5F5","sphere":[-2178035.06800555,4388451.58254205,4070220.15417589,52.9101966961065],"type":"node"},{"children":[{"id":"a8f15eda80c50adb0e71943adc8015cf","name":"9F5","sphere":[-2178113.0544733,4388331.98123735,4070303.34016155,60.2860580412947],"type":"element"}],"id":"eb160de1de89d9058fcb0b968dbbbd68","name":"9F5","sphere":[-2178113.0544733,4388331.98123735,4070303.34016155,60.2860580412947],"type":"node"},{"children":[{"id":"6c9882bbac1c7093bd25041881277658","name":"48F5","sphere":[-2177896.75278116,4388384.56987132,4070370.30060505,65.599019041445],"type":"element"}],"id":"45fbc6d3e05ebd93369ce542e8f2322d","name":"48F5","sphere":[-2177896.75278116,4388384.56987132,4070370.30060505,65.599019041445],"type":"node"}]}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":152.179389246507,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[410.929813066614,211.649066582788,4.34207683755085,76.0896946232533,0,0,0,69.6824397714809,0,0,0,4.35635270224884]},"children":[{"boundingVolume":{"box":[410.92875234047,211.648507775224,4.34842872619625,76.0824379848323,0,0,0,69.681435255862,0,0,0,4.34842872619629]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":152.179389246507,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":248.211877750233,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[396.669490883825,299.787857319927,7.46036536525935,124.105938875116,0,0,0,110.385756963165,0,0,0,7.48136246204376]},"children":[{"boundingVolume":{"box":[396.664978027344,299.783699035644,7.46499252319334,124.099731445313,0,0,0,110.37606048584,0,0,0,7.46499252319337]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":248.211877750233,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -1 +1 @@
|
|||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":743.36757371109,"properties":{"aboveFloor":{"extras":{"group":"","id":"3bf6be057db6b04af61772b271af08d6","name":"aboveFloor","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"buildingId":{"extras":{"group":"","id":"170c87b6f1f99cd5e518d3dcbd03f1f5","name":"buildingId","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"name ":{"extras":{"group":"","id":"61407ea52bd90b78325a69b87c3dd7f1","name":"name ","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"underFloor":{"extras":{"group":"","id":"8678d81e33d2246b5e6d6e9f555ef5c8","name":"underFloor","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0}},"refine":"REPLACE","root":{"boundingVolume":{"box":[302.773336872924,332.984230930451,41.7879019416869,371.683786855545,0,0,0,371.522012060508,0,0,0,41.8595770848915]},"children":[{"boundingVolume":{"box":[361.473539840631,261.834671856092,37.290811516622,215.133976037328,0,0,0,248.215135614533,0,0,0,37.2908115607705]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[357.213748732467,298.61329271597,41.8050515651703,237.60237050493,0,0,0,282.546784527983,0,0,0,41.8050520420074]},"content":{"uri":"NoLod_1.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[374.072633685304,321.791465815049,34.0500162839889,260.141902610233,0,0,0,310.845503584596,0,0,0,34.0500165224075]},"content":{"uri":"NoLod_2.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[357.213748732467,281.660771013155,30.5500125773251,237.60237050493,0,0,0,261.061274801897,0,0,0,30.5500125996768]},"content":{"uri":"NoLod_3.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[345.903912308994,310.524015999234,7.50002574711106,211.420288992951,0,0,0,119.703873666207,0,0,0,7.50002575130202]},"content":{"uri":"NoLod_4.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[374.072633685304,321.791465815049,41.8050341310685,260.141902610233,0,0,0,310.845503584596,0,0,0,41.8050694761092]},"content":{"uri":"NoLod_5.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[361.71451237286,327.089239836166,23.4889926801122,245.792549697689,0,0,0,302.77308682353,0,0,0,23.4889927019679]},"content":{"uri":"NoLod_6.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[307.925513489114,238.292257233352,36.0750178098678,170.50424929126,0,0,0,221.179339047756,0,0,0,36.0750180482864]},"content":{"uri":"NoLod_7.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[337.723784202442,276.831581792497,8.87738800048825,218.112404975308,0,0,0,260.76507360451,0,0,0,8.87736892700197]},"content":{"uri":"NoLod_8.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":743.36757371109,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":842.988205499016,"properties":{"aboveFloor":{"extras":{"group":"","id":"3bf6be057db6b04af61772b271af08d6","name":"aboveFloor","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"buildingId":{"extras":{"group":"","id":"170c87b6f1f99cd5e518d3dcbd03f1f5","name":"buildingId","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"name ":{"extras":{"group":"","id":"6576a470bb6fa2821a3cfbe8827957d4","name":"name ","type":"string","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"underFloor":{"extras":{"group":"","id":"8678d81e33d2246b5e6d6e9f555ef5c8","name":"underFloor","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0}},"refine":"REPLACE","root":{"boundingVolume":{"box":[341.433875275077,263.14676776994,41.8001739075407,322.201036830898,0,0,0,421.494102749508,0,0,0,41.8708575097844]},"children":[{"boundingVolume":{"box":[332.283189640661,256.910470500271,37.3399962949168,278.077833308558,0,0,0,384.501803064078,0,0,0,37.3399963808644]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[327.026372589025,256.303052853991,41.8050570487976,297.388543762121,0,0,0,385.69684502716,0,0,0,41.8050580024719]},"content":{"uri":"NoLod_1.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[332.406740977829,268.071647474172,34.0008268356323,304.416329437408,0,0,0,416.531382022769,0,0,0,34.0008287429809]},"content":{"uri":"NoLod_2.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[405.130602838653,275.075092201799,25.8804416226756,258.42237246807,0,0,0,409.527937295142,0,0,0,25.8804417086232]},"content":{"uri":"NoLod_3.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[326.202671524745,241.954284116808,22.0856375694275,298.212244826402,0,0,0,400.045613764343,0,0,0,22.0856385231018]},"content":{"uri":"NoLod_4.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[392.005827659887,239.975622909664,30.5992031097412,222.924958472926,0,0,0,346.440507451631,0,0,0,30.5991916656494]},"content":{"uri":"NoLod_5.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[259.254278453418,102.833838901609,4.7696933725383,51.6714232288086,0,0,0,231.298973598391,0,0,0,4.76969337672926]},"content":{"uri":"NoLod_6.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[341.393607941962,263.143320236683,41.8050565719604,322.159367364762,0,0,0,421.459770701529,0,0,0,41.8050584793091]},"content":{"uri":"NoLod_7.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[392.854155962836,273.569873221751,23.488996386528,244.167847026794,0,0,0,408.240036090976,0,0,0,23.4889966249466]},"content":{"uri":"NoLod_8.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[272.128524780273,249.492221345056,36.0258291959762,240.054763793945,0,0,0,378.886013518225,0,0,0,36.0258294343948]},"content":{"uri":"NoLod_9.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[307.665249175727,249.22045088396,8.87737855966929,278.027420348822,0,0,0,379.157783979321,0,0,0,8.87737836782093]},"content":{"uri":"NoLod_10.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":842.988205499016,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -134,9 +134,9 @@ export default {
|
|||
},
|
||||
labelLocation:{
|
||||
name: "标注坐标位置",
|
||||
req: async function(data){
|
||||
req: async function(id,data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/third/tdevice/label_location/`,data
|
||||
`${config.API_URL}/third/tdevice/${id}/label_location/`,data
|
||||
);
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -238,13 +238,9 @@ const routes = [
|
|||
"title": "工单详情",
|
||||
"icon": "el-icon-menu",
|
||||
"hidden": true,
|
||||
"perms": ["allwork"]
|
||||
},
|
||||
"component": "wf/ticketdetail"
|
||||
},
|
||||
|
||||
|
||||
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
@ -470,7 +466,6 @@ const routes = [
|
|||
"title": "访客",
|
||||
"icon": "el-icon-user-filled",
|
||||
"type": "menu",
|
||||
"perms": ["vm"]
|
||||
},
|
||||
"children": [
|
||||
{
|
||||
|
|
@ -479,7 +474,6 @@ const routes = [
|
|||
"meta": {
|
||||
"title": "来访项目",
|
||||
"icon": "el-icon-tickets",
|
||||
"perms": ["visit"]
|
||||
},
|
||||
"component": "vm/visit"
|
||||
},
|
||||
|
|
@ -489,7 +483,6 @@ const routes = [
|
|||
"meta": {
|
||||
"title": "我的访客",
|
||||
"icon": "el-icon-user",
|
||||
"perms": ["visit"]
|
||||
},
|
||||
"component": "vm/visitor"
|
||||
},{
|
||||
|
|
@ -499,7 +492,6 @@ const routes = [
|
|||
"title": "访客人员",
|
||||
"icon": "el-icon-menu",
|
||||
"hidden": true,
|
||||
"perms": ["visit"]
|
||||
},
|
||||
"component": "vm/people"
|
||||
}
|
||||
|
|
@ -510,10 +502,9 @@ const routes = [
|
|||
"title": "项目信息",
|
||||
"icon": "el-icon-menu",
|
||||
"hidden": true,
|
||||
"perms": ["visit"]
|
||||
},
|
||||
"component": "vm/vistoradd"
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
]
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ router.beforeEach(async (to, from, next) => {
|
|||
document.title = to.meta.title ? `${to.meta.title} - ${config.APP_NAME}` : `${config.APP_NAME}`
|
||||
|
||||
let token = tool.cookie.get("TOKEN");
|
||||
//去往登录页
|
||||
if (to.path === "/login") {
|
||||
//删除路由(替换当前layout路由)
|
||||
// router.addRoute(routes[0])
|
||||
|
|
@ -46,12 +47,12 @@ router.beforeEach(async (to, from, next) => {
|
|||
next();
|
||||
return false;
|
||||
}
|
||||
|
||||
//目标路由等于当前路由
|
||||
if (routes.findIndex(r => r.path === to.path) >= 0) {
|
||||
next();
|
||||
return false;
|
||||
}
|
||||
|
||||
//未登录
|
||||
if (!token) {
|
||||
next({
|
||||
path: '/login'
|
||||
|
|
@ -66,13 +67,18 @@ router.beforeEach(async (to, from, next) => {
|
|||
//加载动态/静态路由
|
||||
if (!isGetRouter) {
|
||||
// let apiMenu = tool.data.get("MENU") || []
|
||||
let permissions = tool.data.get("PERMISSIONS") || [];
|
||||
let userMenu = userRoutes;
|
||||
let permissions = tool.data.get("PERMISSIONS") || [];//账号页面权限
|
||||
let userMenu = userRoutes;//静态路由
|
||||
// debugger;
|
||||
// console.log(userRoutes);
|
||||
//非超级管理员
|
||||
if (permissions.indexOf('superuser') == -1) {
|
||||
userMenu = treeFilter(userRoutes, node => {
|
||||
return node.meta.perms ? node.meta.perms.filter(item => permissions.indexOf(item) > -1).length > 0 : true
|
||||
});
|
||||
}
|
||||
// debugger;
|
||||
// console.log(userMenu);
|
||||
// let userMenu = checkRoute(userRoutes, permissions)
|
||||
// let menu = [...userMenu, ...apiMenu]
|
||||
var menuRouter = filterAsyncRouter(userMenu);
|
||||
|
|
@ -179,10 +185,23 @@ function flatAsyncRoutes(routes, breadcrumb = []) {
|
|||
//过滤树
|
||||
function treeFilter(tree, func) {
|
||||
return tree.map(node => ({ ...node })).filter(node => {
|
||||
|
||||
node.children = node.children && treeFilter(node.children, func)
|
||||
|
||||
return func(node) || (node.children && node.children.length)
|
||||
})
|
||||
}
|
||||
//过滤树
|
||||
// function treeFilter(tree, func) {
|
||||
// let treemap = tree.map(node => ({ ...node }));
|
||||
|
||||
// let returnTree = treemap.filter(node => {
|
||||
// node.children = node.children && treeFilter(node.children, func)
|
||||
// return func(node) || (node.children && node.children.length)
|
||||
// })
|
||||
// return returnTree;
|
||||
// }
|
||||
|
||||
|
||||
function hasPerm(perms_need, perms_have) {
|
||||
let has = false
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ export default {
|
|||
visible: true,
|
||||
isSaveing: false,
|
||||
coordinates: {
|
||||
floorNo: '',
|
||||
floorNo: 'Floor1',
|
||||
railName: '',
|
||||
railType: 1,//1:多边形；0表示圆形
|
||||
mapType: '1',//点位信息有经纬度则为2，有xy则为1
|
||||
mapType: 1,//点位信息有经纬度则为2，有xy则为1
|
||||
color: '1',
|
||||
polygon: {
|
||||
points: []
|
||||
|
|
@ -62,7 +62,7 @@ export default {
|
|||
methods: {
|
||||
loadMap() {
|
||||
let that = this;
|
||||
|
||||
|
||||
window.map = new jsmap.JSMap({
|
||||
mapType: jsmap.JSMapType.MAP_3D,
|
||||
container: 'mapContainer1',
|
||||
|
|
@ -103,11 +103,11 @@ export default {
|
|||
drawMode: jsmap.JSDrawMode.POLYGON, //画图类型POINT:画点 POLYLINE:画线 POLYGON:画面
|
||||
//画图结束的回调，返回所画的面信息
|
||||
callback: (feature) => {
|
||||
/*console.log('add', feature);
|
||||
console.log('add', feature);
|
||||
console.log(feature.properties);//type:POLYGON;id:"";name:"";floorNo:"";floorId:""
|
||||
console.log(feature.geometry);//feature.geometry.coordinates:[[],[]]面数组*/
|
||||
this.coordinates.floorNo = feature.properties.floorNo;
|
||||
this.coordinates.floorId = feature.properties.floorId;
|
||||
console.log(feature.geometry);//feature.geometry.coordinates:[[],[]]面数组
|
||||
this.coordinates.floorNo = feature.properties.floorNo == '室外' ? 'Floor1' : feature.properties.floorNo;
|
||||
// this.coordinates.floorId = feature.properties.floorId;
|
||||
that.points = feature.geometry.coordinates[0];
|
||||
},
|
||||
//移除相应面的回调，返回相应面信息
|
||||
|
|
@ -125,99 +125,72 @@ export default {
|
|||
});
|
||||
window.map.addControl(drawTool2);
|
||||
if (that.areaPoints.length > 2) {
|
||||
debugger
|
||||
|
||||
|
||||
debugger;
|
||||
that.areaMarkerLayers();
|
||||
}
|
||||
});
|
||||
window.map.on('mapClickNode', function (event) {
|
||||
console.log('mapClickNode', event);
|
||||
// event.FID: 点击的nodeID
|
||||
// event.centroid: 点击的node的质心
|
||||
// event.eventInfo:{coord: 地图坐标, eventID:event事件ID}
|
||||
// event.floorId:点击楼层ID
|
||||
// event.mapCoord:地图坐标
|
||||
// event.node:点击的node
|
||||
// event.nodeType:node的类型，见JSNodeType枚举
|
||||
// event.properties:node的属性信息
|
||||
// event.x:地图坐标x
|
||||
// event.y:地图坐标y
|
||||
});
|
||||
},
|
||||
closeDrawer() {
|
||||
this.$emit('closed');
|
||||
},
|
||||
areaMarkerLayers() {
|
||||
let that = this;
|
||||
that.areaMarkerLayer = new jsmap.JSDomMarkerLayer({
|
||||
minimumLevel: 3,
|
||||
maxmumLevel: 22,
|
||||
show: true
|
||||
});
|
||||
window.map.addLayer(that.areaMarkerLayer);
|
||||
// this.markerShow();
|
||||
},
|
||||
markerShow() {
|
||||
let that = this;
|
||||
let tool = new jsmap.JSMapCoordTool(window.map);
|
||||
//当电子围栏有数据时
|
||||
let areaPoints = [];
|
||||
let point = null;
|
||||
let point0 = that.areaPoints[0]
|
||||
debugger;
|
||||
console.log(point0)
|
||||
debugger;
|
||||
let obj = { x: point0.x, y: point0.y};
|
||||
console.log(obj)
|
||||
debugger;
|
||||
let pixel = tool.screenToMapCoordinate(obj);
|
||||
console.log(pixel)
|
||||
that.areaPoints.forEach(item => {
|
||||
let obj = { x: item.x, y: item.y }
|
||||
let pixel = tool.screenToMapCoordinate(obj);
|
||||
|
||||
point = new jsmap.JSPoint(pixel.x, pixel.y, 0);
|
||||
console.log(item)
|
||||
let point = new jsmap.JSPoint(Number(item.x), Number(item.y), 0);
|
||||
areaPoints.push(point)
|
||||
})
|
||||
let polygonMarker = new jsmap.JSPolygonMarker({
|
||||
var polygonMarker = new jsmap.JSPolygonMarker({
|
||||
id: that.areaId,//id
|
||||
position: that.areaPoints,//坐标集合
|
||||
position: areaPoints,//坐标集合
|
||||
floorId: 1,//楼层id
|
||||
color: 'rgba(0,0,255,.44)',//填充颜色
|
||||
strokeColor: 'rgba(0,0,255,.44)',//边线颜色
|
||||
depthTest: false,//是否开启深度检测
|
||||
// material: new jsmap.JSWaterMaterial(), //材质，材质属性一旦设置，color属性就会失效
|
||||
allowPicking: true, //是否允许点击
|
||||
displayCondition: new jsmap.JSDisplayCondition(0.0, 1000), //可见范围
|
||||
// material: new jsmap.JSWaterMaterial(),
|
||||
allowPicking: true,
|
||||
displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
|
||||
properties: {
|
||||
test: 'polygonTest'
|
||||
},//属性设置
|
||||
},
|
||||
callback: (marker) => {
|
||||
// console.log(marker);
|
||||
}//回调
|
||||
console.log(marker);
|
||||
}
|
||||
});
|
||||
that.areaMarkerLayer.addMarker(polygonMarker);
|
||||
window.map.addMarker(polygonMarker);
|
||||
},
|
||||
//表单提交方法
|
||||
submit() {
|
||||
let that = this;
|
||||
// debugger;
|
||||
let pointXY = [];
|
||||
console.log(that.points)
|
||||
let tool = new jsmap.JSMapCoordTool(window.map);
|
||||
let coordinate = { x: 114.63059258861512, y: 38.81407163905287 };
|
||||
let pixel = tool.mapToScreenCoordinate(coordinate);
|
||||
// let tool = new jsmap.JSMapCoordTool(window.map);
|
||||
// let coordinate = { x: 114.63059258861512, y: 38.81407163905287 };
|
||||
// let pixel = tool.mapToScreenCoordinate(coordinate);
|
||||
debugger;
|
||||
console.log(pixel)
|
||||
|
||||
debugger;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
let points = that.points;
|
||||
if (points.length > 0) {
|
||||
if (points.length > 2) {
|
||||
that.isSaveing = true;
|
||||
that.coordinates.color = 'rgba(255,0,0,.4)';
|
||||
points.forEach(item => {
|
||||
let coordinate = { x: parseFloat(item[0]), y: parseFloat(item[1]) };
|
||||
let pixel = tool.mapToScreenCoordinate(coordinate);
|
||||
let pixel = { x: parseFloat(item[0]), y: parseFloat(item[1]) };
|
||||
// let zuobiao = tool.screenToMapCoordinate(pixel);
|
||||
|
||||
// console.log(zuobiao)
|
||||
pointXY.push(pixel);
|
||||
|
||||
});
|
||||
|
||||
that.coordinates.polygon.points = pointXY;
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-button type="primary" icon="el-icon-refresh" @click="syncData" :syncLoading="syncLoading"
|
||||
>同步</el-button
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-refresh" @click="syncData" :syncLoading="syncLoading">同步</el-button>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<!-- <el-input
|
||||
|
|
@ -21,28 +19,15 @@
|
|||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="apiObj"
|
||||
:pageStr="pageStr"
|
||||
:pageSizeStr="pageSizeStr"
|
||||
:parseData="parseData"
|
||||
row-key="id"
|
||||
@selection-change="selectionChange"
|
||||
stripe
|
||||
@resetQuery="resetQuery"
|
||||
>
|
||||
<scTable ref="table" :apiObj="apiObj" :pageStr="pageStr" :pageSizeStr="pageSizeStr" :parseData="parseData"
|
||||
row-key="id" @selection-change="selectionChange" stripe @resetQuery="resetQuery">
|
||||
<!-- <el-table-column type="selection" width="50"></el-table-column> -->
|
||||
<el-table-column label="序号" type="index" width="50"></el-table-column>
|
||||
<el-table-column
|
||||
label="喇叭名称"
|
||||
prop="name"
|
||||
min-width="150"
|
||||
></el-table-column>
|
||||
<el-table-column label="喇叭名称" prop="name" min-width="150"></el-table-column>
|
||||
<el-table-column label="音量" prop="extra" min-width="40">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.extra && scope.row.extra.player">{{
|
||||
scope.row.extra.player.EnvVolume
|
||||
scope.row.extra.player.EnvVolume
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -60,35 +45,19 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<!--<el-table-column label="位置" prop="count_people" min-width="90"></el-table-column>-->
|
||||
<el-table-column
|
||||
label="所在区域"
|
||||
prop="my_info.area_name"
|
||||
min-width="100"
|
||||
></el-table-column>
|
||||
<el-table-column label="所在区域" prop="my_info.area_name" min-width="100"></el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="180">
|
||||
<template #default="scope">
|
||||
<el-button-group>
|
||||
<el-button
|
||||
text
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="handlePosition(scope.row)"
|
||||
>标记位置</el-button
|
||||
>
|
||||
<el-button text type="primary" size="small" @click="handlePosition(scope.row)">标记位置</el-button>
|
||||
</el-button-group>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<channel-view
|
||||
v-if="dialogSave"
|
||||
ref="saveDialog"
|
||||
:channelType="50"
|
||||
:channelCode="channelCode"
|
||||
:channelName="channelName"
|
||||
@closed="dialogSave = false"
|
||||
></channel-view>
|
||||
<channel-view v-if="dialogSave" ref="saveDialog" :channelId="channelId" :channelName="channelName" :channelArea="channelArea" :channelAreas="channelAreas"
|
||||
:channelLocation="channelLocation" @closed="dialogSave = false"></channel-view>
|
||||
</template>
|
||||
<script>
|
||||
import channelView from "./vchannel_view";
|
||||
|
|
@ -117,13 +86,19 @@ export default {
|
|||
search: {
|
||||
keyword: null,
|
||||
},
|
||||
channelId: "",
|
||||
channelCode: "",
|
||||
channelName: "",
|
||||
channelArea: '',
|
||||
channelAreas: [],
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
handlePosition(row) {
|
||||
this.channelCode = row.sn;
|
||||
this.channelId = row.my_info.id ? row.my_info.id : null;
|
||||
this.channelArea = row.my_info.area ? row.my_info.area : '';
|
||||
this.channelAreas = row.my_info.areas ? row.my_info.areas : [];
|
||||
this.channelLocation = row.my_info.location ? row.my_info.location : {};
|
||||
this.channelName = row.name;
|
||||
this.dialogSave = true;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,13 +2,7 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-refresh"
|
||||
@click="syncData"
|
||||
:loading="syncLoading"
|
||||
>同步</el-button
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-refresh" @click="syncData" :loading="syncLoading">同步</el-button>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<!-- <el-input
|
||||
|
|
@ -25,35 +19,13 @@
|
|||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
:params="apiParams"
|
||||
:pageStr="pageStr"
|
||||
:pageSizeStr="pageSizeStr"
|
||||
:orderStr="orderStr"
|
||||
:parseData="parseData"
|
||||
@selection-change="selectionChange"
|
||||
stripe
|
||||
@resetQuery="resetQuery"
|
||||
>
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" :params="apiParams" :pageStr="pageStr"
|
||||
:pageSizeStr="pageSizeStr" :orderStr="orderStr" :parseData="parseData" @selection-change="selectionChange"
|
||||
stripe @resetQuery="resetQuery">
|
||||
<el-table-column label="序号" type="index" width="50"></el-table-column>
|
||||
<el-table-column
|
||||
label="设备编号"
|
||||
prop="deviceCode"
|
||||
min-width="100"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="通道编号"
|
||||
prop="channelCode"
|
||||
min-width="150"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="通道名称"
|
||||
prop="channelName"
|
||||
min-width="250"
|
||||
></el-table-column>
|
||||
<el-table-column label="设备编号" prop="deviceCode" min-width="100"></el-table-column>
|
||||
<el-table-column label="通道编号" prop="channelCode" min-width="150"></el-table-column>
|
||||
<el-table-column label="通道名称" prop="channelName" min-width="250"></el-table-column>
|
||||
<el-table-column label="通道状态" prop="stat" min-width="80">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.stat === 0">未启用</span>
|
||||
|
|
@ -62,42 +34,42 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="类型" min-width="50">
|
||||
<template #default="scope">{{
|
||||
deviceTypes[scope.row.cameraType]
|
||||
deviceTypes[scope.row.cameraType]
|
||||
}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否在线" prop="isOnline" min-width="180">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.isOnline === 0"><el-tag type="warning">离线</el-tag></span>
|
||||
<span v-else><el-tag type="success">在线</el-tag></span>
|
||||
<span v-if="scope.row.isOnline === 0">
|
||||
<el-tag type="warning">离线</el-tag>
|
||||
</span>
|
||||
<span v-else>
|
||||
<el-tag type="success">在线</el-tag>
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="所在区域"
|
||||
prop="my_info.area_name"
|
||||
min-width="80"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
prop="createTime"
|
||||
min-width="160"
|
||||
></el-table-column>
|
||||
<el-table-column label="所在区域" prop="my_info.area_name" min-width="80"></el-table-column>
|
||||
<el-table-column label="所在位置" min-width="150">
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.my_info.location.x">
|
||||
<div>
|
||||
x:{{ scope.row.my_info.location.x }}
|
||||
</div>
|
||||
<div>
|
||||
y:{{ scope.row.my_info.location.y }}
|
||||
</div>
|
||||
<!-- <div>
|
||||
z:{{ scope.row.my_info.location.z }}
|
||||
</div> -->
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" prop="createTime" min-width="160"></el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="180">
|
||||
<template #default="scope">
|
||||
<el-button-group>
|
||||
<el-button
|
||||
text
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="handlePosition(scope.row)"
|
||||
>标记位置
|
||||
<el-button text type="primary" size="small" @click="handlePosition(scope.row)">标记位置
|
||||
</el-button>
|
||||
<el-button
|
||||
text
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="handleView(scope.row)"
|
||||
>实时监控</el-button
|
||||
>
|
||||
<el-button text type="primary" size="small" @click="handleView(scope.row)">实时监控</el-button>
|
||||
<!-- <el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row, scope.$index)">
|
||||
<template #reference>
|
||||
<el-button text type="danger" size="small">删除</el-button>
|
||||
|
|
@ -115,14 +87,8 @@
|
|||
<el-button @click="viewClose">关闭</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<channel-view
|
||||
v-if="dialogSave"
|
||||
ref="saveDialog"
|
||||
:channelType="60"
|
||||
:channelCode="channelCode"
|
||||
:channelName="channelName"
|
||||
@closed="dialogSave = false"
|
||||
></channel-view>
|
||||
<channel-view v-if="dialogSave" ref="saveDialog" :channelId="channelId" :channelName="channelName" :channelArea="channelArea" :channelAreas="channelAreas"
|
||||
:channelLocation="channelLocation" @closed="dialogSave = false"></channel-view>
|
||||
</template>
|
||||
<script>
|
||||
import channelView from "./vchannel_view";
|
||||
|
|
@ -130,7 +96,7 @@ import videoView from "./videoView";
|
|||
|
||||
export default {
|
||||
name: "monitor",
|
||||
inject:['reload'],
|
||||
inject: ['reload'],
|
||||
components: {
|
||||
channelView,
|
||||
videoView
|
||||
|
|
@ -138,24 +104,23 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
apiObj: this.$API.am.video.list,
|
||||
apiParams: {
|
||||
},
|
||||
pageStr: "pageNum",
|
||||
pageSizeStr: "pageSize",
|
||||
orderStr: "sort",
|
||||
parseData: (res)=>{
|
||||
return {
|
||||
data: res, //分析无分页的数据字段结构
|
||||
rows: res.pageData, //分析行数据字段结构
|
||||
total: res.totalRows, //分析总数字段结构
|
||||
}
|
||||
},
|
||||
apiParams: {
|
||||
},
|
||||
pageStr: "pageNum",
|
||||
pageSizeStr: "pageSize",
|
||||
orderStr: "sort",
|
||||
parseData: (res) => {
|
||||
return {
|
||||
data: res, //分析无分页的数据字段结构
|
||||
rows: res.pageData, //分析行数据字段结构
|
||||
total: res.totalRows, //分析总数字段结构
|
||||
}
|
||||
},
|
||||
dialogSave: false,
|
||||
limitedVisible: false,
|
||||
syncLoading: false,
|
||||
query: {},
|
||||
selection: [],
|
||||
channelId: "",
|
||||
params: {
|
||||
json: {
|
||||
data: {
|
||||
|
|
@ -166,8 +131,12 @@ export default {
|
|||
},
|
||||
code: "video_realtime",
|
||||
},
|
||||
channelCode:'',
|
||||
flvPlayer:null,
|
||||
channelCode: '',
|
||||
channelId: '',
|
||||
channelArea: '',
|
||||
channelAreas: [],
|
||||
channelLocation: {},
|
||||
flvPlayer: null,
|
||||
deviceTypes: {
|
||||
1: "枪机",
|
||||
2: "球机",
|
||||
|
|
@ -201,61 +170,31 @@ export default {
|
|||
// }
|
||||
// });
|
||||
},
|
||||
viewClose(){
|
||||
viewClose() {
|
||||
this.limitedVisible = false;
|
||||
},
|
||||
handlePosition(row) {
|
||||
this.channelCode = row.channelCode;
|
||||
debugger;
|
||||
console.log(row)
|
||||
this.channelId = row.my_info.id ? row.my_info.id : null;
|
||||
this.channelArea = row.my_info.area ? row.my_info.area : '';
|
||||
this.channelAreas = row.my_info.areas ? row.my_info.areas : [];
|
||||
this.channelLocation = row.my_info.location ? row.my_info.location : {};
|
||||
this.channelName = row.channelName;
|
||||
this.dialogSave = true;
|
||||
},
|
||||
//删除区域
|
||||
async handleDel(row) {
|
||||
await this.$API.am.area.delete.req(row.id).then((res) => {
|
||||
if (res.err_msg) {
|
||||
this.$message.error(res.err_msg);
|
||||
} else {
|
||||
this.$refs.table.refresh();
|
||||
this.$message.success("删除成功");
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
//批量删除区域
|
||||
async batch_del() {
|
||||
this.$confirm(
|
||||
`确定删除选中的 ${this.selection.length} 项吗？如果删除项中含有子集将会被一并删除`,
|
||||
"提示",
|
||||
{
|
||||
type: "warning",
|
||||
}
|
||||
)
|
||||
.then(() => {
|
||||
const loading = this.$loading();
|
||||
let params = { pk: { pks: this.selection } };
|
||||
this.$API.am.area.deletes.req(params).then((res) => {
|
||||
loading.close();
|
||||
if (res.err_msg) {
|
||||
this.$message.error(res.err_msg);
|
||||
} else {
|
||||
this.$refs.table.refresh();
|
||||
this.$message.success("删除成功");
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
//表格选择后回调事件
|
||||
selectionChange(selection) {
|
||||
this.selection = selection;
|
||||
},
|
||||
|
||||
//搜索
|
||||
handleQuery() {this.$refs.table.refresh();},
|
||||
handleQuery() { this.$refs.table.refresh(); },
|
||||
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
},
|
||||
|
||||
async syncData() {
|
||||
this.syncLoading = true;
|
||||
var res = await this.$API.third.tdevice.vchannelSync.req({});
|
||||
|
|
|
|||
|
|
@ -1,39 +1,19 @@
|
|||
<template>
|
||||
<el-drawer
|
||||
id="mapDrawer"
|
||||
:title="channelName+'位置标记'"
|
||||
v-model="visible"
|
||||
destroy-on-close
|
||||
:size="'80%'"
|
||||
@closed="closeDrawer"
|
||||
>
|
||||
<el-form
|
||||
:model="form"
|
||||
label-width="80px"
|
||||
style="position:absolute;top:15px;left:200px;"
|
||||
>
|
||||
<el-drawer id="mapDrawer" :title="channelName" v-model="visible" destroy-on-close :size="'80%'"
|
||||
@closed="closeDrawer">
|
||||
<el-form :model="form" label-width="80px" style="position:absolute;top:15px;left:300px;">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="所在区域" prop="name">
|
||||
<el-select v-model="form.area" style="width: 100%">
|
||||
<el-option
|
||||
v-for="item in areasList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
<el-option v-for="item in areasList" :key="item.id" :label="item.name" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="覆盖区域" prop="name">
|
||||
<el-select v-model="form.areas" multiple style="width: 100%">
|
||||
<el-option
|
||||
v-for="item in areasList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
<el-option v-for="item in areasList" :key="item.id" :label="item.name" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -45,11 +25,7 @@
|
|||
<div id='mapContainer1'></div>
|
||||
</el-main>
|
||||
<el-footer>
|
||||
<el-button
|
||||
type="primary"
|
||||
:loading="isSaveing"
|
||||
@click="submit"
|
||||
>
|
||||
<el-button type="primary" :loading="isSaveing" @click="submit">
|
||||
保存
|
||||
</el-button>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
|
|
@ -59,147 +35,180 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
emits: ["success", "closed"],
|
||||
props: {
|
||||
channelCode: {
|
||||
type: String,
|
||||
},
|
||||
channelType: {
|
||||
type: Number,
|
||||
},
|
||||
channelName: {
|
||||
type: String,
|
||||
}
|
||||
export default {
|
||||
emits: ["success", "closed"],
|
||||
props: {
|
||||
channelLocation: {
|
||||
type: Object,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
visible: true,
|
||||
isSaveing: false,
|
||||
points:[],
|
||||
areasList:[],
|
||||
form:{
|
||||
type:60,//设备类型
|
||||
location:null,//位置信息
|
||||
area:'',//所在区域
|
||||
areas:[],//覆盖区域
|
||||
code:'',//设备唯一标识
|
||||
}
|
||||
};
|
||||
channelId: {
|
||||
type: String,
|
||||
},
|
||||
mounted() {
|
||||
this.$nextTick(()=>{
|
||||
this.loadMap();
|
||||
})
|
||||
this.getArea();
|
||||
channelName: {
|
||||
type: String,
|
||||
},
|
||||
methods: {
|
||||
loadMap(){
|
||||
let that = this;
|
||||
window.map = new jsmap.JSMap({
|
||||
mapType: jsmap.JSMapType.MAP_3D,
|
||||
container: 'mapContainer1',
|
||||
mapServerURL: 'data/map',
|
||||
enableShadows: false, //是否开启阴影 默认false
|
||||
enableLighting: false, //是否开发光照 默认false
|
||||
mapScaleLevelRange: [16, 23],//比例尺级别范围， 16级到23级,默认[1,24]
|
||||
floorControlOptions: {
|
||||
floorHeight: 20,//楼层间距
|
||||
position: jsmap.JSControlPosition.RIGHT_TOP,//控件位置
|
||||
offset: {
|
||||
x: 10,
|
||||
y: 10,
|
||||
}//控件偏移位置
|
||||
},
|
||||
imageryProvider: jsmap.JSImageryProviderType.IMAGE_TDT,
|
||||
backgroundColor: '#3798ff', //背景颜色
|
||||
viewOptions: {
|
||||
//屏幕中心坐标
|
||||
center: {x: 114.63059258861512, y: 38.81407163905287, z: 1},
|
||||
// center: {x:120,y:30,z:10},
|
||||
//相机距屏幕中心点距离（单位m）
|
||||
distance: 400,
|
||||
// 旋转角（单位°）
|
||||
rotate: 0,
|
||||
//倾斜角（单位°）
|
||||
tilt: 45,
|
||||
}
|
||||
});
|
||||
window.map.openMapById('0000');
|
||||
window.map.on('loadComplete', e => {
|
||||
// console.log('Map loadComplete!');
|
||||
var drawTool = new jsmap.JSDrawToolControl({
|
||||
position: jsmap.JSControlPosition.RIGHT_TOP, //画图工具在容器中的相对位置，当前为右上
|
||||
offset: {
|
||||
x: 20,
|
||||
y: 180
|
||||
}, //偏移量
|
||||
drawMode: jsmap.JSDrawMode.POINT, //画图类型POINT:画点 POLYLINE:画线 POLYGON:画面
|
||||
channelArea: {
|
||||
type: String,
|
||||
},
|
||||
channelAreas: {
|
||||
type: Array,
|
||||
|
||||
//画图结束的回调，返回所画的点的信息
|
||||
callback: (feature) => {
|
||||
//console.log('add', feature);
|
||||
//console.log(feature.properties);//type:POINT;id:"";name:"";floorNo:"";floorId:""
|
||||
//console.log(feature.geometry);//type:POINT;coordinates:[114.63028499839209,38.81195080123784,0]
|
||||
this.form.location = feature.geometry.coordinates;
|
||||
},
|
||||
//移除相应点的回调，返回相应点信息
|
||||
removeCallback: (feature) => {
|
||||
console.log('remove', feature);
|
||||
},
|
||||
//编辑相应点的回调，返回相应点信息
|
||||
editCallback: (feature) => {
|
||||
console.log('editCallback', feature);
|
||||
},
|
||||
//定位到相应点的回调，返回相应点信息
|
||||
locateCallback: (feature) => {
|
||||
console.log('locate..', feature);
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
visible: true,
|
||||
isSaveing: false,
|
||||
points: [],
|
||||
areasList: [],
|
||||
form: {
|
||||
// type:60,//设备类型
|
||||
location: null,//位置信息
|
||||
area: '',//所在区域
|
||||
areas: [],//覆盖区域
|
||||
// code:'',//设备唯一标识
|
||||
}
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.$nextTick(() => {
|
||||
this.loadMap();
|
||||
})
|
||||
this.form.area = this.channelArea;
|
||||
this.form.areas = this.channelAreas;
|
||||
debugger;
|
||||
this.getArea();
|
||||
},
|
||||
methods: {
|
||||
loadMap() {
|
||||
let that = this;
|
||||
window.map = new jsmap.JSMap({
|
||||
mapType: jsmap.JSMapType.MAP_3D,
|
||||
container: 'mapContainer1',
|
||||
mapServerURL: 'data/map',
|
||||
enableShadows: false, //是否开启阴影 默认false
|
||||
enableLighting: false, //是否开发光照 默认false
|
||||
mapScaleLevelRange: [16, 23],//比例尺级别范围， 16级到23级,默认[1,24]
|
||||
floorControlOptions: {
|
||||
floorHeight: 20,//楼层间距
|
||||
position: jsmap.JSControlPosition.RIGHT_TOP,//控件位置
|
||||
offset: {
|
||||
x: 10,
|
||||
y: 10,
|
||||
}//控件偏移位置
|
||||
},
|
||||
imageryProvider: jsmap.JSImageryProviderType.IMAGE_TDT,
|
||||
backgroundColor: '#3798ff', //背景颜色
|
||||
viewOptions: {
|
||||
//屏幕中心坐标
|
||||
center: { x: 114.63059258861512, y: 38.81407163905287, z: 1 },
|
||||
// center: {x:120,y:30,z:10},
|
||||
//相机距屏幕中心点距离（单位m）
|
||||
distance: 400,
|
||||
// 旋转角（单位°）
|
||||
rotate: 0,
|
||||
//倾斜角（单位°）
|
||||
tilt: 45,
|
||||
}
|
||||
});
|
||||
window.map.openMapById('0000');
|
||||
window.map.on('loadComplete', e => {
|
||||
debugger;
|
||||
console.log(that.channelLocation)
|
||||
//如果位置已标记，显示上次标记的位置
|
||||
if (that.channelLocation.x) {
|
||||
var pointMarker = new jsmap.JSPointMarker({
|
||||
color: '#536dfe', //填充颜色
|
||||
size: 2, //尺寸
|
||||
position: new jsmap.JSPoint(that.channelLocation.x, that.channelLocation.y, 1), //坐标
|
||||
floorId: 1, //楼层id,默认为1（地面）
|
||||
outlineColor: '#CD5C5C', //边线颜色
|
||||
outlineWidth: 1, //边线宽
|
||||
depthTest: true, //是否开启深度检测
|
||||
show: true, //是否显示
|
||||
allowPicking: true, //是否允许点击
|
||||
displayCondition: new jsmap.JSDisplayCondition(0.0, 1000), //可见范围
|
||||
nearFarScale: new jsmap.JSNearFarScale(0.0, 10.0, 500, 0.5), //比例缩放
|
||||
properties: {
|
||||
type: 0
|
||||
},//属性设置
|
||||
callback: (node) => {
|
||||
console.log(node);
|
||||
}//回调事件
|
||||
});
|
||||
window.map.addControl(drawTool);
|
||||
});
|
||||
},
|
||||
closeDrawer() {
|
||||
this.$emit('closed');
|
||||
},
|
||||
getArea(){
|
||||
this.$API.am.area.list.req().then(res=>{
|
||||
debugger;
|
||||
if(res.err_msg){
|
||||
this.message.error(res.err_msg)
|
||||
}else{
|
||||
this.areasList = res.results;
|
||||
window.map.addMarker(pointMarker);
|
||||
}
|
||||
// console.log('Map loadComplete!');
|
||||
var drawTool = new jsmap.JSDrawToolControl({
|
||||
position: jsmap.JSControlPosition.RIGHT_TOP, //画图工具在容器中的相对位置，当前为右上
|
||||
offset: {
|
||||
x: 20,
|
||||
y: 180
|
||||
}, //偏移量
|
||||
drawMode: jsmap.JSDrawMode.POINT, //画图类型POINT:画点 POLYLINE:画线 POLYGON:画面
|
||||
|
||||
//画图结束的回调，返回所画的点的信息
|
||||
callback: (feature) => {
|
||||
console.log('add', feature);
|
||||
console.log(feature.properties);//type:POINT;id:"";name:"";floorNo:"";floorId:""
|
||||
console.log(feature.geometry);//type:POINT;coordinates:[114.63028499839209,38.81195080123784,0]
|
||||
let floorNo = feature.properties.floorNo=='室外'?'Floor1':feature.properties.floorNo;
|
||||
this.form.location = feature.geometry.coordinates;
|
||||
this.form.location.push(floorNo);
|
||||
},
|
||||
//移除相应点的回调，返回相应点信息
|
||||
removeCallback: (feature) => {
|
||||
console.log('remove', feature);
|
||||
},
|
||||
//编辑相应点的回调，返回相应点信息
|
||||
editCallback: (feature) => {
|
||||
console.log('editCallback', feature);
|
||||
},
|
||||
//定位到相应点的回调，返回相应点信息
|
||||
locateCallback: (feature) => {
|
||||
console.log('locate..', feature);
|
||||
}
|
||||
})
|
||||
},
|
||||
//表单提交方法
|
||||
submit() {
|
||||
let that = this;
|
||||
let item = this.form.location;
|
||||
//console.log(this.form.location);
|
||||
that.form.code = that.channelCode;
|
||||
that.form.type = that.channelType;
|
||||
that.form.name = that.channelName;
|
||||
that.form.location = {x:item[0],y:item[1],z:item[2]};
|
||||
that.$API.am.tdevice.labelLocation.req(that.form)
|
||||
.then(res => {
|
||||
that.isSaveing = false;
|
||||
that.visible = false;
|
||||
that.$emit("success");
|
||||
that.$message.success("操作成功");
|
||||
return res
|
||||
}).catch(err => {
|
||||
});
|
||||
window.map.addControl(drawTool);
|
||||
});
|
||||
},
|
||||
closeDrawer() {
|
||||
this.$emit('closed');
|
||||
},
|
||||
getArea() {
|
||||
this.$API.am.area.list.req().then(res => {
|
||||
debugger;
|
||||
if (res.err_msg) {
|
||||
this.message.error(res.err_msg)
|
||||
} else {
|
||||
this.areasList = res.results;
|
||||
}
|
||||
})
|
||||
},
|
||||
//表单提交方法
|
||||
submit() {
|
||||
let that = this;
|
||||
let item = this.form.location;
|
||||
that.form.location = { x: item[0], y: item[1], z: item[2] ,floorNo:item[3]};
|
||||
that.$API.am.tdevice.labelLocation.req(that.channelId, that.form)
|
||||
.then(res => {
|
||||
that.isSaveing = false;
|
||||
that.visible = false;
|
||||
that.$emit("success");
|
||||
that.$message.success("操作成功");
|
||||
return res
|
||||
}).catch(err => {
|
||||
that.isSaveing = false;
|
||||
return err
|
||||
})
|
||||
},
|
||||
},
|
||||
};
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-drawer.open{
|
||||
width: 70%!important;
|
||||
}
|
||||
.el-drawer.open {
|
||||
width: 70% !important;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -160,9 +160,17 @@ export default {
|
|||
var res1 = await this.$API.auth.info.get();
|
||||
this.$TOOL.data.set("USER_INFO", res1);
|
||||
this.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
|
||||
this.$router.replace({
|
||||
path: "/",
|
||||
});
|
||||
debugger;
|
||||
console.log(res1.type)
|
||||
if(res1.type==='employee'){
|
||||
this.$router.replace({
|
||||
path: "/",
|
||||
});
|
||||
}else{
|
||||
this.$router.replace({
|
||||
path: "/rpm/rpj",
|
||||
});
|
||||
}
|
||||
this.$message.success("Login Success 登录成功");
|
||||
this.islogin = false;
|
||||
} catch (err) {
|
||||
|
|
|
|||
|
|
@ -8,270 +8,217 @@
|
|||
</div>
|
||||
<div class="right-panel">
|
||||
<div class="right-panel-search">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="名称"
|
||||
clearable
|
||||
@click="handleQuery"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-select v-model="query.create_by">
|
||||
<el-option label="全部" value="000" />
|
||||
<el-option label="我的" :value="userId" />
|
||||
</el-select>
|
||||
<el-input v-model="query.search" placeholder="名称" clearable @click="handleQuery"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="tableoperation"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
@selection-change="selectionChange"
|
||||
stripe
|
||||
@resetQuery="resetQuery"
|
||||
>
|
||||
<scTable ref="tableoperation" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" stripe
|
||||
@resetQuery="resetQuery">
|
||||
<!-- <el-table-column
|
||||
label="#"
|
||||
type="index"
|
||||
width="50"
|
||||
></el-table-column> -->
|
||||
<el-table-column
|
||||
label="许可证"
|
||||
prop="opls"
|
||||
width="160"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag v-for="item in scope.row.cates_" :key="item.id" style="margin-right:2px">{{item.name}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="作业简介"
|
||||
prop="name"
|
||||
width="200"
|
||||
></el-table-column>
|
||||
<el-table-column label="作业状态" prop="state">
|
||||
<template #default="scope">{{stateoptions[scope.row.state]}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="生产状态"
|
||||
prop="state_work"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="作业区域"
|
||||
><template #default="scope">
|
||||
{{scope.row.area_.name}}
|
||||
<el-table-column label="许可证" prop="opls" width="160">
|
||||
<template #default="scope">
|
||||
<el-tag v-for="item in scope.row.cates_" :key="item.id" style="margin-right:2px">{{ item.name }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="预计开始"
|
||||
prop="start_time"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="预计结束"
|
||||
prop="end_time"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="属地部门"
|
||||
prop="dept_ter"
|
||||
><template #default="scope">
|
||||
{{scope.row.dept_ter_.name}}
|
||||
<el-table-column label="作业简介" prop="name" width="200"></el-table-column>
|
||||
<el-table-column label="作业状态" prop="state">
|
||||
<template #default="scope">{{ stateoptions[scope.row.state] }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="生产状态" prop="state_work"></el-table-column>
|
||||
<el-table-column label="作业区域"><template #default="scope">
|
||||
{{ scope.row.area_.name }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="预计开始" prop="start_time"></el-table-column>
|
||||
<el-table-column label="预计结束" prop="end_time"></el-table-column>
|
||||
<el-table-column label="属地部门" prop="dept_ter"><template #default="scope">
|
||||
{{ scope.row.dept_ter_.name }}
|
||||
</template></el-table-column>
|
||||
<el-table-column
|
||||
label="业务部门"
|
||||
prop="dept_bus"
|
||||
><template #default="scope">
|
||||
{{scope.row.dept_bus_.name}}
|
||||
<el-table-column label="业务部门" prop="dept_bus"><template #default="scope">
|
||||
{{ scope.row.dept_bus_.name }}
|
||||
</template></el-table-column>
|
||||
<el-table-column
|
||||
label="创建人"
|
||||
prop="create_by"
|
||||
><template #default="scope">
|
||||
{{scope.row.create_by_.name}}
|
||||
<el-table-column label="创建人" prop="create_by"><template #default="scope">
|
||||
{{ scope.row.create_by_.name }}
|
||||
</template></el-table-column>
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
prop="create_time"
|
||||
></el-table-column>
|
||||
<el-table-column label="创建时间" prop="create_time"></el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="180">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
v-auth="'operation.update'"
|
||||
@click="creatopl(scope.row)"
|
||||
>许可证
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="table_show(scope.row, scope.$index)"
|
||||
>查看
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="scope.row.state === 10"
|
||||
link
|
||||
type="warning"
|
||||
size="small"
|
||||
v-auth="'operation.update'"
|
||||
@click="table_edit(scope.row, scope.$index)"
|
||||
>编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
size="small"
|
||||
v-if="scope.row.state === 10"
|
||||
v-auth="'operation.delete'"
|
||||
@click="table_del(scope.row)"
|
||||
>删除
|
||||
</el-button>
|
||||
<el-button link type="primary" size="small" v-auth="'operation.update'"
|
||||
@click="creatopl(scope.row)">许可证
|
||||
</el-button>
|
||||
<el-button link type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
|
||||
</el-button>
|
||||
<el-button v-if="scope.row.state === 10" link type="warning" size="small"
|
||||
v-auth="'operation.update'" @click="table_edit(scope.row, scope.$index)">编辑
|
||||
</el-button>
|
||||
<el-button link type="danger" size="small" v-if="scope.row.state === 10"
|
||||
v-auth="'operation.delete'" @click="table_del(scope.row)">删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
<save-dialog
|
||||
v-if="dialog.save"
|
||||
ref="saveDialog"
|
||||
@success="handleSaveSuccess"
|
||||
@closed="dialog.save = false"
|
||||
></save-dialog>
|
||||
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save = false">
|
||||
</save-dialog>
|
||||
</el-container>
|
||||
</template>
|
||||
<script>
|
||||
import saveDialog from "./operation_form.vue";
|
||||
import saveDialog from "./operation_form.vue";
|
||||
|
||||
export default {
|
||||
name: "operation",
|
||||
components: {
|
||||
saveDialog,
|
||||
export default {
|
||||
name: "operation",
|
||||
components: {
|
||||
saveDialog,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialog: {
|
||||
save: false,
|
||||
permission: false,
|
||||
},
|
||||
apiObj: this.$API.opm.operation.list,
|
||||
query: {
|
||||
search: '',
|
||||
create_by: '000',
|
||||
},
|
||||
selection: [],
|
||||
search: {
|
||||
keyword: null,
|
||||
},
|
||||
stateoptions: {
|
||||
10: "创建中",
|
||||
20: "审批中",
|
||||
30: "待作业",
|
||||
40: "作业中",
|
||||
50: "已关闭",
|
||||
},
|
||||
userId: '',
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
let userInfo = this.$TOOL.data.get("USER_INFO");
|
||||
this.userId = userInfo.id;
|
||||
},
|
||||
methods: {
|
||||
|
||||
//添加
|
||||
add() {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("add");
|
||||
});
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialog: {
|
||||
save: false,
|
||||
permission: false,
|
||||
},
|
||||
apiObj: this.$API.opm.operation.list,
|
||||
query: {},
|
||||
selection: [],
|
||||
search: {
|
||||
keyword: null,
|
||||
},
|
||||
stateoptions: {
|
||||
10: "创建中",
|
||||
20: "审批中",
|
||||
30: "待作业",
|
||||
40: "作业中",
|
||||
50: "已关闭",
|
||||
},
|
||||
};
|
||||
|
||||
//编辑
|
||||
table_edit(row) {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("edit").setData(row);
|
||||
});
|
||||
},
|
||||
//查看
|
||||
table_show(row) {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("show").setData(row);
|
||||
});
|
||||
},
|
||||
//创建作业许可证
|
||||
creatopl(row) {
|
||||
this.$router.push({
|
||||
name: "opl",
|
||||
query: {
|
||||
id: row.id,
|
||||
},
|
||||
});
|
||||
},
|
||||
//权限设置
|
||||
permission() {
|
||||
this.dialog.permission = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.permissionDialog.open();
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
|
||||
//添加
|
||||
add() {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("add");
|
||||
});
|
||||
},
|
||||
|
||||
//编辑
|
||||
table_edit(row) {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("edit").setData(row);
|
||||
});
|
||||
},
|
||||
//查看
|
||||
table_show(row) {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("show").setData(row);
|
||||
});
|
||||
},
|
||||
//创建作业许可证
|
||||
creatopl(row) {
|
||||
this.$router.push({
|
||||
name: "opl",
|
||||
query: {
|
||||
id: row.id,
|
||||
},
|
||||
});
|
||||
},
|
||||
//权限设置
|
||||
permission() {
|
||||
this.dialog.permission = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.permissionDialog.open();
|
||||
});
|
||||
},
|
||||
|
||||
//删除
|
||||
table_del(row) {
|
||||
this.$API.opm.operation.delete
|
||||
.req(row.id)
|
||||
.then((res) => {
|
||||
this.$message.success("删除成功");
|
||||
this.$refs.tableoperation.refresh();
|
||||
return res;
|
||||
})
|
||||
.catch((err) => {
|
||||
return err;
|
||||
});
|
||||
|
||||
},
|
||||
|
||||
|
||||
//表格选择后回调事件
|
||||
selectionChange(selection) {
|
||||
this.selection = selection;
|
||||
},
|
||||
//表格内开关
|
||||
changeSwitch(val, row) {
|
||||
row.status = row.status == "1" ? "0" : "1";
|
||||
row.$switch_status = true;
|
||||
setTimeout(() => {
|
||||
delete row.$switch_status;
|
||||
row.status = val;
|
||||
this.$message.success("操作成功");
|
||||
}, 500);
|
||||
},
|
||||
//搜索
|
||||
handleQuery() {
|
||||
},
|
||||
//根据ID获取树结构
|
||||
filterTree(id) {
|
||||
var target = null;
|
||||
|
||||
function filter(tree) {
|
||||
tree.forEach((item) => {
|
||||
if (item.id == id) {
|
||||
target = item;
|
||||
}
|
||||
if (item.children) {
|
||||
filter(item.children);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
filter(this.$refs.tableoperation.tableData);
|
||||
return target;
|
||||
},
|
||||
//本地更新数据
|
||||
handleSaveSuccess(data, mode) {
|
||||
if (mode == "add") {
|
||||
//删除
|
||||
table_del(row) {
|
||||
this.$API.opm.operation.delete
|
||||
.req(row.id)
|
||||
.then((res) => {
|
||||
this.$message.success("删除成功");
|
||||
this.$refs.tableoperation.refresh();
|
||||
} else if (mode == "edit") {
|
||||
this.$refs.tableoperation.refresh();
|
||||
}
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
},
|
||||
return res;
|
||||
})
|
||||
.catch((err) => {
|
||||
return err;
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
//表格选择后回调事件
|
||||
selectionChange(selection) {
|
||||
this.selection = selection;
|
||||
},
|
||||
//表格内开关
|
||||
changeSwitch(val, row) {
|
||||
row.status = row.status == "1" ? "0" : "1";
|
||||
row.$switch_status = true;
|
||||
setTimeout(() => {
|
||||
delete row.$switch_status;
|
||||
row.status = val;
|
||||
this.$message.success("操作成功");
|
||||
}, 500);
|
||||
},
|
||||
//搜索
|
||||
handleQuery() {
|
||||
let obj = {};
|
||||
obj.search = this.query.search;
|
||||
if (this.query.create_by == '000') {
|
||||
obj.create_by = '';
|
||||
} else {
|
||||
obj.create_by = this.query.create_by;
|
||||
}
|
||||
this.$refs.tableoperation.queryData(obj);
|
||||
},
|
||||
//根据ID获取树结构
|
||||
filterTree(id) {
|
||||
var target = null;
|
||||
function filter(tree) {
|
||||
tree.forEach((item) => {
|
||||
if (item.id == id) {
|
||||
target = item;
|
||||
}
|
||||
if (item.children) {
|
||||
filter(item.children);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
filter(this.$refs.tableoperation.tableData);
|
||||
return target;
|
||||
},
|
||||
//本地更新数据
|
||||
handleSaveSuccess(data, mode) {
|
||||
if (mode == "add") {
|
||||
this.$refs.tableoperation.refresh();
|
||||
} else if (mode == "edit") {
|
||||
this.$refs.tableoperation.refresh();
|
||||
}
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,22 @@
|
|||
let temp =JSON.stringify(data[i]);
|
||||
X ='<span style="color: #43e669;margin-right: 6px;">'+i+'</span>'+ '：' + temp+'<br>';
|
||||
}else{
|
||||
X ='<span style="color: #43e669;margin-right: 6px;">'+i+'</span>'+ '：' + data[i]+'<br>';
|
||||
let contents = [];
|
||||
let isString = typeof(data[i])=='string';
|
||||
var reg1 = new RegExp("\r\n", "g");
|
||||
var reg2 = new RegExp("\n", "g");
|
||||
var reg3 = new RegExp("\\n", "g");
|
||||
var reg4 = new RegExp("\n\n", "g");
|
||||
if(isString&&data[i].indexOf("\\n")>-1){
|
||||
debugger;
|
||||
console.log(data[i])
|
||||
contents = data[i].replace(reg4,"<br/>");
|
||||
console.log(contents)
|
||||
}else{
|
||||
contents = data[i];
|
||||
}
|
||||
// console.log(data[i].replace(/\r\n/g,'<br>'));
|
||||
X ='<span style="display:inline-block;color: #43e669;margin-right: 6px; white-space: pre-wrap;">'+i+'</span>'+ '：' + contents+'<br>';
|
||||
}
|
||||
dataStr += X;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,254 +8,206 @@
|
|||
</div>
|
||||
<div class="right-panel">
|
||||
<div class="right-panel-search">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="名称"
|
||||
clearable
|
||||
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
|
||||
></el-button>
|
||||
<el-select v-model="query.create_by">
|
||||
<el-option label="全部" value="000" />
|
||||
<el-option label="我的" :value="userId" />
|
||||
</el-select>
|
||||
<el-input v-model="query.search" placeholder="名称" clearable></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
|
||||
stripe
|
||||
@resetQuery="resetQuery"
|
||||
>
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe @resetQuery="resetQuery">
|
||||
<el-table-column label="#" type="index" fixed="left" width="50"></el-table-column>
|
||||
<el-table-column label="名称" prop="name" fixed="left" width="180"></el-table-column>
|
||||
<el-table-column label="项目类型" prop="type" width="180"
|
||||
>
|
||||
<template #default="scope"
|
||||
>{{ type_[scope.row.type] }}
|
||||
<el-table-column label="项目类型" prop="type" width="180">
|
||||
<template #default="scope">{{ type_[scope.row.type] }}
|
||||
</template>
|
||||
</el-table-column
|
||||
>
|
||||
<el-table-column
|
||||
label="合同编号"
|
||||
prop="contract_number"
|
||||
width="180"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="进厂时间"
|
||||
prop="come_time"
|
||||
width="180"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="离厂时间"
|
||||
prop="leave_time"
|
||||
width="180"
|
||||
></el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="合同编号" prop="contract_number" width="180"></el-table-column>
|
||||
<el-table-column label="进厂时间" prop="come_time" width="180"></el-table-column>
|
||||
<el-table-column label="离厂时间" prop="leave_time" width="180"></el-table-column>
|
||||
<el-table-column label="状态" prop="state" width="100">
|
||||
<template #default="scope">{{ state_[scope.row.state] }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批状态" width="200">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.ticket_&&scope.row.ticket_.state_" style="margin-right: 5px;">{{scope.row.ticket_.state_.name }}</span>
|
||||
<el-tag
|
||||
v-if="scope.row.ticket_&&scope.row.ticket_.act_state"
|
||||
:type="scope.row.ticket_.act_state===0?'':scope.row.ticket_.act_state===1?'':scope.row.ticket_.act_state===2?'danger':scope.row.ticket_.act_state===3?'danger':scope.row.ticket_.act_state===5?'danger':scope.row.ticket_.act_state===4?'success':''"
|
||||
>{{act_states[scope.row.ticket_.act_state]}}
|
||||
<span v-if="scope.row.ticket_ && scope.row.ticket_.state_"
|
||||
style="margin-right: 5px;">{{ scope.row.ticket_.state_.name }}</span>
|
||||
<el-tag v-if="scope.row.ticket_ && scope.row.ticket_.act_state"
|
||||
:type="scope.row.ticket_.act_state === 0 ? '' : scope.row.ticket_.act_state === 1 ? '' : scope.row.ticket_.act_state === 2 ? 'danger' : scope.row.ticket_.act_state === 3 ? 'danger' : scope.row.ticket_.act_state === 5 ? 'danger' : scope.row.ticket_.act_state === 4 ? 'success' : ''">
|
||||
{{ act_states[scope.row.ticket_.act_state] }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="所属部门"
|
||||
prop="belong_dept_name"
|
||||
width="180"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="相关方"
|
||||
prop="rparty_name"
|
||||
width="180"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="创建人"
|
||||
prop="create_by"
|
||||
width="180"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
prop="create_time"
|
||||
width="180"
|
||||
></el-table-column>
|
||||
<el-table-column label="所属部门" prop="belong_dept_name" width="180"></el-table-column>
|
||||
<el-table-column label="相关方" prop="rparty_name" width="180"></el-table-column>
|
||||
<el-table-column label="创建人" prop="create_by" width="180"></el-table-column>
|
||||
<el-table-column label="创建时间" prop="create_time" width="180"></el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="180">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
v-if="scope.row.state===10"
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="next_add(scope.row, scope.$index)"
|
||||
v-auth="'rpj.update'"
|
||||
>继续编辑
|
||||
</el-button>
|
||||
<el-button v-if="scope.row.state === 10" link type="primary" size="small"
|
||||
@click="next_add(scope.row, scope.$index)" v-auth="'rpj.update'">继续编辑
|
||||
</el-button>
|
||||
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="table_show(scope.row, scope.$index)"
|
||||
>查看
|
||||
</el-button>
|
||||
<!--<el-button
|
||||
<el-button link type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
|
||||
</el-button>
|
||||
<!--<el-button
|
||||
text
|
||||
type="warning"
|
||||
size="small"
|
||||
@click="table_edit(scope.row, scope.$index)"
|
||||
>编辑
|
||||
</el-button>-->
|
||||
<el-popconfirm
|
||||
title="确定删除吗？"
|
||||
@confirm="table_del(scope.row, scope.$index)"
|
||||
>
|
||||
<template #reference>
|
||||
<el-button link type="danger" size="small" v-auth="'rpj.delete'">删除</el-button>
|
||||
</template>
|
||||
</el-popconfirm>
|
||||
<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
|
||||
<template #reference>
|
||||
<el-button link type="danger" size="small" v-auth="'rpj.delete'">删除</el-button>
|
||||
</template>
|
||||
</el-popconfirm>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
|
||||
<save-dialog
|
||||
v-if="dialog.save"
|
||||
ref="saveDialog"
|
||||
@success="handleSaveSuccess"
|
||||
@closed="dialog.save = false"
|
||||
></save-dialog>
|
||||
<show-dialog
|
||||
v-if="dialog.show"
|
||||
ref="showDialog"
|
||||
@closed="dialog.show = false"
|
||||
></show-dialog>
|
||||
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save = false">
|
||||
</save-dialog>
|
||||
<show-dialog v-if="dialog.show" ref="showDialog" @closed="dialog.show = false"></show-dialog>
|
||||
</template>
|
||||
<script>
|
||||
import saveDialog from "./rpj_form.vue";
|
||||
import showDialog from "./rpj_show.vue";
|
||||
import saveDialog from "./rpj_form.vue";
|
||||
import showDialog from "./rpj_show.vue";
|
||||
|
||||
export default {
|
||||
name: "remployee",
|
||||
components: {
|
||||
saveDialog,
|
||||
showDialog,
|
||||
export default {
|
||||
name: "remployee",
|
||||
components: {
|
||||
saveDialog,
|
||||
showDialog,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialog: {
|
||||
save: false,
|
||||
show: false,
|
||||
permission: false,
|
||||
},
|
||||
adminform: {
|
||||
username: "",
|
||||
},
|
||||
apiObj: this.$API.rpm.rpj.list,
|
||||
query: {
|
||||
search: '',
|
||||
create_by: '000'
|
||||
},
|
||||
userId: '',
|
||||
selection: [],
|
||||
search: {
|
||||
search: '',
|
||||
keyword: null,
|
||||
},
|
||||
type_: {
|
||||
10: "建筑施工",
|
||||
20: "设备设施检维修",
|
||||
30: "保安保洁服务",
|
||||
40: "其他",
|
||||
},
|
||||
state_: {
|
||||
10: "创建中",
|
||||
20: "审批中",
|
||||
30: "待入厂",
|
||||
40: "进行中",
|
||||
50: "已完成",
|
||||
},
|
||||
act_states: {
|
||||
0: "草稿中",
|
||||
1: "进行中",
|
||||
2: "被退回",
|
||||
3: "被撤回",
|
||||
4: "已完成",
|
||||
5: "已关闭",
|
||||
},
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
let userInfo = this.$TOOL.data.get("USER_INFO");
|
||||
this.userId = userInfo.id;
|
||||
},
|
||||
methods: {
|
||||
//添加
|
||||
add() {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("add");
|
||||
});
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialog: {
|
||||
save: false,
|
||||
show: false,
|
||||
permission: false,
|
||||
},
|
||||
adminform: {
|
||||
username: "",
|
||||
},
|
||||
apiObj: this.$API.rpm.rpj.list,
|
||||
query: {},
|
||||
selection: [],
|
||||
search: {
|
||||
keyword: null,
|
||||
},
|
||||
type_: {
|
||||
10: "建筑施工",
|
||||
20: "设备设施检维修",
|
||||
30: "保安保洁服务",
|
||||
40: "其他",
|
||||
},
|
||||
state_: {
|
||||
10: "创建中",
|
||||
20: "审批中",
|
||||
30: "待入厂",
|
||||
40: "进行中",
|
||||
50: "已完成",
|
||||
},
|
||||
act_states: {
|
||||
0: "草稿中",
|
||||
1: "进行中",
|
||||
2: "被退回",
|
||||
3: "被撤回",
|
||||
4: "已完成",
|
||||
5: "已关闭",
|
||||
},
|
||||
};
|
||||
//编辑
|
||||
table_edit(row) {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("edit").setData(row);
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
//添加
|
||||
add() {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("add");
|
||||
});
|
||||
},
|
||||
//编辑
|
||||
table_edit(row) {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("edit").setData(row);
|
||||
});
|
||||
},
|
||||
//查看
|
||||
table_show(row) {
|
||||
debugger;
|
||||
this.dialog.show = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.showDialog.open().setData(row);
|
||||
});
|
||||
},
|
||||
|
||||
//权限设置
|
||||
permission() {
|
||||
this.dialog.permission = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.permissionDialog.open();
|
||||
});
|
||||
},
|
||||
//删除
|
||||
async table_del(row) {
|
||||
this.$API.rpm.rpj.delete
|
||||
.req(row.id)
|
||||
.then((res) => {
|
||||
this.$message.success("删除成功");
|
||||
|
||||
return res;
|
||||
})
|
||||
.catch((err) => {
|
||||
return err;
|
||||
});
|
||||
},
|
||||
next_add(row) {
|
||||
this.$router.push({
|
||||
name: "rpjadd",
|
||||
query: {
|
||||
rpjid: row.id, //入厂项目id
|
||||
},
|
||||
});
|
||||
},
|
||||
|
||||
//本地更新数据
|
||||
handleSaveSuccess(data, mode) {
|
||||
if (mode == "add") {
|
||||
this.$refs.table.refresh();
|
||||
} else if (mode == "edit") {
|
||||
this.$refs.table.refresh();
|
||||
}
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
},
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query)
|
||||
},
|
||||
//查看
|
||||
table_show(row) {
|
||||
// debugger;
|
||||
this.dialog.show = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.showDialog.open().setData(row);
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
//权限设置
|
||||
permission() {
|
||||
this.dialog.permission = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.permissionDialog.open();
|
||||
});
|
||||
},
|
||||
//删除
|
||||
async table_del(row) {
|
||||
this.$API.rpm.rpj.delete
|
||||
.req(row.id)
|
||||
.then((res) => {
|
||||
this.$message.success("删除成功");
|
||||
|
||||
return res;
|
||||
})
|
||||
.catch((err) => {
|
||||
return err;
|
||||
});
|
||||
},
|
||||
next_add(row) {
|
||||
this.$router.push({
|
||||
name: "rpjadd",
|
||||
query: {
|
||||
rpjid: row.id, //入厂项目id
|
||||
},
|
||||
});
|
||||
},
|
||||
|
||||
//本地更新数据
|
||||
handleSaveSuccess(data, mode) {
|
||||
if (mode == "add") {
|
||||
this.$refs.table.refresh();
|
||||
} else if (mode == "edit") {
|
||||
this.$refs.table.refresh();
|
||||
}
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
},
|
||||
//搜索
|
||||
handleQuery() {
|
||||
let obj = {};
|
||||
obj.search = this.query.search;
|
||||
if (this.query.create_by == '000') {
|
||||
obj.create_by = '';
|
||||
} else {
|
||||
obj.create_by = this.query.create_by;
|
||||
}
|
||||
this.$refs.table.queryData(obj);
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
|
||||
<!-- <el-table-column type="selection" width="50"></el-table-column> -->
|
||||
<el-table-column label="#" type="index" width="50"></el-table-column>
|
||||
<el-table-column label="角色名称" prop="name" width="250"></el-table-column>
|
||||
<el-table-column label="角色标识" prop="code" width="150"></el-table-column>
|
||||
<el-table-column label="角色描述" prop="description" width="150"></el-table-column>
|
||||
<el-table-column label="角色名称" prop="name" min-width="100"></el-table-column>
|
||||
<el-table-column label="角色标识" prop="code" min-width="100"></el-table-column>
|
||||
<el-table-column label="角色描述" prop="description" min-width="150"></el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="140">
|
||||
<template #default="scope">
|
||||
<el-button link size="small" @click="roleEdit(scope.row, scope.$index)" v-auth="'role.update'" type="primary">编辑</el-button>
|
||||
|
|
@ -51,9 +51,11 @@
|
|||
ref="menu"
|
||||
node-key="id"
|
||||
show-checkbox
|
||||
:check-strictly="checkStrictly"
|
||||
:data="menu.list"
|
||||
:props="menu.props"
|
||||
@check="handleChange"
|
||||
@check-change="checkChange"
|
||||
></el-tree>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
|
@ -86,6 +88,7 @@
|
|||
query: {},
|
||||
isSaving: false,
|
||||
limitedVisible : false,
|
||||
checkStrictly:true,
|
||||
type: "add",
|
||||
titleMap: {
|
||||
add: '新增',
|
||||
|
|
@ -123,6 +126,17 @@
|
|||
handleChange(item, check) {
|
||||
this.menu.checked = check.checkedKeys;
|
||||
},
|
||||
checkChange(item, check,node) {
|
||||
let that = this;
|
||||
if(check){//选中
|
||||
if(item.parent!==null){
|
||||
if(that.menu.checked.indexOf(item.parent)>-1){}else{
|
||||
that.menu.checked.push(item.parent)
|
||||
}
|
||||
that.$refs.menu.setChecked(item.parent,true,false);
|
||||
}
|
||||
}
|
||||
},
|
||||
//加载树数据
|
||||
async getGroup() {
|
||||
let res = await this.$API.system.permission.list.req({page: 0});
|
||||
|
|
|
|||
Loading…
Reference in New Issue