apply-clients 3.0.11-3 → 3.0.11-3pm

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Sun Jun 28 10:02:50 CST 2020
-gradle.version=5.2.1
+#Tue Jan 26 18:54:07 CST 2021
+gradle.version=3.5

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/gradle/wrapper/gradle-wrapper.properties

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

package/gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  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"'
-
-# 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
-    ;;
-  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, switch paths to Windows format before running java
-if $cygwin ; 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=$((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"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

package/index.html

@@ -1,21 +1,30 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <META HTTP-EQUIV="pragma" CONTENT="no-cache">
-    <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
-    <META HTTP-EQUIV="expires" CONTENT="0">
-    <title>新疆火炬燃气报装系统</title>
-    <style media="screen">
-    /*url(./static/newmainbg.jpg)*/
-      body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}
-      body .loginbg{ width:100%; height:100%; background:url(./static/loginbg.jpg) no-repeat center top;}
-    </style>
-  </head>
-  <body>
-    <!-- <widget></widget> -->
-    <app></app>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <META HTTP-EQUIV="pragma" CONTENT="no-cache">
+  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
+  <META HTTP-EQUIV="expires" CONTENT="0">
+  <title>湖南燎原燃气报装系统</title>
+  <style media="screen">
+    /*url(./static/newmainbg.jpg)*/
+
+    body {
+      font-size:16px !important;
+      width: 100%;
+      background: #7f8eaf no-repeat center bottom;
+      background-size: cover;
+    }
+
+    body .loginbg {
+      width: 100%;
+      height: 100%;
+      background: url(./static/loginbg.jpg) no-repeat center top;
+    }
+  </style>
+</head>
+<body id="bodymain" class="themeOne">
+<app></app>
+</body>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.11-3",
+  "version": "3.0.11-3pm",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -27,6 +27,7 @@
   "author": "zx <939981212@qq.com>",
   "license": "ISC",
   "dependencies": {
+    "ant-design-vue": "^1.7.6",
     "co": "4.6.0",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
@@ -36,6 +37,7 @@
     "vue-bubble": "^1.0.3"
   },
   "devDependencies": {
+    "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -76,7 +78,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "^0.5.1",
+    "ldap-clients": "3.0.18",
     "material-client": "^1.1.2",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
@@ -89,10 +91,10 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "^1.6.16",
+    "system-clients": "3.1.88-5-liaoyuan",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.21.48",
+    "vue-client": "1.24.122",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/App.vue

@@ -1,138 +1,20 @@
 <template>
-  <app-base class="bg">
-    <div class='flex'>
-      <article>
-        <route v-ref:route></route>
-      </article>
-    </div>
-  </app-base>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <route :comp="{name: 'login'}"></route>
+        </article>
+      </div>
+    </app-base>
+  </div>
 </template>
 
 <script>
-  import co from 'co'
-  import $ from 'jquery'
 
-  Date.prototype.Format = function (fmt) {
-    var o = {
-      "M+": this.getMonth() + 1, //月份
-      "d+": this.getDate(), //日
-      "H+": this.getHours(), //小时
-      "m+": this.getMinutes(), //分
-      "s+": this.getSeconds(), //秒
-      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
-      "S": this.getMilliseconds() //毫秒
-    };
-    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-    for (var k in o)
-      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-    return fmt;
-  }
-
-  let saveGen = function* (self) {
-    try {
-      yield self.$login.login(self.model.ename, self.model.password)
-      yield self.$appdata.load()
 
-      yield self.$getConfig(self, 'Login')
-      console.log('登录配置', self.config)
-      if (self.config.isMac) {
-        // 获取该登录人分公司下的mac配置
-        let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).catch(() => {
-          throw new Error('获取mac配置失败')
-        })
-        console.log('MAC地址信息', getMacs)
-        // 获取本地mac地址
-        let getLocalMac = yield self.$resetget('http://127.0.0.1:8003/loadmac', {
-          resolveMsg: null,
-          rejectMsg: null
-        }).catch(() => {
-          throw new Error('获取本地mac配置失败')
-        })
-        console.log('本地MAC地址信息', getLocalMac)
-        // 对Mac地址进行匹配
-        let macValidate = false
-        for (let i = 0; i < getLocalMac.data.mac.length; i++) {
-          for (let j = 0; j < getMacs.data.length; j++) {
-            if (getMacs.data[j].f_mac_number.toLocaleUpperCase() === getLocalMac.data.mac[i]) {
-              macValidate = true
-            }
-          }
-        }
-        if (!macValidate) {
-          throw new Error('Mac地址验证失败, 请联系管理员！！')
-        }
-      }
-      self.$refs.route.init('home-page', {functions: self.$login.f})
-    } catch (ret) {
-      console.error('登录失败', ret)
-      let msg
-      if (ret instanceof Error) {
-        msg = ret
-      }
-      if (ret.status === 0) {
-        msg = '服务连接错误，请确认服务状态'
-      } else if (ret.status === 401) {
-        msg = ret.data
-      } else if (ret.status === 710) {
-        msg = ret.data
-      }
-      self.createCode()
-      self.picLyanzhengma = ''
-      yield self.$showMessage(msg)
-      self.model.ename = ''
-      self.model.password = ''
-      self.login = false
-      $('form').fadeIn(500)
-    }
-  }
   export default {
-    data() {
-      return {
-        model: {
-          ename: null,
-          password: null
-        },
-        checkCode: '',
-        config: {}
-      }
-    },
-    async ready() {
-      let self = this
-      var url = location.search;
-      var theRequest = new Object();
-      if (url.indexOf("?") != -1) {
-        var str = url.substr(1);
-        let strs = str.split("&");
-        for (var i = 0; i < strs.length; i++) {
-          theRequest[strs[i].split("=")[0]] = decodeURIComponent(strs[i].split("=")[1]);
-        }
-      }
-      if (theRequest.ename && theRequest.password) {
-        self.model.ename = theRequest.ename
-        self.model.password = theRequest.password
-        let gen = saveGen(self)
-        return co(gen)
-      } else {
-        // this.$goto('login')
-        this.$refs.route.init('login')
-      }
-    },
-    methods: {
-      createCode() {
-        let code = "";
-        let codeLength = 4;//验证码的长度
-        let random = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
-          'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');//随机数
-        for (let i = 0; i < codeLength; i++) {
-          //循环操作
-          let index = Math.floor(Math.random() * 36);//取得随机数的索引（0~35）
-          code += random[index];//根据索引取得随机数加到code上
-        }
-        this.checkCode = code;//把code值赋给验证码
-      }
-    }
+
+
   }
 </script>