system-clients 3.0.12 → 3.0.14-akyh-2

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Dec 01 10:42:40 CST 2021
+gradle.version=7.1

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,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.0.12",
+  "version": "3.0.14-akyh-2",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/Main.vue

@@ -2,7 +2,7 @@
   <div @click="hindsetting1()">
     <div class="system-main" id="box" v-el:box v-if="!isManger">
       <div class="system-logo" style="height: auto">
-        <img src="../../static/newStyle/fife.png"/>
+        <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">
@@ -126,6 +126,7 @@
 <script>
   import vue from 'vue'
   import co from 'co'
+  import {HttpResetClass} from 'vue-client'
 
   window.onunload = () => {
     vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
@@ -144,6 +145,7 @@
           set: '/images/lefticon/系统设置.png',
           out: '/images/lefticon/退出系统.png',
           img1: '/images/newStyle/login-user.png',
+          logoimg: '/static/newStyle/fife.png'
           // img2: '/images/lefticon/退出系统.png',
         },
         treeOrIcon: false,
@@ -177,7 +179,8 @@
         })
       }
       console.log("系统名称",this.$appdata.getSingleValue("系统名称"))
-      this.systemname = this.$appdata.getSingleValue("系统名称")? this.$appdata.getSingleValue("系统名称"):'奥枫燃气'
+      this.systemname = this.$appdata.getSingleValue("系统名称")? this.$appdata.getSingleValue("系统名称"):'客服系统'
+      this.imgs.logoimg = '/static/newStyle/' + this.systemname + '.png'
       //   let oBox = this.getElement("box")
       // 	let	oTop = this.getElement("top")
       // 	let	oBottom = this.getElement("bottom")
@@ -208,6 +211,7 @@
       // 				return false
       // 			}
       this.changeShow()
+      this.applyinfo()
     },
     methods: {
         hindsetting(){
@@ -282,6 +286,28 @@
       tabcg(val){
           console.log(val)
         this.tabs = val
+      },
+      applyinfo() {
+        //如果当前登陆人有报建待办业务
+        let http = new HttpResetClass()
+        let data = {
+          condition: '1 = 1',
+          data: {
+            id: this.$login.f.id,
+            org: this.$login.f.orgs
+          }
+        }
+        http.load('POST', 'rs/sql/checkuser', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then((res) => {
+          // console.log("报建待办数据：" + JSON.stringify(res.data))
+          // console.log("报建待办数据条数：" + JSON.stringify(res.data.length))
+          if (res.data.length > 0) {
+            this.$showMessage("您有需要处理的报建待办业务！")
+          }
+        })
+
       }
     },
     computed: {

package/src/components/equipment/PhoneAdd.vue

@@ -65,7 +65,9 @@
     methods: {
       confirm () {
         this.model.f_operator = this.$login.f.name
-        this.model.f_filialeids = this.filialeCodeStr
+        this.model.f_filialeids = this.filialeCodeStr[0]
+        this.model.f_filialeid = this.filialeCodeStr[0]
+        this.model.f_orgid = this.filialeCodeStr[0]
         console.log('保存', this.model)
         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')

package/src/components/equipment/PhoneList.vue

@@ -74,7 +74,7 @@
       },
 
       selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_filialeids like '${this.filialeCodeStr}%'`
+        args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid like '${this.filialeCodeStr}%'`
         this.model.search(args.condition, this.model)
       },
       add () {

package/src/components/equipment/PosAdd.vue

@@ -65,6 +65,7 @@
         this.model.f_operator = this.$login.f.name
         this.model.f_operatorid = this.$login.f.id
         this.model.f_orgid = this.f_filialeid
+        this.model.f_filialeid = this.f_filialeid
         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {

package/src/components/equipment/PosList.vue

@@ -18,6 +18,12 @@
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
                       condition="f_terminal_number like '%{}%'" placeholder="设备编号">
             </div>
+            <div class="col-sm-3">
+              <label class="font_normal_body">联系电话</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_phone"
+                      condition="f_phone like '%{}%'" placeholder="联系电话">
+            </div>
+
             <div class="span" style="float:right;">
               <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
               <button type="button" class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
@@ -26,11 +32,21 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-3">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;所在地</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_address"
+                      condition="f_address like '%{}%'" placeholder="所在地">
+            </div>
             <div class="col-sm-3">
               <label class="font_normal_body">设备名称</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_name"
                       condition="f_terminal_name like '%{}%'" placeholder="设备名称">
             </div>
+            <div class="col-sm-3">
+              <label class="font_normal_body">机器编号</label>
+              <input  type="text" class="input_search" style="width:60%"  v-model="model.f_machine_number"
+                      condition="f_machine_number like '%{}%'" placeholder="机器编号">
+            </div>
             <div class="col-sm-3">
               <label class="font_normal_body">所属银行</label>
               <input  type="text" class="input_search" style="width:60%"  v-model="model.f_bank_name"
@@ -45,7 +61,14 @@
             <th>序号</th>
             <th>设备编号</th>
             <th>设备名称</th>
+            <th>机器编号</th>
+            <th>联系电话</th>
+            <th>所在地</th>
             <th>所属银行</th>
+            <th>电池电量</th>
+            <th>是否登录</th>
+            <th>更新时间</th>
+            <th>软件版本</th>
             <th>操作</th>
           </tr>
         </template>
@@ -54,10 +77,19 @@
             <td style="text-align:center">{{$index+1}}</td>
             <td style="text-align:center">{{row.f_terminal_number}}</td>
             <td style="text-align:center">{{row.f_terminal_name}}</td>
+            <td style="text-align:center">{{row.f_machine_number}}</td>
+            <td style="text-align:center">{{row.f_phone}}</td>
+            <td style="text-align:center">{{row.f_address}}</td>
             <td style="text-align:center">{{row.f_bank_name}}</td>
+            <td style="text-align:center">{{row.f_battery_level}}</td>
+            <td style="text-align:center">{{row.f_is_login}}</td>
+            <td style="text-align:center">{{row.f_hybrid_version}}</td>
+            <td style="text-align:center">{{row.f_appVer}}</td>
             <td style="text-align:center">
               <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
+
+
           </tr>
         </template>
       </data-grid>
@@ -77,6 +109,7 @@
         model: new PagedList('rs/sql/equipmentQuery', 20),
         curorgid: [this.f_filialeid],
         f_orgid: '',
+        f_filialeids:'',
         criteriaShow: false
       }
     },
@@ -87,17 +120,24 @@
     methods: {
 
       search () {
+        console.log("111111111111111111111111111111111111")
         this.$refs.paged.$refs.cri.search()
       },
 
       selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
+        args.condition =  `${args.condition} and f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
         this.model.search(args.condition, this.model)
         this.$dispatch('research')
       },
 
       add () {
-        this.$dispatch('add')
+        if (this.f_filialeid) {
+          this.$parent.f_filialeid=this.f_filialeid
+          this.$dispatch('add')
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+
       },
 
       del (row) {
@@ -113,6 +153,7 @@
       getorg (val) {
         this.f_orgid = val[0]
         this.f_filialeid = val[0]
+        this.search()
       },
       hidden(){
         this.criteriaShow = !this.criteriaShow

package/src/components/server/Login.vue

@@ -16,7 +16,7 @@
       </div>
       <div class="loginmain-right">
 
-        <p @click="theme()" style="white-space: nowrap">奥枫燃气客服系统</p>
+        <p @click="theme()" style="white-space: nowrap">燃气客服系统</p>
 
         <form v-show="!login">
           <!--                    <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">-->
@@ -73,7 +73,7 @@
       <!--          </form>-->
       <!--        </div>-->
     </div>
-    <div class="login-foot">
+    <div class="login-foot" v-show="false">
       技术支持：西安奥枫软件有限公司
     </div>
   </div>

package/src/plugins/GetLoginInfoService.js

@@ -161,7 +161,7 @@ let loginGen = async function (name, password) {
         await proc(Vue.$login.f)
       }
       // 定时发送心跳
-      setInterval(()=> {
+      /*setInterval(()=> {
         let http = new HttpResetClass()
         http.load('POST', `rs/user/access/${Vue.$login.f.id}`, {}, {resolveMsg: null, rejectMsg: null}).then((req) => {
           if(req.data.status==710){
@@ -172,7 +172,7 @@ let loginGen = async function (name, password) {
             })
           }
         })
-      }, 2 * 60 * 1000)
+      }, 2 * 60 * 1000)*/
     }
 
   } else {

package/.npmignore

@@ -1,10 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-/dev-server.js