manage-client 3.2.248 → 3.2.250

package/build/dev-server.js

@@ -1,180 +1,180 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// 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 shaoguan = 'http://119.146.1.106:8300/'
-var qtx= 'http://36.103.222.144:6300/'
-// var bendi = 'http://220.194.141.253:8600/'
-// var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001/'
-// var bendi = 'http://203.57.101.233:8400/'
-// var bendi = 'http://121.36.106.17:8400/'
-// var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400'
-// var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://127.0.0.1:8080'
-// 192.168.
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
-var proxyTable = {
-  '/rs/logic/exportfile': {
-    target: bendi
-  },
-  '/files': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: bendi
-  },
-  '/rs/logic/getSaleInitData': {
-    target: bendi
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: bendi
-  },
-  '/rs/path/getParams': {
-    target: bendi
-  },
-  '/rs/data': {
-    target: bendi
-  },
-  '/rs/license': {
-    target: bendi
-  },
-  '/rs/db': {
-    target: bendi
-  },
-  '/excel': {
-    target: bendi
-  },
-  '/rs/config': {
-    target: bendi
-  },
-  '/rs/sql/getLicenseById': {
-    target: bendi
-  },
-  '/rs/report': {
-    target: bendi
-  },
-  '/rs/vue': {
-    target: bendi
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/sql/singleTable': {
-    target: bendi
-  },
-  '/rs': {
-    target: wode
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8015, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8015')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// 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 shaoguan = 'http://119.146.1.106:8300/'
+var qtx= 'http://36.103.222.144:6300/'
+// var bendi = 'http://220.194.141.253:8600/'
+// var bendi = 'http://203.57.101.233:9001'
+// var bendi = 'http://172.168.1.11:9001/'
+// var bendi = 'http://203.57.101.233:8400/'
+// var bendi = 'http://121.36.106.17:8400/'
+// var fuwu = 'http://203.57.101.233:9001'
+var bendi = 'http://203.57.101.233:8400/'
+// var bendi = 'http://119.187.112.234:8400/'
+var wode = 'http://203.57.101.233:8400/'
+// 192.168.
+//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
+// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
+var proxyTable = {
+  '/rs/logic/exportfile': {
+    target: bendi
+  },
+  '/files': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: bendi
+  },
+  '/rs/logic/getSaleInitData': {
+    target: bendi
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: bendi
+  },
+  '/rs/path/getParams': {
+    target: bendi
+  },
+  '/rs/data': {
+    target: bendi
+  },
+  '/rs/license': {
+    target: bendi
+  },
+  '/rs/db': {
+    target: bendi
+  },
+  '/excel': {
+    target: bendi
+  },
+  '/rs/config': {
+    target: bendi
+  },
+  '/rs/sql/getLicenseById': {
+    target: bendi
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: bendi
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/sql/singleTable': {
+    target: bendi
+  },
+  '/rs': {
+    target: wode
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8015, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8015')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.248",
+  "version": "3.2.250",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/filiale/WEINAN/UserGasAll.vue

@@ -120,25 +120,25 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">时间区间</label>
-                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'"
+                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
                                 :show-reset-button="reset"
-                                :value.sync="model.startDate"
+                                :value.sync="model.startDate1"
                                 id="startDate"
                                 style="width:60%"
                                 placeholder="开始时间"
-                                v-model="model.startDate">
+                                v-model="model.startDate1">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
-                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'"
+                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
                                 :show-reset-button="reset"
-                                :value.sync="model.endDate"
+                                :value.sync="model.endDate1"
                                 style="width:60%"
                                 id="endDate"
                                 style="width:60%"
                                 placeholder="结束日期"
-                                v-model="model.endDate">
+                                v-model="model.endDate1">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
@@ -369,8 +369,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
         operator: [],
         filename: '',
         searchshow: true,
-        startDate: '',
-        endDate: '',
+        startDate1:'',
+        endDate1:'',
+        // startDate: '',
+        // endDate: '',
         echarts: false,
         isActiveTotalForm: false,
         condition: '1=1',
@@ -466,8 +468,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
 
       },
       search(args) {
-        this.startDate = this.$refs.paged.$refs.cri.model.startDate
-        this.endDate = this.$refs.paged.$refs.cri.model.endDate
+        // this.startDate = this.$refs.paged.$refs.cri.model.startDate
+        // this.endDate = this.$refs.paged.$refs.cri.model.endDate
+        console.log('--------------------', args)
+        console.log('--------------------', this)
         if (this.endDate == '' || this.startDate == '') {
           return this.$showMessage("时间区间的开始和结束时间不能为空！")
         }
@@ -530,6 +534,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
       }
     },
     computed: {
+      startDate(){
+        return this.startDate1 + ' 00:00:00'
+      },
+      endDate(){
+        return this.endDate1 + ' 23:59:59'
+      },
       houseTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
       },

package/src/filiale/shanxian/BankManager.vue

@@ -8,9 +8,9 @@
 import * as Util from '../../Util'
 import co from 'co'
 import echarts from 'echarts'
-import {HttpResetClass } from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
-let getData = function * (self) {
+let getData = function* (self) {
   let load = new HttpResetClass()
   load.load('POST', 'rs/sql/userfilesvalues',
     {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: self.orgid}},
@@ -20,20 +20,20 @@ let getData = function * (self) {
       // let arrparams = []
       console.log('获取数据。。', res.data)
       let org = []
-      //let name = []
-      let minyongvalue=[]
-      let feiminyongvalue=[]
+      // let name = []
+      let minyongvalue = []
+      let feiminyongvalue = []
       for (var i = 0; i < res.data.length; i++) {
         if (!org.includes(res.data[i].org)) {
           org.push(res.data[i].org)
         }
         if (res.data[i].name === '民用') {
           minyongvalue[org.indexOf(res.data[i].org)] = res.data[i].number
-        }else{
-          feiminyongvalue[org.indexOf(res.data[i].org)]= res.data[i].number
+        } else {
+          feiminyongvalue[org.indexOf(res.data[i].org)] = res.data[i].number
         }
       }
-      self.set(org,minyongvalue,feiminyongvalue)
+      self.set(org, minyongvalue, feiminyongvalue)
     })
 }
 export default {
@@ -61,16 +61,16 @@ export default {
     }
   },
   methods: {
-    set (org,minyongvalue,feiminyongvalue) {
+    set (org, minyongvalue, feiminyongvalue) {
       this.xc = echarts.init(document.getElementById('bm'))
       this.xc.setOption({
-        color: [ '#786570', '#c4ccd3' ],
-        title : {
+        color: ['#FE974B', '#3D72FF'],
+        title: {
           text: '新增用户散列图',
           subtext: '数据查询来源',
           x: 'left'
         },
-        tooltip : {
+        tooltip: {
           trigger: 'axis',
           formatter: function (params) {
             var str = ''
@@ -84,47 +84,47 @@ export default {
         legend: {
           x: 'left',
           y: 'bottom',
-          data: ['民用','非民用']
+          data: ['民用', '非民用']
         },
         toolbox: {
-          show : true,
-          feature : {
-            dataView : {show: true, readOnly: false},
-            magicType : {show: true, type: ['line', 'bar']},
-            restore : {show: true},
-            saveAsImage : {show: true}
+          show: true,
+          feature: {
+            dataView: {show: true, readOnly: false},
+            magicType: {show: true, type: ['line', 'bar']},
+            restore: {show: true},
+            saveAsImage: {show: true}
           }
         },
-        calculable : true,
-        xAxis : [
+        calculable: true,
+        xAxis: [
           {
-            type : 'category',
-            data : org
+            type: 'category',
+            data: org
           }
         ],
-        yAxis : [
+        yAxis: [
           {
-            type : 'value'
+            type: 'value'
           }
         ],
-        series : [
+        series: [
           {
-            name:'民用',
-            type:'bar',
-            data:minyongvalue,
-            markLine : {
-              data : [
-                {type : 'average', name: '平均值'}
+            name: '民用',
+            type: 'bar',
+            data: minyongvalue,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
               ]
             }
           },
           {
-            name:'非民用',
-            type:'bar',
-            data:feiminyongvalue,
-            markLine : {
-              data : [
-                {type : 'average', name : '平均值'}
+            name: '非民用',
+            type: 'bar',
+            data: feiminyongvalue,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
               ]
             }
           }
@@ -132,7 +132,7 @@ export default {
       })
     },
     searchdata () {
-      let getGen =getData(this)
+      let getGen = getData(this)
       co(getGen)
     }
   },