manage-client 3.2.21 → 3.2.25

package/src/filiale/WEINAN/ReportDataQuery.vue

@@ -121,6 +121,20 @@
             <template partial='foot'></template>
           </data-grid>
         </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              用气量合计:&emsp;{{sumsmodel.f_oughtamount.toFixed(0)}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              用气金额合计:&emsp;{{sumsmodel.f_oughtfee.toFixed(0)}}
+            </td>
+          </tr>
+        </table>
       </div>
     </div>
   </div>
@@ -143,11 +157,16 @@
     title: '上报数据查询',
     data() {
       return {
-        model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {}),
+        model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {},{
+          f_oughtamount: 0,
+          f_oughtfee: 0
+        }),
         criteriaShow: false,
         defaultConfig: {
           defaultPrint: []
         },
+        other:[],
+        footer:[],
         config: {
           fieldMapping: {
             f_userinfo_code: '客户编号',
@@ -161,6 +180,7 @@
           {label: '全部', value: ''}
         ],
         styles:false,
+        sumsmodel: {},
         headData: [],
         bodyData: [],
         //默认打印列
@@ -206,6 +226,23 @@
         //初始化气表价格
         this.prices = this.$MagGetSaleParam.getPrices();
       },
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
+        this.other = [];
+        this.footer = [];
+        let exportdata = this.getCondition;
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData = [], exportfield = this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
       showMeterStyle() {
         this.styles = true
       },
@@ -215,6 +252,7 @@
       async selfSearch(args) {
         args.condition = `${args.condition}` + this.orgCondtionStr
         await this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         // 查询到数据进行处理
         // if (this.model.rows.length > 0) {
         //   this.bodyData =  Object.keys(this.model.rows[0])
@@ -256,6 +294,17 @@
       // }
     },
     watch: {
+      'model.rows'(val) {
+        if(val.length === 0){
+          this.sumsmodel = {}
+        }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
     },
     computed: {
       metertypes() {

package/src/filiale/WEINAN/SiteManager.vue

@@ -1,191 +1,191 @@
-<template lang="html">
-  <div id="charts">
-    <div id="gph" :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/getPregas',
-  {data: {startDate: self.startdate + ' 00:00:00', endDate: self.enddate + ' 23:59:59',f_orgid: `f_orgid = ${self.orgid}`}},
-  {resolveMsg: null, rejectMsg: null})
-  .then((res) => {
-    let data = res.data
-    // let xPro = Array.from(new Set(res.data.map(x => x.f_gasproperties)))
-    // 表型
-    let xPro = data.map(x => x.f_meter_type)
-    // 居民用气
-    let yNumJM = data.map(x => x.f_ptpregas)
-    let yNumBGL = data.map(x => x.f_bglpregas)
-    let yNumJZCN = data.map(x => x.f_cnpregas)
-    let yNumGF = data.map(x => x.f_gfpregas)
-    let yNumFJM = data.map(x => x.f_fjmpregas)
-    // xPro.forEach(item => {
-    //   yNumJB[yNumJB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '机表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
-    //   yNumKB[yNumKB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '卡表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
-    //   yNumWLWB[yNumWLWB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '物联网表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
-    // })
-    console.log('表型', xPro)
-    console.log('居民用气', yNumJM)
-    console.log('壁挂炉用气', yNumBGL)
-    console.log('集中采暖', yNumJZCN)
-    console.log('公福用气', yNumGF)
-    console.log('非居民用气', yNumFJM)
-    // self.texttile = '用户类型'
-    // let arrparams = []
-    // let numdata = []
-    // let gasdata = []
-    // let pricedata = []
-    // for (var i = 0; i < res.data.length; i++) {
-    //     arrparams[i] = res.data[i].name
-    //     numdata[i] = res.data[i].num_value
-    //     gasdata[i] = res.data[i].gas_value
-    //     pricedata[i] = res.data[i].money_value
-    // }
-    self.set(xPro,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM)
-  })
-}
-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,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM) {
-     this.xc = echarts.init(document.getElementById('gph'))
-     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',
-           axisLabel :{
-             interval:0
-           },
-           data : arrparams
-         }
-      ],
-      yAxis : [
-        {
-          type : 'value'
-        }
-      ],
-      series : [
-        {
-          name:'居民用气',
-          type:'bar',
-          data:yNumJM,
-          markLine : {
-            data : [
-              {type : 'average', name: '平均值'}
-            ]
-          }
-        },
-        {
-          name:'壁挂炉用气',
-          type:'bar',
-          data:yNumBGL,
-          markLine : {
-            data : [
-              {type : 'average', name: '平均值'}
-            ]
-          }
-        },
-        {
-          name:'集中采暖',
-          type:'bar',
-          data:yNumJZCN,
-          markLine : {
-          data : [
-              {type : 'average', name : '平均值'}
-            ]
-          }
-        },
-        {
-          name:'公福用气',
-          type:'bar',
-          data:yNumGF,
-          markLine : {
-          data : [
-              {type : 'average', name : '平均值'}
-            ]
-          }
-        },
-        {
-          name:'非居民用气',
-          type:'bar',
-          data:yNumFJM,
-          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>
+<template lang="html">
+  <div id="charts">
+    <div id="gph" :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/getPregas',
+  {data: {startDate: self.startdate + ' 00:00:00', endDate: self.enddate + ' 23:59:59',f_orgid: `f_orgid = ${self.orgid}`}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    let data = res.data
+    // let xPro = Array.from(new Set(res.data.map(x => x.f_gasproperties)))
+    // 表型
+    let xPro = data.map(x => x.f_meter_type)
+    // 居民用气
+    let yNumJM = data.map(x => x.f_ptpregas)
+    let yNumBGL = data.map(x => x.f_bglpregas)
+    let yNumJZCN = data.map(x => x.f_cnpregas)
+    let yNumGF = data.map(x => x.f_gfpregas)
+    let yNumFJM = data.map(x => x.f_fjmpregas)
+    // xPro.forEach(item => {
+    //   yNumJB[yNumJB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '机表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
+    //   yNumKB[yNumKB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '卡表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
+    //   yNumWLWB[yNumWLWB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '物联网表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
+    // })
+    console.log('表型', xPro)
+    console.log('居民用气', yNumJM)
+    console.log('壁挂炉用气', yNumBGL)
+    console.log('集中采暖', yNumJZCN)
+    console.log('公福用气', yNumGF)
+    console.log('非居民用气', yNumFJM)
+    // self.texttile = '用户类型'
+    // let arrparams = []
+    // let numdata = []
+    // let gasdata = []
+    // let pricedata = []
+    // for (var i = 0; i < res.data.length; i++) {
+    //     arrparams[i] = res.data[i].name
+    //     numdata[i] = res.data[i].num_value
+    //     gasdata[i] = res.data[i].gas_value
+    //     pricedata[i] = res.data[i].money_value
+    // }
+    self.set(xPro,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM)
+  })
+}
+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,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM) {
+     this.xc = echarts.init(document.getElementById('gph'))
+     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',
+           axisLabel :{
+             interval:0
+           },
+           data : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'居民用气',
+          type:'bar',
+          data:yNumJM,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'壁挂炉用气',
+          type:'bar',
+          data:yNumBGL,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'集中采暖',
+          type:'bar',
+          data:yNumJZCN,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        },
+        {
+          name:'公福用气',
+          type:'bar',
+          data:yNumGF,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        },
+        {
+          name:'非居民用气',
+          type:'bar',
+          data:yNumFJM,
+          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>