From 9b9d81ed30508ed70577cbed70cabe86e8cac038 Mon Sep 17 00:00:00 2001 From: wklion <304413137@qq.com> Date: Tue, 1 Jun 2021 00:55:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=9F=E5=9C=B0=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/const/website.js | 8 +- src/page/index/logo.vue | 2 +- src/router/avue-router.js | 2 +- src/styles/public.scss | 6 +- src/views/land/api/noLand.js | 34 +++- src/views/land/handLand/index.vue | 283 +++++++++++++++++++------- src/views/land/noneHandLand/index.vue | 263 ++++++++++++++++++++---- 8 files changed, 487 insertions(+), 113 deletions(-) diff --git a/public/index.html b/public/index.html index d0084a9..c3633ef 100644 --- a/public/index.html +++ b/public/index.html @@ -14,7 +14,7 @@ - cinderella + 艾儿后台数据管理系统 diff --git a/src/const/website.js b/src/const/website.js index cce6eef..dc90f7b 100644 --- a/src/const/website.js +++ b/src/const/website.js @@ -1,13 +1,13 @@ export default { - title: 'cinderella', - logo: 'cinderella', + title: '艾儿后台数据管理系统', + logo: '', key: 'cinderella', // 配置主键,目前用于存储 - indexTitle: 'cinderella', + indexTitle: '艾儿后台数据管理系统', whiteList: ['/login', '/404', '/401', '/lock'], // 配置无权限可以访问的页面 whiteTagList: ['/login', '/404', '/401', '/lock'], // 配置不添加tags页面 （'/advanced-router/mutative-detail/*'——*为通配符） lockPage: '/lock', tokenTime: 6000, - infoTitle: 'cinderella', + infoTitle: '艾儿后台数据管理系统', statusWhiteList: [428], // 配置首页不可关闭 isFirstPage: false, diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue index e71fddf..8fd176f 100644 --- a/src/page/index/logo.vue +++ b/src/page/index/logo.vue @@ -17,7 +17,7 @@ --> -

cinderella

+

diff --git a/src/router/avue-router.js b/src/router/avue-router.js index 300fc17..7b0f418 100644 --- a/src/router/avue-router.js +++ b/src/router/avue-router.js @@ -18,7 +18,7 @@ RouterPlugin.install = function (router, store) { this.$router.$avueRouter = { // 全局配置 $website: this.$store.getters.website, - $defaultTitle: 'Cinderella', + $defaultTitle: '艾儿后台数据管理系统', routerList: [], group: '', safe: this, diff --git a/src/styles/public.scss b/src/styles/public.scss index 96e2d4b..bb213c4 100644 --- a/src/styles/public.scss +++ b/src/styles/public.scss @@ -132,12 +132,16 @@ .normal_page{ margin: 20px; - background-color: white; + display: flex; + flex-direction: column; .page_search{ padding: 20px; + background-color: white; } .page_content{ + flex: 1; margin-top: 20px; + background-color: white; .page_content_head{ padding: 20px; .page_content_head_left { diff --git a/src/views/land/api/noLand.js b/src/views/land/api/noLand.js index 95fc834..8de9d17 100644 --- a/src/views/land/api/noLand.js +++ b/src/views/land/api/noLand.js @@ -38,11 +38,13 @@ export function queryNoHandLandObj(id) { } // 发送到已挂牌 -export function sendNoHandLandList(query) { +export function sendNoHandLandList(proposedseriaId) { return request({ - url: '/api/landtolist/sendLandList', + url: '/api/landtolist/sendLandList?', method: 'post', - params: query + params: { + proposedseriaId: proposedseriaId + } }) } @@ -61,4 +63,30 @@ export function downloadNoHandLandTemplate() { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, method: 'get' }) +} + +// 通过公告序号经纬度列表查询 +export function queryLonLatList(proposedseriaId) { + return request({ + url: '/api/landtolistlonlat/list/' + proposedseriaId, + method: 'get' + }) +} + +// 新增已挂牌地块经纬度 +export function addLonLat(param) { + return request({ + url: '/api/landtolistlonlat', + method: 'post', + headers: {'Content-Type': 'application/json'}, + data: param + }) +} + +// 通过ID删除拟挂牌地块 +export function delLandLonLat(proposedseriaId,landCode) { + return request({ + url: '/api/landtolistlonlat/'+proposedseriaId+"/"+landCode, + method: 'delete' + }) } \ No newline at end of file diff --git a/src/views/land/handLand/index.vue b/src/views/land/handLand/index.vue index 3e14122..5a93fd0 100644 --- a/src/views/land/handLand/index.vue +++ b/src/views/land/handLand/index.vue @@ -93,7 +93,8 @@ :data="tableData" border @selection-change="handleSelectionChange" - style="width: 100%" + style="width: 100%;" + max-height="630" ref="multipleTable" v-loading="loading" > @@ -104,6 +105,7 @@ :prop="item.prop" :label="item.label" :width="item.width" + :fixed="item.fixed" :show-overflow-tooltip="item.hideMore" > @@ -141,20 +143,21 @@ width="70%" :modal="false" > - 带*数据为必填项 + 带*数据为必填项 - + @@ -275,11 +278,11 @@ - + @@ -311,11 +314,11 @@ - + @@ -366,11 +369,11 @@ - + @@ -415,11 +418,11 @@ - + @@ -472,7 +475,7 @@ - + @@ -777,7 +870,7 @@ import { downloadHandLandTemplate, queryLonLatList, addLonLat, - delLandLonLat + delLandLonLat, } from "@/views/land/api/land"; import { downUrlFile } from "@/util/file"; @@ -804,29 +897,25 @@ export default { label: "公告序号", prop: "annoId", width: 150, - search: true, - rules: [ - { - required: true, - message: "请输入公告序号", - trigger: "blur", - }, - ], + fixed: true, }, { label: "地块编号", prop: "landCode", width: 150, + fixed: true, }, { label: "地块位置", prop: "landPosition", width: 150, + fixed: true, }, { label: "土地用途", prop: "landUsage", width: 150, + fixed: true, }, { label: "土地出让面积(㎡)", @@ -1130,7 +1219,7 @@ export default { dialogTitle: "新增数据", // 编辑Form editForm: {}, - activeNames: [], + activeNames: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"], // 表格加载 loading: false, // 选中的数据 @@ -1139,6 +1228,8 @@ export default { readOnly: true, // 有选中数据 hasSelectData: false, + // 选中tab类型 + activeType: "", rules: { annoId: [ { required: true, message: "请输入公告序号", trigger: "blur" }, @@ -1213,7 +1304,6 @@ export default { }, this.searchForm ); - console.debug(param); fetchHandLandList(param) .then((response) => { this.tableData = response.data.data.records; @@ -1272,6 +1362,7 @@ export default { this.readOnly = false; this.dialogFormVisible = true; this.editForm = row; + this.queryLonLatList(row.landListedId); }, // 删除单个 @@ -1305,15 +1396,7 @@ export default { }, save() { - saveHandLandList(JSON.stringify(this.editForm)).then((res) => { - if (res.success) { - this.$message("保存成功"); - this.dialogFormVisible = false; - } else { - console.debug(res); - this.$message.error("保存失败"); - } - }); + }, // 下载模板 @@ -1338,39 +1421,79 @@ export default { }, // 通过公告序号经纬度列表查询 - queryLonLatList() { - let landListedId = ""; + queryLonLatList(landListedId) { queryLonLatList(landListedId).then((response) => { - this.landLonLat = response.data.data.records; + if (response.data.success) { + this.landLonLat = response.data.data; + } else { + this.landLonLat = []; + } }); }, - // 新增已挂牌地块经纬度 - addLonLat(){ - let param = {}; - addLonLat(param).then(res=>{ - if (res.success) { + // 保存所有数据 + saveAllData() { + saveHandLandList(JSON.stringify(this.editForm)).then((res) => { + if (res.data.success) { this.$message("保存成功"); this.dialogFormVisible = false; } else { - console.debug(res); this.$message.error("保存失败"); } }); }, - // 通过ID删除拟挂牌地块 - delLandLonLat(){ - let landListedId = ""; - let landCode = ''; - delLandLonLat(landListedId, landCode).then(res=>{ - if (res.success) { + + // 添加一行经纬信息 + addOneRowForLonLat() { + let index = 0; + this.landLonLat.forEach((item) => { + item.edit = false; + item.index = index; + index++; + }); + this.landLonLat.push({ + annoId: this.editForm.annoId, + landListedId: this.editForm.landListedId, + landCode: "", + landLonLat: "", + lineColor: "#FF0000", + lineWidth: "", + lineOpaqueness: "", + fillColor: "#FF0000", + fillOpaqueness: "", + edit: true, + index:index + }); + }, + + // 删除一行经纬度 + handleLonLatDelClick(row) { + delLandLonLat(row.landListedId, row.landCode).then((res) => { + if (res.data.success) { this.$message("删除成功"); - this.dialogFormVisible = false; + this.queryLonLatList(row.landListedId); } else { - console.debug(res); this.$message.error("删除失败"); } }); + }, + + // 确定编辑行 + handleLonLatOKClick(row){ + row.edit = false; + addLonLat(row).then(res=>{ + if (res.data.success) { + this.$message("保存成功"); + this.queryLonLatList(row.landListedId); + } else { + this.$message.error("保存失败"); + } + }); + }, + + // 取消编辑行 + handleLonLatCancelClick(row){ + this.landLonLat = this.landLonLat.splice(this.landLonLat.findIndex(item => item.index === row.index), 1); } }, }; @@ -1384,14 +1507,38 @@ export default { } /deep/ .el-dialog__body { height: 82vh; + background-color: #f0f2f5; + position: relative; + display: flex; + flex-direction: column; } /deep/ .el-input { width: 90%; } +/deep/ .el-collapse-item { + margin-top: 10px; + padding-left: 10px; + background-color: white; +} + +/deep/ .el-collapse-item__wrap { + border-top: 1px solid #e8eaec; +} .ti-box { span { font-size: 1rem; } } + +.dialog_op { + position: absolute; + left: 0; + bottom: 0; + width: 100%; + text-align: right; + background-color: white; + border-top: 1px solid #e8eaec; + padding: 5px; +} diff --git a/src/views/land/noneHandLand/index.vue b/src/views/land/noneHandLand/index.vue index 7c4cc14..f555787 100644 --- a/src/views/land/noneHandLand/index.vue +++ b/src/views/land/noneHandLand/index.vue @@ -104,6 +104,7 @@ :prop="item.prop" :label="item.label" :width="item.width" + :fixed="item.fixed" :show-overflow-tooltip="item.hideMore" > @@ -115,7 +116,7 @@ 编辑 - 发送 + 发送 删除 @@ -142,8 +143,8 @@ width="70%" :modal="false" > - 带*数据为必填项 - + 带*数据为必填项 + - + + - + + - + + - + + - + + - + + - + + + + +添加一行 + + + 导入 + @@ -686,14 +772,14 @@ - + - + +
+ 保存所有数据 +
@@ -752,6 +841,10 @@ import { delNoHandLandObj, exportNoHandLandToListExcel, downloadNoHandLandTemplate, + queryLonLatList, + addLonLat, + delLandLonLat, + sendNoHandLandList } from "@/views/land/api/noLand"; import { downUrlFile } from "@/util/file"; import fileDownload from "js-file-download"; @@ -779,29 +872,25 @@ export default { label: "公告序号", prop: "annoId", width: 150, - search: true, - rules: [ - { - required: true, - message: "请输入公告序号", - trigger: "blur", - }, - ], + fixed: true, }, { label: "地块编号", prop: "landCode", width: 150, + fixed: true, }, { label: "地块位置", prop: "landPosition", width: 150, + fixed: true, }, { label: "土地用途", prop: "landUsage", width: 150, + fixed: true, }, { label: "土地出让面积(㎡)", @@ -1109,7 +1198,7 @@ export default { dialogTitle: "新增数据", // 编辑Form editForm: {}, - activeNames: [], + activeNames: ['1','2','3','4','5','6','7','8','9','10'], // 表格加载 loading: false, // 选中的数据 @@ -1118,6 +1207,8 @@ export default { readOnly: true, // 有选中数据 hasSelectData: false, + // 选中tab类型 + activeType:'', }; }, created() {}, @@ -1233,7 +1324,7 @@ export default { this.readOnly = false; this.dialogFormVisible = true; this.editForm = row; - console.debug(this.editForm); + this.queryLonLatList(row.proposedseriaId); }, // 删除单个 @@ -1267,15 +1358,6 @@ export default { }, save() { - saveNoHandLandList(JSON.stringify(this.editForm)).then((res) => { - if (res.success) { - this.$message("保存成功"); - this.dialogFormVisible = false; - } else { - console.debug(res); - this.$message.error("保存失败"); - } - }); }, // 下载模板 @@ -1298,6 +1380,96 @@ export default { clearSelection() { this.$refs.multipleTable.clearSelection(); }, + + // 通过公告序号经纬度列表查询 + queryLonLatList(proposedseriaId) { + queryLonLatList(proposedseriaId).then((response) => { + if (response.data.success) { + this.landLonLat = response.data.data; + } else { + this.landLonLat = []; + } + }); + }, + + // 保存所有数据 + saveAllData(){ + saveNoHandLandList(JSON.stringify(this.editForm)).then((res) => { + if (res.data.success) { + this.$message("保存成功"); + this.dialogFormVisible = false; + } else { + this.$message.error("保存失败"); + } + }); + }, + + // 添加一行经纬信息 + addOneRowForLonLat() { + let index = 0; + this.landLonLat.forEach((item) => { + item.edit = false; + item.index = index; + index++; + }); + this.landLonLat.push({ + // annoId: this.editForm.annoId, + proposedseriaId: this.editForm.proposedseriaId, + landCode: "", + landLonLat: "", + lineColor: "#FF0000", + lineWidth: "", + lineOpaqueness: "", + fillColor: "#FF0000", + fillOpaqueness: "", + edit: true, + index:index + }); + }, + + // 删除一行经纬度 + handleLonLatDelClick(row) { + delLandLonLat(row.proposedseriaId, row.landCode).then((res) => { + if (res.data.success) { + this.$message("删除成功"); + this.queryLonLatList(row.proposedseriaId); + } else { + this.$message.error("删除失败"); + } + }); + }, + + // 确定编辑行 + handleLonLatOKClick(row){ + row.edit = false; + addLonLat(row).then(res=>{ + if (res.data.success) { + this.$message("保存成功"); + this.queryLonLatList(row.proposedseriaId); + } else { + this.$message.error("保存失败"); + } + }); + }, + + // 取消编辑行 + handleLonLatCancelClick(row){ + this.landLonLat = this.landLonLat.splice(this.landLonLat.findIndex(item => item.index === row.index), 1); + }, + + // 发送 + send(row){ + console.debug(row.proposedseriaId); + sendNoHandLandList(row.proposedseriaId).then(res=>{ + if(res.data.success){ + this.$message("发送成功"); + this.onSubmit(); + } + else{ + this.$message.error("发送失败"); + } + }); + } }, }; @@ -1310,15 +1482,38 @@ export default { } /deep/ .el-dialog__body { height: 82vh; + background-color: #F0F2F5; + position: relative; + display: flex; + flex-direction: column; } /deep/ .el-input { width: 90%; } +/deep/ .el-collapse-item{ + margin-top: 10px; + padding-left: 10px; + background-color: white; +} +/deep/ .el-collapse-item__wrap{ + border-top: 1px solid #E8EAEC; +} .ti-box { span { font-size: 1rem; } } + +.dialog_op{ + position: absolute; + left: 0; + bottom: 0; + width: 100%; + text-align: right; + background-color: white; + border-top: 1px solid #E8EAEC; + padding: 5px; +}