manage-client 3.2.145 → 3.2.148

package/build/dev-server.js

@@ -1,176 +1,179 @@
-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://127.0.0.1:8090'
-// var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://121.36.106.17:8400'
-// var fuwu = 'http://203.57.101.233:9001'
-var system = 'http://192.168.50.4: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: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: bendi
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: fuwu
-  }
-}
-
-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(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+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://192.168.50.4:8400'
+// var bendi = 'http://172.168.1.11:9001'
+var fuwu =  'http://192.168.50.4:8400'
+// var fuwu = 'http://203.57.101.233:9001'
+var system = 'http://192.168.50.4: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: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  '/rs/sql/chargeQuery': {
+    target: 'http://127.0.0.1:8084/'
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: fuwu
+  }
+}
+
+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(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/build/webpack.base.conf.js

@@ -60,7 +60,7 @@ module.exports = {
         loader: 'style!css'
       },
       {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf|TTF)(\?.*)?$/,
         loader: 'url',
         query: {
           limit: 10000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.145",
+  "version": "3.2.148",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -64,6 +64,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
+    "swiper": "^5.4.5",
     "system-clients": "3.1.89-20",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",

package/src/App.vue

@@ -9,6 +9,7 @@
           <!--<route :comp="{name: 'vender-management'}"></route>-->
           <!--<route :comp="{name: 'malfunction-home'}"></route>-->
           <route :comp="{name: 'login'}"></route>
+<!--          <route :comp="{name: 'call-report-main-page'}"></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> -->

package/src/components/SellReport/BankManager.vue

@@ -13,17 +13,17 @@ import {HttpResetClass } from 'vue-client'
 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}},
-  {resolveMsg: null, rejectMsg: null})
-  .then((res) => {
-    self.texttile = '用户类型'
-    // let arrparams = []
-    console.log('获取数据。。', res.data)
-    let org = []
-    //let name = []
-    let minyongvalue=[]
-    let feiminyongvalue=[]
-    for (var i = 0; i < res.data.length; i++) {
+    {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: self.orgid}},
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      self.texttile = '用户类型'
+      // let arrparams = []
+      console.log('获取数据。。', res.data)
+      let org = []
+      //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)
         }
@@ -32,9 +32,9 @@ let getData = function * (self) {
         }else{
           feiminyongvalue[org.indexOf(res.data[i].org)]= res.data[i].number
         }
-    }
-    self.set(org,minyongvalue,feiminyongvalue)
-  })
+      }
+      self.set(org,minyongvalue,feiminyongvalue)
+    })
 }
 export default {
   props: {
@@ -49,98 +49,98 @@ export default {
     orgid: {
       type: String
     }
-},
- data () {
-   title: '银行管理'
-   return {
-     texttile: '',
-     xc: '',
+  },
+  data () {
+    title: '银行管理'
+    return {
+      texttile: '',
+      xc: '',
 
-     minyongvalue: [],
-     feiminyongvalue: []
-   }
- },
- methods: {
-   set (org,minyongvalue,feiminyongvalue) {
-     this.xc = echarts.init(document.getElementById('bm'))
-     this.xc.setOption({
-       title : {
-         text: '新增用户散列图',
-         subtext: '数据查询来源',
-         x: 'left'
-       },
-       tooltip : {
-         trigger: 'axis'
-       },
-       legend: {
-         x: 'left',
-         y: 'bottom',
-         data: ['民用','非民用']
-       },
-       toolbox: {
-         show : true,
-         feature : {
-           dataView : {show: true, readOnly: false},
-           magicType : {show: true, type: ['line', 'bar']},
-           restore : {show: true},
-           saveAsImage : {show: true}
-         }
-       },
-       calculable : true,
-       xAxis : [
-         {
-           type : 'category',
-           data : org
-         }
-      ],
-      yAxis : [
-        {
-          type : 'value'
-        }
-      ],
-      series : [
-        {
-          name:'民用',
-          type:'bar',
-          data:minyongvalue,
-          markLine : {
-            data : [
-              {type : 'average', name: '平均值'}
-            ]
+      minyongvalue: [],
+      feiminyongvalue: []
+    }
+  },
+  methods: {
+    set (org,minyongvalue,feiminyongvalue) {
+      this.xc = echarts.init(document.getElementById('bm'))
+      this.xc.setOption({
+        title : {
+          text: '新增用户散列图',
+          subtext: '数据查询来源',
+          x: 'left'
+        },
+        tooltip : {
+          trigger: 'axis'
+        },
+        legend: {
+          x: 'left',
+          y: 'bottom',
+          data: ['民用','非民用']
+        },
+        toolbox: {
+          show : true,
+          feature : {
+            dataView : {show: true, readOnly: false},
+            magicType : {show: true, type: ['line', 'bar']},
+            restore : {show: true},
+            saveAsImage : {show: true}
           }
         },
-        {
-          name:'非民用',
-          type:'bar',
-          data:feiminyongvalue,
-          markLine : {
-          data : [
-              {type : 'average', name : '平均值'}
-            ]
+        calculable : true,
+        xAxis : [
+          {
+            type : 'category',
+            data : org
           }
-        }
-      ]
-     })
-   },
-   searchdata () {
-     let getGen =getData(this)
-     co(getGen)
-   }
- },
- ready () {
-   this.searchdata()
- },
- watch: {
-   'startdate' (val) {
-     this.searchdata()
-   },
-   'enddate' (val) {
-     this.searchdata()
-   },
-   'orgid' (val) {
-     this.searchdata()
-   }
- }
+        ],
+        yAxis : [
+          {
+            type : 'value'
+          }
+        ],
+        series : [
+          {
+            name:'民用',
+            type:'bar',
+            data:minyongvalue,
+            markLine : {
+              data : [
+                {type : 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name:'非民用',
+            type:'bar',
+            data:feiminyongvalue,
+            markLine : {
+              data : [
+                {type : 'average', name : '平均值'}
+              ]
+            }
+          }
+        ]
+      })
+    },
+    searchdata () {
+      let getGen =getData(this)
+      co(getGen)
+    }
+  },
+  ready () {
+    this.searchdata()
+  },
+  watch: {
+    'startdate' (val) {
+      this.searchdata()
+    },
+    'enddate' (val) {
+      this.searchdata()
+    },
+    'orgid' (val) {
+      this.searchdata()
+    }
+  }
 
 }
 </script>