From 0d420c1fa33b9237f8452ef2edeb0cf6332c75e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=83=B3?= <826276471@qq.com> Date: Tue, 4 Mar 2025 16:56:41 +0800 Subject: [PATCH 1/5] style --- .../illegalHandle/common/Register.vue | 49 ++- .../landsManage/common/CreateLand.vue | 284 ------------------ .../component/landsManage/index.vue | 42 --- 3 files changed, 39 insertions(+), 336 deletions(-) delete mode 100644 sub-government-affairs-service/src/views/landManage/component/landsManage/common/CreateLand.vue diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/Register.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/Register.vue index 8541333..5af4394 100644 --- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/Register.vue +++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/Register.vue @@ -7,9 +7,27 @@
{{ item.value }}
-

案件处理>

- -

案件结果>

+ +

案件处理>

+ + + + + +
+ + + + + + +
+ +

案件结果>

+ + + + @@ -23,16 +41,21 @@ const props = defineProps({ default: false, }, }); -watch( - () => props.visible, - (val) => { - _visible.value = val; - } -); + /* --------------- data --------------- */ // #region const _visible = ref(false); +watch( + () => props.visible, + (val) => { + _visible.value = val; + }, + { + deep: true, + immediate: true, + } +); const info = reactive([ { label: '案件名称', @@ -76,7 +99,13 @@ const info = reactive([ line: true, }, ]); - +const form = reactive({ + record: '', + proof: [], + document: 0, + attrs: [], + result: 0, +}); // #endregion /* --------------- methods --------------- */ diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/common/CreateLand.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/common/CreateLand.vue deleted file mode 100644 index 65a4dfd..0000000 --- a/sub-government-affairs-service/src/views/landManage/component/landsManage/common/CreateLand.vue +++ /dev/null @@ -1,284 +0,0 @@ - - - - - diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue index a7e3d12..212fb52 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue @@ -547,46 +547,4 @@ async function handleRowSave(val, done, loading) { } } } -.create_land_attrs_content_ { - display: flex; - flex-wrap: wrap; - box-sizing: border-box; - gap: 20px; - .custom-form__uploader { - box-sizing: border-box; - height: auto; - } - > div { - width: calc(50% - 10px); - aspect-ratio: 1 / 1; - } - .attrs_content__item { - box-sizing: border-box; - position: relative; - padding: 6px; - border: 1px solid #ccc; - border-radius: 4px; - img { - width: 100%; - height: 100%; - border-radius: 2px; - } - .clear_btn { - position: absolute; - right: 0px; - top: 0px; - font-size: 18px; - color: #f15c5c; - opacity: 0; - cursor: pointer; - background-color: #fff; - border-radius: 50%; - } - &:hover { - .clear_btn { - opacity: 1; - } - } - } -} From 7ef6e7c6e2e62655f8caa3b65ee6dcf86ee2ed89 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Tue, 4 Mar 2025 09:02:27 +0000 Subject: [PATCH 2/5] feat:analysis-land --- .../src/router/index.js | 4 +- .../src/router/modules/statisticAnalysis.js | 32 +++ .../views/statisticAnalysis/land/index.vue | 189 ++++++++++++++++++ 3 files changed, 223 insertions(+), 2 deletions(-) create mode 100644 sub-government-affairs-service/src/router/modules/statisticAnalysis.js create mode 100644 sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 6c70a9a..1b373f4 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -3,7 +3,7 @@ * @Author: zenghua.wang * @Date: 2023-06-20 11:48:41 * @LastEditors: zenghua.wang - * @LastEditTime: 2025-02-28 13:50:00 + * @LastEditTime: 2025-03-04 10:42:19 */ import { createRouter, createWebHistory } from 'vue-router'; import Layout from '@/layouts/index.vue'; @@ -12,7 +12,7 @@ import resourceRouter from './modules/resource'; import plantingAndBreedingRouter from './modules/plantingAndBreeding'; import landsRoutes from './modules/lands'; import annualplanRoutes from './modules/annualplan'; -import statisticsRoutes from './modules/statistics'; +import statisticsRoutes from './modules/statisticAnalysis'; import dictRoutes from './modules/dict'; export const constantRoutes = [ diff --git a/sub-government-affairs-service/src/router/modules/statisticAnalysis.js b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js new file mode 100644 index 0000000..764d159 --- /dev/null +++ b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js @@ -0,0 +1,32 @@ +import Layout from '@/layouts/index.vue'; +import Views from '@/layouts/Views.vue'; + +export default [ + { + path: '/sub-government-affairs-service/analysis', + name: 'analysis', + component: Layout, + redirect: '/sub-government-affairs-service/analysis-land', + meta: { title: '统计分析', icon: 'icon-test' }, + children: [ + { + path: '/sub-government-affairs-service/analysis-land', + component: () => import('@/views/statisticAnalysis/land/index.vue'), + name: 'analysis-land', + meta: { title: '土地利用与规划分析', icon: 'Document' }, + }, + // { + // path: '/sub-government-affairs-service/analysis-agriculture', + // name: 'analysis-agriculture', + // component: () => import('@/views/statisticAnalysis/agriculture/index.vue'), + // meta: { title: '农业生产效率分析', icon: 'Document' }, + // }, + // { + // path: '/sub-government-affairs-service/analysis-environment', + // name: 'analysis-environment', + // component: () => import('@/views/statisticAnalysis/environment/index.vue'), + // meta: { title: '环境影响与经济效益分析', icon: 'Document' }, + // }, + ], + }, +]; diff --git a/sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue b/sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue new file mode 100644 index 0000000..86d364e --- /dev/null +++ b/sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue @@ -0,0 +1,189 @@ + + + + From 00342e1d5255d01984c92219fd34e51f90ec1f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=83=B3?= <826276471@qq.com> Date: Tue, 4 Mar 2025 17:29:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=EF=BC=9A=E6=9A=82=E6=97=B6=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=9C=B0=E5=9B=BE=E9=80=89=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/index.html | 4 +- .../component/landsManage/index.vue | 74 +++++++++++++++---- 2 files changed, 60 insertions(+), 18 deletions(-) diff --git a/main/index.html b/main/index.html index 211ab8e..b1788ff 100644 --- a/main/index.html +++ b/main/index.html @@ -6,14 +6,14 @@ - diff --git a/main/src/components/index.js b/main/src/components/index.js index b2b5fc8..b95d513 100644 --- a/main/src/components/index.js +++ b/main/src/components/index.js @@ -4,6 +4,7 @@ import CustomImportExcel from './custom-import-excel'; import CustomRichEditor from './custom-rich-editor'; import CustomEchartBar from './custom-echart-bar'; import CustomEchartPie from './custom-echart-pie'; -import CustomEchartMultiLine from './custom-echart-multi-line'; +import CustomEchartLine from './custom-echart-line'; +import CustomEchartMixin from './custom-echart-mixin'; -export { SvgIcon, CustomTableOperate, CustomImportExcel, CustomRichEditor, CustomEchartBar, CustomEchartPie, CustomEchartMultiLine }; +export { SvgIcon, CustomTableOperate, CustomImportExcel, CustomRichEditor, CustomEchartBar, CustomEchartPie, CustomEchartLine, CustomEchartMixin }; diff --git a/sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue b/sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue index 86d364e..13b17af 100644 --- a/sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue +++ b/sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue @@ -16,7 +16,7 @@ - + @@ -75,17 +75,13 @@ const state = reactive({ // show: false, // }, }, - series: [ - { - name: 'bar', - type: 'bar', - barWidth: 50, - data: [], - itemStyle: { - borderRadius: 25, - }, + barStyle: { + // barWidth: 50, + showBackground: true, + itemStyle: { + borderRadius: 10, }, - ], + }, }, cropData: [ { value: 230, name: '土豆' }, From 10f866f3940f520fa9b5ed07e03e73e9b5381394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=83=B3?= <826276471@qq.com> Date: Wed, 5 Mar 2025 17:30:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=E5=9C=9F=E5=9C=B0=E8=BF=9D=E6=B3=95?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/index.html | 4 +- .../illegalHandle/common/FileUpload.vue | 86 ++++++ .../illegalHandle/common/Register.vue | 30 ++- .../component/illegalHandle/index.vue | 244 +++++++++++++++++- .../component/landsManage/index.vue | 61 ++--- 5 files changed, 374 insertions(+), 51 deletions(-) create mode 100644 sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue diff --git a/main/index.html b/main/index.html index b1788ff..211ab8e 100644 --- a/main/index.html +++ b/main/index.html @@ -6,14 +6,14 @@ - + diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue new file mode 100644 index 0000000..a9a1953 --- /dev/null +++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/Register.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/Register.vue index 5af4394..cf69e61 100644 --- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/Register.vue +++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/Register.vue @@ -1,5 +1,5 @@ @@ -61,9 +62,7 @@ import { useUserStore } from '@/store/modules/user'; import { getLandsList, exportLands, delLand, saveLand, importLands } from '@/apis/land.js'; import { ElMessage } from 'element-plus'; import useLandHook from './useLandHook'; -import { CommonUpload } from '@/apis'; import Attrs from './common/Attrs.vue'; -import { add } from 'lodash'; const { landType, landsType, landClassificationType, handleIficationType } = useLandHook(); const { VITE_APP_BASE_API } = import.meta.env; @@ -79,8 +78,9 @@ const local_ = ref([102.833669, 24.88149, '昆明市']); const local = ref(JSON.parse(JSON.stringify(local_.value))); /* --------------- data --------------- */ // #region +const loading = ref(false); const crudRef = ref(); -const pageData = reactive({ +const pageData = ref({ currentPage: 1, pageSize: 10, total: 0, @@ -88,8 +88,8 @@ const pageData = reactive({ const data = ref([]); const option = reactive({ ...CRUD_OPTIONS, - selection: false, menuWidth: 120, + selection: false, column: [ { label: '地块名', @@ -342,16 +342,16 @@ const option = reactive({ label: '土地使用权信息', prop: 'baseGroup', column: [ - // { - // label: '地理位置', - // prop: 'coordinate', - // viewDisplay: false, - // }, - // { - // label: '地理位置', - // prop: 'coordinateView', - // addDisplay: false, - // }, + { + label: '地理位置', + prop: 'coordinate', + viewDisplay: false, + }, + { + label: '地理位置', + prop: 'coordinateView', + addDisplay: false, + }, { label: '图片', prop: 'landUrl', @@ -375,30 +375,33 @@ const rowData = ref([]); // #region async function getList() { + loading.value = true; const params = { - current: pageData.currentPage, - size: pageData.pageSize, + current: pageData.value.currentPage, + size: pageData.value.pageSize, landType: landType.value, ...searchData, }; let res = await getLandsList(params); + loading.value = false; if (res.code == 200) { - data.value = res.data.records; + const { total, records } = res.data; + data.value = records; data.value.forEach((v) => { v.isTransfer = v.landTransfer || 1; v.isTransferView = v.landTransfer == 1 ? '否' : '是'; v.landClassificationTypeView = handleIficationType(v.handleIficationType); - // v.coordinateView = v.coordinate; + v.coordinateView = v.coordinate; }); - pageData.total = res.data.total; + pageData.value.total = total; } } function handlePageChange(val) { - pageData.currentPage = val; + pageData.value.currentPage = val; getList(); } function handleSizeChange(val) { - pageData.pageSize = val; + pageData.value.pageSize = val; getList(); } async function handleSearch(form, done) { @@ -412,9 +415,9 @@ async function handleResetSearch() { for (let key in searchData) { searchData[key] = ''; } - pageData.currentPage = 1; - pageData.pageSize = 10; - pageData.total = 0; + pageData.value.currentPage = 1; + pageData.value.pageSize = 10; + pageData.value.total = 0; await getList(); } const attrNames = reactive(landsType.map((v) => v.label)); @@ -518,9 +521,9 @@ async function handleRowSave(val, done, loading) { data.landCertificateUrl = landOwnerUrls.join(); data.landUrl = landUrls.join(); data.villageCode = data.villageCode[data.villageCode.length - 1] || ''; - // if (local.value.length != 0) { - // data.coordinate = `${local.value[0]}E,${local.value[1]}N`; - // } + if (local.value.length != 0) { + data.coordinate = `${local.value[0]}E,${local.value[1]}N`; + } const res = await saveLand(data); loading(); if (res.code == 200) {