浏览代码

Update 调整优化首页

Yue 2 年之前
父节点
当前提交
473a1faa59
共有 2 个文件被更改,包括 215 次插入206 次删除
  1. 4 4
      VbdsmUI_V2.1.1/src/pc/manage/classic.html
  2. 211 202
      VbdsmUI_V2.1.1/src/pc/manage/desktop.html

+ 4 - 4
VbdsmUI_V2.1.1/src/pc/manage/classic.html

@@ -26,7 +26,6 @@
 				width: 0px;
 			}
 		</style>
-		<script src="./plugin/weather/index.js" type="text/javascript"></script>
 		<script charset="UTF-8" type="text/javascript"></script>
 	</head>
 
@@ -44,12 +43,12 @@
 					<div class="right_navbar">
 						<!--<a id="toDesktopBtn" class="easyui-linkbutton">切换到桌面版</a>-->
 						<div class="weatherWX" id="weatherWX"></div>
-						<div class="portrait">
+						<!-- <div class="portrait">
 							<a><img src="css/img/head.png" /></a>
 							<ul>
 								<li data-target="#myModal" data-toggle="modal">关于我们</li>
 							</ul>
-						</div>
+						</div> -->
 						<a class="monitoringSite" href="#">
 							<span class="text">监测点运行情况</span>
 							<div class="message">
@@ -67,7 +66,7 @@
 								</div>
 							</div>
 						</a>
-						<a class="bigScreen" href="">适控观象台</a>
+						<!-- <a class="bigScreen" href="">适控观象台</a> -->
 						<div class="setting"><a id="basicBtn" src="setting.html?system">个人设置</a></div>
 						<a class="log-out" id="logoutBtn">退出登录</a>
 					</div>
@@ -161,5 +160,6 @@
 		<script src="/js/yi-scroll.js" type="text/javascript"></script>
 		<script src="/js/underscore.js" type="text/javascript"></script>
 		<script src="/js/bootstrap.min.js" type="text/javascript"></script>
+		<script src="./plugin/weather/index.js" type="text/javascript"></script>
 	</body>
 </html>

+ 211 - 202
VbdsmUI_V2.1.1/src/pc/manage/desktop.html

@@ -1,208 +1,217 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-		<meta content="webkit" name="renderer" />
-		<title>桌面 - 正在加载...</title>
-		<link href="/images/favicon.ico" id="favicon" rel="Shortcut Icon" />
-		<link href="http://static.vbdsm.com/css/bootstrap.css?ver=2.0" rel="stylesheet" />
-		<link href="http://static.vbdsm.com/css/font-awesome/css/font-awesome.css" rel="stylesheet" />
-		<!--[if IE 7]>
-			<link
-				rel="stylesheet"
-				href="http://static.vbdsm.com/css/font-awesome/css/font-awesome-ie7.css" />
-		<![endif]-->
-		<link href="http://static.vbdsm.com/js/lib/picasa/style/style.css?ver=2.0" rel="stylesheet" />
-
-		<link href="/css/skin/metro/desktop.css?ver=2.0" id="link_css_list" rel="stylesheet" />
-
-		<style media="screen" type="text/css">
-			.desktop {
-				background-image: url("/images/wall_page/14.jpg");
-				background-color: #222;
-			}
-
-			.alertbox {
-				float: left;
-				height: 21px;
-				width: 30px;
-				font-size: 18px;
-				padding-top: 7px;
-				color: #fff;
-				cursor: pointer;
-			}
-
-			.volume {
-				float: left;
-				height: 21px;
-				width: 22px;
-				font-size: 18px;
-				padding-top: 7px;
-				color: #fff;
-				cursor: pointer;
-			}
-
-			.badge {
-				text-align: center;
-				padding: 4px;
-				left: 10px;
-				top: -29px;
-				position: relative;
-				background: red;
-				border-radius: 10px;
-				width: auto;
-				height: 10px;
-				opacity: 0.8;
-				overflow: hidden;
-				z-index: 99980;
-			}
-		</style>
-
-		<script charset="UTF-8" type="text/javascript"></script>
-	</head>
-	<body oncontextmenu="return core.contextmenu();" style="overflow: hidden">
-		<div class="init_loading">
-			<div><img src="/images/loading_simple.gif" /></div>
-		</div>
-		<img class="wallbackground" src="" style="overflow: hidden; position: fixed" />
-		<div class="desktop" id="desktop-box"></div>
-
-		<script id="desktop-template" type="text/template">
-			<div class='bodymain html5_drag_upload_box desktop'>
-			    <div class="fileContiner fileList_icon hidden">
-
-			        <div class="file systemBox menuDefault" title="{{LNG.app_store}}"
-			             data-app='{"type":"app","width":"","height":"","content":"core.appStore();"}'>
-			            <div class="ico" filetype="oexe" style="background-image:url(/images/app/appstore.png)"></div>
-			            <div class="titleBox"><span>{{LNG.app_store}}</span></div>
-			        </div>
-
-			        <div class="file systemBox menuDefault" title="{{LNG.setting}}"
-			             data-app='{"type":"app","width":"","height":"","content":"core.setting();"}'>
-			            <div class="ico" filetype="oexe" style="background-image:url(/images/app/setting.png)"></div>
-			            <div class="titleBox"><span>{{LNG.setting}}</span></div>
-			        </div>
-			        <!--
-			        <div class="file systemBox menuRecycleButton" title="回收站"
-			        data-app='{"type":"app","width":"","height":"","content":"core.explorer('*recycle*/',LNG.recycle);"}'>
-			            <div class="ico" filetype="oexe" style="background-image:url(/images/app/recycle.png)"></div>
-			            <div class="titleBox" ><span>回收站</span></div>
-			        </div>
-			        -->
-			    </div>
-			</div><!-- html5拖拽上传list -->
-
-			<a class="start" style="cursor: pointer;"></a>
-			<div id="taskbar" style="display:block;">
-			    <div id="desktop"></div>
-			</div>
-			<div class="taskbar_right ">
-			    <div title="您有4条告警信息" class="alertbox" style="display:none;">
-			        <i class="fa fa-bell"></i>
-			        <span class="badge">4</span>
-			    </div>
-			    <div class="copyright dropdown-toggle" title="关于我们"><i class="fa fa-info-circle"></i></div>
-			    <div class="volume" style="display:none;">
-			        <div class="sound mp3" style="width:0px;height:0px;"></div>
-			        <span title="点击关闭声音" class="volume-on" style="display:block;"><i class=" fa fa-volume-up"></i></span>
-			        <span title="点击打开声音" class="volume-off fa-stack fa-lg" style="display:none;">
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+    <meta content="webkit" name="renderer"/>
+    <title>桌面 - 正在加载...</title>
+    <link href="/images/favicon.ico" id="favicon" rel="Shortcut Icon"/>
+    <link href="http://static.vbdsm.com/css/bootstrap.css?ver=2.0" rel="stylesheet"/>
+    <link href="http://static.vbdsm.com/css/font-awesome/css/font-awesome.css" rel="stylesheet"/>
+    <!--[if IE 7]>
+    <link
+            rel="stylesheet"
+            href="http://static.vbdsm.com/css/font-awesome/css/font-awesome-ie7.css"/>
+    <![endif]-->
+    <link href="http://static.vbdsm.com/js/lib/picasa/style/style.css?ver=2.0" rel="stylesheet"/>
+
+    <link href="/css/skin/metro/desktop.css?ver=2.0" id="link_css_list" rel="stylesheet"/>
+
+    <style media="screen" type="text/css">
+        .desktop {
+            background-image: url("/images/wall_page/14.jpg");
+            background-color: #222;
+        }
+
+        .alertbox {
+            float: left;
+            height: 21px;
+            width: 30px;
+            font-size: 18px;
+            padding-top: 7px;
+            color: #fff;
+            cursor: pointer;
+        }
+
+        .volume {
+            float: left;
+            height: 21px;
+            width: 22px;
+            font-size: 18px;
+            padding-top: 7px;
+            color: #fff;
+            cursor: pointer;
+        }
+
+        .badge {
+            text-align: center;
+            padding: 4px;
+            left: 10px;
+            top: -29px;
+            position: relative;
+            background: red;
+            border-radius: 10px;
+            width: auto;
+            height: 10px;
+            opacity: 0.8;
+            overflow: hidden;
+            z-index: 99980;
+        }
+
+        .start {
+            background-color: rgba(0, 0, 0, .2);
+            width: 42px;
+            height: 42px;
+            border-radius: 50%;
+        }
+    </style>
+
+    <script charset="UTF-8" type="text/javascript"></script>
+</head>
+<body oncontextmenu="return core.contextmenu();" style="overflow: hidden">
+<div class="init_loading">
+    <div><img src="/images/loading_simple.gif"/></div>
+</div>
+<img class="wallbackground" src="" style="overflow: hidden; position: fixed"/>
+<div class="desktop" id="desktop-box"></div>
+
+<script id="desktop-template" type="text/template">
+    <div class='bodymain html5_drag_upload_box desktop'>
+        <div class="fileContiner fileList_icon hidden">
+
+            <div class="file systemBox menuDefault" title="{{LNG.app_store}}"
+                 data-app='{"type":"app","width":"","height":"","content":"core.appStore();"}'>
+                <div class="ico" filetype="oexe" style="background-image:url(/images/app/appstore.png)"></div>
+                <div class="titleBox"><span>{{LNG.app_store}}</span></div>
+            </div>
+
+            <div class="file systemBox menuDefault" title="{{LNG.setting}}"
+                 data-app='{"type":"app","width":"","height":"","content":"core.setting();"}'>
+                <div class="ico" filetype="oexe" style="background-image:url(/images/app/setting.png)"></div>
+                <div class="titleBox"><span>{{LNG.setting}}</span></div>
+            </div>
+            <!--
+            <div class="file systemBox menuRecycleButton" title="回收站"
+            data-app='{"type":"app","width":"","height":"","content":"core.explorer('*recycle*/',LNG.recycle);"}'>
+                <div class="ico" filetype="oexe" style="background-image:url(/images/app/recycle.png)"></div>
+                <div class="titleBox" ><span>回收站</span></div>
+            </div>
+            -->
+        </div>
+    </div><!-- html5拖拽上传list -->
+
+    <a class="start" style="cursor: pointer;"></a>
+    <div id="taskbar" style="display:block;">
+        <div id="desktop"></div>
+    </div>
+    <div class="taskbar_right ">
+        <div title="您有4条告警信息" class="alertbox" style="display:none;">
+            <i class="fa fa-bell"></i>
+            <span class="badge">4</span>
+        </div>
+        <div class="copyright dropdown-toggle" title="关于我们"><i class="fa fa-info-circle"></i></div>
+        <div class="volume" style="display:none;">
+            <div class="sound mp3" style="width:0px;height:0px;"></div>
+            <span title="点击关闭声音" class="volume-on" style="display:block;"><i class=" fa fa-volume-up"></i></span>
+            <span title="点击打开声音" class="volume-off fa-stack fa-lg" style="display:none;">
 							<i style="top: -14px;position: relative;" class="fa fa-volume-off"></i>
-							<i style="position: relative; top: -18px;left:-14px;  font-size: 12px;" class="fa fa-times"></i>
+							<i style="position: relative; top: -18px;left:-14px;  font-size: 12px;"
+                               class="fa fa-times"></i>
 					</span>
-			    </div>
-			    <div class="datebox" title="显示时钟"></div>
-			    <div class="tab_hide_all" title="显示桌面"></div>
-			</div>
-			<div id="rightwin">
-			    <div style="width: 200px;height: 250px;" class="systime">
-			        <div style="font-size: 30px;" class="time"></div>
-			        <div style="font-size: 16px;" class="day"></div>
-			    </div>
-			    <div class="oclock" style="width:200px;height:185px;margin-top: -185px;"></div>
-			</div>
-			<div id="menuwin">
-			    <div id="startmenu"></div>
-			    <div id="logo"><span class="icon"></span><span class="text">{{AUTH.company.name}}</span><span
-			            class="ver"></span></div>
-			    <ul id="programs">
-			        <div class="apps" style="height: 333px;overflow: hidden;overflow-y: auto;padding:10px 0px 0px 0px;">
-
-			        </div>
-			        <li style="bottom:0px;position: absolute;width: 100%;" class="search">
-			            <input type="text"
-			                   style="width: 208px;padding:0px 0px 0px 5px;margin:5px 0px 5px 5px;height: 30px;line-height:30px;border-right:none;">
-			            <span title="快速搜索应用"
-			                  style="height: 30px;line-height:30px;width:25px;display: block;border:1px solid #ccc;position: absolute;right: 5px;top: 5px;border-left: none;cursor:pointer; ">
+        </div>
+        <div class="datebox" title="显示时钟"></div>
+        <div class="tab_hide_all" title="显示桌面"></div>
+    </div>
+    <div id="rightwin">
+        <div style="width: 200px;height: 250px;" class="systime">
+            <div style="font-size: 30px;" class="time"></div>
+            <div style="font-size: 16px;" class="day"></div>
+        </div>
+        <div class="oclock" style="width:200px;height:185px;margin-top: -185px;"></div>
+    </div>
+    <div id="menuwin">
+        <div id="startmenu"></div>
+        <div id="logo"><span class="icon"></span><span class="text">{{AUTH.company.name}}</span><span
+                class="ver"></span></div>
+        <ul id="programs">
+            <div class="apps" style="height: 333px;overflow: hidden;overflow-y: auto;padding:10px 0px 0px 0px;">
+
+            </div>
+            <li style="bottom:0px;position: absolute;width: 100%;" class="search">
+                <input type="text"
+                       style="width: 208px;padding:0px 0px 0px 5px;margin:5px 0px 5px 5px;height: 30px;line-height:30px;border-right:none;">
+                <span title="快速搜索应用"
+                      style="height: 30px;line-height:30px;width:25px;display: block;border:1px solid #ccc;position: absolute;right: 5px;top: 5px;border-left: none;cursor:pointer; ">
 					<i class="fa fa-search" style="margin: 8px 5px;"></i>
 				</span>
-			        </li>
-			    </ul>
-			    <ul id="links">
-			        <li class="icon" style="margin-bottom: 15px;">
-			            <div style="background-image:url(/images/app/computer.png);width:64px;height:64px;margin-bottom:5px;"></div>
-			        </li>
-			        <li><a href="javascript:void(0);" onclick="core.setting('user');"><span>{{AUTH.user.loginName}}</span></a>
-			        </li>
-
-			        <li><a href="javascript:void(0);" onclick="core.appStore();"><span>{{LNG.app_store}}</span></a></li>
-			        <li><a href="javascript:void(0);" onclick="core.setting('basic');"><span>{{LNG.setting}}</span></a></li>
-
-			        <li>
-			            <div id="rightspliter"></div>
-			        </li>
-			        <!--<li><a href="javascript:void(0);" onclick="core.setting('wall');"><span>{{LNG.setting_wall}}</span></a></li>-->
-			        <li onmouseover="$('.dropdown-menu',$(this)).show();"
-			            onmouseleave="$('.dropdown-menu',$(this)).hide();return false;">
-			            <a href="javascript:void(0);">
-			                <span>{{LNG.ui_change_local}}&nbsp;&nbsp;<b class="caret"></b></span>
-			            </a>
-			            <div style="position:relative;top:-7px;">
-			                <ul class="dropdown-menu fadein pull-right" role="menu">
-			                    <li><a href='javascript:core.language("en");' class='' style='color:#000;'>English</a></li>
-			                    <li><a href='javascript:core.language("zh_CN");' class='this' style='color:#000;'>简体中文</a>
-			                    </li>
-			                    <li><a href='javascript:core.language("zh_TW");' class='' style='color:#000;'>繁體中文</a></li>
-			                </ul>
-			            </div>
-			        </li>
-			        <li><a href="javascript:void(0);" onclick="core.setting('help');"><span>{{LNG.setting_help}}</span></a></li>
-			        <li><a href="javascript:void(0);" id="toFullscreenBtn"><span>全屏显示</span></a></li>
-			        <li>
-			            <div id="rightspliter"></div>
-			        </li>
-
-			        <li><a id="toClassicBtn" href="javascript:void(0);"><span>切换到传统版</span></a></li>
-
-			        <li class="sys-btnss" style="bottom:30px;position: fixed;"><a class="logout-btn" href="javascript:void(0);"><span>{{LNG.ui_logout}}&nbsp;&nbsp;<i
-			                class="fa fa-power-off"></i></span></a></li>
-			    </ul>
-			</div>
-		</script>
-		<script src="http://static.vbdsm.com/js/lib/jquery-1.8.0.min.js"></script>
-		<script src="http://static.vbdsm.com/js/lib/jquery.query-2.1.7.js"></script>
-		<script src="http://static.vbdsm.com/js/lib/jquery-lib.js"></script>
-		<script src="http://static.vbdsm.com/js/lib/soundplayer/jquery.jmp3.js"></script>
-		<script src="http://static.vbdsm.com/js/lib/handlebars.js"></script>
-		<script src="http://static.vbdsm.com/js/lib/highcharts/highcharts.js"></script>
-		<script src="http://static.vbdsm.com/js/lib/highcharts/highcharts-more.js"></script>
-		<script src="http://static.vbdsm.com/js/lib/seajs/sea.js"></script>
-		<script>
-			var cid = $.query.get("auth_cid")
-			$("body").append(
-				'<script src="/system/lang/desktop/config.json?script=1&auth_cid=' + cid + '"><\/script>'
-			)
-			$(document).ready(function () {
-				if (AUTH.error) {
-					alert(AUTH.error)
-					return
-				}
-				G.this_path = "/datas/explorer/"
-				seajs.config({
-					base: "http://static.vbdsm.com/",
-					map: [[/^(.*\.(?:css|js))(.*)$/i, "$1$2?ver=" + G.version]],
-				})
-				seajs.use("/js/desktop.util")
-			})
-		</script>
-	</body>
+            </li>
+        </ul>
+        <ul id="links">
+            <li class="icon" style="margin-bottom: 15px;">
+                <div style="background-image:url(/images/app/computer.png);width:64px;height:64px;margin-bottom:5px;"></div>
+            </li>
+            <li><a href="javascript:void(0);" onclick="core.setting('user');"><span>{{AUTH.user.loginName}}</span></a>
+            </li>
+
+            <li><a href="javascript:void(0);" onclick="core.appStore();"><span>{{LNG.app_store}}</span></a></li>
+            <li><a href="javascript:void(0);" onclick="core.setting('basic');"><span>{{LNG.setting}}</span></a></li>
+
+            <li>
+                <div id="rightspliter"></div>
+            </li>
+            <!--<li><a href="javascript:void(0);" onclick="core.setting('wall');"><span>{{LNG.setting_wall}}</span></a></li>-->
+            <li onmouseover="$('.dropdown-menu',$(this)).show();"
+                onmouseleave="$('.dropdown-menu',$(this)).hide();return false;">
+                <a href="javascript:void(0);">
+                    <span>{{LNG.ui_change_local}}&nbsp;&nbsp;<b class="caret"></b></span>
+                </a>
+                <div style="position:relative;top:-7px;">
+                    <ul class="dropdown-menu fadein pull-right" role="menu">
+                        <li><a href='javascript:core.language("en");' class='' style='color:#000;'>English</a></li>
+                        <li><a href='javascript:core.language("zh_CN");' class='this' style='color:#000;'>简体中文</a>
+                        </li>
+                        <li><a href='javascript:core.language("zh_TW");' class='' style='color:#000;'>繁體中文</a></li>
+                    </ul>
+                </div>
+            </li>
+            <li><a href="javascript:void(0);" onclick="core.setting('help');"><span>{{LNG.setting_help}}</span></a></li>
+            <li><a href="javascript:void(0);" id="toFullscreenBtn"><span>全屏显示</span></a></li>
+            <li>
+                <div id="rightspliter"></div>
+            </li>
+
+            <li><a id="toClassicBtn" href="javascript:void(0);"><span>切换到传统版</span></a></li>
+
+            <li class="sys-btnss" style="bottom:30px;position: fixed;"><a class="logout-btn" href="javascript:void(0);"><span>{{LNG.ui_logout}}&nbsp;&nbsp;<i
+                    class="fa fa-power-off"></i></span></a></li>
+        </ul>
+    </div>
+</script>
+<script src="http://static.vbdsm.com/js/lib/jquery-1.8.0.min.js"></script>
+<script src="http://static.vbdsm.com/js/lib/jquery.query-2.1.7.js"></script>
+<script src="http://static.vbdsm.com/js/lib/jquery-lib.js"></script>
+<script src="http://static.vbdsm.com/js/lib/soundplayer/jquery.jmp3.js"></script>
+<script src="http://static.vbdsm.com/js/lib/handlebars.js"></script>
+<script src="http://static.vbdsm.com/js/lib/highcharts/highcharts.js"></script>
+<script src="http://static.vbdsm.com/js/lib/highcharts/highcharts-more.js"></script>
+<script src="http://static.vbdsm.com/js/lib/seajs/sea.js"></script>
+<script>
+    var cid = $.query.get("auth_cid")
+    $("body").append(
+        '<script src="/system/lang/desktop/config.json?script=1&auth_cid=' + cid + '"><\/script>'
+    )
+    $(document).ready(function () {
+        if (AUTH.error) {
+            alert(AUTH.error)
+            return
+        }
+        G.this_path = "/datas/explorer/"
+        seajs.config({
+            base: "http://static.vbdsm.com/",
+            map: [[/^(.*\.(?:css|js))(.*)$/i, "$1$2?ver=" + G.version]],
+        })
+        seajs.use("/js/desktop.util")
+    })
+</script>
+</body>
 </html>