冲突
This commit is contained in:
parent
17288ef785
commit
66059e2f45
48
package.json
48
package.json
@ -1,5 +1,4 @@
|
|||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
"name": "ruoyi",
|
"name": "ruoyi",
|
||||||
"version": "3.8.4",
|
"version": "3.8.4",
|
||||||
"description": "若依管理系统",
|
"description": "若依管理系统",
|
||||||
@ -45,52 +44,5 @@
|
|||||||
"vite-plugin-svg-icons": "2.0.1",
|
"vite-plugin-svg-icons": "2.0.1",
|
||||||
"vite-plugin-vue-setup-extend": "0.4.0"
|
"vite-plugin-vue-setup-extend": "0.4.0"
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
"name": "ruoyi",
|
|
||||||
"version": "3.8.4",
|
|
||||||
"description": "若依管理系统",
|
|
||||||
"author": "若依",
|
|
||||||
"license": "MIT",
|
|
||||||
"scripts": {
|
|
||||||
"dev": "vite",
|
|
||||||
"build:prod": "vite build",
|
|
||||||
"build:stage": "vite build --mode staging",
|
|
||||||
"preview": "vite preview"
|
|
||||||
},
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@element-plus/icons-vue": "2.0.10",
|
|
||||||
"@fit-screen/vue": "^0.2.0",
|
|
||||||
"@vueuse/core": "9.5.0",
|
|
||||||
"axios": "0.27.2",
|
|
||||||
"echarts": "^5.3.0",
|
|
||||||
"element-plus": "2.2.21",
|
|
||||||
"file-saver": "2.0.5",
|
|
||||||
"fuse.js": "6.6.2",
|
|
||||||
"highcharts": "^10.3.3",
|
|
||||||
"js-cookie": "3.0.1",
|
|
||||||
"jsencrypt": "3.3.1",
|
|
||||||
"lib-flexible": "^0.3.2",
|
|
||||||
"nprogress": "0.2.0",
|
|
||||||
"pinia": "2.0.22",
|
|
||||||
"postcss-px2rem": "^0.3.0",
|
|
||||||
"v-scale-screen": "^2.2.0",
|
|
||||||
"vue": "3.2.45",
|
|
||||||
"vue-cropper": "1.0.3",
|
|
||||||
"vue-router": "4.1.4"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@vitejs/plugin-vue": "3.1.0",
|
|
||||||
"@vue/compiler-sfc": "3.2.45",
|
|
||||||
"sass": "1.56.1",
|
|
||||||
"unplugin-auto-import": "0.11.4",
|
|
||||||
"vite": "3.2.3",
|
|
||||||
"vite-plugin-compression": "0.5.1",
|
|
||||||
"vite-plugin-svg-icons": "2.0.1",
|
|
||||||
"vite-plugin-vue-setup-extend": "0.4.0"
|
|
||||||
>>>>>>> 49bcfb120ce1d3cf4355582b8c7fe18c523a4a0c
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -323,51 +323,9 @@ function initMap() {
|
|||||||
destination: Cesium.Rectangle.fromDegrees(119.5091, 35.5671, 120.3285, 36.1455),
|
destination: Cesium.Rectangle.fromDegrees(119.5091, 35.5671, 120.3285, 36.1455),
|
||||||
duration: 2,
|
duration: 2,
|
||||||
});
|
});
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
// 图层点击事件
|
// 图层点击事件
|
||||||
layerClick()
|
layerClick()
|
||||||
=======
|
|
||||||
var handler = new Cesium.ScreenSpaceEventHandler(viewer.canvas);
|
|
||||||
handler.setInputAction(function (movement) {
|
|
||||||
var ray = viewer.camera.getPickRay(movement.position);
|
|
||||||
var cartesian = viewer.scene.globe.pick(ray, viewer.scene);
|
|
||||||
if (cartesian) {
|
|
||||||
let cartographic = Cesium.Cartographic.fromCartesian(cartesian);
|
|
||||||
if (cartographic) {
|
|
||||||
let xy = new Cesium.Cartesian2();
|
|
||||||
let alti = viewer.camera.positionCartographic.height;
|
|
||||||
let level = getLevel(alti);
|
|
||||||
const layers = viewer.imageryLayers._layers;
|
|
||||||
let providerPoint =null
|
|
||||||
layers.forEach(item => {
|
|
||||||
if (item._imageryProvider._layers == "shuzisannong:huangdaoqu_town") {
|
|
||||||
providerPoint=item
|
|
||||||
}
|
|
||||||
});
|
|
||||||
// 拿取最后一个图层
|
|
||||||
let provider = providerPoint._imageryProvider;
|
|
||||||
console.log(providerPoint);
|
|
||||||
if (provider && provider.ready && provider._layers && providerPoint.show === true) {
|
|
||||||
xy = provider.tilingScheme.positionToTileXY(cartographic, level, xy);
|
|
||||||
let promise = provider.pickFeatures(
|
|
||||||
xy.x,
|
|
||||||
xy.y,
|
|
||||||
level,
|
|
||||||
cartographic.longitude,
|
|
||||||
cartographic.latitude
|
|
||||||
);
|
|
||||||
if (promise) {
|
|
||||||
promise.then(data => {
|
|
||||||
if (data.length > 0) {
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
|
|
||||||
>>>>>>> 49bcfb120ce1d3cf4355582b8c7fe18c523a4a0c
|
|
||||||
|
|
||||||
//加载黄岛区村级地图服务
|
//加载黄岛区村级地图服务
|
||||||
// Cesium.GeoJsonDataSource.load(
|
// Cesium.GeoJsonDataSource.load(
|
||||||
@ -546,7 +504,6 @@ function getLevel(height) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
let XZDM = ''
|
let XZDM = ''
|
||||||
// 图层点击事件
|
// 图层点击事件
|
||||||
function layerClick() {
|
function layerClick() {
|
||||||
@ -666,8 +623,6 @@ function deleteEntityByName(name) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 49bcfb120ce1d3cf4355582b8c7fe18c523a4a0c
|
|
||||||
/*------------------接口--------------------*/
|
/*------------------接口--------------------*/
|
||||||
const getArea = () => {
|
const getArea = () => {
|
||||||
getarea({ time: '2023-04-19', subregion: '0', parent: '黄岛区' }).then(res => {
|
getarea({ time: '2023-04-19', subregion: '0', parent: '黄岛区' }).then(res => {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user