From 46d555d78727ff6f99e95b9753d6563eacc0565b Mon Sep 17 00:00:00 2001 From: helloxujingliang <3225043@qq.com> Date: Sat, 24 May 2025 16:10:35 +0800 Subject: [PATCH] mrege --- src/views/sys/exception/Converge/Converge.vue | 18 ++--- .../Converge/Converge/SearchComponent.vue | 32 +-------- .../sys/exception/Converge/Converge/index.vue | 3 +- .../exception/Converge/SearchComponent.vue | 17 +++-- src/views/sys/exception/Converge/index.vue | 2 +- ....timestamp-1748073441364-1426dcaa303d8.mjs | 66 +++++++++++++++++++ 6 files changed, 87 insertions(+), 51 deletions(-) create mode 100644 vite.config.ts.timestamp-1748073441364-1426dcaa303d8.mjs diff --git a/src/views/sys/exception/Converge/Converge.vue b/src/views/sys/exception/Converge/Converge.vue index f4a5ac7..26f7cec 100644 --- a/src/views/sys/exception/Converge/Converge.vue +++ b/src/views/sys/exception/Converge/Converge.vue @@ -38,12 +38,7 @@ v-model:open="showInfoOpen" :footer="null" :destroyOnClose="true"> - - - - - - + @@ -53,12 +48,11 @@ import Map from './Converge/index.vue'; import useDrag from './drag'; import LayerCenter from './mapComponent/layers/index.vue'; - import { getDetail } from '@/api/tiankongdi/index' - import IdleWatersInsertModal from '@/views/demo/IdleWaters/InsertModal.vue' - import IdleLandInsertModal from '@/views/demo/IdleLand/InsertModal.vue' - import IdleHouseInsertModal from '@/views/demo/IdleHouse/InsertModal.vue' - import IdleFarmingInsertModal from '@/views/demo/IdleFarming/InsertModal.vue' - import IdleNongjiInsertModal from '@/views/demo/IdleNongji/InsertModal.vue' + // import { getDetail } from '@/api/tiankongdi/index' + const getDetail = ()=>{ + + } + const { style, startDrag } = useDrag(); diff --git a/src/views/sys/exception/Converge/Converge/SearchComponent.vue b/src/views/sys/exception/Converge/Converge/SearchComponent.vue index 8f36c5b..5b8647b 100644 --- a/src/views/sys/exception/Converge/Converge/SearchComponent.vue +++ b/src/views/sys/exception/Converge/Converge/SearchComponent.vue @@ -49,7 +49,7 @@ // import { getLoadCaseInfoMineralsTuBanList } from '@/api/minerals/index'; import { WktToGeojson } from '@/components/MapboxMaps/src/WktGeojsonTransform'; import { transformGCJ2WGS } from '@/utils/EpsgTransform'; - import { getPageList, getPolygonCenter } from '@/api/tiankongdi/index' + import { getPolygonCenter } from '@/api/tiankongdi/index' const emits = defineEmits(['toPosition', 'handlerFilter', 'flyToLocation']); const props = defineProps(['layer', 'layerSettings']); @@ -125,35 +125,7 @@ searchResult.value = []; const params = { page: 1, limit: 10, key: keyword.value}; const types = [1,2,3,5] - Promise.all(types.map(type => getPageList(params, type))) - .then(results => { - console.log('所有请求成功', results); - for(let index = 0; index < results.length; index ++){ - let type = 0 - switch(index){ - case 0: - type = 1; - break - case 1: - type = 2; - break - case 2: - type = 3; - break - case 3: - type = 5; - break - } - results[index].items.forEach(item => { - searchResult.value.push({...item,type:type}) - }) - } - console.log('searchResult',searchResult.value) - showSearchResult.value = true; - }) - .catch(error => { - console.error('至少有一个请求失败', error); - }); + } else { // 地名搜索 axios diff --git a/src/views/sys/exception/Converge/Converge/index.vue b/src/views/sys/exception/Converge/Converge/index.vue index 0c275bb..fe64ca4 100644 --- a/src/views/sys/exception/Converge/Converge/index.vue +++ b/src/views/sys/exception/Converge/Converge/index.vue @@ -38,7 +38,8 @@ import U from 'mapbox-gl-utils'; import { MP } from './src/MP.js'; import { GeojsonToWkt } from './src/WktGeojsonTransform.js'; - import { layers } from '@/views/sys/exception/util' + // import { layers } from '@/views/sys/exception/util' + let layers = {} const emits = defineEmits([ 'onload', diff --git a/src/views/sys/exception/Converge/SearchComponent.vue b/src/views/sys/exception/Converge/SearchComponent.vue index 6d84940..7a45d17 100644 --- a/src/views/sys/exception/Converge/SearchComponent.vue +++ b/src/views/sys/exception/Converge/SearchComponent.vue @@ -77,13 +77,13 @@ watch( () => props.layerSettings, () => { - subjectName.value = props.layerSettings.subjectname; - subjectTable.value = props.layerSettings.tablename; - Object.keys(props.layerSettings.legend[0]).forEach((item) => { - if (item != '默认') { - filters.value.push({ name: item }); - } - }); + // subjectName.value = props.layerSettings.subjectname; + // subjectTable.value = props.layerSettings.tablename; + // Object.keys(props.layerSettings.legend[0]).forEach((item) => { + // if (item != '默认') { + // filters.value.push({ name: item }); + // } + // }); }, ); @@ -163,6 +163,9 @@ { name: '全部', }, + { + name:"历史项目", + } ]); diff --git a/src/views/sys/exception/Converge/index.vue b/src/views/sys/exception/Converge/index.vue index 1e767d6..74d2bcd 100644 --- a/src/views/sys/exception/Converge/index.vue +++ b/src/views/sys/exception/Converge/index.vue @@ -252,7 +252,7 @@ } function handlerLoadPolygon(code = '', filter = '', type = '', level = '') { - + alert(map_filter); let sql_filter; let map_filter; let type_filter; diff --git a/vite.config.ts.timestamp-1748073441364-1426dcaa303d8.mjs b/vite.config.ts.timestamp-1748073441364-1426dcaa303d8.mjs new file mode 100644 index 0000000..67d26ad --- /dev/null +++ b/vite.config.ts.timestamp-1748073441364-1426dcaa303d8.mjs @@ -0,0 +1,66 @@ +// vite.config.ts +import { defineApplicationConfig } from "file:///E:/projects/LanLingXiangMu/internal/vite-config/dist/index.mjs"; +var vite_config_default = defineApplicationConfig({ + overrides: { + optimizeDeps: { + include: [ + "echarts/core", + "echarts/charts", + "echarts/components", + "echarts/renderers", + "qrcode", + "@iconify/iconify", + "ant-design-vue/es/locale/zh_CN", + "ant-design-vue/es/locale/en_US", + "@/../lib/vform/designer.umd.js" + ] + }, + build: { + /* 其他build生产打包配置省略 */ + //... + target: "esnext", + commonjsOptions: { + include: /node_modules|lib/ + //这里记得把lib目录加进来，否则生产打包会报错！！ + } + }, + server: { + proxy: { + "/basic-api": { + target: "http://localhost:3000", + changeOrigin: true, + ws: true, + rewrite: (path) => path.replace(new RegExp(`^/basic-api`), "") + // only https + // secure: false + }, + "/upload": { + target: "http://localhost:3300/upload", + changeOrigin: true, + ws: true, + rewrite: (path) => path.replace(new RegExp(`^/upload`), "") + } + }, + warmup: { + clientFiles: ["./index.html", "./src/{views,components}/*"] + } + }, + define: { + "process.env": { + BASE_URL: "/" + } + }, + css: { + preprocessorOptions: { + less: { + javascriptEnabled: true + } + } + }, + plugins: [] + } +}); +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJFOlxcXFxwcm9qZWN0c1xcXFxMYW5MaW5nWGlhbmdNdVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiRTpcXFxccHJvamVjdHNcXFxcTGFuTGluZ1hpYW5nTXVcXFxcdml0ZS5jb25maWcudHNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL0U6L3Byb2plY3RzL0xhbkxpbmdYaWFuZ011L3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQXBwbGljYXRpb25Db25maWcgfSBmcm9tICdAdmJlbi92aXRlLWNvbmZpZyc7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZUFwcGxpY2F0aW9uQ29uZmlnKHtcbiAgb3ZlcnJpZGVzOiB7XG4gICAgb3B0aW1pemVEZXBzOiB7XG4gICAgICBpbmNsdWRlOiBbXG4gICAgICAgICdlY2hhcnRzL2NvcmUnLFxuICAgICAgICAnZWNoYXJ0cy9jaGFydHMnLFxuICAgICAgICAnZWNoYXJ0cy9jb21wb25lbnRzJyxcbiAgICAgICAgJ2VjaGFydHMvcmVuZGVyZXJzJyxcbiAgICAgICAgJ3FyY29kZScsXG4gICAgICAgICdAaWNvbmlmeS9pY29uaWZ5JyxcbiAgICAgICAgJ2FudC1kZXNpZ24tdnVlL2VzL2xvY2FsZS96aF9DTicsXG4gICAgICAgICdhbnQtZGVzaWduLXZ1ZS9lcy9sb2NhbGUvZW5fVVMnLFxuICAgICAgICAnQC8uLi9saWIvdmZvcm0vZGVzaWduZXIudW1kLmpzJyxcbiAgICAgIF0sXG4gICAgfSxcbiAgICBidWlsZDoge1xuICAgICAgLyogXHU1MTc2XHU0RUQ2YnVpbGRcdTc1MUZcdTRFQTdcdTYyNTNcdTUzMDVcdTkxNERcdTdGNkVcdTc3MDFcdTc1NjUgKi9cbiAgICAgIC8vLi4uXG4gICAgICB0YXJnZXQ6ICdlc25leHQnLFxuICAgICAgY29tbW9uanNPcHRpb25zOiB7XG4gICAgICAgIGluY2x1ZGU6IC9ub2RlX21vZHVsZXN8bGliLywgLy9cdThGRDlcdTkxQ0NcdThCQjBcdTVGOTdcdTYyOEFsaWJcdTc2RUVcdTVGNTVcdTUyQTBcdThGREJcdTY3NjVcdUZGMENcdTU0MjZcdTUyMTlcdTc1MUZcdTRFQTdcdTYyNTNcdTUzMDVcdTRGMUFcdTYyQTVcdTk1MTlcdUZGMDFcdUZGMDFcbiAgICAgIH0sXG4gICAgfSxcbiAgICBzZXJ2ZXI6IHtcbiAgICAgIHByb3h5OiB7XG4gICAgICAgICcvYmFzaWMtYXBpJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzAwMCcsXG4gICAgICAgICAgY2hhbmdlT3JpZ2luOiB0cnVlLFxuICAgICAgICAgIHdzOiB0cnVlLFxuICAgICAgICAgIHJld3JpdGU6IChwYXRoKSA9PiBwYXRoLnJlcGxhY2UobmV3IFJlZ0V4cChgXi9iYXNpYy1hcGlgKSwgJycpLFxuICAgICAgICAgIC8vIG9ubHkgaHR0cHNcbiAgICAgICAgICAvLyBzZWN1cmU6IGZhbHNlXG4gICAgICAgIH0sXG4gICAgICAgICcvdXBsb2FkJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzMwMC91cGxvYWQnLFxuICAgICAgICAgIGNoYW5nZU9yaWdpbjogdHJ1ZSxcbiAgICAgICAgICB3czogdHJ1ZSxcbiAgICAgICAgICByZXdyaXRlOiAocGF0aCkgPT4gcGF0aC5yZXBsYWNlKG5ldyBSZWdFeHAoYF4vdXBsb2FkYCksICcnKSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgICB3YXJtdXA6IHtcbiAgICAgICAgY2xpZW50RmlsZXM6IFsnLi9pbmRleC5odG1sJywgJy4vc3JjL3t2aWV3cyxjb21wb25lbnRzfS8qJ10sXG4gICAgICB9LFxuICAgIH0sXG4gICAgZGVmaW5lOiB7XG4gICAgICAncHJvY2Vzcy5lbnYnOiB7XG4gICAgICAgIEJBU0VfVVJMOiAnLycsXG4gICAgICB9LFxuICAgIH0sXG4gICAgY3NzOiB7XG4gICAgICBwcmVwcm9jZXNzb3JPcHRpb25zOiB7XG4gICAgICAgIGxlc3M6IHtcbiAgICAgICAgICBqYXZhc2NyaXB0RW5hYmxlZDogdHJ1ZSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgfSxcbiAgICBwbHVnaW5zOiBbXSxcbiAgfSxcbn0pO1xuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFzUSxTQUFTLCtCQUErQjtBQUU5UyxJQUFPLHNCQUFRLHdCQUF3QjtBQUFBLEVBQ3JDLFdBQVc7QUFBQSxJQUNULGNBQWM7QUFBQSxNQUNaLFNBQVM7QUFBQSxRQUNQO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLElBQ0EsT0FBTztBQUFBO0FBQUE7QUFBQSxNQUdMLFFBQVE7QUFBQSxNQUNSLGlCQUFpQjtBQUFBLFFBQ2YsU0FBUztBQUFBO0FBQUEsTUFDWDtBQUFBLElBQ0Y7QUFBQSxJQUNBLFFBQVE7QUFBQSxNQUNOLE9BQU87QUFBQSxRQUNMLGNBQWM7QUFBQSxVQUNaLFFBQVE7QUFBQSxVQUNSLGNBQWM7QUFBQSxVQUNkLElBQUk7QUFBQSxVQUNKLFNBQVMsQ0FBQyxTQUFTLEtBQUssUUFBUSxJQUFJLE9BQU8sYUFBYSxHQUFHLEVBQUU7QUFBQTtBQUFBO0FBQUEsUUFHL0Q7QUFBQSxRQUNBLFdBQVc7QUFBQSxVQUNULFFBQVE7QUFBQSxVQUNSLGNBQWM7QUFBQSxVQUNkLElBQUk7QUFBQSxVQUNKLFNBQVMsQ0FBQyxTQUFTLEtBQUssUUFBUSxJQUFJLE9BQU8sVUFBVSxHQUFHLEVBQUU7QUFBQSxRQUM1RDtBQUFBLE1BQ0Y7QUFBQSxNQUNBLFFBQVE7QUFBQSxRQUNOLGFBQWEsQ0FBQyxnQkFBZ0IsNEJBQTRCO0FBQUEsTUFDNUQ7QUFBQSxJQUNGO0FBQUEsSUFDQSxRQUFRO0FBQUEsTUFDTixlQUFlO0FBQUEsUUFDYixVQUFVO0FBQUEsTUFDWjtBQUFBLElBQ0Y7QUFBQSxJQUNBLEtBQUs7QUFBQSxNQUNILHFCQUFxQjtBQUFBLFFBQ25CLE1BQU07QUFBQSxVQUNKLG1CQUFtQjtBQUFBLFFBQ3JCO0FBQUEsTUFDRjtBQUFBLElBQ0Y7QUFBQSxJQUNBLFNBQVMsQ0FBQztBQUFBLEVBQ1o7QUFDRixDQUFDOyIsCiAgIm5hbWVzIjogW10KfQo=