manage-client 3.2.294 → 3.2.296

package/src/filiale/shanxian/UserGasEcharts.vue

@@ -0,0 +1,240 @@
+<template lang="html">
+  <div class="basic-main" style="height: 100%;">
+  <div class="row" style="height: 15%;width: 100%;" v-show="echarts">
+    <div class="col-sm-2" style="display: inline-block;">
+      <button @click="$parent.notShowEcharts()" class="button_clear button_spacing">隐藏图表</button>
+    </div>
+    <!--图显示模板-->
+    <div class="row col-sm-3 mystyle" style="display: inline-block;">
+      <label class="font_normal_body">图表统计项</label>
+      <v-select :options='$parent.getgroupname' :value.sync="groupname"
+                close-on-select
+                id="groupname"
+                placeholder='分组项'
+                v-model="groupname"
+                value-single="true"></v-select>
+    </div>
+  </div>
+  <div style="height: 80%;width: 98%;">
+    <div id="info"></div>
+  </div>
+  </div>
+</template>
+
+<script>
+  import * as Util from '../../Util'
+  import co from 'co'
+  import { HttpResetClass } from 'vue-client'
+
+  let getData = function * (self, condition) {
+    let load = new HttpResetClass()
+    load.load('POST', 'rs/sql/webmeter_getUserGasGroup',
+      {data: {condition: condition, groupname: self.groupname[0], startDate: self.startdate,
+          endDate: self.enddate}},
+      {resolveMsg: null, rejectMsg: null})
+      .then((res) => {
+        let arrparams = []
+        let gasdata1 = []
+        let gasdata2 = []
+        let gasdata3 = []
+        for (var i = 0; i < res.data.length; i++) {
+          arrparams[i] = res.data[i].f_type
+          gasdata1[i] = res.data[i].f_oughtamount1
+          gasdata2[i] = res.data[i].f_oughtamount2
+          gasdata3[i] = res.data[i].f_oughtamount3
+        }
+        self.set(arrparams, gasdata1, gasdata2, gasdata3)
+      })
+  }
+  export default {
+    props: {
+      echarts:{
+        type:Boolean,
+        default:false
+      },
+      startdate: {
+        type: String,
+        default: Util.toStandardDateString()
+      },
+      enddate: {
+        type: String,
+        default: Util.toStandardDateString()
+      },
+      condition: {
+        type: String,
+        default: '1=1'
+      },
+      groupname: {
+        type: String,
+        default: 'year'
+      }
+    },
+    data () {
+      title: '业务类型'
+      return {
+        xc: ''
+      }
+    },
+    ready(){
+      console.log(this.echarts)
+    },
+    methods: {
+      set (arrparams, gasdata1, gasdata2, gasdata3) {
+        console.log('--------->>>>>>>>>>>>',arrparams,gasdata1,gasdata3)
+        console.log("ec:"+this.echarts)
+        let name = ''
+        if (this.groupname === 'year')
+        {
+          name = '年'
+        } else if (this.groupname === 'month'){
+          name = '月'
+        } else if (this.groupname === 'week'){
+          name = '周'
+        } else {
+          name = '日'
+        }
+        const statInfo = document.getElementById('info') // 获取图表元素
+        statInfo.style.width = window.innerWidth - 200 + "px";  //初始化echarts图表宽度
+        statInfo.style.height = window.innerHeight - 200 + "px";  //初始化echarts图表宽度
+        this.xc = this.$echarts.init(statInfo)
+        // 设置宽度自适应
+        window.addEventListener('resize', () => {
+          statInfo.style.width = window.innerWidth - 200 + "px";
+          statInfo.style.height = window.innerHeight - 200 + "px";
+          this.xc.resize();
+        })
+        // this.xc.resize({height: '100%',width: '100%'})
+        this.xc.setOption({
+          title: {
+            text: '用气' + name + '分析图',
+            left: 'center',
+            y: '10',
+            textStyle: {
+              color: '#000',
+              fontSize: 20
+            }
+          },
+          color: ['#0070c0', '#00b050','#e1a822'],
+          tooltip: {
+            trigger: 'axis',
+            extraCssText: 'width: auto;height: auto;'
+          },
+          grid:{
+            top:'20%',
+          },
+          legend: {
+            y: '50',
+            data: ['用气量(民用)(m³)', '用气量(商业)(m³)', '用气量(工业)(m³)']
+          },
+          toolbox: {
+            y: '50',
+            show: true,
+            right:'2%',
+            feature: {
+              mark: {show: true},
+              dataView: {show: true, readOnly: false},
+              magicType: {show: true, type: ['line', 'bar', 'stack', 'tiled']},
+              restore: {show: true},
+              saveAsImage: {show: true}
+            }
+          },
+          calculable: true,
+          xAxis: [
+          { name: '日期',
+            nameTextStyle: {
+              fontSize: 15
+            },
+            type: 'category',
+            data: arrparams
+          }
+        ],
+          yAxis : [
+          {
+            type : 'value',
+            name: '用气量(m³)',
+            nameTextStyle: {
+              fontSize: 15
+            },
+            axisLabel: {
+              show: true,
+              textStyle: {
+                fontSize: 15,
+                'color': '#7d8000'
+              }
+            }
+          }
+        ],
+        series : [
+          {
+            name: '用气量(民用)(m³)',
+            type: 'bar',
+            smooth: true,
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
+            data: gasdata1,
+            markPoint: {
+              data: [
+                {type: 'max', name: '最大值'},
+                {type: 'min', name: '最小值'}
+              ]
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '用气量(商业)(m³)',
+            type: 'bar',
+            smooth: true,
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
+            data: gasdata2,
+            markPoint: {
+              data: [
+                {type: 'max', name: '最大值'},
+                {type: 'min', name: '最小值'}
+              ]
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '用气量(工业)(m³)',
+            type: 'bar',
+            smooth: true,
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
+            data: gasdata3,
+            markPoint: {
+              data: [
+                {type: 'max', name: '最大值'},
+                {type: 'min', name: '最小值'}
+              ]
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          }
+        ]
+        })
+      },
+      searchdata (condition) {
+        console.log("ec:"+this.echarts)
+        let getGen = getData(this, condition)
+        co(getGen)
+      }
+    },
+    watch: {
+      'echarts' (val) {
+        this.searchdata(this.condition)
+      },
+      'groupname' (val) {
+        this.searchdata(this.condition)
+      }
+    }
+  }
+</script>

package/src/filiale/shanxian/reportManage.js

@@ -2,6 +2,7 @@
 import Vue from 'vue'
 
 export default function () {
+  Vue.component('echarts-box', (resolve) => { require(['./EchartsBox'], resolve) })
   // 收费查询
   Vue.component('site-manager', (resolve) => { require(['./SiteManager'], resolve) })
   // 新增用户散列图

package/src/filiale/shanxian/webmeterManage.js

@@ -5,4 +5,8 @@ export default function () {
   Vue.component('user-lost-contact-analysis', (resolve) => { require(['./UserLostContactAnalysis'], resolve) })
   // 失联查询
   Vue.component('lost-contact-analysis-list', (resolve) => { require(['./LostContactAnalysisList'], resolve) })
+  // 失联查询
+  Vue.component('new-webmeter-user-gas-all', (resolve) => { require(['./UserGasAll.vue'], resolve) })
+  // 失联查询
+  Vue.component('user-gas-echarts', (resolve) => { require(['./UserGasEcharts.vue'], resolve) })
 }

package/src/filiale/wenxi/WebHandQuery.vue

@@ -401,7 +401,8 @@
         return {
           condition: this.condition,
           startDate:`${this.$refs.paged.$refs.criteria.model.startDate}`,
-          endDate:`${this.$refs.paged.$refs.criteria.model.endDate}`
+          endDate:`${this.$refs.paged.$refs.criteria.model.endDate}`,
+          f_userinfo_code:`${this.$refs.paged.$refs.criteria.model.f_userinfo_code}`
         }
       },
       getstart(){

package/src/filiale/xinkang/meterFaultChangeSummary.vue

@@ -0,0 +1,196 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <div class="form-group" >
+      <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+        <div class="row">
+          <div class="col-sm-3 form-group" >
+            <label class="font_normal_body" for="startDate">开始日期:</label>
+            <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                        v-model="model.startDate"
+                        :value.sync="model.startDate"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="reset">
+            </datepicker>
+          </div>
+          <div class="col-sm-3 form-group" >
+            <label  class="font_normal_body" for="endDate">结束日期:</label>
+            <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                        v-model="model.endDate"
+                        :value.sync="model.endDate"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="reset">
+            </datepicker>
+          </div>
+          <div class="col-sm-3 form-group" >
+            <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
+            <right-tree id="org" @re-res="getRes"></right-tree>
+          </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+            <res-select id="dep" restype='department'
+                        @res-select="getdep"
+                        :parentresid="depresid"
+                        :initresid='queryData.depid' >
+            </res-select>
+
+          </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body">气表品牌</label>
+            <v-select :value.sync="model.f_meter_brand"
+                      v-model="model.f_meter_brand"
+                      :options="meterbrands" value-single
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body">换表类型</label>
+            <v-select :value.sync="queryData2.f_changetables_reason"
+                      v-model="queryData2.f_changetables_reason"
+                      :options="reasons" multiple>
+            </v-select>
+          </div>
+          <div class="col-sm-2 form-group" style="float:right;">
+            <button class="button_search" @click="searchData()">查询</button>
+            <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':criteriaShow,
+                  'button_shrink_bottom':!criteriaShow}"  @click="hidden()"></div>
+          </div>
+        </div>
+      </div>
+      <div style="width:100%;height: 100%;margin-top: 2%" class="div-iframe">
+        <iframe class="iframe_style" style="width:100%;height:100% ;border: medium none;" :src="url" v-if="isShow"></iframe>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+let readySomething = async function (self) {
+  await self.$MagLoadParams.loadParam()
+  self.initParams()
+}
+export default {
+  title: '客户类型分项汇总表',
+  data () {
+    return {
+      orgCondtionStr: '1=1',
+      model: {
+        startDate: '',
+        endDate: '',
+        f_meter_brand: ''
+      },
+      isShow: false,
+      url: '',
+      urlPrefix: 'http://139.9.204.64:8080/report/jmreport/shareView/825973291077713920',
+      queryData: {
+        f_orgid: [],
+        f_depid: [],
+        f_payment: []
+      },
+      queryData2: {
+        f_changetables_reason: []
+      },
+      orgname: '',
+      depresid: [],
+      userresid: [],
+      depname: '',
+      operatorname: '',
+      operatorid: [],
+      depid: [],
+      criteriaShow: false,
+      meterbrands: [],
+      reasons: this.$appdata.getParam('换表原由') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('换表原由')] : [],
+    }
+  },
+  ready () {
+    this.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    // this.$refs.paged.$refs.criteria.search()
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+    this.searchData()
+  },
+  methods: {
+    initParams () {
+      // 初始化气表品牌
+      let brandArr = []
+      this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        brandArr.push(temp)
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+    },
+    dataHand (obj) {
+      let queryData = ''
+      queryData = this.orgCondtionStr
+      for (let key in obj) {
+        if (obj[key] !== null && obj[key] !== '' && obj[key] !== undefined && obj[key].length > 0) {
+          if (Array.isArray(obj[key])) {
+            let stringValue = ''
+            for (var i = 0; i < obj[key].length; i++) {
+              if (i === obj[key].length - 1) {
+                stringValue = stringValue + "'" + obj[key][i] + "'"
+              } else {
+                stringValue = stringValue + "'" + obj[key][i] + "',"
+              }
+            }
+            queryData = queryData + ' and t.' + key + ' in (' + stringValue + ')'
+          } else {
+            queryData = queryData + ' and t.' + key + ' = ' + "'" + obj[key] + "'"
+          }
+        }
+      }
+      return queryData
+    },
+    searchData () {
+      let condition = this.dataHand(this.queryData)
+      let f_changetables_reason = this.dataHand(this.queryData2)
+      // 重置url
+      this.url = ''
+      // encodeURIComponent是将该参数中的特殊符号进行编码，后端会进行解码
+      this.url = this.urlPrefix + '?condition=' + encodeURIComponent(condition) +
+        '&startDate=' + encodeURIComponent(this.model.startDate) +
+        '&endDate=' + encodeURIComponent(this.model.endDate) +
+        '&f_meter_brand=' + encodeURIComponent(this.model.f_meter_brand) +
+        '&f_changetables_reason=' + encodeURIComponent(f_changetables_reason)
+      console.log('报表===>' + this.url)
+      this.isShow = true
+    },
+    load () {
+      this.isShow = true
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.userresid = obj.resids
+      this.queryData.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.queryData.f_depid = obj
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+.span{
+  height: 0;
+}
+.iframe_style{
+  border: medium none;
+}
+</style>

package/src/filiale/xinkang/reportManage.js

@@ -10,5 +10,6 @@ export default function () {
   Vue.component('echarts-box', (resolve) => { require(['./EchartsBox'], resolve) })
   // 新增用户散列图
   Vue.component('bank-manager', (resolve) => { require(['./BankManager'], resolve) })
-
+  // 换表故障统计报表
+  Vue.component('change-meter-fault-summary', (resolve) => { require(['./meterFaultChangeSummary'], resolve) })
 }

package/src/main.js

@@ -7,8 +7,9 @@ import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
 import webmeterManage from './webmeterManage'
+import webmeterManageF from './filiale/shanxian/webmeterManage'
 import reportManage from './reportManage'
-import reportManageF from './filiale/xinkang/reportManage'
+import reportManageF from './filiale/shanxian/reportManage'
 import newmanage from './newmanage'
 import ManageHome from './ManageHome'
 import echarts from 'echarts'
@@ -47,6 +48,7 @@ system(false)
 
 saleManage()
 webmeterManage()
+webmeterManageF()
 ManageHome()
 newmanage()
 reportManage()