manage-client 3.1.24 → 3.1.26-aode

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

@@ -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,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.1.24",
+  "version": "3.1.26-aode",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -8,7 +8,6 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "axios": "^0.21.1",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -40,7 +39,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,26 +48,24 @@
     "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",
+    "vue-amap": "0.5.10",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.0",
-    "sale-client": "3.2.18-1",
+    "sale-client": "1.0.93-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-18",
     "url-loader": "^0.5.7",
-    "vue-amap": "0.5.10",
-    "vue-client": "1.24.21",
+    "vue-client": "1.22.25-aode",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",
+    "system-clients": "3.1.94-aode",
     "vue-resource": "^1.5.0",
     "vue-router": "^0.7.13",
     "vue-strap": "^1.0.9",

package/src/App.vue

@@ -1,29 +1,28 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <!--<route :comp="{name: 'liaoyuan-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: 'manage-main2'}"></route>-->
-          <!-- <route :comp="{name: 'load-data'}"></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>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-export default {
-
-
-}
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <!--<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: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+
+
+}
+</script>

package/src/Util.js

@@ -318,31 +318,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>

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

@@ -6,28 +6,14 @@
 </template>
 
 <script>
-  import * as DataSql from "../../../stores/DataSql";
-  import co from "co";
-
   export default {
     name: "ReasonConsultation",
-    data() {
-      return {
-        consultingdata:[],
-        visits:[],
-        grade:[],
-      }
-    },
     methods:{
-      searchdata(){
-        let consultingdata = DataSql.getData(this, 'consultingdata', {},'consultingdata')
-        co(consultingdata)
-      },
       setBar() {
         this.xc = this.$echarts.init(document.getElementById('consultation'))
         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,
@@ -108,26 +94,7 @@
       },
     },
     ready() {
-      // 拼接sql，请求后台
-      this.searchdata()
-
-    }
-    ,
-    watch :{
-      'consultingdata': {
-        deep: true,
-        handler(val) {
-          console.log('-------------客服')
-          console.log('客服',this.consultingdata)
-          console.log('长度',this.consultingdata.length)
-          for (let i = 4; i >=0 ; i--) {
-              this.visits.push(this.consultingdata[i].count)
-              this.grade.push(this.consultingdata[i].f_content)
-          }
-          this.setBar()
-        }
-      },
-
+      this.setBar()
     }
   }
 </script>