From 450955d4cf8fc5fdd5b660a763e6249b71c3d0dc Mon Sep 17 00:00:00 2001
From: taoshihan1991 <630892807@qq.com>
Date: Tue, 29 Sep 2020 14:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95iframe=E7=82=B9=E5=87=BB=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 router/view.go                      |  1 +
 static/html/header.html             |  4 ++--
 static/html/setting.html            | 31 ++------------------------
 static/html/setting_bottom.html     |  6 +++--
 static/html/setting_config.html     |  1 -
 static/html/setting_deploy.html     |  1 -
 static/html/setting_ipblack.html    |  1 -
 static/html/setting_kefu_list.html  |  1 -
 static/html/setting_left.html       |  2 +-
 static/html/setting_mysql.html      |  1 -
 static/html/setting_role_list.html  |  1 -
 static/html/setting_statistics.html | 34 +++++++++++++++++++++++++++++
 static/html/setting_welcome.html    |  1 -
 tmpl/setting.go                     |  8 +++++++
 14 files changed, 52 insertions(+), 41 deletions(-)
 create mode 100644 static/html/setting_statistics.html

diff --git a/router/view.go b/router/view.go
index 76fe65b..0cc2773 100644
--- a/router/view.go
+++ b/router/view.go
@@ -15,6 +15,7 @@ func InitViewRouter(engine *gin.Engine) {
 	engine.GET("/main", middleware.JwtPageMiddleware, tmpl.PageMain)
 	engine.GET("/chat_main", middleware.JwtPageMiddleware, tmpl.PageChatMain)
 	engine.GET("/setting", tmpl.PageSetting)
+	engine.GET("/setting_statistics", tmpl.PageSettingStatis)
 	engine.GET("/setting_mysql", tmpl.PageSettingMysql)
 	engine.GET("/setting_welcome", tmpl.PageSettingWelcome)
 	engine.GET("/setting_deploy", tmpl.PageSettingDeploy)
diff --git a/static/html/header.html b/static/html/header.html
index aaa14fd..aff7bef 100644
--- a/static/html/header.html
+++ b/static/html/header.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="description" content="">
     <meta name="author" content="陶士涵">
-    <title>GO-IMAP网页版邮箱imap工具</title>
+    <title>GO-FLY客服管理系统</title>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/element-ui@2.13.1/lib/theme-chalk/index.css">
     <link rel="stylesheet" href="/static/css/common.css">
     <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
@@ -27,7 +27,7 @@
         }
         .mainMain{
             background: #fff;
-            margin-left: 10px;
+            /*margin-left: 10px;*/
             margin-bottom: 60px;
         }
         .mainIframe{
diff --git a/static/html/setting.html b/static/html/setting.html
index a750961..b3b73c1 100644
--- a/static/html/setting.html
+++ b/static/html/setting.html
@@ -4,38 +4,11 @@
         <el-container v-loading.fullscreen.lock="fullscreenLoading">
 
             {{template "setting_left" .}}
-
-            <el-main class="mainMain settingMain">
-                <h2 class="textDark">数据总览</h2>
-                <el-row :gutter="10">
-                    <el-col :span="8">
-                        <div class="smallBox bgInfo">
-                            <h3  v-html="statistics.visitors"></h3>
-                            <p>总访客数</p>
-                        </div>
-                    </el-col>
-                    <el-col :span="8">
-                        <div class="smallBox bgSuccess">
-                            <h3  v-html="statistics.message"></h3>
-                            <p>总消息数</p>
-                        </div>
-                    </el-col>
-                    <el-col :span="8">
-                        <div class="smallBox bgDanger">
-                            <h3 v-html="statistics.session"></h3>
-                            <p>当前会话数</p>
-                        </div>
-                    </el-col>
-                </el-row>
-            </el-main>
-
+            <iframe  class="mainIframe"  v-bind:src="iframeUrl" frameborder="0"></iframe>
         </el-container>
     </template>
 
 </div>
 </body>
-<script>
-    var Password="{{.Password}}";
-    var Username="{{.Username}}";
-</script>
+
 {{template "setting_bottom" .}}
diff --git a/static/html/setting_bottom.html b/static/html/setting_bottom.html
index 08d8878..4e53195 100644
--- a/static/html/setting_bottom.html
+++ b/static/html/setting_bottom.html
@@ -7,6 +7,7 @@
         el: '#app',
         delimiters:["<{","}>"],
         data: {
+            iframeUrl:"/setting_statistics",
             fullscreenLoading:false,
             openIndex:[1],
             account: {
@@ -145,7 +146,8 @@
             },
             //跳转
             openUrl(url){
-                window.location.href=url;
+                //window.location.href=url;
+                this.iframeUrl=url;
             },
             //展示提示
             showNotice(){
@@ -186,7 +188,7 @@
                         _this.roleList=result;
                     });
                 }
-                if(ACTION=="setting"){
+                if(ACTION=="setting_statistics"){
                     this.sendAjax("/statistics","get",{},function(result) {
                         _this.statistics = result;
                     });
diff --git a/static/html/setting_config.html b/static/html/setting_config.html
index 7ec523a..2377bd6 100644
--- a/static/html/setting_config.html
+++ b/static/html/setting_config.html
@@ -2,7 +2,6 @@
 <div id="app" style="width:100%">
     <template>
         <el-container v-loading.fullscreen.lock="fullscreenLoading">
-            {{template "setting_left" .}}
 
             <el-main class="mainMain">
 
diff --git a/static/html/setting_deploy.html b/static/html/setting_deploy.html
index f1c444f..957864f 100644
--- a/static/html/setting_deploy.html
+++ b/static/html/setting_deploy.html
@@ -2,7 +2,6 @@
 <div id="app" style="width:100%">
     <template>
         <el-container>
-                {{template "setting_left" .}}
 
             <el-main class="mainMain">
                 <el-tabs>
diff --git a/static/html/setting_ipblack.html b/static/html/setting_ipblack.html
index 664500b..33da5f0 100644
--- a/static/html/setting_ipblack.html
+++ b/static/html/setting_ipblack.html
@@ -2,7 +2,6 @@
 <div id="app" style="width:100%">
     <template>
         <el-container v-loading.fullscreen.lock="fullscreenLoading">
-            {{template "setting_left" .}}
 
             <el-main class="mainMain">
                 <el-table
diff --git a/static/html/setting_kefu_list.html b/static/html/setting_kefu_list.html
index 1cce161..e347b35 100644
--- a/static/html/setting_kefu_list.html
+++ b/static/html/setting_kefu_list.html
@@ -2,7 +2,6 @@
 <div id="app" style="width:100%">
     <template>
         <el-container v-loading.fullscreen.lock="fullscreenLoading">
-                {{template "setting_left" .}}
 
             <el-main class="mainMain">
                 <el-button style="margin-bottom: 10px;" @click="addKefu" type="primary" size="small">添加客服</el-button>
diff --git a/static/html/setting_left.html b/static/html/setting_left.html
index 1d65d9c..58092b6 100644
--- a/static/html/setting_left.html
+++ b/static/html/setting_left.html
@@ -11,7 +11,7 @@
             <span>账户设置</span>
         </template>
         <el-menu-item-group>
-            <el-menu-item index="1-1" v-on:click="openUrl('/setting')">统计信息</el-menu-item>
+            <el-menu-item index="1-1" v-on:click="openUrl('/setting_statistics')">统计信息</el-menu-item>
             <el-menu-item index="1-2" v-on:click="openUrl('/setting_welcome')">自动欢迎</el-menu-item>
         </el-menu-item-group>
     </el-submenu>
diff --git a/static/html/setting_mysql.html b/static/html/setting_mysql.html
index 806aa36..75bee03 100644
--- a/static/html/setting_mysql.html
+++ b/static/html/setting_mysql.html
@@ -2,7 +2,6 @@
 <div id="app" style="width:100%">
     <template>
         <el-container v-loading.fullscreen.lock="fullscreenLoading">
-                {{template "setting_left" .}}
 
             <el-main class="mainMain">
                 <el-form :model="mysql" :rules="rules" ref="mysql"  label-width="120px">
diff --git a/static/html/setting_role_list.html b/static/html/setting_role_list.html
index 792efae..aaf2e46 100644
--- a/static/html/setting_role_list.html
+++ b/static/html/setting_role_list.html
@@ -2,7 +2,6 @@
 <div id="app" style="width:100%">
     <template>
         <el-container v-loading.fullscreen.lock="fullscreenLoading">
-            {{template "setting_left" .}}
 
             <el-main class="mainMain">
                 <el-button style="margin-bottom: 10px;" @click="" type="primary" size="small">添加角色</el-button>
diff --git a/static/html/setting_statistics.html b/static/html/setting_statistics.html
new file mode 100644
index 0000000..c092c5a
--- /dev/null
+++ b/static/html/setting_statistics.html
@@ -0,0 +1,34 @@
+{{template "header" }}
+<div id="app" style="width:100%">
+    <template>
+        <el-container v-loading.fullscreen.lock="fullscreenLoading">
+            <el-main class="mainMain settingMain">
+                <h2 class="textDark">数据总览</h2>
+                <el-row :gutter="10">
+                    <el-col :span="8">
+                        <div class="smallBox bgInfo">
+                            <h3  v-html="statistics.visitors"></h3>
+                            <p>总访客数</p>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <div class="smallBox bgSuccess">
+                            <h3  v-html="statistics.message"></h3>
+                            <p>总消息数</p>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <div class="smallBox bgDanger">
+                            <h3 v-html="statistics.session"></h3>
+                            <p>当前会话数</p>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-main>
+        </el-container>
+    </template>
+</div>
+</body>
+{{template "setting_bottom" .}}
+
+
diff --git a/static/html/setting_welcome.html b/static/html/setting_welcome.html
index 56714ef..2d2958c 100644
--- a/static/html/setting_welcome.html
+++ b/static/html/setting_welcome.html
@@ -2,7 +2,6 @@
 <div id="app" style="width:100%">
     <template>
         <el-container v-loading.fullscreen.lock="fullscreenLoading">
-            {{template "setting_left" .}}
 
             <el-main class="mainMain">
                 <el-button style="margin-bottom: 10px;" @click="addWelcome" type="primary" size="small">添加欢迎</el-button>
diff --git a/tmpl/setting.go b/tmpl/setting.go
index 68284ab..4073945 100644
--- a/tmpl/setting.go
+++ b/tmpl/setting.go
@@ -21,6 +21,14 @@ func PageSettingWelcome(c *gin.Context) {
 	})
 }
 
+//统计
+func PageSettingStatis(c *gin.Context) {
+	c.HTML(http.StatusOK, "setting_statistics.html", gin.H{
+		"tab_index": "1-3",
+		"action":    "setting_statistics",
+	})
+}
+
 //设置mysql
 func PageSettingMysql(c *gin.Context) {
 	c.HTML(http.StatusOK, "setting_mysql.html", gin.H{