manage-client 3.1.14-aode → 3.1.15-zk

package/.eslintrc.js

@@ -10,7 +10,11 @@ module.exports = {
   'rules': {
     // allow paren-less arrow functions
     'arrow-parens': 0,
+    // allow async-await
+    'generator-star-spacing': 0,
     // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    // 必须使用全等
+    'eqeqeq': 0
   }
 }

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue May 25 10:57:31 CST 2021
-gradle.version=5.5
+#Mon Oct 26 16:02:57 CST 2020
+gradle.version=6.1.1

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Change Log
 所有关于本产品的变化都在该文档里。
+## 3.1.3-7 -2020-10-16 @王点点
+- 升至3.1.3-7综合查询导出添加导出时间和表尾合计
 ## 1.6.0 -2019-09-19 @郭伟
 - 升至1.8.0切出鄂州分支
 

package/ManageClient.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ManageClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.1-25" type="WEB_MODULE" version="4">
+<module external.linked.project.id="ManageClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.0-17" type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -10,4 +10,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

package/build/dev-server.js

@@ -10,16 +10,15 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
- var str = 'http://192.168.10.14:8300', fuwu = 'http://192.168.10.14:8300'
+var bendi = 'http://127.0.0.1:8081/'
+var fuwu = 'http://192.168.20.27:8400/'
 var proxyTable = {
-  '/rs/logic/exportfile': {
-    target: fuwu
-  },
   '/files': {
     target: fuwu
   },
+  '/rs/logic/exportfile': {
+    target: bendi
+  },
   // 查找资源服务数据
   '/rs/search': {
     target: fuwu
@@ -32,6 +31,9 @@ var proxyTable = {
   '/rs/logic/getInitData': {
     target: fuwu
   },
+  '/rs/logic/getSaleInitData':{
+    target: fuwu
+  },
   // 用户登录服务地址
   '/rs/user': {
     target: fuwu
@@ -60,9 +62,18 @@ var proxyTable = {
   '/rs/report': {
     target: fuwu
   },
+  '/rs/sql': {
+    target: bendi
+  },
   '/rs/vue': {
     target: fuwu
   },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
   '/rs': {
     target: fuwu
   }
@@ -150,10 +161,10 @@ app.use('/static', express.static('./static'))
 //   })
 // })
 
-module.exports = app.listen(8099, function (err) {
+module.exports = app.listen(8085, function (err) {
   if (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://localhost:8099')
+  console.log('Listening at http://localhost:8085')
 })

package/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "营收模块 前端组件",
   "author": "何宁社 <524395609@qq.com>",
   "license": "ISC",
@@ -92,7 +92,7 @@
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3",
-    "system-clients": "^1.0.18",
+    "system-clients": "^3.0.52",
     "safecheck-client": "^0.0.7",
     "sale-clients":"^0.0.6"
   }

package/build/webpack.base.conf.js

@@ -15,7 +15,8 @@ module.exports = {
     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('src')
     }
   },
   resolveLoader: {
@@ -25,7 +26,7 @@ module.exports = {
     loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue-loader'
       },
       {
         test: /\.js$/,
@@ -39,6 +40,7 @@ module.exports = {
           `${projectRoot}\\node_modules\\vue-strap\\src`,
           `${projectRoot}\\node_modules\\system-clients\\src`,
           `${projectRoot}\\node_modules\\sale-client\\src`,
+          `${projectRoot}\\node_modules\\ldap-clients\\src`,
         ]
       },
       {
@@ -53,6 +55,10 @@ module.exports = {
         test: /\.less$/,
         loader: 'style!css!less'
       },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
       {
         test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
         loader: 'url',

package/build.gradle

@@ -5,7 +5,7 @@ buildscript {
 	}
 }
 
-version = '3.1.1-25'
+version = '3.1.0-17'
 apply plugin: 'java'
 task release(type:Exec) {
 	workingDir '.'

package/config/index.js

@@ -27,7 +27,9 @@ module.exports = {
     autoOpenBrowser: true,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {},
+    proxyTable: {
+      timeout:3000    //设置超时时间
+    },
     // CSS Sourcemaps off by default because relative paths are "buggy"
     // with this option, according to the CSS-Loader README
     // (https://github.com/webpack/css-loader#sourcemaps)

package/gradle/wrapper/gradle-wrapper.properties

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

package/gradlew.bat

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

package/src/App.vue

@@ -3,14 +3,14 @@
     <app-base class="bg">
       <div class='flex'>
         <article>
-          <!--<route :comp="{name: 'manage-home'}"></route>-->
+          <!--<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: '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

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