新增功能和Bug修复

BJYSYBZ_C/public/config.js

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

BJYSYBZ_C/src/components/ol/VLImgLayers/index.vue

@@ -6,7 +6,7 @@
           >查看控规</el-checkbox
         >
       </div>
-      <div class=" checkBox checkBox1">
+      <div class=" checkBox checkBox1" v-show="isGdShow">
         <el-checkbox v-model="checked1" @change="checkBoxChange1"
           >查看供地</el-checkbox
         >
@@ -34,12 +34,20 @@ export default {
     return {
       checked1: false,
       checked: false,
+      isGdShow: false,
       sliderVal: 100,
       moreLayers: ['hzyx-202311'],
     };
   },
   watch: {},
-  created() {},
+  created() {
+    const userInfo = JSON.parse(localStorage.getItem("userInfo"))
+    if (userInfo.roles) {
+      if (userInfo.roles.indexOf('admin') != -1) {
+        this.isGdShow = true;
+      }
+    }
+  },
   methods: {
     checkBoxChange(val) {
       this.$emit('change', val);

BJYSYBZ_C/src/views/BjWlydManageView/components/FourContent.vue

@@ -227,8 +227,12 @@ export default {
       let roles = users.roles.join(',');
       if (roles.indexOf('admin') > -1) {
       } else {
-        this.query.gddw = users.nickName;
-        this.disabledShow = true;
+        if (users.nickName == '滨江地块监督') {
+          this.query.gddw = '';
+        } else {
+          this.query.gddw = users.nickName;
+          this.disabledShow = true;
+        }
       }
     }
   },
@@ -262,12 +266,16 @@ export default {
       this.initHZ();
       this.getTsxzListData();
       let refreshP = '1=1';
+      console.log(this.query)
       if (this.query.xzqdm) {
         refreshP += ` and dkwz = '${this.query.xzqdm}'`;
       }
       if (this.query.name) {
         refreshP += ` and dkbh like '%${this.query.name}%'`;
       }
+      if (this.query.gddw) {
+        refreshP += ` and gddw like '${this.query.gddw}'`;
+      }
       if (this.query.small) {
         refreshP += ` and mj >= ${this.query.small}`;
       }
@@ -288,6 +296,9 @@ export default {
       let p = {
         ...this.query,
       };
+      if (this.userInfo && this.userInfo['nickName'] == '滨江地块监督') {
+        p['gddw'] = ''
+      }
       const urlApi = `/api/ybz-bj/manageHZ`;
       this.$ajax.get(urlApi, p, this, false).then((result) => {
         const { sl, mj } = result.data;
@@ -302,6 +313,9 @@ export default {
         pageIndex: this.config.page.index,
         pageSize: this.config.page.count,
       };
+      if (this.userInfo && this.userInfo['nickName'] == '滨江地块监督') {
+        p['gddw'] = ''
+      }
       this.$ajax.get(urlApi, p, this, false).then((result) => {
         const data = result['data'] || {};
         this.xzList = data['list'];

BJYSYBZ_C/src/views/BjWlydManageView/components/Td.vue

@@ -14,7 +14,7 @@
             size="medium"
             v-model="sumbitObj.dkbh"
             placeholder="请输入"
-            :disabled="dkbhDisShow"
+            :disabled="dkbhDisShow || currentRole == '滨江地块监督'"
           ></el-input>
         </td>
       </tr>
@@ -25,6 +25,7 @@
             size="medium"
             v-model="sumbitObj.mj"
             placeholder="请输入"
+            :disabled="currentRole == '滨江地块监督'"
           ></el-input>
         </td>
       </tr>
@@ -38,6 +39,7 @@
             placeholder="请选择"
             size="medium"
             style="width: 100%"
+            :disabled="currentRole == '滨江地块监督'"
             clearable
           >
             <el-option
@@ -58,6 +60,7 @@
             size="medium"
             v-model="sumbitObj.dkxz"
             placeholder="请输入"
+            :disabled="currentRole == '滨江地块监督'"
           ></el-input>
         </td>
       </tr>
@@ -68,7 +71,7 @@
             size="medium"
             v-model="sumbitObj.gddw"
             placeholder="请输入"
-            :disabled="disabledShow"
+            :disabled="disabledShow || currentRole == '滨江地块监督'"
           ></el-input>
         </td>
       </tr>
@@ -79,6 +82,7 @@
             size="medium"
             v-model="sumbitObj.lxr"
             placeholder="请输入"
+            :disabled="currentRole == '滨江地块监督'"
           ></el-input>
         </td>
       </tr>
@@ -89,6 +93,7 @@
             size="medium"
             v-model="sumbitObj.lxdh"
             placeholder="请输入"
+            :disabled="currentRole == '滨江地块监督'"
           ></el-input>
         </td>
       </tr>
@@ -100,6 +105,7 @@
             :autosize="true"
             v-model="sumbitObj.szfw"
             placeholder="请输入"
+            :disabled="currentRole == '滨江地块监督'"
           ></el-input>
         </td>
       </tr>
@@ -111,6 +117,7 @@
             :autosize="true"
             v-model="sumbitObj.bz"
             placeholder="请输入"
+            :disabled="currentRole == '滨江地块监督'"
           ></el-input>
         </td>
       </tr>
@@ -136,6 +143,7 @@
             :show-file-list="false"
             accept=".dwg,.shp,.txt"
             :before-upload="beforeUpload"
+            :disabled="currentRole == '滨江地块监督'"
           >
             <i class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
@@ -185,7 +193,7 @@
       </tr>
     </table>
 
-    <div class="btn-wrapper">
+    <div class="btn-wrapper" v-if="currentRole !== '滨江地块监督'">
       <!-- <div class="btn-item btn-item-1" @click="save">
         <img src="@/assets/images/bjybz/save.png" alt="" />保 存
       </div>
@@ -254,6 +262,7 @@ export default {
   data() {
     return {
       dkbhDisShow: true,
+      currentRole: '',
       sumbitObj: {
         fileType: '',
         fileName: '',
@@ -288,6 +297,7 @@ export default {
       } else {
         this.disabledShow = true;
       }
+      this.currentRole = users['nickName']
     }
   },
   mounted() {},
@@ -559,9 +569,9 @@ table {
 ::v-deep .tdHeight {
   textarea {
     white-space: pre-wrap;
-    color: rgba(135, 193, 255, 1);
+    color: rgba(135, 193, 255, 1) !important;
     word-break: break-all;
-    background-color: transparent;
+    background-color: transparent !important;
     border: 0;
     &::-webkit-input-placeholder {
       /* WebKit browsers，webkit内核浏览器 */

BJYSYBZ_C/src/views/BjWlydManageView/components/Td1.vue

@@ -14,6 +14,7 @@
               multiple
               placeholder="请选择"
               :popper-append-to-body="false"
+              :disabled="currentRole == '滨江地块监督'"
             >
               <el-option
                 v-for="item in options"
@@ -23,7 +24,7 @@
               >
               </el-option>
             </el-select>
-            <div class="btn" @click="xcryAddDk">
+            <div class="btn" @click="xcryAddDk" v-if="currentRole != '滨江地块监督'">
               <img src="@/assets/images/bjybz/save2.png" alt="" />
               <p>保存</p>
             </div>
@@ -85,7 +86,7 @@
     </table>
 
     <div class="title">
-      <p>现场照片(3)</p>
+      <p>现场照片({{ carouselImgs.length }})</p>
     </div>
     <div class="xzzpBox" v-if="carouselImgs.length > 0">
       <el-carousel type="card" :autoplay="false">
@@ -173,10 +174,14 @@ export default {
       activeName: 0,
       collapseList: [],
       sumbitObj: {},
+      currentRole: ''
     };
   },
   mounted() {
-    let users = JSON.parse(localStorage.getItem('userInfo'));
+    const users = JSON.parse(localStorage.getItem('userInfo'));
+    if (users) {
+      this.currentRole = users['nickName']
+    }
     this.initTableList(users.nickName);
     this.initAjax();
     this.xcryXcryInit();

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/dto/ManageDTO.java

@@ -1,10 +1,14 @@
 package com.zjugis.ysgzybz.domain.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @Author 陈俊
  * @Date 2023/12/18 14:03
@@ -24,7 +28,8 @@ public class ManageDTO {
     private String szfw;
     @ColumnWidth(20)
     @ExcelProperty(value = {"滨江区管理地块情况表","面积(亩)"}, index = 3)
-    private String mj;
+    @ContentStyle(dataFormat = 2)
+    private BigDecimal mj;
     @ColumnWidth(20)
     @ExcelProperty(value = {"滨江区管理地块情况表","地块现状"}, index = 4)
     private String dkxz;

BJYSYBZ_S/src/main/resources/application-tinker.yml

@@ -3,8 +3,8 @@ spring:
     postgre:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: org.postgresql.Driver
-      url: jdbc:postgresql://10.249.168.231:54321/sde?currentSchema=sde
-      username: zjugis
+      url: jdbc:postgresql://10.249.3.61:5432/sde
+      username: sde
       password: zjugis1402!
       initialSize: 1
       minIdle: 3

BJYSYBZ_S/src/main/resources/mapper/YbzBJMapper.xml

@@ -826,7 +826,7 @@
         <if test="dto.small != null">
             and mj &gt;= ${dto.small}
         </if>
-        order by mj desc nulls last
+        order by dkbh asc nulls last
     </select>
 
     <update id="lsydSave" parameterType="com.zjugis.ysgzybz.domain.dto.CommonDTO">

WEB-VIEW/src/webview.vue

@@ -97,23 +97,22 @@ export default {
 
   methods: {
     mapClickHandle (payload) {
-      this.toDetailInfo(payload['dksyh'])
+      this.toDetailInfo(payload['dksyh'], 'map')
     },
-    toDetailInfo (dksyh) {
+    toDetailInfo (dksyh, source) {
       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);
+          this.toDetailHandle(result.data, source);
         }
       });
     },
-    toDetailHandle (item) {
+    toDetailHandle (item, source='list') {
       wx.miniProgram.navigateTo({
-        url: `/pages/receivedDetail/index?obj=${JSON.stringify(item)}`,
+        url: `/pages/receivedDetail/index?obj=${JSON.stringify(item)}&source=${source}`,
       });
     },
     toDetailHandle1(item) {

YSGZYBZ_WXAPP/pages/receivedDetail/index.scss

@@ -11,6 +11,19 @@
       padding: 10px;
 
       &.checkResultBox {
+		  >.titleBox {
+			  display: flex;
+			  justify-content: space-between;
+			  align-items: center;
+			  >button {
+				border: 0px;
+				background-color: #00a2e8;
+				color: #fff;
+				font-size: 12px;
+				padding: 0px 10px;
+				margin: 0px;
+			  }
+		  }
 
         >.content {
           margin-top: 10px;

YSGZYBZ_WXAPP/pages/receivedDetail/index.vue

@@ -42,7 +42,10 @@
         </view>
       </view>
       <view class="checkResultBox">
-        <text class="title">巡查记录</text>
+	    <view class="titleBox">
+		  <text class="title">巡查记录</text>
+		  <button v-if="source == 'map'" class="btn" @click="toXcDetail">新增巡查</button>
+	    </view>
         <view class="content">
           <uni-collapse
             accordion
@@ -124,18 +127,26 @@ export default {
       collapseList: [],
       accordionVal: '',
       warningId: '',
+	  source: '',
     };
   },
   onReady() {
     uni.showTabBar();
   },
   onLoad(option) {
-    const idStr = JSON.parse(option['obj']);
-    this.objs = idStr;
+    const objs = JSON.parse(option['obj']);
+	this.source = option['source'];
+	console.log(this.source)
+    this.objs = objs;
     this.initList();
   },
   beforeDestroy() {},
   methods: {
+	  toXcDetail(){
+			wx.navigateTo({
+			  url: `/pages/nocheckDetail/index?obj=${JSON.stringify(this.objs)}`,
+			});
+	  },
     previewImg(current, index) {
       const urls = this.collapseList[index].imgList.map((item) => {
         return item.fileurl;

YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue

@@ -522,13 +522,24 @@
 			 * @param {Object} index
 			 */
 			delFile(index) {
-				this.$emit('delete', {
-					tempFile: this.files[index],
-					tempFilePath: this.files[index].url
-				})
-				this.files.splice(index, 1)
-				this.$nextTick(() => {
-					this.setEmit()
+				const _that = this;
+				wx.showModal({
+					title: '',
+					content: '确定删除该图片？',
+					success (res) {
+					  if (res.confirm) {
+						_that.$emit('delete', {
+							tempFile: _that.files[index],
+							tempFilePath: _that.files[index].url
+						})
+						_that.files.splice(index, 1)
+						_that.$nextTick(() => {
+							_that.setEmit()
+						})
+					  } else if (res.cancel) {
+						console.log('用户点击取消')
+					  }
+					}
 				})
 			},
 

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));

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

@@ -161,7 +161,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {
+/* WEBPACK VAR INJECTION */(function(uni, wx) {
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
@@ -187,19 +187,27 @@ var _default = {
       objs: {},
       collapseList: [],
       accordionVal: '',
-      warningId: ''
+      warningId: '',
+      source: ''
     };
   },
   onReady: function onReady() {
     uni.showTabBar();
   },
   onLoad: function onLoad(option) {
-    var idStr = JSON.parse(option['obj']);
-    this.objs = idStr;
+    var objs = JSON.parse(option['obj']);
+    this.source = option['source'];
+    console.log(this.source);
+    this.objs = objs;
     this.initList();
   },
   beforeDestroy: function beforeDestroy() {},
   methods: {
+    toXcDetail: function toXcDetail() {
+      wx.navigateTo({
+        url: "/pages/nocheckDetail/index?obj=".concat(JSON.stringify(this.objs))
+      });
+    },
     previewImg: function previewImg(current, index) {
       var urls = this.collapseList[index].imgList.map(function (item) {
         return item.fileurl;
@@ -253,7 +261,7 @@ var _default = {
   }
 };
 exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+/* 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/receivedDetail/index.wxss

@@ -37,6 +37,19 @@
   background-color: #fff;
   padding: 10px;
 }
+.nocheckBox .container > view.checkResultBox > .titleBox {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.nocheckBox .container > view.checkResultBox > .titleBox > button {
+  border: 0px;
+  background-color: #00a2e8;
+  color: #fff;
+  font-size: 12px;
+  padding: 0px 10px;
+  margin: 0px;
+}
 .nocheckBox .container > view.checkResultBox > .content {
   margin-top: 10px;
 }

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js

@@ -60,7 +60,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uniCloud, uni) {
+/* WEBPACK VAR INJECTION */(function(uniCloud, uni, wx) {
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
@@ -678,14 +678,24 @@ var _default2 = {
      * @param {Object} index
      */
     delFile: function delFile(index) {
-      var _this7 = this;
-      this.$emit('delete', {
-        tempFile: this.files[index],
-        tempFilePath: this.files[index].url
-      });
-      this.files.splice(index, 1);
-      this.$nextTick(function () {
-        _this7.setEmit();
+      var _that = this;
+      wx.showModal({
+        title: '',
+        content: '确定删除该图片？',
+        success: function success(res) {
+          if (res.confirm) {
+            _that.$emit('delete', {
+              tempFile: _that.files[index],
+              tempFilePath: _that.files[index].url
+            });
+            _that.files.splice(index, 1);
+            _that.$nextTick(function () {
+              _that.setEmit();
+            });
+          } else if (res.cancel) {
+            console.log('用户点击取消');
+          }
+        }
       });
     },
     /**
@@ -777,7 +787,7 @@ var _default2 = {
   }
 };
 exports.default = _default2;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js */ 103)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js */ 103)["default"], __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"]))
 
 /***/ }),