Compare commits

..

2 Commits

Author SHA1 Message Date
Cc 490ff6d1ac 新增store管理 2024-12-13 13:51:04 +08:00
Cc 10e9ecc4a7 坐标系 2024-10-29 11:16:18 +08:00
15 changed files with 986 additions and 372 deletions

View File

@ -4,7 +4,7 @@
```bash ```bash
# 进入项目目录 # 进入项目目录
cd ruoyi-ui-vue3 cd ruoyi-ui-vue3
# 安装依赖 # 安装依赖
npm install --registry=https://registry.npmmirror.com npm install --registry=https://registry.npmmirror.com

View File

@ -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'
})
}

View File

@ -35,19 +35,19 @@ const usePermissionStore = defineStore(
}, },
generateRoutes(roles) { generateRoutes(roles) {
return new Promise(resolve => { return new Promise(resolve => {
let menu = JSON.parse(Cookies.get('menu')||'{}') let menu = JSON.parse(Cookies.get('menu')||sessionStorage.getItem("menu")||'{}')
if(!menu.menuId){ if(!menu?.menuId){
return return
} }
Cookies.remove("menu")
sessionStorage.setItem('menu',JSON.stringify(menu));
// 向后端请求路由数据 // 向后端请求路由数据
getRouters({menuId:menu.menuId}).then(res => { getRouters({menuId:menu.menuId}).then(res => {
res.data.forEach(data=>{ res.data.forEach(data=>{
if(!isHttp(data.path) ){ if(!isHttp(data.path) ){
data.path = '/'+data.path data.path = '/'+data.path
data.component = "Layout" data.component = "Layout"
} }
}) })
const sdata = JSON.parse(JSON.stringify(res.data)) const sdata = JSON.parse(JSON.stringify(res.data))
const rdata = JSON.parse(JSON.stringify(res.data)) const rdata = JSON.parse(JSON.stringify(res.data))

View File

@ -0,0 +1,339 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="坐标系名称" prop="layerName">
<el-input
v-model="queryParams.name"
placeholder="请输入坐标系名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="EPSG代号" prop="layerName">
<el-input
v-model="queryParams.epsg"
placeholder="请输入EPSG代号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['system:layers:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:layers:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:layers:remove']"
>删除</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="layersList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="坐标系名称"
align="center"
prop="name"
width="350"
/>
<el-table-column label="JPG文件是否生成" align="center" prop="jpgUrl">
<template #default="scope">
<span>
EPSG:{{scope.row.epsg}}
</span>
</template>
</el-table-column>
<el-table-column label="经度最小" align="center" prop="minLng" />
<el-table-column label="经度最大" align="center" prop="maxLng" />
<el-table-column label="中央经线" align="center" prop="centerLng" />
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template #default="scope">
<el-button
link
type="primary"
icon="Edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
link
type="danger"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:layers:remove']"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改部门对话框 -->
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form ref="epsgRef" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">
<el-form-item label="坐标系名称" prop="name">
<el-input v-model="form.name" placeholder="请输入" />
</el-form-item>
<el-form-item label="EPSG代号" prop="epsg">
<el-input v-model="form.epsg" placeholder="请输入" />
</el-form-item>
<el-form-item label="经度最小">
<el-input v-model="form.minLng" placeholder="请输入" />
</el-form-item>
<el-form-item label="经度最大">
<el-input v-model="form.maxLng" placeholder="请输入" />
</el-form-item>
<el-form-item label="中央经线">
<el-input v-model="form.centerLng" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="Layers">
import { list, del, add, update } from "@/api/system/coordinateSystem";
import { listUser } from "@/api/system/user";
const { proxy } = getCurrentInstance();
const data = reactive({
// loading
buttonLoading: false,
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
layersList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
name: undefined,
epsg: undefined,
isAsc: "asc",
},
//
form: {},
//
rules: {
name: [{ required: true, message: "坐标系名称不能为空", trigger: "blur" }],
epsg: [{ required: true, message: "EPSG代号不能为空", trigger: "blur" }],
},
});
const {
open,
showSearch,
queryParams,
form,
ids,
rules,
title,
layersList,
total,
multiple,
single,
loading,
buttonLoading,
} = toRefs(data);
//
function reset() {
form.value = {
epsg: undefined,
name: undefined,
minLng: undefined,
maxLng: undefined,
centerLng: undefined,
};
proxy.resetForm("epsgRef");
}
/** 新增按钮操作 */
function handleAdd() {
reset();
open.value = true;
title.value = "添加坐标系";
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["epsgRef"].validate((valid) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id != null) {
update(form.value)
.then((response) => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
})
.finally(() => {
buttonLoading.value = false;
});
} else {
add(form.value)
.then((response) => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
})
.finally(() => {
buttonLoading.value = false;
});
}
}
});
}
//
function cancel() {
open.value = false;
reset();
}
//
function handleSelectionChange(selection) {
ids.value = selection.map((item) => item.id);
single.value = selection.length !== 1;
multiple.value = !selection.length;
}
/** 查询坐标系管理列表 */
function getList() {
// loading.value = false;
loading.value = true;
list(queryParams.value).then((response) => {
layersList.value = response.rows;
total.value = response.total;
loading.value = false;
});
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryForm");
handleQuery();
}
/** 删除按钮操作 */
function handleDelete(row) {
const idsData = row.id || ids.value;
proxy.$modal
.confirm('是否确认删除坐标系管理编号为"' + idsData + '"的数据项?')
.then(() => {
loading.value = true;
return del(idsData);
})
.then(() => {
loading.value = false;
getList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => {})
.finally(() => {
loading.value = false;
});
}
function handleUpdate(row) {
reset();
form.value = JSON.parse(JSON.stringify(row));
title.value = row.name;
open.value = true;
}
getList();
</script>
<style lang="scss" scoped>
.dialog-footer {
display: flex;
justify-content: end;
}
</style>

View File

@ -85,7 +85,7 @@
<el-table-column label="图层坐标体系" align="center" prop="jpgUrl"> <el-table-column label="图层坐标体系" align="center" prop="jpgUrl">
<template #default="scope"> <template #default="scope">
<span> <span>
{{(coordList.filter(item=>item.value==scope.row.coordinateSystem))[0].label}} {{scope.row.coordinateSystem.name}}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
@ -187,12 +187,12 @@
<el-form-item label="坐标体系" prop="ascUrl"> <el-form-item label="坐标体系" prop="ascUrl">
<el-select <el-select
style="width: 100%" style="width: 100%"
v-model="form.coordinateSystem" v-model="form.coordinateSystemId"
placeholder="请选择" placeholder="请选择"
size="large" size="large"
> >
<el-option :label="item.label" :value="item.value" v-for="item in coordList" /> <el-option :label="item.name" :value="item.id" v-for="item in coordList" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -242,6 +242,9 @@ import {
tifConvert, tifConvert,
updateLayers, updateLayers,
} from "@/api/system/layers"; } from "@/api/system/layers";
import {
list,
} from "@/api/system/coordinateSystem";
import { listUser } from "@/api/system/user"; import { listUser } from "@/api/system/user";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
@ -311,31 +314,12 @@ const {
const userSelect = ref("图层分配用户"); const userSelect = ref("图层分配用户");
const coordList=ref([ const coordList=ref([
{ label:'WGS84',value:1},
{ label:'CGCS2000',value:2},
]) ])
const openUser = ref(false); 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 userData = ref([]);
const userQuery = ref([]); const userQuery = ref([]);
@ -502,9 +486,37 @@ function handleUpdate(row) {
}); });
} }
getList(); getList();
generateData().then((res) => { const generateData = new Promise((resolve, reject) => {
userData.value = res; 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]
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.dialog-footer { .dialog-footer {

View File

@ -23,7 +23,7 @@ const userStore = useUserStore()
import {getDesktopRouters} from '@index/api/menu' import {getDesktopRouters} from '@index/api/menu'
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
const openMenu =(item)=>{ const openMenu =(item)=>{
debugger
if(item.path){ if(item.path){
if(isHttp(item.path)){ if(isHttp(item.path)){

View File

@ -26,6 +26,7 @@
</el-form-item> </el-form-item>
<el-form-item label="楼层:" prop="houseFloors"> <el-form-item label="楼层:" prop="houseFloors">
<el-input v-model="form.houseFloors" type="number" placeholder="请输入" class="inputCss" /> <el-input v-model="form.houseFloors" type="number" placeholder="请输入" class="inputCss" />
<!-- <label for="" style="color: #fff;">({{maxHouseFloors}}~{{minHouseFloors}})</label> -->
</el-form-item> </el-form-item>
<el-form-item label="面积:" prop="area"> <el-form-item label="面积:" prop="area">
@ -65,7 +66,8 @@
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {recognitionAdd} from "@map/api/exit.js" import {recognitionAdd,getElevation} from "@map/api/exit.js"
import ldMap from "@map/utils/map/init";
const loading = ref(false) const loading = ref(false)
const props = defineProps({ const props = defineProps({
layerId:String, layerId:String,
@ -117,6 +119,16 @@ const rules=ref( {
{label:'建', value:'建'}, {label:'建', value:'建'},
{label:'未调绘', value:'未调绘'}, {label:'未调绘', value:'未调绘'},
]) ])
const maxHouseFloors = ref('')
const minHouseFloors = ref('')
function getMaxAndMin(numbers) {
const max = Math.max(...numbers);
const min = Math.min(...numbers);
return [max, min];
}
function add(){ function add(){
proxy.$refs["dataRef"].validate(valid => { proxy.$refs["dataRef"].validate(valid => {
if (valid) { if (valid) {

View File

@ -365,14 +365,15 @@ onMounted(() => {
treeHeight.value = window.innerHeight - 258; treeHeight.value = window.innerHeight - 258;
}; };
tableDate.value = house.value; tableDate.value = house.value;
$ldMap.initMap().then((e) => { getLayerList().then(() => {
getLayerList().then(() => { let firstData =layerslist.value[0]
if (layerslist.value) { selectLayer(firstData.id);
selectLayer(layerslist.value[0].id); getlegend();
}
}); });
getlegend();
});
emitter.on("loadLayer", () => { emitter.on("loadLayer", () => {
getLayerList(); getLayerList();
}); });
@ -483,10 +484,16 @@ function selectLayer(e) {
console.log(item); console.log(item);
layerId.value = item.id; layerId.value = item.id;
layerName.value = item.layerName layerName.value = item.layerName
$ldMap.addLayer({ $ldMap.initMap(item.coordinateSystem.epsg).then((e) => {
$ldMap.addLayer({
url: item.layerUrl, url: item.layerUrl,
id: e, id: e,
}); });
});
} }
}); });
} }

View File

@ -421,9 +421,7 @@ function addPointMap(val) {
$ldMap.addDefaultByPoint(data); $ldMap.addDefaultByPoint(data);
}); });
} }
function getAllMapData() {
$ldMap.getAllData();
}
function cutPolygon() { function cutPolygon() {
let { flag, data } = cut(); let { flag, data } = cut();
if (flag) { if (flag) {
@ -571,11 +569,12 @@ function setPolygonData() {
$ldMap.addDeviceData(mapdata.station, "Station"); $ldMap.addDeviceData(mapdata.station, "Station");
}); });
} }
function exportCad(){ function exportCad(){
// exporGis() // exporGis()
if(profilesId.value){ if(profilesId.value){
proxy.download("/pipe/recognition/exportCad?profilesId="+profilesId.value, {}, proxy.download("/pipe/recognition/exportCad?profilesId="+profilesId.value, {},
`${layerName.value}.dxf`,{ `${layerName.value}.dwg`,{
baseURL: "/map-api" baseURL: "/map-api"
},true); },true);

View File

@ -30,6 +30,7 @@
v-model="findValue" v-model="findValue"
style="background: rgb(0, 0, 0, 0.4)" style="background: rgb(0, 0, 0, 0.4)"
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="closeWaitDialog"
width="30%" width="30%"
> >
<template #header="{ close, titleId, titleClass }"> <template #header="{ close, titleId, titleClass }">
@ -135,10 +136,7 @@
> >
<el-button <el-button
type="warning" type="warning"
@click=" @click="closeBtn"
findValue = false;
loading = false;
"
>取消</el-button >取消</el-button
> >
</div> </div>
@ -148,6 +146,7 @@
v-model="lineValue" v-model="lineValue"
title="" title=""
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="closeWaitDialog"
width="30%" width="30%"
> >
<template #header="{ close, titleId, titleClass }"> <template #header="{ close, titleId, titleClass }">
@ -253,10 +252,7 @@
> >
<el-button <el-button
type="warning" type="warning"
@click=" @click="closeBtn"
lineValue = false;
loading = false;
"
>取消</el-button >取消</el-button
> >
</div> </div>
@ -407,6 +403,7 @@ import html2canvas from "html2canvas";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
const $ldMap = inject("$ldMap"); // const $ldMap = inject("$ldMap"); //
const $ldBox = inject("$ldBox"); // const $ldBox = inject("$ldBox"); //
import { ElMessageBox } from 'element-plus'
const componentId = ref(sjLeft); const componentId = ref(sjLeft);
const comid = ref("sj"); const comid = ref("sj");
const changemenu = (e) => { const changemenu = (e) => {
@ -439,10 +436,13 @@ const posterimg = ref();
let mapdata = useMapDataStore(); let mapdata = useMapDataStore();
let mapLog = useMapLogStore(); let mapLog = useMapLogStore();
const { sseData, profilesList, secen } = storeToRefs(mapdata); const { sseData, profilesList, secen,clientId } = storeToRefs(mapdata);
const setFlag = ref(false); const setFlag = ref(false);
const priceRef = ref(); const priceRef = ref();
watch(clientId,(val)=>{
loading.value=Boolean(val)
})
watch(setFlag, (val) => { watch(setFlag, (val) => {
!val && priceRef.value.init(); !val && priceRef.value.init();
}); });
@ -523,9 +523,6 @@ const verificationChange = () => {
const findValue = ref<Boolean>(false); const findValue = ref<Boolean>(false);
const lineValue = ref<Boolean>(false); const lineValue = ref<Boolean>(false);
const loading = ref(false); const loading = ref(false);
watch([lineValue, findValue], (val) => {
!val[0] && !val[1] && (loading.value = false);
});
const setFindVal = (e) => { const setFindVal = (e) => {
mapdata.getProfilesList().then((res) => { mapdata.getProfilesList().then((res) => {
findValue.value = e; findValue.value = e;
@ -541,7 +538,7 @@ const setLineVal = (e) => {
const current = ref(""); const current = ref("");
const handleCurrentChange = (e) => { const handleCurrentChange = (e) => {
current.value = e.id; e&&(current.value = e.id)
}; };
const profilesDelete = (e) => { const profilesDelete = (e) => {
mapdata mapdata
@ -552,10 +549,38 @@ const profilesDelete = (e) => {
}) })
.catch((e) => {}); .catch((e) => {});
}; };
function closeBtn(){
closeWaitDialog(()=>{
lineValue.value=false;
findValue.value = false;
loading.value = false;
})
}
function closeWaitDialog(fun){
console.log(clientId.value)
if(clientId.value){
ElMessageBox.confirm("数据加载中,是否确定关闭", {
confirmButtonText: "关闭",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
mapdata.closeSse();
fun();
})
.catch(() => {
});
}else{
fun();
}
}
const priceFlag = ref(false); const priceFlag = ref(false);
function findArea(override) { function findArea(override) {
loading.value = true; // loading.value = true;
$ldMap.removeAllLayer(); $ldMap.removeAllLayer();
if (override) { if (override) {
mapdata mapdata
@ -563,8 +588,9 @@ function findArea(override) {
.then(() => { .then(() => {
setValue(); setValue();
}) })
.catch(() => { .catch((e) => {
loading.value = false;
}); });
} else { } else {
if (current.value) { if (current.value) {
@ -587,6 +613,7 @@ function findArea(override) {
actionType: "data", //add,exit,del, actionType: "data", //add,exit,del,
isrevoke: false, //, isrevoke: false, //,
}); });
$ldMap.removeAllLayer();
$ldMap.addDefaultData(mapdata.road, "Road"); $ldMap.addDefaultData(mapdata.road, "Road");
$ldMap.addDefaultData(mapdata.house, "House"); $ldMap.addDefaultData(mapdata.house, "House");
$ldMap.addDefaultData(mapdata.river, "River"); $ldMap.addDefaultData(mapdata.river, "River");
@ -595,7 +622,7 @@ function findArea(override) {
} }
} }
function findLine(override) { function findLine(override) {
loading.value = true; // loading.value = true;
if(override){ if(override){
mapdata mapdata
.setLineData(override) .setLineData(override)
@ -603,7 +630,7 @@ function findLine(override) {
setLine() setLine()
}) })
.catch(() => { .catch(() => {
loading.value = false; // loading.value = false;
}); });
}else{ }else{

View File

@ -24,6 +24,7 @@ const useMapDataStore = defineStore(
'mapData', 'mapData',
{ {
state: () => ({ state: () => ({
source:null,
profilesList: [], profilesList: [],
profilesId: '', profilesId: '',
layerId: '', layerId: '',
@ -117,7 +118,7 @@ const useMapDataStore = defineStore(
resolve() resolve()
}).catch(err => { }).catch(err => {
reject() reject(err)
}) })
} else { } else {
recognitionload({ layersId: this.layerId, override }).then(res => { recognitionload({ layersId: this.layerId, override }).then(res => {
@ -252,16 +253,27 @@ const useMapDataStore = defineStore(
}); });
this.house = houseData; this.house = houseData;
}, },
closeSse(){
let self = this;
sseClose(self.clientId).then(res=>{
self.clientId = ''
})
},
sseConfig(type) { sseConfig(type) {
let self = this; let self = this;
self.sseData = [] self.sseData = []
self.clientId = '' if(self.clientId){
this.closeSse()
}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let base = '/map-api'; let base = '/map-api';
let url = `${base}/sse/connect/`; let url = `${base}/sse/connect/`;
var es = new EventSourcePolyfill(url, { self.source = new EventSourcePolyfill(url, {
heartbeatTimeout: 10000000, heartbeatTimeout: 10000000,
headers: { headers: {
Authorization: 'Bearer ' + getToken() Authorization: 'Bearer ' + getToken()
@ -269,12 +281,12 @@ const useMapDataStore = defineStore(
}); });
es.onopen = function (event) { self.source.onopen = function (event) {
console.log("连接成功", event); console.log("连接成功", event);
}; };
es.onmessage = function (event) { self.source.onmessage = function (event) {
// to to something… // to to something…
console.log("接收信息", event); console.log("接收信息", event);
// console.log(event.data) // console.log(event.data)
@ -284,14 +296,19 @@ const useMapDataStore = defineStore(
case 'clientId': setRecogn(data.data); break; case 'clientId': setRecogn(data.data); break;
case 'text': self.sseData.push(data); break; case 'text': self.sseData.push(data); break;
case 'data': setdata(data.data); break; case 'data': setdata(data.data); break;
case 'error': errordata(data.data); break;
} }
}; };
function setRecogn(clientId) { function setRecogn(clientId) {
if (!self.clientId) { if (!self.clientId) {
self.clientId = clientId self.clientId = clientId
if (type == 'recognition') { if (type == 'recognition') {
recognitionreload({ layersId: self.layerId, clientId }) recognitionreload({ layersId: self.layerId, clientId }).then(res=>{
}).catch(err => {
self.closeSse()
})
} else { } else {
pipelinereload({ layersId: self.layerId, clientId }) pipelinereload({ layersId: self.layerId, clientId })
@ -304,9 +321,7 @@ const useMapDataStore = defineStore(
let text = (type == 'recognition' ? '特征物识别' : '布线') + '结束,关闭并刷新?点击确定刷新,点击取消停留当前页面' let text = (type == 'recognition' ? '特征物识别' : '布线') + '结束,关闭并刷新?点击确定刷新,点击取消停留当前页面'
ElMessageBox.confirm(text, '识别提示', ElMessageBox.confirm(text, '识别提示',
{ confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
self.closeSse()
self.clientId = ''
es.close()
resolve(data) resolve(data)
}).catch(() => { }).catch(() => {
@ -314,12 +329,18 @@ const useMapDataStore = defineStore(
reject() reject()
}); });
} }
function errordata(text){
ElMessageBox.confirm(text, '错误提示',
{ confirmButtonText: '关闭',showCancelButton:false, type: 'warning' }).then(() => {
self.clientId=''
});
es.onerror = function (error) { }
self.source = function (error) {
// 监听错误 // 监听错误
console.log("错误", error); console.log("错误", error);
self.clientId = '' self.clientId = ''
es.close()
// reject() // reject()
}; };
}); });

View File

@ -1,128 +1,268 @@
const tk="0eab750b26cdeee155e8c4f2310b53ef" const tk="0eab750b26cdeee155e8c4f2310b53ef"
const TileInfoData={ const TileInfoData={
infoData:{ infoData:function (wkid:number){
dpi: 90.71428571427429, // 切片方案的每英寸点数(即像素)。 let data = {
size: 256, // 设置每个瓷砖的高度和宽度为[256, 256]像素。 '4326':{
origin: { dpi: 90.71428571427429, // 切片方案的每英寸点数(即像素)。
// 切片方案的原点。 size: 256, // 设置每个瓷砖的高度和宽度为[256, 256]像素。
type: "point", origin: {
x: -180, // 切片方案的原点。
y: 90, type: "point",
spatialReference: { wkid: 4326 }, x: -180,
}, y: 90,
spatialReference: { wkid: 4326 }, spatialReference: { wkid: wkid },
lods: [ },
// 定义平铺方案的详细级别数组。 spatialReference: { wkid: wkid },
{ lods: [
level: 2, // 定义平铺方案的详细级别数组。
levelValue: 2, {
resolution: 0.3515625, level: 2,
scale: 147748796.52937502, levelValue: 2,
resolution: 0.3515625,
scale: 147748796.52937502,
},
{
level: 3,
levelValue: 3,
resolution: 0.17578125,
scale: 73874398.264687508,
},
{
level: 4,
levelValue: 4,
resolution: 0.087890625,
scale: 36937199.132343754,
},
{
level: 5,
levelValue: 5,
resolution: 0.0439453125,
scale: 18468599.566171877,
},
{
level: 6,
levelValue: 6,
resolution: 0.02197265625,
scale: 9234299.7830859385,
},
{
level: 7,
levelValue: 7,
resolution: 0.010986328125,
scale: 4617149.8915429693,
},
{
level: 8,
levelValue: 8,
resolution: 0.0054931640625,
scale: 2308574.9457714846,
},
{
level: 9,
levelValue: 9,
resolution: 0.00274658203125,
scale: 1154287.4728857423,
},
{
level: 10,
levelValue: 10,
resolution: 0.001373291015625,
scale: 577143.73644287116,
},
{
level: 11,
levelValue: 11,
resolution: 0.0006866455078125,
scale: 288571.86822143558,
},
{
level: 12,
levelValue: 12,
resolution: 0.00034332275390625,
scale: 144285.93411071779,
},
{
level: 13,
levelValue: 13,
resolution: 0.000171661376953125,
scale: 72142.967055358895,
},
{
level: 14,
levelValue: 14,
resolution: 8.58306884765625e-5,
scale: 36071.483527679447,
},
{
level: 15,
levelValue: 15,
resolution: 4.291534423828125e-5,
scale: 18035.741763839724,
},
{
level: 16,
levelValue: 16,
resolution: 2.1457672119140625e-5,
scale: 9017.8708819198619,
},
{
level: 17,
levelValue: 17,
resolution: 1.0728836059570313e-5,
scale: 4508.9354409599309,
},
{
level: 18,
levelValue: 18,
resolution: 5.3644180297851563e-6,
scale: 2254.4677204799655,
},
{
level: 19,
levelValue: 19,
resolution: 2.68220901489257815e-6,
scale: 1127.23386023998275,
},
],
}, },
{ '4490':{
level: 3, dpi: 96,
levelValue: 3, rows: 256,
resolution: 0.17578125, cols: 256,
scale: 73874398.264687508, compressionQuality: 0,
}, origin: {
{ x: -180,
level: 4, y: 90
levelValue: 4, },
resolution: 0.087890625, spatialReference: {
scale: 36937199.132343754, wkid: 4490
}, },
{ lods: [
level: 5, {
levelValue: 5, level: 1,
resolution: 0.0439453125, levelValue: 1,
scale: 18468599.566171877, resolution: 0.703125,
}, scale: 295497593.05875003
{ },
level: 6, {
levelValue: 6, level: 2,
resolution: 0.02197265625, levelValue: 2,
scale: 9234299.7830859385, resolution: 0.3515625,
}, scale: 147748796.52937502
{ },
level: 7, {
levelValue: 7, level: 3,
resolution: 0.010986328125, levelValue: 3,
scale: 4617149.8915429693, resolution: 0.17578125,
}, scale: 73874398.264687508
{ },
level: 8, {
levelValue: 8, level: 4,
resolution: 0.0054931640625, levelValue: 4,
scale: 2308574.9457714846, resolution: 0.087890625,
}, scale: 36937199.132343754
{ },
level: 9, {
levelValue: 9, level: 5,
resolution: 0.00274658203125, levelValue: 5,
scale: 1154287.4728857423, resolution: 0.0439453125,
}, scale: 18468599.566171877
{ },
level: 10, {
levelValue: 10, level: 6,
resolution: 0.001373291015625, levelValue: 6,
scale: 577143.73644287116, resolution: 0.02197265625,
}, scale: 9234299.7830859385
{ },
level: 11, {
levelValue: 11, level: 7,
resolution: 0.0006866455078125, levelValue: 7,
scale: 288571.86822143558, resolution: 0.010986328125,
}, scale: 4617149.8915429693
{ },
level: 12, {
levelValue: 12, level: 8,
resolution: 0.00034332275390625, levelValue: 8,
scale: 144285.93411071779, resolution: 0.0054931640625,
}, scale: 2308574.9457714846
{ },
level: 13, {
levelValue: 13, level: 9,
resolution: 0.000171661376953125, levelValue: 9,
scale: 72142.967055358895, resolution: 0.00274658203125,
}, scale: 1154287.4728857423
{ },
level: 14, {
levelValue: 14, level: 10,
resolution: 8.58306884765625e-5, levelValue: 10,
scale: 36071.483527679447, resolution: 0.001373291015625,
}, scale: 577143.73644287116
{ },
level: 15, {
levelValue: 15, level: 11,
resolution: 4.291534423828125e-5, levelValue: 11,
scale: 18035.741763839724, resolution: 0.0006866455078125,
}, scale: 288571.86822143558
{ },
level: 16, {
levelValue: 16, level: 12,
resolution: 2.1457672119140625e-5, levelValue: 12,
scale: 9017.8708819198619, resolution: 0.00034332275390625,
}, scale: 144285.93411071779
{ },
level: 17, {
levelValue: 17, level: 13,
resolution: 1.0728836059570313e-5, levelValue: 13,
scale: 4508.9354409599309, resolution: 0.000171661376953125,
}, scale: 72142.967055358895
{ },
level: 18, {
levelValue: 18, level: 14,
resolution: 5.3644180297851563e-6, levelValue: 14,
scale: 2254.4677204799655, resolution: 8.58306884765625e-5,
}, scale: 36071.483527679447
{ },
level: 19, {
levelValue: 19, level: 15,
resolution: 2.68220901489257815e-6, levelValue: 15,
scale: 1127.23386023998275, resolution: 4.291534423828125e-5,
}, scale: 18035.741763839724
], },
{
level: 16,
levelValue: 16,
resolution: 2.1457672119140625e-5,
scale: 9017.8708819198619
},
{
level: 17,
levelValue: 17,
resolution: 1.0728836059570313e-5,
scale: 4508.9354409599309
},
{
level: 18,
levelValue: 18,
resolution: 5.3644180297851563e-6,
scale: 2254.4677204799655
},
{
level: 19,
levelValue: 19,
resolution: 2.68220901489257815e-6,
scale: 1127.23386023998275
},
{
level: 20,
levelValue: 20,
resolution: 1.341104507446289075e-6,
scale: 563.616930119991375
}
]
}
}
return data[wkid]
}, },
img_c: "http://{subDomain}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILEMATRIX={level}&TILEROW={row}&TILECOL={col}&tk=" +tk, img_c: "http://{subDomain}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILEMATRIX={level}&TILEROW={row}&TILECOL={col}&tk=" +tk,
cia_c: "http://{subDomain}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILEMATRIX={level}&TILEROW={row}&TILECOL={col}&tk=" +tk cia_c: "http://{subDomain}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILEMATRIX={level}&TILEROW={row}&TILECOL={col}&tk=" +tk

View File

@ -4,6 +4,7 @@ import TianData from './Tmap'
import TileInfo from "@arcgis/core/layers/support/TileInfo"; import TileInfo from "@arcgis/core/layers/support/TileInfo";
import WebTileLayer from "@arcgis/core/layers/WebTileLayer"; import WebTileLayer from "@arcgis/core/layers/WebTileLayer";
import TileLayer from "@arcgis/core/layers/TileLayer.js"; import TileLayer from "@arcgis/core/layers/TileLayer.js";
import MapImageLayer from "@arcgis/core/layers/MapImageLayer.js";
import Draw from "@arcgis/core/views/draw/Draw.js"; import Draw from "@arcgis/core/views/draw/Draw.js";
import Polyline from "@arcgis/core/geometry/Polyline.js"; import Polyline from "@arcgis/core/geometry/Polyline.js";
import Polygon from "@arcgis/core/geometry/Polygon.js"; import Polygon from "@arcgis/core/geometry/Polygon.js";
@ -69,65 +70,70 @@ const ldMap = {
hightlayer: '', hightlayer: '',
pngLayer: null, pngLayer: null,
selectPng: '', selectPng: '',
wkid: null,
//初始化地图 //初始化地图
initMap: function () { initMap: function (wkid) {
self = this; self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let tileInfo = new TileInfo(TianData.infoData); if(wkid==self.wkid){
resolve()
let defaultInfo = { }else{
subDomains: ["t1"], let tileInfo = new TileInfo(TianData.infoData(wkid));
spatialReference: { self.wkid = wkid
wkid: 4326, let defaultInfo = {
}, subDomains: ["t1"],
tileInfo: tileInfo, spatialReference: {
} wkid: wkid,
let imageBasemapLayer = new WebTileLayer({ },
...defaultInfo, tileInfo: tileInfo,
urlTemplate: TianData.img_c }
}) let imageBasemapLayer = new WebTileLayer({
let imageNoteLayer = new WebTileLayer({ ...defaultInfo,
...defaultInfo, urlTemplate: TianData.img_c
urlTemplate: TianData.cia_c })
}) let imageNoteLayer = new WebTileLayer({
...defaultInfo,
urlTemplate: TianData.cia_c
})
this.map = new Map({ this.map = new Map({
basemap: { basemap: {
baseLayers: [imageBasemapLayer, imageNoteLayer], baseLayers: [imageBasemapLayer, imageNoteLayer],
}, },
slider: false slider: false
}); });
let lodsView = [ let lodsView = [
{ level: 0, resolution: 156543.033928, scale: 591657527.591555 }, { level: 0, resolution: 156543.033928, scale: 591657527.591555 },
{ level: 1, resolution: 78271.5169639999, scale: 295828763.795777 }, { level: 1, resolution: 78271.5169639999, scale: 295828763.795777 },
{ level: 2, resolution: 39135.7584820001, scale: 147914381.897889 }, { level: 2, resolution: 39135.7584820001, scale: 147914381.897889 },
{ level: 3, resolution: 19567.8792409999, scale: 73957190.948944 }, { level: 3, resolution: 19567.8792409999, scale: 73957190.948944 },
{ level: 4, resolution: 9783.93962049996, scale: 36978595.474472 }, { level: 4, resolution: 9783.93962049996, scale: 36978595.474472 },
{ level: 5, resolution: 4891.96981024998, scale: 18489297.737236 }, { level: 5, resolution: 4891.96981024998, scale: 18489297.737236 },
{ level: 6, resolution: 2445.98490512499, scale: 9244648.868618 }, { level: 6, resolution: 2445.98490512499, scale: 9244648.868618 },
{ level: 7, resolution: 1222.99245256249, scale: 4622324.434309 }, { level: 7, resolution: 1222.99245256249, scale: 4622324.434309 },
{ level: 8, resolution: 611.49622628138, scale: 2311162.217155 }, { level: 8, resolution: 611.49622628138, scale: 2311162.217155 },
{ level: 9, resolution: 305.748113140558, scale: 1155581.108577 }, { level: 9, resolution: 305.748113140558, scale: 1155581.108577 },
{ level: 10, resolution: 152.874056570411, scale: 577790.554289 }, { level: 10, resolution: 152.874056570411, scale: 577790.554289 },
{ level: 11, resolution: 76.4370282850732, scale: 288895.277144 }, { level: 11, resolution: 76.4370282850732, scale: 288895.277144 },
{ level: 12, resolution: 38.2185141425366, scale: 144447.638572 }, { level: 12, resolution: 38.2185141425366, scale: 144447.638572 },
{ level: 13, resolution: 19.1092570712683, scale: 72223.819286 }, { level: 13, resolution: 19.1092570712683, scale: 72223.819286 },
{ level: 14, resolution: 9.55462853563415, scale: 36111.909643 }, { level: 14, resolution: 9.55462853563415, scale: 36111.909643 },
{ level: 15, resolution: 4.77731426794937, scale: 18055.954822 }, { level: 15, resolution: 4.77731426794937, scale: 18055.954822 },
{ level: 16, resolution: 2.38865713397468, scale: 9027.977411 }, { level: 16, resolution: 2.38865713397468, scale: 9027.977411 },
{ level: 17, resolution: 1.19432856685505, scale: 4513.988705 }, { level: 17, resolution: 1.19432856685505, scale: 4513.988705 },
{ level: 18, resolution: 0.597164283559817, scale: 2256.994353 }, { level: 18, resolution: 0.597164283559817, scale: 2256.994353 },
{ level: 19, resolution: 0.298582141647617, scale: 1128.497176 }, { level: 19, resolution: 0.298582141647617, scale: 1128.497176 },
{ level: 20, resolution: 0.14929107082380833, scale: 564.248588 }, { level: 20, resolution: 0.14929107082380833, scale: 564.248588 },
{ level: 21, resolution: 0.07464553541190416, scale: 282.124294 }, { level: 21, resolution: 0.07464553541190416, scale: 282.124294 },
{ level: 22, resolution: 0.03732276770595208, scale: 141.062147 }, { level: 22, resolution: 0.03732276770595208, scale: 141.062147 },
{ level: 23, resolution: 0.01866138385297604, scale: 70.5310735 }, { level: 23, resolution: 0.01866138385297604, scale: 70.5310735 },
] ]
@ -135,123 +141,127 @@ const ldMap = {
this.view = new MapView({ this.view = new MapView({
container: "viewDiv", container: "viewDiv",
map: this.map, map: this.map,
spatialReference: { spatialReference: {
wkid: 4326, wkid: wkid,
}, },
constraints: { constraints: {
lods: lodsView, lods: lodsView,
rotationEnabled: false, rotationEnabled: false,
minZoom: 0, minZoom: 0,
maxZoom: 50 maxZoom: 50
}, },
center: [116.85722842688202, 39.26485279059861], center: [116.85722842688202, 39.26485279059861],
zoom: 15, zoom: 15,
}); });
let measurementWidget = new DistanceMeasurement2D({ let measurementWidget = new DistanceMeasurement2D({
view: this.view view: this.view
}); });
// this.view.ui.add(measurementWidget, "bottom-right"); // this.view.ui.add(measurementWidget, "bottom-right");
self.view.on("drag", function (event) { self.view.on("drag", function (event) {
if (event.button == 2 && self.DrawDregType && self.ldMapActionType == 'regectionAction') { if (event.button == 2 && self.DrawDregType && self.ldMapActionType == 'regectionAction') {
console.log(event) console.log(event)
let point = self.view.toMap({ x: event.x, y: event.y }); let point = self.view.toMap({ x: event.x, y: event.y });
if (event.action == 'start') { if (event.action == 'start') {
// self.DrawLine() // self.DrawLine()
self.DrawstartPoint = [point.x, point.y]; self.DrawstartPoint = [point.x, point.y];
}
if (event.action == 'end') {
self.Bindpolygon()
self.view.graphics.removeAll();
}
if (event.action == 'update') {
// self.destroyDraw()
self.DrawenedPoint = [point.x, point.y];
let data = {
vertices: [self.DrawstartPoint, self.DrawenedPoint]
} }
self.createPolygon(data) if (event.action == 'end') {
} self.Bindpolygon()
self.view.graphics.removeAll();
} }
if (event.action == 'update') {
// self.destroyDraw()
}); self.DrawenedPoint = [point.x, point.y];
mapLog = useMapLogStore() let data = {
self.view.ui.remove("zoom"); //移除 vertices: [self.DrawstartPoint, self.DrawenedPoint]
self.view.ui.remove("attribution"); //移除底部ESRI logo bb
self.view.on("click", (event) => {
console.log(event)
if (self.popup) {
self.popup.remove()
}
if (self.hightlayer) {
self.hightlayer.removeAll()
}
self.view.hitTest(event).then((response) => {
self.lighHight?.remove();
self.selectLine = ''
self.selectPng = ''
if (response.results && response.results[0]) {
var graphic = response.results[0].graphic;
console.log(graphic)
if (self.ldMapActionType == 'lineAction') {
if (graphic.geometry.type == "polyline") {
self.view.whenLayerView(graphic.layer).then((layerView) => {
emitter.emit('line', graphic.attributes.data)
self.selectLine = graphic
self.lighHight = layerView.highlight(graphic)
})
} }
self.createPolygon(data)
} }
if (graphic.attributes?.type == 'qdf') {
self.view.whenLayerView(graphic.layer).then((layerView) => {
self.selectPng = graphic
self.lighHight = layerView.highlight(graphic)
})
}
} }
}); });
}); mapLog = useMapLogStore()
self.view.watch("zoom", function (newValue, oldValue, propertyName, target) { self.view.ui.remove("zoom"); //移除
self.view.ui.remove("attribution"); //移除底部ESRI logo bb
if (Number.isInteger(newValue)) { self.view.on("click", (event) => {
console.info(newValue);
self.showeleByzoom(newValue)
}
});
//文字
self.view.when(e => { console.log(event)
// const print = new Print({ if (self.popup) {
// view: self.view, self.popup.remove()
// // specify your own print service }
// printServiceUrl: if (self.hightlayer) {
// "http://139.224.252.239:6080/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task"
// }); self.hightlayer.removeAll()
}
self.view.hitTest(event).then((response) => {
self.lighHight?.remove();
self.selectLine = ''
self.selectPng = ''
if (response.results && response.results[0]) {
var graphic = response.results[0].graphic;
console.log(graphic)
if (self.ldMapActionType == 'lineAction') {
if (graphic.geometry.type == "polyline") {
self.view.whenLayerView(graphic.layer).then((layerView) => {
emitter.emit('line', graphic.attributes.data)
self.selectLine = graphic
self.lighHight = layerView.highlight(graphic)
})
}
}
if (graphic.attributes?.type == 'qdf') {
self.view.whenLayerView(graphic.layer).then((layerView) => {
self.selectPng = graphic
self.lighHight = layerView.highlight(graphic)
})
}
}
});
});
self.view.watch("zoom", function (newValue, oldValue, propertyName, target) {
if (Number.isInteger(newValue)) {
console.info(newValue);
self.showeleByzoom(newValue)
}
});
//文字
self.view.when(e => {
// const print = new Print({
// view: self.view,
// // specify your own print service
// printServiceUrl:
// "http://139.224.252.239:6080/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task"
// });
// // Add widget to the top right corner of the view
// self.view.ui.add(print, "top-right");
resolve()
})
}
// // Add widget to the top right corner of the view
// self.view.ui.add(print, "top-right");
resolve()
})
}) })
@ -301,10 +311,7 @@ const ldMap = {
self.initSketch() self.initSketch()
}, },
removeAll() { removeAll() {
self.view.map.removeAll(); self.view.map.removeAll();
}, },
addLayer: function (e) { addLayer: function (e) {
@ -312,15 +319,17 @@ const ldMap = {
let data = { let data = {
id: "layerName", id: "layerName",
url: '', url: '',
...e ...e,
spatialReference: {
wkid: self.wkid,
},
} }
var imgLayer = new TileLayer(data); var imgLayer = new TileLayer(data);
this.map.layers.add(imgLayer); this.map.add(imgLayer);
imgLayer.when((e) => { imgLayer.when((e) => {
self.nowlayer = e self.nowlayer = e
self.setCenter(e.fullExtent.center.x, e.fullExtent.center.y) self.setCenter(e.fullExtent.center.x, e.fullExtent.center.y)
}) })
self.view.whenLayerView(imgLayer).then(function (layerView) { self.view.whenLayerView(imgLayer).then(function (layerView) {
@ -915,7 +924,7 @@ const ldMap = {
type == 'left' ? paths[0][0] = nowXy : paths[0][paths[0].length - 1] = nowXy type == 'left' ? paths[0][0] = nowXy : paths[0][paths[0].length - 1] = nowXy
const polyline = new Polyline({ const polyline = new Polyline({
paths: paths, paths: paths,
spatialReference: self.view.spatialReference,
}) })
const length = geometryEngine.geodesicLength(polyline, "meters"); const length = geometryEngine.geodesicLength(polyline, "meters");
console.log(length.toFixed(2)) console.log(length.toFixed(2))
@ -945,7 +954,8 @@ const ldMap = {
self.sketchLayer.pointLayer.removeAll(); self.sketchLayer.pointLayer.removeAll();
self.lineLayer && self.lineLayer.removeAll() self.lineLayer && self.lineLayer.removeAll()
self.loadelevationLayer.removeAll() self.loadelevationLayer.removeAll()
self.hightlayer &&self.hightlayer.removeAll()
self.textLayer&&self.textLayer.removeAll()
}, },
//清除点位 //清除点位
removePoint() { removePoint() {
@ -972,7 +982,7 @@ const ldMap = {
data.forEach(item => { data.forEach(item => {
const polyline = new Polyline({ const polyline = new Polyline({
paths: item.path, paths: item.path,
spatialReference: self.view.spatialReference,
}) })
const lineSymbol = self.returnLineSymbole(item.width, item.color) const lineSymbol = self.returnLineSymbole(item.width, item.color)
@ -1202,7 +1212,7 @@ const ldMap = {
width: 0 width: 0
} }
}, },
spatialReference: self.view.spatialReference
}); });
if (data.pointType == 'y') { if (data.pointType == 'y') {
@ -1232,7 +1242,7 @@ const ldMap = {
width: 10 width: 10
} }
}, },
spatialReference: self.view.spatialReference
}); });
self.pngLayer.add(pointGraphic, 10) self.pngLayer.add(pointGraphic, 10)
}, },
@ -1256,7 +1266,7 @@ const ldMap = {
height: 20, height: 20,
width: 20, width: 20,
}, },
spatialReference: self.view.spatialReference
}); });
self.pngLayer.add(pointGraphic, 10) self.pngLayer.add(pointGraphic, 10)
}) })
@ -1427,7 +1437,7 @@ const ldMap = {
const point = new Point({ const point = new Point({
x: data.path[0], x: data.path[0],
y: data.path[1], y: data.path[1],
spatialReference: self.view.spatialReference
}) })
const newPointGraphic = new Graphic({ const newPointGraphic = new Graphic({
@ -1532,7 +1542,7 @@ const ldMap = {
} }
const polygon = new Polygon({ const polygon = new Polygon({
rings: path, rings: path,
spatialReference: self.view.spatialReference //
}) })
@ -1557,9 +1567,14 @@ const ldMap = {
} }
if (res.type == "House") { if (res.type == "House") {
const areas = geodesicUtils.geodesicAreas([polygon], "square-meters"); try{
const area = Math.abs(areas[0]).toFixed(2) const areas = geodesicUtils.geodesicAreas([polygon], "square-meters");
res.area = res.area || area const area = Math.abs(areas[0]).toFixed(2)
res.area = res.area || area
}catch{
}
} }
const newPolygonGraphic = new Graphic({ const newPolygonGraphic = new Graphic({
geometry: polygon, geometry: polygon,
@ -1619,7 +1634,6 @@ const ldMap = {
color: [255, 255, 255, 255], color: [255, 255, 255, 255],
font: { // autocasts as new Font() font: { // autocasts as new Font()
size: 12, size: 12,
weight: "bold" weight: "bold"
} }
} }
@ -2076,7 +2090,7 @@ const ldMap = {
let polyline = { let polyline = {
type: "polyline", // autocasts as new Polyline() type: "polyline", // autocasts as new Polyline()
paths: vertices, paths: vertices,
spatialReference: self.view.spatialReference
} }
const lineSymbol = self.returnLineSymbole(3, [0, 255, 255, 255]) const lineSymbol = self.returnLineSymbole(3, [0, 255, 255, 255])
let graphic = new Graphic({ let graphic = new Graphic({
@ -2164,7 +2178,7 @@ const ldMap = {
hasZ: false, hasZ: false,
hasM: false, hasM: false,
rings: [rings], rings: [rings],
spatialReference: self.view.spatialReference
}) })
let graphic = new Graphic({ let graphic = new Graphic({
geometry: polygon, geometry: polygon,
@ -2604,7 +2618,7 @@ const ldMap = {
const polygon = new Polygon({ const polygon = new Polygon({
rings: data.path, rings: data.path,
spatialReference: self.view.spatialReference
}) })
let graphic = new Graphic({ let graphic = new Graphic({

File diff suppressed because one or more lines are too long

View File

@ -63,6 +63,11 @@ export default defineConfig(({ mode, command }) => {
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/afterSales-api/, '') rewrite: (p) => p.replace(/^\/afterSales-api/, '')
}, },
'/arcgis': {
target: 'http://139.224.252.239:6080',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/arcgis-map/, '')
},
} }
}, },
//fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file