system-clients 3.1.94 → 3.1.96-aode

package/.eslintrc.js

@@ -1,16 +1,16 @@
-// module.exports = {
-//   root: true,
-//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-//   extends: 'standard',
-//   // required to lint *.vue files
-//   plugins: [
-//     'eslint-plugin-html'
-//   ],
-//   // add your custom rules here
-//   'rules': {
-//     // allow paren-less arrow functions
-//     'arrow-parens': 0,
-//     // allow debugger during development
-//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-//   }
-// }
+module.exports = {
+  root: true,
+  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+  extends: 'standard',
+  // required to lint *.vue files
+  plugins: [
+    'eslint-plugin-html'
+  ],
+  // add your custom rules here
+  'rules': {
+    // allow paren-less arrow functions
+    'arrow-parens': 0,
+    // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+  }
+}

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Mar 13 10:30:51 GMT+08:00 2020
-gradle.version=3.5
+#Tue Aug 16 15:18:31 CST 2022
+gradle.version=7.1

package/build/webpack.base.conf.js

@@ -7,16 +7,16 @@ module.exports = {
     app: './src/main.js'
   },
   output: {
-    path: path.resolve(__dirname, '../dist/mergeUser'),
-    publicPath: 'mergeUser/',
+    path: path.resolve(__dirname, '../dist/static'),
+    publicPath: 'static/',
     filename: '[name].js'
   },
   resolve: {
     extensions: ['', '.js', '.vue'],
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
-      'src': path.resolve(__dirname, '../src'),
-      'test': path.resolve(__dirname, '../test')
+      'test': path.resolve(__dirname, '../test'),
+      'src': path.resolve(__dirname, '../src')
     }
   },
   resolveLoader: {
@@ -32,15 +32,12 @@ module.exports = {
         test: /\.js$/,
         loader: 'babel',
         include: [
-          /src/,
-          /build/,
-          /examples/,
-          /test/,
-          /node_modules\/vue-client\/src/,
-          /node_modules\/vue-strap\/src/,
-          /node_modules\/system-clients\/src/,
-          /node_modules\/ldap-clients\/src/,
-          /node_modules\/address-client\/src/
+          `${projectRoot}\\src`,
+          `${projectRoot}\\build`,
+          `${projectRoot}\\examples`,
+          `${projectRoot}\\test`,
+          `${projectRoot}\\node_modules\\vue-client\\src`,
+          `${projectRoot}\\node_modules\\vue-strap\\src`
         ],
         options: {
           presets: ['es2015']
@@ -58,10 +55,6 @@ module.exports = {
         test: /\.less$/,
         loader: 'style!css!less'
       },
-      {
-        test: /\.css$/,
-        loader: 'style!css'
-      },
       {
         test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
         loader: 'url',

package/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "system-clients",
-  "version": "3.1.94",
+  "version": "3.1.96-aode",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
+    "doc": "doc",
     "example": "examples",
     "test": "test"
   },
@@ -19,7 +20,6 @@
   "dependencies": {
     "base64-js": "^1.3.0",
     "js-base64": "^2.4.9",
-    "jsencrypt": "^3.0.0-rc.1",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "src": "^1.1.2",
@@ -76,7 +76,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.33",
+    "vue-client": "1.21.60",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",
@@ -84,8 +84,9 @@
     "vue-router": "^0.7.13",
     "vue-strap": "^1.0.9",
     "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
+    "vue-validator": "^3.0.0-alpha.2",
     "webpack": "^1.12.2",
+    "jsencrypt": "3.0.0-rc.1",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3"

package/src/components/Main.vue

@@ -1,76 +1,25 @@
 <template>
-  <div @click="hindsetting1()" :class="{'with-watermark':showwatermakeflag}">
-    <!--    <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 @click="hindsetting1()">
 
-    <!--        </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,6 +34,7 @@
                 <!-- <li>{{name}}</li> -->
                 <li>{{date}}</li>
                 <li @click="show=true">修改密码</li>
+                <li @click="clearCache">清除缓存</li>
                 <li @click="AddChangeMsgShow=true">系统版本:1.0.0</li>
               </ul>
 
@@ -121,47 +71,6 @@
   import vue from 'vue'
   import co from 'co'
 
-  let getwartermakr = async function(self){
-    let param = {
-      tablename:'t_singlevalue',
-      condition: " 1=1 and name=\'水印内容\'"
-    };
-    let result =await self.$resetpost('rs/sql/saleSingleTable',{data:param},{resolveMsg: null, rejectMsg: null});
-    if(result && result.data.length>0){
-      self.showwatermakeflag = true;
-      createWaterMark(result.data[0].value);
-    }else{
-      self.showwatermakeflag = false;
-    }
-  }
-
-  let createWaterMark = function(userName){
-    let style;
-    if (style) style.remove();
-    let width = window.parseInt(document.body.clientWidth);
-    let canvasWidth = width / window.parseInt(width / 320);
-    let fontFamily = window.getComputedStyle(document.body)["font-family"];
-    let canvas = document.createElement("canvas");
-    canvas.width = canvasWidth;
-    canvas.height = 200;
-    let ctx = canvas.getContext("2d");
-    ctx.rotate((-20 * Math.PI) / 180);
-    ctx.font = `20px ${fontFamily}`;
-    ctx.fillStyle = "rgba(8,8,8,.1)";
-    ctx.fillText(userName, 50, 200);
-    let imgSrc = canvas.toDataURL("image/png");
-    style = document.createElement("style");
-    style.innerHTML = `.with-watermark:before{
-        content: "";
-        width: 100%;
-        height: 100%;
-        display: block;
-        position: absolute;
-        background-image: url("${imgSrc}");
-    }`;
-    (document.head.append || document.head.appendChild).apply(document.head, [style]);
-  }
-
   window.onunload = () => {
     vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
   }
@@ -191,8 +100,8 @@
         tabs:[],       //已初始化页签数组
         selecttab:'',
         setting:true,
-        srcsetting:'../../static/newStyle/setting.png',
-        showwatermakeflag:false,
+        srcsetting:'../../static/newStyle/setting.png'
+
         // headerHint: true, // 右侧顶部提示信息
         // value: 25645.26,
         // AddChangeMsgShow: false,
@@ -200,7 +109,6 @@
       }
     },
     ready () {
-      getwartermakr(this);
       let component = this.$login.getUrlCompileParames('component')
       if (component) {
         this.isManger = true
@@ -327,6 +235,9 @@
             window.location.reload()
           }
         })
+      },
+      clearCache() {
+        this.$resetpost('/rs/search/clearCache', { userid: this.$login.f.id }, { resolveMsg: '清除缓存成功', rejectMsg: '清除缓存失败，请重试' })
       }
     },
     computed: {
@@ -546,6 +457,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 {

package/src/components/equipment/EquipmentManage.vue

@@ -4,7 +4,7 @@
       <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
         <div class="row">
           <div class="col-sm-2 form-group">
-            <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
+            <label class="font_normal_body">终端类型</label>
             <v-select id="f_charge_type"
                       v-model="model.f_equipment_type"
                       placeholder='终端类型'