From cc2818f3f602eccf7be0e989569f2987e8d58401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=83=B3?= <826276471@qq.com> Date: Wed, 26 Feb 2025 16:55:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=8C=E5=9C=9F=E5=A3=A4=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E5=9C=B0=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=B5=81=E8=BD=AC=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components.d.ts | 1 + sub-government-affairs-service/package.json | 1 + .../src/components/GridSelect.vue | 43 +++++++ .../src/components/LandClassificationType.vue | 56 +++++++++ .../src/components/LandIsTranfer.vue | 50 ++++++++ .../src/components/LandType.vue | 17 +-- .../src/components/LatLngPoint.vue | 43 +++++++ sub-government-affairs-service/src/main.js | 12 +- .../landsManage/common/CreateLand.vue | 48 +++++-- sub-government-affairs-service/yarn.lock | 117 +++++++++++++++++- 10 files changed, 361 insertions(+), 27 deletions(-) create mode 100644 sub-government-affairs-service/src/components/GridSelect.vue create mode 100644 sub-government-affairs-service/src/components/LandClassificationType.vue create mode 100644 sub-government-affairs-service/src/components/LandIsTranfer.vue create mode 100644 sub-government-affairs-service/src/components/LatLngPoint.vue diff --git a/sub-government-affairs-service/components.d.ts b/sub-government-affairs-service/components.d.ts index e787dd0..478bab3 100644 --- a/sub-government-affairs-service/components.d.ts +++ b/sub-government-affairs-service/components.d.ts @@ -8,6 +8,7 @@ export {} declare module 'vue' { export interface GlobalComponents { CustCard: typeof import('./src/components/CustCard.vue')['default'] + GridSelect: typeof import('./src/components/GridSelect.vue')['default'] LandType: typeof import('./src/components/LandType.vue')['default'] Pagina: typeof import('./src/components/Pagina.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/sub-government-affairs-service/package.json b/sub-government-affairs-service/package.json index a073b05..44795cf 100644 --- a/sub-government-affairs-service/package.json +++ b/sub-government-affairs-service/package.json @@ -18,6 +18,7 @@ "dependencies": { "@element-plus/icons-vue": "^2.3.1", "@smallwei/avue": "^3.6.2", + "@vuemap/vue-amap": "^2.1.9", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.6.5", diff --git a/sub-government-affairs-service/src/components/GridSelect.vue b/sub-government-affairs-service/src/components/GridSelect.vue new file mode 100644 index 0000000..79aecbb --- /dev/null +++ b/sub-government-affairs-service/src/components/GridSelect.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/sub-government-affairs-service/src/components/LandClassificationType.vue b/sub-government-affairs-service/src/components/LandClassificationType.vue new file mode 100644 index 0000000..49e1b94 --- /dev/null +++ b/sub-government-affairs-service/src/components/LandClassificationType.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/sub-government-affairs-service/src/components/LandIsTranfer.vue b/sub-government-affairs-service/src/components/LandIsTranfer.vue new file mode 100644 index 0000000..92ce54f --- /dev/null +++ b/sub-government-affairs-service/src/components/LandIsTranfer.vue @@ -0,0 +1,50 @@ + + + + + diff --git a/sub-government-affairs-service/src/components/LandType.vue b/sub-government-affairs-service/src/components/LandType.vue index 306489d..e81157a 100644 --- a/sub-government-affairs-service/src/components/LandType.vue +++ b/sub-government-affairs-service/src/components/LandType.vue @@ -12,15 +12,15 @@ import { ref, watch } from 'vue'; const props = defineProps({ // 父组件传过来的值 value: { - type: Number, - default: 0, + type: String || null, + default: null, }, }); const emit = defineEmits(['update:value']); /* --------------- data --------------- */ // #region -const val = ref(0); +const val = ref(null); watch( () => props.value, () => { @@ -32,14 +32,9 @@ watch( } ); const options = ref([ - { label: '耕地', value: 0 }, - { label: '果园', value: 1 }, - { label: '茶园', value: 2 }, - { label: '其他园地', value: 3 }, - { label: '林地', value: 4 }, - { label: '草地', value: 5 }, - { label: '其他农用地', value: 6 }, - { label: '农村宅基地', value: 7 }, + { label: '农用地', value: '0' }, + { label: '住宅用地', value: '1' }, + { label: '园林', value: '2' }, ]); // #endregion diff --git a/sub-government-affairs-service/src/components/LatLngPoint.vue b/sub-government-affairs-service/src/components/LatLngPoint.vue new file mode 100644 index 0000000..7fea065 --- /dev/null +++ b/sub-government-affairs-service/src/components/LatLngPoint.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/sub-government-affairs-service/src/main.js b/sub-government-affairs-service/src/main.js index e4318cb..be8601b 100644 --- a/sub-government-affairs-service/src/main.js +++ b/sub-government-affairs-service/src/main.js @@ -19,9 +19,17 @@ import { registerDirective } from './directives'; import { registerGlobalComponents } from './plugins/globalComponents'; import { registerElIcons } from './plugins/icon'; import { registerMicroApps } from './plugins/micro'; - +import VueAMap, { initAMapApiLoader } from '@vuemap/vue-amap'; +initAMapApiLoader({ + key: 'c843a50db7157faf295c6fa37c48719f', + securityJsCode: 'f09302d3ed65110614bdb26e44717ddf', // 新版key需要配合安全密钥使用 + //Loca:{ + // version: '2.0.0' + //} // 如果需要使用loca组件库,需要加载Loca +}); const app = createApp(App); -app.use(pinia).use(router).use(ElementPlus).use(Avue); + +app.use(pinia).use(router).use(ElementPlus).use(Avue).use(VueAMap); registerGlobalComponents(app); registerElIcons(app); registerDirective(app); 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 index a172c32..c381960 100644 --- 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 @@ -2,20 +2,28 @@
基础信息
- - + + - - - - - - - - + + + + + + + + + + + + + + + + + -
土地产权信息
@@ -26,6 +34,9 @@ - + diff --git a/sub-government-affairs-service/yarn.lock b/sub-government-affairs-service/yarn.lock index 24467ef..74473c4 100644 --- a/sub-government-affairs-service/yarn.lock +++ b/sub-government-affairs-service/yarn.lock @@ -433,6 +433,20 @@ dependencies: buffer "^6.0.3" +"@math.gl/core@3.6.3": + version "3.6.3" + resolved "https://registry.npmmirror.com/@math.gl/core/-/core-3.6.3.tgz#a6bf796ed421093099749d609de8d99a3ac20a53" + integrity sha512-jBABmDkj5uuuE0dTDmwwss7Cup5ZwQ6Qb7h1pgvtkEutTrhkcv8SuItQNXmF45494yIHeoGue08NlyeY6wxq2A== + dependencies: + "@babel/runtime" "^7.12.0" + "@math.gl/types" "3.6.3" + gl-matrix "^3.4.0" + +"@math.gl/types@3.6.3": + version "3.6.3" + resolved "https://registry.npmmirror.com/@math.gl/types/-/types-3.6.3.tgz#9fa9866feabcbb76de107d78ff3a89c0243ac374" + integrity sha512-3uWLVXHY3jQxsXCr/UCNPSc2BG0hNUljhmOBt9l+lNFDp7zHgm0cK2Tw4kj2XfkJy4TgwZTBGwRDQgWEbLbdTA== + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.npmmirror.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -705,6 +719,27 @@ resolved "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== +"@turf/helpers@^6.5.0": + version "6.5.0" + resolved "https://registry.npmmirror.com/@turf/helpers/-/helpers-6.5.0.tgz#f79af094bd6b8ce7ed2bd3e089a8493ee6cae82e" + integrity sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw== + +"@turf/intersect@^6.5.0": + version "6.5.0" + resolved "https://registry.npmmirror.com/@turf/intersect/-/intersect-6.5.0.tgz#a14e161ddd0264d0f07ac4e325553c70c421f9e6" + integrity sha512-2legGJeKrfFkzntcd4GouPugoqPUjexPZnOvfez+3SfIMrHvulw8qV8u7pfVyn2Yqs53yoVCEjS5sEpvQ5YRQg== + dependencies: + "@turf/helpers" "^6.5.0" + "@turf/invariant" "^6.5.0" + polygon-clipping "^0.15.3" + +"@turf/invariant@^6.5.0": + version "6.5.0" + resolved "https://registry.npmmirror.com/@turf/invariant/-/invariant-6.5.0.tgz#970afc988023e39c7ccab2341bd06979ddc7463f" + integrity sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg== + dependencies: + "@turf/helpers" "^6.5.0" + "@types/eslint@^8.4.5": version "8.56.12" resolved "https://registry.npmmirror.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a" @@ -946,6 +981,51 @@ resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz#87b309a6379c22b926e696893237826f64339b6f" integrity sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ== +"@vuemap/amap-jsapi-loader@1.0.4": + version "1.0.4" + resolved "https://registry.npmmirror.com/@vuemap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.4.tgz#699fc44eda74306ed489e9873d633f820cdac29a" + integrity sha512-s5fFHrsNkjYMovEmUJ5S23jpDtElTanDN2HdCt/amOD245a8wWVcTPjl06YEHXtxf6Ewm+z29wQByOCn209Hxg== + +"@vuemap/amap-jsapi-types@^0.0.16": + version "0.0.16" + resolved "https://registry.npmmirror.com/@vuemap/amap-jsapi-types/-/amap-jsapi-types-0.0.16.tgz#74f9d381d519fe1ce49b0ae8fe103f7213b1e5c2" + integrity sha512-1B1H2IS8sT2RDubbpEY+K8j11Gb7PZY5Bo0cszRkF8Nw+9HNqpbUNeqkQ6+rxLkwIedcSkOsFDy/IyzXCUXqVw== + +"@vuemap/amap-jsapi-types@^0.0.17": + version "0.0.17" + resolved "https://registry.npmmirror.com/@vuemap/amap-jsapi-types/-/amap-jsapi-types-0.0.17.tgz#3f21674520a97785388885a1b19c68acacaeb20e" + integrity sha512-FHI8OMWxJWbgyuQ0tKclvurQIVHRexMIYAOwZ/z9+G7aHHK5EFhKM13siLczNNAgXdJ2dctPEghCdlhcByl3Ag== + +"@vuemap/amap-xyz-layer@0.0.13": + version "0.0.13" + resolved "https://registry.npmmirror.com/@vuemap/amap-xyz-layer/-/amap-xyz-layer-0.0.13.tgz#e0479c6e5227d3bba5bfb42b70314f988d8920b7" + integrity sha512-F6ZSoRGuQzeW9ETKFKES3WwbEogK68vBW5fpY5QGWAf54zumkfpJAIoU2x9gx1bzMT7hwDY895xIhNRuF1LwOw== + dependencies: + "@math.gl/core" "3.6.3" + earcut "2.2.4" + gl-matrix "3.4.3" + +"@vuemap/district-cluster@0.0.11": + version "0.0.11" + resolved "https://registry.npmmirror.com/@vuemap/district-cluster/-/district-cluster-0.0.11.tgz#cdb37d621de03d73d462e47b580353f74f7c65e6" + integrity sha512-SY01gFe8uhP5FKjzyTe0x2yL2K5VmwD5UKlEUU4e09UUZphXCj2Ci7iunX0L29nWINkBjdfxu8dXzhIcx9T3ug== + dependencies: + "@turf/helpers" "^6.5.0" + "@turf/intersect" "^6.5.0" + "@vuemap/amap-jsapi-types" "^0.0.16" + topojson-client "3.1.0" + +"@vuemap/vue-amap@^2.1.9": + version "2.1.9" + resolved "https://registry.npmmirror.com/@vuemap/vue-amap/-/vue-amap-2.1.9.tgz#ea039ea9e6cdfc7cea7610d4a3088a428922ba5c" + integrity sha512-/5Rzljj2gYFuqh52If7Sbr/tYqZYUPPtTvvQBflj7SWVgpH06GMU40DhWizz9Ef62UzaifS2IKZjXeuAvRw4wQ== + dependencies: + "@vuemap/amap-jsapi-loader" "1.0.4" + "@vuemap/amap-jsapi-types" "^0.0.17" + "@vuemap/amap-xyz-layer" "0.0.13" + "@vuemap/district-cluster" "0.0.11" + lodash-es "^4.17.21" + "@vueuse/core@^9.1.0": version "9.13.0" resolved "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz#2f69e66d1905c1e4eebc249a01759cf88ea00cf4" @@ -1668,7 +1748,7 @@ commander@*: resolved "https://registry.npmmirror.com/commander/-/commander-13.0.0.tgz#1b161f60ee3ceb8074583a0f95359a4f8701845c" integrity sha512-oPYleIY8wmTVzkvQq10AEok6YcTC4sRUBl8F9gVuwchGVUCTbl/vhLTaQqutuuySYOsu8YTgV+OxKc/8Yvx+mQ== -commander@^2.20.0: +commander@2, commander@^2.20.0: version "2.20.3" resolved "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -2086,6 +2166,11 @@ dunder-proto@^1.0.0, dunder-proto@^1.0.1: es-errors "^1.3.0" gopd "^1.2.0" +earcut@2.2.4: + version "2.2.4" + resolved "https://registry.npmmirror.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" + integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== + echarts@^5.5.0: version "5.6.0" resolved "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz#2377874dca9fb50f104051c3553544752da3c9d6" @@ -2880,6 +2965,11 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.npmmirror.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== +gl-matrix@3.4.3, gl-matrix@^3.4.0: + version "3.4.3" + resolved "https://registry.npmmirror.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9" + integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA== + glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.npmmirror.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" @@ -4617,6 +4707,14 @@ pkg-types@^1.2.1, pkg-types@^1.3.0: mlly "^1.7.4" pathe "^2.0.1" +polygon-clipping@^0.15.3: + version "0.15.7" + resolved "https://registry.npmmirror.com/polygon-clipping/-/polygon-clipping-0.15.7.tgz#3823ca1e372566f350795ce9dd9a7b19e97bdaad" + integrity sha512-nhfdr83ECBg6xtqOAJab1tbksbBAOMUltN60bU+llHVOL0e5Onm1WpAXXWXVB39L8AJFssoIhEVuy/S90MmotA== + dependencies: + robust-predicates "^3.0.2" + splaytree "^3.1.0" + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.npmmirror.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -5137,6 +5235,11 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" +robust-predicates@^3.0.2: + version "3.0.2" + resolved "https://registry.npmmirror.com/robust-predicates/-/robust-predicates-3.0.2.tgz#d5b28528c4824d20fc48df1928d41d9efa1ad771" + integrity sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg== + rollup@^2.77.2: version "2.79.2" resolved "https://registry.npmmirror.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090" @@ -5524,6 +5627,11 @@ specificity@^0.4.1: resolved "https://registry.npmmirror.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019" integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg== +splaytree@^3.1.0: + version "3.1.2" + resolved "https://registry.npmmirror.com/splaytree/-/splaytree-3.1.2.tgz#d1db2691665a3c69d630de98d55145a6546dc166" + integrity sha512-4OM2BJgC5UzrhVnnJA4BkHKGtjXNzzUfpQjCO8I05xYPsfS/VuQDwjCGGMi8rYQilHEV4j8NBqTFbls/PZEE7A== + split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.npmmirror.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" @@ -6037,6 +6145,13 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" +topojson-client@3.1.0: + version "3.1.0" + resolved "https://registry.npmmirror.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99" + integrity sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw== + dependencies: + commander "2" + traverse@^0.6.6: version "0.6.11" resolved "https://registry.npmmirror.com/traverse/-/traverse-0.6.11.tgz#e8daa071b101ae66767fffa6f177aa6f7110068e"