manage-client 3.2.10 → 3.2.11-aode

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -7,6 +7,14 @@
             <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>
+                    <res-select :initresid="$parent.$parent.orgid"
+                                style="width:60%"
+                                @res-select="$parent.$parent.getRes"
+                                restype='organization'>
+                    </res-select>
+                  </div>
                   <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"
@@ -19,35 +27,24 @@
                            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'
+                    <label class="font_normal_body">表&emsp;&emsp;号</label>
+                    <input  style="width:60%" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' type="text"
+                            v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
                     >
                   </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>
+<!--                    <button class="btn btn-success" @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>
+                    <export-excel-plus :data="$parent.$parent.getCondition"
+                                  :defaultselect="$parent.$parent.selectfields"
+                                  :field="$parent.$parent.getfield"
+                                  :exportprogress="true" v-ref:exports
+                                  sqlurl="rs/logic/exportfileplus" sql-name="webmeter_getUserGasList" template-name='物联网用气分析查询导出'
+                                  :choose-col="true"></export-excel-plus>
                   </div>
                 </div>
                 <div class="row" v-show="$parent.$parent.criteriaShow">
@@ -63,27 +60,18 @@
                       close-on-select condition="uf.f_gasproperties2 {}">
                     </v-select>
                   </div>-->
-<!--                  <res-select-group  :show-component="['company']" :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">表&emsp;&emsp;号</label>
-                    <input  style="width:60%" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' type="text"
-                            v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
+                    <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-2">
-                    <label class="font_normal_body">公&emsp;&emsp;司</label>
-                    <right-tree @re-res="$parent.$parent.getorg"
-                                :initresid='$parent.$parent.orgid'></right-tree>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">小区名称</label>
+                    <input  style="width:60%" class="input_search" placeholder='小区名称' type="text"
+                            v-el:area v-el:xq v-model="model.f_residential_area" v-next-el='f_residential_area'
+                    >
                   </div>
-<!--                  <div class="col-sm-2 form-group">-->
-<!--                    <label class="font_normal_body">组织机构</label>-->
-<!--                    <res-select :initresid="$parent.$parent.orgid"-->
-<!--                                style="width:60%"-->
-<!--                                @res-select="$parent.$parent.getRes"-->
-<!--                                restype='organization'>-->
-<!--                    </res-select>-->
-<!--                  </div>-->
-
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户类型</label>
                     <v-select :options='$parent.$parent.Gasusertype'
@@ -123,6 +111,7 @@
                     <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="开始时间"
@@ -135,22 +124,36 @@
                                 :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 class="col-sm-2 form-group">
+                    <label for="inputStartDate" class="font_normal_body">结算日期</label>
+                    <datepicker id="inputStartDate" placeholder="结算日期" style="width:60%"
+                                v-model="model.inputStartDate"
+                                :value.sync="model.inputStartDate"
+                                :format="'yyyy-MM-dd HH:mm:ss'"
+                                condition="f_input_date >= '{}'"
+                                :show-reset-button="true"
+                    >
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="inputEndDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&ensp;</label>
+                    <datepicker id="inputEndDate" placeholder="结算日期" style="width:60%"
+                                v-model="model.inputEndDate"
+                                :value.sync="model.inputEndDate"
+                                condition="f_input_date <= '{}'"
+                                :format="'yyyy-MM-dd HH:mm:ss'"
+                                :show-reset-button="true"
+                    >
+                    </datepicker>
                   </div>
+
                   <!--<div class="col-sm-2 form-group">
                     <label class="font_normal_body">用&nbsp;气&nbsp;量&nbsp;</label>
                     <input  type="text" style="width:60%" class="input_search"
@@ -163,41 +166,6 @@
                            v-model="model.f_end_oughtamount" placeholder='结束气量'
                     >
                   </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">
-                    <label class="font_normal_body">房屋类型</label>
-                    <v-select :value.sync="model.f_house_type" v-model="model.f_house_type"
-                              :options='$parent.$parent.houseTypes' placeholder='请选择'
-                              close-on-select
-                              condition="f_house_type = '{}'"></v-select>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">安装位置</label>
-                    <v-select :value.sync="model.f_position" v-model="model.f_position"
-                              :options='$parent.$parent.positions' placeholder='请选择'
-                              condition="f_position = '{}'"
-                              close-on-select></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>
@@ -213,34 +181,22 @@
                   <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>
+                    <nobr>用气地址</nobr>
                   </th>
                   <th style="text-align:center">
-                    <nobr>气表名称</nobr>
+                    <nobr>气表品牌</nobr>
                   </th>
                   <th style="text-align:center">
-                    <nobr>用气地址</nobr>
+                    <nobr>起始时间~终止时间</nobr>
                   </th>
+<!--                  <th style="text-align:center">-->
+<!--                    <nobr>终止时间</nobr>-->
+<!--                  </th>-->
                   <th style="text-align:center">
                     <nobr>表号</nobr>
                   </th>
@@ -266,6 +222,9 @@
                   <th style="text-align:center">
                     <nobr>期末结余(元)</nobr>
                   </th>
+                  <th style="text-align:center">
+                    <nobr>组织</nobr>
+                  </th>
                 </tr>
 
 
@@ -274,24 +233,22 @@
                 <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>
+                  <nobr>{{row.f_address}}</nobr>
                 </td>
-                <td style="text-align:center">
-                  <nobr>{{row.f_price}}</nobr>
+                <td>
+                  <nobr>{{row.f_meter_brand}}</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>
+                  <nobr>{{row.f_hand_date}}</nobr>
                 </td>
+<!--                <td>-->
+<!--                  <nobr>{{row.f_end_hand_date}}</nobr>-->
+<!--                </td>-->
                 <td>{{row.f_meternumber}}</td>
                 <td style="text-align:center">{{row.f_balance}}</td>
                 <td style="text-align:center">{{row.f_last_tablebase}}</td>
@@ -301,87 +258,54 @@
                 <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>
+                <td style="text-align:center">{{row.f_organization_name}}</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">
+  <div  v-show="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 v-show="isActiveTotalForm" style="height:100%">
+    <user-gas-eform :condition="condition"></user-gas-eform>
   </div>
 </template>
 
 <script>
-import {HttpResetClass, PagedList} from 'vue-client'
+  import {PagedList} from 'vue-client'
   import UserGasEcharts from './UserGasEcharts'
   import * as Util from '../../../Util'
   import getLodop from '../../../plugins/LodopFuncs'
   import plugins from '../../../plugins/GetLoginInfoService'
-  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
-  let readyGen = async function (self) {
+  import exportConfig from "../../sale/config/exportConfig";
+  let readySomething = async function (self) {
     await self.$MagLoadParams.loadParam()
     self.initParams()
-    self.getaddress()
   }
-
   export default {
     title: '用气分析',
     props: ['data'],
     components: {UserGasEcharts},
     data() {
       return {
-        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
-        }),
+        other:[],
+        footer:[],
+        sumName: [],
+        model: new PagedList('rs/sql/webmeter_getUserGasList', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
         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: '',
@@ -391,68 +315,50 @@ import {HttpResetClass, PagedList} from 'vue-client'
         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': '表号',
-            'f_meter_brand':'气表品牌',
-            'f_balance':'期初余额(元)',
-            'f_last_tablebase': '上期底数',
-            'f_tablebase':'本期底数',
-            'f_oughtamount':'用气量(m³)',
-            'f_oughtfee':'用气金额(元)',
-            'f_curbalance':'期末结余(元)'
-
-          }
-        },
-        groupname: ['day'],
+        groupname: ['year'],
         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: `!= '壁挂炉'`}]
+        selectfields:[],
       }
     },
     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.startDate = Util.toStandardDateString() + ' 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
+        //this.$refs.paged.$refs.cri.search();
+        for(var item in exportConfig.webmeterusergasConfig){
+          this.selectfields.push(item)
+        }
+        readySomething(this);
     },
     methods: {
+      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.toStandardDateString()}`);
+        otherInData.push(`导出人：${this.$login.f.name}`)
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
       // 查询开关
       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') {
@@ -474,12 +380,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
         // 初始化气表品牌
         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)
-          }
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
 
@@ -490,11 +394,15 @@ import {HttpResetClass, PagedList} from 'vue-client'
         if (this.endDate == '' || this.startDate == '') {
           return this.$showMessage("时间区间的开始和结束时间不能为空！")
         }
-        // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
+        if (!this.orgCondtionStr){
+          return this.$showMessage("请选择分公司！")
+        }
         if (this.orgCondtionStr)
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
+          this.condition = this.$refs.paged.$refs.cri.condition + `and h.f_orgid in ${this.orgCondtionStr}`
         else
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+          this.condition = this.$refs.paged.$refs.cri.condition
+        this.model.params.f_orgid = this.orgCondtionStr
+        this.model.params.f_residential_area = this.$refs.paged.$refs.cri.model.f_residential_area ==null|| this.$refs.paged.$refs.cri.model.f_residential_area==''?'':` and a.f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}'`
         args.condition = this.condition
         this.model.search(args.condition, args.model)
       },
@@ -523,21 +431,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
       getRes(obj) {
         this.orgCondtionStr = plugins.convertToIn(obj)
       },
-      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) {
@@ -546,14 +439,21 @@ import {HttpResetClass, PagedList} from 'vue-client'
         } else {
           this.reportStr = null
         }
+      },
+      sumsmodel: {
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
       }
     },
     computed: {
-      houseTypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
+      getCondition() {
+        let f_residential_area = this.$refs.paged.$refs.cri.model.f_residential_area ==null|| this.$refs.paged.$refs.cri.model.f_residential_area==''?'':` and a.f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}'`
+        return {condition: `${this.$refs.paged.$refs.cri.condition} and h.f_orgid in ` + this.orgCondtionStr, f_residential_area:f_residential_area,startDate: this.$refs.paged.$refs.cri.model.startDate,endDate:this.$refs.paged.$refs.cri.model.endDate,f_orgid:this.orgCondtionStr}
       },
-      positions() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
+      getfield() {
+        return exportConfig.webmeterusergasConfig
       },
       Gasusertype() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]

package/src/components/webmeter/DrillData/UserGasEcharts.vue

@@ -1,11 +1,11 @@
 <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 class="basic-main">
+  <div style="height: 40px;width: 100%;" v-show="echarts">
+    <div style="display: inline-block;">
+      <button @click="$parent.notShowEcharts()" class="btn btn-success">隐藏图表</button>
     </div>
     <!--图显示模板-->
-    <div class="row col-sm-3 mystyle" style="display: inline-block;">
+    <div class="mystyle" style="display: inline-block;">
       <label class="font_normal_body">图表统计项</label>
       <v-select :options='$parent.getgroupname' :value.sync="groupname"
                 close-on-select
@@ -15,8 +15,8 @@
                 value-single="true"></v-select>
     </div>
   </div>
-  <div style="height: 80%;width: 98%;">
-    <div id="info"></div>
+  <div id="charts" style=" height: 98%;width: 98%;padding: 1% 1%;">
+    <div id="info" style=" height: 98%;width: 98%;padding: 1% 1%;min-width:98%;min-height: 98%"></div>
   </div>
   </div>
 </template>
@@ -24,6 +24,7 @@
 <script>
   import * as Util from '../../../Util'
   import co from 'co'
+  import echarts from 'echarts'
   import { HttpResetClass } from 'vue-client'
 
   let getData = function * (self, condition) {
@@ -78,7 +79,6 @@
     },
     methods: {
       set (arrparams, gasdata1, gasdata2) {
-        console.log('--------->>>>>>>>>>>>',arrparams,gasdata1,gasdata2)
         console.log("ec:"+this.echarts)
         let name = ''
         if (this.groupname === 'year')
@@ -91,17 +91,7 @@
         } 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 = echarts.init(document.getElementById('info'))
         this.xc.setOption({
           title: {
             text: '用气' + name + '分析图',
@@ -114,8 +104,7 @@
           },
           color: ['#61a0a8', '#2f4554'],
           tooltip: {
-            trigger: 'axis',
-            extraCssText: 'width: auto;height: auto;'
+            trigger: 'axis'
           },
           grid:{
             top:'20%',