Prechádzať zdrojové kódy

优化巡查上报功能和后台接口调整

songxy 9 mesiacov pred
rodič
commit
752bdbf216
27 zmenil súbory, kde vykonal 1418 pridanie a 1311 odobranie
  1. 9 0
      BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/entity/Bjxcjl.java
  2. 12 0
      BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/vo/BjxcjlCreateReqVO.java
  3. 3 2
      BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/XcjlServiceImpl.java
  4. 2 2
      BJYSYBZ_S/src/main/resources/mapper/XcryMapper.xml
  5. 95 74
      YSGZYBZ_WXAPP/pages/nocheckDetail/index.vue
  6. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  7. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  8. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/SlideCard/SlideCard.js.map
  9. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/navigationBar/navigationBar.js.map
  10. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  11. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/index.js.map
  12. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/nocheckDetail/index.js.map
  13. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/received/index.js.map
  14. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/receivedDetail/index.js.map
  15. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map
  16. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map
  17. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map
  18. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map
  19. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map
  20. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  21. 1060 1060
      YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/common/vendor.js
  22. 11 11
      YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/components/navigationBar/navigationBar.js
  23. 2 2
      YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/main/index.js
  24. 197 133
      YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/nocheckDetail/index.js
  25. 11 11
      YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/received/index.js
  26. 3 3
      YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/receivedDetail/index.js
  27. 13 13
      YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js

+ 9 - 0
BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/entity/Bjxcjl.java

@@ -36,6 +36,15 @@ public class Bjxcjl {
      */
     private String xcryMobile;
 
+    /**
+     * 巡查是否有效 0 无效 1 有效
+     * **/
+    private Integer status;
+
+    /**
+     * 备注:用于巡查记录异常说明
+     * **/
+    private String bz;
 
     /**
      * 现状描述

+ 12 - 0
BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/vo/BjxcjlCreateReqVO.java

@@ -40,6 +40,18 @@ public class BjxcjlCreateReqVO {
      */
     private String dksyh;
 
+    /**
+     * 巡查是否有效
+     * **/
+    private Integer status;
+
+    /**
+     * 巡查关联图片
+     * **/
     private List<BjxcjlImgCreateReqVO> imgList;
 
+    /**
+     * 备注:用于巡查记录异常说明
+     * **/
+    private String bz;
 }

+ 3 - 2
BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/XcjlServiceImpl.java

@@ -41,6 +41,7 @@ public class XcjlServiceImpl extends ServiceImpl<XcjlMapper, Bjxcjl> implements
         entiy.setXcryName(reqVO.getXcryName());
         entiy.setXcryMobile(reqVO.getXcryMobile());
         entiy.setDksyh(reqVO.getDksyh());
+        entiy.setStatus(reqVO.getStatus());
         entiy.setXcsj(new Date());
         super.save(entiy);
         List<BjxcjlImgCreateReqVO> imgList = reqVO.getImgList();
@@ -59,8 +60,8 @@ public class XcjlServiceImpl extends ServiceImpl<XcjlMapper, Bjxcjl> implements
     public List<BjxcjlRespVO> getListByDksyh(String dksyh) {
         QueryWrapper<Bjxcjl> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dksyh", dksyh);
-//        queryWrapper.eq("is_xc", 1);
         queryWrapper.orderByDesc("xcsj");
+        queryWrapper.eq("status", 1);
 
         List<Bjxcjl> lists = super.list(queryWrapper);
 
@@ -74,8 +75,8 @@ public class XcjlServiceImpl extends ServiceImpl<XcjlMapper, Bjxcjl> implements
         }
         QueryWrapper<Bjxcjl> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dksyh", bjxcjlPageReqDTO.getDksyh());
-//        queryWrapper.eq("is_xc", 1);
         queryWrapper.orderByDesc("xcsj");
+        queryWrapper.eq("status", 1);
 
         List<Bjxcjl> lists = super.list(queryWrapper);
         List<Bjxcjl> nLists = null;

+ 2 - 2
BJYSYBZ_S/src/main/resources/mapper/XcryMapper.xml

@@ -31,7 +31,7 @@
             T1.dksyh,T1.dkbh,T1.dkmj,T1.dkwz,T1.mj,T1.dkxz,T1.gddw,T1.lxr,T1.lxdh,T1.bz,T1.szfw,T2.xcsj
         from
             sde.bjwkfly2000 T1
-        left join (select max(xcsj) xcsj,dksyh from sde.bjxcjl GROUP BY dksyh) T2 ON T1.dksyh = T2.dksyh
+        left join (select max(xcsj) xcsj,dksyh from sde.bjxcjl where status = 1 GROUP BY dksyh) T2 ON T1.dksyh = T2.dksyh
         <where>
             <if test ="dkIds != null and dkIds.size()>0 ">
                 AND T1.dksyh IN
@@ -77,7 +77,7 @@
         T1.dksyh,T1.dkbh,T1.dkmj,T1.dkwz,T1.mj,T1.dkxz,T1.gddw,T1.lxr,T1.lxdh,T1.bz,T1.szfw,T2.xcsj
         from
         sde.bjwkfly2000 T1
-        left join (select max(xcsj) xcsj,dksyh from sde.bjxcjl GROUP BY dksyh) T2 ON T1.dksyh = T2.dksyh
+        left join (select max(xcsj) xcsj,dksyh from sde.bjxcjl where status = 1 GROUP BY dksyh) T2 ON T1.dksyh = T2.dksyh
         <where>
             1=1
             <if test="dto.xzqdm != null and dto.xzqdm !=''">

+ 95 - 74
YSGZYBZ_WXAPP/pages/nocheckDetail/index.vue

@@ -127,7 +127,8 @@
 				dialogShow: false,
 				checkInfos: [],
 				isLocationAuthorize: true,	//是否开启定位授权
-				isLocation: true
+				isLocation: true,
+				bz: ''
 			};
 		},
 		onReady() {
@@ -135,8 +136,7 @@
 		},
 		onLoad(option) {
 			this.checkAuthorize()
-			const idStr = JSON.parse(option['obj']);
-			this.objs = idStr;
+			this.objs = JSON.parse(option['obj']);
 			this.queryIsLocation().then((result) => {
 				if (result && result['data']) {
 					this.isLocation = result['data']
@@ -153,10 +153,9 @@
 		},
 		methods: {
 			checkAuthorize() {
-				const self = this;
 				this.getLocationEnabled().then((enabled)=>{
 					if(enabled){
-						self.getWxLocation().then(res => {
+						this.getWxLocation().then(res => {
 							if (res === 0) {
 								this.getWxSetting();
 							}
@@ -312,17 +311,29 @@
 						);
 						if (!resultData['data']) {
 							isSubmit = false;
-							uni.showModal({
-								title: '提示',
-								content: `超出地块拍摄范围`
-							});
 							break;
 						}
 					}
 				}
-				if (!isSubmit) return;
+				if(!isSubmit){
+					uni.showModal({
+						title: '提示',
+						content: `超出地块拍摄范围`,
+						confirmText: '继续',
+						success: function(res) {
+							if (res.confirm) {
+								_that.submitXcjlHandle(files);
+							}
+						},
+					});
+				}else{
+					_that.submitXcjlHandle(files);
+				}
+			},
+			submitXcjlHandle(files){
+				const _that = this;
 				this.addXcjlAjax(files).then((result) => {
-					if (result.data) {
+					if (result && result.data) {
 						uni.showModal({
 							title: '提示',
 							content: '上报成功,是否返回首页',
@@ -333,34 +344,47 @@
 									});
 								} else if (res.cancel) {
 									uni.navigateTo({
-										url: `/pages/receivedDetail/index?obj=${JSON.stringify(
-		  				  _that.objs,
-		  				)}`,
+										url: `/pages/receivedDetail/index?obj=${JSON.stringify(_that.objs)}`,
 									});
 								}
 							},
 						});
-						if (_that.objs && _that.objs.dksyh) {
-							uni.removeStorageSync(_that.objs.dksyh)
-						}
+					}else{
+						uni.showModal({
+							title: '提示',
+							content: '上报异常,请联系管理员'
+						});
+					}
+					if (_that.objs && _that.objs.dksyh) {
+						uni.removeStorageSync(_that.objs.dksyh)
 					}
 				});
 			},
-			async addXcjlAjax(files = []) {
-				const _that = this;
+			addXcjlAjax(files = []) {
 				const sendData = {
 					xcryId: uni.getStorageSync('userInfo').id,
 					xzms: this.baseFormData.xzms,
 					xcryName: uni.getStorageSync('userInfo').xcry,
 					xcryMobile: uni.getStorageSync('userInfo').lxdh,
 					dksyh: this.objs.dksyh,
-					imgList: files
+					status: 1,
+					bz: '',
+					imgList: files,
 				};
-				return await httpAjax({
-					url: 'app/xc/addXcjl',
-					method: 'POST',
-					data: sendData,
-				});
+				if(!this.lat || !this.long){
+					sendData['status'] = 0
+				}
+				return new Promise((resolve, reject)=>{
+					httpAjax({
+						url: 'app/xc/addXcjl',
+						method: 'POST',
+						data: sendData,
+					}).then((result)=>{
+						resolve(sendData['status'] === 0 ? null : result);
+					}).catch(err=>{
+						reject(err)
+					})
+				})
 			},
 			temporaryXcjl() {
 				if (this.objs && this.objs.dksyh) {
@@ -386,6 +410,35 @@
 					},
 				});
 			},
+			async fileUploadAjax(tempFile) {
+				const formData = new FormData();
+				formData.appendFile('file', tempFile);
+				const sendData = formData.getData();
+				let header = {
+					'content-type': sendData.contentType,
+				};
+				const result = await httpAjax({
+					url: 'api/oss/upload',
+					method: 'POST',
+					header,
+					data: sendData.buffer,
+				});
+				if(!result || !result['data']) return;
+				const fileInfo = result['data'];
+				this.setFileImgList(fileInfo['name'], tempFile, fileInfo['path']);
+				const res = await this.getWxLocation()
+				if (res === 0) {
+					this.getWxSetting();
+				}else{
+					this.lat = res.latitude;
+					this.long = res.longitude;
+				}
+				fileInfo.lat = this.lat;
+				fileInfo.lng = this.long;
+				fileInfo.fileId = fileInfo.id;
+				fileInfo.warningId = this.warningId;
+				this.fileList.push(fileInfo);
+			},
 			setFileImgList(name, url, path2) {
 				const extnames = name.match(/\.(jpg|jpeg|png|GIF|JPG|PNG)$/);
 				const extname = extnames[0];
@@ -396,61 +449,29 @@
 					extname,
 				});
 			},
-			deleteImage(item) {
+			async deleteImage(item) {
 				const that = this;
-				httpAjax({
+				const result = await httpAjax({
 					url: 'api/oss/delete?filePath=' + item['tempFile']['path2'],
 					method: 'GET',
-				}).then((result) => {
-					const data = result['data'];
-					if (data) {
-						for (let i = 0; i < that.fileImgList.length; i++) {
-							const imgItem = that.fileImgList[i];
-							if (imgItem['path2'] === item['tempFile']['path2']) {
-								that.fileImgList.splice(i, 1);
-								break;
-							}
-						}
-						for (let i = 0; i < that.fileList.length; i++) {
-							const fileItem = that.fileList[i];
-							if (fileItem['path'] === item['tempFile']['path2']) {
-								that.fileList.splice(i, 1);
-								break;
-							}
+				})
+				const data = result['data'];
+				if (data) {
+					for (let i = 0; i < that.fileImgList.length; i++) {
+						const imgItem = that.fileImgList[i];
+						if (imgItem['path2'] === item['tempFile']['path2']) {
+							that.fileImgList.splice(i, 1);
+							break;
 						}
 					}
-				});
-			},
-			fileUploadAjax(tempFile) {
-				const formData = new FormData();
-				formData.appendFile('file', tempFile);
-				const sendData = formData.getData();
-				let header = {
-					'content-type': sendData.contentType,
-				};
-				const that = this;
-				httpAjax({
-					url: 'api/oss/upload',
-					method: 'POST',
-					header,
-					data: sendData.buffer,
-				}).then((result) => {
-					const fileInfo = result['data'];
-					that.setFileImgList(fileInfo['name'], tempFile, fileInfo['path']);
-					//文件上传成功后获取经纬度给图片信息
-					this.getWxLocation().then(res => {
-						if (res === 0) {
-							this.getWxSetting();
+					for (let i = 0; i < that.fileList.length; i++) {
+						const fileItem = that.fileList[i];
+						if (fileItem['path'] === item['tempFile']['path2']) {
+							that.fileList.splice(i, 1);
+							break;
 						}
-						this.lat = res.latitude;
-						this.long = res.longitude;
-						fileInfo.lat = res.latitude;
-						fileInfo.lng = res.longitude;
-						fileInfo.fileId = fileInfo.id;
-						fileInfo.warningId = this.warningId;
-						this.fileList.push(fileInfo);
-					})
-				});
+					}
+				}
 			},
 			toBackHandle() {
 				uni.navigateBack();

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/SlideCard/SlideCard.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/navigationBar/navigationBar.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/nocheckDetail/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/received/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/receivedDetail/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1060 - 1060
YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/common/vendor.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 11 - 11
YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/components/navigationBar/navigationBar.js


+ 2 - 2
YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/main/index.js

@@ -145,12 +145,12 @@ exports.default = void 0;
 var _https = _interopRequireDefault(__webpack_require__(/*! @/utils/https.js */ 39));
 var navigationBar = function navigationBar() {
   __webpack_require__.e(/*! require.ensure | components/navigationBar/navigationBar */ "components/navigationBar/navigationBar").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/navigationBar/navigationBar.vue */ 78));
+    return resolve(__webpack_require__(/*! ../../components/navigationBar/navigationBar.vue */ 81));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var received = function received() {
   Promise.all(/*! require.ensure | pages/received/index */[__webpack_require__.e("common/vendor"), __webpack_require__.e("pages/received/index")]).then((function () {
-    return resolve(__webpack_require__(/*! ../received/index.vue */ 85));
+    return resolve(__webpack_require__(/*! ../received/index.vue */ 88));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 /**

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 197 - 133
YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/nocheckDetail/index.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 11 - 11
YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/received/index.js


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

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uniCollapse: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 92))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 95))
     },
     uniCollapseItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 99))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 102))
     },
   }
 } catch (e) {
@@ -174,7 +174,7 @@ var _CustomMixins = _interopRequireDefault(__webpack_require__(/*! @/mixins/Cust
 var _config = _interopRequireDefault(__webpack_require__(/*! @/utils/config */ 40));
 var navigationBar = function navigationBar() {
   __webpack_require__.e(/*! require.ensure | components/navigationBar/navigationBar */ "components/navigationBar/navigationBar").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/navigationBar/navigationBar.vue */ 78));
+    return resolve(__webpack_require__(/*! ../../components/navigationBar/navigationBar.vue */ 81));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var FormData = __webpack_require__(/*! @/utils/formData/formData.js */ 58);

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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker"],{
 
-/***/ 134:
+/***/ 137:
 /*!***********************************************************************************************************************!*\
   !*** E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue ***!
   \***********************************************************************************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 135);
-/* harmony import */ var _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=script&lang=js& */ 137);
+/* harmony import */ var _uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 138);
+/* harmony import */ var _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=script&lang=js& */ 140);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _uni_file_picker_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=style&index=0&lang=css& */ 153);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
@@ -41,7 +41,7 @@ component.options.__file = "uni_modules/uni-file-picker/components/uni-file-pick
 
 /***/ }),
 
-/***/ 135:
+/***/ 138:
 /*!******************************************************************************************************************************************************!*\
   !*** E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=template&id=363ace0e& ***!
   \******************************************************************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "uni_modules/uni-file-picker/components/uni-file-pick
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 136);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 139);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 136:
+/***/ 139:
 /*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=template&id=363ace0e& ***!
   \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -99,7 +99,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 137:
+/***/ 140:
 /*!************************************************************************************************************************************************!*\
   !*** E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************************************************************/
@@ -108,14 +108,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-file-picker.vue?vue&type=script&lang=js& */ 138);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-file-picker.vue?vue&type=script&lang=js& */ 141);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 138:
+/***/ 141:
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -130,10 +130,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 140));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 76));
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 142));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 78));
 var _chooseAndUploadFile = __webpack_require__(/*! ./choose-and-upload-file.js */ 151);
 var _utils = __webpack_require__(/*! ./utils.js */ 152);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -850,7 +850,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 */ 139)["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"]))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js */ 142)["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"]))
 
 /***/ }),
 
@@ -889,7 +889,7 @@ __webpack_require__.r(__webpack_exports__);
     'uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker-create-component',
     {
         'uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(134))
+            __webpack_require__('2')['createComponent'](__webpack_require__(137))
         })
     },
     [['uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker-create-component']]

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov