manage-client 3.2.295 → 3.2.297

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400'
+var bendi = 'http://119.187.112.234:8300/#'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://127.0.0.1:8084'
+var wode = 'http://119.187.112.234:8300/#'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.295",
+  "version": "3.2.297",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

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

@@ -134,7 +134,7 @@
 
                 <th><nobr>上报类型</nobr></th>
                 <th><nobr>表内累计充值金额</nobr></th>
-                <th><nobr>噪音强度</nobr></th>
+                <th><nobr>信号强度</nobr></th>
                 <th><nobr>信噪比</nobr></th>
                 <th><nobr>电压</nobr></th>
 

package/src/filiale/shanxian/BankManager.vue

@@ -60,7 +60,7 @@ export default {
     set (naturedata, num1, num2, num3) {
       this.xc = echarts.init(document.getElementById('bm'))
       this.xc.setOption({
-        color: ['#7dabbf', '#9ac57d', '#cfcbbf'],
+        color: ['#ed7d31', '#00b050', '#5b9bd5'],
         title: {
           text: '新增用户散列图',
           subtext: '数据查询来源',

package/src/filiale/shanxian/Paymentpie.vue

@@ -56,6 +56,9 @@ let getData = function* (self) {
         arrparams[i] = res.data[i].name
         item1.name = res.data[i].name
         item1.value = res.data[i].money_value
+        item1.itemStyle = {
+          color: res.data[i].color
+        }
         moneydata.push(item1)
       }
       console.log('加载echars组件')
@@ -147,9 +150,9 @@ export default {
     setMoney (arrparams, moneydata) {
       console.log('进入组件')
       let option = {
-        color: ['#00C953', '#FFA500',
-          '#FFC0CB', '#00BFFF',
-          '#00FFC8', '#87CEEB',
+        color: ['#00b050', '#ff0000',
+          '#7030a0', '#0070c0',
+          '#8acf57', '#e1a822',
           '#FFE400', '#9FDB1D',
           '#165DFF', '#00FF2A'],
         title: [

package/src/filiale/shanxian/SiteManager.vue

@@ -77,7 +77,7 @@ export default {
     setNum (arrparams1, numdata1, arrparams2, numdata2, arrparams3, numdata3, color1, color2, color3) {
       console.log('进入组件')
       let option1 = {
-        color: ['#7dabbf', '#9ac57d', '#cfcbbf'],
+        color: ['#00b050', '#ed7d31', '#5b9bd5'],
         title: [
           {
             text: '销售气量饼状图',

package/src/filiale/shanxian/UserGasAll.vue

@@ -0,0 +1,558 @@
+<template>
+  <div class="flex-row" id="unit" v-show="(!echarts)&&(!isActiveTotalForm)">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <div class="flex" style="flex:1;">
+          <criteria-paged :model="model" :pager='true' v-ref:paged>
+            <criteria @condition-changed='$parent.search' partial='criteria' v-ref:cri>
+              <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+                <div class="row" width="100%">
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">客户编号</label>
+                    <input  style="width:60%" class="input_search" condition="f_userinfo_code like '%{}%'" placeholder='客户编号' type="text"
+                           v-el:meternumber v-model="model.f_userinfo_code" v-next-el='f_userinfo_code'
+                    >
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">客户名称</label>
+                    <input  style="width:60%" class="input_search" condition="f_user_name like '%{}%'" placeholder='客户名称' type="text"
+                           v-el:username v-model="model.f_username" v-next-el='userid'>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                    <v-select :value.sync="model.f_residential_area"
+                              class="select_list select"
+                              v-model="model.f_residential_area"
+                              style="width: 60%"
+                              multiple
+                              condition="f_residential_area in {}"
+                              :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                              close-on-select>
+
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用气地址</label>
+                    <input  style="width:60%" class="input_search" condition="f_address like '%{}%'" placeholder='用气地址' type="text"
+                            v-el:area v-el:xq v-model="model.f_address" v-next-el='address'
+                    >
+                  </div>
+                  <div class="col-sm-4 form-group button-range">
+                    <button @click="search()" class="button_search button_spacing">查询</button>
+                    <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
+                    <export-excel :data="$parent.$parent.getCondition()"
+                                  :field="$parent.$parent.getfield"
+                                  sqlurl="rs/logic/exportfile" sql-name="webmeter_getUserGasList" template-name='用气分析'
+                                  v-ref:exports
+                                  :choose-col="true"></export-excel>
+                    <button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()" >显示汇总</button>
+                    <button class="button_export button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
+                    <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                  </div>
+                </div>
+                <div class="row" v-show="$parent.$parent.criteriaShow">
+         <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">表&emsp;&emsp;号</label>
+                    <input  style="width:60%" class="input_search" condition="f_meternumber like '%{}'" placeholder='表号' type="text"
+                            v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
+                    >
+                  </div>
+                  <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">客户类型</label>
+                    <v-select :options='$parent.$parent.Gasusertype'
+                              :value.sync="model.f_user_type"
+                              close-on-select
+                              style="width:60%"
+                              condition="f_user_type = '{}'"
+                              id="f_user_type"
+                              placeholder='客户类型'
+                              v-model="model.f_user_type"
+                              value-single="true">
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用气性质</label>
+                    <v-select :options='$parent.$parent.Gasproperties'
+                              :value.sync="model.f_gasproperties"
+                              close-on-select
+                              condition="f_gasproperties = '{}'"
+                              id="f_gasproperties"
+                              placeholder='用气性质'
+                              style="width:60%"
+                              v-model="model.f_gasproperties"
+                              value-single="true">
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">气表品牌</label>
+                    <v-select :value.sync="model.f_meter_brand"
+                              v-model="model.f_meter_brand"
+                              :options='$parent.$parent.meterbrands' placeholder='请选择'
+                              condition="f_meter_brand = '{}'"
+                              close-on-select></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">时间区间</label>
+                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'"
+                                :show-reset-button="reset"
+                                :value.sync="model.startDate"
+                                id="startDate"
+                                style="width:60%"
+                                placeholder="开始时间"
+                                v-model="model.startDate">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
+                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'"
+                                :show-reset-button="reset"
+                                :value.sync="model.endDate"
+                                style="width:60%"
+                                id="endDate"
+                                style="width:60%"
+                                placeholder="结束日期"
+                                v-model="model.endDate">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;用气量&nbsp;</label>
+                    <div class="row">
+                      <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount1"
+                             condition="f_oughtamount >= {} " placeholder="">
+                      <label class="font_normal_body"> ≤ x ≤ </label>
+                      <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount2"
+                             condition="f_oughtamount <= {} " placeholder="">
+                    </div>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">壁&ensp;挂&ensp;炉</label>
+                    <v-select id="f_meter_brand"
+                              v-model="model.f_usetype"
+                              placeholder=''
+                              :value.sync="model.f_usetype"
+                              :options='$parent.$parent.usetypes'
+                              condition="f_usetype {}" :search="false"
+                              close-on-select style="width: 60%">
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                    <label class="font_normal_body">期末结余</label>
+                    <div class="row">
+                      <input type="text" style="width:27%" class="input_search" v-model="model.f_curbalance1"
+                             condition="f_curbalance >= {} " placeholder="">
+                      <label class="font_normal_body"> ≤ x ≤ </label>
+                      <input type="text" style="width:27%" class="input_search" v-model="model.f_curbalance2"
+                             condition="f_curbalance <= {} " placeholder="">
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </criteria>
+            <data-grid :model="model" id="usergasall" partial='list' class="list_area table_sy" v-ref:grid>
+              <template partial='head'>
+                <tr>
+                  <th style="text-align:center">
+                    <nobr>客户编号</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>客户类型</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>用气性质</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>用户电话</nobr>
+                  </th>
+                  <!--<th style="text-align:center"><nobr>用气属性</nobr></th>-->
+                  <th style="text-align:center">
+                    <nobr>客户名称</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>小区</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>用气单价</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>累购气量</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>累购金额</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>账号结余</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>气表名称</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>用气地址</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>表号</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>壁挂炉</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>期初余额(元)</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>上期底数</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>本期底数</nobr>
+                  </th>
+                  <!-- <th style="text-align:center"><nobr>气价(元/m³)</nobr></th>-->
+                  <th style="text-align:center">
+                    <nobr>用气量(m³)</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>用气金额(元)</nobr>
+                  </th>
+<!--                  <th style="text-align:center">-->
+<!--                    <nobr>充值金额(元)</nobr>-->
+<!--                  </th>-->
+                  <th style="text-align:center">
+                    <nobr>期末结余(元)</nobr>
+                  </th>
+                </tr>
+
+
+              </template>
+              <template partial='body'>
+                <td>{{row.f_userinfo_code}}</td>
+                <td style="text-align:center">{{row.f_user_type}}</td>
+                <td style="text-align:center">{{row.f_gasproperties}}</td>
+                <td style="text-align:center">{{row.f_user_phone}}</td>
+                <!--<td style="text-align:center">{{row.f_gasproperties2}}</td>-->
+                <td style="text-align:center">
+                  <nobr>{{row.f_user_name}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_residential_area}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_price}}</nobr>
+                </td>
+                <td style="text-align:center">{{row.f_total_gas}}</td>
+                <td style="text-align:center">{{row.f_total_fee}}</td>
+                <td style="text-align:center">{{row.f_balance_amount}}</td>
+                <td style="text-align:center">{{row.f_meter_brand}}</td>
+                <td>
+                  <nobr>{{row.f_address}}</nobr>
+                </td>
+                <td>{{row.f_meternumber}}</td>
+                <td>{{row.isbgl}}</td>
+                <td style="text-align:center">{{row.f_balance}}</td>
+                <td style="text-align:center">{{row.f_last_tablebase}}</td>
+                <td style="text-align:center">{{row.f_tablebase}}</td>
+                <!--<td style="text-align:center">{{row.f_avg_price}}</td>-->
+                <td style="text-align:center">{{row.f_oughtamount}}</td>
+                <td style="text-align:center">{{row.f_oughtfee}}</td>
+<!--                <td style="text-align:center">{{row.f_collection}}</td>-->
+                <td style="text-align:center">{{row.f_curbalance}}</td>
+              </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;{{model.sums.f_total_gas}}
+            </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                总累购金额:&emsp;{{model.sums.f_total_fee}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                总账户结余:&emsp;{{model.sums.f_balance_amount}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                本期用气量合计:&emsp;{{model.sums.f_oughtamount}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                本期用气金额合计:&emsp;{{model.sums.f_oughtfee}}
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="flex-row" v-if="echarts">
+    <user-gas-echarts :condition="condition" :echarts="echarts" :enddate="endDate"
+                      :groupname="groupname[0]" :startdate="startDate"></user-gas-echarts>
+  </div>
+  <!--汇总表显示模板-->
+  <div class="flex-row" v-if="isActiveTotalForm">
+    <user-gas-eform :condition="condition" :enddate="endDate" :startdate="startDate"></user-gas-eform>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+  import UserGasEcharts from './UserGasEcharts'
+  import * as Util from '../../Util'
+  import getLodop from '../../plugins/LodopFuncs'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+  let readyGen = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    self.getaddress()
+  }
+
+  export default {
+    title: '用气分析',
+    props: ['data'],
+    components: {UserGasEcharts},
+    data() {
+      return {
+        resshow:['company','slicearea'],
+        model: new PagedList('rs/sql/webmeter_getUserGasList', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
+          f_oughtamount: 0,
+          f_oughtfee: 0,
+          f_total_gas: 0,
+          f_total_fee: 0,
+          f_balance_amount: 0
+        }),
+        getGroupNameByDate: [
+          {label: '年份', value: 'year'},
+          {label: '月份', value: 'month'},
+          {label: '周', value: 'week'}
+        ],
+        meterbrands: [],
+        residentialArea: [],
+        criteriaShow: false,
+        reportStr: null,
+        show: false,
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        outlets: [],
+        operator: [],
+        filename: '',
+        searchshow: true,
+        startDate: '',
+        endDate: '',
+        echarts: false,
+        isActiveTotalForm: false,
+        condition: '1=1',
+        getfield: {},
+        config: {
+          excelHeaders: {
+            'f_userinfo_code':'客户编号',
+            'f_user_type':'客户类型',
+            'f_gasproperties': '用气性质',
+            'f_user_name': '客户名称',
+            'f_user_phone':'客户电话',
+            'f_residential_area': '小区',
+            'f_price':'用气单价',
+            'f_address':'用气地址',
+            'f_meternumber': '表号',
+            'isbgl': '壁挂炉',
+            'f_meter_brand':'气表品牌',
+            'f_balance':'期初余额(元)',
+            'f_last_tablebase': '上期底数',
+            'f_tablebase':'本期底数',
+            'f_oughtamount':'用气量(m³)',
+            'f_oughtfee':'用气金额(元)',
+            'f_curbalance':'期末结余(元)'
+
+          }
+        },
+        groupname: ['day'],
+        getgroupname: [
+          {label: '年份', value: 'year'},
+          {label: '月份', value: 'month'},
+          {label: '周', value: 'week'},
+          {label: '日', value: 'day'}
+        ],
+        // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
+        orgCondtionStr: '(' + this.$login.f.orgid + ')',
+        orgid:[this.$login.f.orgid],
+        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}],
+        zonesdata:''
+      }
+    },
+    ready() {
+        readyGen(this)
+      console.log('444444444', Util.addDate(new Date(),-6).substring(0,10))
+      this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-4).substring(0,10) + ' 00:00:00'
+        this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+        // this.$refs.paged.$refs.cri.search()
+        this.getfield = this.config.excelHeaders
+    },
+    methods: {
+      // 查询开关
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      async  getaddress(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区',data)
+        let house = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
+      SaveAsFile(str) {
+        this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let style = '<style>' +
+              'td {border-width: 1px;padding: 2px;border-style: solid; border-color:black; border-collapse:collapse;} .tdright{text-align: right;}  .tdcenter{text-align: center;}</style>';
+            let strHtml = style + document.getElementById(str).innerHTML;
+            console.log(strHtml);
+            let LODOP = getLodop();
+            LODOP.PRINT_INIT('');
+            LODOP.ADD_PRINT_TABLE(5, 5, '99%', '100%', strHtml);
+            LODOP.SAVE_TO_FILE('用气分析.xls')
+          }
+        })
+      },
+      clearmsg() {
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          if (item.value.f_meter_type == '物联网表') {
+            let temp = {}
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            brandArr.push(temp)
+          }
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+
+      },
+      search(args) {
+        this.startDate = this.$refs.paged.$refs.cri.model.startDate
+        this.endDate = this.$refs.paged.$refs.cri.model.endDate
+        if (this.endDate == '' || this.startDate == '') {
+          return this.$showMessage("时间区间的开始和结束时间不能为空！")
+        }
+        // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
+        if (this.orgCondtionStr)
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
+        else
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+        if(this.zonesdata){
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
+        }
+        args.condition = this.condition
+        this.model.search(args.condition, args.model)
+      },
+      // 显示柱状图
+      showEcharts() {
+        this.echarts = true
+        this.isActiveTotalForm = false
+      },
+      notShowTotalForm() {
+        this.echarts = false
+        this.isActiveTotalForm = false
+      },
+      // 不显示柱状图
+      notShowEcharts() {
+        this.echarts = false
+        this.isActiveTotalForm = false
+      },
+      // 显示汇总数据表格
+      showTotalForm() {
+        this.echarts = false
+        this.isActiveTotalForm = true
+      },
+      close() {
+        this.show = false
+      },
+      getRes(obj) {
+        this.orgCondtionStr = plugin.convertToIn(obj)
+        if(obj.indexOf("f_zones = ")>0){
+          this.zonesdata = obj.substring(obj.indexOf("f_zones = "))
+        }else{
+          this.zonesdata='';
+        }
+      },
+      getorg(obj) {
+        this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
+      },
+      getCondition () {
+        return {
+          condition: this.condition,
+          startDate: this.startDate,
+          endDate: this.endDate
+        }
+      }
+      // getRes(condition,obj) {
+      //   this.orgCondtionStr = condition
+      //   this.orgname = obj.orgnames[0]
+      //   this.depname = obj.depnames[0]
+      // }
+    },
+    watch: {
+      'data'(val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      }
+    },
+    computed: {
+      houseTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
+      },
+      positions() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
+      },
+      Gasusertype() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      valveStatus() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
+      Gasproperties() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      }
+    }
+  }
+</script>
+<style>
+  .mystyle {
+    float: right;
+    padding-right: 10%;
+  }
+
+  .mystyle1 {
+    padding-top: 10px;
+
+  }
+
+  .mystyle2 {
+    width: 100%;
+    height: 35px;
+    /*background: #00A3F0;*/
+    padding-left: 15px;
+    float: left;
+  }
+
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+    padding: 10px 10px 10px 10px;
+    border-radius: 15px;
+  }
+</style>

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/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()