manage-client 3.2.75 → 3.2.76-jb

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/.classpath

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

package/.editorconfig

@@ -1,9 +1,9 @@
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

package/.project

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>client</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>client</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

package/README.md

@@ -1,39 +1,39 @@
-# ManageClient
-
-#### 项目介绍
-{**以下是码云平台说明，您可以替换为您的项目简介**
-码云是开源中国推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 使用说明
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 参与贡献
-
-1. Fork 本项目
-2. 新建 Feat_xxx 分支
-3. 提交代码
-4. 新建 Pull Request
-
-
-#### 码云特技
-
-1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+# ManageClient
+
+#### 项目介绍
+{**以下是码云平台说明，您可以替换为您的项目简介**
+码云是开源中国推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
+无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
+
+#### 软件架构
+软件架构说明
+
+
+#### 安装教程
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### 使用说明
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### 参与贡献
+
+1. Fork 本项目
+2. 新建 Feat_xxx 分支
+3. 提交代码
+4. 新建 Pull Request
+
+
+#### 码云特技
+
+1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
+3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
+4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
+5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
 6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

package/build/dev-server.js

@@ -13,9 +13,9 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8090'
+var bendi = 'http://114.117.163.208:8600/#'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://121.36.106.17:8400/'
+var fuwu = 'http://114.117.163.208:8600/#'
 // var fuwu = 'http://172.168.1.11:9001'
 var system = 'http://192.168.50.4:8400'
 //192.168.
@@ -69,19 +69,19 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: fuwu
+    target: bendi
   },
   '/rs/vue': {
     target: fuwu
   },
   '/rs/file': {
-    target: fuwu
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
+    target: bendi
   },
+  // '/rs/logic/SumSettleFileImport': {
+  //   target: 'http://127.0.0.1:8080'
+  // },
   '/rs': {
-    target: fuwu
+    target: bendi
   }
 }
 

package/config/dev.env.js

@@ -1,6 +1,6 @@
-var merge = require('webpack-merge')
-var prodEnv = require('./prod.env')
-
-module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
-})
+var merge = require('webpack-merge')
+var prodEnv = require('./prod.env')
+
+module.exports = merge(prodEnv, {
+  NODE_ENV: '"development"'
+})

package/config/prod.env.js

@@ -1,3 +1,3 @@
-module.exports = {
-  NODE_ENV: '"production"'
-}
+module.exports = {
+  NODE_ENV: '"production"'
+}

package/config/test.env.js

@@ -1,6 +1,6 @@
-var merge = require('webpack-merge')
-var devEnv = require('./dev.env')
-
-module.exports = merge(devEnv, {
-  NODE_ENV: '"testing"'
-})
+var merge = require('webpack-merge')
+var devEnv = require('./dev.env')
+
+module.exports = merge(devEnv, {
+  NODE_ENV: '"testing"'
+})

package/package.json

@@ -1,14 +1,17 @@
 {
   "name": "manage-client",
-  "version": "3.2.75",
+  "version": "3.2.76-jb",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
     "test": "test"
   },
-  "dependencies": {},
+  "dependencies": {
+    "crypto-js": "^4.1.1",
+    "swiper": "^5.4.5"
+  },
   "devDependencies": {
-    "axios": "^0.21.1",
+    "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -32,6 +35,7 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
     "extract-text-webpack-plugin": "^1.0.1",
+    "filemanager-webpack-plugin": "^2.0.5",
     "file-loader": "^0.8.4",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
@@ -50,23 +54,24 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.28",
+    "ldap-clients": "3.0.60",
     "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": "3.4.121-jb",
     "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",
+    "swiper": "^5.4.5",
+    "system-clients": "3.2.68",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.33",
+    "vue-client": "1.24.93",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",
@@ -78,7 +83,8 @@
     "webpack": "1.12.2",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
+    "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0"
   },
   "scripts": {
     "unit": "karma start test/unit/karma.conf.js --single-run",

package/release.bat

@@ -1,5 +1,5 @@
-git add -A
-git commit -m "[build] %1"
-git tag -a V%1 -m "Release version %1"
-git push origin --tags
-git push
+git add -A
+git commit -m "[build] %1"
+git tag -a V%1 -m "Release version %1"
+git push origin --tags
+git push

package/src/App.vue

@@ -1,28 +1,71 @@
-<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: '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: '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: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+
+export default {
+  data () {
+    return {
+      lastTime: null, // 最后一次点击的时间
+      currentTime: null, // 当前点击的时间
+      // 获取一次不在获取控制
+      getConfig: false,
+      config: {
+        timeOut: 0, // 单位: 分钟
+        exitPrompt: '因您长时间未操作, 请重新登陆!'
+      },
+    }
+  },
+  ready () {
+    Vue.mmType = 'nginx'
+    Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+  },
+  created () {
+    this.lastTime = new Date().getTime()
+  },
+  methods: {
+    async isTimeOut () {
+      // 获取config配置
+      if (!this.getConfig && this.$login.f && this.$login.f.dir) {
+        await this.$getConfig(this, 'App')
+        this.getConfig = true
+      }
+      // 无配置,不开启
+      if (this.config.timeOut <= 0) return
+      // 记录这次点击的时间
+      this.currentTime = new Date().getTime()
+      // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于超时时间
+      if (this.currentTime - this.lastTime > (this.config.timeOut * 60 * 1000)) {
+        // 如果是登录状态
+        if (this.$login.f.id) {
+          await this.$showMessage(this.config.exitPrompt)
+          window.location.reload()
+        } else {
+          this.lastTime = new Date().getTime()
+        }
+      } else {
+        // 如果在超时时间内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+        this.lastTime = new Date().getTime()
+      }
+    }
+  }
+}
+</script>

package/src/components/MeterManage/ChangeMeterQuery.vue

@@ -1,82 +1,82 @@
-<template >
-  <div id="stand-work-list" class="flex bg-white p-10">
-    <div class="height:auto">
-      <criteria-paged :model="model" v-ref:paged  >
-        <data-grid :model="model" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <th>序号</th>
-              <th><nobr>换表类型</nobr></th>
-              <th><nobr>换表费</nobr></th>
-              <th><nobr>旧表底数</nobr></th>
-              <th><nobr>新表底数</nobr></th>
-              <th><nobr>旧卡号</nobr></th>
-              <th><nobr>新卡号</nobr></th>
-              <th><nobr>换表日期</nobr></th>
-            </tr>
-          </template>
-          <template partial='body' partial='list' v-ref:grid>
-            <tr >
-              <td style="text-align: center;">{{$index+1}}</td>
-              <td style="text-align: center;"><nobr>{{row.f_change_type}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_newmeter_base}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_newcard_id}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_changemeter_date}}</nobr></td>
-            </tr>
-          </template>
-          <template partial='foot'></template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-
-  export default {
-    title: '收费',
-    data () {
-      return {
-        condition: '1=1',
-        model: new PagedList('rs/sql/changeMeterQuery', 15),
-        row: null,
-        isdeal: true,
-        obj: {
-          userid: this.$login.f.id,
-          source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-          res: this.$login.f.f_fengongsi,
-          resids: this.$login.f.f_orgids
-        },
-        show: false
-      }
-    },
-    props:
-      {
-        f_userinfo_id: '',
-        isdeal: {},
-        args:{}
-      },
-    ready () {
-      this.search()
-    },
-    methods: {
-      search(){
-        if(this.args && this.args.model) {
-          this.condition = `f_userinfo_id = ${this.f_userinfo_id} `
-          if (this.args.model.f_start_date) this.condition += `and f_changemeter_date >= '${this.args.model.f_start_date} '`
-          if (this.args.model.f_end_date) this.condition += `and f_changemeter_date <= '${this.args.model.f_end_date}' `
-          this.model.search(this.condition, this.args.model)
-        }
-      }
-    },
-    watch:{
-      args(val){
-        this.search()
-      }
-    }
-  }
-</script>
+<template >
+  <div id="stand-work-list" class="flex bg-white p-10">
+    <div class="height:auto">
+      <criteria-paged :model="model" v-ref:paged  >
+        <data-grid :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th><nobr>换表类型</nobr></th>
+              <th><nobr>换表费</nobr></th>
+              <th><nobr>旧表底数</nobr></th>
+              <th><nobr>新表底数</nobr></th>
+              <th><nobr>旧卡号</nobr></th>
+              <th><nobr>新卡号</nobr></th>
+              <th><nobr>换表日期</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align: center;">{{$index+1}}</td>
+              <td style="text-align: center;"><nobr>{{row.f_change_type}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_newmeter_base}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_newcard_id}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changemeter_date}}</nobr></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: '收费',
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('rs/sql/changeMeterQuery', 15),
+        row: null,
+        isdeal: true,
+        obj: {
+          userid: this.$login.f.id,
+          source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+          res: this.$login.f.f_fengongsi,
+          resids: this.$login.f.f_orgids
+        },
+        show: false
+      }
+    },
+    props:
+      {
+        f_userinfo_id: '',
+        isdeal: {},
+        args:{}
+      },
+    ready () {
+      this.search()
+    },
+    methods: {
+      search(){
+        if(this.args && this.args.model) {
+          this.condition = `f_userinfo_id = ${this.f_userinfo_id} `
+          if (this.args.model.f_start_date) this.condition += `and f_changemeter_date >= '${this.args.model.f_start_date} '`
+          if (this.args.model.f_end_date) this.condition += `and f_changemeter_date <= '${this.args.model.f_end_date}' `
+          this.model.search(this.condition, this.args.model)
+        }
+      }
+    },
+    watch:{
+      args(val){
+        this.search()
+      }
+    }
+  }
+</script>