From 853873ddb35e8eeb42b1b1b9fdb247ba5b1f19d1 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期三, 22 二月 2023 14:35:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW
---
src/components/Screen/bottom.vue | 50 ++--------------
src/views/datamanage/metadataManage.vue | 8 +-
src/assets/lang/zh.js | 4
src/views/AuthorizationManagement/menuRoleAuthorization.vue | 29 ++++-----
src/views/Tools/LayerTree.vue | 15 ++++
src/views/maintenance/tokentool.vue | 2
package.json | 6 -
src/components/MyBread.vue | 2
src/views/AuthorizationManagement/roleResAuthorization.vue | 1
src/views/Synthesis/LeftMenu.vue | 4 -
public/globle/globle.js | 7 ++
src/components/mapsdk.vue | 2
12 files changed, 52 insertions(+), 78 deletions(-)
diff --git a/package.json b/package.json
index f123eab..12b8a37 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,11 @@
"install": "^0.13.0",
"jquery": "^3.6.0",
"moment": "^2.29.4",
- "node-sass": "^7.0.3",
+ "node-sass": "^4.14.1",
"npm": "^8.15.1",
"object-assign": "^4.1.1",
"ol": "^6.15.1",
- "sql.js": "^1.5.0",
- "sqlite3": "^5.0.2",
+ "sass-loader": "^8.0.0",
"terraformer-wkt-parser": "^1.2.1",
"theme-vue": "0.0.8",
"vant": "^2.12.25",
@@ -57,7 +56,6 @@
"lint-staged": "^9.5.0",
"postcss-pxtorem": "^5.1.1",
"prettier": "^2.2.1",
- "sass-loader": "^10.3.1",
"vue-particles": "^1.0.9",
"vue-template-compiler": "^2.6.11"
},
diff --git a/public/globle/globle.js b/public/globle/globle.js
index 5023da2..5c1e8a3 100644
--- a/public/globle/globle.js
+++ b/public/globle/globle.js
@@ -18,3 +18,10 @@
window.TSExcavation = null;
}
}
+
+window.XZOutlie="dlg_100w_boua"; //1:100涓囪鏀块潰layer鍚嶇О
+window.ImageLayer3=null;//1:100涓囪鏀块潰鍥惧眰
+
+
+
+
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 9f4b326..b9cd095 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -98,7 +98,7 @@
storageDirectory: '瀛樺偍鐩綍',
dataVersion: '鏁版嵁鐗堟湰',
selectData: '閫夋嫨鏁版嵁',
- selectMetadata: '閫夋嫨鍏冩暟鎹�',
+ selectMetadata: '閫夋嫨婧愭暟鎹�',
entryName: '椤圭洰鍚嶇О',
selectWBSData: '閫夋嫨WBS鏁版嵁',
coordinateSystem: '鍧愭爣绯�',
@@ -530,7 +530,7 @@
downlog: {
type1: 'Shp鏂囦欢',
type2: '涓撻鍥�',
- type3: '鍏冩暟鎹�',
+ type3: '婧愭暟鎹�',
type4: '涓氬姟鏁版嵁',
type5: '绠￠亾鍒嗘瀽',
type6: '缁熻鎶ュ憡',
diff --git a/src/components/MyBread.vue b/src/components/MyBread.vue
index 9f71cac..4297e9d 100644
--- a/src/components/MyBread.vue
+++ b/src/components/MyBread.vue
@@ -27,7 +27,7 @@
position: relative;
top: 10px;
// margin-top: 24px;
- width: 500px;
+ // width: 500px;
margin-left: 10px;
}
</style>
diff --git a/src/components/Screen/bottom.vue b/src/components/Screen/bottom.vue
index 7de4602..0c8c667 100644
--- a/src/components/Screen/bottom.vue
+++ b/src/components/Screen/bottom.vue
@@ -171,6 +171,7 @@
},
created() {
this.getCountProjectDisplay()
+ this.getCountProjectTour()
},
methods: {
ChangeBaseLayer() {
@@ -210,56 +211,17 @@
const position = line.coordinates[0]
const result = []
position.forEach(pos => {
- pos.push(50)
+ // 娣诲姞婕父楂樺害锛屽悗缁慨鏀筍DK婧愮爜鍙互閫傞厤涓哄湴闈㈤珮绋�
+ pos.push(1000)
result.push(...pos)
})
- //
console.log("line", position)
- // 瑗挎皵涓滆緭浜岀嚎瑗挎骞茬嚎
- // console.log("PipeLine", PipeLine)
- const features = PipeLine.features
- // features.forEach(item => {
- // const name = item.properties.pipename
- // const rawArr = item.geometry.coordinates
- // })
- // const pipeline = features.find(
- // item => item.properties.pipename == "瑗挎皵涓滆緭涓�绾�"
- // )
- // const name = pipeline.properties.pipename
- // const rawArr = pipeline.geometry.coordinates[0]
- // const result = []
- // rawArr.forEach(pos => {
- // pos.push(50)
- // result.push(...pos)
- // })
- // console.log("result", result);
- // sgworld.Command.execute(2, 3, "", data => {
- // data.showPoint = false
- // data.showLine = true
- // data.mode = 1
- // // 寮圭獥鏁版嵁
- // window.PathAnimationData = {
- // flyData: data,
- // }
- // window.PathAnimationData.winIndex = layer.open({
- // type: 2,
- // title: "璺緞鍔ㄧ敾",
- // shade: false,
- // area: ["352px", "690px"],
- // offset: "r",
- // skin: "other-class",
- // content: SmartEarthRootUrl + "Workers/path/Path.html",
- // end: function () {
- // PathAnimationData.fly && PathAnimationData.fly.exit()
- // },
- // })
- // })
window.sgworld.Creator.getFlyData(result, data => {
data.showPoint = false
data.showLine = true
data.mode = 1
- data.height = 2000
+ data.height = 5000
// 寮圭獥鏁版嵁
window.PathAnimationData = {
@@ -267,12 +229,12 @@
}
window.PathAnimationData.winIndex = layer.open({
type: 2,
- title: "璺緞鍔ㄧ敾",
+ title: "宸ョ▼宸¤",
shade: false,
area: ["352px", "690px"],
offset: "r",
skin: "other-class",
- content: SmartEarthRootUrl + "Workers/path/Path.html",
+ content: SmartEarthRootUrl + "Workers/path/ProjectPath.html",
end: function () {
PathAnimationData.fly && PathAnimationData.fly.exit()
},
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index f556173..66270d1 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -415,6 +415,8 @@
})
)
+ window.ImageLayer3=this.layer3;
+
// for (var i in gaoDeBaseUrl) {
// sgworld.Creator.createUrlTemplateImageryProvider(
// gaoDeBaseUrl[i].label,
diff --git a/src/views/AuthorizationManagement/menuRoleAuthorization.vue b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
index 3c7ffeb..c69f78d 100644
--- a/src/views/AuthorizationManagement/menuRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
@@ -8,16 +8,16 @@
]"
></My-bread>
<el-divider /> -->
- <div class="menuSettings_tree subpage_Div menuRoleAuthorization_left">
+ <div class="menuSettings_tree subpage_Div menuRoleAuthorization_left" style="padding-top:10px;width: 23%;overflow-y: auto;">
<My-bread
:list="[
`${$t('operatManage.operatManage')}`,
- `${$t('operatManage.UserRoleAuthorization')}`,
+ `${$t('operatManage.MenuRoleAuthorization')}`,
]"
></My-bread>
<el-divider />
- <div class="menuTreeBox">
+ <div>
<div class="card_tree">
<el-tree
:data="depList"
@@ -35,7 +35,7 @@
</div>
</div>
<!-- <div class="menuRoleAuthorization_resize" title="鏀剁缉渚ц竟鏍�">鈰�</div> -->
- <div class="menuTreeBox menuRoleAuthorization_mid">
+
<!-- <div class="left_tree subpage_Div">
<el-tree
:data="depList"
@@ -57,8 +57,6 @@
color: #409eff;
line-height: 1;
cursor: text;
- position: relative;
- top: 5px;
margin-left: 10px;
display: flex;
align-items: center;
@@ -129,7 +127,6 @@
</el-pagination>
</div>
</div>
- </div>
<!-- <div class="menuSettings">
@@ -531,13 +528,11 @@
border-radius: 10px;
position: relative;
display: flex;
- // justify-content: space-between;
+ justify-content: space-between;
- .menuTreeBox {
- width: 100%;
- height: 98%;
+
.left_tree {
- width: 29%;
+ width: 23%;
height: 92%;
padding: 10px;
@@ -548,14 +543,14 @@
}
.right_menu {
border-radius: 10px;
- width: 97%;
- height: 100%;
+ width: 75%;
+ // height: 92%;
padding: 10px;
-
- border-radius: 5px;
+ // padding-top:0;
+ border-radius: 10px;
float: right;
}
- }
+
.divider {
margin-top: 8px;
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index db58563..cb25eba 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -710,4 +710,5 @@
.el-table /deep/ tr {
background-color: transparent !important;
}
+
</style>
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 8a56e5f..ebffc74 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -1214,9 +1214,7 @@
},
function (entity) {
let positions = entity.polygon.hierarchy.getValue().positions;
- console.log(positions);
sgworld.Creator.SimpleGraphic.remove(entity.id);
-
window.DXTerrainFlattening = sgworld.Creator.createTerrainModifier("鍦板舰鍘嬪钩", positions, 10, {});
}
);
@@ -1368,7 +1366,7 @@
window.sgworld.Command.execute(2, 3, '', (data) => {
data.showPoint = false;
data.showLine = true;
- data.mode = 1;
+ data.mode = 0;
// 寮圭獥鏁版嵁
window.PathAnimationData = {
flyData: data,
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index 396ca16..04d664c 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -405,9 +405,20 @@
handleDrop (draggingNode, dropNode, dropType, ev) {
console.log('tree drop: ', dropNode.label, dropType);
},
- handleCheckChange (data, checked, indeterminate) {
+ handleCheckChange(data, checked, indeterminate) {
+
+
+
if (data.type != 2) return;
+ //鍋氬垽鏂槸鍚︽槸1锛�100涓囪鏀跨晫闈�
+ if(data.layer==window.XZOutlie&&checked){
+ window.ImageLayer3.show=false;
+ }else{
+ window.ImageLayer3.show=true;
+ }
+
+
var std = [];
if (data.layerType == 'WMS') {
var layers_ol = window.map.getAllLayers();
@@ -452,7 +463,7 @@
}
}
},
- setAddLayers (res) {
+ setAddLayers(res) {
if (res.layerType == 'WMS') {
var url = geoServerURl;
if (res.url != null && res.url != undefined) {
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 9c4f250..46bda18 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -203,7 +203,7 @@
<el-table-column :label="$t('dataManage.vmobj.name')" >
<template slot-scope="scope">
<span v-if="scope.row.ismeta > 0 ">
- <el-link title="鍏冩暟鎹煡璇�" @click="setQueryMetaData(scope.row)" target="_blank">{{ scope.row.name }}</el-link>
+ <el-link title="婧愭暟鎹煡璇�" @click="setQueryMetaData(scope.row)" target="_blank">{{ scope.row.name }}</el-link>
</span>
<span v-else>{{ scope.row.name }}</span>
</template>
@@ -846,18 +846,18 @@
this.startQueryMetaData();
},
- //鍏冩暟鎹〉闈㈠垏鎹�
+ //婧愭暟鎹〉闈㈠垏鎹�
handleMetaSizeChange(val){
this.listMetaData.pageIndex = 1;
this.listMetaData.pageSize = val;
this.startQueryMetaData();
},
- //鍏冩暟鎹〉闈㈠垏鎹�
+ //婧愭暟鎹〉闈㈠垏鎹�
handMetaCurrentChange(val){
this.listMetaData.pageIndex = val;
this.startQueryMetaData();
},
- //鍏冩暟鎹煡璇�
+ //婧愭暟鎹煡璇�
setQueryMetaData(row){
this.fromQueryMeta.title = row.name
this.listMetaData = {
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index adaf849..fcd95b5 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -169,7 +169,7 @@
</template>
</el-table-column>
</el-table>
- <div style="margin-top: 10px">
+ <div style="margin-top: 25px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
--
Gitblit v1.9.3