zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

newMap

This commit is contained in:
shijing 2022-09-12 14:33:27 +08:00
parent 1ed6787310
commit 849dee3e4a
42 changed files with 160 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.development
View File

@ -7,10 +7,11 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
# 接口地址 # 接口地址
#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
#VUE_APP_WS_API = 'ws://localhost:8000' #VUE_APP_WS_API = 'ws://localhost:8000'
#VUE_APP_API_BASEURL = http://10.99.5.79:20309/api VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
VUE_APP_API_BASEURL = http://127.0.0.1:8000/api #VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
VUE_APP_BASEURL = http://127.0.0.1:8000 VUE_APP_BASEURL = http://127.0.0.1:8000
# 本地端口 # 本地端口
VUE_APP_PORT = 2800 VUE_APP_PORT = 2800

BIN
public/data/map/0000/floors/F1/NoLod_0.b3dm
View File

Binary file not shown.

BIN
public/data/map/0000/floors/F1/NoLod_1.cmpt
View File

Binary file not shown.

BIN
public/data/map/0000/floors/F1/NoLod_2.cmpt
View File

Binary file not shown.

2
public/data/map/0000/floors/F1/scenetree.json
View File

File diff suppressed because one or more lines are too long

2
public/data/map/0000/floors/F1/tileset.json
View File

@ -1 +1 @@
{"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]}} {"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":729.153637399664,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[260.160376041546,359.026835576631,9.54808784462512,364.576818699832,0,0,0,291.546981683467,0,0,0,9.60555503051728]},"children":[{"boundingVolume":{"box":[332.332748413086,328.44495010376,2.66666650772094,178.721725463867,0,0,0,256.783626556396,0,0,0,2.66666650772095]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[244.943717956543,359.015686035156,9.56152819287264,349.351875305176,0,0,0,291.531188964844,0,0,0,9.5615282188705]},"content":{"uri":"NoLod_1.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[260.148765563965,359.284801483154,5.1301535964012,364.556922912598,0,0,0,291.262073516846,0,0,0,5.13015371561051]},"content":{"uri":"NoLod_2.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":729.153637399664,"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]}}

BIN
public/data/map/0000/floors/F2/NoLod_0.cmpt
View File

Binary file not shown.

2
public/data/map/0000/floors/F2/scenetree.json
View File

File diff suppressed because one or more lines are too long

2
public/data/map/0000/floors/F2/tileset.json
View File

@ -1 +1 @@
{"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]}} {"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":336.964365107473,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[356.889695911785,332.701583136106,10.2471229815856,162.296591556747,0,0,0,168.482182553736,0,0,0,10.2786699868739]},"children":[{"boundingVolume":{"box":[356.883804321289,332.696495056152,10.2551507949829,162.289352416992,0,0,0,168.470497131348,0,0,0,10.2551507949829]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":336.964365107473,"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]}}

BIN
public/data/map/0000/floors/F3/NoLod_0.cmpt
View File

Binary file not shown.

2
public/data/map/0000/floors/F3/scenetree.json
View File

@ -1 +1 @@
{"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"}]} {"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"3F3","sphere":[-2178018.50100926,4388465.68431375,4070210.19495718,37.8184143932611],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F3","sphere":[-2178018.50100926,4388465.68431375,4070210.19495718,37.8184143932611],"type":"node"},{"children":[{"id":"1385974ed5904a438616ff7bdb3f7439_1","name":"5F3","sphere":[-2178031.60407231,4388448.42522664,4070221.7050806,49.1301756845489],"type":"element"}],"id":"f0935e4cd5920aa6c7c996a5ee53a70f_1","name":"5F3","sphere":[-2178031.60407231,4388448.42522664,4070221.7050806,49.1301756845489],"type":"node"},{"children":[{"id":"555d6702c950ecb729a966504af0a635_2","name":"9F3","sphere":[-2178105.07705503,4388346.60712926,4070300.64958941,114.54834301924],"type":"element"}],"id":"eae27d77ca20db309e056e3d2dcd7d69_2","name":"9F3","sphere":[-2178105.07705503,4388346.60712926,4070300.64958941,114.54834301924],"type":"node"},{"children":[{"id":"9de6d14fff9806d4bcd1ef555be766cd_3","name":"19F3","sphere":[-2177953.30625944,4388417.82038216,4070296.46168306,85.0507740805845],"type":"element"}],"id":"3fe94a002317b5f9259f82690aeea4cd_3","name":"19F3","sphere":[-2177953.30625944,4388417.82038216,4070296.46168306,85.0507740805845],"type":"node"},{"children":[{"id":"9a96876e2f8f3dc4f3cf45f02c61c0c1_4","name":"27F3","sphere":[-2177940.5399923,4388355.6256027,4070370.29082181,58.1701905390415],"type":"element"}],"id":"0deb1c54814305ca9ad266f53bc82511_4","name":"27F3","sphere":[-2177940.5399923,4388355.6256027,4070370.29082181,58.1701905390415],"type":"node"},{"children":[{"id":"9b72e31dac81715466cd580a448cf823_5","name":"35F3","sphere":[-2177823.88394648,4388389.55147948,4070395.33371241,43.2236236957598],"type":"element"}],"id":"2d6cc4b2d139a53512fb8cbb3086ae2e_5","name":"35F3","sphere":[-2177823.88394648,4388389.55147948,4070395.33371241,43.2236236957598],"type":"node"},{"children":[{"id":"185c29dc24325934ee377cfda20e414c_6","name":"36F3","sphere":[-2177879.39998858,4388352.60926307,4070405.23707734,54.0975855402698],"type":"element"}],"id":"acc3e0404646c57502b480dc052c4fe1_6","name":"36F3","sphere":[-2177879.39998858,4388352.60926307,4070405.23707734,54.0975855402698],"type":"node"},{"children":[{"id":"aba3b6fd5d186d28e06ff97135cade7f_7","name":"48F3","sphere":[-2177895.01902485,4388384.95601556,4070375.15763571,71.4845040558291],"type":"element"}],"id":"7f5d04d189dfb634e6a85bb9d9adf21e_7","name":"48F3","sphere":[-2177895.01902485,4388384.95601556,4070375.15763571,71.4845040558291],"type":"node"},{"children":[{"id":"43fa7f58b7eac7ac872209342e62e8f1_8","name":"64F3","sphere":[-2177852.82505158,4388373.95439428,4070395.82561574,40.4745862663681],"type":"element"}],"id":"6e0721b2c6977135b916ef286bcb49ec_8","name":"64F3","sphere":[-2177852.82505158,4388373.95439428,4070395.82561574,40.4745862663681],"type":"node"}]}

2
public/data/map/0000/floors/F3/tileset.json
View File

@ -1 +1 @@
{"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]}} {"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":311.450640053255,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[364.357528544846,320.698907062178,10.2496432997286,155.725320026628,0,0,0,139.348868321395,0,0,0,10.2752380399033]},"children":[{"boundingVolume":{"box":[364.35213470459,320.694847106934,10.2551498413086,155.718727111816,0,0,0,139.338569641113,0,0,0,10.2551498413086]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":311.450640053255,"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]}}

BIN
public/data/map/0000/floors/F4/NoLod_0.cmpt
View File

Binary file not shown.

2
public/data/map/0000/floors/F4/scenetree.json
View File

@ -1 +1 @@
{"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"}]} {"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"3F4","sphere":[-2178018.49248575,4388465.66713678,4070210.17892003,37.7717111736954],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F4","sphere":[-2178018.49248575,4388465.66713678,4070210.17892003,37.7717111736954],"type":"node"},{"children":[{"id":"1385974ed5904a438616ff7bdb3f7439_1","name":"5F4","sphere":[-2178031.63700997,4388448.49160392,4070221.7670533,49.3096984131552],"type":"element"}],"id":"f0935e4cd5920aa6c7c996a5ee53a70f_1","name":"5F4","sphere":[-2178031.63700997,4388448.49160392,4070221.7670533,49.3096984131552],"type":"node"},{"children":[{"id":"555d6702c950ecb729a966504af0a635_2","name":"9F4","sphere":[-2178102.41115256,4388346.46949829,4070297.26171086,114.174271506014],"type":"element"}],"id":"eae27d77ca20db309e056e3d2dcd7d69_2","name":"9F4","sphere":[-2178102.41115256,4388346.46949829,4070297.26171086,114.174271506014],"type":"node"},{"children":[{"id":"0bb4aec1710521c12ee76289d9440817_3","name":"35F4","sphere":[-2177823.3229888,4388390.2492641,4070394.72568501,45.6459852920301],"type":"element"}],"id":"3fe94a002317b5f9259f82690aeea4cd_3","name":"35F4","sphere":[-2177823.3229888,4388390.2492641,4070394.72568501,45.6459852920301],"type":"node"},{"children":[{"id":"2421fcb1263b9530df88f7f002e78ea5_4","name":"36F4","sphere":[-2177879.69881051,4388353.21131779,4070404.51138508,55.94515450969],"type":"element"}],"id":"69cb3ea317a32c4e6143e665fdb20b14_4","name":"36F4","sphere":[-2177879.69881051,4388353.21131779,4070404.51138508,55.94515450969],"type":"node"},{"children":[{"id":"298f95e1bf9136124592c8d4825a06fc_5","name":"48F4","sphere":[-2177893.32208356,4388381.47424735,4070371.9183465,61.8938769084992],"type":"element"}],"id":"05f971b5ec196b8c65b75d2ef8267331_5","name":"48F4","sphere":[-2177893.32208356,4388381.47424735,4070371.9183465,61.8938769084992],"type":"node"}]}

2
public/data/map/0000/floors/F4/tileset.json
View File

@ -1 +1 @@
{"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]}} {"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":312.162410588237,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[363.103096635197,320.698471311713,5.20051235565916,156.081205294118,0,0,0,139.348474974511,0,0,0,5.22603405686095]},"children":[{"boundingVolume":{"box":[363.098091125488,320.694831848144,5.20595550537107,156.075065612793,0,0,0,139.338554382324,0,0,0,5.2059555053711]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":312.162410588237,"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]}}

BIN
public/data/map/0000/floors/F5/NoLod_0.cmpt
View File

Binary file not shown.

2
public/data/map/0000/floors/F5/scenetree.json
View File

@ -1 +1 @@
{"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"}]} {"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"5F5","sphere":[-2178032.41351211,4388450.05115666,4070223.20522699,52.9101953566222],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"5F5","sphere":[-2178032.41351211,4388450.05115666,4070223.20522699,52.9101953566222],"type":"node"},{"children":[{"id":"a8f15eda80c50adb0e71943adc8015cf_1","name":"9F5","sphere":[-2178110.39997978,4388330.44985224,4070306.39121349,60.2860571522366],"type":"element"}],"id":"eb160de1de89d9058fcb0b968dbbbd68_1","name":"9F5","sphere":[-2178110.39997978,4388330.44985224,4070306.39121349,60.2860571522366],"type":"node"},{"children":[{"id":"077e29b11be80ab57e1a2ecabb7da330_2","name":"35F5","sphere":[-2177825.6226832,4388397.65128469,4070398.48245372,68.3230915065948],"type":"element"}],"id":"45fbc6d3e05ebd93369ce542e8f2322d_2","name":"35F5","sphere":[-2177825.6226832,4388397.65128469,4070398.48245372,68.3230915065948],"type":"node"},{"children":[{"id":"c058f544c737782deacefa532d9add4c_3","name":"48F5","sphere":[-2177894.0982884,4388383.03848682,4070373.35165645,65.5990215478889],"type":"element"}],"id":"89f0fd5c927d466d6ec9a21b9ac34ffa_3","name":"48F5","sphere":[-2177894.0982884,4388383.03848682,4070373.35165645,65.5990215478889],"type":"node"}]}

2
public/data/map/0000/floors/F5/tileset.json
View File

@ -1 +1 @@
{"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]}} {"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":315.699794427725,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[361.228811640409,318.400731931441,10.2756728595123,157.849897213862,0,0,0,125.023257025983,0,0,0,10.2987403851002]},"children":[{"boundingVolume":{"box":[361.223625183105,318.396354675293,10.2805328369141,157.843940734863,0,0,0,125.011268615723,0,0,0,10.2805328369141]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":315.699794427725,"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]}}

BIN
public/data/map/0000/map/NoLod_0.b3dm
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_1.b3dm
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_10.cmpt
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_11.cmpt Normal file
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_2.cmpt
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_3.cmpt
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_4.cmpt
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_5.cmpt
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_6.cmpt
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_7.b3dm Normal file
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_8.cmpt
View File

Binary file not shown.

BIN
public/data/map/0000/map/NoLod_9.cmpt
View File

Binary file not shown.

2
public/data/map/0000/map/scenetree.json
View File

File diff suppressed because one or more lines are too long

2
public/data/map/0000/map/tileset.json
View File

@ -1 +1 @@
{"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]}} {"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":847.178673364222,"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":[280.879172582529,262.943389467429,41.8013344202191,385.299789182958,0,0,0,423.589336682111,0,0,0,41.8726648548618]},"children":[{"boundingVolume":{"box":[251.507033586502,263.641495573935,37.3399963158164,355.30607676506,0,0,0,387.255379807535,0,0,0,37.3399963599649]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[327.486883838739,276.826900502986,41.8050591945648,297.535364826287,0,0,0,402.243244345948,0,0,0,41.805059671402]},"content":{"uri":"NoLod_1.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[333.68842657425,268.169772277712,34.0008294582367,303.935018826293,0,0,0,416.708141227256,0,0,0,34.0008299350738]},"content":{"uri":"NoLod_2.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[279.989022899983,275.557225427875,25.880443572998,384.397180248616,0,0,0,409.320687876302,0,0,0,25.8804435729981]},"content":{"uri":"NoLod_3.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[327.539059583022,260.553237514219,22.0856399303954,297.483189082004,0,0,0,419.292293608954,0,0,0,22.0856399768312]},"content":{"uri":"NoLod_4.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[332.026396186384,288.222782793389,6.80855184793471,58.5481097549296,0,0,0,390.710208719678,0,0,0,5.0501384139061]},"content":{"uri":"NoLod_5.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[391.142535529039,421.210428028205,30.5992050170898,220.240338006117,0,0,0,256.9844301034,0,0,0,30.5991897583008]},"content":{"uri":"NoLod_6.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[257.557134949309,274.384831535792,4.76969218044541,51.6714232793874,0,0,0,398.872517902369,0,0,0,4.76969218463637]},"content":{"uri":"NoLod_7.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[279.989022899983,262.956235043612,41.8050593137741,384.397180248616,0,0,0,421.921740302872,0,0,0,41.8050595521927]},"content":{"uri":"NoLod_8.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[393.677130898842,274.052659481922,23.4889984021581,244.145372935342,0,0,0,408.03427497828,0,0,0,23.4889984240138]},"content":{"uri":"NoLod_9.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[271.436798095703,253.469684523831,36.0258311033249,239.049346923828,0,0,0,378.886028366794,0,0,0,36.0258313417435]},"content":{"uri":"NoLod_10.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[308.408320392492,275.646399701986,8.87737855966929,278.456801380041,0,0,0,401.606284467141,0,0,0,8.87737836782093]},"content":{"uri":"NoLod_11.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":847.178673364222,"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]}}

2
public/data/map/0000/mapConfig.conf
View File

File diff suppressed because one or more lines are too long

3
src/config/index.js
View File

@ -26,6 +26,9 @@ const DEFAULT_CONFIG = {
//追加其他头 //追加其他头
HEADERS: {}, HEADERS: {},
//视频地址
VUE_APP_VIDEOHOST : '10.99.5.24',
//请求是否开启缓存 //请求是否开启缓存
REQUEST_CACHE: false, REQUEST_CACHE: false,

2
src/config/table.js
View File

@ -5,7 +5,7 @@ import tool from '@/utils/tool'
export default { export default {
successCode: 200, //请求完成代码 successCode: 200, //请求完成代码
pageSize: 20, //表格每一页条数 pageSize: 20, //表格每一页条数
pageSizes: [1, 10, 20, 30, 40, 50], //表格可设置的一页条数 pageSizes: [1, 10, 20, 30, 40, 50,100,200], //表格可设置的一页条数
paginationLayout: "total, sizes, prev, pager, next, jumper", //表格分页布局，可设置"total, sizes, prev, pager, next, jumper" paginationLayout: "total, sizes, prev, pager, next, jumper", //表格分页布局，可设置"total, sizes, prev, pager, next, jumper"
parseData: function (res) { //数据分析 parseData: function (res) { //数据分析
return { return {

2
src/views/am/vchannel_view.vue
View File

@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所在区域" prop="name"> <el-form-item label="所在区域" prop="name">
<el-select v-model="form.area" style="width: 100%"> <el-select v-model="form.area" filterable 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-select>
</el-form-item> </el-form-item>

15
src/views/am/videoView.vue
View File

@ -4,6 +4,7 @@
</div> </div>
</template> </template>
<script> <script>
import sysConfig from "@/config";
export default { export default {
props: { props: {
channelCode: { channelCode: {
@ -36,11 +37,18 @@ export default {
that.params.json.data.channelId = that.channelCode; that.params.json.data.channelId = that.channelCode;
that.$API.am.video.item.req(that.params).then((res) => { that.$API.am.video.item.req(that.params).then((res) => {
that.url = res.url; that.url = res.url;
debugger;
if (flvjs.isSupported()) { if (flvjs.isSupported()) {
debugger;
console.log(sysConfig.VUE_APP_VIDEOHOST);
debugger;
let videoElement = document.getElementById("videoElement"); let videoElement = document.getElementById("videoElement");
let URLS = res.url.replace('192.168.10.253',sysConfig.VUE_APP_VIDEOHOST);
debugger;
console.log(URLS)
that.flvPlayer = flvjs.createPlayer({ that.flvPlayer = flvjs.createPlayer({
type: "flv", type: "flv",
url: res.url, url: URLS,
}); });
that.flvPlayer.attachMediaElement(videoElement); that.flvPlayer.attachMediaElement(videoElement);
that.flvPlayer.load(); that.flvPlayer.load();
@ -48,9 +56,8 @@ export default {
} }
}); });
}, },
unmounted () { beforeUnmount(){
debugger; let that = this;
let that = this;
that.flvPlayer.pause(); that.flvPlayer.pause();
that.flvPlayer.unload(); that.flvPlayer.unload();
that.flvPlayer.detachMediaElement(); that.flvPlayer.detachMediaElement();

25
src/views/bigScreen/index.vue
View File

@ -749,7 +749,7 @@
</template> </template>
<script> <script>
import { genTree } from "@/utils/verificate"; import { genTree } from "@/utils/verificate";
import sysConfig from "@/config";
export default { export default {
data() { data() {
return { return {
@ -1007,11 +1007,12 @@ export default {
this.$API.am.video.item.req(this.params).then(res => { this.$API.am.video.item.req(this.params).then(res => {
console.log(res); console.log(res);
this.url = res.url; this.url = res.url;
let URLS = res.url.replace('192.168.10.253',sysConfig.VUE_APP_VIDEOHOST);
if (flvjs.isSupported()) { if (flvjs.isSupported()) {
let videoElement = document.getElementById(item.markers[0].id + 'videoPlayer'); let videoElement = document.getElementById(item.markers[0].id + 'videoPlayer');
let flvPlayer = flvjs.createPlayer({ let flvPlayer = flvjs.createPlayer({
type: 'flv', type: 'flv',
url: res.url url: URLS
}); });
flvPlayer.attachMediaElement(videoElement); flvPlayer.attachMediaElement(videoElement);
flvPlayer.load(); flvPlayer.load();
@ -1429,7 +1430,7 @@ export default {
let pixel = item.my_info.location; let pixel = item.my_info.location;
if(pixel.x){ if(pixel.x){
cameraMarker = new jsmap.JSIconTextMarker({ cameraMarker = new jsmap.JSIconTextMarker({
id: item.channelCode, id: item.channelCode,
position: { x: pixel.x, y: pixel.y, z: pixel.z }, //坐标 position: { x: pixel.x, y: pixel.y, z: pixel.z }, //坐标
floorId: pixel.floorId, //楼层id,默认为1（地面） floorId: pixel.floorId, //楼层id,默认为1（地面）
image: "/img/camera.svg", image: "/img/camera.svg",
@ -1764,12 +1765,19 @@ export default {
getVchannels() { getVchannels() {
let that = this; let that = this;
// debugger; // debugger;
that.$API.am.tdevice.vchannel.req({page_size:999}).then(res => { that.$API.am.tdevice.vchannel.req({pageSize:999}).then(res => {
if (res.err_msg) { if (res.err_msg) {
that.$message.error(res.err_msg); that.$message.error(res.err_msg);
} else { } else {
that.Vchannels = res.pageData; debugger;
that.showCameraMarkers(res.pageData); console.log(res.pageData.length)
let Vchannels = res.pageData.filter(item=>{
return item.my_info.location!==undefined;
})
that.Vchannels = Vchannels;
// debugger;
console.log(Vchannels.length)
that.showCameraMarkers(Vchannels);
} }
}); });
}, },
@ -1781,7 +1789,10 @@ export default {
if (res.err_msg) { if (res.err_msg) {
that.$message.error(res.err_msg); that.$message.error(res.err_msg);
} else { } else {
that.speakerList = res.rows; let list = res.rows.filter(item=>{
return item.my_info.location!==undefined;
})
that.speakerList = list;
that.showSpeakersMarkers(res.rows); that.showSpeakersMarkers(res.rows);
} }
}); });

39
src/views/ecm/event.vue
View File

@ -152,15 +152,24 @@
</el-table-column> </el-table-column>
</scTable> </scTable>
</el-main> </el-main>
<detail-dialog
v-if="dialog.handle"
ref="handleDialog"
:eventID="eventID"
@success="handleSuccess"
@closed="dialog.handle = false"
></detail-dialog>
</el-container> </el-container>
</template> </template>
<script> <script>
import detailDialog from "./event_handlefrom.vue";
import { CircleCheckFilled, CircleCloseFilled } from "@element-plus/icons-vue"; import { CircleCheckFilled, CircleCloseFilled } from "@element-plus/icons-vue";
export default { export default {
name: "event", name: "event",
components: { components: {
CircleCheckFilled, CircleCheckFilled,
CircleCloseFilled, CircleCloseFilled,
detailDialog
}, },
data() { data() {
return { return {
@ -170,6 +179,7 @@ export default {
areaOptions: [], areaOptions: [],
dialog: { dialog: {
save: false, save: false,
handle: false,
permission: false, permission: false,
}, },
apiObj: this.$API.ecm.event.list, apiObj: this.$API.ecm.event.list,
@ -178,6 +188,7 @@ export default {
search: { search: {
keyword: null, keyword: null,
}, },
eventID:'',
}; };
}, },
created() { created() {
@ -185,13 +196,20 @@ export default {
this.getAreaOptions(); this.getAreaOptions();
}, },
methods: { methods: {
//处理
table_handle(row) {
this.eventID = row.id;
this.dialog.handle = true;
this.$nextTick(() => {
this.$refs.handleDialog.open("edit").setData(row);
});
},
//查看 //查看
table_show(row) { table_show(row) {
this.$router.push({ this.eventID = row.id;
name: "eventhandlefrom", this.dialog.handle = true;
query: { this.$nextTick(() => {
id: row.id, this.$refs.handleDialog.open("show").setData(row);
},
}); });
}, },
getCateOptions() { getCateOptions() {
@ -204,15 +222,10 @@ export default {
this.areaOptions = res; this.areaOptions = res;
}) })
}, },
//事件处理 handleSuccess(){
table_handle(row) {
this.$router.push({
name: "eventhandlefrom",
query: {
id: row.id,
},
});
}, },
//搜索 //搜索
handleQuery() { handleQuery() {
if(this.timeRange){ if(this.timeRange){

38
src/views/ecm/event_handlefrom.vue
View File

@ -1,6 +1,12 @@
<template> <template>
<el-drawer
:title="titleMap[mode]"
v-model="visible"
:size="1000"
destroy-on-close
@closed="$emit('closed')"
>
<el-container v-loading="loading"> <el-container v-loading="loading">
<!--<sc-title title="详细信息"></sc-title>-->
<el-main> <el-main>
<el-card> <el-card>
<el-descriptions title="事件信息" :border="true"> <el-descriptions title="事件信息" :border="true">
@ -86,7 +92,7 @@
type="textarea" type="textarea"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item v-if="mode==='edit'">
<el-button type="primary" @click="onSubmit">保存</el-button> <el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -100,6 +106,7 @@
stripe stripe
hidePagination hidePagination
hideRefresh hideRefresh
hideDo
> >
<el-table-column label="#" type="index" width="50"></el-table-column> <el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="事件种类" width="200"> <el-table-column label="事件种类" width="200">
@ -151,12 +158,19 @@
</el-card> </el-card>
</el-main> </el-main>
</el-container> </el-container>
</el-drawer>
</template> </template>
<script> <script>
export default { export default {
name: "eventfrom", name: "eventfrom",
emits: ["success", "closed"], emits: ["success", "closed"],
props: {
eventID: {
type: String,
default: ""
}
},
data() { data() {
return { return {
loading: false, loading: false,
@ -164,6 +178,7 @@ export default {
isSaveing: false, isSaveing: false,
mode: "show", mode: "show",
titleMap: { titleMap: {
edit: "事件处理",
show: "事件信息查看", show: "事件信息查看",
}, },
type_options: [ type_options: [
@ -186,19 +201,30 @@ export default {
], ],
form: {}, form: {},
remindData: [], remindData: [],
eventID: "", eventId: "",
}; };
}, },
mounted() { mounted() {
this.eventID = this.$route.query.id; //事件的ID this.eventId = this.eventID; //事件的ID
this.getEvent(); this.getEvent();
this.getRemind(); this.getRemind();
}, },
methods: { methods: {
//显示
open(mode = "show") {
debugger;
this.mode = mode;
this.visible = true;
return this;
},
//表单注入数据
setData(data) {
Object.assign(this.form, data);
},
getEvent() { getEvent() {
this.loading = true; this.loading = true;
this.$API.ecm.event.item this.$API.ecm.event.item
.req(this.eventID) .req(this.eventId)
.then((res) => { .then((res) => {
this.loading = false; this.loading = false;
this.form = res; this.form = res;
@ -209,7 +235,7 @@ export default {
}, },
getRemind() { getRemind() {
this.$API.ecm.remind.list this.$API.ecm.remind.list
.req({ event: this.eventID, page: 0 }) .req({ event: this.eventId, page: 0 })
.then((res) => { .then((res) => {
this.remindData = res; this.remindData = res;
}); });

18
src/views/opm/fire.vue
View File

@ -459,7 +459,13 @@
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="检测人"> <el-form-item label="检测人">
<el-select <el-input
v-model="formgas.checker_name"
style="width:200px"
disabled
></el-input>
<ehsUserSelect :multiple="false" @submit="getChecker"/>
<!-- <el-select
v-model="formgas.checker" v-model="formgas.checker"
placeholder="选择作业人员" placeholder="选择作业人员"
> >
@ -469,7 +475,7 @@
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -529,7 +535,7 @@
const defaultformgas = { const defaultformgas = {
id: "", id: "",
check_time: null, check_time: null,
opl: "" opl: "",
}; };
export default { export default {
name: "fire", name: "fire",
@ -603,6 +609,10 @@
this.form.charger=data.id; this.form.charger=data.id;
this.form.charger_name=data.name this.form.charger_name=data.name
}, },
getChecker(data){
this.formgas.checker=data.id;
this.formgas.checker_name=data.name
},
getMonitor(data) { getMonitor(data) {
this.form.monitor=data.id; this.form.monitor=data.id;
this.form.monitor_name=data.name this.form.monitor_name=data.name
@ -851,7 +861,7 @@
this.$router.push({ this.$router.push({
name: "opl", name: "opl",
query: { query: {
id: this.operationId,//作业ID operationid: this.operationId,//作业ID
}, },
}); });

44
src/views/opm/space.vue
View File

@ -468,7 +468,7 @@
:model="formgas" :model="formgas"
:rules="rules" :rules="rules"
:disabled="mode == 'show'" :disabled="mode == 'show'"
label-width="80px" label-width="120px"
width="70%" width="70%"
style="margin: 40px 40px 40px 40px" style="margin: 40px 40px 40px 40px"
> >
@ -497,7 +497,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="CO"> <el-form-item label="CO(ppm)">
<el-input <el-input
v-model.number="formgas.co" v-model.number="formgas.co"
type="text" type="text"
@ -545,10 +545,19 @@
<el-button type="primary" @click="submitgas">确 定</el-button> <el-button type="primary" @click="submitgas">确 定</el-button>
</template> </template>
</sc-dialog> </sc-dialog>
<el-button style="margin-top: 12px" @click="handleLastStep" <el-button @click="handleLastStep"
>上一步</el-button >上一步</el-button
> >
<el-button style="margin-top: 12px" @click="submitOut">退出</el-button> <el-button
:loading="tLoading"
v-for=" item in initForm.transitions"
:key="item.id"
type="primary"
@click="submitTicketCreate(item.id)"
style="margin-right:4px"
>{{item.name}}
</el-button>
<el-button @click="submitOut">退出</el-button>
</el-main> </el-main>
</el-container> </el-container>
</template> </template>
@ -606,7 +615,7 @@ export default {
cate: "", cate: "",
risks_checked: [], risks_checked: [],
}, },
initForm: {},
operationId: "", operationId: "",
oplcateId: "", oplcateId: "",
oplId: "", oplId: "",
@ -646,7 +655,7 @@ export default {
this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
this.oplId = this.$route.query.oplId; //许可证ID this.oplId = this.$route.query.oplId; //许可证ID
this.getoplData(); this.getoplData();
this.getInit();
this.getDept(); this.getDept();
this.getUser(); this.getUser();
}, },
@ -659,6 +668,13 @@ export default {
this.getData(); this.getData();
} }
}, },
//渲染工单提交按钮
getInit() {
this.$API.wf.workflow.initkey.req('opl_space').then((res) => {
this.initForm = res;
});
},
//根据oplId，查许可证 //根据oplId，查许可证
getData() { getData() {
this.$API.opm.opl.read.req(this.oplId).then((res) => { this.$API.opm.opl.read.req(this.oplId).then((res) => {
@ -861,6 +877,22 @@ export default {
return err; return err;
}); });
}, },
//提交,创建工单
submitTicketCreate(id) {
let ticket = {};
ticket.workflow = this.initForm.workflow;
ticket.ticket_data = {opl: this.oplId};
ticket.transition = id;
ticket.title = this.form.name + '-申请';
this.tLoading = true
this.$API.wf.ticket.create.req(ticket).then((res) => {
this.tLoading = false
this.$message.success("提交成功");
this.submitOut()
}).catch(e=>{this.tLoading=false});
},
//退出界面 //退出界面
submitOut(){ submitOut(){
this.$router.push({ this.$router.push({