From 585cb20bf900587af83e849739f999f04f527796 Mon Sep 17 00:00:00 2001 From: liuminjian Date: Fri, 6 Aug 2021 19:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9D=97=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD,=E4=BC=98=E5=8C=96=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0\=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/homestead/index.js | 26 +- src/assets/images/homestead/delete_icon.png | Bin 0 -> 4765 bytes src/views/homestead/index.vue | 430 +++++++++++++++++--- 3 files changed, 394 insertions(+), 62 deletions(-) create mode 100644 src/assets/images/homestead/delete_icon.png diff --git a/src/api/homestead/index.js b/src/api/homestead/index.js index 6c4c3e48..7420f76f 100644 --- a/src/api/homestead/index.js +++ b/src/api/homestead/index.js @@ -129,9 +129,25 @@ export function currentLocation(query) { //修改坐标数据同步 export function coordinatesUpdateGeo(data) { - return request({ - url: '/geo/geo/coordinatesEdit', - method: 'post', - data: data - }) + return request({ + url: '/geo/geo/coordinatesEdit', + method: 'post', + data: data + }) +} + +//删除农房信息 +export function houseRemove(id) { + return request({ + url: '/geo/house/remove/' + id, + method: 'get', + }) } + +//删除农地信息 +export function landRemove(id) { + return request({ + url: '/geo/land/remove/' + id, + method: 'get', + }) +} \ No newline at end of file diff --git a/src/assets/images/homestead/delete_icon.png b/src/assets/images/homestead/delete_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d1992f001d9b3323f1a56af53ff4f231dd6354ef GIT binary patch literal 4765 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 literal 0 HcmV?d00001 diff --git a/src/views/homestead/index.vue b/src/views/homestead/index.vue index 879c8437..5c1b81f4 100644 --- a/src/views/homestead/index.vue +++ b/src/views/homestead/index.vue @@ -231,6 +231,7 @@
+
@@ -255,6 +256,7 @@
+
@@ -352,7 +354,11 @@ class="picture" v-if="houseInfoLookList.behindHouse == ''" > -
+
现
状
图
片
@@ -362,7 +368,11 @@ class="picture" v-if="houseInfoLookList.frontHouse == ''" >
-
+
历
史
图
片
@@ -434,15 +444,23 @@
-
- +
+
现
状
图
片
-
- +
+
历
史
图
片
@@ -726,33 +744,55 @@
-
上传现状图片
-
- -
- 等待传图 -
- +
+
+ +
+ 等待传图 +
+ +
+ +
+ 上
传
现
状
图
片 +
-
-
-
上传历史图片
-
- -
- 等待传图 -
- +
+
+ +
+ 等待传图 +
+ +
+ +
+ 上
传
历
史
图
片 +
@@ -923,16 +963,69 @@
+
+
+ +
+ 等待传图 +
+ +
+ +
+ 上
传
现
状
图
片 +
+
+
+
+ +
+ 等待传图 +
+ +
+ +
+ 上
传
历
史
图
片 +
+
+
+
@@ -973,6 +1067,16 @@
+ + +
+ +
+ @@ -991,6 +1095,8 @@ import { getHouse, currentLocation, coordinatesUpdateGeo, + houseRemove, + landRemove, } from "@/api/homestead/index"; import { uploadFileBase } from "../../api/authenticRight"; import request from "@/utils/request"; @@ -1156,6 +1262,9 @@ export default { //农房列表 显影 homesteadListStatus: false, geoJson: "", + //放大预览图片弹窗 + previewZoomImageVisbile: false, + previewZoomImageValue: "", }; }, mounted() { @@ -1164,6 +1273,82 @@ export default { this.windowHeight = windowHeight; }, methods: { + previewZoomImageFun() { + this.previewZoomImageVisbile = false; + this.previewZoomImageValue = ""; + }, + //放大预览图片 + previewZoomImage(imagesUrl) { + this.previewZoomImageVisbile = true; + this.previewZoomImageValue = imagesUrl; + console.log(imagesUrl); + }, + //删除农地信息 + deletefdInfo() { + this.$dialog + .confirm({ + title: "确认执行删除操作？", + message: "删除后内容不可恢复", + }) + .then(() => { + console.log(this.farmhouseStatus); + if (this.farmhouseStatus == 0) { + //农房 + houseRemove(this.houseInfoList.id).then((res) => { + if (res.code == 200) { + this.hideEditNav(); + this.tGeoOrganization.orgCode = this.houseInfoList.orgCode; + coordinatesUpdateGeo(this.tGeoOrganization).then((res) => {}); + } + }); + } else { + //农地 + landRemove(this.landInfoList.id).then((res) => { + if (res.code == 200) { + this.hideEditNav(); + this.tGeoOrganization.orgCode = this.landInfoList.orgCode; + coordinatesUpdateGeo(this.tGeoOrganization).then((res) => {}); + } + }); + } + }) + .catch(() => { + // on cancel + }); + }, + //隐藏编辑农地状态 + hideEditNav() { + this.hasTable = false; + + if ($(".searchBar_wrap").css("bottom") != "0px") { + $(".landHomestead_wrap").css({ bottom: "0" }); + $(".landHomestead_wrap").animate( + { + bottom: "-100%", + }, + 300 + ); + + $(".searchBar_wrap").css({ bottom: "-100%" }); + $(".searchBar_wrap").animate( + { + bottom: "0", + }, + 400 + ); + let searchBarWrapPadding = $(".searchBar_wrap") + .css("paddingTop") + .replace("px", ""); + let searchBarWrapHeight = $(".searchBar_wrap").height(); + + $(".rightIcon_wrap").animate( + { + bottom: searchBarWrapHeight + searchBarWrapPadding * 2 + 10 + "px", + }, + 200 + ); + } + }, //编辑农地信息 editnfdInfo(type) { this.currentType = 1; @@ -1263,11 +1448,11 @@ export default { //farmhouse农房 land农地 if (type == "farmhouse") { this.farmhouseStatus = 0; - this.houseInfoList.behindHouse =null; - this.houseInfoList.frontHouse =null; + this.houseInfoList.behindHouse = null; + this.houseInfoList.frontHouse = null; } else if (type == "land") { - this.landInfoList.frontland =null; - this.landInfoList.behindland =null; + this.landInfoList.frontland = null; + this.landInfoList.behindland = null; this.farmhouseStatus = 1; } }, @@ -3266,6 +3451,10 @@ export default { // this.houseInfoList.frontHouse = res.url; // }); // }, + nfAddimgonReadHistoryDelete() { + this.nfAddfileListHistory = []; + this.houseInfoList.frontHouse = ""; + }, nfAddimgonReadHistory(file) { // 创建Canvas对象(画布) let canvas = document.createElement("canvas"); @@ -3313,6 +3502,10 @@ export default { }); }; }, + nfAddimgonReadNowDelete() { + this.nfAddfileListNow = []; + this.houseInfoList.behindHouse = ""; + }, nfAddimgonReadNow(file) { // 创建Canvas对象(画布) let canvas = document.createElement("canvas"); @@ -3367,6 +3560,10 @@ export default { // console.log(this.landInfoList.frontland); // }); // }, + ndAddimgonReadHistoryDelete() { + this.ndAddfileListHistory = []; + this.landInfoList.frontland = ""; + }, ndAddimgonReadHistory(file) { // 创建Canvas对象(画布) let canvas = document.createElement("canvas"); @@ -3412,6 +3609,10 @@ export default { }); }; }, + ndAddimgonReadNowDelete() { + this.ndAddfileListNow = []; + this.landInfoList.behindland = ""; + }, ndAddimgonReadNow(file) { // 创建Canvas对象(画布) let canvas = document.createElement("canvas"); @@ -3465,6 +3666,19 @@ export default { width: 100vw; height: 100vh; position: relative; + .previewZoomImage_wrap { + z-index: 99; + .previewZoomImage_main { + display: flex; + align-items: center; + justify-content: center; + height: 100%; + .previewImg { + max-width: 90vw; + max-height: 90vh; + } + } + } .rightIcon_wrap { position: absolute; right: 16px; @@ -4063,6 +4277,20 @@ export default { no-repeat; background-size: 100% 100%; margin-top: 14px; + box-shadow: 3px 3px 5px rgba(60, 191, 91, 0.3); + border-radius: 50%; + } + .delete_icon { + width: 72px; + height: 72px; + float: right; + background: url("../../assets/images/homestead/delete_icon.png") + no-repeat; + background-size: 100% 100%; + margin-top: 14px; + margin-right: 20px; + box-shadow: 3px 3px 5px rgba(212, 42, 42, 0.3); + border-radius: 50%; } } } @@ -4121,8 +4349,8 @@ export default { } } .uploadPictures_block { - flex: 0 0 160px; - max-height: 160px; + flex: 0 0 200px; + max-height: 200px; display: flex; max-width: 90%; .statusQuo { @@ -4130,16 +4358,17 @@ export default { display: flex; &:first-child { - margin-right: 36px; + margin-right: 20px; } .picture { flex: 1; background: url("../../assets/images/homestead/no_img.png") center center no-repeat; background-size: 90% auto; + padding-left: 10px; img { - width: 98%; - height: 90%; + width: 100%; + height: 100%; } } .describe { @@ -4148,6 +4377,17 @@ export default { justify-content: center; /* 相对父元素水平居中 */ align-items: center; /* 子元素相对父元素垂直居中 */ margin-left: 6px; + padding-left: 10px; + .uploads_main { + width: 200px; + height: 200px; + ::v-deep { + .van-uploader__input-wrapper { + width: 200px; + height: 200px; + } + } + } } } } @@ -4295,18 +4535,94 @@ export default { } } .uploadPicturesFlex_block { - .title_m { - font-size: 28px; - flex: 0 0 50px; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - word-break: break-all; - align-items: center; /* 子元素相对父元素垂直居中 */ - margin-bottom: 20px; - } - .main_m { + flex: 0 0 250px; + max-height: 280px; + display: flex; + padding-top: 30px; + // max-width: 90%; + .statusQuo { + flex: 1; + display: flex; + + &:first-child { + margin-right: 30px; + } + .picture { + flex: 1; + display: flex; + // background: url("../../assets/images/homestead/no_img.png") center + // center no-repeat; + // background-size: 90% auto; + img { + width: 100%; + height: 230px; + } + .uploads_main { + width: 100%; + display: flex; + flex: 1; + /deep/ { + .van-uploader__wrapper { + flex: 1; + display: flex; + .van-uploader__preview { + flex: 1; + margin: 0; + display: flex; + .van-uploader__preview-image { + flex: 1; + width: initial; + height: initial; + .van-image__img { + height: 230px; + } + } + } + } + .van-uploader__input-wrapper { + width: 100%; + } + .van-uploader__upload { + // width: 100%; + // height: 200px; + width: initial; + height: initial; + flex: 1; + margin: 0; + } + } + } + } + .describe { + flex: 0 0 32px; + display: flex; + justify-content: center; /* 相对父元素水平居中 */ + align-items: center; /* 子元素相对父元素垂直居中 */ + margin-left: 15px; + } } + // .title_m { + // font-size: 28px; + // flex: 0 0 50px; + // white-space: nowrap; + // text-overflow: ellipsis; + // overflow: hidden; + // word-break: break-all; + // align-items: center; /* 子元素相对父元素垂直居中 */ + // margin-bottom: 20px; + // } + // .main_m { + // width: 200px; + // height: 200px; + // .uploads_main { + // width: 100%; + // height: 100%; + // img { + // width: 200px; + // height: 200px; + // } + // } + // } } } .footer_main {