Commit b310822e by 李萌萌

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

parent 9be11a7c
......@@ -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);
}
}
//加载完组织机构后的回调函数
......
/*
* @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);
}
......
/*
* @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;
......
......@@ -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);
});
......
<!--
* @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();
},
},
......
<!--
* @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() {},
......
<!--
* @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:"数据切换"
});
},
},
};
......
<!--
* @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>
<!--
* @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,
});
});
......
<!--
* @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: {} },
......
<!--
* @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