修改 云南测试问题

src/api/harmonic-boot/area.ts

@@ -97,9 +97,9 @@ export function getXbLineRank(data:any) {
     })
 }
 // 数据补招
-export function recall(data:any) {
+export function FullRecall(data:any) {
     return request({
-        url: '/data-processing-boot/data/recall',
+        url: '/data-processing-boot/data/FullRecall',
         method: 'post',
         data: data
     })

src/assets/map/云南.json

@@ -1,4 +1,22 @@
-{ "type": "FeatureCollection", "features": [{ "type": "Feature", "properties": { "adcode": 530100, "name": "昆明", "center": [102.712251, 25.040609], "centroid": [102.87442, 25.387092], "childrenNum": 14, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 0, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+{
+    "type": "FeatureCollection",
+    "features": [
+            {
+            "type": "Feature",
+            "properties": {
+                "adcode": 530100,
+                "name": "昆明",
+                "center": [102.712251, 25.040609],
+                "centroid": [102.87442, 25.387092],
+                "childrenNum": 14,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 0,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [103.109095, 24.506989],
@@ -359,7 +377,404 @@
                             [103.109095, 24.506989]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 530300, "name": "曲靖", "center": [103.797851, 25.501557], "centroid": [103.939179, 25.705863], "childrenNum": 9, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 1, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 530100,
+                "name": "昆明",
+                "center": [102.712251, 25.040609],
+                "centroid": [102.87442, 25.387092],
+                "childrenNum": 14,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 0,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
+                    [
+                        [
+                            [103.109095, 24.506989],
+                            [103.139179, 24.526106],
+                            [103.152704, 24.527327],
+                            [103.167876, 24.510813],
+                            [103.176286, 24.523991],
+                            [103.237408, 24.507559],
+                            [103.247379, 24.514148],
+                            [103.237755, 24.532126],
+                            [103.263071, 24.552703],
+                            [103.25102, 24.584172],
+                            [103.260123, 24.607342],
+                            [103.278677, 24.603766],
+                            [103.284225, 24.622949],
+                            [103.269573, 24.633353],
+                            [103.288734, 24.656839],
+                            [103.305727, 24.640992],
+                            [103.323933, 24.639367],
+                            [103.385922, 24.60466],
+                            [103.419648, 24.577099],
+                            [103.448952, 24.571081],
+                            [103.460656, 24.558233],
+                            [103.491348, 24.555875],
+                            [103.472621, 24.541805],
+                            [103.483805, 24.530987],
+                            [103.4532, 24.511301],
+                            [103.474962, 24.499097],
+                            [103.535304, 24.527408],
+                            [103.543367, 24.554899],
+                            [103.562787, 24.555631],
+                            [103.617754, 24.596286],
+                            [103.631625, 24.616609],
+                            [103.619748, 24.624981],
+                            [103.640295, 24.65757],
+                            [103.633013, 24.663502],
+                            [103.666565, 24.724184],
+                            [103.658589, 24.734579],
+                            [103.670033, 24.760239],
+                            [103.654774, 24.782158],
+                            [103.664137, 24.792873],
+                            [103.652346, 24.823633],
+                            [103.657722, 24.868987],
+                            [103.648445, 24.88083],
+                            [103.611772, 24.877586],
+                            [103.586109, 24.889671],
+                            [103.575445, 24.849111],
+                            [103.547095, 24.865661],
+                            [103.522819, 24.831423],
+                            [103.497243, 24.832965],
+                            [103.447392, 24.892105],
+                            [103.444184, 24.923488],
+                            [103.467245, 24.939542],
+                            [103.469413, 24.975047],
+                            [103.461437, 24.999927],
+                            [103.438202, 25.019293],
+                            [103.44219, 25.026908],
+                            [103.409591, 25.045622],
+                            [103.408637, 25.061983],
+                            [103.422422, 25.071702],
+                            [103.454327, 25.073727],
+                            [103.494122, 25.107655],
+                            [103.469673, 25.122875],
+                            [103.480164, 25.142302],
+                            [103.463431, 25.154685],
+                            [103.465338, 25.182037],
+                            [103.417654, 25.190209],
+                            [103.40699, 25.181471],
+                            [103.404649, 25.151367],
+                            [103.377599, 25.164154],
+                            [103.328528, 25.162859],
+                            [103.32558, 25.139226],
+                            [103.311102, 25.146673],
+                            [103.311362, 25.174998],
+                            [103.289947, 25.184546],
+                            [103.298964, 25.205985],
+                            [103.258303, 25.216906],
+                            [103.273822, 25.25783],
+                            [103.295149, 25.261388],
+                            [103.291508, 25.284026],
+                            [103.303386, 25.288311],
+                            [103.304946, 25.311268],
+                            [103.318731, 25.325736],
+                            [103.294716, 25.325251],
+                            [103.272088, 25.340767],
+                            [103.304513, 25.405154],
+                            [103.342227, 25.424293],
+                            [103.370403, 25.453118],
+                            [103.358092, 25.472008],
+                            [103.36867, 25.489039],
+                            [103.394679, 25.481694],
+                            [103.42563, 25.486779],
+                            [103.43274, 25.514137],
+                            [103.419128, 25.532775],
+                            [103.432393, 25.553104],
+                            [103.417827, 25.57214],
+                            [103.434213, 25.577786],
+                            [103.447305, 25.562219],
+                            [103.484672, 25.554556],
+                            [103.514669, 25.573753],
+                            [103.533223, 25.571495],
+                            [103.545014, 25.583834],
+                            [103.523773, 25.609557],
+                            [103.503659, 25.605848],
+                            [103.491174, 25.62286],
+                            [103.492475, 25.651637],
+                            [103.51675, 25.679602],
+                            [103.510248, 25.696603],
+                            [103.531142, 25.720127],
+                            [103.514669, 25.736961],
+                            [103.51727, 25.75339],
+                            [103.556718, 25.779801],
+                            [103.540419, 25.80194],
+                            [103.5438, 25.817314],
+                            [103.514236, 25.806287],
+                            [103.502272, 25.829547],
+                            [103.476349, 25.816268],
+                            [103.465512, 25.82335],
+                            [103.471667, 25.856585],
+                            [103.460396, 25.865113],
+                            [103.440629, 25.854895],
+                            [103.418088, 25.829628],
+                            [103.385402, 25.839446],
+                            [103.390517, 25.855619],
+                            [103.36182, 25.845239],
+                            [103.348295, 25.856585],
+                            [103.328181, 25.857389],
+                            [103.318124, 25.839607],
+                            [103.300611, 25.856907],
+                            [103.289947, 25.889247],
+                            [103.306333, 25.914904],
+                            [103.30486, 25.943209],
+                            [103.290728, 25.948193],
+                            [103.291768, 25.973275],
+                            [103.282318, 26.001726],
+                            [103.305813, 26.048406],
+                            [103.298877, 26.064311],
+                            [103.26862, 26.092017],
+                            [103.253101, 26.122687],
+                            [103.255875, 26.145163],
+                            [103.237582, 26.155356],
+                            [103.254921, 26.17261],
+                            [103.244257, 26.188256],
+                            [103.211919, 26.21465],
+                            [103.189551, 26.217056],
+                            [103.189464, 26.201815],
+                            [103.170824, 26.204622],
+                            [103.16779, 26.221708],
+                            [103.15149, 26.222912],
+                            [103.149236, 26.247774],
+                            [103.131896, 26.243924],
+                            [103.107621, 26.260524],
+                            [103.114904, 26.295077],
+                            [103.097737, 26.325454],
+                            [103.100858, 26.362071],
+                            [103.083866, 26.413492],
+                            [103.081438, 26.44704],
+                            [103.05959, 26.513305],
+                            [103.062278, 26.534665],
+                            [103.054562, 26.541864],
+                            [103.052481, 26.514585],
+                            [103.031847, 26.4869],
+                            [102.989885, 26.482658],
+                            [102.998121, 26.450322],
+                            [102.988324, 26.409088],
+                            [102.998208, 26.371925],
+                            [102.985116, 26.345727],
+                            [102.971591, 26.340278],
+                            [102.89469, 26.338515],
+                            [102.879518, 26.365516],
+                            [102.867467, 26.338996],
+                            [102.833394, 26.30662],
+                            [102.78519, 26.298925],
+                            [102.764816, 26.277681],
+                            [102.739933, 26.268622],
+                            [102.723547, 26.245689],
+                            [102.719733, 26.218179],
+                            [102.674563, 26.205425],
+                            [102.659131, 26.221388],
+                            [102.620116, 26.245769],
+                            [102.601303, 26.249057],
+                            [102.611273, 26.282331],
+                            [102.638583, 26.307662],
+                            [102.629393, 26.336833],
+                            [102.571132, 26.362632],
+                            [102.551625, 26.362151],
+                            [102.541914, 26.338515],
+                            [102.43805, 26.300047],
+                            [102.396088, 26.297642],
+                            [102.349011, 26.244726],
+                            [102.282773, 26.220184],
+                            [102.257457, 26.220104],
+                            [102.244886, 26.21088],
+                            [102.236476, 26.185127],
+                            [102.248527, 26.157362],
+                            [102.263439, 26.142835],
+                            [102.259885, 26.127424],
+                            [102.294304, 26.110565],
+                            [102.314678, 26.088484],
+                            [102.347884, 26.075795],
+                            [102.353519, 26.060937],
+                            [102.343635, 26.023823],
+                            [102.332451, 26.004378],
+                            [102.335919, 25.989832],
+                            [102.321614, 25.964111],
+                            [102.322394, 25.945058],
+                            [102.340428, 25.927771],
+                            [102.328463, 25.922222],
+                            [102.330544, 25.898256],
+                            [102.322308, 25.888041],
+                            [102.328983, 25.852964],
+                            [102.352305, 25.84709],
+                            [102.377534, 25.828179],
+                            [102.371726, 25.801457],
+                            [102.379008, 25.787611],
+                            [102.362449, 25.782619],
+                            [102.357074, 25.71779],
+                            [102.38421, 25.693299],
+                            [102.380222, 25.661309],
+                            [102.36583, 25.638015],
+                            [102.379095, 25.628906],
+                            [102.382043, 25.60996],
+                            [102.421577, 25.588834],
+                            [102.43016, 25.573027],
+                            [102.451401, 25.581818],
+                            [102.448107, 25.534389],
+                            [102.463713, 25.526321],
+                            [102.460245, 25.501952],
+                            [102.477411, 25.491137],
+                            [102.479058, 25.453038],
+                            [102.457557, 25.428735],
+                            [102.457297, 25.417752],
+                            [102.430767, 25.398531],
+                            [102.435275, 25.381487],
+                            [102.393747, 25.368885],
+                            [102.377795, 25.389646],
+                            [102.358374, 25.370824],
+                            [102.349011, 25.349494],
+                            [102.368604, 25.336403],
+                            [102.362449, 25.310703],
+                            [102.373806, 25.29979],
+                            [102.378315, 25.269878],
+                            [102.406318, 25.277559],
+                            [102.413428, 25.250794],
+                            [102.407532, 25.208493],
+                            [102.390626, 25.211244],
+                            [102.373373, 25.190776],
+                            [102.359328, 25.153229],
+                            [102.36661, 25.114699],
+                            [102.351438, 25.089842],
+                            [102.342508, 25.059149],
+                            [102.300113, 25.066762],
+                            [102.281299, 25.048781],
+                            [102.235089, 25.03266],
+                            [102.233962, 25.051211],
+                            [102.200583, 25.065628],
+                            [102.20093, 25.085874],
+                            [102.187665, 25.083688],
+                            [102.171106, 25.053074],
+                            [102.182377, 25.04068],
+                            [102.179082, 25.018482],
+                            [102.203791, 24.991499],
+                            [102.228153, 25.000332],
+                            [102.247574, 24.98145],
+                            [102.246013, 24.964429],
+                            [102.229714, 24.940028],
+                            [102.226853, 24.910676],
+                            [102.263093, 24.91992],
+                            [102.263006, 24.889428],
+                            [102.29205, 24.878884],
+                            [102.296471, 24.849598],
+                            [102.287975, 24.823714],
+                            [102.295518, 24.802857],
+                            [102.285287, 24.801315],
+                            [102.297165, 24.755205],
+                            [102.29153, 24.696893],
+                            [102.282947, 24.686657],
+                            [102.292223, 24.660496],
+                            [102.271242, 24.65432],
+                            [102.287542, 24.624331],
+                            [102.296038, 24.591652],
+                            [102.283987, 24.559534],
+                            [102.267341, 24.559697],
+                            [102.250435, 24.532776],
+                            [102.230234, 24.526594],
+                            [102.210293, 24.507396],
+                            [102.197809, 24.509348],
+                            [102.207692, 24.48079],
+                            [102.215842, 24.482824],
+                            [102.244019, 24.458085],
+                            [102.249741, 24.439038],
+                            [102.261532, 24.440829],
+                            [102.306442, 24.416977],
+                            [102.292657, 24.406881],
+                            [102.311557, 24.386117],
+                            [102.335833, 24.39996],
+                            [102.360021, 24.398576],
+                            [102.373373, 24.436271],
+                            [102.3569, 24.444004],
+                            [102.373893, 24.45198],
+                            [102.380309, 24.481929],
+                            [102.404671, 24.497063],
+                            [102.420537, 24.477535],
+                            [102.453222, 24.513904],
+                            [102.489462, 24.50048],
+                            [102.507929, 24.524235],
+                            [102.540094, 24.513497],
+                            [102.565323, 24.538226],
+                            [102.599395, 24.53481],
+                            [102.609712, 24.513823],
+                            [102.587691, 24.503572],
+                            [102.612834, 24.491368],
+                            [102.669968, 24.503409],
+                            [102.686614, 24.490635],
+                            [102.683319, 24.472327],
+                            [102.69537, 24.462479],
+                            [102.742794, 24.485591],
+                            [102.763949, 24.47786],
+                            [102.775393, 24.497307],
+                            [102.815708, 24.51187],
+                            [102.798021, 24.5209],
+                            [102.789091, 24.553516],
+                            [102.801489, 24.581896],
+                            [102.797935, 24.593522],
+                            [102.815101, 24.611001],
+                            [102.805651, 24.628476],
+                            [102.82221, 24.640586],
+                            [102.827585, 24.669108],
+                            [102.856716, 24.706884],
+                            [102.840243, 24.748465],
+                            [102.870935, 24.746029],
+                            [102.914977, 24.768439],
+                            [102.90362, 24.803344],
+                            [102.911163, 24.854791],
+                            [102.925554, 24.846434],
+                            [102.938472, 24.859739],
+                            [102.95928, 24.862173],
+                            [102.965089, 24.883345],
+                            [102.982602, 24.882453],
+                            [103.000202, 24.89689],
+                            [103.000635, 24.919515],
+                            [103.017801, 24.897133],
+                            [103.030719, 24.863958],
+                            [103.02387, 24.800747],
+                            [103.016501, 24.796364],
+                            [103.015547, 24.762268],
+                            [103.026818, 24.754799],
+                            [103.042077, 24.772011],
+                            [103.07693, 24.754311],
+                            [103.05985, 24.712083],
+                            [103.046932, 24.699574],
+                            [103.0328, 24.641236],
+                            [103.044071, 24.602384],
+                            [103.04199, 24.568235],
+                            [103.052741, 24.555631],
+                            [103.08612, 24.553272],
+                            [103.111002, 24.565877],
+                            [103.109095, 24.506989]
+                        ]
+                    ]
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 530300,
+                "name": "曲靖",
+                "center": [103.797851, 25.501557],
+                "centroid": [103.939179, 25.705863],
+                "childrenNum": 9,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 1,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [103.384795, 26.734393],
@@ -765,7 +1180,25 @@
                             [103.390431, 26.73591]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 530400, "name": "玉溪", "center": [102.543907, 24.350461], "centroid": [102.204123, 24.138434], "childrenNum": 9, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 2, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 530400,
+                "name": "玉溪",
+                "center": [102.543907, 24.350461],
+                "centroid": [102.204123, 24.138434],
+                "childrenNum": 9,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 2,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [102.226853, 24.910676],
@@ -1126,7 +1559,25 @@
                             [102.226853, 24.910676]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 530500, "name": "保山", "center": [99.167133, 25.111802], "centroid": [98.971932, 24.97507], "childrenNum": 5, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 3, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 530500,
+                "name": "保山",
+                "center": [99.167133, 25.111802],
+                "centroid": [98.971932, 24.97507],
+                "childrenNum": 5,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 3,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [98.888014, 25.634791],
@@ -1392,7 +1843,25 @@
                             [98.888014, 25.634791]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 530600, "name": "昭通", "center": [103.717216, 27.336999], "centroid": [104.00534, 27.652533], "childrenNum": 11, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 4, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 530600,
+                "name": "昭通",
+                "center": [103.717216, 27.336999],
+                "centroid": [104.00534, 27.652533],
+                "childrenNum": 11,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 4,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [103.054562, 26.541864],
@@ -1751,7 +2220,25 @@
                             [103.054562, 26.541864]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 530700, "name": "丽江", "center": [100.233026, 26.872108], "centroid": [100.524919, 26.939309], "childrenNum": 5, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 5, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 530700,
+                "name": "丽江",
+                "center": [100.233026, 26.872108],
+                "centroid": [100.524919, 26.939309],
+                "childrenNum": 5,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 5,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [100.909905, 26.166912],
@@ -2068,7 +2555,25 @@
                             [100.909905, 26.166912]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 530800, "name": "普洱", "center": [100.972344, 22.777321], "centroid": [100.722321, 23.188037], "childrenNum": 10, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 6, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 530800,
+                "name": "普洱",
+                "center": [100.972344, 22.777321],
+                "centroid": [100.722321, 23.188037],
+                "childrenNum": 10,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 6,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [101.277073, 24.292678],
@@ -2481,7 +2986,25 @@
                             [101.277073, 24.292678]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 530900, "name": "临沧", "center": [100.08697, 23.886567], "centroid": [99.674418, 23.938527], "childrenNum": 8, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 7, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 530900,
+                "name": "临沧",
+                "center": [100.08697, 23.886567],
+                "centroid": [99.674418, 23.938527],
+                "childrenNum": 8,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 7,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [100.408182, 24.707291],
@@ -2730,7 +3253,25 @@
                             [100.408182, 24.707291]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 532300, "name": "楚雄", "center": [101.546046, 25.041988], "centroid": [101.569589, 25.352508], "childrenNum": 10, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 8, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 532300,
+                "name": "楚雄",
+                "center": [101.546046, 25.041988],
+                "centroid": [101.569589, 25.352508],
+                "childrenNum": 10,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 8,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [102.226853, 24.910676],
@@ -3058,7 +3599,25 @@
                             [102.226853, 24.910676]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 532500, "name": "红河", "center": [103.384182, 23.366775], "centroid": [103.037257, 23.440306], "childrenNum": 13, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 9, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 532500,
+                "name": "红河",
+                "center": [103.384182, 23.366775],
+                "centroid": [103.037257, 23.440306],
+                "childrenNum": 13,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 9,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [103.109095, 24.506989],
@@ -3513,7 +4072,25 @@
                             [103.053261, 24.03661]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 532600, "name": "文山", "center": [104.24401, 23.36951], "centroid": [104.716265, 23.688656], "childrenNum": 8, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 10, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 532600,
+                "name": "文山",
+                "center": [104.24401, 23.36951],
+                "centroid": [104.716265, 23.688656],
+                "childrenNum": 8,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 10,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [104.567014, 24.472652],
@@ -3850,7 +4427,25 @@
                             [104.567014, 24.472652]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 532800, "name": "西双版纳", "center": [100.797941, 22.001724], "centroid": [100.94391, 21.930146], "childrenNum": 3, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 11, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 532800,
+                "name": "西双版纳",
+                "center": [100.797941, 22.001724],
+                "centroid": [100.94391, 21.930146],
+                "childrenNum": 3,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 11,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [101.647968, 22.33165],
@@ -4077,7 +4672,25 @@
                             [101.647968, 22.33165]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 532900, "name": "大理", "center": [100.225668, 25.589449], "centroid": [100.039806, 25.7274], "childrenNum": 12, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 12, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 532900,
+                "name": "大理",
+                "center": [100.225668, 25.589449],
+                "centroid": [100.039806, 25.7274],
+                "childrenNum": 12,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 12,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [98.888014, 25.634791],
@@ -4409,7 +5022,25 @@
                             [98.888014, 25.634791]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 533100, "name": "德宏", "center": [98.578363, 24.436694], "centroid": [98.085143, 24.557413], "childrenNum": 5, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 13, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 533100,
+                "name": "德宏",
+                "center": [98.578363, 24.436694],
+                "centroid": [98.085143, 24.557413],
+                "childrenNum": 5,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 13,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [98.089436, 25.33608],
@@ -4601,7 +5232,25 @@
                             [98.089436, 25.33608]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 533300, "name": "怒江", "center": [98.854304, 25.850949], "centroid": [98.868904, 26.962444], "childrenNum": 4, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 14, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 533300,
+                "name": "怒江",
+                "center": [98.854304, 25.850949],
+                "centroid": [98.868904, 26.962444],
+                "childrenNum": 4,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 14,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [99.64333, 26.677124],
@@ -4939,7 +5588,25 @@
                             [99.64333, 26.677124]
                         ]
                     ]
-            ] } }, { "type": "Feature", "properties": { "adcode": 533400, "name": "迪庆", "center": [99.706463, 27.826853], "centroid": [99.440026, 27.956929], "childrenNum": 3, "level": "city", "parent": { "adcode": 530000 }, "subFeatureIndex": 15, "acroutes": [100000, 530000] }, "geometry": { "type": "MultiPolygon", "coordinates": [
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "adcode": 533400,
+                "name": "迪庆",
+                "center": [99.706463, 27.826853],
+                "centroid": [99.440026, 27.956929],
+                "childrenNum": 3,
+                "level": "city",
+                "parent": { "adcode": 530000 },
+                "subFeatureIndex": 15,
+                "acroutes": [100000, 530000]
+            },
+            "geometry": {
+                "type": "MultiPolygon",
+                "coordinates": [
                     [
                         [
                             [100.299463, 27.736135],
@@ -5320,4 +5987,8 @@
                             [100.299463, 27.736135]
                         ]
                     ]
-            ] } }] }
+                ]
+            }
+        }
+    ]
+}

src/components/echarts/MyEchartMap.vue

@@ -2,7 +2,7 @@
 <template>
     <div style="position: relative">
         <div class="bars_w" ref="chartMap" id="chartMap"></div>
-        <span @click="circle" v-show="showCircle" class="iconfont icon-back"></span>
+        <!-- <span @click="circle" v-show="showCircle" class="iconfont icon-back"></span> -->
     </div>
 </template>
 
@@ -19,7 +19,7 @@ const myCharts = ref()
 const showCircle = ref(false)
 
 const fetchConfig = async (name: string) => {
-    const res = await import(`../../assets/map/${name}.json`)
+    const res = await import(`../../assets/map/${name.replace(/市$/, "")}.json`)
     return res.default
     // GetEchar(res.default)
 }

src/layouts/admin/components/globalPopUp.vue

@@ -21,9 +21,9 @@
                             {{ Math.floor(row.eventValue * 10000) / 100 }}
                         </template>
                     </vxe-column>
-                    <vxe-column field="eventReason" width="110px" title="暂降类型">
+                    <vxe-column field="eventType" width="110px" title="暂降类型">
                         <template #default="{ row }">
-                            {{ eventType.filter(item => item.id == row.eventReason)[0]?.name || '/' }}
+                            {{ event.filter(item => item.id == row.eventType)[0]?.name || '/' }}
                         </template>
                     </vxe-column>
                 </vxe-table>
@@ -38,7 +38,7 @@ import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import MQTT from '@/utils/mqtt'
 const dictData = useDictData()
-const eventType = dictData.getBasicData('Event_Type')
+const event = dictData.getBasicData('Event_Statis')
 import { useAdminInfo } from '@/stores/adminInfo'
 const adminInfo = useAdminInfo()
 const height = mainHeight(-20)
@@ -63,6 +63,7 @@ const init = async () => {
         // 设置消息接收回调
         mqttClient.onMessage((topic, message) => {
             const msg = JSON.parse(message.toString())
+            console.log("🚀 ~ init ~ msg:", msg)
             if (msg.deptList.includes(adminInfo.$state.deptId)) {
                 drawer.value = true
                 isLoading.value = true

src/utils/mqtt.ts

@@ -52,7 +52,10 @@ class MQTT {
         }
 
         try {
-            const mqttUrl = localStorage.getItem('MqttUrl') || 'ws://192.168.1.68:8083/mqtt'
+            const mqttUrl =
+                localStorage.getItem('MqttUrl') == 'null'
+                    ? 'ws://192.168.1.68:8083/mqtt'
+                    : localStorage.getItem('MqttUrl')
 
             this.client = mqtt.connect(mqttUrl, this.defaultOptions as IClientOptions)
             this.setupEventListeners()

src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue

@@ -73,8 +73,11 @@
                         </el-select>
                     </el-form-item>
                 </template>
+                <template v-slot:operation>
+                    <el-button :icon='Download' type='primary' @click='download'>下载波形</el-button>
+                </template>
             </TableHeader>
-            <Table ref="tableRef" />
+            <Table ref="tableRef" :checkboxConfig='checkboxConfig'/>
         </div>
         <div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
             <waveForm ref="waveFormRef" senior :boxoList="boxoList" :wp="wp" @backbxlb="backbxlb" />
@@ -84,12 +87,16 @@
 <script setup lang="ts">
 import { ref, onMounted, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
+import { Download } from '@element-plus/icons-vue'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { mainHeight } from '@/utils/layout'
 import waveForm from '@/components/echarts/waveForm.vue'
 import { getMonitorEventAnalyseWave } from '@/api/event-boot/transient'
 import { useDictData } from '@/stores/dictData'
+import { ElMessageBox, ElMessage } from 'element-plus'
+import { VxeTablePropTypes } from 'vxe-table'
+import { downloadWaveFile } from '@/api/event-boot/transient'
 const dictData = useDictData()
 defineOptions({
     name: 'harmonic-boot/area/TransientEventList'
@@ -107,6 +114,7 @@ const tableStore = new TableStore({
     url: '/event-boot/transient/getTransientValue',
     method: 'POST',
     column: [
+         { width: '60', type: 'checkbox' },
         {
             field: 'index',
             title: '序号',
@@ -238,9 +246,37 @@ provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
 })
-
+const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig<any>>({
+    checkMethod: ({ row }) => {
+        return row.fileFlag === 1
+    }
+})
 const backbxlb = () => {
     view.value = true
     view2.value = false
 }
+// 下载波形
+const download = () => {
+    if (!tableStore.table.selection.length) {
+        ElMessage.warning('请选择数据')
+        return
+    }
+    downloadWaveFile({
+        lineId: tableStore.table.selection.map((item: any) => item.eventId)
+    }).then((res: any) => {
+        if (res.type == 'application/json') {
+            ElMessage.warning('暂无可下载的波形文件!')
+            return
+        }
+        ElMessage.success('下载中。。。!')
+        let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = '波形分析下载' // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link) //释放标签
+    })
+}
 </script>

src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue

@@ -127,12 +127,15 @@
             补招时间：
             <el-date-picker
                 v-model="timeData"
-                type="daterange"
+                type="datetimerange"
-                format="YYYY-MM-DD"
+                format="YYYY-MM-DD HH:mm:00"
-                value-format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD HH:mm:00"
                 range-separator="至"
+                date-format="YYYY-MM-DD"
+                time-format="HH:mm:00"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                style="width: 400px"
                 :disabledDate="disabledDate"
             />
             <template #footer>
@@ -148,7 +151,7 @@
 import { ref, onMounted, watch } from 'vue'
 import { useDictData } from '@/stores/dictData'
 import DatePicker from '@/components/form/datePicker/index.vue'
-import { getAreaDept, recall } from '@/api/harmonic-boot/area'
+import { getAreaDept, FullRecall } from '@/api/harmonic-boot/area'
 import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -182,7 +185,6 @@ const getTreeData = async () => {
             idArr.value.push(element.id)
         })
         treeData.value = JSON.parse(JSON.stringify(res.data))
-        
     })
 }
 
@@ -328,7 +330,6 @@ const tableStore = new TableStore({
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
         setTimeout(() => {
             activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
-            
         }, 0)
     },
     resetCallback: () => {
@@ -338,7 +339,6 @@ const tableStore = new TableStore({
         formData.value.scale = voltageleveloption
         formData.value.manufacturer = terminaloption
         formData.value.loadType = interfereoption
-        
     }
 })
 
@@ -409,7 +409,7 @@ const makeUpSubmit = () => {
         })
     }
 
-    recall({
+    FullRecall({
         monitorId: tableRef.value
             .getRef()
             .getCheckboxRecords()
@@ -418,9 +418,8 @@ const makeUpSubmit = () => {
         reCallEndTime: timeData.value[1],
         reCallStartTime: timeData.value[0]
     }).then(res => {
-
         ElMessage({
-            message: "补招命令下发成功",
+            message: '补招命令下发成功',
             type: 'success'
         })
         dialogVisible.value = false
@@ -441,7 +440,6 @@ watch(
 )
 </script>
 <style lang="scss" scoped>
-
 // .online {
 //     width: 100%;
 //     height: 100%;

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue

@@ -67,11 +67,11 @@
             <!-- <el-form :inline="true">
            
         </el-form> -->
-            <div id="canvas" class="mt10" :style="height1" style="overflow-y: auto" v-loading="loading">
+            <div id="canvas" class="mt10" :style="height1" style="overflow-y: auto;overflow-x: hidden" v-loading="loading">
                 <my-echart
                     :options="item.option"
                     v-for="item in list"
-                    style="min-height: 210px"
+                    style="min-height: 190px"
                     :style="height"
                     @triggerPoint="triggerPoint"
                     @group="group"
@@ -1926,6 +1926,8 @@ const triggerPoint = (data: any) => {
 }
 // 计算高度
 const selectChange = (flag: boolean) => {
+    // const height1: any = ref(mainHeight(160))
+    height1.value = mainHeight(flag ? 220 : 160)
     height.value = mainHeight(flag ? 220 : 160, list.value.length > 3 ? 3 : list.value.length)
 }
 const backbxlb = () => {

src/views/pqs/voltageSags/Region/components/Compatibility.vue

@@ -246,7 +246,7 @@ const info = async (list: any) => {
             left: '80px',
             top: '18px'
         },
-        color: ['yellow', 'green', 'red'],
+        color: ['#DAA520', 'green', 'red'],
         xAxis: {
             type: 'log',
             min: '0.001',
@@ -438,7 +438,7 @@ const gongfunction = () => {
                     })
                 }
             } else if (xx < 0.5) {
-                if (yy > 70) {
+                if (yy > 50) {
                     standF++
                     pointF.value.push({
                         value: point,

src/views/pqs/voltageSags/Region/thermodynamicDiagram/index.vue

@@ -54,6 +54,7 @@ const tableStore = new TableStore({
     beforeSearchFun: () => {},
     loadCallback: () => {
         geoCoordMap.value = []
+          list.value=[]
         header.value.areaRef.change()
         // 处理地图数据
         tableStore.table.data.eventHeatMapValue.forEach(val => {

src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/ITICquxianfenxi/index.vue

@@ -107,7 +107,7 @@ const init = () => {
                     name: '%'
                 }
             ],
-            color: ['#007D7B','#07CCCA', 'green','red'],
+         color: ['#FF8C00', '#00BFFF', 'green', 'red'],
             options: {
                 dataZoom: null,
                 series: [

src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue

@@ -109,7 +109,7 @@ const init = () => {
                     name: '%'
                 }
             ],
-            color: ['#007D7B', 'green', 'red'],
+            color: ['#DAA520', 'green', 'red'],
             options: {
                 dataZoom: null,
                 series: [
@@ -135,13 +135,13 @@ const init = () => {
                         name: '可容忍事件',
                         type: 'scatter',
                         symbol: 'circle',
-                        data: gongData.pointI
+                        data: gongData.pointF
                     },
                     {
                         name: '不可容忍事件',
                         type: 'scatter',
                         symbol: 'circle',
-                        data: gongData.pointIun
+                        data: gongData.pointFun
                     }
                 ]
             }
@@ -205,6 +205,8 @@ function gongfunction(arr: any) {
                     })
                 }
             } else if (xx <= 0.5) {
+             
+                
                 if (yy > 120 || yy < 70) {
                     unstandI++
                     pointIun.push({

src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/dianyazanjiangbiaojimidu/index.vue

@@ -12,7 +12,7 @@
             <div class="first">
                 <div class="mb10">DISDIP表格(国际发配电联盟UNIPEDE)</div>
                 <div style="flex: 1; overflow: hidden">
-                    <vxe-table v-bind="defaultAttribute" height="400px" size="mini" :data="firstData">
+                    <vxe-table v-bind="defaultAttribute" height="420px" size="mini" :data="firstData">
                         <vxe-colgroup title="剩余电压" field="name" width="80px"></vxe-colgroup>
                         <vxe-colgroup title="持续时间">
                             <vxe-column field="twentyMs" title="20ms" :formatter="formatter" />

src/views/pqs/voltageSags/overview/right.vue

@@ -17,7 +17,7 @@
         </div>
         <div class="overview-right-item" style="padding-top: 0">
             <div class="overview-right-item-title">
-                <div style="font-weight: 700">未处理暂态事件</div>
+                <div style="font-weight: 700">暂态事件</div>
                 <!-- <el-button type="primary" size="small" icon="el-icon-Promotion" @click="jump">事件关联分析</el-button> -->
             </div>
             <div style="flex: 1; overflow: hidden">