manage-client 3.1.13 → 3.1.14-ls

package/src/components/sale/filesquery/ArchivesManage.vue

@@ -18,9 +18,6 @@
     <tabs header="用户设备查询" v-if="permission('用户设备查询')">
       <user-equipment-query v-if="show.includes('用户设备查询')"></user-equipment-query>
     </tabs>
-    <tabs header="调价记录查询" v-if="permission('调价记录查询')">
-      <price-change-query v-if="show.includes('调价记录查询')"></price-change-query>
-    </tabs>
   </tab-button>
 
 </template>

package/src/components/sale/filesquery/DeviceQuery.vue

@@ -291,7 +291,7 @@
             </footer>
           </modal>
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div></div></div>

package/src/components/sale/filesquery/MeterQuery.vue

@@ -429,7 +429,7 @@
           <!--</footer>-->
           <!--</modal>-->
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div>

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -17,18 +17,15 @@
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
                             condition="f_user_name = '{}'" placeholder="客户名称">
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">客户电话</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
-                           condition="f_user_phone like '%{}%'" placeholder="客户电话">
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">身份证号</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_idnumber"
-                           condition="f_idnumber like '%{}%'" placeholder="身份证号">
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">客户状态</label>
+                    <v-select :value.sync="model.f_user_state"
+                              v-model="model.f_user_state"
+                              :options='$parent.$parent.userstates' placeholder='请选择'
+                              condition="f_user_state = '{}'"
+                              close-on-select></v-select>
                   </div>
 
-
                   <div class="span" style = "float:right;">
                     <button class="button_search button_spacing" v-show="false" @click="$parent.$parent.ReadIDCard()">读取身份证</button>
                     <read-card :is-single.sync="$parent.$parent.isSingleUser"  @read-info="$parent.$parent.cardBtn"  v-ref:readcard></read-card>
@@ -74,55 +71,6 @@
                     </datepicker>
                   </div>
 
-                  <div class="col-sm-2 form-group" >
-                    <label class="font_normal_body">客户状态</label>
-                    <v-select :value.sync="model.f_user_state"
-                              v-model="model.f_user_state"
-                              :options='$parent.$parent.userstates' placeholder='请选择'
-                              condition="f_user_state = '{}'"
-                              close-on-select></v-select>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">人&emsp;&emsp;数</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_people_num"
-                           condition="f_people_num = '{}'" placeholder="人数">
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">客户地址</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
-                           condition="f_address like '%{}%'" placeholder='客户地址'>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label for="startDate" class="font_normal_body">建档日期</label>
-                    <datepicker placeholder="建档日期" style="width:60%"
-                                v-model="model.f_createfile_date"
-                                :value.sync="model.f_createfile_date"
-                                :format="'yyyy-MM-dd'"
-                                :show-reset-button="true"
-                                condition="f_createfile_date >= '{} 00:00:00'">
-                    </datepicker>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">建档部门</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_depname"
-                           condition="f_depname like '%{}%'" placeholder='建档部门'>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">报警器编码</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_alarm_code"
-                           condition="f_alarm_code like '%{}%'" placeholder='报警器编码'>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">发票编码</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_taxpayer_id"
-                           condition="f_taxpayer_id like '%{}%'" placeholder='发票编码'>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">燃气表号</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                           condition="f_meternumber like '%{}%'" placeholder='燃气表号'>
-                  </div>
-
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">气表分类</label>
                     <v-select :value.sync="model.f_meter_classify"
@@ -204,16 +152,6 @@
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_room"
                             condition="f_room = '{}'"  placeholder='门牌号'>
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">余额区间</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_balance"
-                           condition="f_balance >= '{}'" placeholder="最小值">
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">&ensp;&ensp;&ensp;至&ensp;&ensp;&ensp;</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.balance2"
-                           condition="f_balance <= '{}'" placeholder="最大值">
-                  </div>
                   <div class="col-sm-2 form-group" >
                     <label class="font_normal_body">客户地址</label>
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_address"
@@ -411,7 +349,7 @@
                               v-el:cc></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">安&ensp;装&ensp;人</label>
+                    <label class="font_normal_body">安装人</label>
                     <v-select :value.sync="model.f_install_person" v-model='model.f_install_person'
                               style="width:60%"
                               :multiple="true"
@@ -433,10 +371,6 @@
                   <th><nobr>卡号</nobr></th>
                   <th><nobr>客户名称</nobr></th>
                   <th><nobr>小区名称</nobr></th>
-                  <th><nobr>楼栋</nobr></th>
-                  <th><nobr>单元</nobr></th>
-                  <th><nobr>楼层</nobr></th>
-                  <th><nobr>门牌号</nobr></th>
                   <th>
                     <data-order field="f_userinfo_code" name="客户地址"
                                 :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
@@ -541,9 +475,6 @@
                   <th>
                     <nobr>灶具信息</nobr>
                   </th>
-                  <th>
-                    <nobr>备注</nobr>
-                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -557,10 +488,6 @@
                 <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_address}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_building}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_unit}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_room}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_book_slice_area}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_gas_date}}</nobr></td>
@@ -652,7 +579,6 @@
                 <td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
               </template>
               <template partial='foot'>
 
@@ -696,7 +622,7 @@
             </footer>
           </modal>
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div></div></div>

package/src/components/sale/filesquery/UserDeviceQuery.vue

@@ -192,7 +192,7 @@
             </footer>
           </modal>
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div></div></div>

package/src/components/sale/filesquery/UserQuery.vue

@@ -180,7 +180,6 @@
                               multiple = "true"
                               close-on-select></v-select>
                   </div>
-
                   <!--            <div class="col-sm-2" >-->
                   <!--              <label for="f_balance"  class="font_normal_body">账户结余</label>-->
                   <!--              <div class="form-group">-->
@@ -223,28 +222,6 @@
                               condition="f_book_slice_area = '{}'"></v-select>
                   </div>
                   <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">客户等级</label>
-                    <v-select :value.sync="model.f_user_level"
-                              v-model="model.f_user_level" condition="f_user_level in {}"
-                              :options='$parent.$parent.userLevels' placeholder='请选择'
-                              multiple = "true"
-                              close-on-select></v-select>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">通气状态</label>
-                    <v-select :value.sync="model.f_address_state"
-                              v-model="model.f_address_state" condition="f_address_state = '{}'"
-                              :options='$parent.$parent.addressstate' placeholder='请选择'
-                              close-on-select></v-select>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">发卡状态</label>
-                    <v-select :value.sync="model.f_whether_hairpin"
-                              v-model="model.f_whether_hairpin" condition="f_whether_hairpin = '{}'"
-                              :options='$parent.$parent.hairpin' placeholder='请选择'
-                              close-on-select></v-select>
-                  </div>
                 </div>
               </div>
             </criteria>
@@ -271,9 +248,6 @@
                   <th>
                     <nobr>账户余额</nobr>
                   </th>
-                  <th>
-                    <nobr>客户等级</nobr>
-                  </th>
                   <th>
                     <data-order field="f_address" name="客户地址"
                                 :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
@@ -320,12 +294,6 @@
                   <th>
                     <nobr>缴费编号</nobr>
                   </th>
-                  <th>
-                    <nobr>通气状态</nobr>
-                  </th>
-                  <th>
-                    <nobr>发卡状态</nobr>
-                  </th>
                   <th>
                     <nobr>备注</nobr>
                   </th>
@@ -356,9 +324,6 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_balance}}</nobr>
                 </td>
-                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
-                  <nobr>{{row.f_user_level}}</nobr>
-                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
@@ -404,12 +369,6 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr><span v-if="row.f_cost_type =='银行代扣'">{{row.f_bank_pay_number}}</span></nobr>
                 </td>
-                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
-                  <nobr>{{row.f_address_state}}</nobr>
-                </td>
-                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
-                  <nobr>{{row.f_whether_hairpin}}</nobr>
-                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_comments}}</nobr>
                 </td>
@@ -529,8 +488,6 @@
           f_userinfo_code: '',
           f_filialeids: ''
         },
-        hairpin:this.$appdata.getParam('发卡状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('发卡状态')]:[],
-        addressstate:this.$appdata.getParam('地址状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]:[],
         userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
         show:false,
         rowdata:{},
@@ -866,9 +823,6 @@
       },
       userstates() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
-      },
-      userLevels () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
       }
     }
   }

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-row" v-show="!showdetail">
+  <div class="flex-row" v-if="!showdetail">
     <div id='app1' class="basic-main" v-show="(!echarts)&&(!isActiveTotalForm)">
       <criteria-paged :model="model" :pager='true' v-ref:paged>
         <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
@@ -48,7 +48,7 @@
                             :choose-col="true"></export-excel>
 <!--              <button class="button_export button_spacing" @click="$parent.$parent.SaveAsFile('lostuserlist')">导出</button>-->
 <!--              <button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()">显示汇总</button>-->
-              <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
+<!--              <button class="button_search 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>
@@ -318,24 +318,33 @@
       </data-grid>
     </criteria-paged>
   </div>
-    <div class="flex-row" v-show="echarts" style="width: 100%;height: 90%;">
-      <lost-contact-echarts :groupname="groupname[0]" :condition = "condition" :startdate="startDate"
-                            :enddate="endDate" :echarts="echarts"></lost-contact-echarts>
+  <div v-show="echarts" style="height: 40px;width: 100%;">
+    <div style="display: inline-block;">
+      <button class="button_search button_spacing" @click="notShowEcharts()">隐藏图表</button>
     </div>
-    <div class="span" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">
-      <lost-contact-eform :condition="condition"
-      ></lost-contact-eform>
+    <div class="mystyle" style="display: inline-block;">
+      <label class="font_normal_body">图表统计项</label>
+       <v-select style="width:60%" id="Groupname" v-model="groupname"
+                placeholder='分组项'
+                value-single="true"
+                :value.sync="groupname"
+                :options='getgroupname'
+                close-on-select></v-select>
     </div>
   </div>
-
-  <!--  <div v-show="isActiveTotalForm" style="height: 40px;width: 100%;">-->
-  <!--    <button class="button_search button_spacing" @click="notShowTotalForm()">隐藏汇总</button>-->
-  <!--  </div>-->
-<!--  <div class="flex-row" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">-->
-<!--    <lost-contact-eform :condition="model.condition" :startdate="startDate"-->
-<!--                        :enddate="endDate"></lost-contact-eform>-->
+  <div class="span" v-show="echarts" style="width: 100%;height: 90%;">
+    <lost-contact-echarts :groupname="groupname[0]" :condition="condition" :startdate="startDate"
+                          :enddate="endDate" :echarts="echarts"></lost-contact-echarts>
+  </div>
+<!--  <div v-show="isActiveTotalForm" style="height: 40px;width: 100%;">-->
+<!--    <button class="button_search button_spacing" @click="notShowTotalForm()">隐藏汇总</button>-->
 <!--  </div>-->
-  <div  class="flex-row" style="width:99%;height:98%;margin-bottom:0px" v-if="showdetail">
+  <div class="span" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">
+    <lost-contact-eform :condition="condition" :startdate="startDate"
+                        :enddate="endDate"></lost-contact-eform>
+  </div>
+  </div>
+  <div  class="basic-main" v-if="showdetail">
     <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
   </div>
 </template>
@@ -404,7 +413,7 @@
         getgroupname: [
           {label: '客户类型', value: 'f_user_type'},
           {label: '用气性质', value: 'f_gasproperties'},
-          {label: '分公司', value: 'f_orgname'},
+          {label: '分公司', value: 'f_orgid'},
           {label: '最长失联天数', value: 'max_days_type'},
           {label: '合计失联天数', value: 'all_days_type'}
         ],
@@ -482,7 +491,7 @@
       },
       showmsg(obj){
         this.rowdata=obj
-        this.showdetail = true
+        this.showdetail=true
       },
       cancel() {
         this.showdetail = false
@@ -506,7 +515,7 @@
         if (this.endDate == '' || this.startDate == '') {
           return this.$showMessage("时间区间的开始和结束时间不能为空！")
         }
-        this.condition = args.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`
+        args.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`
         this.model.search(args.condition, args.model)
       },
       getorg(obj) {

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

@@ -1,41 +1,25 @@
 <template lang="html">
-  <div class="basic-main">
-    <div style="height: 40px;width: 100%;" v-show="echarts">
-      <div style="display: inline-block;">
-        <button @click="$parent.notShowEcharts()" class="button_clear button_spacing">隐藏图表</button>
-      </div>
-      <!--图显示模板-->
-      <div class="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 id="charts" style=" height: 98%;width: 98%;padding: 1% 1%;">
-      <div id="infoss" style=" height: 600px;width: 800px;padding: 1% 1%;min-width:98%;min-height: 98%"></div>
-    </div>
+  <div id="charts">
+    <div id="infoss" style="height: 98%;width: 98%;padding: 1% 1%;"></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, condition) {
     let load = new HttpResetClass()
     load.load('POST', 'rs/sql/webmeter_getNewLoseGroupList',
-      {data:{condition: condition, groupname: self.groupname[0], startDate: self.startdate ? self.startdate:Util.toStandardDateString(),
-          endDate: self.enddate ? self.enddate:Util.toStandardDateString()}},
+      {data:{condition: condition, groupname: self.groupname, startDate: self.startdate,
+          endDate: self.enddate}},
       {resolveMsg: null, rejectMsg: null})
       .then((res) => {
         let name = []
         let value = []
-        for (let i = 0; i < res.data.length; i++) {
+        for (var i = 0; i < res.data.length; i++) {
           name[i] = res.data[i].res
           value[i] = res.data[i].value
         }
@@ -75,26 +59,25 @@
     methods: {
       set (key, value) {
         let Name = ''
-        if (this.groupname[0] === 'f_user_type')
+        if (this.groupname === 'f_user_type')
         {
           Name = '用户类型'
-        } else if (this.groupname[0] === 'f_gasproperties') {
+        } else if (this.groupname === 'f_gasproperties') {
           Name = '用气性质'
-        }  else if (this.groupname[0] === 'f_orgname') {
+        }  else if (this.groupname === 'f_orgname') {
           Name = '分公司'
-        } else if (this.groupname[0] === 'max_days_type') {
+        } else if (this.groupname === 'max_days_type') {
           Name = '最长失联天数'
-        } else if (this.groupname[0] === 'all_days_type') {
+        } else if (this.groupname === 'all_days_type') {
           Name = '合计失联天数'
         } else {
           Name = '合计'
         }
-        this.xc = this.$echarts.init(document.getElementById('infoss'))
-        console.log('-----55555------', this.xc)
-        let option = {
+        this.xc = echarts.init(document.getElementById('infoss'))
+        var option = {
           title: {
             text: '表具失联(' + Name + ')分析',
-            left: 'center',
+            'left': 'center',
             textStyle: {
               color: '#000',
               fontSize: 15
@@ -158,7 +141,6 @@
           ]
         }
         this.xc.setOption(option)
-        console.log("------------->>>>>>>>",document.getElementById('infoss'))
       },
       searchdata (condition) {
         let getGen = getData(this, condition)

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

@@ -9,7 +9,7 @@
                 <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"
+                    <input  style="width:60%" class="input_search" condition="u.f_userinfo_code like '%{}%'" placeholder='客户编号' type="text"
                            v-el:meternumber v-model="model.f_userinfo_code" v-next-el='f_userinfo_code'
                     >
                   </div>
@@ -52,7 +52,7 @@
                                   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>
                   </div>
                 </div>
@@ -248,6 +248,9 @@
                   <th style="text-align:center">
                     <nobr>期初余额(元)</nobr>
                   </th>
+                  <th style="text-align:center">
+                    <nobr>期间充值(元)</nobr>
+                  </th>
                   <th style="text-align:center">
                     <nobr>上期底数</nobr>
                   </th>
@@ -295,6 +298,7 @@
                 </td>
                 <td>{{row.f_meternumber}}</td>
                 <td style="text-align:center">{{row.f_balance}}</td>
+                <td style="text-align:center">{{row.f_total_charge}}</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>-->
@@ -332,13 +336,13 @@
       </div>
     </div>
   </div>
-  <div class="flex-row" v-show="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-if="isActiveTotalForm">
+    <user-gas-eform :condition="condition"></user-gas-eform>
   </div>
 </template>
 
@@ -492,7 +496,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         }
         // 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}`
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and u.f_orgid in ${this.orgCondtionStr}`
         else
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
         args.condition = this.condition

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

@@ -1,11 +1,11 @@
 <template lang="html">
   <div class="basic-main">
-  <div class="row" style="height: 40px;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 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
@@ -16,7 +16,7 @@
     </div>
   </div>
   <div id="charts" style=" height: 98%;width: 98%;padding: 1% 1%;">
-    <div id="info" style=" height: 600px;width: 1000px;padding: 1% 1%;"></div>
+    <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,8 +91,7 @@
         } else {
           name = '日'
         }
-        this.xc = this.$echarts.init(document.getElementById('info'))
-        // this.xc.resize({height: '100%',width: '100%'})
+        this.xc = echarts.init(document.getElementById('info'))
         this.xc.setOption({
           title: {
             text: '用气' + name + '分析图',