From 96d60bf2d4e5d820e1ab59d47f1c1f693c3ab8c1 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Wed, 19 May 2021 21:54:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9Atab=E9=A1=B5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/safesite/easyui/themes/icon.css    |  12 +++
 .../safesite/easyui/themes/icons/dutyist.png  | Bin 0 -> 305 bytes
 .../easyui/themes/icons/feedbacklist.png      | Bin 0 -> 435 bytes
 .../safesite/easyui/themes/icons/safelist.png | Bin 0 -> 325 bytes
 .../safesite/easyui/themes/icons/worklist.png | Bin 0 -> 465 bytes
 safesite/templates/index.html                 |  91 +++++++++++++++---
 safesite/templates/main.html                  |   3 +-
 7 files changed, 94 insertions(+), 12 deletions(-)
 create mode 100644 safesite/static/safesite/easyui/themes/icons/dutyist.png
 create mode 100644 safesite/static/safesite/easyui/themes/icons/feedbacklist.png
 create mode 100644 safesite/static/safesite/easyui/themes/icons/safelist.png
 create mode 100644 safesite/static/safesite/easyui/themes/icons/worklist.png

diff --git a/safesite/static/safesite/easyui/themes/icon.css b/safesite/static/safesite/easyui/themes/icon.css
index 9be80535..8ed26feb 100644
--- a/safesite/static/safesite/easyui/themes/icon.css
+++ b/safesite/static/safesite/easyui/themes/icon.css
@@ -206,6 +206,18 @@
 .icon-offence {
     background: url('icons/offence.png') no-repeat center center;
 }
+.icon-safelist {
+    background: url('icons/safelist.png') no-repeat center center;
+}
+.icon-dutylist {
+    background: url('icons/dutyist.png') no-repeat center center;
+}
+.icon-worklist {
+    background: url('icons/worklist.png') no-repeat center center;
+}
+.icon-feedbacklist {
+    background: url('icons/feedbacklist.png') no-repeat center center;
+}
 
 
 
diff --git a/safesite/static/safesite/easyui/themes/icons/dutyist.png b/safesite/static/safesite/easyui/themes/icons/dutyist.png
new file mode 100644
index 0000000000000000000000000000000000000000..227982039119b652aea68109f475205e74aa4c12
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002^Nkl<ZI8U|H
zy-Gtt5QgC=l@UR(v$gR8EKF+~K@dey5G@2NJMk8TAXbtPQv?!3P%N~uwz2RAEUYYo
zt(Tyz?2+SoatH<&rr2fnop1gs#ypiV{~HEa#1=L&jT<!ZoCZt*hgicadhx>myJ+GO
zSLkM-JYWgI?ywiF$}g4IXyGA1iU12($w^IBmICUS!^U3#t60ax2!Ko6rYX$Fyv}f3
zqTn4hyrh6||G+*vC4k`bU6-OZ2Kp41BP8z=3iyQ6qBdr4_h@4l=ecMH5t@O&{D)0q
z7@{4_U=nZW$AS7WjAgs9jg#nogo~oR`L|^nc}YJ3Lt7~kTh}+*00000NkvXXu0mjf
Dr~7_*

literal 0
HcmV?d00001

diff --git a/safesite/static/safesite/easyui/themes/icons/feedbacklist.png b/safesite/static/safesite/easyui/themes/icons/feedbacklist.png
new file mode 100644
index 0000000000000000000000000000000000000000..be3fcb850a38fb92a0f54e13adf8a87eda11a52b
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<ZI8Uw9
zJxc>Y5C-6P_M!+{Xpt3c1S?~qK?!zZI$J?30wR%IM6JZM8U+#mfP#C8D5SFSC&UD7
zv=KoKVq>M=39%C-yCV@2Qka~g+ibBj&wk7f;g5rA`JrU-1dL!aPYA5s98BD5N2aSW
zmhEm;=Pw{+7xP4B-x&6q0i{gzOsn23!3;2{p9vcQ+s)MhX1!GnY6fT}a}4eSs6s%5
zz*i#aMSlbsB~O{~ZrN^3J8~Tc)1t?X&@8ksP*L)nh%YSLTh&UY2#C)=q-QS6L*peU
zdejooO5TI{&|36%wUWyKQlhhCER;VUA+pkU&P4MoXeHm6Xf0sBWGgDTAVAyH#-kMX
zo(B{8$(Ddo!MtH~1s1&sXL@7C@SYG>m=aHq)kpRPw31~85&-51m=Z9<lzhFfRj4KK
zp@QK6Xa|IDX0!{!0@?0$V|o2g;K;P8m_pmq>$m^H7w~J3{|9QK-_DKeOuA4~(am}{
d{wBFG_7e&n`VqP+@Oc0L002ovPDHLkV1k!tyUG9n

literal 0
HcmV?d00001

diff --git a/safesite/static/safesite/easyui/themes/icons/safelist.png b/safesite/static/safesite/easyui/themes/icons/safelist.png
new file mode 100644
index 0000000000000000000000000000000000000000..d63d92a0c76013106a23c5dfdff2c2991477afe7
GIT binary patch
literal 325
zcmV-L0lNN)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003DNkl<ZI8U{c
zu}Z^G7=_Pi`Uc`6I4U%GgQTThOxhQ4^AU7%Zyh?ii=*fRIMqZDrELaRZ90e#AihF#
zk61`3Qp1Jn-7fe4KhFQ3bBPTPi~f1&_eBnDc#_V%Bwf~)fGi5+#?$g%1zN5Bd%(Qc
zY9r4(YZW-oV`DUa`d<Zaz1H>uaMvlQ1KHka{8_1BV}Ol~l?t*jIA9Gs5+xc#!w)x^
z-oJF4ow_k?)VL+#xUk&H#w_xW0A7haT!u$x=*H>3b&$SOYQSd$=hZ>}E~x7z>4P<3
z76n5H6A~AKPP{n1Ep}x&Li3W)uAy$cyYzZ>(IsFO`U8^v-&`Pg+K4CTKi{oBPnES_
XQ&grA3`?=S00000NkvXXu0mjftL%+Q

literal 0
HcmV?d00001

diff --git a/safesite/static/safesite/easyui/themes/icons/worklist.png b/safesite/static/safesite/easyui/themes/icons/worklist.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb27e69ab07e225f14c464833be2dd77918eb920
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004)Nkl<ZI8U{c
zK_~=K7{~u_W|dN!gAy)#lY?5huG*Vox8@)R?P}fjqNd#K=jyaBTpWfeF3M!BgHjYq
zDYR*COo<}a2rb%qPj9tZ3?+HT_ulvW{@?%mK88OY_Q!bm0w^AhD2$15E4%eM0S)zq
zXkqQJdjAa|W<n7zga|^dOOk235(*{^Fy=t8L$b1_gnR%{Jf?#|laG{$ZbE>-M2M_h
zh7$d@gu(N48R!p4^cxULs5U!z*#Kuj05%|8se-Ir1@cuvQV*i+5xAGB*10@3D2}d5
zBT@+f7iDh$=z%l|ifSl|7#QttZqVx0_3iTqZR7NQrYgJESbq}}v84Qz4!1M{m;#WR
z*tzIHnVYrQzm!lh=RLS9fBQ1KdE%}VOWs7q*x_gfoM{NCM5gV0(*+((hucC2H;<Dm
zg}Z5Z+<?j=5Q>uyx3)X?&wF$EYn|p-4PSs(ucU@Ln--_{FGpl>RWik6X1b?kcd1Z3
zJ1#!;`U2id;5s}(we?nJ1bAy-KsDrW`Fil%-T0qn`i+WL@IJf|Jp(|I00000NkvXX
Hu0mjfm&4G!

literal 0
HcmV?d00001

diff --git a/safesite/templates/index.html b/safesite/templates/index.html
index f3444a99..b6ec6c66 100644
--- a/safesite/templates/index.html
+++ b/safesite/templates/index.html
@@ -77,8 +77,8 @@
     <div id='Loading' class="loading">
         <font>加载中···</font>
     </div>
-    <div id="tt" class="easyui-tabs" data-options="region:'center',border:false">
-        <div title="主页" id='main' href="mainhtml" style="overflow-x:hidden;">
+    <div id="tt" region="center" class="easyui-tabs">
+        <div title="主页" href="/mainhtml" id="main">
         </div>
     </div>
     <div region="north" class="northDiv">
@@ -177,8 +177,77 @@
     <div id="questiondd" style="overflow: hidden;"></div>
     <input type="hidden" id="in" show="" total="" target="" show2="" />
     <!-- <button type="hidden" id="getb" onclick="test()" /> -->
-
+    
+<div id="rcmenu" class="easyui-menu">
+	<div id="closecur">
+		关闭
+	</div>
+	<div id="closeall">
+		关闭全部
+	</div>
+	<div id="closeother">
+		关闭其他
+	</div>
+</div>
     <script>
+        $(document).ready(function () {
+
+            $('#tt').tabs({
+                border: false,
+                onSelect: function (title) {
+                        var allTabs = $('#tt').tabs('tabs');
+                        var selectTab = $('#tt').tabs('getSelected');
+                        for (var i = 0; i < allTabs.length; i++) {
+                            if (allTabs[i].panel('options').title != selectTab.panel('options').title) {
+                                $('#tt').tabs('update', {
+                                    tab: allTabs[i],
+                                    options: {
+                                        content: 'Tab Body'
+                                    }
+                                    });
+                             }
+                        }
+                        selectTab.panel('refresh')
+                }
+            });
+            $(".tabs-header").bind('contextmenu',function(e){
+		e.preventDefault();
+		$('#rcmenu').menu('show', {
+			left: e.pageX,
+			top: e.pageY
+		});
+	});
+	//关闭当前标签页
+	$("#closecur").bind("click",function(){
+		var tab = $('#tt').tabs('getSelected');
+		var index = $('#tt').tabs('getTabIndex',tab);
+        if(index!=0){
+            $('#tab').tabs('close',index);
+        }
+		
+	});
+	//关闭所有标签页
+	$("#closeall").bind("click",function(){
+		var tablist = $('#tt').tabs('tabs');
+		for(var i=tablist.length-1;i>0;i--){
+			$('#tt').tabs('close',i);
+		}
+	});
+	//关闭非当前标签页（先关闭右侧，再关闭左侧）
+	$("#closeother").bind("click",function(){
+		var tablist = $('#tt').tabs('tabs');
+		var tab = $('#tt').tabs('getSelected');
+		var index = $('#tt').tabs('getTabIndex',tab);
+		for(var i=tablist.length-1;i>index;i--){
+			$('#tt').tabs('close',i);
+		}
+		var num = index-1;
+		for(var i=num;i>0;i--){
+			$('#tt').tabs('close',i);
+		}
+	});
+
+        });
         $.messager.show({
             title: '提示',
             msg: '每晚10点-11点为维护时间,请尽量不在此时间使用',
@@ -284,7 +353,7 @@
                     $("#main").attr('value', 'listall');
                     // $("#main").panel({ href: node.attributes, title: node.text });
                     let title = node.text
-                    if ($('#tt').tabs('tabs').length>7){
+                    if ($('#tt').tabs('tabs').length > 10) {
                         alert('标签页过多,请先关闭')
                         return
                     }
@@ -298,13 +367,13 @@
                             title: title,
                             href: node.attributes,
                             closable: true,
-                            tools:[{
-		iconCls:'icon-mini-refresh',
-		handler:function(){
-            var tab = $('#tt').tabs('getSelected');  // get selected panel
-            tab.panel('refresh');
-		}
-    }]
+                            // tools: [{
+                            //     iconCls: 'icon-mini-refresh',
+                            //     handler: function () {
+                            //         var tab = $('#tt').tabs('getSelected');  // get selected panel
+                            //         tab.panel('refresh');
+                            //     }
+                            // }]
                         });
                     }
                 },
diff --git a/safesite/templates/main.html b/safesite/templates/main.html
index 683f9be7..aa209997 100644
--- a/safesite/templates/main.html
+++ b/safesite/templates/main.html
@@ -1,3 +1,4 @@
+<div style="margin-left: 10px;margin-right:10px;overflow: hidden;">
 <div style="width:100%;height:300px;padding: 20px;">
     <div id="map1div" style="width: 33%; height:100%;float:left;"></div>
     <div id="map2div" style="width: 66%; height:100%;float:left;"></div>
@@ -330,7 +331,7 @@ float: left;">
 <div id="panelx" class="easyui-panel"  data-options="iconCls:'fa-bar-chart'" >
     
 </div>
-
+</div>
 
 <script type="text/javascript">
    //首页总数统计