manage-client 3.2.83-2 → 3.2.83-aode

package/gradlew

@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original 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 POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${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 "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# 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" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -29,6 +29,9 @@ 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"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :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 %CMD_LINE_ARGS%
+"%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

package/package.json

@@ -1,14 +1,17 @@
 {
   "name": "manage-client",
-  "version": "3.2.83-2",
+  "version": "3.2.83-aode",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
     "test": "test"
   },
-  "dependencies": {},
+  "dependencies": {
+    "axios": "^1.2.0",
+    "jsencrypt": "*",
+    "vue-json-excel": "^0.3.0"
+  },
   "devDependencies": {
-    "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -40,7 +43,6 @@
     "isparta-loader": "^2.0.0",
     "jasmine-core": "^2.4.1",
     "jquery": "^3.3.1",
-    "jsencrypt": "3.0.0-rc.1",
     "json-loader": "^0.5.4",
     "karma": "^1.4.1",
     "karma-chrome-launcher": "^2.2.0",
@@ -50,23 +52,21 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.28",
     "less": "^2.7.3",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
-    "moment": "2.24.0",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.0",
-    "sale-client": "3.4.14",
+    "sale-client": "^1.2.17-aode",
     "selenium-server": "2.52.0",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.89-20",
+    "system-clients": "3.1.94-aode",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.33",
+    "vue-client": "^1.22.28-aode",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",

package/src/App.vue

@@ -3,14 +3,14 @@
     <app-base class="bg">
       <div class='flex'>
         <article>
-          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
+          <!--<route :comp="{name: 'manage-home'}"></route>-->
           <!--<route :comp="{name: 'meter-reading'}"></route>-->
           <!--<route :comp="{name: 'Gasproperties'}"></route>-->
           <!--<route :comp="{name: 'vender-management'}"></route>-->
           <!--<route :comp="{name: 'malfunction-home'}"></route>-->
           <route :comp="{name: 'login'}"></route>
           <!-- <route :comp="{name: 'load-data'}"></route> -->
-           <!--<route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
+          <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
           <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
         </article>
       </div>

package/src/Util.js

@@ -213,6 +213,32 @@ export function getNowDate (name) {
   // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
   return year + '年' + mymonth + '月' + myday + '日  ' + week[myweekday]
 }
+export function GetPreMonthDay(date, monthNum) {
+  var dateArr = date.split('-');
+  var year = dateArr[0]; //获取当前日期的年份
+  var month = dateArr[1]; //获取当前日期的月份
+  var day = dateArr[2]; //获取当前日期的日
+  var days = new Date(year, month, 0);
+  days = days.getDate(); //获取当前日期中月的天数
+  var year2 = year;
+  var month2 = parseInt(month) - monthNum;
+  if (month2 <= 0) {
+    var absM = Math.abs(month2);
+    year2 = parseInt(year2) - Math.ceil(absM / 12 == 0 ? 1 : parseInt(absM) / 12);
+    month2 = 12 - (absM % 12);
+  }
+  var day2 = day;
+  var days2 = new Date(year2, month2, 0);
+  days2 = days2.getDate();
+  if (day2 > days2) {
+    day2 = days2;
+  }
+  if (month2 < 10) {
+    month2 = '0' + month2;
+  }
+  var t2 = year2 + '-' + month2
+  return t2;
+}
 
 export function addDate (date, days) {
   // 求取当前时间的工具
@@ -280,6 +306,20 @@ export function uncompileStr (code) {
   return c
 }
 
+//计算日期间隔天数
+export function getDaysBetween(startDate, enDate) {
+  const sDate = Date.parse(startDate)
+  const eDate = Date.parse(enDate)
+  if (sDate > eDate) {
+    return 0
+  }
+  if (sDate === eDate) {
+    return 1
+  }
+  const days = (eDate - sDate) / (1 * 24 * 60 * 60 * 1000)
+  return days
+}
+
 export function dateDescripte (date) {
   let nowTime = new Date().getTime()
   let oldTime = new Date(date).getTime()
@@ -318,31 +358,7 @@ export function nextMonth20 (date) {
   let nextMonth = ds[1] - 0 + 1
   return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
 }
-//
-export function dateSwitch(fmt,dateStr,times){
-  let date=new Date(dateStr).getTime()+times
-  return this.dateFormat(fmt,new Date(date))
-}
-// 时间格式化
-export function dateFormat(fmt, date) {
-  let ret;
-  const opt = {
-    "y+": date.getFullYear().toString(),        // 年
-    "M+": (date.getMonth() + 1).toString(),     // 月
-    "d+": date.getDate().toString(),            // 日
-    "h+": date.getHours().toString(),           // 时
-    "m+": date.getMinutes().toString(),         // 分
-    "s+": date.getSeconds().toString()          // 秒
-    // 有其他格式化字符需求可以继续添加，必须转化成字符串
-  }
-  for (let k in opt) {
-    ret = new RegExp("(" + k + ")").exec(fmt);
-    if (ret) {
-      fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
-    }
-  }
-  return fmt
-}
+
 // export function getNowDate () {
 //   // 求取当前时间的工具
 //   let myweekday = ''

package/src/components/ManageHome/Home/Monitor.vue

@@ -42,6 +42,7 @@
     },
     data() {
       return {
+        date: [2018, 2017, 2016],
         xc: '',
         warn: '',
         suspicious: '',
@@ -91,9 +92,10 @@
             show: false,
           },
           yAxis: {
-            data: data.grade,
             type: 'category',
             axisLabel: {
+              margin: 10 * scale,
+              show: true,
               color: function (param) {
                 if (param == '警告类型') {
                   return '#fff'
@@ -108,7 +110,7 @@
             axisLine: {
               show: false,
             },
-
+            data: data.grade
           },
           series: [{
             type: 'bar',
@@ -207,7 +209,6 @@
           this.warn = this.resdata[0].warn
           this.suspicious = this.resdata[0].suspicious
           this.$parent.loaddata++
-          console.log(this.resdata, '----------警告用户统计----------')
         }
       },
       'monitordata': {
@@ -234,7 +235,6 @@
     },
     ready() {
       this.searchdata()
-
     }
   }
 </script>

package/src/components/ManageHome/Home/UserModule.vue

@@ -95,10 +95,10 @@
               text: result,
               left: '43%',
               top: '47%',
-              padding: [1000 * scale, 1000 * scale],
+              padding: [10 * scale, 10 * scale],
               textStyle: {
                 color: '#00e2ea',
-                fontSize: 120 * scale,
+                fontSize: 12 * scale,
 
               }
             }],
@@ -174,7 +174,7 @@
                       }
                     }
                   },
-                  padding: [100, -100 * scale],
+                  padding: [0, -100 * scale],
                   rich: rich,
                 }
               },

package/src/components/ManageHome/Monitor/NoContact.vue

@@ -139,7 +139,6 @@
               axisLabel: {interval: 0, textStyle: {color: '#ffffff', fontSize: 14 * scale}},
               axisTick: {show: false},
               data: xAxisData,
-              min:6
             },
           ],
           yAxis: [

package/src/components/ManageHomeCS/CustomerService/ContentmentStatistics.vue

@@ -34,13 +34,13 @@
             name: legendData[v],
             type: 'line',
             symbol: "circle",
-            symbolSize: 5 ,
+            symbolSize: 5 * scale,
             itemStyle: {
               normal: {
                 lineStyle: {
                   width: 1,
-                  shadowBlur: 10 ,
-                  shadowOffsetY: 15 ,
+                  shadowBlur: 10 * scale,
+                  shadowOffsetY: 15 * scale,
                 }
               }
             },
@@ -65,9 +65,9 @@
             data: legendData,
             y: 'top',
             // padding: [0, 25*scale, 0, 0],
-            itemWidth: 14 ,
-            itemHeight: 6 ,
-            textStyle: {width: '20%', color: "#15dce2", fontSize: 12 },
+            itemWidth: 14 * scale,
+            itemHeight: 6 * scale,
+            textStyle: {width: '20%', color: "#15dce2", fontSize: 12 * scale},
           },
           color: colors,
           grid: {left: '5%', top: "18%", bottom: "5%", right: "5%", containLabel: true},

package/src/components/ManageHomeCS/CustomerService/ExcepCollect.vue

@@ -38,7 +38,7 @@
           type: 'line',
           smooth: false,  // true: 光滑曲线  , false: 直线
           symbol: 'circle',
-          symbolSize: 5 ,
+          symbolSize: 5 * scale,
           areaStyle: {
             normal: {
               color: new this.$echarts.graphic.LinearGradient(
@@ -56,7 +56,7 @@
             position: 'top',
             textStyle: { //数值样式
               color: '#f7cb32',
-              fontSize: 14
+              fontSize: 14 * scale
             }
           },
           itemStyle: {
@@ -83,9 +83,9 @@
             right:'5%',
             data: legendData,
             y: 'top',
-            itemWidth: 12 ,
-            itemHeight: 6 ,
-            textStyle: {width: '20%', color: "#15dce2", fontSize: 12 },
+            itemWidth: 12 * scale,
+            itemHeight: 6 * scale,
+            textStyle: {width: '20%', color: "#15dce2", fontSize: 12 * scale},
             formatter: function (params) {
               return params
             },

package/src/components/ManageHomeCS/CustomerService/ReasonComplaint.vue

@@ -6,28 +6,14 @@
 </template>
 
 <script>
-  import * as DataSql from "../../../stores/DataSql";
-  import co from "co";
-
   export default {
     name: "ReasonComplaint",
-    data() {
-      return {
-        ReasonComplaint:[],
-        visits:[],
-        grade:[],
-      }
-    },
     methods:{
-      searchdata(){
-        let ReasonComplaint = DataSql.getData(this, 'reasonComplaint', {},'ReasonComplaint')
-        co(ReasonComplaint)
-      },
       setBar() {
         this.xc = this.$echarts.init(document.getElementById('complaint'))
         var scale=this.$parent.$parent.$parent.scale
-        var visits = this.visits
-        var grade = this.grade
+        var visits = [92, 102, 89,100,150]
+        var grade = ['话务员态度差','维修员延误','上门服务态度差' ,'维修未能完成','抢修未成功']
         var data = {
           grade: grade,
           visits: visits,
@@ -109,23 +95,7 @@
       },
     },
     ready() {
-      this.searchdata()
-    },
-    watch:{
-      'ReasonComplaint': {
-        deep: true,
-        handler(val) {
-          console.log('-------------客服')
-          console.log('客服',this.ReasonComplaint)
-          console.log('长度',this.ReasonComplaint.length)
-          for (let i = 4; i >=0 ; i--) {
-            this.visits.push(this.ReasonComplaint[i].count)
-            this.grade.push(this.ReasonComplaint[i].f_content)
-          }
-          this.setBar()
-        }
-      },
-
+      this.setBar()
     }
   }
 </script>