From dda0e6f581e8c2b116f2eae53756d80215d6e5e0 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期三, 01 二月 2023 09:31:37 +0800
Subject: [PATCH] 1
---
src/views/datamanage/metadataManage.vue | 2
public/config/config copy.js | 54 ++++
public/LfSKyline/js/index.js | 17
src/views/datamanage/projectManage.vue | 45 +++
src/views/Synthesis/LeftMenu.vue | 36 ++-
src/views/maintenance/userManagement.vue | 12
src/views/AuthorizationManagement/roleMenuAuthorization.vue | 9
src/views/userManage/authorityManage.vue | 2
src/components/mapsdk.vue | 98 +++++---
src/views/datamanage/dataUpdata.vue | 120 +++++++++-
src/views/datamanage/SpatialData.vue | 67 +++--
src/api/api.js | 14 +
src/assets/lang/zh.js | 3
src/views/Tools/LayerTree.vue | 1
src/views/datamanage/dictionaryManage.vue | 4
public/LfSKyline/css/index.css | 2
public/config/config.js | 4
src/views/userManage/orgManage.vue | 44 ++-
src/views/datamanage/catalogueManage.vue | 51 ++++
src/assets/lang/en.js | 3
src/views/maintenance/menuSettings.vue | 7
src/components/navMenu.vue | 19
public/LfSKyline/index.html | 13
23 files changed, 467 insertions(+), 160 deletions(-)
diff --git a/public/LfSKyline/css/index.css b/public/LfSKyline/css/index.css
index 4f73d2f..d138a8e 100644
--- a/public/LfSKyline/css/index.css
+++ b/public/LfSKyline/css/index.css
@@ -77,7 +77,7 @@
}
.content {
- height: calc(100% - 80px);
+ height: calc(100% - 60px);
width: 100%;
display: flex;
}
diff --git a/public/LfSKyline/index.html b/public/LfSKyline/index.html
index b89cc96..da80981 100644
--- a/public/LfSKyline/index.html
+++ b/public/LfSKyline/index.html
@@ -32,8 +32,9 @@
color: #409EFF;
border-bottom: 1px solid #409EFF;
}
- a {
-
+
+ a {
+
border-bottom: 1px solid black;
}
</style>
@@ -94,7 +95,13 @@
<div id="rightCont" class="left_content">
<fieldset class="fieldset">
<legend>鏁版嵁鐩綍</legend>
- <div id="layers"></div>
+ <!-- <div id="layers"></div> -->
+ <div>
+ <object id="TerraExplorerInformationWindowEx" classid="CLSID:3A4F919B-65A8-11D5-85C1-0001023952C1" width="300" height="400"></object>
+
+ </div>
+
+
</fieldset>
</div>
<div class="right_content">
diff --git a/public/LfSKyline/js/index.js b/public/LfSKyline/js/index.js
index 45b82d8..9741cbb 100644
--- a/public/LfSKyline/js/index.js
+++ b/public/LfSKyline/js/index.js
@@ -1,7 +1,7 @@
window.SG = null;
var Index = {
menuFlag: true,
- treePlay: 'PS\\鍏ㄥ浗绠＄綉涓撻鍥惧睍绀�',
+ treePlay: '婕旂ず鏂规\\鏂规1',
objTypes: [19, 23, 26, 29, 34, 36, 38, 39, 40],
init: function () {
var flag = Detect.detectIE();
@@ -19,20 +19,19 @@
a.href = LFData + "/soft/TEv7.4.zip";
},
initSG: function () {
+ TerraExplorerInformationWindowEx.AttachTo3dWindow(TEWinEx);
+
SG = TEWinEx.CreateInstance("TerraExplorerX.SGWorld74"); // SGWorld74,SGWorld71,SGWorld66
SG.AttachEvent("OnLoadFinished", this.loadFinished);
-
-
-
SG.Open(app.fly);
},
loadFinished: function () {
SG.DetachEvent("OnLoadFinished", Index.loadFinished);
- var layers = [];
- Index.getLayers("", layers);
- Index.ininTrees("layers", layers);
- // Index.flyToStart();
-
+ // var layers = [];
+ // Index.getLayers("", layers);
+ // Index.ininTrees("layers", layers);
+ Index.flyToStart();
+
},
getLayers: function (pid, layers) {
diff --git a/public/config/config copy.js b/public/config/config copy.js
new file mode 100644
index 0000000..f6077f2
--- /dev/null
+++ b/public/config/config copy.js
@@ -0,0 +1,54 @@
+var isWeb = location.hostname.indexOf("103.85.165.") > -1;
+
+var webHost = isWeb ? location.hostname + ":8052" : location.hostname + ":8088";
+
+var fmeHost = isWeb ? location.hostname + ":8051" : location.hostname + ":88";
+
+var iisHost = isWeb ? location.hostname + ":8050" : location.hostname + ":80";
+
+var menuStartName = "绠￠亾鍩虹澶ф暟鎹钩鍙�";
+
+var LFData = "http://" + iisHost + "/LFData";
+
+var BASE_URL = 'http://' + webHost + '/server';
+
+// WebSocket 鏈嶅姟鍦板潃
+var socketUrl = 'ws://' + webHost + '/server/ws/select';
+
+// GeoServerUrl
+var geoServerURl = '/geoserver/LF/wms';
+
+var geoserverWFS = '/geoserver/LF/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=LF%3Abs_project&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=projname=';
+
+var geoserverWFSLine = '/geoserver/LF/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=LF%3Am_pipeline&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=projname=';
+
+// 妯″瀷鍔犺浇鍦板潃
+var modelUrl = LFData + '/tileset/SN/tileset.json';
+
+// DEM
+var demLayer = LFData + '/dem';
+
+// 缁煎悎灞曠ず
+window.sceneConfig = {
+ // Sdk璁稿彲
+ licenseServer: 'http://' + iisHost + '/LFServer',
+ // MPT鍚嶇О
+ mptName: "china_5m.Ei.397334",
+ // SG鍦板潃
+ SGUrl: "http://" + iisHost + "/SG/Elevation",
+ // Fly鍦板潃
+ fly: 'http://' + iisHost + '/LFData/fly/' + (isWeb ? "lfy_web.fly" : "lf_127.fly"),
+ //
+ positionBtn: [],
+};
+
+var gaoDeBaseUrl = [{
+ url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+ label: '楂樺痉鐭㈤噺',
+}, {
+ url: 'https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
+ label: '楂樺痉褰卞儚',
+}, {
+ url: 'http://webst02.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8',
+ label: '楂樺痉褰卞儚鏍囨敞'
+}];
diff --git a/public/config/config.js b/public/config/config.js
index e430401..f62e2a5 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -1,6 +1,6 @@
var isWeb = location.hostname.indexOf("103.85.165.") > -1;
-var webHost = isWeb ? location.hostname + ":8052" : '192.168.20.205' + ":8088";
+var webHost = isWeb ? location.hostname + ":8052" : '192.168.20.106' + ":12316";
var fmeHost = isWeb ? location.hostname + ":8051" : '192.168.20.205' + ":88";
@@ -16,7 +16,7 @@
var socketUrl = 'ws://' + webHost + '/server/ws/select';
// GeoServerUrl
-var geoServerURl = '/geoserver/LF/wms';
+var geoServerURl = 'http://192.168.20.205:8088//geoserver/LF/wms';
var geoserverWFS = '/geoserver/LF/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=LF%3Abs_project&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=projname=';
diff --git a/src/api/api.js b/src/api/api.js
index 100bb4d..2587203 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -461,6 +461,14 @@
export function select_Comprehensive_SelectWktById(params) {
return request.get('/locate/selectWktById', { params: params });
}
+
+//缁煎悎灞曠ず_璺緞瑙勫垝
+// export function comprehensive_selectRoute(params) {
+// return request.get('/comprehensive/selectRoute?x1=116.78999&x2=116.80458&y1=39.9468&y2=39.94758');
+// }
+export function comprehensive_selectRoute(params) {
+ return request.get('/comprehensive/selectRoute?x1=' + params.x1 + '&x2=' + params.x2 + '&y1=' + params.y1 + '&y2=' + params.y2);
+}
//涓婁紶Shp鏂囦欢璇诲彇绗竴鏉¤褰曠殑WKT;
export function inquiry_uploadShp(params) {
return request.post('/inquiry/uploadShp', params);
@@ -541,7 +549,7 @@
export function dataUpload_selectByPageForUpload(params) {
return request.get('/dataUpload/selectByPageForUpload', { params: params });
}
-
+
//鏁版嵁涓婁紶=鎻愪氦鏁版嵁璐ㄦ
export function dataUpload_uploadChecks(params) {
return request.post('/dataUpload/uploadChecks', params);
@@ -900,3 +908,7 @@
export function project_update(params) {
return request.post('/project/update', params);
}
+//椤圭洰绠＄悊=>鍒犻櫎
+export function project_selectLocation(params) {
+ return request.get('/project/selectLocation?x=' + params.x + '&y=' + params.y)
+}
\ No newline at end of file
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 51ed48a..fe6d1b9 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -62,6 +62,7 @@
location: 'Geographical Position',
province: 'Province',
country: 'Country',
+ county: 'County',
corpname: ' Constructing units ',
department: 'competent department',
conperiod: 'Construction period',
@@ -484,7 +485,7 @@
openFile: 'open File',
saveFile: 'save File',
synthobj: {
- m1: 'Horizontal distance',
+ m1: 'Surface distance',
m2: 'Spatial distance',
m3: 'Altitude',
m4: 'Vertical height',
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 223e8db..299d5e8 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -61,6 +61,7 @@
location: '鍦扮悊浣嶇疆',
province: '鎵�灞炵渷浠�',
country: '鎵�灞炲浗瀹�',
+ county:'鎵�灞炲幙',
corpname: '寤鸿鍗曚綅鍚嶇О',
department: '涓荤閮ㄩ棬',
conperiod: '寤鸿宸ユ湡',
@@ -480,7 +481,7 @@
openFile: '鎵撳紑',
saveFile: '淇濆瓨',
synthobj: {
- m1: '姘村钩璺濈',
+ m1: '琛ㄩ潰璺濈',
m2: '绌洪棿璺濈',
m3: '娴锋嫈楂樺害',
m4: '鍨傜洿楂樺害',
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index c13c3f4..0134978 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -270,6 +270,7 @@
import {
select_Comprehensive_ByPageAndCount,
select_Comprehensive_SelectWktById,
+ comprehensive_selectRoute
} from '../api/api';
export default {
name: '',
@@ -354,23 +355,23 @@
});
Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
- url: gaoDeBaseUrl[0].url,
-
-
+ url: gaoDeBaseUrl[0].url,
+
+
})
);
Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
- url: gaoDeBaseUrl[1].url,
-
+ url: gaoDeBaseUrl[1].url,
+
})
);
Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
- url: gaoDeBaseUrl[2].url,
-
-
+ url: gaoDeBaseUrl[2].url,
+
+
})
);
@@ -422,15 +423,15 @@
window.elevationTool = new SmartEarth.ElevationTool(window.sgworld);
elevationTool.setContourColor('#F1D487');
- var helper = new Cesium.EventHelper();
- helper.add(Viewer.scene.globe.tileLoadProgressEvent, function (e) {
-
- if (e == 0) {
-console.log("杩欎釜鏄姞杞芥渶鍚庝竴涓煝閲忓垏鐗囩殑鍥炶皟");
-}
- helper.removeAll();
- helper = undefined;
- });
+ // var helper = new Cesium.EventHelper();
+ // helper.add(Viewer.scene.globe.tileLoadProgressEvent, function (e) {
+
+ // if (e == 0) {
+ // console.log("杩欎釜鏄姞杞芥渶鍚庝竴涓煝閲忓垏鐗囩殑鍥炶皟");
+ // }
+ // helper.removeAll();
+ // helper = undefined;
+ // });
@@ -621,29 +622,54 @@
break;
}
},
- showMouseLeftClick(res) {
+ async showMouseLeftClick(res) {
if (res == 3) {
if (this.linePath != null) {
this.clearPathAll(3);
}
+ var start = this.pathFrom.lon.split(",")
+ var end = this.pathFrom.lat.split(",")
+ var startData = {
+ x1: parseFloat(start[0]),
+ y1: parseFloat(start[1]),
+ x2: parseFloat(end[0]),
+ y2: parseFloat(end[1])
+ }
- var jsonurl =
- wnsUrl +
- '?start=' +
- this.pathFrom.lon +
- '&end=' +
- this.pathFrom.lat +
- '&propertyName=Shape&tolerance=500&request=FindPath&format=json';
- $.ajax({
- url: jsonurl,
- async: false,
- type: 'GET',
- dataType: 'json',
- contentType: 'application/json;charset=utf-8',
- success: (data) => {
- this.executeFly3D(data);
- },
- });
+ const data = await comprehensive_selectRoute(startData);
+ if (data.code != 200) {
+ return this.$message.error('鏁版嵁璇锋眰澶辫触');
+ }
+ var wkt = this.$wkt.parse(data.result);
+ var bufferSource = Cesium.GeoJsonDataSource.load(wkt, {
+ stroke: new Cesium.Color(82 / 255, 152 / 255, 255 / 255, 1),
+
+ strokeWidth: 5,
+ clampToGround: true,
+ })
+ bufferSource.then((bufferSource) => {
+ sgworld.Navigate.flyToObj(bufferSource)
+ Viewer.dataSources.add(bufferSource);
+
+ }
+ )
+ // var jsonurl =
+ // wnsUrl +
+ // '?start=' +
+ // this.pathFrom.lon +
+ // '&end=' +
+ // this.pathFrom.lat +
+ // '&propertyName=Shape&tolerance=500&request=FindPath&format=json';
+ // $.ajax({
+ // url: jsonurl,
+ // async: false,
+ // type: 'GET',
+ // dataType: 'json',
+ // contentType: 'application/json;charset=utf-8',
+ // success: (data) => {
+ // this.executeFly3D(data);
+ // },
+ // });
} else {
var that = this;
if (this.handler != null) {
@@ -744,6 +770,8 @@
sgworld.Creator.DeleteObject(this.linePath);
this.linePath = null;
}
+
+ Viewer.dataSources.removeAll( )
break;
case 4:
if (this.linePath != null) {
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 0132bc6..458c344 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -186,11 +186,10 @@
}
},
setLiClick(res, index) {
-
setTimeout(() => {
this.changeliSelect = res.cnName;
if (res.url.indexOf('http') != -1) {
- if (this.$store.reporturl == null) {
+ if (location.href.indexOf('/WareInspection') == -1) {
this.$store.reporturl = res.url;
this.$router.push('/WareInspection');
} else {
@@ -221,10 +220,10 @@
that.setMenuTree(menuLists);
} else {
- this.$message({
- message: '鏆傛棤鑿滃崟鏍忔暟鎹�',
- type: 'warning'
- });
+ this.$message({
+ message: '鏆傛棤鑿滃崟鏍忔暟鎹�',
+ type: 'warning'
+ });
}
}
},
@@ -266,10 +265,10 @@
return father.pid == 1; // 杩斿洖涓�绾ц彍鍗�
});
} else {
- this.$message({
- message: '鏆傛棤鑿滃崟鏍忔暟鎹�',
- type: 'warning'
- });
+ this.$message({
+ message: '鏆傛棤鑿滃崟鏍忔暟鎹�',
+ type: 'warning'
+ });
}
},
logOut() {
diff --git a/src/views/AuthorizationManagement/roleMenuAuthorization.vue b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
index b84e715..d6a69d6 100644
--- a/src/views/AuthorizationManagement/roleMenuAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
@@ -15,14 +15,14 @@
<el-form-item label="鍗曚綅">
<el-select
ref="multiSelect"
- style="width: 300px"
+ style="width: 300px; "
v-model="selFrom.name"
placeholder="璇烽�夋嫨鍗曚綅鍚嶇О..."
@change="chooseCustom('multiSelect')"
>
<el-option
:value="selectTree"
- style="overflow: auto; backgrond: transparent; height: 200px"
+ style="overflow: auto; backgrond: transparent; height: 100%;"
disabled
>
<el-tree
@@ -704,6 +704,10 @@
/deep/.el-dialog__title {
color: white;
}
+/* //鍙充晶鍜屼笅鏂圭殑鐧借竟 */
+ /deep/.el-scrollbar__wrap{
+ height: 1000px !important;
+ }
.divider {
margin-top: 8px;
}
@@ -753,6 +757,7 @@
.el-scrollbar__wrap {
margin-bottom: -20px !important;
margin-right: -20px !important;
+
}
.el-select-dropdown__item.hover,
.el-select-dropdown__item:hover {
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 1d2c780..12aa838 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -228,7 +228,7 @@
{
id: 'j1',
label: 'synthesis.synthobj.m1',
- name: '姘村钩璺濈',
+ name: '琛ㄩ潰璺濈',
css: 'twoMenu_imge71',
},
{
@@ -528,7 +528,7 @@
(data) => {
data.id = window.sgworld.Core.getuid();
this.measureData.set(data.id, measure);
- this.openMeasureResultInfo('姘村钩璺濈', data);
+ this.openMeasureResultInfo('琛ㄩ潰璺濈', data);
}
);
break;
@@ -545,16 +545,24 @@
);
break;
case 'j3':
- var measure = window.sgworld.Command.execute(
- 1,
- 11,
- this.colorAll,
- (data) => {
- data.id = window.sgworld.Core.getuid();
- this.measureData.set(data.id, measure);
- this.openMeasureResultInfo('娴锋嫈楂樺害', data);
- }
- );
+ // var measure = window.sgworld.Command.execute(
+ // 1,
+ // 11,
+ // this.colorAll,
+ // (data) => {
+ // data.id = window.sgworld.Core.getuid();
+ // this.measureData.set(data.id, measure);
+ // this.openMeasureResultInfo('娴锋嫈楂樺害', data);
+ // }
+ // );
+ var measure = window.sgworld.Command.execute(0, 3, this.colorAll, (data) => {
+ data.id = window.sgworld.Core.getuid();
+ this.measureData.set(data.id, measure);
+ this.openMeasureResultInfo('骞抽潰闈㈢Н', data);
+
+
+ });
+
break;
case 'j2':
var measure = window.sgworld.Command.execute(
@@ -632,12 +640,12 @@
openMeasureResultInfo(name, data) {
let info = '';
switch (name) {
- case '姘村钩璺濈':
+ case '琛ㄩ潰璺濈':
case '绌洪棿璺濈':
info = '鎬婚暱搴︼細' + data.distance[data.distance.length - 1];
break;
case '娴锋嫈楂樺害':
- info = '娴锋嫈锛�' + data.height;
+ info = '楂樺害锛�' + data.height;
break;
case '鍨傜洿楂樺害':
info = `${data.gddistance}<br>${data.kjdistance}<br>${data.spdistance}`;
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index c3196f8..e5ad2fd 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -343,6 +343,7 @@
}
},
setAddLayers(res) {
+
let layerWMS = new Cesium.WebMapServiceImageryProvider({
url: geoServerURl,
layers: res.resource,
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 757d7f1..b720b5c 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -42,7 +42,7 @@
></el-input>
</el-form-item>
<el-form-item>
- <el-button
+ <el-button v-if="btnStatus.insert"
@click="conditionVisible = true"
size="small"
icon="el-icon-plus"
@@ -69,7 +69,7 @@
<el-button
@click="getSpaceMapVisibale"
size="small"
- type="primary"
+ type="primary"
>{{
$t('synthesis.rangequery')
}}</el-button>
@@ -90,6 +90,7 @@
/>
<el-table-column
width="60"
+ align="center"
type="index"
:label="$t('common.index')"
/>
@@ -102,7 +103,7 @@
align="center"
></el-table-column>
<el-table-column
- min-width="80"
+ min-width="120"
:label="$t('common.operate')"
>
<template slot-scope="scope">
@@ -141,31 +142,33 @@
class="infoBox"
v-show="showinfoBox"
>
- <el-card class="box-card">
+
+ <div
+ slot="header"
+ class="clearfix"
+ >
+ <span>{{$t('common.details')}}</span>
+
<div
- slot="header"
- class="clearfix"
+ style="float: right; cursor: pointer"
+ @click="closeDetial"
>
- <span>{{$t('common.details')}}</span>
- <div
- style="float: right; cursor: pointer"
- @click="closeDetial"
- >
- <i class="el-icon-close"></i>
- </div>
+ <i class="el-icon-close"></i>
</div>
- <div class="contentBox">
- <ul>
- <li v-for="(item, index) in itemdetail">
- <p>
- <label> {{ item.label }}:</label>
- <label class="boxlabel">{{ item.value }}</label>
- </p>
- <el-divider></el-divider>
- </li>
- </ul>
- </div>
- </el-card>
+ <el-divider></el-divider>
+ </div>
+ <div class="contentBox">
+ <ul>
+ <li v-for="(item, index) in itemdetail">
+ <p>
+ <label> {{ item.label }}:</label>
+ <label class="boxlabel">{{ item.value }}</label>
+ </p>
+ <el-divider></el-divider>
+ </li>
+ </ul>
+ </div>
+
</div>
<el-dialog
:title="$t('common.attachinform')"
@@ -191,7 +194,7 @@
style="display: none"
@change="insertFile( )"
/>
- <el-link
+ <el-link
@click="getInsertFile( )"
:underline="false"
><i class="el-icon-folder-opened"></i></el-link>
@@ -199,14 +202,14 @@
<el-form-item>
<el-row>
<el-col :span="3">
- <el-link
+ <el-link v-if="btnStatus.insert"
class="elLink"
:underline="false"
@click="setAttachInsert"
>{{$t('common.append')}}</i></el-link>
</el-col>
<el-col :span="3">
- <el-link
+ <el-link v-if="btnStatus.delete"
class="elLink"
:underline="false"
@click="setAttachDel"
@@ -618,7 +621,7 @@
permsEntity
.filter((item) => item.perms == currentPerms)
.map((item) => {
- console.log(item);
+
this.btnStatus[item.tag.substr(1)] = true;
});
},
@@ -1182,13 +1185,17 @@
}
.infoBox {
width: 500px;
-
position: absolute;
z-index: 100;
top: 15%;
right: 15%;
background-color: #303030;
color: white;
+ border: 1px solid gray;
+ height: 600px;
+ padding: 10px;
+ overflow: auto;
+ border-radius: 5px;
.el-card {
background-color: transparent;
color: white;
diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue
index 2f2257a..a3856d5 100644
--- a/src/views/datamanage/catalogueManage.vue
+++ b/src/views/datamanage/catalogueManage.vue
@@ -31,6 +31,7 @@
</el-breadcrumb>
<div>
<el-button
+ v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@click="setEditNode(1)"
type="info"
@@ -38,6 +39,7 @@
size="small"
>鍚戜笂绉诲姩</el-button>
<el-button
+ v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@click="setEditNode(2)"
type="info"
@@ -45,6 +47,7 @@
size="small"
>鍚戜笅绉诲姩</el-button>
<el-button
+ v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(1)"
type="success"
@@ -52,6 +55,7 @@
size="small"
>鏂板鍚岀骇</el-button>
<el-button
+ v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(2)"
type="success"
@@ -59,6 +63,7 @@
size="small"
>鏂板瀛愮骇</el-button>
<el-button
+ v-if="menuStatus.delete"
@click="setDelNode()"
:disabled="itemdetail.pid == null ? true : false"
type="danger"
@@ -103,6 +108,7 @@
</el-form-item>
<div class="btnBox">
<el-button
+ v-if="menuStatus.update"
class="primary"
size="small"
@click="updCata('itemdetail')"
@@ -110,6 +116,7 @@
$t('common.preservation')
}}</el-button>
<el-button
+ v-if="menuStatus.update"
type="info"
size="small"
@click="reset"
@@ -198,6 +205,7 @@
updateDirTrees,
insertDir,
deleteDir,
+ getPerms,
} from '../../api/api';
import MyBread from '../../components/MyBread.vue';
export default {
@@ -214,6 +222,11 @@
}
};
return {
+ menuStatus: {
+ delete: false,
+ insert: false,
+ update: false,
+ },
defaultProps: {
children: 'children',
label: 'name',
@@ -574,11 +587,11 @@
this.getDirTree();
return;
} else {
- this.$message.error('淇敼澶辫触锛岃閲嶈瘯锛�');
+ this.$message.error('淇敼澶辫触锛岃閲嶈瘯锛�');
}
})
.catch(() => {
- this.$message.error('淇敼澶辫触锛岃閲嶈瘯锛�');
+ this.$message.error('淇敼澶辫触锛岃閲嶈瘯锛�');
});
},
handleNodeClick(data, node) {
@@ -604,7 +617,7 @@
}, 500);
})
.catch((res) => {
- this.$message.error('淇敼澶辫触锛岃閲嶈瘯锛�');
+ this.$message.error('淇敼澶辫触锛岃閲嶈瘯锛�');
this.fullscreenLoading = false;
});
} else {
@@ -620,9 +633,41 @@
this.itemdetail = JSON.parse(this.backUpData);
}
},
+ showPermsMenu(res) {
+
+ switch (res.tag) {
+ case '/delete':
+ this.menuStatus.delete = true;
+ break;
+ case '/insert':
+ this.menuStatus.insert = true;
+ break;
+ case '/update':
+ this.menuStatus.update = true;
+ break;
+ }
+ },
+ getPerms() {
+ var val = this.$store.state.currentPerms;
+ var permsEntity = this.$store.state.permsEntity;
+ if (!permsEntity || !permsEntity.length) {
+ getPerms().then((res) => {
+ if (res.code == 200) {
+ permsEntity = res.result;
+ }
+ });
+ }
+ for (var i = 0; i < permsEntity.length; i++) {
+ if (val === permsEntity[i].perms) {
+ console.log(i, permsEntity[i])
+ this.showPermsMenu(permsEntity[i]);
+ }
+ }
+ },
},
mounted() {
this.getDirTree();
+ this.getPerms();
},
};
</script>
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index f7cb493..312ac25 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -227,7 +227,7 @@
</el-form-item>
<el-form-item>
<!-- 涓婁紶 -->
- <el-button
+ <el-button v-if="menuStatus.upload"
:disabled="tableData.length == 0 ? false : true"
@click="setFileUpload"
size="small"
@@ -237,7 +237,7 @@
$t('common.upload')
}}</el-button>
<!-- 鍒犻櫎 -->
- <el-button
+ <el-button v-if="menuStatus.delete"
:disabled="multipleSelection.length == 0 ? true : false"
icon="el-icon-delete"
size="small"
@@ -245,7 +245,7 @@
type="danger"
>{{ $t('common.delete') }}</el-button>
<!-- 璐ㄦ -->
- <el-button
+ <el-button v-if="menuStatus.insert"
:disabled="multipleSelection.length == 0 ? true : false"
type="info"
size="small"
@@ -254,7 +254,7 @@
>{{$t('common.quayTest')}}
</el-button>
<!-- 鍏ュ簱 -->
- <el-button
+ <el-button v-if="menuStatus.insert"
@click="setFileWare"
size="small"
:disabled="tableData.length == 0 ? true: false"
@@ -310,8 +310,8 @@
width="120"
>
<template slot-scope="scope">
- <el-button
- v-if="scope.row.code != null"
+ <el-button v-if="menuStatus.download"
+ v-show="scope.row.code != null"
@click="handerLogClick(scope.row)"
type="text"
size="mini"
@@ -355,7 +355,7 @@
size="small"
type="info"
>{{ $t('common.reset') }}</el-button>
- <el-button
+ <el-button v-if="menuStatus.delete"
@click="setWarehouseDel"
icon="el-icon-folder-delete"
type="danger"
@@ -503,37 +503,55 @@
class="ContBox"
v-show="quayTestShow.checkAttrs"
>
- <el-checkbox checked disabled>灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)</el-checkbox>
</div>
<div
class="ContBox"
v-show="quayTestShow.checkMath"
>
- <el-checkbox checked disabled>鏁板鍩虹妫�鏌ワ細(.shp,.dlg)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >鏁板鍩虹妫�鏌ワ細(.shp,.dlg)</el-checkbox>
</div>
<div
class="ContBox"
v-show="quayTestShow.checkDecorate"
>
- <el-checkbox checked disabled>鍥鹃潰鏁撮グ妫�鏌ワ細(.dwg)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >鍥鹃潰鏁撮グ妫�鏌ワ細(.dwg)</el-checkbox>
</div>
<div
class="ContBox"
v-show="quayTestShow.checkXls"
>
- <el-checkbox checked disabled>琛ㄦ牸鏁版嵁妫�鏌ワ細(.xls/.xlsx)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >琛ㄦ牸鏁版嵁妫�鏌ワ細(.xls/.xlsx)</el-checkbox>
</div>
<div
class="ContBox"
v-show="quayTestShow.checkOrigin"
>
- <el-checkbox checked disabled>鍘熺偣妫�鏌ワ細(*鍓栭潰鍥�*.dwg)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >鍘熺偣妫�鏌ワ細(*鍓栭潰鍥�*.dwg)</el-checkbox>
</div>
<div
class="ContBox"
v-show="quayTestShow.checkMeta"
>
- <el-checkbox checked disabled>鍏冩暟鎹鏌ワ細(*鍏冩暟鎹�*.xls/.xlsx)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >鍏冩暟鎹鏌ワ細(*鍏冩暟鎹�*.xls/.xlsx)</el-checkbox>
</div>
<div
class="ContBox"
@@ -545,7 +563,10 @@
class="demo-form-inline"
>
<el-form-item>
- <el-checkbox checked disabled>鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg)</el-checkbox>
</el-form-item>
<el-form-item>
<div class="ContDiv">
@@ -599,7 +620,10 @@
class="demo-form-inline"
>
<el-form-item>
- <el-checkbox checked disabled>鏍呮牸妫�鏌ワ細(.tif/.img)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >鏍呮牸妫�鏌ワ細(.tif/.img)</el-checkbox>
</el-form-item>
<el-form-item>
<div class="ContDiv">
@@ -629,7 +653,10 @@
class="demo-form-inline"
>
<el-form-item>
- <el-checkbox checked disabled>楂樼▼妫�鏌ワ細(.tif/.img)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >楂樼▼妫�鏌ワ細(.tif/.img)</el-checkbox>
</el-form-item>
<el-form-item>
<div class="ContDiv">
@@ -659,7 +686,10 @@
class="demo-form-inline"
>
<el-form-item>
- <el-checkbox checked disabled>鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx)</el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx)</el-checkbox>
</el-form-item>
<el-form-item>
<div class="ContDiv">
@@ -681,7 +711,10 @@
class="demo-form-inline"
>
<el-form-item>
- <el-checkbox checked disabled>OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx) </el-checkbox>
+ <el-checkbox
+ checked
+ disabled
+ >OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx) </el-checkbox>
</el-form-item>
<el-form-item>
<div class="ContDiv">
@@ -1083,8 +1116,16 @@
pageSize: 1,
pageSize: 10,
},
- count1:0,
- attributeData:[],
+ count1: 0,
+ attributeData: [],
+ menuStatus: {
+ delete: false,
+ insert: false,
+ update: false,
+ upload: false,
+ download: false,
+
+ },
}
},
@@ -1097,11 +1138,50 @@
this.setProjectName();
//鑾峰彇鏂囦欢涓婁紶璺緞
this.getFilePath();
+ //鏉冮檺鑾峰彇
+ this.getPerms();
},
watch: {
},
methods: {
+ showPermsMenu(res) {
+
+ switch (res.tag) {
+ case '/delete':
+ this.menuStatus.delete = true;
+ break;
+ case '/insert':
+ this.menuStatus.insert = true;
+ break;
+ case '/update':
+ this.menuStatus.update = true;
+ break;
+ case '/upload':
+ this.menuStatus.upload = true;
+ break;
+ case '/download':
+ this.menuStatus.download = true;
+ break;
+ }
+ },
+ getPerms() {
+ var val = this.$store.state.currentPerms;
+ var permsEntity = this.$store.state.permsEntity;
+ if (!permsEntity || !permsEntity.length) {
+ getPerms().then((res) => {
+ if (res.code == 200) {
+ permsEntity = res.result;
+ }
+ });
+ }
+ for (var i = 0; i < permsEntity.length; i++) {
+ if (val === permsEntity[i].perms) {
+
+ this.showPermsMenu(permsEntity[i]);
+ }
+ }
+ },
//鏁版嵁鍒楄〃娓呭崟-table 鐐瑰嚮
handleLoaderSizeChange(val) {
this.listLoader.pageIndex = 1;
diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue
index 128915a..faab855 100644
--- a/src/views/datamanage/dictionaryManage.vue
+++ b/src/views/datamanage/dictionaryManage.vue
@@ -30,13 +30,13 @@
@click="getRemoveForm"
type="info"
>{{ $t('common.reset') }}</el-button>
- <el-button
+ <el-button v-if="btnStatus.insert"
icon="el-icon-edit"
size="small"
@click="InsertFormdialog = true"
type="success"
>{{ $t('common.append') }}</el-button>
- <el-button
+ <el-button v-if="btnStatus.delete"
icon="el-icon-delete"
size="small"
@click="DelFormData"
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 407fd4f..1c6f4d5 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -191,7 +191,7 @@
>{{
$t('common.details')
}}</el-link>
- <el-link
+ <el-link v-if="btnStatus.update"
@click="editInfo(scope.row)"
style="margin-left: 10px; color: white"
>{{ $t('common.edit') }}</el-link>
diff --git a/src/views/datamanage/projectManage.vue b/src/views/datamanage/projectManage.vue
index e8b669b..fb3bc4c 100644
--- a/src/views/datamanage/projectManage.vue
+++ b/src/views/datamanage/projectManage.vue
@@ -61,17 +61,22 @@
prop="geom"
:label="$t('dataManage.projectObj.location')"
/>
+
<el-table-column
- prop="province"
- :label="$t('dataManage.projectObj.province')"
+ prop="corpname"
+ :label="$t('dataManage.projectObj.corpname')"
/>
<el-table-column
prop="country"
:label="$t('dataManage.projectObj.country')"
/>
<el-table-column
- prop="corpname"
- :label="$t('dataManage.projectObj.corpname')"
+ prop="province"
+ :label="$t('dataManage.projectObj.province')"
+ />
+ <el-table-column
+ prop="location"
+ :label="$t('dataManage.projectObj.county')"
/>
<el-table-column
prop="department"
@@ -251,11 +256,15 @@
>
</el-link>
</el-form-item>
+
+ <el-form-item :label="$t('dataManage.projectObj.country')">
+ <el-input v-model="editFrom.country"></el-input>
+ </el-form-item>
<el-form-item :label="$t('dataManage.projectObj.province')">
<el-input v-model="editFrom.province"></el-input>
</el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.country')">
- <el-input v-model="editFrom.country"></el-input>
+ <el-form-item :label="$t('dataManage.projectObj.county')">
+ <el-input v-model="editFrom.location"></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.corpname')">
<el-input v-model="editFrom.corpname"></el-input>
@@ -306,6 +315,7 @@
project_insert,
project_delete,
project_update,
+ project_selectLocation,
} from '../../api/api';
import ProjectOl from '../../components/ProjectOl.vue';
import MyBread from '../../components/MyBread.vue';
@@ -374,10 +384,28 @@
})
.catch((_) => { });
},
- innerClose() {
+ async innerClose() {
this.showMap = false;
this.innerVisible = false;
- ;
+
+ var wkt = this.$wkt.parse(this.$store.state.projeOl);
+
+ const data = await project_selectLocation({ x: wkt.coordinates[0], y: wkt.coordinates[1] })
+ console.log(data.result)
+ if (data.code == 200) {
+
+ for (var i in data.result) {
+ var key = data.result[i].key;
+ var val = data.result[i].value;
+ if (key == "鍥�") {
+ this.editFrom.country = val;
+ } else if (key == "鐪�") {
+ this.editFrom.province = val;
+ }else if (key == "甯�") {
+ this.editFrom.location = val;
+ }
+ }
+ }
this.editFrom.geom = this.$store.state.projeOl;
},
async insertEditFrom() {
@@ -446,6 +474,7 @@
this.$message.error('鍒楄〃鑾峰彇澶辫触');
return;
}
+
// this.count = data.result;
this.count1 = data.count;
this.dbTableData = data.result;
diff --git a/src/views/maintenance/menuSettings.vue b/src/views/maintenance/menuSettings.vue
index e394294..df5b1e4 100644
--- a/src/views/maintenance/menuSettings.vue
+++ b/src/views/maintenance/menuSettings.vue
@@ -35,6 +35,7 @@
<div>
<el-button
+ v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@click="setEditNode(1)"
type="info"
@@ -42,6 +43,7 @@
size="small"
>鍚戜笂绉诲姩</el-button>
<el-button
+ v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@click="setEditNode(2)"
type="info"
@@ -49,6 +51,7 @@
size="small"
>鍚戜笅绉诲姩</el-button>
<el-button
+ v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(1)"
type="success"
@@ -56,6 +59,7 @@
size="small"
>鏂板鍚岀骇</el-button>
<el-button
+ v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(2)"
type="success"
@@ -63,6 +67,7 @@
size="small"
>鏂板瀛愮骇</el-button>
<el-button
+ v-if="menuStatus.delete"
@click="setDelNode()"
:disabled="itemdetail.pid == null ? true : false"
type="danger"
@@ -334,7 +339,7 @@
},
data() {
return {
- menuStatus: {
+ menuStatus: {
delete: false,
insert: false,
update: false,
diff --git a/src/views/maintenance/userManagement.vue b/src/views/maintenance/userManagement.vue
index bc9b7d9..ad15aa1 100644
--- a/src/views/maintenance/userManagement.vue
+++ b/src/views/maintenance/userManagement.vue
@@ -60,6 +60,7 @@
<br />
<el-form-item>
<el-button
+ v-if="menuStatus.insert"
type="success"
size="small"
@click="showAddDialog"
@@ -70,6 +71,7 @@
</el-form-item>
<el-form-item>
<el-button
+ v-if="menuStatus.delete"
type="danger"
size="small"
@click="deleteUserInfo"
@@ -80,6 +82,7 @@
</el-form-item>
<el-form-item v-show="setbatchFlag">
<el-button
+ v-if="menuStatus.update"
size="small"
@click="editPwd"
type="warning"
@@ -213,14 +216,14 @@
width="200px"
:label="$t('userManage.userInfoObj.bak')"
/>
- <el-table-column
+ <!-- <el-table-column
:label="$t('common.operate')"
width="80px"
fixed="right"
v-if="menuStatus.update"
>
<template slot-scope="scope">
- <!-- <el-button type="primary" size="small">淇敼</el-button> -->
+
<el-button
type="warning"
plain
@@ -228,7 +231,7 @@
size="small"
>{{ $t('common.edit') }}</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
<div
style="margin-top: 25px"
@@ -839,6 +842,8 @@
methods: {
...mapActions(['login', 'getpublickey']),
getUserInfo() {
+ this.pageSize = 10;
+ this.currentPage = 1;
queryDepTree()
.then((res) => {
if (res.code == 200) {
@@ -1039,6 +1044,7 @@
};
this.multipleSelection = [];
this.resetPwd = false;
+
this.getUserInfo();
}
}, 500);
diff --git a/src/views/userManage/authorityManage.vue b/src/views/userManage/authorityManage.vue
index bbdfb13..cf2bac3 100644
--- a/src/views/userManage/authorityManage.vue
+++ b/src/views/userManage/authorityManage.vue
@@ -12,7 +12,7 @@
label-width="100px"
:inline="true"
>
- <el-form-item :label="$t('common.username')">
+ <el-form-item >
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item>
diff --git a/src/views/userManage/orgManage.vue b/src/views/userManage/orgManage.vue
index 35cea89..fe08415 100644
--- a/src/views/userManage/orgManage.vue
+++ b/src/views/userManage/orgManage.vue
@@ -30,35 +30,35 @@
</el-breadcrumb>
<div>
- <el-button
+ <el-button v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@click="setEditNode(1)"
type="info"
icon="el-icon-top"
size="small"
>鍚戜笂绉诲姩</el-button>
- <el-button
+ <el-button v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@click="setEditNode(2)"
type="info"
icon="el-icon-bottom"
size="small"
>鍚戜笅绉诲姩</el-button>
- <el-button
+ <el-button v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(1)"
type="success"
icon="el-icon-plus"
size="small"
>鏂板鍚岀骇</el-button>
- <el-button
+ <el-button v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(2)"
type="success"
icon="el-icon-plus"
size="small"
>鏂板瀛愮骇</el-button>
- <el-button
+ <el-button v-if="menuStatus.delete"
@click="setDelNode()"
:disabled="itemdetail.pid == null ? true : false"
type="danger"
@@ -339,6 +339,7 @@
queryMaxId,
insertDep,
deleteDep,
+ getPerms
} from '../../api/api';
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -794,18 +795,37 @@
break;
}
},
+ getPerms() {
+ var val = this.$store.state.currentPerms;
+ var permsEntity = this.$store.state.permsEntity;
+
+ if (permsEntity.length == 0) {
+ getPerms().then((res) => {
+ if (res.code == 200) {
+ permsEntity = res.result;
+ }
+ });
+ }
+ for (var i = 0; i < permsEntity.length; i++) {
+ if (permsEntity[i].perms == val) {
+ console.log(permsEntity[i])
+ this.showPermsMenu(permsEntity[i]);
+ }
+ }
+ },
},
mounted() {
this.getMenuTree();
+ this.getPerms();
},
created() {
- var val = this.$store.state.currentPerms;
- var permsEntity = this.$store.state.permsEntity;
- for (var i = 0; i < permsEntity.length; i++) {
- if (permsEntity[i].perms == val) {
- this.showPermsMenu(permsEntity[i]);
- }
- }
+ // var val = this.$store.state.currentPerms;
+ // var permsEntity = this.$store.state.permsEntity;
+ // for (var i = 0; i < permsEntity.length; i++) {
+ // if (permsEntity[i].perms == val) {
+ // this.showPermsMenu(permsEntity[i]);
+ // }
+ // }
},
};
</script>
--
Gitblit v1.9.3