manage-client 3.2.234 → 3.2.236

package/src/filiale/qianneng/QnJgqZhdacx.vue

@@ -134,9 +134,6 @@
                   <th>
                     <nobr>表号</nobr>
                   </th>
-                  <th>
-                    <nobr>气表底数</nobr>
-                  </th>
                   <th>
                     <nobr>客户类型</nobr>
                   </th>
@@ -152,12 +149,6 @@
                   <th>
                     <nobr>表状态</nobr>
                   </th>
-                  <th>
-                    <nobr>抄表册编号</nobr>
-                  </th>
-                  <th>
-                    <nobr>抄表册顺序</nobr>
-                  </th>
                   <th>
                     <nobr>备注信息</nobr>
                   </th>
@@ -197,9 +188,6 @@
                 <td style="text-align: center;">
                   <nobr>{{row.f_meternumber}}</nobr>
                 </td>
-                <td style="text-align: center;">
-                  <nobr>{{row.f_meter_base}}</nobr>
-                </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_user_type}}</nobr>
                 </td>
@@ -215,12 +203,6 @@
                 <td style="text-align: center;">
                   <nobr>{{row.f_table_state}}</nobr>
                 </td>
-                <td style="text-align: center;">
-                  <nobr>{{row.f_meter_book_num}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                  <nobr>{{row.f_meter_book_sort}}</nobr>
-                </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_comments}}</nobr>
                 </td>
@@ -636,7 +618,7 @@
         return data
       },
       getExportField() {
-        return exportConfig.qnChaobiaoyhhz
+        return exportConfig.qnJgqZhdacx
       },
       inputtor () {
         // 获取抄表员

package/src/filiale/qianneng/exportConfig.js

@@ -121,6 +121,40 @@ export default{
   qnTiaojiabuchaTJB:{
     'f_type': '业务类别','f_user_type': '客户类型','bicount': '笔数','f_change_price': '价差','f_operator': '操作人',
     'f_real_amount': '补差气量','f_surplus_fee': '补差金额','zhzc': '账户支出','zhcr': '账户存入','f_collection': '实收'
-  }
+  },
+  qnJgqZhdacx:{
+    'f_userinfo_code':'客户编号',	'f_user_name':'客户名称',	'f_user_state':'客户状态',	'f_address':'客户地址',	'f_user_phone':'客户电话',
+    'f_gas_date':'通气日期',	'f_price_name':'气价名称',	'f_meter_type':'气表类型',	'f_meter_brand':'气表品牌',	'f_meter_style':'气表型号',
+    'f_meternumber':'表号',	 'f_user_type':'客户类型',	'f_gasproperties':'用气性质',	'f_credentials':'证件类型',
+    'f_idnumber':'证件号码',	'f_table_state':'表状态',	'f_comments':'备注信息'
+  },
+  qnJgqMgqbb:{
+    'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'地址','e_spmc':'商品名称','g_cbqj':'抄表期间','h_csqf':'起方','i_cszf':'止方',
+    'j_ysql':'气量','k_dj':'单价','l_je':'金额','m_znj':'违约金',/**'n_jc':'价差',**/'o_sjje':'金额合计','r_yqxzcfl':'用气性质',
+    's_jfrq':'日期','t_jfyf':'月份','sfyg':'收费员','cbg':'抄表员'
+  },
+  qnJgqGshzbb:{
+    'a_jfyf':'月份',	'c_yqxz':'用气性质',	'd_dj':'单价',	'e_ysql':'气量',	'f_je':'金额', 'g_znj':'违约金', 'i_sjje':'金额合计',
+  },
+  qnJgqGsxsmx:{
+    'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'用气地址','e_spmc':'商品名称','g_cbqj':'抄表期间','h_csqf':'起方','i_cszf':'止方',
+    'j_ysql':'气量','k_dj':'单价','l_je':'金额','m_znj':'违约金','o_sjje':'金额合计','u_xyqxz':'用气性质','s_jfrq':'日期',
+    't_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员'
+  },
+  qnJgqMyhzbb:{
+    'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'地址','khlx':'客户类型','r_yqxzcfl':'用气性质','nyql':'年用气量','nje':'年用气金额'
+  },
+  qnJgqMyxsmx:{
+    'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'地址','e_spmc':'商品名称','g_cbqj':'抄表期间','h_csqf':'起方','i_cszf':'止方',
+    'j_ysql':'气量','k_dj':'单价','l_je':'金额','m_znj':'违约金',/**'n_jc':'价差',**/'o_sjje':'金额合计','r_yqxzcfl':'用气性质',
+    's_jfrq':'日期','t_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员'
+  },
+  qnJgqXsjgbb:{
+    'a_yf':'月份','b_hjql':'合计气量','c_hjhs':'合计户数','d_gyql':'工业气量','e_gyhs':'工业户数','f_syql':'商业气量','g_syhs':'商业户数',
+    'h_xxql':'学校气量','i_xxhs':'学校户数','j_jmql':'居民气量','k_jmhs':'居民户数'
+  },
+  qnJgqYhsbb:{
+    'a_yd':'月度','b_gy':'工业','c_sy':'商业','d_yy':'医院','e_yey':'幼儿园','f_yl':'养老','g_xx':'学校','h_jm':'居民户','i_bgl':'壁挂炉','j_xj':'小计'
+  },
 }
 

package/src/filiale/shanxian/BankManager.vue

@@ -64,13 +64,22 @@ export default {
     set (org,minyongvalue,feiminyongvalue) {
       this.xc = echarts.init(document.getElementById('bm'))
       this.xc.setOption({
+        color: [ '#786570', '#c4ccd3' ],
         title : {
           text: '新增用户散列图',
           subtext: '数据查询来源',
           x: 'left'
         },
         tooltip : {
-          trigger: 'item'
+          trigger: 'axis',
+          formatter: function (params) {
+            var str = ''
+            str += params[0].name + '</br>'
+            for (var i = 0; i < params.length; i++) {
+              str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '户' + '</br>'
+            }
+            return str
+          }
         },
         legend: {
           x: 'left',

package/src/filiale/shanxian/BussinessType.vue

@@ -55,13 +55,26 @@ export default {
    set (arrparams,numdata,pricedata) {
      this.xc = echarts.init(document.getElementById('sm'))
      this.xc.setOption({
+       color: [ '#A7C2B9', '#E4B1F7' ],
        title : {
          text: '其他业务散列图',
          subtext: '数据查询来源',
          x: 'left'
        },
         tooltip:{
-          trigger:'item'
+          trigger: 'axis',
+          formatter: function (params) {
+            var str = ''
+            str += params[0].name + '</br>'
+            for (var i = 0; i < params.length; i++) {
+              if (i === 0) {
+                str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '笔' + '</br>'
+              } else {
+                str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '元' + '</br>'
+              }
+            }
+            return str
+          }
         },
        legend: {
          x: 'left',

package/src/filiale/shanxian/Paymentpie.vue

@@ -92,7 +92,7 @@ export default {
          }],
        tooltip: {
          trigger: 'item',
-         formatter: '{a} <br/>{b}: {c} ({d}%)'
+         formatter: '{a} <br/>{b}: ({c}m³) ({d}%)'
        },
        legend: {
          orient: 'horizontal',
@@ -148,7 +148,7 @@ export default {
          }],
        tooltip: {
          trigger: 'item',
-         formatter: '{a} <br/>{b}: {c} ({d}%)'
+         formatter: '{a} <br/>{b}: ({c}元) ({d}%)'
        },
        legend: {
          orient: 'horizontal',

package/src/filiale/shanxian/SiteManager.vue

@@ -62,7 +62,21 @@ export default {
          x: 'left'
        },
        tooltip : {
-         trigger: 'item'
+         trigger: 'axis',
+         formatter: function (params) {
+           var str = ''
+           str += params[0].name + '</br>'
+           for (var i = 0; i < params.length; i++) {
+             if (i === 0) {
+               str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '笔' + '</br>'
+             } else if (i === 1) {
+               str += params[i].marker + params[i].seriesName + ': ' + params[i].data + 'm³' + '</br>'
+             } else {
+               str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '元' + '</br>'
+             }
+           }
+           return str
+         }
        },
        legend: {
          x: 'left',
@@ -96,6 +110,16 @@ export default {
           type:'bar',
           data:numdata,
           barMinHeight: 5,
+          itemStyle: {
+            normal: {
+              color: function (params) {
+                // 给出颜色组
+                var colorList = ['#FE8463', '#9BCA63', '#FAD860', '#F3A43B',
+                  '#60C0DD', '#F4E001', '#F0805A']
+                return colorList[params.dataIndex]
+              }
+            }
+          },
           markLine : {
             data : [
               {type : 'average', name: '平均值'}
@@ -106,6 +130,16 @@ export default {
           name:'气量',
           type:'bar',
           data:gasdata,
+          itemStyle: {
+            normal: {
+              color: function (params) {
+                // 给出颜色组
+                var colorList = ['#AF9E22', '#45AC89', '#C2DF99',
+                  '#183467', '#26C0C0']
+                return colorList[params.dataIndex]
+              }
+            }
+          },
           markLine : {
             data : [
               {type : 'average', name: '平均值'}
@@ -116,6 +150,16 @@ export default {
           name:'金额',
           type:'bar',
           data:pricedata,
+          itemStyle: {
+            normal: {
+              color: function (params) {
+                // 给出颜色组
+                var colorList = ['#C1232B', '#B5C334', '#FCCE10', '#E87C25',
+                  '#27727B', '#D7504B', '#C6E579']
+                return colorList[params.dataIndex]
+              }
+            }
+          },
           markLine : {
           data : [
               {type : 'average', name : '平均值'}

package/src/main.js

@@ -1,65 +1,66 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-//import webmeterManage from './webmeterManage'
-//import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage('huayin')
-//webmeterManage()
-ManageHome()
-newmanage()
-//reportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage()
+webmeterManage("WEINAN")
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+

package/lib/package_2022-12-01-14-30-50.json

@@ -1,109 +0,0 @@
-{
-  "name": "manage-client",
-  "version": "3.2.174",
-  "description": "经营管控模块前台组件",
-  "main": "src/index.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {
-    "swiper": "^5.4.5"
-  },
-  "devDependencies": {
-    "axios": "0.15.3",
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "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",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "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",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "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",
-    "moment": "2.24.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.5.0",
-    "sale-client": "3.4.14",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "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",
-    "vue-client": "1.24.51",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "webpack-parallel-uglify-plugin": "^1.0.0"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js --single-run",
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/management_modules.git"
-  },
-  "keywords": [
-    "manage"
-  ],
-  "author": "liuxudong",
-  "license": "ISC"
-}