浏览代码

BUG修复

songxy 1 年之前
父节点
当前提交
027267cec0
共有 22 个文件被更改,包括 33 次插入25 次删除
  1. 2 2
      BJYSYBZ_C/public/config.js
  2. 1 0
      BJYSYBZ_C/src/views/WlydxqView/components/FourContent.vue
  3. 3 3
      BJYSYBZ_C/src/views/components/BigScreenMap/index.vue
  4. 15 0
      WEB-VIEW/src/views/components/BigScreenMap/index.vue
  5. 0 14
      WEB-VIEW/src/webViewMap.vue
  6. 6 0
      WEB-VIEW/src/webview.vue
  7. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  8. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  9. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/SlideCard/SlideCard.js.map
  10. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/navigationBar/navigationBar.js.map
  11. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  12. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/index.js.map
  13. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/nocheckDetail/index.js.map
  14. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/received/index.js.map
  15. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/receivedDetail/index.js.map
  16. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map
  17. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map
  18. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map
  19. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map
  20. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map
  21. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  22. 6 6
      YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/common/vendor.js

+ 2 - 2
BJYSYBZ_C/public/config.js

@@ -1,7 +1,7 @@
 const arcMapToken = "sy-af242c93-2d14-4232-812b-b9f23172dbb2";
 window.ApplicationConfig = {
-  // baseUrl: "https://zdzy.zrzyt.zj.gov.cn/app215/ybz-api/",
-  baseUrl: 'http://localhost:7089/ysgzybz',
+  baseUrl: "https://zdzy.zrzyt.zj.gov.cn/app215/ybz-api/",
+  // baseUrl: 'http://localhost:7089/ysgzybz',
   mapLayerConfig: {
     use: "innerNet",
     projection: {

+ 1 - 0
BJYSYBZ_C/src/views/WlydxqView/components/FourContent.vue

@@ -311,6 +311,7 @@ export default {
     },
     xzClick (item) {
       this.$emit('clickCallback', item)
+      this.$vm.$emit("getGdDetailData", item);
       this.$vm.$emit("setGdDetailType", 20);
       this.$vm.$emit("location-feature-where", { layerId: 'bj-wlyd', where: `dkbh = '${item.dkbh}'`, setting: {outFields: 'dkbh,ssqx,ssjd,mj'} })
     },

+ 3 - 3
BJYSYBZ_C/src/views/components/BigScreenMap/index.vue

@@ -225,9 +225,9 @@
           </div>
 
           <div class="content" v-if="detailType == 20">
-            <h2>{{ detailData["dkbh"] }}</h2>
-            <p>行政区划:{{ detailData["ssqx"] }} - {{ detailData["ssjd"] }}</p>
-            <p>面积:{{ (detailData["mj"] * 15).toFixed(2) }} 亩</p>
+            <h2>{{ detailData["dkbh"] || props['dkbh'] }}</h2>
+            <p>行政区划:{{ (detailData["ssqx"] || props["ssqx"]) }} - {{ detailData["ssjd"] || props["ssjd"] }}</p>
+            <p>面积:{{ ((detailData["mj"] || props['mj']) * 15).toFixed(2) }} 亩</p>
           </div>
           <div class="content" v-if="detailType == 21">
             <h2>{{ props["tdqlr"] }}</h2>

+ 15 - 0
WEB-VIEW/src/views/components/BigScreenMap/index.vue

@@ -254,6 +254,21 @@ export default {
         this.map.getView().setZoom(_initZoom);
       }, 200);
     }
+    this.$vm.$on('changeLayer', (payload) => {
+      const { id, param, layerIdx } = payload;
+      console.log("payload---------------")
+      console.log(payload)
+      let params = {};
+        params = {
+          layers: layerIdx,
+          cql_filter: param,
+        };
+        console.log(params)
+      let layer = this.getLayerById(id);
+      layer.setVisible(true);
+      const source = layer.getSource();
+      source.updateParams(params);
+    });
     this.$vm.$on('updateLayer', (payload) => {
       const { id, param, layerIdx1, layerIdx2 } = payload;
       let params = {};

+ 0 - 14
WEB-VIEW/src/webViewMap.vue

@@ -22,20 +22,6 @@ export default {
   name: 'TsxzMap',
   components: { BigScreenMap },
   mounted() {
-    this.$vm.$on('changeLayer', (payload) => {
-      const { id, param, layerIdx1, layerIdx2 } = payload;
-      let params = {
-        layers: `show:${layerIdx1},${layerIdx2}`,
-        layerDefs: {
-          [layerIdx1]: param,
-          [layerIdx2]: param,
-        },
-      };
-      let layer = this.$refs.arcMapRef.getLayerById(id);
-      layer.setVisible(true);
-      const source = layer.getSource();
-      source.updateParams(params);
-    });
     this.$vm.$emit('setGdDetailType', 20);
     this.changeXzq();
     //监听图层改变事件

+ 6 - 0
WEB-VIEW/src/webview.vue

@@ -91,6 +91,12 @@ export default {
       that.$vm.$emit('addPoint', that.citys);
     }, 3000);
     this.userInfo = JSON.parse(this.$route.query.objs);
+    if (this.userInfo && this.userInfo.gddw) {
+      setTimeout(() => {
+        const refreshP = `gddw like '%${this.userInfo.gddw}%'`
+        this.$vm.$emit("changeLayer", { id: "bj-dkgl", param: refreshP, layerIdx: 'sde:bjwkfly2000' })
+      }, 800)
+    }
     this.queryWarningPage();
   },
 

文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/SlideCard/SlideCard.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/navigationBar/navigationBar.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/nocheckDetail/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/received/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/receivedDetail/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map


文件差异内容过多而无法显示
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


+ 6 - 6
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));
@@ -11054,7 +11054,7 @@ var k = "development" === "development",
   C = S([]),
   A = "h5" === I ? "web" : "app-plus" === I ? "app" : I,
   P = S(undefined),
-  E = S([]) || [],
+  E = S(undefined) || [],
   O = true;
 var x = "";
 try {

部分文件因为文件数量过多而无法显示