manage-client 3.2.258 → 3.2.260

package/src/filiale/wenxi/config/exportConfig.js

@@ -818,6 +818,44 @@ monthGasConfig: {
     'f_insert_date': '抄表日期',
     'f_last_insertdate': '上次抄表日期',
     'f_valvestate': '阀门开启状态'
+  },
+  // 物联网表抄表
+  webmeterHandConfig: {
+    'f_userinfo_code': '用户编号',
+    'f_user_name': '用户名称',
+    'f_residential_area': '小区名称',
+    'f_address': '地址',
+    'f_meter_brand': '气表品牌',
+    'f_meternumber': '表号',
+    'f_oughtamount': '本期气量',
+    'f_oughtfee': '本期金额',
+    'f_jval': '表内剩余余额',
+    'f_hand_date': '抄表日期',
+    'f_total_fee': '累计购气金额',
+    'f_total_gas': '累计使用量',
+    'f_balance_amount': '系统余额',
+    'cycleGas': '当前周期已用气量',
+    'cycleFee': '当前周期消费金额',
+    'f_stair1price': '一阶气价',
+    'f_stairamount1': '一阶气量',
+    'f_stair1fee': '一阶金额',
+    'f_stair2price': '二阶气价',
+    'f_stairamount2': '二阶气量',
+    'f_stair2fee': '二阶金额',
+    'f_stair3price': '三阶气价',
+    'f_stairamount3': '三阶气量',
+    'f_stair3fee': '三阶金额',
+    'f_signal': '信号强度',
+    'f_snr': '信噪比',
+    'f_batteryLevel': '电压',
+    'f_networkShutValve': '阀门关闭标志',
+    'f_valveState': '阀门状态',
+    'f_magneticInterference': '磁干扰',
+    'f_valve_exception': '异常阀门',
+    'f_SplitAlarm': '拆表报警',
+    'f_overCurrentProtection': '过流保护',
+    'f_die_meter': '死表',
+    'f_upload_type': '上报类型'
   }
 
 }

package/src/main.js

@@ -1,66 +1,68 @@
-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()
-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 saleManageRongchuang from './filiale/shanggao/sale'
+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('rongchuang')
+ldap()
+system(false)
+
+saleManage()
+saleManageRongchuang()
+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 }
+})
+