获取dk经纬度功能重构和OSS对象上传服务更改

YSGZYBZ_WXAPP/pages/nocheckDetail/index.vue

@@ -175,7 +175,50 @@ export default {
       var Lat = Math.atan2(Z, Hyp);
       return { lng: (Lng * 180) / Math.PI, lat: (Lat * 180) / Math.PI };
     },
+	GeoServerQuery(param,serverType = 'ows') {
+	  const _default = {
+		service: 'WFS',
+		version: '1.1.1',
+		request: 'GetFeature',
+		typeName: '',
+		maxFeatures: '1',
+		outputFormat: 'application/json',
+		cql_filter: ``
+	  }
+	  Object.assign(_default, param)
+	  let paramStr = '';
+	  for(let key in _default){
+          if(paramStr == ''){
+              paramStr+=`?${key}=${_default[key]}`
+          }else{
+              paramStr+=`&${key}=${_default[key]}`
+          }
+	  }
+	  const url = config.bjdkgl;
+      return uni.request({
+          url:`${url}/${serverType}${paramStr}`,
+          method: 'GET',
+        }).then((result) => {
+          let arr = result[1].data.features[0].geometry.coordinates[0][0];
+          let newArr = [];
+          arr.forEach((item, index) => {
+            let obj = {
+              latitude: item[1],
+              longitude: item[0],
+            };
+            newArr.push(obj);
+          });
+          let center = this.calculateCenter(newArr);
+          this.centerLay = center;
+		});
+	},
     initLayCenter(dksyh) {
+		this.GeoServerQuery({
+			typeName: 'sde:bjwkfly2000',
+			cql_filter: `dksyh = '${dksyh}'`
+		})
+	},
+    initLayCenter1(dksyh) {
       let where =
         '?where=dksyh%3D%27' +
         dksyh +

YSGZYBZ_WXAPP/pages/received/index.vue

@@ -107,7 +107,61 @@ export default {
     this.mapObj = uni.createMapContext('map');
   },
   methods: {
-    cardBoxClick(item, index) {
+	GeoServerQuery(param,serverType = 'ows') {
+	  const _default = {
+		service: 'WFS',
+		version: '1.1.1',
+		request: 'GetFeature',
+		typeName: '',
+		maxFeatures: '1',
+		outputFormat: 'application/json',
+		cql_filter: ``
+	  }
+	  Object.assign(_default, param)
+	  let paramStr = '';
+	  for(let key in _default){
+          if(paramStr == ''){
+              paramStr+=`?${key}=${_default[key]}`
+          }else{
+              paramStr+=`&${key}=${_default[key]}`
+          }
+	  }
+	  const url = config.bjdkgl;
+      return uni.request({
+          url:`${url}/${serverType}${paramStr}`,
+          method: 'GET',
+        }).then((result) => {
+          let arr = result[1].data.features[0].geometry.coordinates[0][0];
+          let newArr = [];
+          arr.forEach((item, index) => {
+            let obj = {
+              latitude: item[1],
+              longitude: item[0],
+            };
+            newArr.push(obj);
+          });
+          let center = this.calculateCenter(newArr);
+          this.latitude = center.lat - 0.007;
+          this.longitude = center.lng;
+          this.scale = 15.3 + (Math.random() + 1) / 1000;
+          this.covers = [
+            {
+              // dashArray: Math.random(),
+              points: newArr,
+              strokeColor: '#ff0000',
+              zIndex: 100,
+              strokeWidth: 2,
+            },
+          ];
+		});
+	},
+    cardBoxClick(item) {
+		this.GeoServerQuery({
+			typeName: 'sde:bjwkfly2000',
+			cql_filter: `dksyh = '${item['dksyh']}'`
+		})
+	},
+    cardBoxClick1(item, index) {
       let where =
         '?where=dksyh%3D%27' +
         item.dksyh +

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1556,7 +1556,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8913,7 +8913,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8934,14 +8934,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9037,7 +9037,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -9692,7 +9692,7 @@ var config = {
 
   baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
   webViewUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/wxin-view/#/",
-  bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer'
+  bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/geoserver/sde'
 };
 var _default = config;
 exports.default = _default;

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/nocheckDetail/index.js

@@ -176,7 +176,7 @@ var navigationBar = function navigationBar() {
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var FormData = __webpack_require__(/*! @/utils/formData/formData.js */ 58);
-var _default = {
+var _default2 = {
   mixins: [_CustomMixins.default],
   components: {
     navigationBar: navigationBar
@@ -260,8 +260,53 @@ var _default = {
         lat: Lat * 180 / Math.PI
       };
     },
-    initLayCenter: function initLayCenter(dksyh) {
+    GeoServerQuery: function GeoServerQuery(param) {
       var _this = this;
+      var serverType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'ows';
+      var _default = {
+        service: 'WFS',
+        version: '1.1.1',
+        request: 'GetFeature',
+        typeName: '',
+        maxFeatures: '1',
+        outputFormat: 'application/json',
+        cql_filter: ""
+      };
+      Object.assign(_default, param);
+      var paramStr = '';
+      for (var key in _default) {
+        if (paramStr == '') {
+          paramStr += "?".concat(key, "=").concat(_default[key]);
+        } else {
+          paramStr += "&".concat(key, "=").concat(_default[key]);
+        }
+      }
+      var url = _config.default.bjdkgl;
+      return uni.request({
+        url: "".concat(url, "/").concat(serverType).concat(paramStr),
+        method: 'GET'
+      }).then(function (result) {
+        var arr = result[1].data.features[0].geometry.coordinates[0][0];
+        var newArr = [];
+        arr.forEach(function (item, index) {
+          var obj = {
+            latitude: item[1],
+            longitude: item[0]
+          };
+          newArr.push(obj);
+        });
+        var center = _this.calculateCenter(newArr);
+        _this.centerLay = center;
+      });
+    },
+    initLayCenter: function initLayCenter(dksyh) {
+      this.GeoServerQuery({
+        typeName: 'sde:bjwkfly2000',
+        cql_filter: "dksyh = '".concat(dksyh, "'")
+      });
+    },
+    initLayCenter1: function initLayCenter1(dksyh) {
+      var _this2 = this;
       var where = '?where=dksyh%3D%27' + dksyh + '%27&text=&objectIds=&time=&geometry=&geometryType=esriGeometryEnvelope&inSR=&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=&returnGeometry=true&maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=pjson';
       var url = _config.default.bjdkgl + '/0/query';
       // let whereStr = `1=1 and dksyh in (${s})`;
@@ -278,8 +323,8 @@ var _default = {
           };
           newArr.push(obj);
         });
-        var center = _this.calculateCenter(newArr);
-        _this.centerLay = center;
+        var center = _this2.calculateCenter(newArr);
+        _this2.centerLay = center;
       });
     },
     saveWarning: function saveWarning() {
@@ -321,7 +366,7 @@ var _default = {
       return (s * 1000).toFixed(0);
     },
     relationFileById: function relationFileById(fileObj) {
-      var _this2 = this;
+      var _this3 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _that, files, laycenterArr, laycenter, locationResult, isLocation, isSubmit, i, m;
         return _regenerator.default.wrap(function _callee$(_context) {
@@ -329,7 +374,7 @@ var _default = {
             switch (_context.prev = _context.next) {
               case 0:
                 //文件上传
-                _that = _this2;
+                _that = _this3;
                 files = [];
                 console.log(fileObj);
                 laycenterArr = [];
@@ -346,7 +391,7 @@ var _default = {
                   };
                   laycenterArr.push(obj1);
                 });
-                laycenter = _this2.centerLay;
+                laycenter = _this3.centerLay;
                 _context.next = 8;
                 return (0, _https.default)({
                   url: 'api/oss/location',
@@ -365,7 +410,7 @@ var _default = {
                   _context.next = 22;
                   break;
                 }
-                m = _this2.getDistance(laycenter.lat, laycenter.lng, laycenterArr[i].lat, laycenterArr[i].lng);
+                m = _this3.getDistance(laycenter.lat, laycenter.lng, laycenterArr[i].lat, laycenterArr[i].lng);
                 if (!(isLocation && m > 50)) {
                   _context.next = 19;
                   break;
@@ -390,7 +435,7 @@ var _default = {
                 }
                 return _context.abrupt("return");
               case 24:
-                _this2.addXcjlAjax(files).then(function (result) {
+                _this3.addXcjlAjax(files).then(function (result) {
                   if (result.data) {
                     uni.showModal({
                       title: '提示',
@@ -422,7 +467,7 @@ var _default = {
     },
     addXcjlAjax: function addXcjlAjax() {
       var _arguments = arguments,
-        _this3 = this;
+        _this4 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var files, _that, sendData;
         return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -430,13 +475,13 @@ var _default = {
             switch (_context2.prev = _context2.next) {
               case 0:
                 files = _arguments.length > 0 && _arguments[0] !== undefined ? _arguments[0] : [];
-                _that = _this3;
+                _that = _this4;
                 sendData = {
                   xcryId: uni.getStorageSync('userInfo').id,
-                  xzms: _this3.baseFormData.xzms,
+                  xzms: _this4.baseFormData.xzms,
                   xcryName: uni.getStorageSync('userInfo').xcry,
                   xcryMobile: uni.getStorageSync('userInfo').lxdh,
-                  dksyh: _this3.objs.dksyh,
+                  dksyh: _this4.objs.dksyh,
                   imgList: files
                 };
                 _context2.next = 5;
@@ -537,7 +582,7 @@ var _default = {
     },
     //拍摄时获取设备的经纬度
     getLocationApi: function getLocationApi(data) {
-      var _this4 = this;
+      var _this5 = this;
       var _that = this;
       wx.authorize({
         scope: 'scope.userLocation',
@@ -562,7 +607,7 @@ var _default = {
         },
         fail: function fail(err) {
           console.log('获取授权失败', err);
-          _this4.handleOpenSetting();
+          _this5.handleOpenSetting();
         }
       });
     },
@@ -592,7 +637,7 @@ var _default = {
     }
   }
 };
-exports.default = _default;
+exports.default = _default2;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"]))
 
 /***/ }),

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/received/index.js

@@ -157,7 +157,7 @@ var WebMap = function WebMap() {
     return resolve(__webpack_require__(/*! ../demo/index.vue */ 126));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
-var _default = {
+var _default2 = {
   mixins: [_CustomMixins.default],
   components: {
     SlideCard: SlideCard,
@@ -191,8 +191,62 @@ var _default = {
     this.mapObj = uni.createMapContext('map');
   },
   methods: {
-    cardBoxClick: function cardBoxClick(item, index) {
+    GeoServerQuery: function GeoServerQuery(param) {
       var _this = this;
+      var serverType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'ows';
+      var _default = {
+        service: 'WFS',
+        version: '1.1.1',
+        request: 'GetFeature',
+        typeName: '',
+        maxFeatures: '1',
+        outputFormat: 'application/json',
+        cql_filter: ""
+      };
+      Object.assign(_default, param);
+      var paramStr = '';
+      for (var key in _default) {
+        if (paramStr == '') {
+          paramStr += "?".concat(key, "=").concat(_default[key]);
+        } else {
+          paramStr += "&".concat(key, "=").concat(_default[key]);
+        }
+      }
+      var url = _config.default.bjdkgl;
+      return uni.request({
+        url: "".concat(url, "/").concat(serverType).concat(paramStr),
+        method: 'GET'
+      }).then(function (result) {
+        var arr = result[1].data.features[0].geometry.coordinates[0][0];
+        var newArr = [];
+        arr.forEach(function (item, index) {
+          var obj = {
+            latitude: item[1],
+            longitude: item[0]
+          };
+          newArr.push(obj);
+        });
+        var center = _this.calculateCenter(newArr);
+        _this.latitude = center.lat - 0.007;
+        _this.longitude = center.lng;
+        _this.scale = 15.3 + (Math.random() + 1) / 1000;
+        _this.covers = [{
+          // dashArray: Math.random(),
+          points: newArr,
+          strokeColor: '#ff0000',
+          zIndex: 100,
+          strokeWidth: 2
+        }];
+      });
+    },
+    cardBoxClick: function cardBoxClick(item) {
+      this.GeoServerQuery({
+        typeName: 'sde:bjwkfly2000',
+        cql_filter: "dksyh = '".concat(item['dksyh'], "'")
+      });
+    },
+    cardBoxClick1: function cardBoxClick1(item, index) {
+      var _this2 = this;
       var where = '?where=dksyh%3D%27' + item.dksyh + '%27&text=&objectIds=&time=&geometry=&geometryType=esriGeometryEnvelope&inSR=&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=&returnGeometry=true&maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=pjson';
       var url = _config.default.bjdkgl + '/0/query';
       uni.request({
@@ -208,14 +262,14 @@ var _default = {
           };
           newArr.push(obj);
         });
-        var center = _this.calculateCenter(newArr);
+        var center = _this2.calculateCenter(newArr);
 
         // this.latitude = newArr[0].latitude - (Math.random() / 100000 + 0.008);
         // this.longitude = newArr[0].longitude;
-        _this.latitude = center.lat - 0.007;
-        _this.longitude = center.lng;
-        _this.scale = 15.3 + (Math.random() + 1) / 1000;
-        _this.covers = [{
+        _this2.latitude = center.lat - 0.007;
+        _this2.longitude = center.lng;
+        _this2.scale = 15.3 + (Math.random() + 1) / 1000;
+        _this2.covers = [{
           // dashArray: Math.random(),
           points: newArr,
           strokeColor: '#ff0000',
@@ -256,7 +310,7 @@ var _default = {
       this.queryWarningPage();
     },
     location: function location(val) {
-      var _this2 = this;
+      var _this3 = this;
       var sendData = {
         id: val.id
       };
@@ -266,10 +320,10 @@ var _default = {
         data: sendData
       }).then(function (result) {
         var data = result['data'];
-        _this2.latitude = data.lat - (Math.random() / 100000 + 0.004);
-        _this2.longitude = data.lng;
-        _this2.scale = 15.3 + (Math.random() + 1) / 1000;
-        _this2.covers = [{
+        _this3.latitude = data.lat - (Math.random() / 100000 + 0.004);
+        _this3.longitude = data.lng;
+        _this3.scale = 15.3 + (Math.random() + 1) / 1000;
+        _this3.covers = [{
           id: Math.random(),
           latitude: data.lat,
           longitude: data.lng,
@@ -298,7 +352,7 @@ var _default = {
       }
     },
     queryWarningPage: function queryWarningPage() {
-      var _this3 = this;
+      var _this4 = this;
       if (!this.isRequest) return;
       var sendData = {
         dkbh: this.dkbhModel ? this.dkbhModel.toUpperCase() : '',
@@ -312,8 +366,8 @@ var _default = {
         data: sendData
       }).then(function (result) {
         if (result.data) {
-          _this3.listData = result.data;
-          _this3.listData.forEach(function (item) {
+          _this4.listData = result.data;
+          _this4.listData.forEach(function (item) {
             if (item.lxdh.indexOf('\n') > -1) {
               item.lxdh = item.lxdh.replace('\n', '');
             }
@@ -344,7 +398,7 @@ var _default = {
     }
   }
 };
-exports.default = _default;
+exports.default = _default2;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/project.config.json

@@ -21,31 +21,7 @@
   "libVersion": "3.2.5",
   "appid": "wxf515059e19e3d655",
   "projectname": "wx-app-new",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": 0,
-      "list": [
-        {
-          "name": "",
-          "path": "",
-          "query": "",
-          "id": 0
-        }
-      ]
-    }
-  },
+  "condition": {},
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -3,18 +3,5 @@
   "projectname": "wx-app-new",
   "setting": {
     "compileHotReLoad": true
-  },
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "pages/main/index",
-          "pathName": "pages/main/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        }
-      ]
-    }
   }
 }

YSGZYBZ_WXAPP/utils/config.js

@@ -7,7 +7,7 @@ const config = {
   baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
   webViewUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/wxin-view/#/",
   
-  bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer'
+  bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/geoserver/sde'
 }
 
 export default config