diff --git a/package.json b/package.json index b269eeffa..cb33356d4 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ }, "devDependencies": { "@antv/f2": "^3.8.10-beta.1", - "@tinymce/tinymce-vue": "^3.2.8", + "@tinymce/tinymce-vue": "3.2.8", "@vue/cli-plugin-babel": "^3.10.0", "@vue/cli-plugin-eslint": "^3.10.0", "@vue/cli-service": "^3.10.0", @@ -71,7 +71,7 @@ "ol": "^6.9.0", "sass-loader": "^7.3.1", "script-loader": "^0.7.2", - "tinymce": "^5.8.2", + "tinymce": "5.8.2", "vue-template-compiler": "^2.6.11" }, "eslintConfig": { diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue index eb118d6ad..8f7f561d6 100644 --- a/src/views/components/tinymce2/index.vue +++ b/src/views/components/tinymce2/index.vue @@ -87,11 +87,12 @@ export default { toolbar_mode: "none", toolbar_drawer: "sliding", toolbar_mode: "sliding", - outputFormat: 'p', + outputFormat: "p", plugins: "wordcount visualchars visualblocks toc textpattern template tabfocus spellchecker searchreplace save quickbars print preview paste pagebreak noneditable nonbreaking media insertdatetime importcss imagetools image hr help fullscreen fullpage directionality codesample code charmap link code table lists advlist anchor autolink autoresize autosave", // 插件需要import进来 toolbar: - "formats undo redo paste print fontsizeselect fontselect template fullpage|wordcount ltr rtl visualchars visualblocks toc spellchecker searchreplace|save preview pagebreak nonbreaking|media image|outdent indent aligncenter alignleft alignright alignjustify lineheight underline quicklink h2 h3 blockquote numlist bullist table removeformat forecolor backcolor bold italic strikethrough hr charmap link insertdatetime|subscript superscript cut codesample code |anchor preview fullscreen|help", + // "formats undo redo paste print fontsizeselect fontselect template fullpage|wordcount ltr rtl visualchars visualblocks toc spellchecker searchreplace|save preview pagebreak nonbreaking|media image|outdent indent aligncenter alignleft alignright alignjustify lineheight underline quicklink h2 h3 blockquote numlist bullist table removeformat forecolor backcolor bold italic strikethrough hr charmap link insertdatetime|subscript superscript cut codesample code |anchor preview fullscreen|help", + "formats undo redo|fontsizeselect|fontselect|forecolor backcolor bold italic underline strikethrough removeformat|image media link|outdent indent|aligncenter alignleft alignright alignjustify lineheight quicklink h2 h3 blockquote numlist bullist table|subscript superscript codesample code|preview fullscreen|wordcount|help", content_style: "p {margin: 5px 0; font-size: 14px}", fontsize_formats: "12px 14px 16px 18px 24px 36px 48px 56px 72px", font_formats: @@ -171,17 +172,16 @@ export default { if (editor && val !== prevVal && val !== editor.getContent()) { if (typeof val !== "string") val = val.toString(); debounceSetContent.call(editor, val); - return + return; } // debounceSetContent.call(editor, this.dormatHtml(val)); }); editor.on("change keyup undo redo", () => { // console.log('editor.getContent()---', editor.getContent({ format : 'p' })) - const c = editor.getContent({ format : 'p' }) + const c = editor.getContent({ format: "p" }); this.$emit("input", editor.getContent()); // debounce(500, this.$emit("input", editor.getContent({ format : 'p' }))); - ; }); editor.on("blur", () => { // console.log('editor.blur--', editor.getContent({ format : 'p' })) @@ -190,12 +190,12 @@ export default { }); }, dormatHtml(content) { - let c = '' - if (content.indexOf('DOCTYPE') != -1) { + let c = ""; + if (content.indexOf("DOCTYPE") != -1) { c = content.slice(45, -16); } - console.log('content', typeof content) - return c || content + console.log("content", typeof content); + return c || content; }, getUserToken() { return localStorage.getItem("token"); @@ -211,3 +211,10 @@ export default { }, }; + + diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 03b19b0de..4507abb30 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -122,6 +122,72 @@ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + 0) { @@ -299,6 +385,113 @@ export default { ...mapGetters(['clientHeight', 'iframeHeight']) }, methods: { + handleChangeV (val) { + + this.buildingId = ""; + this.buildingUnitId = ""; + this.houseId = ""; + this.getBuildList(); + // this.getUniList(); + // this.getHouseList(); + }, + handleChangeB (val) { + + this.buildingUnitId = ""; + this.houseId = ""; + this.getUniList(); + // this.getHouseList(); + }, + handleChangeD () { + this.houseId = ""; + this.getHouseList(); + }, + + async getValiheList () { + const { user } = this.$store.state; + if (!this.selGridId) { + this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId + } + + const url = "/gov/org/icneighborhood/neighborhood-options"; + // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" + let params = { + gridId: this.selGridId, + agencyId: this.selAgencyId, + isPage: false + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.optionsV = data; + + this.neighborHoodId = "" + this.buildingId = ""; + this.buildingUnitId = ""; + this.houseId = ""; + } else { + this.$message.error(msg); + } + + + }, + + async getBuildList () { + const url = "/gov/org/icbuilding/buildingoption"; + // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" + let params = { + neighborHoodId: this.neighborHoodId, + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.optionsB = data; + this.buildingId = ""; + this.buildingUnitId = ""; + this.houseId = ""; + } else { + this.$message.error(msg); + } + + + }, + async getUniList () { + + const url = "/gov/org/icbuildingunit/unitoption"; + // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" + let params = { + buildingId: this.buildingId, + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.optionsD = data; + this.buildingUnitId = ""; + this.houseId = ""; + } else { + this.$message.error(msg); + } + + + }, + getHouseList () { + this.$http + .post("/gov/org/ichouse/houseoption", { unitId: this.buildingUnitId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + + this.optionsH = res.data; + this.houseId = ""; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, handleSearch () { // if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) { @@ -323,6 +516,10 @@ export default { this.remark = '' this.updateStartDate = '' this.updateEndDate = '' + this.neighborHoodId = '' + this.buildingId = '' + this.buildingUnitId = '' + this.houseId = '' this.pageSize = 10 this.pageNo = 1 @@ -392,7 +589,7 @@ export default { }, - handleNodeClick (obj) { + async handleNodeClick (obj) { this.ownerName = '' this.ownerPhone = '' this.rentFlag = '' @@ -404,18 +601,42 @@ export default { this.selObj = JSON.parse(JSON.stringify(obj)) this.getTreeObj(obj) + await nextTick(1000) + this.vDisabled = false + this.bDisabled = false + if (obj.level === 'building') {//点击楼栋 + this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) + this.selAgencyId = '' + this.selGridId = '' + await this.getValiheList() + this.neighborHoodId = this.selTreeObj.pid + await this.getBuildList() + this.buildingId = this.selTreeObj.id + await this.getUniList() + this.vDisabled = true + this.bDisabled = true - this.$nextTick(() => { - if (obj.level === 'building') {//点击楼栋 - this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) - - } else if (obj.level === 'neighborHood') {//点击小区 - this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj) + } else if (obj.level === 'neighborHood') {//点击小区 + this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj) + this.selAgencyId = '' + this.selGridId = '' + await this.getValiheList() + this.neighborHoodId = this.selTreeObj.id + await this.getBuildList() + this.vDisabled = true + } else { + this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) + if (obj.level === 'grid') { + this.selAgencyId = '' + this.selGridId = this.selTreeObj.id } else { - this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) + this.selAgencyId = this.selTreeObj.id + this.selGridId = '' } - }) + this.getValiheList('', '') + } + }, @@ -507,7 +728,7 @@ export default { obj.longitude = this.centerPoint[1] } this.selTreeObj = obj - console.log(this.selTreeObj) + console.log('selTreeObj', this.selTreeObj) }, diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index c16620f39..55875f770 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -332,6 +332,10 @@ export default { sortType: this.sortType, updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, + neighborHoodId: this.neighborHoodId, + buildingId: this.buildingId, + buildingUnitId: this.buildingUnitId, + houseId: this.houseId, }; this.$refs.baobiao.init({ elseParams: { @@ -436,6 +440,10 @@ export default { sortType: this.sortType, updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, + neighborHoodId: this.neighborHoodId, + buildingId: this.buildingId, + buildingUnitId: this.buildingUnitId, + houseId: this.houseId, }; const url = "/gov/org/house/houselist"; @@ -637,6 +645,10 @@ export default { updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, buildingId: this.agencyObj.id, + neighborHoodId: this.neighborHoodId, + buildingId: this.buildingId, + buildingUnitId: this.buildingUnitId, + houseId: this.houseId, }; if (this.agencyObj.level === "grid") { @@ -734,6 +746,10 @@ export default { remark: this.remark, updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, + neighborHoodId: this.neighborHoodId, + buildingId: this.buildingId, + buildingUnitId: this.buildingUnitId, + houseId: this.houseId, buildingId: "", neighborHoodId: "", }; @@ -926,6 +942,22 @@ export default { type: String, default: "", }, + neighborHoodId: { + type: String, + default: "", + }, + buildingId: { + type: String, + default: "", + }, + buildingUnitId: { + type: String, + default: "", + }, + houseId: { + type: String, + default: "", + }, }, }; diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index 5bf73b2ca..bf4ff1a2e 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -310,7 +310,12 @@ size="small" @click="handleVisiteList(scope.row)">随访记录 - +
+ 删除 +
{ + + let delUrl = "/epmetuser/icEpidemicSpecialAttention/delete"; + const { data, code, msg } = await requestPost(delUrl, [row.id]); + + if (code === 0) { + this.$message({ + type: "success", + message: "删除成功", + }); + this.loadTable(); + } else { + this.$message.error(msg); + } + }) + .catch((err) => { + if (err == "cancel") { + // this.$message({ + // type: "info", + // message: "已取消删除" + // }); + } + }); + }, + async deleteFocus (row) { const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del" diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 4b776bec9..5bf223997 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -22,7 +22,6 @@ { - item.isResiUserShow = item.isResiUser === '0' ? '否' : '是' + item.isResiUserShow = item.isLocalResiUser === '0' ? '否' : '是' if (item.natResult === '1') { item.natResultShow = '阳性' } else if (item.natResult === '0') { diff --git a/src/views/modules/base/epidemic/natInfo/noNatList.vue b/src/views/modules/base/epidemic/natInfo/noNatList.vue index 33ccfc846..30e32cd7f 100644 --- a/src/views/modules/base/epidemic/natInfo/noNatList.vue +++ b/src/views/modules/base/epidemic/natInfo/noNatList.vue @@ -64,6 +64,31 @@ + + + + + + + + + + +
- + - - - + + - +
- +
- - - + + 选择图片 -
-
-
- 取 消 - 确 定 + 取 消 + 确 定
@@ -132,7 +154,7 @@ import nextTick from "dai-js/tools/nextTick"; export default { props: {}, - data () { + data() { return { offlineShowed: false, @@ -148,7 +170,7 @@ export default { optionUrl: "/gov/voice/tag/taglist", optionUrlParams: {}, optionList: [], - optionCook (list) { + optionCook(list) { return list.map((item) => ({ label: item.tagName, value: item.tagId, @@ -189,12 +211,12 @@ export default { children: "subAgencyList", checkStrictly: true, }, - optionCook (obj) { + optionCook(obj) { return [obj]; }, supKeys: ["publishRangeId", "publishRangeType"], supValues: ["", ""], - handleChangeFn (vals, item) { + handleChangeFn(vals, item) { const { optionList } = item; if (vals.length > 0) { item["supValues"][0] = vals[vals.length - 1]; @@ -246,14 +268,14 @@ export default { exportUrl: "", addUrl: "/gov/voice/article/addOrSaveDraft", - editUrl: "", + editUrl: "/gov/voice/article/updateArticle", infoUrl: "/gov/voice/article/detailV2", - delUrl: "", - editAuth (item) { - return false; + delUrl: "/gov/voice/article/delete批量", + editAuth(item) { + return item.statusFlagName == "已发布"; }, - delAuth (item) { - return false; + delAuth(item) { + return item.statusFlagName == "已下线"; }, editParams: [ @@ -283,7 +305,7 @@ export default { uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/article/upload", supKeys: ["imgUrlArr", "imgUrl"], supValues: [() => [], ""], - beforeImgUpload (file, item, that) { + beforeImgUpload(file, item, that) { console.log(file); const isLt1M = file.size / 1024 / 1024 < 10; const srcType = file.type; @@ -319,10 +341,10 @@ export default { checkStrictly: false, emitPath: false, }, - optionCook (obj) { + optionCook(obj) { return [obj]; }, - handleChangeFn (vals, item, that) { + handleChangeFn(vals, item, that) { console.log("handleChangeFn", vals); const { optionList } = item; const optionPlaneList = collapse(optionList, "subAgencyList"); @@ -363,7 +385,7 @@ export default { type: "date", value: dateFormat(new Date(), "yyyy-MM-dd"), pickerOptions: { - disabledDate (time) { + disabledDate(time) { return time.getTime() > Date.now(); }, }, @@ -384,7 +406,7 @@ export default { optionType: "group", supKeys: ["publisherName", "publisherType"], supValues: ["", ""], - optionCook (data) { + optionCook(data) { let ret = []; const { agencyDeptList, agencyGridList, agencyId, agencyName } = data; @@ -426,7 +448,7 @@ export default { } return ret; }, - handleChangeFn (vals, item, that) { + handleChangeFn(vals, item, that) { const { optionList } = item; let opts = []; optionList.forEach((g) => { @@ -454,7 +476,7 @@ export default { optionUrl: "/gov/voice/tag/taglist", optionUrlParams: {}, optionList: [], - optionCook (list) { + optionCook(list) { return list.map((item) => ({ label: item.tagName, value: item.tagName, @@ -487,7 +509,7 @@ export default { editElseRules: {}, editConfig: { confirmBtnName: "发布", - cookInfoFn (data) { + cookInfoFn(data) { if (data.richTextFlag == "0") { data.content = data.contentList .map((item) => { @@ -518,7 +540,7 @@ export default { return data; }, - beforeSubmit (formType, fmData, that) { + beforeSubmit(formType, fmData, that) { if (fmData.isTop == "1" && !fmData.imgUrl) { that.$message.error("请上传封面图片"); return false; @@ -532,109 +554,105 @@ export default { uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile", replayImgList: [], hideUploadBtn: false, - selType: 'top', - selArticleId: '', - selImgUrl: '' + selType: "top", + selArticleId: "", + selImgUrl: "", }; }, components: { basePage, offline }, computed: {}, watch: {}, - async mounted () { }, + async mounted() {}, methods: { - async handleOfflineShow (item) { + async handleOfflineShow(item) { console.log(item); this.offlineShowed = true; await nextTick(100); this.$refs.offlineForm.initForm(item); }, - async handleAddImage () { - console.log('formData', this.formData) - this.topArticle() + async handleAddImage() { + console.log("formData", this.formData); + this.topArticle(); }, - async handleCancleTopArticle (item, type) { - this.selType = type - this.selArticleId = item.articleId - await this.topArticle() + async handleCancleTopArticle(item, type) { + this.selType = type; + this.selArticleId = item.articleId; + await this.topArticle(); }, - async handleTopArticle (item, type) { - - this.selType = type - this.selArticleId = item.articleId + async handleTopArticle(item, type) { + this.selType = type; + this.selArticleId = item.articleId; - let hasImage = await this.isHasImage() + let hasImage = await this.isHasImage(); - if (hasImage === 'refrsh') { + if (hasImage === "refrsh") { this.$message.error("请求失败，请重新尝试"); - - } else if (hasImage === 'no') { + } else if (hasImage === "no") { // this.$message.info("请先上传封面图片"); - this.showAddImage = true + this.showAddImage = true; } else { - await this.topArticle() + await this.topArticle(); } - }, - async isHasImage () { + async isHasImage() { const url = "/gov/voice/article/detailV2"; const { tableData } = this; const { data, code, msg } = await requestPost(url, { articleId: this.selArticleId, - }); if (code === 0) { // this.formData = data if (data.imgUrl) { - return 'has' + return "has"; } else { - return 'no' + return "no"; } } else { - return 'refrsh' + return "refrsh"; } }, - async topArticle () { + async topArticle() { const url = "/gov/voice/article/topArticle"; const { tableData } = this; let params = { articleId: this.selArticleId, - type: this.selType - } + type: this.selType, + }; if (this.selImgUrl) { - params.imgUrl = this.selImgUrl + params.imgUrl = this.selImgUrl; } const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.$message.success("操作成功！"); - this.showAddImage = false + this.showAddImage = false; this.$refs.basePage.refresh(); } else { this.$message.success("操作失败！"); } }, - removePic (file, fileList) { + removePic(file, fileList) { this.selImgUrl = ""; this.replayImgList = []; this.hideUploadBtn = fileList.length >= 1; }, // 最多上传3张图，超过时隐藏上传按钮 - handleEditChange (file, fileList) { + handleEditChange(file, fileList) { this.hideUploadBtn = fileList.length >= 1; }, - exceedPic () { + exceedPic() { this.$message.warning("只能上传1张封面图"); }, - beforeAvatarUpload (file) { + beforeAvatarUpload(file) { const isJPG = file.type === "image/jpeg"; const isLt2M = file.size / 1024 / 1024 < 10; @@ -643,17 +661,17 @@ export default { } return isLt2M; }, - handleSuccess (response, file, fileList) { + handleSuccess(response, file, fileList) { this.replayImgList.push(file); this.selImgUrl = response.data.url; }, - handleOfflineSuccess () { + handleOfflineSuccess() { this.$refs.basePage.refresh(); this.offlineShowed = false; }, - async handleClickDraft (fmData) { + async handleClickDraft(fmData) { let url = this.addUrl; let params = { ...fmData, diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue index 883e32a05..7a3cfdfe6 100644 --- a/src/views/modules/communityParty/heart/heartForm.vue +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -183,7 +183,7 @@ + label-width="150px">
- -
- - - - -
+
+ + + 查询 +
+
- - - - -
- -
- - - - -
+
+ + + 查询 +
+
- - - - -
{ - if (!map_act) { - this.initMap(this.formData.actLatitude, this.formData.actLongitude, this.formData.signInLatitude, this.formData.signInLongitude) - } else { - map_act.setCenter(this.formData.actLatitude, this.formData.actLongitude); - map_act.setMarker(this.formData.actLatitude, this.formData.actLongitude); - map_signin.setCenter(this.formData.signInLatitude, this.formData.signInLongitude); - map_signin.setMarker(this.formData.signInLatitude, this.formData.signInLongitude); - - } - - }) }, //获取主办方 @@ -712,170 +689,188 @@ export default { }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 - initMap (latitude1, longitude1, latitude2, longitude2) { - - map_act = new daiMap( - document.getElementById("app_heart_act"), - { latitude1, longitude1 }, - { - zoom: 16.2, // 设置地图缩放级别 - pitch: 43.5, // 设置俯仰角 - rotation: 45, // 设置地图旋转角度 - } - ); - map_signin = new daiMap( - document.getElementById("app_heart_signin"), - { latitude2, longitude2 }, + initMap () { + // 定义地图中心点坐标 + var center = new window.TMap.LatLng(36.0722275, 120.38945519); + // 定义map变量，调用 TMap.Map() 构造函数创建地图 + map_act = new window.TMap.Map(document.getElementById("map_act_id"), { + center: center, // 设置地图中心点坐标 + zoom: 16.2, // 设置地图缩放级别 + pitch: 43.5, // 设置俯仰角 + rotation: 45, // 设置地图旋转角度 + }); + map_signin = new window.TMap.Map( + document.getElementById("map_signin_id"), { + center: center, // 设置地图中心点坐标 zoom: 16.2, // 设置地图缩放级别 pitch: 43.5, // 设置俯仰角 rotation: 45, // 设置地图旋转角度 } ); + search_act = new window.TMap.service.Search({ pageSize: 10 }); + // 新建一个地点搜索类 + markers_act = new TMap.MultiMarker({ + map: map_act, + geometries: [], + }); + infoWindowList_act = Array(10); + + geocoder_act = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 + + search_signin = new window.TMap.service.Search({ pageSize: 10 }); + // 新建一个地点搜索类 + markers_signin = new TMap.MultiMarker({ + map: map_signin, + geometries: [], + }); + infoWindowList_signin = Array(10); + + geocoder_signin = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 + // 监听地图平移结束 - map_act.on("dragend", (e) => { + map_act.on("panend", (e) => { this.handleMoveCenterAct(e); }); - - map_act.setCenter(latitude1, longitude1); - map_act.setMarker(latitude1, longitude1); + this.handleMoveCenterAct(); // 监听地图平移结束 - map_signin.on("dragend", (e) => { + map_signin.on("panend", (e) => { this.handleMoveCenterSignin(e); }); + this.handleMoveCenterSignin(); + }, - map_signin.setCenter(latitude2, longitude2); - map_signin.setMarker(latitude2, longitude2); - + setMarkerAct (lat, lng) { + markers_act.setGeometries([]); + markers_act.add([ + { + id: "4", + styleId: "marker", + position: new TMap.LatLng(lat, lng), + properties: { + title: "marker4", + }, + }, + ]); }, + handleSearchMapAct () { + infoWindowList_act.forEach((infoWindow) => { + infoWindow.close(); + }); + infoWindowList_act.length = 0; + markers_act.setGeometries([]); + // 在地图显示范围内以给定的关键字搜索地点 + search_act + .searchNearby({ + keyword: this.formData.actAddress, + radius: 1000, + autoExtend: true, + center: map_act.getCenter(), + }) + .then((result) => { + let { data } = result; + if (Array.isArray(data) && data.length > 0) { + const { + location: { lat, lng }, + } = data[0]; + map_act.setCenter(new TMap.LatLng(lat, lng)); + this.setMarkerAct(lat, lng); + this.formData.actLatitude = lat; + this.formData.actLongitude = lng; + } else { + this.$message.error("未检索到相关位置坐标"); + } + }); + }, - async handleMoveCenterAct () { + handleMoveCenterAct (e) { //修改地图中心点 - const { lat, lng } = map_act.getCenter(); + const center = map_act.getCenter(); + const lat = center.getLat(); + const lng = center.getLng(); this.formData.actLatitude = lat; this.formData.actLongitude = lng; - map_act.setMarker(lat, lng); - - let { msg, data } = await map_act.getAddress(lat, lng); - if (msg == "success") { - this.formData.actAddress = data.address - this.searchValueAct = data.address - this.searchOptionsAct = [] - + this.setMarkerAct(lat, lng); + + if (e && e.originalEvent) { + geocoder_act + .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 + .then((result) => { + this.formData.actAddress = result.result.address; + }); } }, - async handleMoveCenterSignin () { - //修改地图中心点 - const { lat, lng } = map_signin.getCenter(); - this.formData.signInLatitude = lat; - this.formData.signInLongitude = lng; - map_signin.setMarker(lat, lng); - - let { msg, data } = await map_signin.getAddress(lat, lng); - if (msg == "success") { - this.formData.signInAddress = data.address - this.searchValueSignin = data.address - this.searchOptionsSignin = [] - - } + setMarkerSignin (lat, lng) { + markers_signin.setGeometries([]); + markers_signin.add([ + { + id: "4", + styleId: "marker", + position: new TMap.LatLng(lat, lng), + properties: { + title: "marker4", + }, + }, + ]); }, - async remoteMethodAct (query) { - - if (query !== '') { - this.loadingAct = true; - - const { msg, data } = await map_act.searchNearby(query); - this.loadingAct = false; - this.resultListAct = [] - - if (msg == "success" && data.resultList && data.resultList.length > 0) { - - if (data.resultList && data.resultList.length > 0) { - this.resultListAct = data.resultList - this.searchOptionsAct = this.resultListAct.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; - - }); + handleSearchMapSignin () { + infoWindowList_signin.forEach((infoWindow) => { + infoWindow.close(); + }); + infoWindowList_signin.length = 0; + markers_signin.setGeometries([]); + // 在地图显示范围内以给定的关键字搜索地点 + search_signin + .searchNearby({ + keyword: this.formData.signInAddress, + radius: 1000, + autoExtend: true, + center: map_signin.getCenter(), + }) + .then((result) => { + let { data } = result; + if (Array.isArray(data) && data.length > 0) { + const { + location: { lat, lng }, + } = data[0]; + map_signin.setCenter(new TMap.LatLng(lat, lng)); + this.setMarkerSignin(lat, lng); + this.formData.signInLatitude = lat; + this.formData.signInLongitude = lng; + } else { + this.$message.error("未检索到相关位置坐标"); } - } else { - this.searchOptionsAct = [ - { - value: '0', - label: '未检索到结果' - } - ] - } - } else { - this.searchOptionsAct = []; - } + }); }, - async remoteMethodSignin (query) { - - if (query !== '') { - this.loadingSign = true; - - const { msg, data } = await map_signin.searchNearby(query); - this.loadingSign = false; - this.resultListSignin = [] - if (msg == "success" && data.resultList && data.resultList.length > 0) { - - if (data.resultList && data.resultList.length > 0) { - this.resultListSignin = data.resultList - this.searchOptionsSignin = this.resultListSignin.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; - - }); - } - } else { - this.searchOptionsSignin = [ - { - value: '0', - label: '未检索到结果' - } - ] - } - } else { - this.searchOptionsSignin = []; + handleMoveCenterSignin (e) { + //修改地图中心点 + const center = map_signin.getCenter(); + const lat = center.getLat(); + const lng = center.getLng(); + this.formData.signInLatitude = lat; + this.formData.signInLongitude = lng; + this.setMarkerSignin(lat, lng); + + if (e && e.originalEvent) { + geocoder_signin + .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 + .then((result) => { + this.formData.signInAddress = result.result.address; + }); } }, - handleClickKeyAct (index) { - let selPosition = this.resultListAct[index] - let lonlat = selPosition.lonlat.split(" ") - map_act.setCenter(lonlat[1], lonlat[0]); - map_act.setMarker(lonlat[1], lonlat[0]); - this.formData.actLatitude = lonlat[1]; - this.formData.actLongitude = lonlat[0]; - this.formData.actAddress = selPosition.address + selPosition.name - }, - handleClickKeySignin (index) { - let selPosition = this.resultListSignin[index] - let lonlat = selPosition.lonlat.split(" ") - map_signin.setCenter(lonlat[1], lonlat[0]); - map_signin.setMarker(lonlat[1], lonlat[0]); - this.formData.signInLatitude = lonlat[1]; - this.formData.signInLongitude = lonlat[0]; - this.formData.signInAddress = selPosition.address + selPosition.name - }, handleCancle () { this.resetData(); this.$emit("dialogCancle"); }, resetData () { - this.searchValueAct = '' - this.searchOptionsAct = [] - this.resultListAct = [] - - this.searchValueSignin = '' - this.searchOptionsSignin = [] - this.resultListSignin = [] - this.actId = ""; this.replayImgList = []; this.agencyIdArray = []; diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index f06ecc7ac..71face8d1 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -720,13 +720,18 @@ export default { const { tableData, idName } = this; const idValue = tableData[rowIndex][idName]; + let param = { + [idName]: idValue, + }; if (url.endsWith("/")) { url += idValue; } + if (url.endsWith("批量")) { + url = url.slice(0, -2); + param = [idValue]; + } - const { data, code, msg } = await requestPost(url, { - [idName]: idValue, - }); + const { data, code, msg } = await requestPost(url, param); if (code === 0) { this.$message.success("删除成功！"); diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index a472ca5a9..e5924a369 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -97,6 +97,53 @@ + +
合同信息
+
出租人信息
+ + + + + + + + + + + + + + + + + + + +
+ + + +
+ +
承租人信息
+ + + + + + + + + + + + + + + +
居住成员信息

@@ -206,53 +253,6 @@
-
合同信息
-
出租人信息
- - - - - - - - - - - - - - - - - - - -
- - - -
- -
承租人信息
- - - - - - - - - - - - - - - -
-
合同内容
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue index c56ac16ae..4f651215a 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue @@ -18,38 +18,7 @@
-
-
居住成员信息
- - - - - - - - - - - - - - - - - - - -
+
合同信息
出租人信息
@@ -103,7 +72,38 @@
- +
+
居住成员信息
+ + + + + + + + + + + + + + + + + + + +
合同内容