diff --git a/.env.development b/.env.development index bd43a46..f30d669 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ # @Author: 张涛 # @Date: 2023-11-09 18:29:41 # @LastEditors: JC9527 - # @LastEditTime: 2023-12-15 22:03:06 + # @LastEditTime: 2023-12-26 21:39:38 # @FilePath: \JiangningUrbanManagePc\.env.development ### # 页面标题 @@ -14,6 +14,8 @@ ENV = 'development' # 若依管理系统/开发环境 # /dev-api VUE_APP_BASE_API = 'http://39.101.188.84:9037' +VUE_APP_BASE_API1 = 'https://t-kd-process-server.jsszkd.com' +# VUE_APP_BASE_API = 'http://192.168.0.107:9037' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 61fc6e0..cbf1eef 100644 --- a/.env.production +++ b/.env.production @@ -6,3 +6,4 @@ ENV = 'production' # 若依管理系统/生产环境 VUE_APP_BASE_API = 'http://39.101.188.84:9037' +VUE_APP_BASE_API1 = 'https://t-kd-process-server.jsszkd.com' diff --git a/package.json b/package.json index 6d3bfce..10286f2 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "echarts": "5.4.0", "element-ui": "2.15.13", "file-saver": "2.0.5", + "flv.js": "^1.6.2", "fuse.js": "6.4.3", "highlight.js": "9.18.5", "js-beautify": "1.13.0", @@ -58,6 +59,8 @@ "quill": "1.3.7", "screenfull": "5.0.2", "sortablejs": "1.10.2", + "video.js": "^8.6.1", + "videojs-contrib-hls": "^5.15.0", "vue": "2.6.12", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", diff --git a/src/api/bigScreenApi/eventApi.js b/src/api/bigScreenApi/eventApi.js new file mode 100644 index 0000000..9f4444c --- /dev/null +++ b/src/api/bigScreenApi/eventApi.js @@ -0,0 +1,10 @@ +import request from "@/utils/request2" + +// 事件来源 +export function getDeviceList(params) { + return request({ + url: "/event/source/trend", + method:'get', + params + }) +} \ No newline at end of file diff --git a/src/api/bigScreenApi/index.js b/src/api/bigScreenApi/index.js index 9051340..7c4dad3 100644 --- a/src/api/bigScreenApi/index.js +++ b/src/api/bigScreenApi/index.js @@ -4,6 +4,15 @@ import request from "@/utils/request" * 人员 */ +// 监控视频 +export function videoSurveillance(data) { + return request({ + url: "/jn/dockingEq/videoSurveillance", + method:'post', + data + }) +} + // 终端设备坐标采集、在线状态接口 export function getDeviceList(params) { return request({ diff --git a/src/assets/images/dialogbg/组 787@2x.png b/src/assets/images/dialogbg/组 787@2x.png new file mode 100644 index 0000000..7e95832 Binary files /dev/null and b/src/assets/images/dialogbg/组 787@2x.png differ diff --git a/src/assets/images/icon/icon6.png b/src/assets/images/icon/icon6.png new file mode 100644 index 0000000..975c79e Binary files /dev/null and b/src/assets/images/icon/icon6.png differ diff --git a/src/assets/images/popup/bg5.png b/src/assets/images/popup/bg5.png new file mode 100644 index 0000000..7e95832 Binary files /dev/null and b/src/assets/images/popup/bg5.png differ diff --git a/src/assets/styles/leaflet.scss b/src/assets/styles/leaflet.scss index c836859..3bdc9cb 100644 --- a/src/assets/styles/leaflet.scss +++ b/src/assets/styles/leaflet.scss @@ -107,7 +107,8 @@ // 执法人员 .person-popup { - width: 242px; + // width: 242px; + width: 470px; height: 244px; background-image: url("../images/popup/bg1.png"); background-size: 100% 100%; @@ -129,6 +130,7 @@ align-items: center; justify-content: center; width: 194px; + width: 100%; height: 30px; background: linear-gradient(270deg, rgba(9, 32, 53, 0) 0%, rgba(8, 37, 64, 0.98) 51%, rgba(9, 34, 56, 0) 100%); border-radius: 0px 0px 0px 0px; @@ -138,7 +140,8 @@ } .mask { - width: 13px; + // width: 13px; + width: 35px; height: 13px; cursor: pointer; } @@ -150,17 +153,31 @@ .person-info { display: flex; align-items: center; - - .dot { - width: 4px; - height: 4px; - background: #DAEBFF; - box-shadow: 0px 0px 10px 5px rgba(0, 119, 255, 0.25), 0px 0px 5px 0px rgba(229, 241, 255, 0.25); - border-radius: 20px 20px 20px 20px; - margin-right: 15px; + margin-bottom: 10px; + .info-left { + display: flex; + align-items: center; + width: 80px; + .dot { + width: 4px; + height: 4px; + background: #DAEBFF; + box-shadow: 0px 0px 10px 5px rgba(0, 119, 255, 0.25), 0px 0px 5px 0px rgba(229, 241, 255, 0.25); + border-radius: 20px 20px 20px 20px; + margin-right: 10px; + } + + .name { + text-align: right; + flex: 1; + font-size: 12px; + font-family: Source Han Sans CN-Medium, Source Han Sans CN; + font-weight: 500; + color: #E9F4FF; + line-height: 14px; + } } - .name, .position { font-size: 12px; font-family: Source Han Sans CN-Medium, Source Han Sans CN; @@ -168,18 +185,20 @@ color: #E9F4FF; line-height: 14px; margin-right: 9px; + flex: 1; } } .btns { display: grid; - grid-column: 1fr; - grid-row-gap: 6px; - margin-top: 15px; + // grid-column: 1fr; + // grid-row-gap: 6px; + grid-template-columns: repeat(5, 80px); + grid-column-gap: 6px; div { background-image: url('../images/popup/icon1btn.png'); - width: 100%; + width: 80px; height: 30px; background-size: 100% 100%; display: flex; @@ -327,15 +346,18 @@ padding: 11px 25px 24px 25px; .bg { - background-image: url("../images/videoImg.png"); + background-image: url("../images/popup/screenshot20230817.png"); background-size: 100% 100%; width: 192px; height: 108px; padding: 2px; + display: flex; + align-items: center; + justify-content: center; img { - width: 100%; - height: 100%; + width: 92px; + cursor: pointer; } } @@ -453,4 +475,69 @@ background-size: 100% 100%; } } +} + +.travel { + background-image: url("../images/dialogbg/792@2x.png"); + background-size: 100% 100%; + background-color: transparent; + .el-dialog__header { + padding: 10px 20px; + .closeClick { + // display: flex; + height: 46px; + // justify-content: space-between; + position: relative; + padding-top: 10px; + .headline { + background-image: url("../images/dialogtitlebg.png"); + width: 451px; + background-size: 100% 100%; + padding-left: 22px; + height: 38px; + .headlinetitle { + font-size: 20px; + font-family: "YouSheBiaoTiHei"; + font-weight: 400; + // line-height: 26px; + color: #ffffff; + display: flex; + flex: 1; + text-shadow: 1px 1px 0px #1a3f76; + &::before { + content: attr(text); + position: absolute; + z-index: 10; + color: #ffffff; + // 渐变样式 + background: linear-gradient(180deg, #ffffff 0%, #43b4c5 100%); + -webkit-background-clip: text; + color: transparent; + // 去除继承父级样式 + text-shadow: none; + } + } + } + .close { + position: absolute; + width: 50px; + height: 50px; + right: 0px; + top: 6px; + cursor: pointer; + } + } + } + .el-dialog__body { + padding: 22px 20px 60px 20px; + } + // 视频播放 + .watch-video-play { + width: 100%; + height: 500px; + .flv-js { + width: 100%; + height: 100%; + } + } } \ No newline at end of file diff --git a/src/main.js b/src/main.js index ae81502..9fc5334 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2023-08-14 13:58:57 * @LastEditors: JC9527 - * @LastEditTime: 2023-12-19 10:34:59 + * @LastEditTime: 2023-12-26 10:40:03 */ import Vue from 'vue' @@ -23,6 +23,7 @@ import plugins from './plugins' // plugins import { download } from '@/utils/request' import "@/utils/rem.js"; //计算rem基准 +import 'video.js/dist/video-js.css' import './assets/icons' // icon import './permission' // permission control // import 'leaflet/dist/leaflet.css' // leaflet样式 diff --git a/src/utils/auth.js b/src/utils/auth.js index 08a43d6..a7e3642 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -2,6 +2,14 @@ import Cookies from 'js-cookie' const TokenKey = 'Admin-Token' +const AccessToken = 'X-Access-Token' + +Cookies.set(AccessToken, 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDM1MjkyMzAsInVzZXJuYW1lIjoi6LW15YWtIn0.iV5P9-g1X309RxfTiWLb42yk7QBGazSUwKLHSEPeLuA') + +export function getAccessToken() { + return Cookies.get(AccessToken) +} + export function getToken() { return Cookies.get(TokenKey) } @@ -13,3 +21,5 @@ export function setToken(token) { export function removeToken() { return Cookies.remove(TokenKey) } + + diff --git a/src/utils/mapJson/1GJ02.json b/src/utils/mapJson/1GJ02.json new file mode 100644 index 0000000..1d44eb6 --- /dev/null +++ b/src/utils/mapJson/1GJ02.json @@ -0,0 +1,176 @@ +{ + "type": "FeatureCollection", + "name": "1GJ02", + "features": [ + { + "type": "Feature", + "properties": { + "CENTERX": 118.81528630570395, + "CENTERY": 31.93920401618924, + "COOD": "320115402001112", + "NAME": "一中队", + "NOTE": null, + "UserID": null, + "UserID0": null, + "UserID_1": null + }, + "geometry": { + "type": "MultiPolygon", + "coordinates": [ + [ + [ + [ + 118.807445182447637, + 31.952766862600512 + ], + [ + 118.807491798068639, + 31.953866311105841 + ], + [ + 118.807387644000144, + 31.955139862220395 + ], + [ + 118.812823342593177, + 31.955166302740292 + ], + [ + 118.819394412595798, + 31.955424189083491 + ], + [ + 118.820497725840085, + 31.955467440621277 + ], + [ + 118.824555900019448, + 31.95520750523324 + ], + [ + 118.825662142762781, + 31.953125554430539 + ], + [ + 118.826325623166142, + 31.950918424542973 + ], + [ + 118.827431824290699, + 31.949025522994102 + ], + [ + 118.828537976583107, + 31.947132612005561 + ], + [ + 118.829354500485223, + 31.945687084646579 + ], + [ + 118.830676372630919, + 31.943346905498586 + ], + [ + 118.833613703958179, + 31.936862737358261 + ], + [ + 118.835762890198382, + 31.932118405538976 + ], + [ + 118.835909451620168, + 31.929156022450734 + ], + [ + 118.835982581564622, + 31.927202157020194 + ], + [ + 118.832178234657235, + 31.924592239611883 + ], + [ + 118.823751786361171, + 31.92215018115256 + ], + [ + 118.821858892561096, + 31.921601565569539 + ], + [ + 118.815195270136698, + 31.918791628692862 + ], + [ + 118.808861700329189, + 31.918802476934637 + ], + [ + 118.808473975054795, + 31.920647705672344 + ], + [ + 118.808420743360927, + 31.924058800306419 + ], + [ + 118.808442472525215, + 31.927459041950378 + ], + [ + 118.808379952620868, + 31.928808192440172 + ], + [ + 118.808378346291803, + 31.928842856247922 + ], + [ + 118.808175072462106, + 31.930967022103108 + ], + [ + 118.807575752308594, + 31.93512985307666 + ], + [ + 118.80715842484878, + 31.938691699647205 + ], + [ + 118.807230976249386, + 31.94200061694546 + ], + [ + 118.807272956126056, + 31.943915232021347 + ], + [ + 118.807276923571877, + 31.944100448372328 + ], + [ + 118.807313947157354, + 31.946564545136248 + ], + [ + 118.80735214371623, + 31.949106708741827 + ], + [ + 118.807438136723903, + 31.952600686397819 + ], + [ + 118.807445182447637, + 31.952766862600512 + ] + ] + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/utils/mapJson/2GJ02.json b/src/utils/mapJson/2GJ02.json new file mode 100644 index 0000000..a74670b --- /dev/null +++ b/src/utils/mapJson/2GJ02.json @@ -0,0 +1,7 @@ +{ +"type": "FeatureCollection", +"name": "2GJ02", +"features": [ +{ "type": "Feature", "properties": { "CENTERX": 118.82603040183329, "CENTERY": 31.902574229779447, "COOD": "320115402001213", "NAME": "二中队", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.823751786361171, 31.92215018115256 ], [ 118.832178234657235, 31.924592239611883 ], [ 118.835982581564622, 31.927202157020194 ], [ 118.837678365097062, 31.925181934404549 ], [ 118.83966857870729, 31.921648547383651 ], [ 118.842396794701358, 31.919626185791017 ], [ 118.846452644691198, 31.917790162854004 ], [ 118.849033131987738, 31.915453032509362 ], [ 118.851034745820883, 31.912667954989566 ], [ 118.85139187315454, 31.912171057428566 ], [ 118.852128348978312, 31.909837737078291 ], [ 118.852496086424821, 31.907631208498426 ], [ 118.851462540715758, 31.905490532066597 ], [ 118.85094537015776, 31.903474855366291 ], [ 118.85146082104113, 31.901709180887163 ], [ 118.853008630112882, 31.899689342658579 ], [ 118.853711623808493, 31.898528462607914 ], [ 118.851198812411155, 31.895146293826784 ], [ 118.849486598245434, 31.892871622654173 ], [ 118.8443182911967, 31.887313317866003 ], [ 118.841685212221961, 31.88475925454415 ], [ 118.836584500724456, 31.881000733004946 ], [ 118.832537364786887, 31.878786867967264 ], [ 118.830888647369804, 31.878089446286364 ], [ 118.826845448875687, 31.876379121137781 ], [ 118.82148270133527, 31.874842232605648 ], [ 118.814310201177037, 31.873786066855612 ], [ 118.814827737312783, 31.8745959698952 ], [ 118.811487701945509, 31.883569180117746 ], [ 118.810546236336833, 31.893010141153855 ], [ 118.810531277264417, 31.893172158545418 ], [ 118.809690406896863, 31.902279288074187 ], [ 118.809520051449198, 31.913006052163194 ], [ 118.808942084649985, 31.916289311198057 ], [ 118.808861700329189, 31.918802476934637 ], [ 118.815195270136698, 31.918791628692862 ], [ 118.821858892561096, 31.921601565569539 ], [ 118.823751786361171, 31.92215018115256 ] ] ] ] } } +] +} diff --git a/src/utils/mapJson/3GJ02.json b/src/utils/mapJson/3GJ02.json new file mode 100644 index 0000000..de56862 --- /dev/null +++ b/src/utils/mapJson/3GJ02.json @@ -0,0 +1,7 @@ +{ +"type": "FeatureCollection", +"name": "3GJ02", +"features": [ +{ "type": "Feature", "properties": { "CENTERX": 118.78707562845804, "CENTERY": 31.935406447981268, "COOD": "320115402001123", "NAME": "三中队", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.807272956126056, 31.943915232021347 ], [ 118.807230976249386, 31.94200061694546 ], [ 118.80715842484878, 31.938691699647205 ], [ 118.807575752308594, 31.93512985307666 ], [ 118.808175072462106, 31.930967022103108 ], [ 118.808378346291803, 31.928842856247922 ], [ 118.808379952620868, 31.928808192440172 ], [ 118.808442472525215, 31.927459041950378 ], [ 118.808420743360927, 31.924058800306419 ], [ 118.808473975054795, 31.920647705672344 ], [ 118.808872409062943, 31.918802459161501 ], [ 118.796290992339237, 31.912226097171981 ], [ 118.796321143198583, 31.911705122236821 ], [ 118.791410082244326, 31.909270456660057 ], [ 118.791349087561372, 31.912365504830507 ], [ 118.786887673852178, 31.911157222286604 ], [ 118.781165361982588, 31.910378493001122 ], [ 118.7660813497032, 31.908410773021767 ], [ 118.760639408874923, 31.907985987821945 ], [ 118.757999345649097, 31.910584846033014 ], [ 118.767052165228876, 31.91148350639255 ], [ 118.775158367223142, 31.914930059958863 ], [ 118.780866575632828, 31.915310562629326 ], [ 118.782416061775294, 31.918965089970932 ], [ 118.785295009382637, 31.92066461982629 ], [ 118.785294574990132, 31.922492392243164 ], [ 118.783314074142424, 31.925570560900255 ], [ 118.782413924673648, 31.926969489988732 ], [ 118.780567466683848, 31.928357321423288 ], [ 118.779015917044148, 31.930816304545665 ], [ 118.776799746614302, 31.932330122763613 ], [ 118.776577506835082, 31.934410117567509 ], [ 118.777167347033995, 31.93787630572562 ], [ 118.777240438048693, 31.940460366903665 ], [ 118.775393212721497, 31.942036907496931 ], [ 118.772881181983294, 31.942668128527245 ], [ 118.771772003235924, 31.94531559827676 ], [ 118.770958488218312, 31.947395703956825 ], [ 118.770735576491163, 31.950862244950354 ], [ 118.769996210095627, 31.951996897052005 ], [ 118.76955183320085, 31.954707146937992 ], [ 118.770068357565762, 31.956912988734906 ], [ 118.771397911551034, 31.9588034676236 ], [ 118.779898638744072, 31.95780879262804 ], [ 118.784917953800601, 31.95722017367212 ], [ 118.795108510422494, 31.956075154531671 ], [ 118.803155038918476, 31.955118888565917 ], [ 118.807387644000144, 31.955139862220395 ], [ 118.807491798068639, 31.953866311105841 ], [ 118.807445182447637, 31.952766862600512 ], [ 118.807438136723903, 31.952600686397819 ], [ 118.80735214371623, 31.949106708741827 ], [ 118.807313947157354, 31.946564545136248 ], [ 118.807276923571877, 31.944100448372328 ], [ 118.807272956126056, 31.943915232021347 ] ] ] ] } } +] +} diff --git a/src/utils/mapJson/4GJ02.json b/src/utils/mapJson/4GJ02.json new file mode 100644 index 0000000..a962fe7 --- /dev/null +++ b/src/utils/mapJson/4GJ02.json @@ -0,0 +1,7 @@ +{ +"type": "FeatureCollection", +"name": "4GJ02", +"features": [ +{ "type": "Feature", "properties": { "CENTERX": 118.79300420001525, "CENTERY": 31.871076556041626, "COOD": "320115402001221", "NAME": "四中队", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.781176079718378, 31.910378483049595 ], [ 118.786898389328044, 31.911157210375713 ], [ 118.79135980140056, 31.912365491499646 ], [ 118.791394151891325, 31.910798998589517 ], [ 118.79142079606234, 31.909270443310373 ], [ 118.796321143198583, 31.911705122236821 ], [ 118.796290619507488, 31.912232539306522 ], [ 118.808872409062943, 31.918802459161501 ], [ 118.808952793366274, 31.916289293409179 ], [ 118.809530760038911, 31.913006034262967 ], [ 118.809701115451645, 31.902279270141314 ], [ 118.810541985642246, 31.893172140455842 ], [ 118.811498410129389, 31.883569161856318 ], [ 118.814838444877722, 31.87459595108832 ], [ 118.814320908831817, 31.873786048127627 ], [ 118.809932729274237, 31.873460659739816 ], [ 118.813059093284167, 31.868778521001413 ], [ 118.815771619725538, 31.863053788131129 ], [ 118.817741121121443, 31.856099389582791 ], [ 118.818254724269337, 31.852408478873432 ], [ 118.818768253720222, 31.847945233046069 ], [ 118.818596637080745, 31.844598796242636 ], [ 118.818938923923028, 31.840908168377098 ], [ 118.819366794243379, 31.836445046551425 ], [ 118.820308753262452, 31.833783083535586 ], [ 118.820897435593494, 31.831713071136051 ], [ 118.816015206345853, 31.829510993360287 ], [ 118.812758970816731, 31.827490820220259 ], [ 118.808507942014018, 31.823638653337312 ], [ 118.806837208858042, 31.822268346886986 ], [ 118.805509041677681, 31.820039286585292 ], [ 118.802210298680762, 31.819272094560255 ], [ 118.80362269618675, 31.824791598426437 ], [ 118.8033082289475, 31.82502248487037 ], [ 118.795924761210415, 31.822844740193673 ], [ 118.795215919971525, 31.824729563867969 ], [ 118.794178123714715, 31.829098279024645 ], [ 118.7941772941018, 31.832136608506971 ], [ 118.796101589880934, 31.83580580815433 ], [ 118.796840986490039, 31.840362421745198 ], [ 118.797950859875954, 31.844285578114594 ], [ 118.798435647842311, 31.84640033010011 ], [ 118.798619461408791, 31.846373920229695 ], [ 118.798468710624448, 31.84669026203165 ], [ 118.798690156641626, 31.850234650793713 ], [ 118.798689411878939, 31.854095788200016 ], [ 118.797652311309832, 31.855616184690852 ], [ 118.791947830394292, 31.861066065643168 ], [ 118.79031742219513, 31.863536263274696 ], [ 118.78713089949666, 31.866071008156627 ], [ 118.783869634239878, 31.868921917140547 ], [ 118.776234585961575, 31.871584649490785 ], [ 118.774160514324734, 31.867787477537501 ], [ 118.772976134820226, 31.863863294339588 ], [ 118.772606309638419, 31.862027720599954 ], [ 118.772725087720616, 31.86036975221063 ], [ 118.771619765988973, 31.854836803821733 ], [ 118.770238649288927, 31.855328725059611 ], [ 118.77041139498327, 31.856374951295841 ], [ 118.77118047903501, 31.858323913829825 ], [ 118.770647462404554, 31.861585585203255 ], [ 118.769739931417732, 31.866917733649945 ], [ 118.76926088193926, 31.869317009445989 ], [ 118.768903370579551, 31.871916926917507 ], [ 118.768798339876923, 31.87268072918032 ], [ 118.767895690447318, 31.872750962035326 ], [ 118.763234832549443, 31.873359820569441 ], [ 118.7596229758215, 31.873896410080636 ], [ 118.757186566667485, 31.874504644712779 ], [ 118.755211425077675, 31.875937088934208 ], [ 118.749621130462813, 31.879696106276967 ], [ 118.74983103278953, 31.879982959093706 ], [ 118.763191599343727, 31.878486465137101 ], [ 118.765121792102505, 31.878269518373191 ], [ 118.765757931852207, 31.878221666116715 ], [ 118.767091985435371, 31.878059640609905 ], [ 118.767714021292946, 31.87870296013331 ], [ 118.768786407562899, 31.879260233667949 ], [ 118.769708584639375, 31.87934557496537 ], [ 118.769817181106148, 31.879664633299029 ], [ 118.770160579276535, 31.882667889982034 ], [ 118.769388847675032, 31.8859291746253 ], [ 118.765700741172893, 31.895026933389218 ], [ 118.764757209390581, 31.897687451553118 ], [ 118.76329881490426, 31.900348088581016 ], [ 118.76186993882456, 31.902483211741952 ], [ 118.761497218279743, 31.904467524728368 ], [ 118.761239955453561, 31.906355442004148 ], [ 118.760639408874923, 31.907985987821945 ], [ 118.7660813497032, 31.908410773021767 ], [ 118.767647071875572, 31.908635366179212 ], [ 118.781176079718378, 31.910378483049595 ] ] ] ] } } +] +} diff --git a/src/utils/mapJson/detachment1.json b/src/utils/mapJson/detachment1.json deleted file mode 100644 index af677e4..0000000 --- a/src/utils/mapJson/detachment1.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "type": "FeatureCollection", - "name": "1中队", - "crs": { - "type": "name", - "properties": { - "name": "urn:ogc:def:crs:OGC:1.3:CRS84" - } - }, - "features": [ - { - "type": "Feature", - "properties": {"name":"1中队"}, - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - 118.80359831953038, - 31.920541474184631 - ], - [ - 118.809995613675383, - 31.921300571418364 - ], - [ - 118.817403518179887, - 31.923457398392177 - ], - [ - 118.820672260009857, - 31.924602706173275 - ], - [ - 118.827974531834627, - 31.927027952762217 - ], - [ - 118.829292266894868, - 31.927790606324628 - ], - [ - 118.83066298193161, - 31.929981679407977 - ], - [ - 118.83113779525732, - 31.932126055676779 - ], - [ - 118.830109301028088, - 31.935518887106991 - ], - [ - 118.827999390641324, - 31.940136960142237 - ], - [ - 118.825524663410405, - 31.945180448031923 - ], - [ - 118.823463948959429, - 31.94886941892689 - ], - [ - 118.821363113715094, - 31.953127462854333 - ], - [ - 118.820788814597393, - 31.954086611966904 - ], - [ - 118.820365727110826, - 31.956235317294286 - ], - [ - 118.818893532794135, - 31.95735984367192 - ], - [ - 118.813689762922351, - 31.957350326300205 - ], - [ - 118.802351626720395, - 31.957380778433478 - ], - [ - 118.802294703527096, - 31.955398230444136 - ], - [ - 118.802218418786111, - 31.946063970017875 - ], - [ - 118.802128741914643, - 31.940737611049684 - ], - [ - 118.803386994535202, - 31.930696400800176 - ], - [ - 118.803387563660024, - 31.924494008769365 - ], - [ - 118.803387563660024, - 31.924494008769365 - ], - [ - 118.80359831953038, - 31.920541474184631 - ] - ] - ] - } - } - ] -} \ No newline at end of file diff --git a/src/utils/mapJson/detachment2.json b/src/utils/mapJson/detachment2.json deleted file mode 100644 index d8a4de8..0000000 --- a/src/utils/mapJson/detachment2.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "type": "FeatureCollection", - "name": "2中队", - "crs": { - "type": "name", - "properties": { - "name": "urn:ogc:def:crs:OGC:1.3:CRS84" - } - }, - "features": [ - { - "type": "Feature", - "properties": {"name":"2中队"}, - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - 118.803474896592405, - 31.922639738321898 - ], - [ - 118.803415659169403, - 31.924023949953117 - ], - [ - 118.803385557625091, - 31.924519011055132 - ], - [ - 118.80338550540823, - 31.925088138416832 - ], - [ - 118.80338317347298, - 31.928664937287238 - ], - [ - 118.803385991746822, - 31.930706401397895 - ], - [ - 118.803302779475828, - 31.9313284042771 - ], - [ - 118.80289471871879, - 31.934617475443002 - ], - [ - 118.802723275811957, - 31.935980502664833 - ], - [ - 118.80258692354306, - 31.937069526099854 - ], - [ - 118.802328255606298, - 31.939143573990314 - ], - [ - 118.802250054873085, - 31.939760586603036 - ], - [ - 118.80213174799637, - 31.940731614577921 - ], - [ - 118.80217457974905, - 31.943427297582843 - ], - [ - 118.80221542758045, - 31.945907929544191 - ], - [ - 118.802217401415177, - 31.946233006932257 - ], - [ - 118.802237232725915, - 31.948471550449295 - ], - [ - 118.802277715774963, - 31.954923093738675 - ], - [ - 118.802300688421141, - 31.955683305621456 - ], - [ - 118.802348621541924, - 31.957376772611138 - ], - [ - 118.795537608916945, - 31.957266113224765 - ], - [ - 118.780942140759066, - 31.959006598942217 - ], - [ - 118.766215143540848, - 31.960821581517681 - ], - [ - 118.765202817198059, - 31.957511241955608 - ], - [ - 118.765070918531421, - 31.955553719795233 - ], - [ - 118.767707926519364, - 31.952424573440474 - ], - [ - 118.767510937632096, - 31.950802075855798 - ], - [ - 118.767511303704467, - 31.946832168473637 - ], - [ - 118.768104972974783, - 31.944147940095036 - ], - [ - 118.770214619735086, - 31.943814329374597 - ], - [ - 118.774963109425499, - 31.941636696326722 - ], - [ - 118.775952417476717, - 31.938337847688473 - ], - [ - 118.775358939211245, - 31.936938986259165 - ], - [ - 118.773578359184796, - 31.935204031064259 - ], - [ - 118.773315292816122, - 31.933246366744783 - ], - [ - 118.774700636934199, - 31.933079523172474 - ], - [ - 118.776349474445951, - 31.931346637066547 - ], - [ - 118.777667926408682, - 31.930956816948655 - ], - [ - 118.778987588722657, - 31.929000701775063 - ], - [ - 118.778724488706928, - 31.926818942882932 - ], - [ - 118.781296752107167, - 31.924472137241949 - ], - [ - 118.780175558924327, - 31.922681525447633 - ], - [ - 118.778262491633313, - 31.921113199766264 - ], - [ - 118.775823213929712, - 31.917363017051272 - ], - [ - 118.775888414933064, - 31.915907754397999 - ], - [ - 118.775757609525229, - 31.912327841935934 - ], - [ - 118.783211201309285, - 31.913286806717171 - ], - [ - 118.785784587549202, - 31.914017040851945 - ], - [ - 118.786397412322756, - 31.914346873911789 - ], - [ - 118.790008470741171, - 31.916801109518921 - ], - [ - 118.792031595441017, - 31.916926918928198 - ], - [ - 118.792224890214499, - 31.917049217341436 - ], - [ - 118.796655998076304, - 31.91917916024158 - ], - [ - 118.796655998076304, - 31.91917916024158 - ], - [ - 118.803474896592405, - 31.922639738321898 - ] - ] - ] - } - } - ] -} \ No newline at end of file diff --git a/src/utils/mapJson/detachment3.json b/src/utils/mapJson/detachment3.json deleted file mode 100644 index 3404b26..0000000 --- a/src/utils/mapJson/detachment3.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "type": "FeatureCollection", - "name": "3中队", - "crs": { - "type": "name", - "properties": { - "name": "urn:ogc:def:crs:OGC:1.3:CRS84" - } - }, - "features": [ - { - "type": "Feature", - "properties": {"name": "3中队"}, - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - 118.810008752170205, - 31.876284869189416 - ], - [ - 118.809510691110347, - 31.877085162032991 - ], - [ - 118.808172714084705, - 31.880839617139745 - ], - [ - 118.806725519689522, - 31.884996003230466 - ], - [ - 118.805990800480743, - 31.888330459257382 - ], - [ - 118.80575398496903, - 31.892287902298033 - ], - [ - 118.804535438673625, - 31.9057197596014 - ], - [ - 118.804377350613152, - 31.914347393214801 - ], - [ - 118.804191882868324, - 31.915637369637061 - ], - [ - 118.803961298342202, - 31.917284351412405 - ], - [ - 118.803807886026604, - 31.918642398539536 - ], - [ - 118.803586355754902, - 31.919901311767862 - ], - [ - 118.803598319346875, - 31.920543474630179 - ], - [ - 118.804749475126968, - 31.920675420618203 - ], - [ - 118.809976576010769, - 31.921298537515739 - ], - [ - 118.813801185022314, - 31.92240659825773 - ], - [ - 118.815630892217698, - 31.922939036220296 - ], - [ - 118.816042731484302, - 31.923062815556552 - ], - [ - 118.817360429810932, - 31.923443316006889 - ], - [ - 118.819265348320016, - 31.924106981382092 - ], - [ - 118.825970326276291, - 31.926367029978536 - ], - [ - 118.828003593146661, - 31.927034008871118 - ], - [ - 118.829307298873488, - 31.92779063464225 - ], - [ - 118.830673002126858, - 31.929993700965959 - ], - [ - 118.831786418944716, - 31.929409662877241 - ], - [ - 118.832852786132364, - 31.928224397928002 - ], - [ - 118.833902293498369, - 31.925045650591304 - ], - [ - 118.834951700659701, - 31.922895130080757 - ], - [ - 118.838320851350758, - 31.921732120154644 - ], - [ - 118.841303156344338, - 31.919959181891659 - ], - [ - 118.843898633545322, - 31.917531316769907 - ], - [ - 118.846052375726387, - 31.912505020561266 - ], - [ - 118.846659850668701, - 31.909418405908788 - ], - [ - 118.845335461949873, - 31.906935532847577 - ], - [ - 118.845832701011787, - 31.904128796578195 - ], - [ - 118.848372978258311, - 31.900670469570265 - ], - [ - 118.840753640498193, - 31.891203901997336 - ], - [ - 118.836335854564652, - 31.887123902499876 - ], - [ - 118.831972982863093, - 31.88355799429733 - ], - [ - 118.824849182232967, - 31.879800796300984 - ], - [ - 118.815792419212215, - 31.87697538357288 - ], - [ - 118.810008752170205, - 31.876284869189416 - ] - ] - ] - } - } - ] -} \ No newline at end of file diff --git a/src/utils/mapJson/detachment4.json b/src/utils/mapJson/detachment4.json deleted file mode 100644 index 7a85078..0000000 --- a/src/utils/mapJson/detachment4.json +++ /dev/null @@ -1,259 +0,0 @@ -{ - "type": "FeatureCollection", - "name": "4中队", - "crs": { - "type": "name", - "properties": { - "name": "urn:ogc:def:crs:OGC:1.3:CRS84" - } - }, - "features": [ - { - "type": "Feature", - "properties": {"name": "4中队"}, - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - 118.80343082010954, - 31.922575651194556 - ], - [ - 118.803607439804253, - 31.919414238207491 - ], - [ - 118.80417086608648, - 31.915388279460718 - ], - [ - 118.804452498157104, - 31.914285504964688 - ], - [ - 118.804453242016834, - 31.906171721127446 - ], - [ - 118.804664863088348, - 31.903756547442779 - ], - [ - 118.805193396872411, - 31.89795517521495 - ], - [ - 118.805667762606532, - 31.892915890950754 - ], - [ - 118.805949618654211, - 31.889455628862937 - ], - [ - 118.806091061823594, - 31.887576469224967 - ], - [ - 118.806689467693332, - 31.884802900856638 - ], - [ - 118.807851001011016, - 31.881761254469723 - ], - [ - 118.809452561546578, - 31.87724409338249 - ], - [ - 118.810153060045508, - 31.876056075413661 - ], - [ - 118.810903640488746, - 31.875151212020395 - ], - [ - 118.816392743105538, - 31.865090039162936 - ], - [ - 118.822635858630164, - 31.853750344485331 - ], - [ - 118.822716065699922, - 31.853339413666976 - ], - [ - 118.822230375483784, - 31.838632664399793 - ], - [ - 118.822057431294382, - 31.833997470434493 - ], - [ - 118.821575450916768, - 31.833588493657665 - ], - [ - 118.818406739850204, - 31.834226725655036 - ], - [ - 118.812904494167171, - 31.83322751107881 - ], - [ - 118.807551170225892, - 31.829666432802032 - ], - [ - 118.805420278020406, - 31.827335373771731 - ], - [ - 118.802162499877852, - 31.823779327276206 - ], - [ - 118.799494928067034, - 31.821009557911417 - ], - [ - 118.794242752823465, - 31.823062961322641 - ], - [ - 118.791002449481965, - 31.824519636806286 - ], - [ - 118.788866535276512, - 31.831912114703744 - ], - [ - 118.79054770271209, - 31.835953121698843 - ], - [ - 118.792134769170033, - 31.840403157708991 - ], - [ - 118.79328795294586, - 31.847616178871153 - ], - [ - 118.793689845280255, - 31.855913384639987 - ], - [ - 118.777232951442087, - 31.87111043054869 - ], - [ - 118.772242862747504, - 31.87291938082285 - ], - [ - 118.76850735569576, - 31.867087431407882 - ], - [ - 118.767591485150078, - 31.85849609827325 - ], - [ - 118.767486584291532, - 31.856617657285611 - ], - [ - 118.76377929779953, - 31.856488523675484 - ], - [ - 118.765146635500429, - 31.861314207598614 - ], - [ - 118.7652862539301, - 31.86638431013554 - ], - [ - 118.76314454757231, - 31.871885328241323 - ], - [ - 118.763175305705659, - 31.874689922110122 - ], - [ - 118.752573072000033, - 31.876521314433113 - ], - [ - 118.745718313494976, - 31.880700515097743 - ], - [ - 118.744798490694038, - 31.881384838359381 - ], - [ - 118.744795459179045, - 31.881736912940053 - ], - [ - 118.758974965688935, - 31.880616470074624 - ], - [ - 118.764318240874516, - 31.882123044813881 - ], - [ - 118.754199413686081, - 31.907088033525696 - ], - [ - 118.753848133760087, - 31.909662550483631 - ], - [ - 118.752214769248027, - 31.912222951883297 - ], - [ - 118.775945489590555, - 31.915736769335847 - ], - [ - 118.775751613672398, - 31.912215811698356 - ], - [ - 118.786000877976974, - 31.91412533184624 - ], - [ - 118.789991442574376, - 31.916826092106163 - ], - [ - 118.792198859040354, - 31.916939156326023 - ], - [ - 118.80343082010954, - 31.922575651194556 - ] - ] - ] - } - } - ] -} \ No newline at end of file diff --git a/src/utils/mapJson/point.json b/src/utils/mapJson/point.json index 20b339c..73d5079 100644 --- a/src/utils/mapJson/point.json +++ b/src/utils/mapJson/point.json @@ -41,24 +41,14 @@ "type": "Point" } }, + { "type": "Feature", "properties": {"name":"执法车辆"}, "geometry": { "coordinates": [ - 118.75617568568583, - 31.907202504842076 - ], - "type": "Point" - } - }, - { - "type": "Feature", - "properties": {"name":"执法车辆"}, - "geometry": { - "coordinates": [ - 118.71245559342861, - 31.80729344525831 + 118.79202271621062, + 31.894683156925666 ], "type": "Point" } @@ -68,8 +58,8 @@ "properties": {"name":"执法车辆"}, "geometry": { "coordinates": [ - 118.76797317089773, - 31.815844471399032 + 118.80544753568995, + 31.946370280828546 ], "type": "Point" } @@ -118,17 +108,7 @@ "type": "Point" } }, - { - "type": "Feature", - "properties": {"name":"普通事件"}, - "geometry": { - "coordinates": [ - 118.75860457969964, - 31.82351023555887 - ], - "type": "Point" - } - }, + { "type": "Feature", "properties": {"name":"重点事件"}, diff --git a/src/utils/mapJson/中队小网格.json b/src/utils/mapJson/中队小网格.json new file mode 100644 index 0000000..878f805 --- /dev/null +++ b/src/utils/mapJson/中队小网格.json @@ -0,0 +1,28 @@ +{ +"type": "FeatureCollection", +"name": "中队小网格", +"features": [ +{ "type": "Feature", "properties": { "CENTERX": 118.80868470184473, "CENTERY": 31.953064278485414, "COOD": "320115402001111", "NAME": "一中队一号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.807445182447637, 31.952766862600512 ], [ 118.807491798068639, 31.953866311105841 ], [ 118.807387644000144, 31.955139862220395 ], [ 118.812823342593177, 31.955166302740292 ], [ 118.819394412595798, 31.955424189083491 ], [ 118.819804686476758, 31.952860629608416 ], [ 118.820078614372932, 31.951734041324332 ], [ 118.820244514810881, 31.951138425224265 ], [ 118.820950891068691, 31.947350236658814 ], [ 118.82002467974651, 31.947352412722829 ], [ 118.816084463053528, 31.947123514253732 ], [ 118.81561332993985, 31.947033173965156 ], [ 118.811822770019944, 31.946868146062418 ], [ 118.807313947157354, 31.946564545136248 ], [ 118.80735214371623, 31.949106708741827 ], [ 118.807438136723903, 31.952600686397819 ], [ 118.807445182447637, 31.952766862600512 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.81845806669385, "CENTERY": 31.952271596717267, "COOD": "320115402001112", "NAME": "一中队二号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.819804686476758, 31.952860629608416 ], [ 118.819394412595798, 31.955424189083491 ], [ 118.820497725840085, 31.955467440621277 ], [ 118.824555900019448, 31.95520750523324 ], [ 118.825662142762781, 31.953125554430539 ], [ 118.826325623166142, 31.950918424542973 ], [ 118.827431824290699, 31.949025522994102 ], [ 118.828537976583107, 31.947132612005561 ], [ 118.829354500485223, 31.945687084646579 ], [ 118.827462778352128, 31.945346220959252 ], [ 118.826252967574689, 31.945192952876692 ], [ 118.825059214827291, 31.945120094766175 ], [ 118.82315347166913, 31.945005639609587 ], [ 118.822957564857575, 31.944995664351861 ], [ 118.822663850468089, 31.947192044699364 ], [ 118.822578198499684, 31.947192202608452 ], [ 118.822861593955835, 31.944989622767046 ], [ 118.821405616837765, 31.944909715734269 ], [ 118.821180892200573, 31.946116767966107 ], [ 118.820950891068691, 31.947350236658814 ], [ 118.820244514810881, 31.951138425224265 ], [ 118.820078614372932, 31.951734041324332 ], [ 118.819804686476758, 31.952860629608416 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.82139280698777, "CENTERY": 31.943663656685278, "COOD": "320115402001113", "NAME": "一中队三号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.821405616837765, 31.944909715734269 ], [ 118.822861593955835, 31.944989622767046 ], [ 118.822578198499684, 31.947192202608452 ], [ 118.822663850468089, 31.947192044699364 ], [ 118.822957564857575, 31.944995664351861 ], [ 118.82315347166913, 31.945005639609587 ], [ 118.825059214827291, 31.945120094766175 ], [ 118.826252967574689, 31.945192952876692 ], [ 118.827462778352128, 31.945346220959252 ], [ 118.829354500485223, 31.945687084646579 ], [ 118.830676372630919, 31.943346905498586 ], [ 118.833613703958179, 31.936862737358261 ], [ 118.832373371011911, 31.936517196513904 ], [ 118.827213027255368, 31.93621584453232 ], [ 118.826495711176506, 31.936185008022424 ], [ 118.825430439134323, 31.936154817707152 ], [ 118.824879061852783, 31.936112938853523 ], [ 118.823829833971629, 31.936045165459326 ], [ 118.822721713891198, 31.936004308602644 ], [ 118.821560050044212, 31.93596890309022 ], [ 118.821560096602965, 31.936478407214434 ], [ 118.821533678074402, 31.940286327738388 ], [ 118.821571027651146, 31.943096579514101 ], [ 118.821576801077768, 31.943530982714446 ], [ 118.821425179109113, 31.94475215961387 ], [ 118.821405616837765, 31.944909715734269 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.8235524337444, "CENTERY": 31.931599191962398, "COOD": "320115402001114", "NAME": "一中队四号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.832373371011911, 31.936517196513904 ], [ 118.833613703958179, 31.936862737358261 ], [ 118.835762890198382, 31.932118405538976 ], [ 118.835909451620168, 31.929156022450734 ], [ 118.835982581564622, 31.927202157020194 ], [ 118.832178234657235, 31.924592239611883 ], [ 118.823751786361171, 31.92215018115256 ], [ 118.822372693811701, 31.924415057693167 ], [ 118.821826792795861, 31.925874856114582 ], [ 118.821660915831714, 31.926698413914359 ], [ 118.82155924570344, 31.927165199952338 ], [ 118.821441549344982, 31.928002076818224 ], [ 118.821437339789043, 31.928243307398606 ], [ 118.821441662770965, 31.929243659835585 ], [ 118.821505722548892, 31.931254753857012 ], [ 118.821506226868436, 31.932793984978769 ], [ 118.821560050044212, 31.93596890309022 ], [ 118.822721713891198, 31.936004308602644 ], [ 118.823829833971629, 31.936045165459326 ], [ 118.824879061852783, 31.936112938853523 ], [ 118.825430439134323, 31.936154817707152 ], [ 118.826495711176506, 31.936185008022424 ], [ 118.827213027255368, 31.93621584453232 ], [ 118.832373371011911, 31.936517196513904 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.81044639780058, "CENTERY": 31.925860775047987, "COOD": "320115402001115", "NAME": "一中队五号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.81097783426614, 31.928685653079135 ], [ 118.812712542053745, 31.928623689826942 ], [ 118.818858573940133, 31.928382204211413 ], [ 118.821437339789043, 31.928243307398606 ], [ 118.821441549344982, 31.928002076818224 ], [ 118.82155924570344, 31.927165199952338 ], [ 118.821660915831714, 31.926698413914359 ], [ 118.821826792795861, 31.925874856114582 ], [ 118.822372693811701, 31.924415057693167 ], [ 118.823751786361171, 31.92215018115256 ], [ 118.821858892561096, 31.921601565569539 ], [ 118.815195270136698, 31.918791628692862 ], [ 118.808861700329189, 31.918802476934637 ], [ 118.808473975054795, 31.920647705672344 ], [ 118.808420743360927, 31.924058800306419 ], [ 118.808442472525215, 31.927459041950378 ], [ 118.808379952620868, 31.928808192440172 ], [ 118.81097783426614, 31.928685653079135 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.80921239345302, "CENTERY": 31.946722716077588, "COOD": "320115402001116", "NAME": "一中队六号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.807276923571877, 31.944100448372328 ], [ 118.807313947157354, 31.946564545136248 ], [ 118.811822770019944, 31.946868146062418 ], [ 118.81561332993985, 31.947033173965156 ], [ 118.816084463053528, 31.947123514253732 ], [ 118.82002467974651, 31.947352412722829 ], [ 118.820950891068691, 31.947350236658814 ], [ 118.821180892200573, 31.946116767966107 ], [ 118.821405616837765, 31.944909715734269 ], [ 118.821425179109113, 31.94475215961387 ], [ 118.821576801077768, 31.943530982714446 ], [ 118.821571027651146, 31.943096579514101 ], [ 118.820235756208064, 31.943171418749206 ], [ 118.820005556648653, 31.943128932261832 ], [ 118.81951303808205, 31.943076195093667 ], [ 118.818699307067121, 31.943007946203611 ], [ 118.818522633241813, 31.942911727443985 ], [ 118.818276354123824, 31.9427137329507 ], [ 118.818019373539514, 31.942585478536259 ], [ 118.816263383031668, 31.942449172922739 ], [ 118.810855923477192, 31.942163589105032 ], [ 118.807482673917903, 31.941954676985674 ], [ 118.807230976249386, 31.94200061694546 ], [ 118.807272956126056, 31.943915232021347 ], [ 118.807276923571877, 31.944100448372328 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.80938176842371, "CENTERY": 31.93778687590795, "COOD": "320115402001117", "NAME": "一中队七号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.821533678074402, 31.940286327738388 ], [ 118.821560096602965, 31.936478407214434 ], [ 118.821560050044212, 31.93596890309022 ], [ 118.821506226868436, 31.932793984978769 ], [ 118.821505722548892, 31.931254753857012 ], [ 118.821441662770965, 31.929243659835585 ], [ 118.821437339789043, 31.928243307398606 ], [ 118.818858573940133, 31.928382204211413 ], [ 118.812712542053745, 31.928623689826942 ], [ 118.81097783426614, 31.928685653079135 ], [ 118.808379952620868, 31.928808192440172 ], [ 118.808378346291803, 31.928842856247922 ], [ 118.808175072462106, 31.930967022103108 ], [ 118.807575752308594, 31.93512985307666 ], [ 118.80715842484878, 31.938691699647205 ], [ 118.807230976249386, 31.94200061694546 ], [ 118.807482673917903, 31.941954676985674 ], [ 118.810855923477192, 31.942163589105032 ], [ 118.816263383031668, 31.942449172922739 ], [ 118.818019373539514, 31.942585478536259 ], [ 118.818276354123824, 31.9427137329507 ], [ 118.818522633241813, 31.942911727443985 ], [ 118.818699307067121, 31.943007946203611 ], [ 118.81951303808205, 31.943076195093667 ], [ 118.820005556648653, 31.943128932261832 ], [ 118.820235756208064, 31.943171418749206 ], [ 118.821571027651146, 31.943096579514101 ], [ 118.821533678074402, 31.940286327738388 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.78959734846245, "CENTERY": 31.95217504489932, "COOD": "320115402001123", "NAME": "三中队三号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.797961356008074, 31.943350292248756 ], [ 118.795711825713923, 31.943235436371438 ], [ 118.792361341524341, 31.94301728292616 ], [ 118.791782386364872, 31.942998027290685 ], [ 118.790807842116763, 31.942965593912184 ], [ 118.787036235569431, 31.94268576744382 ], [ 118.784766610379066, 31.942488858888382 ], [ 118.78471624897378, 31.942664138209505 ], [ 118.78434126875662, 31.94367817110847 ], [ 118.783452025494284, 31.946258771803222 ], [ 118.782894902041392, 31.947959457374758 ], [ 118.781919343379116, 31.950962701479703 ], [ 118.781293106097934, 31.952836132256941 ], [ 118.780543035916224, 31.954772932818795 ], [ 118.780232272617553, 31.955427521936958 ], [ 118.779878648662176, 31.956256449288276 ], [ 118.779851917477671, 31.95695636862888 ], [ 118.779898638744072, 31.95780879262804 ], [ 118.784917953800601, 31.95722017367212 ], [ 118.795108510422494, 31.956075154531671 ], [ 118.803155038918476, 31.955118888565917 ], [ 118.807387644000144, 31.955139862220395 ], [ 118.807491798068639, 31.953866311105841 ], [ 118.807445182447637, 31.952766862600512 ], [ 118.807438136723903, 31.952600686397819 ], [ 118.80735214371623, 31.949106708741827 ], [ 118.807313947157354, 31.946564545136248 ], [ 118.807276923571877, 31.944100448372328 ], [ 118.807272956126056, 31.943915232021347 ], [ 118.805472172761128, 31.943786771600681 ], [ 118.802355564975073, 31.943625376869015 ], [ 118.79991886412229, 31.943452043411398 ], [ 118.797961356008074, 31.943350292248756 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.79554720512074, "CENTERY": 31.937741159806805, "COOD": "320115402001124", "NAME": "三中队四号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.807272956126056, 31.943915232021347 ], [ 118.807230976249386, 31.94200061694546 ], [ 118.80715842484878, 31.938691699647205 ], [ 118.807575752308594, 31.93512985307666 ], [ 118.808175072462106, 31.930967022103108 ], [ 118.808378346291803, 31.928842856247922 ], [ 118.808379952620868, 31.928808192440172 ], [ 118.804314110522029, 31.928345262149122 ], [ 118.801390190092533, 31.928038691924606 ], [ 118.800394077410886, 31.927922188682206 ], [ 118.797898322666342, 31.927654968715789 ], [ 118.797566264357883, 31.927709071147671 ], [ 118.795490287909075, 31.927472960964476 ], [ 118.794990279690467, 31.930914459212584 ], [ 118.794304975827103, 31.934283467796089 ], [ 118.793341144430968, 31.937953163801559 ], [ 118.791782386364872, 31.942998027290685 ], [ 118.792361341524341, 31.94301728292616 ], [ 118.795711825713923, 31.943235436371438 ], [ 118.797961356008074, 31.943350292248756 ], [ 118.79991886412229, 31.943452043411398 ], [ 118.802355564975073, 31.943625376869015 ], [ 118.805472172761128, 31.943786771600681 ], [ 118.807272956126056, 31.943915232021347 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.83066916633008, "CENTERY": 31.920338975740933, "COOD": "320115402001211", "NAME": "二中队一号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.823751786361171, 31.92215018115256 ], [ 118.832178234657235, 31.924592239611883 ], [ 118.835982581564622, 31.927202157020194 ], [ 118.837678365097062, 31.925181934404549 ], [ 118.83966857870729, 31.921648547383651 ], [ 118.842396794701358, 31.919626185791017 ], [ 118.846452644691198, 31.917790162854004 ], [ 118.849033131987738, 31.915453032509362 ], [ 118.851034745820883, 31.912667954989566 ], [ 118.847488466787937, 31.911574221011143 ], [ 118.843596420914793, 31.910283429763059 ], [ 118.841926179952821, 31.909986181431176 ], [ 118.835181245894887, 31.909591223624211 ], [ 118.829747914995707, 31.909279680877571 ], [ 118.829533863903606, 31.910047026714881 ], [ 118.829196719866999, 31.911109581766112 ], [ 118.828731123567181, 31.912402996637468 ], [ 118.82791230172414, 31.914539100504435 ], [ 118.827484144230141, 31.915499921536721 ], [ 118.826622451464431, 31.917180225234834 ], [ 118.825921311893055, 31.91846334615245 ], [ 118.824845491164183, 31.920208398300129 ], [ 118.823751786361171, 31.92215018115256 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.83586836855184, "CENTERY": 31.897486697855868, "COOD": "320115402001212", "NAME": "二中队二号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.835181245894887, 31.909591223624211 ], [ 118.841926179952821, 31.909986181431176 ], [ 118.843596420914793, 31.910283429763059 ], [ 118.847488466787937, 31.911574221011143 ], [ 118.851034745820883, 31.912667954989566 ], [ 118.85139187315454, 31.912171057428566 ], [ 118.852128348978312, 31.909837737078291 ], [ 118.852496086424821, 31.907631208498426 ], [ 118.851462540715758, 31.905490532066597 ], [ 118.85094537015776, 31.903474855366291 ], [ 118.85146082104113, 31.901709180887163 ], [ 118.853008630112882, 31.899689342658579 ], [ 118.853711623808493, 31.898528462607914 ], [ 118.851198812411155, 31.895146293826784 ], [ 118.849486598245434, 31.892871622654173 ], [ 118.8443182911967, 31.887313317866003 ], [ 118.841685212221961, 31.88475925454415 ], [ 118.836584500724456, 31.881000733004946 ], [ 118.832537364786887, 31.878786867967264 ], [ 118.830888647369804, 31.878089446286364 ], [ 118.830805253261403, 31.88116883333571 ], [ 118.830736033028245, 31.88522360727254 ], [ 118.830640178614402, 31.890715781753297 ], [ 118.830597644009629, 31.893896279053632 ], [ 118.830560310112233, 31.895403426109176 ], [ 118.830448266466689, 31.899463622917906 ], [ 118.830325452367177, 31.902815885949291 ], [ 118.830314627378385, 31.902944159178045 ], [ 118.830068784516939, 31.905857329532189 ], [ 118.829747914995707, 31.909279680877571 ], [ 118.835181245894887, 31.909591223624211 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.81461789953485, "CENTERY": 31.909728028675183, "COOD": "320115402001213", "NAME": "二中队三号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.816655464073563, 31.897729923246501 ], [ 118.816805267134697, 31.896651641592864 ], [ 118.817153176165803, 31.895825078697548 ], [ 118.817950743690176, 31.894579372929758 ], [ 118.818459249555133, 31.893720335681518 ], [ 118.810531277264417, 31.893172158545418 ], [ 118.809690406896863, 31.902279288074187 ], [ 118.809520051449198, 31.913006052163194 ], [ 118.808942084649985, 31.916289311198057 ], [ 118.808861700329189, 31.918802476934637 ], [ 118.815195270136698, 31.918791628692862 ], [ 118.821858892561096, 31.921601565569539 ], [ 118.823751786361171, 31.92215018115256 ], [ 118.824845491164183, 31.920208398300129 ], [ 118.825921311893055, 31.91846334615245 ], [ 118.826622451464431, 31.917180225234834 ], [ 118.827484144230141, 31.915499921536721 ], [ 118.82791230172414, 31.914539100504435 ], [ 118.828731123567181, 31.912402996637468 ], [ 118.829196719866999, 31.911109581766112 ], [ 118.829533863903606, 31.910047026714881 ], [ 118.829747914995707, 31.909279680877571 ], [ 118.830068784516939, 31.905857329532189 ], [ 118.830314627378385, 31.902944159178045 ], [ 118.830071189911791, 31.902880724036542 ], [ 118.828283259197249, 31.902691010886905 ], [ 118.82792460357058, 31.90268095779609 ], [ 118.826168767734998, 31.902410720417279 ], [ 118.825226599349222, 31.902208674642011 ], [ 118.824305853687946, 31.902183570709468 ], [ 118.822598184721258, 31.90225645252826 ], [ 118.822003974296635, 31.902284362709327 ], [ 118.820735225983128, 31.902157969944891 ], [ 118.820419370171123, 31.902078097700795 ], [ 118.819402195899286, 31.901779605384395 ], [ 118.818706204550452, 31.901324988405104 ], [ 118.817849579889128, 31.900640034690305 ], [ 118.817298097303066, 31.899922347309971 ], [ 118.816832241967575, 31.898914887674067 ], [ 118.816655464073563, 31.897729923246501 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.81571299047758, "CENTERY": 31.890437192731163, "COOD": "320115402001214", "NAME": "二中队四号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.811487701945509, 31.883569180117746 ], [ 118.810546236336833, 31.893010141153855 ], [ 118.810531277264417, 31.893172158545418 ], [ 118.818459249555133, 31.893720335681518 ], [ 118.817950743690176, 31.894579372929758 ], [ 118.817153176165803, 31.895825078697548 ], [ 118.816805267134697, 31.896651641592864 ], [ 118.816655464073563, 31.897729923246501 ], [ 118.816832241967575, 31.898914887674067 ], [ 118.817298097303066, 31.899922347309971 ], [ 118.817849579889128, 31.900640034690305 ], [ 118.818706204550452, 31.901324988405104 ], [ 118.819402195899286, 31.901779605384395 ], [ 118.820419370171123, 31.902078097700795 ], [ 118.820735225983128, 31.902157969944891 ], [ 118.822003974296635, 31.902284362709327 ], [ 118.822598184721258, 31.90225645252826 ], [ 118.824305853687946, 31.902183570709468 ], [ 118.825226599349222, 31.902208674642011 ], [ 118.826168767734998, 31.902410720417279 ], [ 118.82792460357058, 31.90268095779609 ], [ 118.828283259197249, 31.902691010886905 ], [ 118.830071189911791, 31.902880724036542 ], [ 118.830314627378385, 31.902944159178045 ], [ 118.830325452367177, 31.902815885949291 ], [ 118.830448266466689, 31.899463622917906 ], [ 118.830560310112233, 31.895403426109176 ], [ 118.830597644009629, 31.893896279053632 ], [ 118.830640178614402, 31.890715781753297 ], [ 118.830736033028245, 31.88522360727254 ], [ 118.830805253261403, 31.88116883333571 ], [ 118.830888647369804, 31.878089446286364 ], [ 118.826845448875687, 31.876379121137781 ], [ 118.82148270133527, 31.874842232605648 ], [ 118.814310201177037, 31.873786066855612 ], [ 118.814827737312783, 31.8745959698952 ], [ 118.811487701945509, 31.883569180117746 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.78129902464758, "CENTERY": 31.90950591797764, "COOD": "320115402001221", "NAME": "四中队一号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.781310622958856, 31.91026296990794 ], [ 118.781165361982588, 31.910378493001122 ], [ 118.786887673852178, 31.911157222286604 ], [ 118.791349087561372, 31.912365504830507 ], [ 118.791383438064088, 31.910799011930976 ], [ 118.791410082244326, 31.909270456660057 ], [ 118.79134565297268, 31.907677655232376 ], [ 118.791082971093132, 31.905591680357585 ], [ 118.79089533281693, 31.904025844675967 ], [ 118.788661382625477, 31.904066064551294 ], [ 118.787514874731144, 31.904067380774205 ], [ 118.785628910470081, 31.903865655063797 ], [ 118.783914256901795, 31.903363302212792 ], [ 118.782435251046337, 31.902603191492524 ], [ 118.781709564205769, 31.907117056323109 ], [ 118.781310622958856, 31.91026296990794 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.79923261944224, "CENTERY": 31.88536761388503, "COOD": "320115402001225", "NAME": "四中队五号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.811487701945509, 31.883569180117746 ], [ 118.814827737312783, 31.8745959698952 ], [ 118.814310201177037, 31.873786066855612 ], [ 118.809932729274237, 31.873460659739816 ], [ 118.809165741839209, 31.873632227150072 ], [ 118.804110967940588, 31.873651126095375 ], [ 118.799821446079051, 31.873947254762282 ], [ 118.798584305388758, 31.874077771664258 ], [ 118.798531228073784, 31.87931779081126 ], [ 118.798359954076986, 31.880519413810251 ], [ 118.79814044810027, 31.881404670346917 ], [ 118.79772814104966, 31.882408191223263 ], [ 118.796694613595989, 31.884259974639324 ], [ 118.795547823673587, 31.886190001663167 ], [ 118.797016297142122, 31.887788563601791 ], [ 118.79822148895343, 31.889084772205898 ], [ 118.799421267298499, 31.890203963922534 ], [ 118.80127708369865, 31.891802152177466 ], [ 118.802669510977012, 31.892518715898692 ], [ 118.804254620417993, 31.892730787487697 ], [ 118.810531277264417, 31.893172158545418 ], [ 118.811487701945509, 31.883569180117746 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.77598190663429, "CENTERY": 31.887310635952112, "COOD": "320115402001222", "NAME": "四中队二号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.795547823673587, 31.886190001663167 ], [ 118.794501336320394, 31.88521494269045 ], [ 118.79107816964013, 31.882462613024945 ], [ 118.789433415925316, 31.88117205506968 ], [ 118.787295630387561, 31.879458274204907 ], [ 118.786181134673939, 31.878590654309122 ], [ 118.784107462683622, 31.877541640506344 ], [ 118.781728182580551, 31.876465963257004 ], [ 118.78035088617608, 31.8758129136957 ], [ 118.778582226902714, 31.874548716093734 ], [ 118.776116612888785, 31.872732526664915 ], [ 118.776223866148612, 31.871584657645606 ], [ 118.774149793611997, 31.867787484912739 ], [ 118.772965413586917, 31.863863301263915 ], [ 118.7725955882416, 31.862027727382699 ], [ 118.772714366376277, 31.860369759038988 ], [ 118.771619765988973, 31.854836803821733 ], [ 118.770238649288927, 31.855328725059611 ], [ 118.77041139498327, 31.856374951295841 ], [ 118.77118047903501, 31.858323913829825 ], [ 118.768798339876923, 31.87268072918032 ], [ 118.76846515806433, 31.872695030896399 ], [ 118.767884966933778, 31.872750966982998 ], [ 118.763224106890561, 31.873359823658049 ], [ 118.759612248477438, 31.873896411708813 ], [ 118.757175838180345, 31.874504645350246 ], [ 118.75520069566231, 31.875937088767071 ], [ 118.749610398426043, 31.879696103837041 ], [ 118.749820300850729, 31.879982956738758 ], [ 118.763180873664666, 31.878486468208067 ], [ 118.76511106731698, 31.878269522218432 ], [ 118.765747207359766, 31.878221670215908 ], [ 118.767091985435371, 31.878059640609905 ], [ 118.767714021292946, 31.87870296013331 ], [ 118.768786407562899, 31.879260233667949 ], [ 118.769708584639375, 31.87934557496537 ], [ 118.769817181106148, 31.879664633299029 ], [ 118.770160579276535, 31.882667889982034 ], [ 118.769388847675032, 31.8859291746253 ], [ 118.764757209390581, 31.897687451553118 ], [ 118.76186993882456, 31.902483211741952 ], [ 118.761239955453561, 31.906355442004148 ], [ 118.760639408874923, 31.907985987821945 ], [ 118.757999345649097, 31.910584846033014 ], [ 118.767052165228876, 31.91148350639255 ], [ 118.775158367223142, 31.914930059958863 ], [ 118.780866575633297, 31.915310562629362 ], [ 118.781165361982588, 31.910378493001122 ], [ 118.781310622958856, 31.91026296990794 ], [ 118.781709564205769, 31.907117056323109 ], [ 118.782435251046337, 31.902603191492524 ], [ 118.783914256901795, 31.903363302212792 ], [ 118.785628910470081, 31.903865655063797 ], [ 118.787514874731144, 31.904067380774205 ], [ 118.788661382625477, 31.904066064551294 ], [ 118.79089533281693, 31.904025844675967 ], [ 118.790750589020504, 31.90288901440125 ], [ 118.790359262945614, 31.900052333335786 ], [ 118.790332296229423, 31.898078688753046 ], [ 118.790573174322859, 31.896002814715356 ], [ 118.791097936583625, 31.893551159073073 ], [ 118.79140851350256, 31.892183140908333 ], [ 118.791965500197904, 31.890798719450359 ], [ 118.792458246817901, 31.889966787444447 ], [ 118.79378653306523, 31.888286364101734 ], [ 118.795547823673587, 31.886190001663167 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.80769353666076, "CENTERY": 31.854756649901539, "COOD": "320115402001226", "NAME": "四中队六号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.776223866148612, 31.871584657645606 ], [ 118.776116612888785, 31.872732526664915 ], [ 118.778582226902714, 31.874548716093734 ], [ 118.78035088617608, 31.8758129136957 ], [ 118.781728182580551, 31.876465963257004 ], [ 118.784107462683622, 31.877541640506344 ], [ 118.786181134673939, 31.878590654309122 ], [ 118.787295630387561, 31.879458274204907 ], [ 118.789433415925316, 31.88117205506968 ], [ 118.79107816964013, 31.882462613024945 ], [ 118.794501336320394, 31.88521494269045 ], [ 118.795547823673587, 31.886190001663167 ], [ 118.796694613595989, 31.884259974639324 ], [ 118.79772814104966, 31.882408191223263 ], [ 118.79814044810027, 31.881404670346917 ], [ 118.798359954076986, 31.880519413810251 ], [ 118.798531228073784, 31.87931779081126 ], [ 118.798584305388758, 31.874077771664258 ], [ 118.799821446079051, 31.873947254762282 ], [ 118.804110967940588, 31.873651126095375 ], [ 118.809165741839209, 31.873632227150072 ], [ 118.809932729274237, 31.873460659739816 ], [ 118.813059093284167, 31.868778521001413 ], [ 118.815771619725538, 31.863053788131129 ], [ 118.817741121121443, 31.856099389582791 ], [ 118.818768253720222, 31.847945233046069 ], [ 118.818596637080745, 31.844598796242636 ], [ 118.819366794243379, 31.836445046551425 ], [ 118.820308753262452, 31.833783083535586 ], [ 118.820886728887203, 31.831713090711823 ], [ 118.816004498966578, 31.829511012340056 ], [ 118.812748262867672, 31.827490838698942 ], [ 118.80849723318083, 31.823638671041742 ], [ 118.806826499635406, 31.82226836425108 ], [ 118.80549833212882, 31.820039303664782 ], [ 118.802199588261331, 31.81927211088022 ], [ 118.803611986151452, 31.824791615080454 ], [ 118.803297518828259, 31.825022501451116 ], [ 118.795914048904265, 31.822844754870083 ], [ 118.795205207435046, 31.824729578343746 ], [ 118.794167410835058, 31.829098293201334 ], [ 118.794166581222242, 31.832136622683297 ], [ 118.796090877633546, 31.835805822879824 ], [ 118.796830274479248, 31.840362436675772 ], [ 118.797940148212675, 31.84428559334691 ], [ 118.798424936328132, 31.846400345461838 ], [ 118.798608749950589, 31.846373935640141 ], [ 118.798457999120401, 31.846690277402146 ], [ 118.798679445205451, 31.8502346662227 ], [ 118.798678700443119, 31.854095803628667 ], [ 118.797641599555718, 31.855616199842284 ], [ 118.791937116755591, 31.861066079155492 ], [ 118.790306707978701, 31.863536276284915 ], [ 118.787120184104481, 31.866071020145863 ], [ 118.783858917585235, 31.868921928034109 ], [ 118.776223866148612, 31.871584657645606 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.79705226211863, "CENTERY": 31.923965683446266, "COOD": "320115402001125", "NAME": "三中队五号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.79618544109529, 31.915032486002083 ], [ 118.79600152272856, 31.919135466190987 ], [ 118.79600175415446, 31.921656179494345 ], [ 118.795889532233232, 31.92445593254461 ], [ 118.795490287909075, 31.927472960964476 ], [ 118.797566264357883, 31.927709071147671 ], [ 118.797898322666342, 31.927654968715789 ], [ 118.800394077410886, 31.927922188682206 ], [ 118.801390190092533, 31.928038691924606 ], [ 118.804314110522029, 31.928345262149122 ], [ 118.808379952620868, 31.928808192440172 ], [ 118.808442472525215, 31.927459041950378 ], [ 118.808420743360927, 31.924058800306419 ], [ 118.808473975054795, 31.920647705672344 ], [ 118.807045352402611, 31.920020357722816 ], [ 118.802706642377387, 31.91786803115588 ], [ 118.799075526137429, 31.91610358774874 ], [ 118.796868833539506, 31.915087713255904 ], [ 118.79618544109529, 31.915032486002083 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.7782132922228, "CENTERY": 31.944207548302771, "COOD": "320115402001121", "NAME": "三中队一号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.791200380280117, 31.926822310903624 ], [ 118.78884557412978, 31.926266931972147 ], [ 118.785770285333996, 31.926356200173103 ], [ 118.783314074142424, 31.925570560900255 ], [ 118.782413924673648, 31.926969489988732 ], [ 118.780567466683848, 31.928357321423288 ], [ 118.779015917044148, 31.930816304545665 ], [ 118.776799746614302, 31.932330122763613 ], [ 118.776577506835082, 31.934410117567509 ], [ 118.777167347033995, 31.93787630572562 ], [ 118.777240438048693, 31.940460366903665 ], [ 118.775393212721497, 31.942036907496931 ], [ 118.772881181983294, 31.942668128527245 ], [ 118.771772003235924, 31.94531559827676 ], [ 118.770958488218312, 31.947395703956825 ], [ 118.770735576491163, 31.950862244950354 ], [ 118.769996210095627, 31.951996897052005 ], [ 118.76955183320085, 31.954707146937992 ], [ 118.770068357565762, 31.956912988734906 ], [ 118.771397911551034, 31.9588034676236 ], [ 118.779898638744072, 31.95780879262804 ], [ 118.779851917477671, 31.95695636862888 ], [ 118.779878648662176, 31.956256449288276 ], [ 118.780232272617553, 31.955427521936958 ], [ 118.780543035916224, 31.954772932818795 ], [ 118.781293106097934, 31.952836132256941 ], [ 118.781919343379116, 31.950962701479703 ], [ 118.782894902041392, 31.947959457374758 ], [ 118.783452025494284, 31.946258771803222 ], [ 118.78434126875662, 31.94367817110847 ], [ 118.78471624897378, 31.942664138209505 ], [ 118.784766610379066, 31.942488858888382 ], [ 118.787036235569431, 31.94268576744382 ], [ 118.790807842116763, 31.942965593912184 ], [ 118.791782386364872, 31.942998027290685 ], [ 118.793341144430968, 31.937953163801559 ], [ 118.794304975827103, 31.934283467796089 ], [ 118.794990279690467, 31.930914459212584 ], [ 118.795490287909075, 31.927472960964476 ], [ 118.79509171123081, 31.927235160851755 ], [ 118.792531280951124, 31.926959635598603 ], [ 118.791200380280117, 31.926822310903624 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.78401719536816, "CENTERY": 31.920951929260099, "COOD": "320115402001122", "NAME": "三中队二号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.785294574990132, 31.922492392243164 ], [ 118.783314074142424, 31.925570560900255 ], [ 118.785770285333996, 31.926356200173103 ], [ 118.78884557412978, 31.926266931972147 ], [ 118.791200380280117, 31.926822310903624 ], [ 118.792531280951124, 31.926959635598603 ], [ 118.79509171123081, 31.927235160851755 ], [ 118.795490287909075, 31.927472960964476 ], [ 118.795889532233232, 31.92445593254461 ], [ 118.79600175415446, 31.921656179494345 ], [ 118.79600152272856, 31.919135466190987 ], [ 118.79618544109529, 31.915032486002083 ], [ 118.795433385316528, 31.914971697060292 ], [ 118.794683473590226, 31.914629460507577 ], [ 118.792326447815384, 31.913055746000349 ], [ 118.791481673786421, 31.912459141509405 ], [ 118.791349087561372, 31.912365504830507 ], [ 118.786887673852178, 31.911157222286604 ], [ 118.781165361982588, 31.910378493001122 ], [ 118.780866575632828, 31.915310562629326 ], [ 118.782416061775294, 31.918965089970932 ], [ 118.785295009382637, 31.92066461982629 ], [ 118.785294574990132, 31.922492392243164 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.78846988963286, "CENTERY": 31.902642197333591, "COOD": "320115402001224", "NAME": "四中队四号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.790359262945614, 31.900052333335786 ], [ 118.790750589020504, 31.90288901440125 ], [ 118.79089533281693, 31.904025844675967 ], [ 118.791082971093132, 31.905591680357585 ], [ 118.79134565297268, 31.907677655232376 ], [ 118.791410082244326, 31.909270456660057 ], [ 118.791383438064088, 31.910799011930976 ], [ 118.791349087561372, 31.912365504830507 ], [ 118.791481673786421, 31.912459141509405 ], [ 118.792326447815384, 31.913055746000349 ], [ 118.794683473590226, 31.914629460507577 ], [ 118.795433385316528, 31.914971697060292 ], [ 118.79618544109529, 31.915032486002083 ], [ 118.796557271062255, 31.905133981497965 ], [ 118.796717658790527, 31.901937264168829 ], [ 118.797017350568282, 31.899276673742481 ], [ 118.797820365689802, 31.895226283589331 ], [ 118.798826957661362, 31.892031019268565 ], [ 118.799421267298499, 31.890203963922534 ], [ 118.79822148895343, 31.889084772205898 ], [ 118.797016297142122, 31.887788563601791 ], [ 118.795547823673587, 31.886190001663167 ], [ 118.79378653306523, 31.888286364101734 ], [ 118.792458246817901, 31.889966787444447 ], [ 118.791965500197904, 31.890798719450359 ], [ 118.79140851350256, 31.892183140908333 ], [ 118.791097936583625, 31.893551159073073 ], [ 118.790573174322859, 31.896002814715356 ], [ 118.790332296229423, 31.898078688753046 ], [ 118.790359262945614, 31.900052333335786 ] ] ] ] } }, +{ "type": "Feature", "properties": { "CENTERX": 118.79792603409661, "CENTERY": 31.907469928252954, "COOD": "320115402001223", "NAME": "四中队三号网格", "NOTE": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.79618544109529, 31.915032486002083 ], [ 118.796868833539506, 31.915087713255904 ], [ 118.799075526137429, 31.91610358774874 ], [ 118.802706642377387, 31.91786803115588 ], [ 118.807045352402611, 31.920020357722816 ], [ 118.808473975054795, 31.920647705672344 ], [ 118.808861700329189, 31.918802476934637 ], [ 118.808942084649985, 31.916289311198057 ], [ 118.809520051449198, 31.913006052163194 ], [ 118.809690406896863, 31.902279288074187 ], [ 118.810531277264417, 31.893172158545418 ], [ 118.804254620417993, 31.892730787487697 ], [ 118.802669510977012, 31.892518715898692 ], [ 118.80127708369865, 31.891802152177466 ], [ 118.799421267298499, 31.890203963922534 ], [ 118.798826957661362, 31.892031019268565 ], [ 118.797820365689802, 31.895226283589331 ], [ 118.797017350568282, 31.899276673742481 ], [ 118.796717658790527, 31.901937264168829 ], [ 118.796557271062255, 31.905133981497965 ], [ 118.79618544109529, 31.915032486002083 ] ] ] ] } } +] +} diff --git a/src/utils/request2.js b/src/utils/request2.js new file mode 100644 index 0000000..f56d200 --- /dev/null +++ b/src/utils/request2.js @@ -0,0 +1,177 @@ +import axios from 'axios' +import { Notification, MessageBox, Message, Loading } from 'element-ui' +import store from '@/store' +import { getAccessToken, setToken } from '@/utils/auth' +import errorCode from '@/utils/errorCode' +import { tansParams, blobValidate } from "@/utils/ruoyi"; +import cache from '@/plugins/cache' +import { saveAs } from 'file-saver' + +let downloadLoadingInstance; +// 是否显示重新登录 +export let isRelogin = { show: false }; + +// 是否正在刷新的标记 +let isRefreshing = false +//重试队列 +let requests = [] + +axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' +// 创建axios实例 +const service = axios.create({ + // axios中请求配置有baseURL选项，表示请求URL公共部分 + baseURL: process.env.NODE_ENV === "production" ? location.origin : process.env.VUE_APP_BASE_API1, + // 超时 + timeout: 10000 +}) + +// request拦截器 +service.interceptors.request.use(config => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + // 是否需要防止数据重复提交 + const isRepeatSubmit = (config.headers || {}).repeatSubmit === false + if (getAccessToken() && !isToken) { + config.headers['X-Access-Token'] = getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + } + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let url = config.url + '?' + tansParams(config.params); + url = url.slice(0, -1); + config.params = {}; + config.url = url; + } + if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) { + const requestObj = { + url: config.url, + data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, + time: new Date().getTime() + } + const sessionObj = cache.session.getJSON('sessionObj') + if (sessionObj === undefined || sessionObj === null || sessionObj === '') { + cache.session.setJSON('sessionObj', requestObj) + } else { + const s_url = sessionObj.url; // 请求地址 + const s_data = sessionObj.data; // 请求数据 + const s_time = sessionObj.time; // 请求时间 + const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 + if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { + const message = '数据正在处理，请勿重复提交'; + console.warn(`[${s_url}]: ` + message) + return Promise.reject(new Error(message)) + } else { + cache.session.setJSON('sessionObj', requestObj) + } + } + } + return config +}, error => { + console.log(error) + Promise.reject(error) +}) + +// 响应拦截器 +service.interceptors.response.use(res => { + // console.log(res,'resres'); + // 未设置状态码则默认成功状态 + const code = res.data.code || 200; + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + // 二进制数据则直接返回 + if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { + return res.data + } + if (code === 401) { + if (!isRelogin.show){ + isRelogin.show = true; + MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { + isRelogin.show = false; + store.dispatch('LogOut').then(() => { + location.href = '/#/login'; + }) + }).catch(() => { + isRelogin.show = false; + }); + // TODO:无感刷新token暂缺少不需验证码登录接口 + // const loginForm = { + // username: "admin", + // password: "admin123", + // } + // store.dispatch("NoCodeLogin", loginForm).then(() => { + // isRelogin.show = false; + // res.headers.Authorization = getToken(); + // requests.forEach((cb) => cb(getToken())) + // requests = [] // 重新请求完清空 + // return service(res.config) + // }).catch(() => { + // isRelogin.show = false; + // }); + } else { + return new Promise(resolve => { + // 用函数形式将 resolve 存入，等待刷新后再执行 + requests.push(token => { + res.headers.Authorization = `${token}` + resolve(service(res.config)) + }) + }) + } + // return Promise.reject('无效的会话，或者会话已过期，请重新登录。') + } else if (code === 500) { + Message({ message: msg, type: 'error' }) + return Promise.reject(new Error(msg)) + } else if (code === 601) { + Message({ message: msg, type: 'warning' }) + return Promise.reject('error') + } else if (code !== 200) { + Notification.error({ title: msg }) + return Promise.reject('error') + } else { + return res.data + } + }, + error => { + console.log('err' + error) + let { message } = error; + const originalRequest = error.config; + // console.log(originalRequest,'originalRequest'); + // console.log(error.response.status,'error.response.status'); + if (message == "Network Error") { + message = "后端接口连接异常"; + } else if (message.includes("timeout")) { + message = "系统接口请求超时"; + } else if (message.includes("Request failed with status code")) { + message = "系统接口" + message.substr(message.length - 3) + "异常"; + } + Message({ message: message, type: 'error', duration: 5 * 1000 }) + return Promise.reject(error) + } +) + +// 通用下载方法 +export function download(url, params, filename, config) { + downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", }) + return service.post(url, params, { + transformRequest: [(params) => { return tansParams(params) }], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + responseType: 'blob', + ...config + }).then(async (data) => { + const isBlob = blobValidate(data); + if (isBlob) { + const blob = new Blob([data]) + saveAs(blob, filename) + } else { + const resText = await data.text(); + const rspObj = JSON.parse(resText); + const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] + Message.error(errMsg); + } + downloadLoadingInstance.close(); + }).catch((r) => { + console.error(r) + Message.error('下载文件出现错误，请联系管理员！') + downloadLoadingInstance.close(); + }) +} + +export default service diff --git a/src/views/bigScreen/components/mapLeftContent.vue b/src/views/bigScreen/components/mapLeftContent.vue index 80578e2..c67f1ad 100644 --- a/src/views/bigScreen/components/mapLeftContent.vue +++ b/src/views/bigScreen/components/mapLeftContent.vue @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2023-08-15 09:44:13 * @LastEditors: JC9527 - * @LastEditTime: 2023-12-18 09:49:15 + * @LastEditTime: 2023-12-26 09:49:54 --> diff --git a/src/views/bigScreen/components/mapRightContent.vue b/src/views/bigScreen/components/mapRightContent.vue index 6ccecad..bcf5b80 100644 --- a/src/views/bigScreen/components/mapRightContent.vue +++ b/src/views/bigScreen/components/mapRightContent.vue @@ -4,25 +4,25 @@ * @Author: JC9527 * @Date: 2023-08-15 11:09:57 * @LastEditors: JC9527 - * @LastEditTime: 2023-12-13 10:58:50 + * @LastEditTime: 2023-12-25 11:13:11 --> @@ -98,6 +98,7 @@ export default { weilanArray:[], luduanArray:[], wanggeArray:[], + $listeners: false, } }, props:['quyuData', 'weilanData', 'luduanData', 'wanggeData'], @@ -131,7 +132,7 @@ export default { }, wanggeData: { handler(newWange){ - // console.log(newLuduan,'路段'); + // console.log(newWange,'网格'); if(newWange) { this.wanggeArray = newWange } diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue index afe00f7..cee6129 100644 --- a/src/views/bigScreen/index.vue +++ b/src/views/bigScreen/index.vue @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2023-08-14 14:40:02 * @LastEditors: JC9527 - * @LastEditTime: 2023-12-20 14:58:40 + * @LastEditTime: 2023-12-26 21:59:30 --> diff --git a/src/views/components/ImageUpload/index.vue b/src/views/components/ImageUpload/index.vue new file mode 100644 index 0000000..5ad307f --- /dev/null +++ b/src/views/components/ImageUpload/index.vue @@ -0,0 +1,226 @@ + + + + + diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index ba4fdf3..29b9824 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2023-08-16 14:19:37 * @LastEditors: JC9527 - * @LastEditTime: 2023-08-18 20:46:22 + * @LastEditTime: 2023-12-26 14:25:50 --> + diff --git a/src/views/components/personagetrack/index.vue b/src/views/components/personagetrack/index.vue index 5e43f17..b95b1f4 100644 --- a/src/views/components/personagetrack/index.vue +++ b/src/views/components/personagetrack/index.vue @@ -89,6 +89,8 @@ --> { console.log(res,'行动轨迹'); + this.loading = false; if(res.code == 200 && res.data.result == '000') { let arr = [] res.data.data.forEach(element => { diff --git a/src/views/components/video/index.vue b/src/views/components/video/index.vue new file mode 100644 index 0000000..d183cfb --- /dev/null +++ b/src/views/components/video/index.vue @@ -0,0 +1,84 @@ + + + + diff --git a/src/views/components/videoFileUpload/index.vue b/src/views/components/videoFileUpload/index.vue new file mode 100644 index 0000000..3de9e87 --- /dev/null +++ b/src/views/components/videoFileUpload/index.vue @@ -0,0 +1,46 @@ + + + + diff --git a/src/views/components/videoPlayer/index.vue b/src/views/components/videoPlayer/index.vue index 2ee5daf..d6ef70f 100644 --- a/src/views/components/videoPlayer/index.vue +++ b/src/views/components/videoPlayer/index.vue @@ -4,23 +4,71 @@ * @Author: JC9527 * @Date: 2023-08-17 10:50:58 * @LastEditors: JC9527 - * @LastEditTime: 2023-08-17 11:06:13 + * @LastEditTime: 2023-12-26 14:22:45 --> diff --git a/src/views/components/videoWall/index.vue b/src/views/components/videoWall/index.vue index 8926c2f..bb1b735 100644 --- a/src/views/components/videoWall/index.vue +++ b/src/views/components/videoWall/index.vue @@ -4,19 +4,22 @@ * @Author: JC9527 * @Date: 2023-08-17 10:41:06 * @LastEditors: JC9527 - * @LastEditTime: 2023-12-11 13:44:59 + * @LastEditTime: 2023-12-26 13:51:51 -->