1、滨江一本账后台新增根据dksyh查询详细接口

2、迭代功能需求

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/controller/app/BjXcController.java

@@ -47,6 +47,18 @@ public class BjXcController extends BaseRestController {
         }
     }
 
+
+    @GetMapping("/getXcryDkDetailByDksyh")
+    public Object getXcryDkDetailByDksyh(@RequestParam("dksyh") String dksyh) {
+        try {
+            logger.info("/app/xc/getXcryDkList 接口调用~~~");
+            return result(xcryService.getXcryDkDetailByDksyh(dksyh));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            logger.warn("/app/xc/getXcryDkList 接口异常 -> " + ex.getMessage());
+            return error(ex.getMessage(), BaseRestController.ErrorCode.DEFAULT);
+        }
+    }
     @PostMapping("/addXcjl")
     public Object addXcjl(@RequestBody BjxcjlCreateReqVO reqVO) {
         try {

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/XcryService.java

@@ -32,6 +32,7 @@ public interface XcryService extends IService<Bjxcry> {
      */
     List<BjXcryDkRespVO> getXcryDkList(String xcryId, String dkbh);
 
+    BjXcryDkRespVO getXcryDkDetailByDksyh(String dksyh);
     /**
      * 获取地块下的巡查人员
      * @param dksyh

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/XcryServiceImpl.java

@@ -76,6 +76,13 @@ public class XcryServiceImpl extends ServiceImpl<XcryMapper, Bjxcry> implements
         return xcryMapper.getXcryDk(dkIds,dkbh);
     }
 
+    @Override
+    public BjXcryDkRespVO getXcryDkDetailByDksyh(String dksyh) {
+        ArrayList<String> dkIds = new ArrayList();
+        dkIds.add(dksyh);
+        return xcryMapper.getXcryDk(dkIds,null).get(0);
+    }
+
     @Override
     public List<Bjxcry> getXcryByDksyh(String dksyh) {
         return xcryMapper.getXcryByDksyh(dksyh);

WEB-VIEW/src/components/ol/VlChinaCities/index.vue

@@ -73,7 +73,7 @@ export default {
 
       this.mapInstance.un('click', this.pickFeature)
     },
-    pickFeature(e) {
+    pickFeature (e) {
       const [feature] = this.mapInstance.getFeaturesAtPixel(e.pixel, {
         layerFilter: l => l === this.citiesLayer
       })

WEB-VIEW/src/components/ol/VlMap.vue

@@ -59,7 +59,8 @@ export default {
         view: new View({
           center: this.center,
           projection: this.projection,
-          zoom: 1
+          zoom: 1,
+          enableRotation: false,
         }),
         target: undefined,
         controls: []

WEB-VIEW/src/views/components/BigScreenMap/index.vue

@@ -956,7 +956,7 @@ export default {
       const layerId = this.visibleLayerId;
       // 图斑拾取黑名单
       const pickBlackList = [];
-      map.on('singleclick', (e) => {
+      map.on('click', (e) => {
         this.$vm.$emit('clear-layer');
         if (this.visibleLayerId === 'xzqh-s-search') return;
         if (this.visibleLayerId === 'xzqh-x-search') return;

WEB-VIEW/src/webViewMap.vue

@@ -81,7 +81,8 @@ export default {
     };
   },
   methods: {
-    async mapClickHandle(payload1, key) {
+    async mapClickHandle (payload1, key) {
+      this.$emit('mapClick', payload1);
       if (key == 'bj-dkgl') {
         this.$vm.$emit('setGdDetailType', 24);
       } else if (key == 'bj-kgdk') {

WEB-VIEW/src/webview.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="webview">
-    <WebViewMap class="mapBox" />
+    <WebViewMap class="mapBox" @mapClick="mapClickHandle" />
     <SlideCard>
       <div class="titleBox">
         <div class="search">
@@ -39,7 +39,7 @@
             <div class="x1">上次巡查时间：{{ item.xcsj }}</div>
           </div>
           <div class="cardBoxBtns">
-            <div class="btn btn1" @click.stop="toDetailHandle(item)">
+            <div class="btn btn1" @click="toDetailHandle(item)">
               <img class="icon" src="./assets/images/webview/xcxq.png" />
               <div class="x1">详情</div>
             </div>
@@ -96,7 +96,22 @@ export default {
   },
 
   methods: {
-    toDetailHandle(item) {
+    mapClickHandle (payload) {
+      this.toDetailInfo(payload['dksyh'])
+    },
+    toDetailInfo (dksyh) {
+      const urlApi = `/app/xc/getXcryDkDetailByDksyh`;
+      let params = {
+        dksyh: dksyh
+      };
+      this.$ajax.get(urlApi, params, this, false).then((result) => { 
+        if (result.data) {
+          console.log(result.data)
+          this.toDetailHandle(result.data);
+        }
+      });
+    },
+    toDetailHandle (item) {
       wx.miniProgram.navigateTo({
         url: `/pages/receivedDetail/index?obj=${JSON.stringify(item)}`,
       });
@@ -131,7 +146,7 @@ export default {
     queryWarningPage() {
       let urlApi = `/app/xc/getXcryDkList`;
       let params = {
-        dkbh: this.dkbhModel,
+        dkbh: this.dkbhModel ? this.dkbhModel.toUpperCase() : '',
         xcryId: this.userInfo.id,
       };
       this.$ajax.get(urlApi, params, this, false).then((result) => {

YSGZYBZ_WXAPP/pages/received/index.vue

@@ -223,7 +223,7 @@ export default {
     queryWarningPage() {
       if (!this.isRequest) return;
       const sendData = {
-        dkbh: this.dkbhModel,
+        dkbh: this.dkbhModel ? this.dkbhModel.toUpperCase() : '',
         xcryId: uni.getStorageSync('userInfo').id,
         // xcryId: '11e77c7e53b2730407fd3e481b2d6558',
       };

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({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      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) {
         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({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        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) {
             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({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        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){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        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){
+        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){
             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({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"wx-app-new","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      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) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

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

@@ -301,7 +301,7 @@ var _default = {
       var _this3 = this;
       if (!this.isRequest) return;
       var sendData = {
-        dkbh: this.dkbhModel,
+        dkbh: this.dkbhModel ? this.dkbhModel.toUpperCase() : '',
         xcryId: uni.getStorageSync('userInfo').id
         // xcryId: '11e77c7e53b2730407fd3e481b2d6558',
       };