manage-client 3.2.253 → 3.2.255

package/src/filiale/ningjin/config/tableConfig.js

@@ -0,0 +1,54 @@
+export default{
+  //查询页面的字段名和中文对应
+  ReportDataQuery:
+    {
+      "用户编号":"f_userinfo_code",
+      "用户名称":"f_user_name",
+      "表号":"f_meternumber",
+      "本次抄表底数":"f_tablebase",
+      "上次抄表底数":"f_last_tablebase",
+      "表上余额":"f_jval",
+      "抄表日期":"f_hand_date",
+
+      "上次抄表日期":"f_last_hand_date",
+      "开户日期":"f_gas_date",
+      "软件版本号":"f_software_version",
+      "表状态信息":"f_table_msg",
+      "上次表状态信息":"f_last_meter_state_msg",
+
+      "插入日期":"f_insert_date",
+      "上次插入日期":"f_last_insertdate",
+      "是否结算":"f_whether_clear",
+      "超用气量":"f_super_gas",
+      "电量等级":"f_electricity",
+
+      "购气次数":"f_times",
+      "单价":"f_price",
+      "信号强度":"f_signal",
+      "信噪比":"f_snr",
+      "电压":"f_batterylevel",
+
+      "阀门强制状态":"f_networkshutvalve",
+      "阀门状态":"f_valvestate",
+      "计量类型":"f_wmprepaytype",
+      "上报类型":"f_upload_type",
+      "金额状态":"f_moneystate",
+
+      "增加工况瞬时":"operatingModeFlow",
+      "标况瞬时":"standardConditionFlow",
+      "开盖状态" :"f_SplitAlarm",
+      "液晶状态" : "f_XTIpllStopFlag",
+      "声速" :"soundVelocity",
+
+      "外电低电":"f_lowlithiumbattery",
+      "磁干扰异常":"f_magneticinterference",
+      "表内剩余金额":"f_meterbalanceamt",
+      "表内累计充值金额":"f_meterdebitamt",
+      "补偿状态":"f_compensatestate",
+      "气表品牌":"f_meter_brand",
+      "气表型号":"f_meter_style",
+      "分公司":"f_orgname"
+
+    }
+
+}

package/src/filiale/ningjin/sale.js

@@ -0,0 +1,6 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+export default function () {
+  // 收费查询
+  Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
+}

package/src/filiale/ningjin/webmeterManage.js

@@ -0,0 +1,9 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+export default function () {
+  // 异常汇总分析
+  Vue.component('meter-exception-list', (resolve) => { require(['./MeterExceptionList'], resolve) })
+  // 物联网表用气量统计表
+  Vue.component('use-gas-statistics', (resolve) => { require(['./GasStatistics'], resolve) })
+}
+

package/src/filiale/shanxian/BankManager.vue

@@ -19,21 +19,13 @@ let getData = function* (self) {
       self.texttile = '用户类型'
       // let arrparams = []
       console.log('获取数据。。', res.data)
-      let org = []
-      // let name = []
-      let minyongvalue = []
-      let feiminyongvalue = []
+      let naturedata = []
+      let num = []
       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
-        }
+        naturedata[i] = res.data[i].f_user_nature
+        num[i] = res.data[i].number
       }
-      self.set(org, minyongvalue, feiminyongvalue)
+      self.set(naturedata, num)
     })
 }
 export default {
@@ -61,7 +53,7 @@ export default {
     }
   },
   methods: {
-    set (org, minyongvalue, feiminyongvalue) {
+    set (naturedata, num) {
       this.xc = echarts.init(document.getElementById('bm'))
       this.xc.setOption({
         color: ['#FE974B', '#3D72FF'],
@@ -84,7 +76,7 @@ export default {
         legend: {
           x: 'left',
           y: 'bottom',
-          data: ['民用', '非民用']
+          data: ['户数']
         },
         toolbox: {
           show: true,
@@ -99,7 +91,7 @@ export default {
         xAxis: [
           {
             type: 'category',
-            data: org
+            data: naturedata
           }
         ],
         yAxis: [
@@ -109,23 +101,23 @@ export default {
         ],
         series: [
           {
-            name: '民用',
+            name: '户数',
             type: 'bar',
-            data: minyongvalue,
-            markLine: {
-              data: [
-                {type: 'average', name: '平均值'}
-              ]
-            }
-          },
-          {
-            name: '非民用',
-            type: 'bar',
-            data: feiminyongvalue,
+            data: num,
             markLine: {
               data: [
                 {type: 'average', name: '平均值'}
               ]
+            },
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  // 给出颜色组
+                  var colorList = ['#FE974B', '#3D72FF', '#00C953']
+                  // 循环调用
+                  return colorList[params.dataIndex % colorList.length]
+                }
+              }
             }
           }
         ]

package/src/filiale/shanxian/BussinessType.vue

@@ -14,20 +14,16 @@ import {HttpResetClass} from 'vue-client'
 
 let getData = function* (self) {
   let load = new HttpResetClass()
-  load.load('POST', 'rs/sql/BusinessType',
+  load.load('POST', 'rs/logic/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)
+      numdata[0] = res.data.num
+      pricedata[0] = res.data.money
+      self.set(numdata, pricedata)
     })
 }
 export default {
@@ -52,26 +48,23 @@ export default {
     }
   },
   methods: {
-    set (arrparams, numdata, pricedata) {
+    set (numdata, pricedata) {
       this.xc = echarts.init(document.getElementById('sm'))
       this.xc.setOption({
-        color: ['#FE974B', '#3D72FF'],
+        color: ['#894BE5', '#FFC0CB'],
         title: {
-          text: '其他业务散列图',
+          text: '增值业务散列图',
           subtext: '数据查询来源',
           x: 'left'
         },
         tooltip: {
-          trigger: 'axis',
+          trigger: 'item',
           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>'
-              }
+            let str = ''
+            if (params.seriesName.includes('笔数')) {
+              str += params.seriesName + ': ' + params.value + '笔'
+            } else {
+              str += params.seriesName + ': ' + params.value + '元'
             }
             return str
           }
@@ -79,7 +72,7 @@ export default {
         legend: {
           x: 'left',
           y: 'bottom',
-          data: ['数量', '金额']
+          data: ['笔数', '金额']
         },
         toolbox: {
           show: true,
@@ -94,7 +87,7 @@ export default {
         xAxis: [
           {
             type: 'category',
-            data: arrparams
+            data: ['增值业务数据']
           }
         ],
         yAxis: [
@@ -104,7 +97,7 @@ export default {
         ],
         series: [
           {
-            name: '数量',
+            name: '笔数',
             type: 'bar',
             data: numdata,
             markLine: {

package/src/filiale/shanxian/Paymentpie.vue

@@ -14,7 +14,7 @@ import {HttpResetClass} from 'vue-client'
 let getData = function* (self) {
   let load = new HttpResetClass()
   load.load('POST', 'rs/sql/sellinggasvalue',
-    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid:  self.orgid}},
+    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid: self.orgid}},
     {resolveMsg: null, rejectMsg: null})
     .then((res) => {
       let arrparams = []
@@ -23,15 +23,15 @@ let getData = function* (self) {
         let item = {}
         arrparams[i] = res.data[i].name
         item.name = res.data[i].name
-        item.value = res.data[i].gas_value
+        item.value = res.data[i].money_value
         gasdata.push(item)
       }
       console.log('加载echars组件')
       self.setGas(arrparams, gasdata)
     })
   let load1 = new HttpResetClass()
-  load1.load('POST', 'rs/sql/sellinggasvalue',
-    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_payment', f_orgid:  self.orgid}},
+  load1.load('POST', 'rs/sql/sellinggasvalueroute',
+    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_payment', f_orgid: self.orgid}},
     {resolveMsg: null, rejectMsg: null})
     .then((res) => {
       let arrparams = []
@@ -75,7 +75,7 @@ export default {
         color: ['#FE974B', '#3D72FF', '#00C953'],
         title: [
           {
-            text: '收费来源气量金额饼状图',
+            text: '售气金额饼状图',
             x: '0%',
             y: '0%',
             textStyle: {
@@ -83,7 +83,7 @@ export default {
               fontSize: 18
             }
           }, {
-            text: '气量分布',
+            text: '金额分布',
             x: '40%',
             y: '18%',
             textStyle: {
@@ -93,7 +93,7 @@ export default {
           }],
         tooltip: {
           trigger: 'item',
-          formatter: '{a} <br/>{b}: ({c}m³) ({d}%)'
+          formatter: '{a} <br/>{b}: ({c}元) ({d}%)'
         },
         legend: {
           orient: 'horizontal',
@@ -109,7 +109,7 @@ export default {
         },
         series: [
           {
-            name: '气量',
+            name: '金额',
             type: 'pie',
             radius: ['0%', '40%'],
             center: ['50%', '50%'],
@@ -139,7 +139,7 @@ export default {
               fontSize: 18
             }
           }, {
-            text: '金额分布',
+            text: '渠道分布',
             x: '40%',
             y: '18%',
             textStyle: {

package/src/filiale/shanxian/SiteManager.vue

@@ -53,9 +53,9 @@ export default {
     set (arrparams, numdata, gasdata) {
       this.xc = echarts.init(document.getElementById('gph'))
       this.xc.setOption({
-        color: ['#894BE5', '#FE974B'],
+        color: ['#894BE5', '#00C957'],
         title: {
-          text: '民用及非民用缴费散列图',
+          text: '销售气量散列图',
           subtext: '数据查询来源',
           x: 'left'
         },
@@ -65,8 +65,8 @@ export default {
             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>'
+              if (params[i].seriesName.includes('笔数')) {
+                str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '笔' + '</br>'
               } else {
                 str += params[i].marker + params[i].seriesName + ': ' + params[i].data + 'm³' + '</br>'
               }
@@ -77,7 +77,7 @@ export default {
         legend: {
           x: 'left',
           y: 'bottom',
-          data: ['户数', '气量']
+          data: ['笔数', '气量']
         },
         toolbox: {
           show: true,
@@ -102,7 +102,7 @@ export default {
         ],
         series: [
           {
-            name: '户数',
+            name: '笔数',
             type: 'bar',
             data: numdata,
             barMinHeight: 5,

package/src/filiale/wuhai/ChargeQuery.vue

@@ -312,6 +312,12 @@
                             close-on-select :search="false">
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" style="margin-left: 25px">
+                    备注
+                  </label>
+                  <input type="text" style="width:60%" class="input_search"  placeholder="备注" v-model="model.f_comments" condition="f_comments like '%{}%'">
+                </div>
               </div>
             </div>
           </criteria>