diff --git a/property.js b/property.js
index 86d3155d..b5a638bd 100644
--- a/property.js
+++ b/property.js
@@ -63,4 +63,4 @@ MCSERVER.localProperty.terminalQueue_max_length = 512;
//控制数据中心 数据刷新频率 单位毫秒
//默认 2000 毫秒
-MCSERVER.localProperty.data_center_times = 2000;
\ No newline at end of file
+MCSERVER.localProperty.data_center_times = 500;
\ No newline at end of file
diff --git a/public/common/css/common.css b/public/common/css/common.css
index 8b4f11d9..056af2bf 100644
--- a/public/common/css/common.css
+++ b/public/common/css/common.css
@@ -18,7 +18,11 @@ a:visited {
a:active {
text-decoration: none;
}
-a,input{outline:none;}
+
+a,
+input {
+ outline: none;
+}
/*全局css定义结束*/
@@ -31,7 +35,7 @@ a,input{outline:none;}
z-index: 102;
}
-#MasterLogo{
+#MasterLogo {
letter-spacing: 1.5px;
}
@@ -52,12 +56,11 @@ a,input{outline:none;}
top: 10px;
left: 180px;
right: 0px;
- : ;
}
@media (max-width:640px) {
- #websocket{
- display:none;
+ #websocket {
+ display: none;
}
}
@@ -71,10 +74,8 @@ a,input{outline:none;}
overflow-y: auto;
}
-
/*布局结束*/
-
/*标题*/
.HeaderItem {
@@ -88,7 +89,6 @@ a,input{outline:none;}
text-align: center;
}
-
/*标题的右侧菜单*/
.HeaderR {
@@ -111,7 +111,6 @@ a,input{outline:none;}
background-color: #005983;
}
-
/*左侧的菜单*/
#SideColMenu {
@@ -145,7 +144,6 @@ a,input{outline:none;}
background-color: #017EBC;
}
-
/*菜单的收缩*/
#ShowMenu {
@@ -162,7 +160,6 @@ a,input{outline:none;}
box-shadow: 1px 2px 2px rgba(0, 0, 0, 0.25);
}
-
/*针对于单页的首页容器*/
.OneContainer {
@@ -173,10 +170,8 @@ a,input{outline:none;}
overflow: auto;
}
-
/* 可以设置不同的进入和离开动画 */
-
/* 设置持续时间和动画函数 */
.slide-fade-enter-active {
@@ -191,7 +186,7 @@ a,input{outline:none;}
.slide-fade-leave-to
/* .slide-fade-leave-active for <2.1.8 */
-{
+ {
transform: translateX(10px);
opacity: 0;
}
@@ -205,11 +200,10 @@ a,input{outline:none;}
.fade-leave-to
/* .fade-leave-active in below version 2.1.8 */
-{
+ {
opacity: 0
}
-
/*信息框*/
.ToolsInfo {
@@ -226,50 +220,58 @@ a,input{outline:none;}
color: #F5F5F5;
}
-
/*通用的可编辑的菜单项 table*/
-.PropertiesList{
+
+.PropertiesList {
font-size: 12px;
color: #777777;
-
}
-.PropertiesList th{
+.PropertiesList th {
text-align: center;
background-color: #f8f8f8;
- border-color: #fff;
- border-bottom: 1px solid #ccc;
- border-top: 1px solid #ccc;
- padding: 8px 0px;
- color: #666;
+ border-color: #fff;
+ border-bottom: 1px solid #ccc;
+ border-top: 1px solid #ccc;
+ padding: 8px 0px;
+ color: #666;
}
-.PropertiesList tr{
+.PropertiesList tr {
width: 100%;
}
+
.PropertiesList .input-group {
- margin-bottom: 0px;
+ margin-bottom: 0px;
}
+.font-size-12 {
+ font-size: 12px;
+}
-.font-size-12{font-size: 12px;}
-.font-size-10{font-size: 10px;}
-.font-size-14{font-size: 14px;}
+.font-size-10 {
+ font-size: 10px;
+}
-.ulInfo li{
+.font-size-14 {
+ font-size: 14px;
+}
+
+.ulInfo li {
font-size: 11px;
margin-left: -20px;
}
/*进度条CSS*/
-.Toolscon{
+
+.Toolscon {
position: fixed;
- top: 0px;
- left: 0px;
- /*background-color: #00cc06;*/
- height: 4px;
- z-index: 999;
- width: 100%;
- overflow: hidden;
- line-height: 3px;
-}
+ top: 0px;
+ left: 0px;
+ /*background-color: #00cc06;*/
+ height: 4px;
+ z-index: 999;
+ width: 100%;
+ overflow: hidden;
+ line-height: 3px;
+}
\ No newline at end of file
diff --git a/public/common/css/unit.css b/public/common/css/unit.css
index 196d205f..8e1a24a4 100644
--- a/public/common/css/unit.css
+++ b/public/common/css/unit.css
@@ -6,20 +6,18 @@
color: #0bbd10;
}
-.color-high-red{
+.color-high-red {
color: #ff0000;
}
-.color-gray{
- color: #a5a5a5;
+.color-gray {
+ color: #a5a5a5;
}
.box-shadow {
box-shadow: 2px 0px 6px #888888;
}
-.width-100{
+.width-100 {
width: 100%;
-}
-
-
+}
\ No newline at end of file
diff --git a/public/common/js/common.js b/public/common/js/common.js
index 43ead25b..e9da874e 100644
--- a/public/common/js/common.js
+++ b/public/common/js/common.js
@@ -131,7 +131,6 @@
MCSERVER.colmSet = function (booleans) {
MI.on('colmchange', null); //触发事件
if (!booleans) {
- console.log('菜单隐藏')
$SideCol
.stop(true, true)
.animate({
@@ -151,7 +150,6 @@
});
} else {
- console.log('菜单显示')
$Container
.stop(true, true)
.animate({
diff --git a/public/common/js/response.js b/public/common/js/response.js
index 0b521783..5bc7403d 100644
--- a/public/common/js/response.js
+++ b/public/common/js/response.js
@@ -95,6 +95,11 @@
}
}
+ MI.listener("RedirectPage", function () {
+ //自动菜单更改
+ MCSERVER.autoColmDo();
+ });
+
RES.redirectPage = function (url, key, body, callback) {
ToolsLoadingStart(function () {
@@ -103,6 +108,8 @@
//替換掉原先存在的 函数。防止新的单页没有这些函数而导致代码二次执行
MI.rListener('onend', function () {});
MI.rListener('onload', function () {});
+ //触发页面切换事件
+ MI.on('RedirectPage', url);
RES.redirectHTML(url, key, body, function () {
MI.on('page/live');
//赋予的单页刷新
diff --git a/public/common/js/viewmodel.js b/public/common/js/viewmodel.js
index a6f5b12f..d54f2923 100644
--- a/public/common/js/viewmodel.js
+++ b/public/common/js/viewmodel.js
@@ -41,9 +41,17 @@
PAGE = new Object();
});
+
//菜单获取
MI.routeListener('ws/muem', function (data) {
- DEBUG && console.log('--- 系统菜单获取成功 ---')
+ //菜单选项选择
+ MI.listener("SideMeumClick", function () {
+ console.log("--- 菜单选项被选择 ---");
+ // MCSERVER.autoColmDo();
+ });
+
+ DEBUG && console.log('--- 系统菜单获取成功 ---');
+
MCSERVER.username = data.obj.username;
//虚拟的数据接受，让前端数据得到，菜单在前端建筑
if (TOOLS.isMaster(MCSERVER.username)) {
@@ -61,6 +69,8 @@
methods: {
onRedirect: function (link, api) {
DEBUG && console.log('菜单处网页开始跳转:' + link);
+ //触发菜单选项点击事件
+ MI.on("SideMeumClick", null);
RES.redirectPage(link, api, 'update_page');
},
onMouse: function ($event, flag) {
diff --git a/public/template/component/properties.html b/public/template/component/properties.html
index c3c1eae8..fd1c9813 100644
--- a/public/template/component/properties.html
+++ b/public/template/component/properties.html
@@ -71,7 +71,7 @@
<script src="./common/js/properties.js"></script>
<script>
MI.rListener('onload', function () {
- MCSERVER.autoColmDo();
+ // MCSERVER.autoColmDo();
VIEW_MODEL.newVue('ServerProperties', {
el: '#ServerProperties',