From 10e9ecc4a77d139a36655472ad9e896551b65719 Mon Sep 17 00:00:00 2001 From: Cc Date: Tue, 29 Oct 2024 11:16:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9D=90=E6=A0=87=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- src/admin/api/system/coordinateSystem.js | 38 ++ .../views/system/layers/coordinateSystem.vue | 339 ++++++++++++++++++ src/admin/views/system/layers/index.vue | 64 ++-- src/ldmap/components/comExit/reconExit.vue | 38 +- stats.html | 2 +- 6 files changed, 454 insertions(+), 29 deletions(-) create mode 100644 src/admin/api/system/coordinateSystem.js create mode 100644 src/admin/views/system/layers/coordinateSystem.vue diff --git a/README.md b/README.md index 6ff1a54..99b4b12 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ```bash # 进入项目目录 cd ruoyi-ui-vue3 - + # 安装依赖 npm install --registry=https://registry.npmmirror.com diff --git a/src/admin/api/system/coordinateSystem.js b/src/admin/api/system/coordinateSystem.js new file mode 100644 index 0000000..89d9897 --- /dev/null +++ b/src/admin/api/system/coordinateSystem.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +// 查询坐标系管理列表 +export function list(query) { + return request({ + url: '/pipe/coordinateSystemConfig/list', + method: 'get', + params: query + }) +} + + + +// 新增坐标系管理 +export function add(data) { + return request({ + url: '/pipe/coordinateSystemConfig', + method: 'post', + data: data + }) +} + +// 修改坐标系管理 +export function update(data) { + return request({ + url: '/pipe/coordinateSystemConfig', + method: 'put', + data: data + }) +} + +// 删除坐标系管理 +export function del(id) { + return request({ + url: '/pipe/coordinateSystemConfig/' + id, + method: 'delete' + }) +} diff --git a/src/admin/views/system/layers/coordinateSystem.vue b/src/admin/views/system/layers/coordinateSystem.vue new file mode 100644 index 0000000..df731e0 --- /dev/null +++ b/src/admin/views/system/layers/coordinateSystem.vue @@ -0,0 +1,339 @@ + + + + diff --git a/src/admin/views/system/layers/index.vue b/src/admin/views/system/layers/index.vue index 8dc1f05..53351a7 100644 --- a/src/admin/views/system/layers/index.vue +++ b/src/admin/views/system/layers/index.vue @@ -85,7 +85,7 @@ @@ -187,12 +187,12 @@ - + @@ -242,6 +242,9 @@ import { tifConvert, updateLayers, } from "@/api/system/layers"; +import { + list, +} from "@/api/system/coordinateSystem"; import { listUser } from "@/api/system/user"; const { proxy } = getCurrentInstance(); @@ -311,31 +314,12 @@ const { const userSelect = ref("图层分配用户"); const coordList=ref([ - { label:'WGS84',value:1}, - { label:'CGCS2000',value:2}, + ]) const openUser = ref(false); -const generateData = () => { - const data = []; - return new Promise((resolve, reject) => { - listUser().then((res) => { - console.log(res); - const states = res.rows; - states.forEach((item, index) => { - data.push({ - label: item.nickName, - key: item.userId, - initial: item.nickName, - }); - }); - console.log(data); - resolve(data); - }); - }); -}; const userData = ref([]); const userQuery = ref([]); @@ -502,9 +486,37 @@ function handleUpdate(row) { }); } getList(); -generateData().then((res) => { - userData.value = res; -}); +const generateData = new Promise((resolve, reject) => { + listUser().then((res) => { + console.log(res); + let data = [] + const states = res.rows; + + states.forEach((item, index) => { + data.push({ + label: item.nickName, + key: item.userId, + initial: item.nickName, + }); + }); + console.log(data); + resolve(data); + }); + }); + +const getGEPSData=new Promise((resolve,reject)=>{ + list().then(res=>{ + console.log(res) + resolve(res.rows); + }) + }) + Promise.all([generateData, getGEPSData]).then(res=>{ + + userData.value = res[0]; + coordList.value=res[1] +}) + +