diff --git a/main/package.json b/main/package.json index 3d5ed35..3a1126f 100644 --- a/main/package.json +++ b/main/package.json @@ -44,6 +44,7 @@ "screenfull": "^6.0.2", "vite-plugin-svg-icons": "^2.0.1", "vue": "^3.5.11", + "vue-cesium": "^3.2.9", "vue-router": "^4.2.5" }, "devDependencies": { diff --git a/main/src/App.vue b/main/src/App.vue index 7c2462b..8dcc2f1 100644 --- a/main/src/App.vue +++ b/main/src/App.vue @@ -6,7 +6,6 @@ diff --git a/main/src/components/index.js b/main/src/components/index.js index c93f377..565cf38 100644 --- a/main/src/components/index.js +++ b/main/src/components/index.js @@ -18,6 +18,7 @@ import CustomEchartWaterDroplet from './custom-echart-water-droplet'; import CustomEchartPieGauge from './custom-echart-pie-gauge'; import CustomEchartWordCloud from './custom-echart-word-cloud'; import customEchartScatterBlister from './custom-echart-scatter-blister'; +import customEchartMaps from './custom-echart-maps'; export { SvgIcon, @@ -40,4 +41,5 @@ export { CustomEchartPieGauge, CustomEchartWordCloud, customEchartScatterBlister, + customEchartMaps, }; diff --git a/main/src/hooks/useEcharts.js b/main/src/hooks/useEcharts.js index 19c989f..7a78abd 100644 --- a/main/src/hooks/useEcharts.js +++ b/main/src/hooks/useEcharts.js @@ -73,6 +73,19 @@ export const useEcharts = (elRef, theme = 'default') => { chartInstance?.resize(); } + /** + * 注册地图数据 + * @param {string} mapName - 地图名称 + * @param {object} geoJSON - GeoJSON 数据 + */ + function registerMap(mapName, geoJSON) { + if (!mapName || !geoJSON) { + console.warn('地图名称或 GeoJSON 数据无效'); + return; + } + echarts.registerMap(mapName, geoJSON); + } + watch( () => getDarkMode.value, (theme) => { @@ -103,5 +116,6 @@ export const useEcharts = (elRef, theme = 'default') => { resize, echarts, getInstance, + registerMap, }; }; diff --git a/main/src/main.js b/main/src/main.js index 08bbed6..5d60cba 100644 --- a/main/src/main.js +++ b/main/src/main.js @@ -10,8 +10,21 @@ import '@smallwei/avue/lib/index.css'; import { registerGlobalMicroApps } from './micro'; import { registerElIcons } from './plugins/icon'; import './utils/permission'; +// import VueCesium from 'vue-cesium'; +// import 'vue-cesium/dist/index.css'; +// import { VcViewer } from 'vue-cesium'; const app = createApp(App); -app.use(pinia).use(router).use(ElementPlus).use(Avue).mount('#root'); +app + .use(pinia) + .use(router) + .use(ElementPlus) + .use(Avue) + // .use(VueCesium, { + // cesiumPath: 'https://cdn.bootcdn.net/ajax/libs/cesium/1.69.0/Cesium.js', + // accessToken: + // 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0ZTNkNmE0MS03MjVmLTRjYjEtYjY0ZS0xOTYxZGQ5NmEwOWYiLCJpZCI6MjI1MTM2LCJpYXQiOjE3NDMwNDY5MDB9.uNWADbo2Ol2hip2BopPzk4LYAAsExE_POBasweIbYBk', + // }) + .mount('#root'); registerElIcons(app); registerGlobalMicroApps(); diff --git a/main/src/utils/echarts.js b/main/src/utils/echarts.js index 766c0ba..f03b63c 100644 --- a/main/src/utils/echarts.js +++ b/main/src/utils/echarts.js @@ -1,6 +1,17 @@ import * as echarts from 'echarts/core'; -import { BarChart, LineChart, PieChart, MapChart, PictorialBarChart, RadarChart, GraphChart, GaugeChart, ScatterChart } from 'echarts/charts'; +import { + BarChart, + LineChart, + PieChart, + MapChart, + PictorialBarChart, + RadarChart, + GraphChart, + GaugeChart, + ScatterChart, + EffectScatterChart, +} from 'echarts/charts'; import 'echarts-gl'; import 'echarts-liquidfill'; import 'echarts-wordcloud'; @@ -49,6 +60,7 @@ echarts.use([ GraphChart, GaugeChart, ScatterChart, + EffectScatterChart, ]); export default echarts; diff --git a/main/yarn.lock b/main/yarn.lock index c9b6302..bde9872 100644 --- a/main/yarn.lock +++ b/main/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@amap/amap-jsapi-loader@^1.0.1": + version "1.0.1" + resolved "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz#9ec4b4d5d2467eac451f6c852e35db69e9f9f0c0" + integrity sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw== + "@ampproject/remapping@^2.2.0": version "2.3.0" resolved "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4" @@ -698,6 +703,34 @@ resolved "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== +"@turf/circle@^6.5.0": + version "6.5.0" + resolved "https://registry.npmmirror.com/@turf/circle/-/circle-6.5.0.tgz#dc017d8c0131d1d212b7c06f76510c22bbeb093c" + integrity sha512-oU1+Kq9DgRnoSbWFHKnnUdTmtcRUMmHoV9DjTXu9vOLNV5OWtAAh1VZ+mzsioGGzoDNT/V5igbFOkMfBQc0B6A== + dependencies: + "@turf/destination" "^6.5.0" + "@turf/helpers" "^6.5.0" + +"@turf/destination@^6.5.0": + version "6.5.0" + resolved "https://registry.npmmirror.com/@turf/destination/-/destination-6.5.0.tgz#30a84702f9677d076130e0440d3223ae503fdae1" + integrity sha512-4cnWQlNC8d1tItOz9B4pmJdWpXqS0vEvv65bI/Pj/genJnsL7evI0/Xw42RvEGROS481MPiU80xzvwxEvhQiMQ== + dependencies: + "@turf/helpers" "^6.5.0" + "@turf/invariant" "^6.5.0" + +"@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/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" @@ -939,7 +972,7 @@ "@vue/compiler-ssr" "3.5.13" "@vue/shared" "3.5.13" -"@vue/shared@3.5.13": +"@vue/shared@3.5.13", "@vue/shared@^3.2.47": version "3.5.13" resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz#87b309a6379c22b926e696893237826f64339b6f" integrity sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ== @@ -1066,6 +1099,11 @@ resolved "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz#b9df1b3ab2cd53f678b19b4d927e200774a6f532" integrity sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg== +"@zouyaoji/heatmap.js@^2.0.8": + version "2.0.8" + resolved "https://registry.npmmirror.com/@zouyaoji/heatmap.js/-/heatmap.js-2.0.8.tgz#5f6b285e7635ca07f2ecdb3d83a9dc1d240433d7" + integrity sha512-kBQny/zOUFH2OFoVyu6IdGJEcQMENIAASUsaZhk+OuJ9WexsYf6EU2lCyGURcsFly1kTMZKODlV7nBTCgfvJqg== + acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -1742,6 +1780,11 @@ commander@~12.1.0: resolved "https://registry.npmmirror.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3" integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA== +compare-versions@^6.1.0: + version "6.1.1" + resolved "https://registry.npmmirror.com/compare-versions/-/compare-versions-6.1.1.tgz#7af3cc1099ba37d244b3145a9af5201b629148a9" + integrity sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg== + component-emitter@^1.2.1: version "1.3.1" resolved "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17" @@ -2200,7 +2243,7 @@ echarts-wordcloud@^2.1.0: resolved "https://registry.npmmirror.com/echarts-wordcloud/-/echarts-wordcloud-2.1.0.tgz#c3de6fe267044f6c3343e4ff0e05eedb01c05096" integrity sha512-Kt1JmbcROgb+3IMI48KZECK2AP5lG6bSsOEs+AsuwaWJxQom31RTNd6NFYI01E/YaI1PFZeueaupjlmzSQasjQ== -echarts@^5.6.0: +echarts@^5.4.3, echarts@^5.6.0: version "5.6.0" resolved "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz#2377874dca9fb50f104051c3553544752da3c9d6" integrity sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA== @@ -3976,6 +4019,11 @@ jszip@^3.10.1: readable-stream "~2.3.6" setimmediate "^1.0.5" +kdbush@^4.0.2: + version "4.0.2" + resolved "https://registry.npmmirror.com/kdbush/-/kdbush-4.0.2.tgz#2f7b7246328b4657dd122b6c7f025fbc2c868e39" + integrity sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA== + keyv@^4.5.3, keyv@^4.5.4: version "4.5.4" resolved "https://registry.npmmirror.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" @@ -4132,7 +4180,7 @@ lodash-es@^4.17.21: resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== -lodash-unified@^1.0.2: +lodash-unified@^1.0.2, lodash-unified@^1.0.3: version "1.0.3" resolved "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.3.tgz#80b1eac10ed2eb02ed189f08614a29c27d07c894" integrity sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ== @@ -4352,6 +4400,11 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== +mgrs@1.0.0: + version "1.0.0" + resolved "https://registry.npmmirror.com/mgrs/-/mgrs-1.0.0.tgz#fb91588e78c90025672395cb40b25f7cd6ad1829" + integrity sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA== + micromatch@3.1.0: version "3.1.0" resolved "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.0.tgz#5102d4eaf20b6997d6008e3acfe1c44a3fa815e2" @@ -4461,6 +4514,11 @@ minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: resolved "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== +mitt@^3.0.1: + version "3.0.1" + resolved "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1" + integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw== + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.npmmirror.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -5227,6 +5285,14 @@ progress@^2.0.3: resolved "https://registry.npmmirror.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +proj4@^2.9.1: + version "2.15.0" + resolved "https://registry.npmmirror.com/proj4/-/proj4-2.15.0.tgz#d77c9956861c8ed516071c4208d576cebe800eb5" + integrity sha512-LqCNEcPdI03BrCHxPLj29vsd5afsm+0sV1H/O3nTDKrv8/LA01ea1z4QADDMjUqxSXWnrmmQDjqFm1J/uZ5RLw== + dependencies: + mgrs "1.0.0" + wkt-parser "^1.4.0" + proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" @@ -6780,6 +6846,11 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +urijs@^1.19.11: + version "1.19.11" + resolved "https://registry.npmmirror.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc" + integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ== + urix@^0.1.0: version "0.1.0" resolved "https://registry.npmmirror.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" @@ -6923,6 +6994,25 @@ vite@^5.0.8: optionalDependencies: fsevents "~2.3.3" +vue-cesium@^3.2.9: + version "3.2.9" + resolved "https://registry.npmmirror.com/vue-cesium/-/vue-cesium-3.2.9.tgz#67b9dcbb4ed8e228fde886b957d0f4b4a3e388ba" + integrity sha512-MOgxAfIL+qYT608n+Bqioz2NbAM9pTWztzZ2gOqfHMxNeOFGROCUFatrzCP/OhndeEH8hbqdnGyxt1bHV9+dzQ== + dependencies: + "@amap/amap-jsapi-loader" "^1.0.1" + "@turf/circle" "^6.5.0" + "@vue/shared" "^3.2.47" + "@zouyaoji/heatmap.js" "^2.0.8" + compare-versions "^6.1.0" + echarts "^5.4.3" + kdbush "^4.0.2" + lodash "^4.17.21" + lodash-es "^4.17.21" + lodash-unified "^1.0.3" + mitt "^3.0.1" + proj4 "^2.9.1" + urijs "^1.19.11" + vue-demi@*, vue-demi@^0.14.10: version "0.14.10" resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04" @@ -7047,6 +7137,11 @@ wildcard@^1.1.0: resolved "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz#a7020453084d8cd2efe70ba9d3696263de1710a5" integrity sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng== +wkt-parser@^1.4.0: + version "1.4.0" + resolved "https://registry.npmmirror.com/wkt-parser/-/wkt-parser-1.4.0.tgz#7cca07a6ee5b4baf059b723e62d7fe95bc923bf5" + integrity sha512-qpwO7Ihds/YYDTi1aADFTI1Sm9YC/tTe3SHD24EeIlZxy7Ik6a1b4HOz7jAi0xdUAw487duqpo8OGu+Tf4nwlQ== + word-wrap@^1.2.5: version "1.2.5" resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" diff --git a/sub-government-affairs-service/yarn.lock b/sub-government-affairs-service/yarn.lock index 65d3edd..9aeb966 100644 --- a/sub-government-affairs-service/yarn.lock +++ b/sub-government-affairs-service/yarn.lock @@ -5531,6 +5531,11 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +splitpanes@^4.0.3: + version "4.0.3" + resolved "https://registry.npmmirror.com/splitpanes/-/splitpanes-4.0.3.tgz#342c2b57d906371c2ab44b4578333fbeb13aaa94" + integrity sha512-S/f1CoH2JroOib7kzQtTQNtQCa7VzNQ2qKOO5HNj/5EVVcNkfz1eX/sH+X3XKdBdDLihEKDekVGwrLADd2oirA== + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" diff --git a/sub-government-screen-service/components.d.ts b/sub-government-screen-service/components.d.ts index 5782213..21dcff9 100644 --- a/sub-government-screen-service/components.d.ts +++ b/sub-government-screen-service/components.d.ts @@ -9,7 +9,9 @@ declare module 'vue' { export interface GlobalComponents { BaseBg: typeof import('./src/components/baseBg.vue')['default'] CenterMap: typeof import('./src/components/centerMap.vue')['default'] + CenterMapold: typeof import('./src/components/centerMapold.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] + copy: typeof import('./src/components/centerMap copy.vue')['default'] CurrentTime: typeof import('./src/components/currentTime.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomCard: typeof import('./src/components/CustomCard.vue')['default'] diff --git a/sub-government-screen-service/package.json b/sub-government-screen-service/package.json index d64ba32..f9de77d 100644 --- a/sub-government-screen-service/package.json +++ b/sub-government-screen-service/package.json @@ -32,6 +32,7 @@ "pinia-plugin-persistedstate": "^3.2.1", "screenfull": "^6.0.2", "vue": "^3.3.11", + "vue-cesium": "^3.2.9", "vue-router": "^4.2.5", "vue3-scroll-seamless": "^1.0.6" }, diff --git a/sub-government-screen-service/src/App.vue b/sub-government-screen-service/src/App.vue index acc815e..f9998e0 100644 --- a/sub-government-screen-service/src/App.vue +++ b/sub-government-screen-service/src/App.vue @@ -19,6 +19,11 @@ import { useSettingStore } from '@/store/modules/setting'; import zhCn from 'element-plus/es/locale/lang/zh-cn'; import currentTime from '@/components/currentTime.vue'; +import { createApp } from 'vue'; +import App from './App.vue'; +import VueCesium from 'vue-cesium'; +import 'vue-cesium/dist/index.css'; + const SettingStore = useSettingStore(); // 配置全局组件大小 const size = computed(() => SettingStore.themeConfig.globalComSize); @@ -32,6 +37,14 @@ let apptime = ref(null); // onUnmounted(() => { // apptime.value && apptime.value.chearTime(); // }); + +// const app = createApp(App); +// app.use(VueCesium, { +// cesiumPath: 'https://unpkg.com/cesium@1.104.0/Build/Cesium/Cesium.js', +// accessToken: +// 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJiMDhmOWQzMi1mMTQwLTQ5YzktOTZjZS1lZjVlNTQzZjY4OTAiLCJpZCI6MjI1MTM2LCJpYXQiOjE3MTk1NTMxNTl9.3tRI3yX0jZxdsdx0Gvv40FWMnVpLu8CnQ8qedEDTeqs', +// }); +// app.mount('#app'); diff --git a/sub-government-screen-service/src/components/CustomSelect.vue b/sub-government-screen-service/src/components/CustomSelect.vue deleted file mode 100644 index 8bbe1c7..0000000 --- a/sub-government-screen-service/src/components/CustomSelect.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - - diff --git a/sub-government-screen-service/src/components/GridSelect.vue b/sub-government-screen-service/src/components/GridSelect.vue deleted file mode 100644 index b0c1867..0000000 --- a/sub-government-screen-service/src/components/GridSelect.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/sub-government-screen-service/src/components/LandClassificationType.vue b/sub-government-screen-service/src/components/LandClassificationType.vue deleted file mode 100644 index b9e669c..0000000 --- a/sub-government-screen-service/src/components/LandClassificationType.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - diff --git a/sub-government-screen-service/src/components/LandIsTransfer.vue b/sub-government-screen-service/src/components/LandIsTransfer.vue deleted file mode 100644 index cb7febe..0000000 --- a/sub-government-screen-service/src/components/LandIsTransfer.vue +++ /dev/null @@ -1,54 +0,0 @@ - - - - - diff --git a/sub-government-screen-service/src/components/LandType.vue b/sub-government-screen-service/src/components/LandType.vue deleted file mode 100644 index 26bae46..0000000 --- a/sub-government-screen-service/src/components/LandType.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/sub-government-screen-service/src/components/Pagina.vue b/sub-government-screen-service/src/components/Pagina.vue deleted file mode 100644 index e95f5ba..0000000 --- a/sub-government-screen-service/src/components/Pagina.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - diff --git a/sub-government-screen-service/src/components/centerMap.vue b/sub-government-screen-service/src/components/centerMap.vue index d4cef02..b02a328 100644 --- a/sub-government-screen-service/src/components/centerMap.vue +++ b/sub-government-screen-service/src/components/centerMap.vue @@ -1,27 +1,212 @@ diff --git a/sub-government-screen-service/src/views/breed/index.vue b/sub-government-screen-service/src/views/breed/index.vue index 24e0174..bc36da2 100644 --- a/sub-government-screen-service/src/views/breed/index.vue +++ b/sub-government-screen-service/src/views/breed/index.vue @@ -86,8 +86,6 @@ diff --git a/sub-government-screen-service/src/views/plant/index.vue b/sub-government-screen-service/src/views/plant/index.vue index a6ab626..a5dad90 100644 --- a/sub-government-screen-service/src/views/plant/index.vue +++ b/sub-government-screen-service/src/views/plant/index.vue @@ -26,9 +26,9 @@ - + - +
@@ -86,10 +86,8 @@