manage-client 3.2.210 → 3.2.212

package/src/filiale/shanxian/BankManager.vue

@@ -0,0 +1,146 @@
+<template lang="html">
+  <div id="charts">
+    <div id="bm" :style="{width:'100%',height:'100%'}"></div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../../Util'
+import co from 'co'
+import echarts from 'echarts'
+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++) {
+        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
+        }
+      }
+      self.set(org,minyongvalue,feiminyongvalue)
+    })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+  },
+  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: 'item'
+        },
+        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: '平均值'}
+              ]
+            }
+          },
+          {
+            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>

package/src/filiale/shanxian/BussinessType.vue

@@ -0,0 +1,137 @@
+<template lang="html">
+  <div id="charts">
+    <div id="sm" :style="{width:'100%',height:'98%'}"></div>
+  </div>
+</template>
+
+<script>
+  /* eslint-disable indent,key-spacing,no-labels */
+
+  import * as Util from '../../Util'
+import co from 'co'
+import echarts from 'echarts'
+import {HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+  load.load('POST','rs/sql/BusinessType',
+  {data: {startDate: self.startdate, endDate: self.enddate,f_orgid: self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    self.texttile = '用户类型'
+    let arrparams = []
+    let numdata = []
+    let pricedata = []
+    for (var i = 0; i < res.data.length; i++) {
+        arrparams[i] = res.data[i].name
+        numdata[i] = res.data[i].num
+        pricedata[i] = res.data[i].money
+    }
+    self.set(arrparams,numdata,pricedata)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+  },
+ data () {
+    title: '业务类型'
+   return {
+     texttile: '',
+     xc: ''
+   }
+ },
+ methods: {
+   set (arrparams,numdata,pricedata) {
+     this.xc = echarts.init(document.getElementById('sm'))
+     this.xc.setOption({
+       title : {
+         text: '其他业务散列图',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+        tooltip:{
+          trigger:'item'
+        },
+       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 : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'数量',
+          type:'bar',
+          data:numdata,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'金额',
+          type:'bar',
+          data:pricedata,
+          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>

package/src/filiale/shanxian/reportManage.js

@@ -2,10 +2,14 @@
 let specialComp = {
   // 收费查询
   'site-manager': (resolve) => { require(['./SiteManager'], resolve) },
+  //新增用户散列图
+  'bank-manager': (resolve) => { require(['./BankManager'], resolve) },
   // 付款方式饼图
   'paymentpie': (resolve) => {
     require(['./Paymentpie'], resolve)
   },
+  // 其他业务散列
+  'bussiness-type': (resolve) => { require(['./BussinessType'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/main.js

@@ -44,7 +44,7 @@ all()
 ldap()
 system(false)
 
-saleManage("wuhai")
+saleManage("shanxian")
 webmeterManage("wuhai")
 ManageHome()
 newmanage()

package/yarn-error.log

@@ -1,30 +1,30 @@
-Arguments: 
-  D:\Program Files\nodejs\node.exe C:\Users\80953\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js install
-
-PATH: 
-  E:\Program Files\VMware\VMware Workstation\bin\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\Java\jdk1.8.0_311\bin;C:\Program Files\Java\jdk1.8.0_311\jre\bin;D:\Program Files\nodejs\;D:\Program Files\Git\cmd;D:\Program Files\Redis\;D:\Program Files (x86)\NetSarang\Xshell 7\;D:\Program Files\OpenVPN\bin;E:\软件;D:\Program Files\Redis;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;E:\软件\self;C:\Program Files\OpenVPN\bin;C:\Users\80953\AppData\Local\Programs\Python\Python310\Scripts\;C:\Users\80953\AppData\Local\Programs\Python\Python310\;C:\Users\80953\.cargo\bin;C:\Users\80953\AppData\Local\Microsoft\WindowsApps;;D:\Program Files\Microsoft VS Code\bin;D:\Program Files\JetBrains\IntelliJ IDEA 2022.2\bin;D:\Program Files\JetBrains\WebStorm 2022.2\bin;D:\Program Files\JetBrains\DataGrip 2022.2\bin;C:\Users\80953\AppData\Roaming\npm;C:\Program Files\Bandizip\;C:\Users\80953\AppData\Local\Programs\EmEditor;C:\Users\80953\AppData\Local\JetBrains\Toolbox\scripts;D:\Program Files\JetBrains\WebStorm 2022.2\bin;;D:\Program Files\JetBrains\IntelliJ IDEA 2022.2\bin;;D:\Program Files\JetBrains\DataGrip 2022.2.1\bin;;C:\Program Files\Azure Data Studio\bin;D:\Program Files\JetBrains\CLion 2022.2.1\bin;;C:\Users\80953\AppData\Local\Microsoft\WindowsApps
-
-Yarn version: 
-  1.22.19
-
-Node version: 
-  14.19.1
-
-Platform: 
-  win32 x64
-
-Trace: 
-  Error: https://registry.npmjs.org/jsencrypt: tunneling socket could not be established, cause=connect ECONNREFUSED 127.0.0.1:4780
-      at ClientRequest.onError (C:\Users\80953\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:152376:17)
-      at Object.onceWrapper (events.js:520:26)
-      at ClientRequest.emit (events.js:400:28)
-      at Socket.socketErrorListener (_http_client.js:475:9)
-      at Socket.emit (events.js:400:28)
-      at emitErrorNT (internal/streams/destroy.js:106:8)
-      at emitErrorCloseNT (internal/streams/destroy.js:74:3)
-      at processTicksAndRejections (internal/process/task_queues.js:82:21)
-
-npm manifest: 
+Arguments: 
+  D:\Program Files\nodejs\node.exe C:\Users\80953\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js install
+
+PATH: 
+  E:\Program Files\VMware\VMware Workstation\bin\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\Java\jdk1.8.0_311\bin;C:\Program Files\Java\jdk1.8.0_311\jre\bin;D:\Program Files\nodejs\;D:\Program Files\Git\cmd;D:\Program Files\Redis\;D:\Program Files (x86)\NetSarang\Xshell 7\;D:\Program Files\OpenVPN\bin;E:\软件;D:\Program Files\Redis;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;E:\软件\self;C:\Program Files\OpenVPN\bin;C:\Users\80953\AppData\Local\Programs\Python\Python310\Scripts\;C:\Users\80953\AppData\Local\Programs\Python\Python310\;C:\Users\80953\.cargo\bin;C:\Users\80953\AppData\Local\Microsoft\WindowsApps;;D:\Program Files\Microsoft VS Code\bin;D:\Program Files\JetBrains\IntelliJ IDEA 2022.2\bin;D:\Program Files\JetBrains\WebStorm 2022.2\bin;D:\Program Files\JetBrains\DataGrip 2022.2\bin;C:\Users\80953\AppData\Roaming\npm;C:\Program Files\Bandizip\;C:\Users\80953\AppData\Local\Programs\EmEditor;C:\Users\80953\AppData\Local\JetBrains\Toolbox\scripts;D:\Program Files\JetBrains\WebStorm 2022.2\bin;;D:\Program Files\JetBrains\IntelliJ IDEA 2022.2\bin;;D:\Program Files\JetBrains\DataGrip 2022.2.1\bin;;C:\Program Files\Azure Data Studio\bin;D:\Program Files\JetBrains\CLion 2022.2.1\bin;;C:\Users\80953\AppData\Local\Microsoft\WindowsApps
+
+Yarn version: 
+  1.22.19
+
+Node version: 
+  14.19.1
+
+Platform: 
+  win32 x64
+
+Trace: 
+  Error: https://registry.npmjs.org/jsencrypt: tunneling socket could not be established, cause=connect ECONNREFUSED 127.0.0.1:4780
+      at ClientRequest.onError (C:\Users\80953\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:152376:17)
+      at Object.onceWrapper (events.js:520:26)
+      at ClientRequest.emit (events.js:400:28)
+      at Socket.socketErrorListener (_http_client.js:475:9)
+      at Socket.emit (events.js:400:28)
+      at emitErrorNT (internal/streams/destroy.js:106:8)
+      at emitErrorCloseNT (internal/streams/destroy.js:74:3)
+      at processTicksAndRejections (internal/process/task_queues.js:82:21)
+
+npm manifest: 
   {
     "name": "manage-client",
     "version": "3.0.27-akyh-50",
@@ -122,12 +122,12 @@ npm manifest:
     ],
     "author": "liuxudong",
     "license": "ISC"
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
   # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
   # yarn lockfile v1
   
@@ -7656,4 +7656,4 @@ Lockfile:
   zrender@4.0.4:
     version "4.0.4"
     resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.0.4.tgz#910e60d888f00c9599073f23758dd23345fe48fd"
-    integrity sha512-03Vd/BDl/cPXp8E61f5+Xbgr/a4vDyFA+uUtUc1s+5KgcPbyY2m+78R/9LQwkR6QwFYHG8qk25Q8ESGs/qpkZw==
+    integrity sha512-03Vd/BDl/cPXp8E61f5+Xbgr/a4vDyFA+uUtUc1s+5KgcPbyY2m+78R/9LQwkR6QwFYHG8qk25Q8ESGs/qpkZw==