From 5d30b9f46d6ab175d28e09d4f6cc650d085427d3 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sat, 8 Aug 2015 23:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=9B=91=E6=8E=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/monitor/monitor.js | 8 ++++----
 template/admin/admin.html                  | 2 +-
 template/admin/monitor/monitor.html        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/static/src/js/app/admin/monitor/monitor.js b/static/src/js/app/admin/monitor/monitor.js
index 543d4c4b..19e637d6 100644
--- a/static/src/js/app/admin/monitor/monitor.js
+++ b/static/src/js/app/admin/monitor/monitor.js
@@ -5,7 +5,7 @@ require(["jquery", "chart"], function ($, Chart) {
         datasets: [
             {
                 label: "2222222",
-                fillColor: "rgba(50,187,205,0.2)",
+                fillColor: "rgba(255,255,255,0.2)",
                 strokeColor: "rgba(151,187,205,1)",
                 pointColor: "rgba(151,187,205,1)",
                 pointStrokeColor: "#fff",
@@ -33,7 +33,7 @@ require(["jquery", "chart"], function ($, Chart) {
             },
             {
                 label: "2222222",
-                fillColor: "rgba(50,187,205,0.2)",
+                fillColor: "rgba(255,255,255,0.2)",
                 strokeColor: "rgba(151,187,205,1)",
                 pointColor: "rgba(151,187,205,1)",
                 pointStrokeColor: "#fff",
@@ -52,7 +52,7 @@ require(["jquery", "chart"], function ($, Chart) {
         datasets: [
             {
                 label: "2222222",
-                fillColor: "rgba(50,187,205,0.2)",
+                fillColor: "rgba(255,255,255,0.2)",
                 strokeColor: "rgba(151,187,205,1)",
                 pointColor: "rgba(151,187,205,1)",
                 pointStrokeColor: "#fff",
@@ -62,7 +62,7 @@ require(["jquery", "chart"], function ($, Chart) {
             },
             {
                 label: "2222222",
-                fillColor: "rgba(50,187,205,0.2)",
+                fillColor: "rgba(255,255,255,0.2)",
                 strokeColor: "rgba(252,214,48,1)",
                 pointColor: "rgba(252,214,48,1)",
                 pointStrokeColor: "#fff",
diff --git a/template/admin/admin.html b/template/admin/admin.html
index 94742833..ce1094e9 100644
--- a/template/admin/admin.html
+++ b/template/admin/admin.html
@@ -110,7 +110,7 @@
         <img src="/static/img/loading.gif" id="loading-gif">
         <!-- custom body begin -->
 
-        <div ms-include-src="template_url" data-include-rendered="hide_loading"></div>
+        <div ms-include-src="template_url" data-include-rendered="hide_loading" data-include-replace="true"></div>
 
         <!-- custom body end -->
     </div>
diff --git a/template/admin/monitor/monitor.html b/template/admin/monitor/monitor.html
index 54d33fd5..657586c4 100644
--- a/template/admin/monitor/monitor.html
+++ b/template/admin/monitor/monitor.html
@@ -1,4 +1,4 @@
-<div ms-controller="monitor" class="col-lg-9">
+<div class="col-md-9">
     <h1>服务器监控</h1>
 
     <div>