manage-client 3.2.24 → 3.2.28

package/src/components/webmeter/report/ReportList.vue

@@ -14,7 +14,6 @@
                               :is-mul=false
                               restype='organization'>
                   </res-select>
-
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">表&nbsp;钢&nbsp;号&nbsp;</label>
@@ -301,19 +300,6 @@
           this.gasproperties =[{label: '全部', value: ''}]
         }
       },
-      showdetail(val) {
-        console.log('24detail==', val)
-        if(val){
-          let detail = eval("("+val+")")
-          this.detaillist = detail
-          this.detail24 = true
-        }else{
-          console.log('无数据')
-        }
-      },
-      close() {
-        this.detail24 = false
-      },
       hidden(){
         this.criteriaShow = !this.criteriaShow
       },

package/src/filiale/WEINAN/BankManager.vue

@@ -0,0 +1,139 @@
+<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/qibiao-shouqi',
+    {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: `f_orgid = ${self.orgid}`, condition: '1 = 1'}},
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      let data = res.data
+
+      console.log(data)
+
+      let biaoType = Array.from(new Set(data.map(x => x.biaopinpai)))
+      let totalGas = data.map(x => x.yongqi)
+      // for(let i = 0; i <= data.length; i++){
+      //   if(data[i].biaopinpai == biaoType){
+      //     totalGas.push(data[i].yongqi)
+      //   }
+      // }
+      // let totalGas = data.map(x => x.yongqi)
+
+      console.log('表品牌', biaoType)
+      console.log('用气量', totalGas)
+
+      self.set(biaoType, totalGas)
+    })
+}
+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 (biaoType, totalGas) {
+      this.xc = echarts.init(document.getElementById('bm'))
+      this.xc.setOption({
+        title: {
+          text: '气量售气表',
+          subtext: '数据查询来源',
+          x: 'left'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        legend: {
+          x: 'left',
+          y: 'bottom',
+          data: biaoType
+        },
+        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: biaoType
+          }
+        ],
+        axisLabel: {
+          interval: 0,
+          rotate: 40
+        },
+        yAxis: [
+          {
+            type: 'value'
+          }
+        ],
+        series: [
+          {
+            name: '用气量',
+            type: 'bar',
+            data: totalGas,
+            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>