Skip to content

F
founder_vue
Commit b310822e by 李萌萌
Options

数据地址修改；日志系统添加统一登陆

parent 9be11a7c
Showing with 143 additions and 116 deletions
public/FMapClient/zzjgModelV4.js
......@@ -1151,6 +1151,10 @@ $(document).ready(function(){
}
}
if(!zzjglx&&locatData[locatData.length-1].zoom<mapZoomLevel){
zzjglx=locatData[locatData.length-1].zzjglx;
structureQueryInfo(zzjglx,pointX,pointY,isToCallBack);
}
}
//加载完组织机构后的回调函数
......
public/cfg/cfg.js
/*
* @Author: LMM
* @Date: 2021-08-23 11:19:49
* @LastEditTime: 2021-10-15 10:03:17
* @LastEditTime: 2021-11-11 10:46:24
* @LastEditors: Please set LastEditors
* @Description:配置文件
* @FilePath: \founder_vue\public\cfg\cfg.js
......@@ -142,6 +142,7 @@ window.pageConfig = {
{
name: "大比例尺",
datas: [
{
key: "1：500",
name: "1：500",
......@@ -225,18 +226,16 @@ window.pageConfig = {
name: "倾斜三维5cm",
serviceName: "suiyang（绥阳）",
type: "3D",
url:
"http://172.18.124.72:8082/3DServer/model/0b2801c22a7f485ca529d93028945b69/tileset.json",
url:"http://172.18.124.72:8082/3DServer/model/0b2801c22a7f485ca529d93028945b69/tileset.json",
//经度（度） 维度（度） 高度（米） 航向角（度,正北为0） 俯仰角（度） 旋转角（度）
center: [107.188149, 27.9515, 500],
center: [107.188149, 27.9515, 500,0,-45,0],
},
{
key: "倾斜三维2cm",
name: "倾斜三维2cm",
serviceName: "xyzx（旬邑中学）",
url:
"http://172.18.124.72:8082/3DServer/model/6a2bfb1bdeab477aa46a98499e6e6bd3/tileset.json",
center: [108.32142, 35.09526, 800],
url:"http://172.18.124.72:8082/3DServer/model/6a2bfb1bdeab477aa46a98499e6e6bd3/tileset.json",
center: [108.321, 35.103, 800],
type: "3D",
},
{
......@@ -256,9 +255,9 @@ window.pageConfig = {
key: "倾斜三维精修",
name: "倾斜三维精修",
serviceName: "ylnz（杨凌南站）",
url:
"http://172.18.124.72:8082/3DServer/model/8d2351621f064ee886453567dd8a0411/tileset.json",
center: [108.0481, 34.2493, 500],
//dixing:'http://172.18.124.72:9000/terrain/b0c184502c9e11ec9661c5f1e6ff281b',
url:"http://172.18.124.72:8082/3DServer/model/8d2351621f064ee886453567dd8a0411/tileset.json",
center: [108.047, 34.251, 500,0,-45,0],
type: "3D",
},
],
......@@ -279,16 +278,15 @@ window.pageConfig = {
"http://172.18.124.72:8082/3DServer/model/50d83feca7114cc6b90b2113b46d3f7f/tileset.json",
"http://172.18.124.72:8082/3DServer/model/42bfe8235a464be1b37feaa9991c86d8/tileset.json",
],
center: [116.795, 33.947, 500],
center: [116.791, 33.946, 500,34,-25,0],
type: "3D",
},
{
key: "室内三维",
name: "室内三维",
serviceName: "snsw",
url:
"http://172.18.124.72:8082/3DServer/model/a6fae84ff7a04fbfab546dfd2dfdfea8/tileset.json",
center: [116.307, 39.9825, 80],
url:"http://172.18.124.72:8082/3DServer/model/a6fae84ff7a04fbfab546dfd2dfdfea8/tileset.json",
center: [116.30685, 39.98247, 85.5,12.9,-38,0],
type: "3D",
},
{
......@@ -340,23 +338,16 @@ window.pageConfig = {
"http://172.18.124.72:8082/3DServer/model/4bf5e9133cb64eb6819be44fc77832d4/tileset.json",
"http://172.18.124.72:8082/3DServer/model/664ae2c429e642fda0718de3b4582a3e/tileset.json",
],
center: [123.299, 41.959, 500],
center: [123.298, 41.961, 218,0,-31,0],
type: "3D_dth",
},
{
key: "建筑物三维",
name: "建筑物三维",
serviceName: "lz（兰州三维建筑物）",
url:
"http://172.18.71.226:8083/data/sjcsdata/lzjzw3dtiles/tileset.json",
// "http://172.18.124.72:8082/3DServer/model/ebe0c7c1716e464a8ce653f90b6dc6a4/tileset.json",
url: "http://172.18.124.72:8082/3DServer/model/ebe0c7c1716e464a8ce653f90b6dc6a4/tileset.json",
center: [103.846, 36.05, 500, 0, -40, 0],
type: "3D",
imgLayer: {
url:
"http://172.18.71.226:8082/EzServer7/WMTS?SERVICE=WMTS&layer=gansusheng_k&style=default&tilematrixset=c&Request=GetTile&Version=1.0.0&Format=tile&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}",
// tileMatrixLabels: ["8", "9", "10", "11", "12", "13", "14", "15", "16"],
},
},
{
key: "BIM三维",
......@@ -368,7 +359,7 @@ window.pageConfig = {
// tileMatrixLabels: ["8", "9", "10", "11", "12", "13", "14", "15", "16"],
},
dixing:
"http://172.18.71.238:9000/terrain/3fe905d06f0f11eab88a15117020caa9",
"http://172.18.124.72:9000/terrain/b0c184502c9e11ec9661c5f1e6ff281b",
url: [
"http://172.18.71.226:8083/data/zhunyibim/A区/1号楼/外装/tileset.json",
"http://172.18.71.226:8083/data/zhunyibim/A区/1号楼/土建/tileset.json",
......@@ -467,9 +458,9 @@ window.pageConfig = {
key: "倾斜三维地图",
name: "倾斜三维地图",
serviceName: "倾斜三维地图",
url: _701EzServer,
center: [116.73, 39.885],
zoom: 15,
url: "http://172.18.124.72:8082/3DServer/model/6a2bfb1bdeab477aa46a98499e6e6bd3/tileset.json",
center: [108.32142,35.09526, 800],
type:"3D",
},
{
key: "仿真三维地图",
......@@ -492,9 +483,8 @@ window.pageConfig = {
key: "2.5维地图",
name: "2.5维地图",
serviceName: "2.5WDT",
url: _701EzServer,
center: [116.73, 39.885],
zoom: 15,
type: "html",
url:"http://172.18.124.72:8082/FMapClient8.0.4/gy25w.html",
},
{
key: "室内二维地图",
......@@ -538,10 +528,10 @@ window.pageConfig = {
{
key: "移动端地图",
name: "移动端地图",
serviceName: "JJDT",
serviceName: "SLDT",
url: _701EzServer,
center: [106.564, 26.59],
zoom: 18,
center: [117.18868664550783,39.044290809631356],
zoom: 14,
},
{
key: "智慧小区",
......@@ -551,32 +541,29 @@ window.pageConfig = {
},
{
key: "智慧校园",
name: "智慧小区",
type: "html",
url: "http://172.18.124.72:8082/FMapClient8.0.4/qinghaisw.html",
name: "智慧校园",
type: "3D",
dixing:'http://172.18.124.72:9000/terrain/b0c184502c9e11ec9661c5f1e6ff281b',
url: "http://172.18.124.72:8082/3DServer/model/b5d10b4671c24136ac5c4498dd8c283c/tileset.json",
center: [101.6947,36.6419, 2973.0, 0, -45, 0],
},
{
key: "智慧园林",
name: "智慧园林",
serviceName: "SLGA",
url: _701EzServer,
center: [85.93505859375, 41.642303466796875],
zoom: 13,
url:"http://172.18.124.72:8082/3DServer/model/32a4a946332841e086903b4359dc30dc/tileset.json",
type: "3D",
dixing:"http://172.18.124.72:9000/terrain/b0c184502c9e11ec9661c5f1e6ff281b",
},
{
key: "大型活动安保",
name: "大型活动安保",
serviceName: "DXHDAB",
imgLayer: {
url:
"http://172.18.124.72:8082/EzServer701/WMTS?SERVICE=WMTS&layer=DXHDAB&style=default&tilematrixset=c&Request=GetTile&Version=1.0.0&Format=tile&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}",
},
url:
"http://172.18.124.72:8082/3DServer/model/ebff0ec842e945fc91c47fef77459879/tileset.json",
center: [85.93505859375, 41.642303466796875],
zoom: 13,
url:"http://172.18.124.72:8082/3DServer/model/ebff0ec842e945fc91c47fef77459879/tileset.json",
type: "3D",
dixing:"http://172.18.124.72:9000/terrain/b0c184502c9e11ec9661c5f1e6ff281b",
center: [106.91450,27.64675, 3625,0, -28, 0],
},
{
......@@ -584,7 +571,7 @@ window.pageConfig = {
name: "森林专题",
serviceName: "SLGA",
url: _701EzServer,
center: [85.93505859375, 41.642303466796875],
center: [85.78465396879874,43.79748791188872],
zoom: 13,
},
],
......@@ -597,16 +584,16 @@ window.pageConfig = {
name: "正射影像",
serviceName: "HUAYIN",
url: _701EzServer,
center: [110.09, 34.553],
zoom: 10,
center: [110.0869329561074,34.55095742336285],
zoom: 20,
},
{
key: "倾斜三维",
name: "倾斜三维",
serviceName: "HUAYIN",
url: _701EzServer,
center: [110.09, 34.553],
zoom: 10,
type: "3D",
dixing:"http://172.18.124.72:9000/terrain/b0c184502c9e11ec9661c5f1e6ff281b",
url: "http://172.18.124.72:8082/3DServer/model/6b50181008814d1c8d70b00d6595d5d8/tileset.json",
},
],
},
......@@ -808,6 +795,6 @@ window.pageConfig = {
//运维页面
yunweiUrl: "http://172.18.124.72/PGIS_TL_Privilege/#",//"http://172.18.124.93/fmanagerWeb/#",//
// 日志页面
rizhiUrl: "http://172.18.124.72/flogmanagerWeb",//"http://172.18.124.93/flogmanagerWeb",//
rizhiUrl: "http://172.18.124.72/flogmanagerWeb/#",//"http://172.18.124.93/flogmanagerWeb",//
},
};
};
\ No newline at end of file
src/api/yunwei.js
/*
* @Author: your name
* @Date: 2021-08-31 17:28:41
* @LastEditTime: 2021-10-11 16:41:01
* @LastEditTime: 2021-11-12 13:53:59
* @LastEditors: Please set LastEditors
* @Description: 记录运维日志
* @FilePath: \founder_vue\src\api\yunwei.js
......@@ -70,25 +70,48 @@ function getDatetime() {
second = second < 10 ? "0" + second : second;
return y + "-" + m + "-" + d + " " + h + ":" + minute + ":" + second;
}
var description = "",
functionName = "",
modelName = "",
name = "时空数据展示平台";
// 初始化日志参数
function initLogParam() {
(description = ""),
(functionName = ""),
(modelName = ""),
(name = "时空数据展示平台");
}
// 记录日志
function addLogFunc(parameter) {
if (parameter.description) {
description = parameter.description;
}
if (parameter.functionName) {
functionName = parameter.functionName;
}
if (parameter.modelName) {
modelName = parameter.modelName;
}
if (parameter.name) {
name = parameter.name;
}
const param = {
//操作人账户
account: parameter.account || getAccount(),
// 客户端ip
clientAddress: getIPAdress(),
// 备注
description: parameter.description || "",
description: parameter.description || description,
// 操作的方法名称
functionName: parameter.functionName || "",
functionName: parameter.functionName || functionName,
// 服务端ip
ip: getServerIPAdress(),
// 日志类型: 1-登录，2-添加，3-修改，4-删除，5-查询 ，6-其他
logType: parameter.logType || 5,
// 操作的模块名称
modelName: parameter.modelName || "",
modelName: parameter.modelName || modelName,
// 系统名称
name: "时空数据展示平台",
name: parameter.name || name,
// 操作时间
operateTime: getDatetime(),
// 操作人名称
......@@ -97,13 +120,15 @@ function addLogFunc(parameter) {
return post(rizhiIP, param);
}
export function addLog(parameter) {
// return;
export function addLog(parameter, isInitParam) {
if (isInitParam) {
initLogParam();
}
addLogFunc(parameter)
.then((result) => {
let res = result.data;
if (res.result === "SUCCESS") {
console.log(parameter.modelName);
console.log(parameter);
} else {
console.error(res.result);
}
......
src/utils/map.js
/*
* @Author: your name
* @Date: 2021-08-11 14:55:07
* @LastEditTime: 2021-10-08 17:38:56
* @LastEditTime: 2021-11-10 10:58:26
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\utils\map.js
*/
import markerpng from "../assets/img/marker.png";
import { saveAs } from "file-saver";
import { addLog } from "../api/yunwei";
//—————————————————————————————————— 绘制保存相关————————————————————————————————————————————
let _source, _draw, _snap, _modify;
let curIndex = 1;
......@@ -239,10 +238,6 @@ function _add2DwmtsLayer(opts) {
curLayer = new Ez.TileLayer.WMTS("test", opts.url, opt);
window.map.addLayer(curLayer);
changeMapCenter(opts.center, opts.zoom);
addLog({
functionName: "查看地图",
modelName: opts.serviceName,
});
}
function _remove2DwmtsLayer() {
_remove2dLayer();
......@@ -255,10 +250,6 @@ function _add2DEzMapLayer(opts) {
});
window.map.addLayer(curLayer);
changeMapCenter(opts.center, opts.zoom);
addLog({
functionName: "查看地图",
modelName: opts.serviceName,
});
}
function _remove2DEzMapLayer() {
_remove2dLayer();
......@@ -288,10 +279,6 @@ function _remove2DwmtsslLayer() {
function _add2DxyzLayer(opts) {
curLayer = new Ez.TileLayer.xyz(opts.serviceName, opts.url);
window.map.addLayer(curLayer);
addLog({
functionName: "查看地图",
modelName: opts.serviceName,
});
changeMapCenter(opts.center, opts.zoom);
}
function _remove2DxyzLayer() {
......@@ -312,17 +299,17 @@ function _add3DLayer(opts) {
window.viewer.scene.primitives.add(_3DTileset_temp);
curLayer.push(_3DTileset_temp);
});
viewer.flyTo(curLayer[0]);
opts.center ? changeViewerCenter(opts.center) : viewer.flyTo(curLayer[0]);
} else {
curLayer = new Cesium.Cesium3DTileset({
url: url,
});
window.viewer.scene.primitives.add(curLayer);
viewer.flyTo(curLayer);
opts.center ? changeViewerCenter(opts.center) : viewer.flyTo(curLayer);
}
changeViewerCenter(opts.center);
// changeViewerCenter(opts.center);
}
function _remove3DLayer() {
changeViewerCenter([116, 39, 20000000, 5]);
......@@ -414,11 +401,6 @@ function addImageryLayer(layerObj) {
let layer = add3DBaseLayer(layerObj);
_temp3DLayer.push(layer);
}
addLog({
functionName: "查看三维地图",
modelName: layerObj.toString(),
});
}
function add3DBaseLayer(obj) {
let tempLayer = null;
......
src/views/block/homePageRightButton.vue
......@@ -67,7 +67,17 @@ export default {
switch (this.pageStr) {
case "visit":
// 访问流量
window.open(window.pageConfig.utilData.rizhiUrl);
// window.open(window.pageConfig.utilData.rizhiUrl);
var user = JSON.parse(sessionStorage.getItem("logindata"));
var url =
window.pageConfig.utilData.rizhiUrl +
"/login?username=" +
user.account +
"&password=" +
user.password +
"&type=form";
// 用户管理
window.open(url);
break;
case "userManage":
case "register":
......@@ -92,7 +102,7 @@ export default {
const userJson = sessionStorage.getItem("userdata");
const user = JSON.parse(userJson);
const _this = this;
if (user.authList && user.authList.length.length > 0) {
if (user.authList && user.authList.length > 0) {
user.authList.forEach((auth) => {
_this.authListStr.push(auth.authName);
});
......
src/views/block/layerArrayBox.vue
<!--
* @Author: your name
* @Date: 2021-08-23 11:12:35
* @LastEditTime: 2021-09-23 18:14:03
* @LastEditTime: 2021-11-12 14:01:30
* @LastEditors: Please set LastEditors
* @Description: 左侧图层组界面
* @FilePath: \founder_vue\src\views\block\layerArrayBox.vue
......@@ -34,6 +34,7 @@ import {
removeLayer,
changeMapBaselayerVisible,
} from "../../utils/map";
import { addLog } from "../../api/yunwei";
import icon1 from "@/assets/img/icon1.png";
import icon2 from "@/assets/img/icon2.png";
import icon3 from "@/assets/img/icon3.png";
......@@ -116,6 +117,9 @@ export default {
this.$emit("changeBaseLayerVisible", true);
}
}
addLog({
description:"取消选择"
});
event.stopPropagation();
},
},
......
src/views/block/mapTool.vue
<!--
* @Author: LMM
* @Date: 2021-08-11 10:43:50
* @LastEditTime: 2021-09-23 17:51:26
* @LastEditTime: 2021-11-12 13:55:16
* @LastEditors: Please set LastEditors
* @Description: 右上角地图工具
* @FilePath: \founder_vue\src\views\block\mapTool.vue
......@@ -92,7 +92,8 @@ export default {
let zzjgParams = {
ezmap: window.map,
locatData: locatData,
loadLocatZzjgCallBack: function() {},
loadLocatZzjgCallBack: function() {
},
fristListZzjgCallBack: function() {},
secondListZzjgCallBack: function() {},
topListZzjgCallBack: function() {},
......
src/views/block/oneTypeLayerArr.vue
<!--
* @Author: your name
* @Date: 2021-08-24 10:18:28
* @LastEditTime: 2021-09-22 16:03:46
* @LastEditTime: 2021-11-10 10:57:29
* @LastEditors: Please set LastEditors
* @Description: 单个数据组
* @FilePath: \founder_vue\src\views\block\oneTypeLayerArr.vue
......@@ -32,6 +32,7 @@
</a-tabs>
</template>
<script>
import { addLog } from "../../api/yunwei";
export default {
name: "oneTypeLayerArr",
props: {
......@@ -58,7 +59,14 @@ export default {
},
methods: {
change(type, itemData) {
this.$emit("change", type, itemData);
this.$emit("change", type, itemData, this.data.name);
// 记录日志
addLog({
name: this.data.name,
functionName: type,
modelName: itemData.name,
description:"数据切换"
});
},
},
};
......
src/views/block/searchBox.vue
<!--
* @Author: your name
* @Date: 2021-08-23 11:01:50
* @LastEditTime: 2021-08-23 11:11:48
* @LastEditTime: 2021-11-12 14:17:09
* @LastEditors: Please set LastEditors
* @Description: 左上角搜索框
* @FilePath: \founder_vue\src\views\block\searchBox.vue
......@@ -11,6 +11,7 @@
<a-input-search
placeholder="请输入搜索值"
enter-button
@change="txtChange"
@search="onSearch"
/>
</div>
......@@ -19,22 +20,27 @@
export default {
name: "searchBox",
data() {
return {};
return {
txtChange: null,
};
},
methods: {
onSearch(txt) {
console.log(txt);
},
},
created() {
this.txtChange = $("#zzjgSearchInput").change;
},
};
</script>
<style lang="scss" scoped>
.searchBox{
position: absolute;
top:86px ;
left: 20px;
width: 320px;
height: 40px;
z-index: 3;
.searchBox {
position: absolute;
top: 86px;
left: 20px;
width: 320px;
height: 40px;
z-index: 3;
}
</style>
src/views/map/3DMap.vue
<!--
* @Author: LMM
* @Date: 2021-08-09 14:57:49
* @LastEditTime: 2021-09-16 15:33:36
* @LastEditTime: 2021-11-10 17:43:21
* @LastEditors: Please set LastEditors
* @Description: 三维地图
* @FilePath: \founder_vue\src\views\map\3Dview.vue
......@@ -66,7 +66,7 @@ export default {
window.viewer.imageryLayers.addImageryProvider(imgLayer);
});
window.viewer.scene.globe.depthTestAgainstTerrain = true;
window.viewer.scene.globe.depthTestAgainstTerrain = false;
// this.flyHome();
this.addEvent();
},
......@@ -102,7 +102,6 @@ export default {
let str =
"中心点：" + center[0] + "," + center[1] + "；相机高度：" + center[2];
addLog({
functionName: "地图缩放",
modelName: str,
});
});
......
src/views/map/imgPage.vue
<!--
* @Author: your name
* @Date: 2021-09-23 17:58:36
* @LastEditTime: 2021-10-18 18:13:10
* @LastEditTime: 2021-11-10 17:42:08
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\map\imgPage.vue
......@@ -21,8 +21,7 @@
</a-carousel>
</div>
</template>
<script>
import { addLog } from "../../api/yunwei";
<script>
export default {
props: {
mapInfo: { type: Object, default: {} },
......
src/views/map/map.vue
<!--
* @Author: LMM
* @Date: 2021-08-09 10:08:57
* @LastEditTime: 2021-09-02 18:05:06
* @LastEditTime: 2021-11-11 17:50:05
* @LastEditors: Please set LastEditors
* @Description: 地图
* @FilePath: \founder_vue\src\views\map.vue
......@@ -33,15 +33,16 @@ export default {
},
addMapEvent() {
window.map.on("moveend", function(e) {
var center = map
.getCenter()
.getCoordinate()
.toString(),
// center = map
// .getCenter()
// .getCoordinate()
// .toString(),
// zoom = window.map.getZoom();
var center = $("#locationLabel span")[0].innerText,
zoom = window.map.getZoom();
let str = "中心点：" + center + ";级别：" + zoom;
let str = center + "：" + zoom;
addLog({
functionName: "地图缩放",
modelName: str,
description: str,
});
});
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment