system-clients 3.2.3 → 3.2.4-aodeToV4

package/src/LodopFuncs.js

@@ -1,123 +1,123 @@
-var CreatedOKLodop7766 = null
-
-// ====判断是否需要安装CLodop云打印服务器:====
-function needCLodop () {
-  // return false;
-  try {
-	                                                                                                                          var ua = navigator.userAgent
-	                                                                                                                          if (ua.match(/Windows\sPhone/i) != null) return true
-	                                                                                                                          if (ua.match(/iPhone|iPod/i) != null) return true
-	                                                                                                                          if (ua.match(/Android/i) != null) return true
-	                                                                                                                          if (ua.match(/Edge\D?\d+/i) != null) return true
-	                                                                                                                          if (ua.match(/QQBrowser/i) != null) return false
-	                                                                                                                          var verTrident = ua.match(/Trident\D?\d+/i)
-	                                                                                                                          var verIE = ua.match(/MSIE\D?\d+/i)
-	                                                                                                                          var verOPR = ua.match(/OPR\D?\d+/i)
-	                                                                                                                          var verFF = ua.match(/Firefox\D?\d+/i)
-	                                                                                                                          var x64 = ua.match(/x64/i)
-	                                                                                                                          if ((verTrident == null) && (verIE == null) && (x64 !== null))
-		                                                            return true; else
-	if (verFF !== null) {
-		                                                            verFF = verFF[0].match(/\d+/)
-		                                                            if (verFF[0] >= 42) return true
-	} else
-	if (verOPR !== null) {
-		                                                            verOPR = verOPR[0].match(/\d+/)
-		                                                            if (verOPR[0] >= 32) return true
-	} else
-	if ((verTrident == null) && (verIE == null)) {
-		                                                            var verChrome = ua.match(/Chrome\D?\d+/i)
-		                                                            if (verChrome !== null) {
-			                                                            verChrome = verChrome[0].match(/\d+/)
-			                                                            if (verChrome[0] >= 42) return true
-		};
-	};
-    return false
-  } catch (err) { return true };
-};
-
-// ====页面引用CLodop云打印必须的JS文件：====
-if (needCLodop()) {
-	                                                            var head = document.head || document.getElementsByTagName('head')[0] || document.documentElement
-	                                                            var oscript = document.createElement('script')
-	// 让本机浏览器打印(更优先)：
-	                                                            oscript = document.createElement('script')
-	                                                            oscript.src = 'http://localhost:8000/CLodopfuncs.js?priority=1'
-	                                                            head.insertBefore(oscript, head.firstChild)
-	// 本机浏览器的后补端口8001：
-	// oscript = document.createElement("script");
-	// oscript.src ="http://localhost:8001/CLodopfuncs.js?priority=2";
-	// head.insertBefore( oscript,head.firstChild );
-};
-
-// ====获取LODOP对象的主过程：====
-function getLodop (oOBJECT, oEMBED) {
-  var strHtmInstall = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
-  var strHtmUpdate = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
-  var strHtm64_Install = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
-  var strHtm64_Update = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
-  var strHtmFireFox = "<br><br><font color='#FF00FF'>（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）</font>"
-  var strHtmChrome = "<br><br><font color='#FF00FF'>(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）</font>"
-  var strCLodopInstall = "<br><font color='#FF00FF'>CLodop云打印服务(localhost本地)未安装启动!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行安装</a>,安装后请刷新页面。</font>"
-  var strCLodopUpdate = "<br><font color='#FF00FF'>CLodop云打印服务需升级!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行升级</a>,升级后请刷新页面。</font>"
-  var LODOP
-  try {
-    var isIE = (navigator.userAgent.indexOf('MSIE') >= 0) || (navigator.userAgent.indexOf('Trident') >= 0)
-    if (needCLodop()) {
-      try { LODOP = getCLodop() } catch (err) {};
-	                                                                                                                                                                                              if (!LODOP && document.readyState !== 'complete') { alert('C-Lodop没准备好，请稍后再试！'); return };
-      if (!LODOP) {
-		                                                                                                                                                                                                                                                             if (isIE) document.write(strCLodopInstall); else
-		 document.documentElement.innerHTML = strCLodopInstall + document.documentElement.innerHTML
-        return
-      } else {
-	                                                                                                                                                                                                                                                                     if (CLODOP.CVERSION < '2.0.6.2') {
-			                                                            if (isIE) document.write(strCLodopUpdate); else
-			document.documentElement.innerHTML = strCLodopUpdate + document.documentElement.innerHTML
-		 };
-		                                                                                                                                                                                                                                                             if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED)
-		                                                                                                                                                                                                                                                             if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT)
-	                                                                                                                                                                                                    };
-    } else {
-      var is64IE = isIE && (navigator.userAgent.indexOf('x64') >= 0)
-            // =====如果页面有Lodop就直接使用，没有则新建:==========
-      if (oOBJECT != undefined || oEMBED != undefined) {
-        if (isIE) LODOP = oOBJECT; else LODOP = oEMBED
-      } else if (CreatedOKLodop7766 == null) {
-        LODOP = document.createElement('object')
-        LODOP.setAttribute('width', 0)
-        LODOP.setAttribute('height', 0)
-        LODOP.setAttribute('style', 'position:absolute;left:0px;top:-100px;width:0px;height:0px;')
-        if (isIE) LODOP.setAttribute('classid', 'clsid:2105C259-1E0C-4534-8141-A753534CB4CA')
-        else LODOP.setAttribute('type', 'application/x-print-lodop')
-        document.documentElement.appendChild(LODOP)
-        CreatedOKLodop7766 = LODOP
-      } else LODOP = CreatedOKLodop7766
-            // =====Lodop插件未安装时提示下载地址:==========
-      if ((LODOP == null) || (typeof (LODOP.VERSION) == 'undefined')) {
-        if (navigator.userAgent.indexOf('Chrome') >= 0)
-          document.documentElement.innerHTML = strHtmChrome + document.documentElement.innerHTML
-        if (navigator.userAgent.indexOf('Firefox') >= 0)
-          document.documentElement.innerHTML = strHtmFireFox + document.documentElement.innerHTML
-        if (is64IE) document.write(strHtm64_Install); else
-                 if (isIE) document.write(strHtmInstall); else
-                     document.documentElement.innerHTML = strHtmInstall + document.documentElement.innerHTML
-        return LODOP
-      };
-    };
-    if (LODOP.VERSION < '6.2.0.3') {
-      if (needCLodop())
-        document.documentElement.innerHTML = strCLodopUpdate + document.documentElement.innerHTML; else
-            if (is64IE) document.write(strHtm64_Update); else
-            if (isIE) document.write(strHtmUpdate); else
-            document.documentElement.innerHTML = strHtmUpdate + document.documentElement.innerHTML
-      return LODOP
-    };
-        // ===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
-    LODOP.SET_LICENSES('西安奥枫软件有限公司', '552C41D5AB0D146FCF77D05CD8AA15A1', '', '')
-        // ===========================================================
-    return LODOP
-  } catch (err) { alert('getLodop出错:' + err) };
-};
-
-export default getLodop
+var CreatedOKLodop7766 = null
+
+// ====判断是否需要安装CLodop云打印服务器:====
+function needCLodop () {
+  // return false;
+  try {
+	                                                                                                                          var ua = navigator.userAgent
+	                                                                                                                          if (ua.match(/Windows\sPhone/i) != null) return true
+	                                                                                                                          if (ua.match(/iPhone|iPod/i) != null) return true
+	                                                                                                                          if (ua.match(/Android/i) != null) return true
+	                                                                                                                          if (ua.match(/Edge\D?\d+/i) != null) return true
+	                                                                                                                          if (ua.match(/QQBrowser/i) != null) return false
+	                                                                                                                          var verTrident = ua.match(/Trident\D?\d+/i)
+	                                                                                                                          var verIE = ua.match(/MSIE\D?\d+/i)
+	                                                                                                                          var verOPR = ua.match(/OPR\D?\d+/i)
+	                                                                                                                          var verFF = ua.match(/Firefox\D?\d+/i)
+	                                                                                                                          var x64 = ua.match(/x64/i)
+	                                                                                                                          if ((verTrident == null) && (verIE == null) && (x64 !== null))
+		                                                            return true; else
+	if (verFF !== null) {
+		                                                            verFF = verFF[0].match(/\d+/)
+		                                                            if (verFF[0] >= 42) return true
+	} else
+	if (verOPR !== null) {
+		                                                            verOPR = verOPR[0].match(/\d+/)
+		                                                            if (verOPR[0] >= 32) return true
+	} else
+	if ((verTrident == null) && (verIE == null)) {
+		                                                            var verChrome = ua.match(/Chrome\D?\d+/i)
+		                                                            if (verChrome !== null) {
+			                                                            verChrome = verChrome[0].match(/\d+/)
+			                                                            if (verChrome[0] >= 42) return true
+		};
+	};
+    return false
+  } catch (err) { return true };
+};
+
+// ====页面引用CLodop云打印必须的JS文件：====
+if (needCLodop()) {
+	                                                            var head = document.head || document.getElementsByTagName('head')[0] || document.documentElement
+	                                                            var oscript = document.createElement('script')
+	// 让本机浏览器打印(更优先)：
+	                                                            oscript = document.createElement('script')
+	                                                            oscript.src = 'http://localhost:8000/CLodopfuncs.js?priority=1'
+	                                                            head.insertBefore(oscript, head.firstChild)
+	// 本机浏览器的后补端口8001：
+	// oscript = document.createElement("script");
+	// oscript.src ="http://localhost:8001/CLodopfuncs.js?priority=2";
+	// head.insertBefore( oscript,head.firstChild );
+};
+
+// ====获取LODOP对象的主过程：====
+function getLodop (oOBJECT, oEMBED) {
+  var strHtmInstall = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
+  var strHtmUpdate = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
+  var strHtm64_Install = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
+  var strHtm64_Update = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
+  var strHtmFireFox = "<br><br><font color='#FF00FF'>（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）</font>"
+  var strHtmChrome = "<br><br><font color='#FF00FF'>(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）</font>"
+  var strCLodopInstall = "<br><font color='#FF00FF'>CLodop云打印服务(localhost本地)未安装启动!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行安装</a>,安装后请刷新页面。</font>"
+  var strCLodopUpdate = "<br><font color='#FF00FF'>CLodop云打印服务需升级!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行升级</a>,升级后请刷新页面。</font>"
+  var LODOP
+  try {
+    var isIE = (navigator.userAgent.indexOf('MSIE') >= 0) || (navigator.userAgent.indexOf('Trident') >= 0)
+    if (needCLodop()) {
+      try { LODOP = getCLodop() } catch (err) {};
+	                                                                                                                                                                                              if (!LODOP && document.readyState !== 'complete') { alert('C-Lodop没准备好，请稍后再试！'); return };
+      if (!LODOP) {
+		                                                                                                                                                                                                                                                             if (isIE) document.write(strCLodopInstall); else
+		 document.documentElement.innerHTML = strCLodopInstall + document.documentElement.innerHTML
+        return
+      } else {
+	                                                                                                                                                                                                                                                                     if (CLODOP.CVERSION < '2.0.6.2') {
+			                                                            if (isIE) document.write(strCLodopUpdate); else
+			document.documentElement.innerHTML = strCLodopUpdate + document.documentElement.innerHTML
+		 };
+		                                                                                                                                                                                                                                                             if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED)
+		                                                                                                                                                                                                                                                             if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT)
+	                                                                                                                                                                                                    };
+    } else {
+      var is64IE = isIE && (navigator.userAgent.indexOf('x64') >= 0)
+            // =====如果页面有Lodop就直接使用，没有则新建:==========
+      if (oOBJECT != undefined || oEMBED != undefined) {
+        if (isIE) LODOP = oOBJECT; else LODOP = oEMBED
+      } else if (CreatedOKLodop7766 == null) {
+        LODOP = document.createElement('object')
+        LODOP.setAttribute('width', 0)
+        LODOP.setAttribute('height', 0)
+        LODOP.setAttribute('style', 'position:absolute;left:0px;top:-100px;width:0px;height:0px;')
+        if (isIE) LODOP.setAttribute('classid', 'clsid:2105C259-1E0C-4534-8141-A753534CB4CA')
+        else LODOP.setAttribute('type', 'application/x-print-lodop')
+        document.documentElement.appendChild(LODOP)
+        CreatedOKLodop7766 = LODOP
+      } else LODOP = CreatedOKLodop7766
+            // =====Lodop插件未安装时提示下载地址:==========
+      if ((LODOP == null) || (typeof (LODOP.VERSION) == 'undefined')) {
+        if (navigator.userAgent.indexOf('Chrome') >= 0)
+          document.documentElement.innerHTML = strHtmChrome + document.documentElement.innerHTML
+        if (navigator.userAgent.indexOf('Firefox') >= 0)
+          document.documentElement.innerHTML = strHtmFireFox + document.documentElement.innerHTML
+        if (is64IE) document.write(strHtm64_Install); else
+                 if (isIE) document.write(strHtmInstall); else
+                     document.documentElement.innerHTML = strHtmInstall + document.documentElement.innerHTML
+        return LODOP
+      };
+    };
+    if (LODOP.VERSION < '6.2.0.3') {
+      if (needCLodop())
+        document.documentElement.innerHTML = strCLodopUpdate + document.documentElement.innerHTML; else
+            if (is64IE) document.write(strHtm64_Update); else
+            if (isIE) document.write(strHtmUpdate); else
+            document.documentElement.innerHTML = strHtmUpdate + document.documentElement.innerHTML
+      return LODOP
+    };
+        // ===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
+    LODOP.SET_LICENSES('西安奥枫软件有限公司', '552C41D5AB0D146FCF77D05CD8AA15A1', '', '')
+        // ===========================================================
+    return LODOP
+  } catch (err) { alert('getLodop出错:' + err) };
+};
+
+export default getLodop

package/src/components/Main.vue

@@ -1,76 +1,25 @@
 <template>
   <div @click="hindsetting1()">
-    <!--    <div class="system-main" id="box" v-el:box v-if="!isManger">-->
-    <!--      <div class="system-logo" style="height: auto">-->
-    <!--        <img :src="imgs.logoimg" alt=""/>-->
-    <!--        <label>{{systemname}}</label>-->
-    <!--        <div class="system-logo-chi" >-->
-    <!--          <div  v-if="userpane"  class="auto system-logo-prompt" style="float: right">-->
-    <!--            <span>{{orgpathnames}}</span>-->
-    <!--          </div>-->
-    <!--          &lt;!&ndash;<div class="system-logo-chi-img1" style="float: right" @mouseenter="mouseenteruser()"  @mouseleave="mouseleaveuser()"></div>&ndash;&gt;-->
-    <!--          <span  style="float: right; padding-top: 2px"  @mouseenter="mouseenteruser()"  @mouseleave="mouseleaveuser()"  class="system-logo-chi-span-1">{{$login.f.name}}</span>-->
-    <!--          <span style="border-left: 1px solid;float: right;padding-top: 2px" class="system-logo-chi-span-1"> <img src="../../static/newStyle/login-f.png" height="20" width="20"> </span>-->
-    <!--          <a href="index.html" onclick="return confirm('您确定要退出系统吗？');" style="float: right;padding-top: 2px">-->
-    <!--            <img src="../../static/newStyle/system-off.png" alt="" >-->
-    <!--            <span class="system-logo-chi-span-1">退出系统</span>-->
-    <!--          </a>-->
-    <!--          <div style="float: right"  :class="{'dropstyle':setting,'dropstyle-1':!setting}">-->
-    <!--            <dropdown class="auto" >-->
-    <!--                      <span data-toggle="dropdown" @click="hindsetting()"  >-->
-    <!--                        <img :src="srcsetting" alt=""><span>系统设置</span>-->
-    <!--                      </span>-->
-    <!--              <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-up dropstyle-chi" >-->
-    <!--                &lt;!&ndash;                <li>系统信息及设置</li>&ndash;&gt;-->
-    <!--                <li style="color: #ffffff;white-space: nowrap"  @click="show=true">修改密码</li>-->
-    <!--                <li style="color: #ffffff;white-space: nowrap"  @click="AddChangeMsgShow=true">系统版本</li>-->
-    <!--              </ul>-->
-    <!--            </dropdown>-->
-    <!--          </div>-->
 
-    <!--        </div>-->
-    <!--      </div>-->
-    <!--      <div class="system-left tree-flex" :class="{'system-left-1': !treeOrIcon}" id="top" v-el:top >-->
-    <!--        <div class="system-left-chi" :class="{'system-left-icon': !treeOrIcon}"  >-->
-    <!--          <div class="span system-left-tree" >-->
-    <!--            <left-tree :functions='functions.functions' :userid='userid' @isnodo="isnodo" :treeOrIcon="treeOrIcon"  :tabs="tabs" v-ref:tree></left-tree>-->
-    <!--            &lt;!&ndash;            <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>&ndash;&gt;-->
-    <!--          </div>-->
-    <!--        </div>-->
-    <!--        <div class="system-foot-stretch" >-->
-    <!--          <a @click="changeShow()"><img src="../../static/images/lefticon/菜单伸缩.png" alt=""></a>-->
-    <!--        </div>-->
-    <!--      </div>-->
-
-
-    <!--      <div class="system-right" :class="{'system-right-1': !treeOrIcon}" id="bottom" v-el:bottom>-->
-    <!--        <div class="span">-->
-    <!--          <echarts-box v-if="$refs.mic.tabs.length === 0"></echarts-box>-->
-    <!--          <dynamic :comps='[]' :showup="true" :showhide="false" name='main' :selecttab.sync="selecttab" @tab-changed="tabChange" @tabscg="tabcg" v-ref:mic v-show="!($refs.mic.tabs.length === 0)"></dynamic>-->
-    <!--        </div>-->
-    <!--      </div>-->
-    <!--            <div class="system-foot"  v-el:bottom>-->
-
-    <!--              <div class="system-foot-box">-->
-
-    <!--              </div>-->
-    <!--            </div>-->
-    <!--    </div>-->
     <div class='flex-row  system-main' id="box" v-el:box v-if="!isManger">
+
       <div class="auto "  :class="{'login-operator1':$refs.mic.tabs.length === 0,'login-operator':$refs.mic.tabs.length != 0}">
-            <span>
-               <img
-                 src="../assets/people.png" height="15" width="15">
-              登录人：</span>
-        <label>{{orgpathnames}}</label>
+          <span class="glyphicon glyphicon-asterisk" style="color:#a1d0f5"></span>
+          <span>组织编码:</span>
+         <label style="margin-right:14px;">{{$login.f.number}}</label>
+          <span class="glyphicon glyphicon-user"  style="color:#a1d0f5"></span>
+          <span>登录人：</span>
+          <label>{{orgpathnames}}</label>
       </div>
       <div class="system-left tree-flex" :class="{'tree-flex-icon': !treeOrIcon}" id="top" v-el:top >
         <div class="system-left-chi" :class="{'system-left-icon': !treeOrIcon}"  >
           <div class="span system-left-tree " style="height:85%">
-            <h3>{{systemname}}</h3>
+            <div class="logopicaode"  >
+              <div  class="aodeloginedlogo"></div>
+            </div>
+            <h3 style="margin-bottom: 12px;height: 35px;">&nbsp;&nbsp;</h3>
             <!--            <div class="span" style="margin-bottom:10px;padding-bottom:5px;padding-top:5px;flex: 1;border-top: 1px solid #e5e5e5;border-bottom: 1px solid #e5e5e5;">-->
             <left-tree :functions='functions.functions' :userid='userid' @isnodo="isnodo" v-show="treeOrIcon" :tabs="tabs" v-ref:tree></left-tree>
-            <!--&lt;!&ndash;              <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>&ndash;&gt;-->
           </div>
 
           <div class="tree-flex-footer">
@@ -85,11 +34,12 @@
                 <!-- <li>{{name}}</li> -->
                 <li>{{date}}</li>
                 <li @click="show=true">修改密码</li>
+                <li @click="clearCache">清除缓存</li>
                 <li @click="AddChangeMsgShow=true">系统版本:1.0.0</li>
               </ul>
 
             </dropdown>
-            <a href="index.html" onclick="return confirm('您确定要退出系统吗？');">
+            <a href="index.html" @click.prevent="logOut">
               <img :src="imgs.out" alt="" ><span v-if="treeOrIcon">退出系统</span>
             </a>
           </div>
@@ -150,17 +100,12 @@
         tabs:[],       //已初始化页签数组
         selecttab:'',
         setting:true,
-        srcsetting:'../../static/newStyle/setting.png',
+        srcsetting:'../../static/newStyle/setting.png'
 
         // headerHint: true, // 右侧顶部提示信息
         // value: 25645.26,
         // AddChangeMsgShow: false,
         // showsum: false
-        lockReconnect: false, // 避免重复连接
-        timeout: 10000,   // 10秒发一次心跳
-        connectNumber: 10, // 重连次数
-        timeoutObj: null,
-        serverTimeoutObj: null
       }
     },
     ready () {
@@ -207,91 +152,8 @@
       // 				return false
       // 			}
       this.changeShow()
-
-      vue.prototype.$connectNumber = this.connectNumber
-      this.initWebSocket()
     },
     methods: {
-      // 清除
-      reset () {
-        clearTimeout(this.timeoutObj)
-        clearTimeout(this.serverTimeoutObj)
-      },
-      // 发送心跳
-      start () {
-        // 重置
-        vue.prototype.$connectNumber = this.connectNumber
-        this.timeoutObj = setTimeout(() => {
-          this.$socket.send('ping')
-          console.log('ping!')
-          this.serverTimeoutObj = setTimeout(() => {
-            this.$socket.close()
-          }, this.timeout)
-        }, this.timeout)
-      },
-      // 重连
-      reconnect () {
-        if (this.lockReconnect) return
-        if (this.$connectNumber <= 0) {
-          vue.showMessage('连接已断开，将无法接收消息，请重新登录', ['confirm']).then((res) => {
-            if (res === 'confirm') {
-              location.reload()
-            }
-          })
-          return
-        }
-        this.$connectNumber--
-        setTimeout(() => {
-          console.log('连接异常，尝试重新连接。。。。')
-          this.initWebSocket()
-          this.lockReconnect = false
-        }, 1000 * 60)
-      },
-      // 初始化
-      initWebSocket () {
-        let path = `ws://${location.host}/ws?token=${this.$login.f.id}`
-        try {
-          if ('WebSocket' in window) {
-            // 创建对象
-            vue.prototype.$socket = new WebSocket(path)
-          } else {
-            this.$showMessage('您的浏览器不支持websocket的协议，建议使用新版谷歌浏览器，请勿使用IE浏览器，360浏览器请使用极速模式，不要使用兼容模式!"')
-          }
-        } catch (e) {
-          this.reconnect()
-        }
-
-        this.$socket.onopen = this.onOpen  // 连接成功
-        this.$socket.onmessage = this.onMessage  // 收到消息时回调
-        this.$socket.onclose = this.onClose  // 连接关闭时回调
-        this.$socket.onerror = this.onError  // 通讯异常
-      },
-      // 通讯异常
-      onError () {
-        this.reconnect()
-      },
-      // 连接成功
-      onOpen () {
-        console.log('webSocket连接成功')
-        this.start()
-      },
-      // 收到消息时回调函数
-      onMessage (event) {
-        if (event.data === 'pong') {
-          this.reset()
-          this.start()
-          return
-        }
-        let data = JSON.parse(event.data)
-        this.$broadcast('onMessage', data)
-        this.$showMessage(data.message)
-      },
-      // 关闭连接时回调函数
-      onClose () {
-        console.log('webSocket连接断开')
-        this.reset()
-        this.reconnect()
-      },
       hindsetting(){
 
         this.setting=!this.setting
@@ -359,6 +221,26 @@
       tabcg(val){
         console.log(val)
         this.tabs = val
+      },
+      logOut () {
+        console.log(this.$login.f)
+        this.$showMessage('您确定要退出系统吗？', ['confirm', 'cancel']).then(async (res) => {
+          if (res == 'confirm') {
+            let data = {
+              userid: this.$login.f.id,
+              username: this.$login.f.name,
+              usertelephone: this.$login.f.f_user_telephone
+            }
+            try {
+              await this.$resetget('api/af-system/user/logout', {resolveMsg: '退出成功', rejectMsg: null})
+            }catch(e){
+            }
+            window.location.reload()
+          }
+        })
+      },
+      clearCache() {
+        this.$resetpost('/rs/search/clearCache', { userid: this.$login.f.id }, { resolveMsg: '清除缓存成功', rejectMsg: '清除缓存失败，请重试' })
       }
     },
     computed: {
@@ -578,6 +460,18 @@
   .tree-img {
     font-size: 1.2em;
   }
+  .aodeloginedlogo {
+    background:url(../../static/aodenewlogo.png);
+    background-size:80%;
+    background-repeat: no-repeat;
+  }
+  .logopicaode{
+    width: 100%;
+    height: 61px;
+    float: left;
+    margin-left: 2.5%;
+    margin-top: 10px;
+  }
 
   /*将较长信息截断显示，鼠标悬停显示全部信息*/
   .cutout50 {