瀏覽代碼

git-svn-id: https://192.168.57.71/svn/qt@43 12fe181a-e57f-b044-8676-16dc139aa63e

ld_zhoutl 9 年之前
父節點
當前提交
02eaa9fe7d

+ 70 - 0
jdc/jdcweb/trunk/src/main/webapp/WEB-INF/view/sys/changePwd.jsp

@@ -0,0 +1,70 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2015/8/8
+  Time: 14:06
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<!DOCTYPE html>
+<html>
+<head>
+	<link href="${ctx}/static/easyui/themes/gray/easyui.css" rel="stylesheet" />
+	<link rel="stylesheet" type="text/css" href="${ctx}/static/easyui/themes/icon.css">
+    <link rel="stylesheet" type="text/css" href="${ctx}/assets/semantic.min.css">
+    <style type="text/css">
+		.divbtn {
+		    float:left;margin:0px 0px 10px 8px;padding:5px 0px 0px 0px;color:white;cursor:pointer;
+        	width:75px;height:28px;background-color:#FFBF51;text-align:center;border-radius:3px;
+		}
+	</style>
+	<script type="text/javascript" src="${ctx}/static/easyui/jquery.min.js"></script>
+	<script type="text/javascript"
+		src="${ctx}/static/easyui/jquery.easyui.min.js"></script>
+	<script type="text/javascript"
+		src="${ctx}/static/easyui/locale/easyui-lang-zh_CN.js"></script>
+	<script type="text/javascript" src="${ctx}/static/layer/layer.js"></script>
+    <script src="${ctx}/assets/semantic.min.js"></script>
+	<script type="text/javascript">
+		var basePath = '${ctx}';
+		var flg = '${flg}';
+	</script>
+	<script type="text/javascript"
+		src="${ctx}/static/xt/js/sys/changePwd.js"></script>
+	<title>任务信息</title>
+</head>
+<body style="overflow: hidden">
+	<div style="height:195px;overflow-x:hidden;overflow-y:hidden;">
+		<table class="ui celled table" style="width:300px;margin:20px 30px 0px 30px;">
+	        <tbody>
+				<tr style="color:#00AA00;">
+	                <td align="center">用户名</td>
+	                <td align="center">${userName }</td>
+	            </tr>
+				<tr style="color:#00AA00;">
+	                <td align="center">原密码</td>
+	                <td align="center">
+	                	<input type="password" id="oldPassword" name="oldPassword" maxlength="50"
+							style="width:200px;height:30px;border:0;outline: none;"
+							placeHolder="请输入原密码">
+	                </td>
+	            </tr>
+				<tr style="color:#00AA00;">
+	                <td align="center">新密码</td>
+	                <td align="center">
+	                	<input type="password" id="newPassword" name="newPassword" maxlength="50"
+							style="width:200px;height:30px;border:0;outline: none;"
+							placeHolder="请输入新密码">
+	                </td>
+	            </tr>
+	        </tbody>
+	    </table>
+	</div>
+	<div style="text-align:center;margin-top:5px;margin-left:80px;">
+    	<div class="divbtn" style="background-color:#FFBF51;margin-left:20px;" onclick="savePwd()">保存</div>
+    	<div class="divbtn" style="background-color:#B5B5B5;margin-left:20px;" onclick="closeWin()">关闭</div>
+    </div>
+</body>
+</html>

+ 6 - 0
jdc/jdcweb/trunk/src/main/webapp/WEB-INF/view/sys/home.jsp

@@ -16,9 +16,15 @@
 	</script>
 	<link rel="stylesheet" type="text/css" href="${ctx }/static/xt/css/home.css" />
 	<script type="text/javascript" src="${ctx}/static/easyui/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/static/layer/layer.js"></script>
+    <link rel="stylesheet" type="text/css" href="${ctx}/static/xt/css/main.css">
 	<script type="text/javascript" src="${ctx}/static/xt/js/sys/home.js"></script>
 </head>
 <body class="h_bg">
+	<div class="h_setting">
+		<img id="imgSys" src="${ctx }/static/xt/images/home/系统设置.png" title="系统设置" class="h_xtszicon">
+		<img src="${ctx }/static/xt/images/home/密码.png" title="修改密码" class="h_xgmmicon" onclick="changePwd()">
+	</div>
 	<div class="h_logodiv">
 		<img src="${ctx }/static/xt/images/home/logo.png" class="h_logoimg">
 	</div>

+ 16 - 1
jdc/jdcweb/trunk/src/main/webapp/static/xt/css/home.css

@@ -4,7 +4,7 @@
 	-moz-background-size:cover;-webkit-background-size:cover;
 }
 .h_logodiv {
-	padding-top:2em;
+	padding-top:0em;
 	text-align:center;
 }
 .h_logoimg {
@@ -114,3 +114,18 @@
 	width:25px;
 	height:25px;
 }
+
+.h_setting {
+	padding-top:1em;
+	margin:0px 30px 0px 0px;
+	text-align:right;
+}
+
+.h_xtszicon {
+	display:none;
+	cursor:pointer;
+}
+
+.h_xgmmicon {
+	cursor:pointer;
+}

+ 2 - 0
jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/basic_info.js

@@ -53,6 +53,8 @@ var water_features_url = "http://10.1.30.116:8090/iserver/services/map-GKZY/rest
 var img_base_url        = "http://10.1.30.111:8191/iserver/services/map-ugcv5-jshdimage/rest/maps/jshdimage";
 var base_features_url   = "http://10.1.30.111:8191/iserver/services/map-rest-GZCX_map2/rest/maps/GZCX_map";
 var railway_city_url    = "http://10.1.30.111:8191/iserver/services/map-rest-GZCX_map2/rest/maps/JSCities";
+var railway_base_url    = "http://10.1.30.111:8095/iserver/services/map-mongodb-JSGISTGK2/rest/maps/JSGIST-GK";
+var railway_route_url    = "http://10.1.30.116:8090/iserver/services/map-jstl2/rest/maps/jstl";
 // 江苏市界
 var sj_url =            "http://10.1.30.116:8090/iserver/services/data-GKZY/rest/data/datasources/GKZYData/datasets/L_SJ_PY";
 

+ 47 - 0
jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/changePwd.js

@@ -0,0 +1,47 @@
+/**
+ * 指挥-任务-用户
+ */
+
+
+$(function(){
+    
+})
+
+/**
+ * 保存按钮
+ */
+function savePwd() {
+	var oldPassword = $("#oldPassword").val();
+	var newPassword = $("#newPassword").val();
+	if(newPassword.length < 6) {
+    	$.messager.alert('提示','密码长度必须大于六位!');
+    	return;
+	}
+	$.get(basePath + "/userManage/changePwd", {
+		"oldPassword":oldPassword,
+		"newPassword":newPassword
+	}, function (result) {
+		console.info(result);
+        if(result) {
+        	if(result.success == true) {
+        		$.messager.alert('提示','密码修改成功!', null, function(){
+        			closeWin();
+                });
+        	}
+        	if(result.success == false) {
+            	$.messager.alert('提示',result.message);
+        	}
+        } else {
+        	$.messager.alert('提示','密码修改失败!');
+        }
+    }, 'json');
+}
+
+/**
+ * 关闭当前窗口
+ */
+function closeWin() {
+    var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+    parent.layer.close(index);
+}
+

+ 23 - 11
jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/common_railway.js

@@ -3,22 +3,19 @@
  */
 var hczMarkerlayer;  //火车站图层
 var map;
-var railBaseLayer;
+var railBaseLayer, railBaseLayer2;
 var vectorLayer;
 var railLineFeatures = [];
 var basicType;
 
 /** 页面初始化 */
 $(function () {
-    initRailMap(base_url);
-    initRail();
+    initRailMap();
     // 图层
     basicType = [
         {"id": tc_jtsn, "type": "railway", label: "交通枢纽", layer: jtsnMarkerlayer},
         {"id": tc_ptzd, "type": "railway", label: "普通站点", layer: ptzdMarkerlayer}
     ];
-    // 设置图层选中事件
-    getRailLayerItems();
     // 查询题录列表
     showRailList();
     // 调整左边栏显示高度和宽度
@@ -87,7 +84,7 @@ function initRailBasicInfoEvent(name) {
  *初始化地图
  *
  */
-function initRailMap(baseUrl) {
+function initRailMap() {
     /**
      * 初始化地图
      * @type {SuperMap.Map}
@@ -97,10 +94,10 @@ function initRailMap(baseUrl) {
             //new SuperMap.Control.LayerSwitcher(),
             new SuperMap.Control.Navigation(),
             new SuperMap.Control.MousePosition()
-        ]
+        ], allOverlays:true
     });
     //初始化图层
-    railBaseLayer = new SuperMap.Layer.TiledDynamicRESTLayer("底图", baseUrl, {
+    railBaseLayer = new SuperMap.Layer.TiledDynamicRESTLayer("底图", base_url, {
         transparent: true,
         cacheEnabled: true
     }, {maxResolution: "auto"});
@@ -112,16 +109,28 @@ function initRailMap(baseUrl) {
     //监听图层信息加载完成事件
 
 
-    railBaseLayer.events.on({"layerInitialized": addRailLayer});
+    railBaseLayer.events.on({"layerInitialized": addRailLayer1});
 
 }
 
+function addRailLayer1() {
+    //初始化图层
+    railBaseLayer2 = new SuperMap.Layer.TiledDynamicRESTLayer("底图2", railway_route_url, {
+        transparent: true,
+        cacheEnabled: true
+    });
+    railBaseLayer2.events.on({"layerInitialized": addRailLayer});
+}
+
 function addRailLayer() {
     railBaseLayer.isBaseLayer = true;
-    map.addLayers([railBaseLayer]);
+    railBaseLayer2.isBaseLayer = true;
+    map.addLayers([railBaseLayer, railBaseLayer2]);
 
     //显示地图范围
     map.setCenter(new SuperMap.LonLat(119.7401215, 32.985849),4);
+
+    initRail();
 }
 
 function initRail() {
@@ -139,7 +148,10 @@ function initRail() {
 //
 //    queryUTFGrid(params,base_features_url, railProcessCompleted);
     // 获取铁路列表
-    getTLXList();
+    //getTLXList();
+    
+    // 设置图层选中事件
+    getRailLayerItems();
 }
 
 

+ 49 - 25
jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/home.js

@@ -5,6 +5,10 @@
  */
 /** 页面初始化 */
 $(function () {
+    //弹出层样式
+    layer.config({
+        skin: 'demo-class'
+    });
 	adjustBlock();
 	getPermission();
 });
@@ -17,30 +21,36 @@ function getPermission() {
             if(result && result.length > 0) {
                 for(var i=0; i <result.length;i++) {
                 	var obj = result[i];
-        			//console.info(obj.attributes.url);
-            		var img = $("#"+obj.attributes.code).find("img")[0];
-            		$(img).css('cursor', "pointer");
-            		$(img).attr('src', basePath + "/" +obj.attributes.icon2);
-            		$(img).click({top: obj}, function(event){
-            			var obj1 = event.data.top;
-            			window.open(basePath+obj1.attributes.url);
-            		});
-            		$(img).mouseover({top: obj},function(event){
-            			var obj1 = event.data.top;
-            			var sIndex = obj1.attributes.icon2.lastIndexOf("/");
-            			var pIndex = obj1.attributes.icon2.lastIndexOf(".");
-            			var filename = obj1.attributes.icon2.substr(sIndex+1, pIndex - sIndex - 1);
-            			var path = obj1.attributes.icon2.substr(0, sIndex+1);
-            			console.info(filename);
-            			console.info(path);
-            			this.src = basePath + "/" + path + filename + "_over.png";
-            		});
-            		$(img).mouseout({top: obj},function(event){
-            			var obj1 = event.data.top;
-            			this.src = basePath + "/" +obj1.attributes.icon2;
-            		});
-            		// 获取二级菜单
-            		getMenus(obj.id, obj.attributes.code);
+        			if("sys" == obj.attributes.code) {
+        				$("#imgSys").css("display","inline");
+        				$("#imgSys").click({top: obj}, function(event){
+                			var obj1 = event.data.top;
+                			window.open(basePath+obj1.attributes.url);
+                		});
+        			} else {
+                		var img = $("#"+obj.attributes.code).find("img")[0];
+                		$(img).css('cursor', "pointer");
+                		$(img).attr('src', basePath + "/" +obj.attributes.icon2);
+                		$(img).click({top: obj}, function(event){
+                			var obj1 = event.data.top;
+                			window.open(basePath+obj1.attributes.url);
+                		});
+                		// 鼠标移入一出事件
+                		$(img).mouseover({top: obj},function(event){
+                			var obj1 = event.data.top;
+                			var sIndex = obj1.attributes.icon2.lastIndexOf("/");
+                			var pIndex = obj1.attributes.icon2.lastIndexOf(".");
+                			var filename = obj1.attributes.icon2.substr(sIndex+1, pIndex - sIndex - 1);
+                			var path = obj1.attributes.icon2.substr(0, sIndex+1);
+                			this.src = basePath + "/" + path + filename + "_over.png";
+                		});
+                		$(img).mouseout({top: obj},function(event){
+                			var obj1 = event.data.top;
+                			this.src = basePath + "/" +obj1.attributes.icon2;
+                		});
+                		// 获取二级菜单
+                		getMenus(obj.id, obj.attributes.code);
+        			}
                 }
             }
         }, 'json');
@@ -96,6 +106,9 @@ function openSubPage(code, url, pcode) {
 	if(code == "skyView") {
 		$("#aLink").attr("href", url);
 		$("#spanId").click();
+	} if(code == "adsb") {
+		$("#aLink").attr("href", url);
+		$("#spanId").click();
 	} else if(code == "cxw") {
 		window.open(url);
 	} else if(code == "hsais") {
@@ -134,4 +147,15 @@ function menuMouseOver(obj) {
 
 function menuMouseOut(obj) {
 	$(obj).removeClass("h_menudivmouse");
-};
+};
+
+function changePwd() {
+	layer.open({
+        type: 2,
+        title: "修改密码",
+        shadeClose: false,
+        shade: 0.1,
+        area: ['360px', '320px'],
+        content: basePath + '/userManage/pwd'
+    });
+}