manage-client 3.2.90 → 3.2.91-aode

package/src/components/webmeter/newwebmeter/UserGasList.vue

@@ -1,16 +1,30 @@
 <template>
-  <div class="flex-row" v-show="!echarts">
-    <div id='app' class="basic-main">
+  <div class="flex-row">
+    <div id='app' class="basic-main" v-show="!echarts">
       <criteria-paged :model="model" :pager='true' v-ref:paged>
         <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
-
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">表&nbsp;&nbsp;号&nbsp;</label>
+                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                       v-model="model.f_meternumber" placeholder='表号'
+                       condition="uf.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                >
+              </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>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_userinfo_code" placeholder='客户编号'
-                       condition="u.f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
+                       condition="u.f_userinfo_code like '{}%'" v-next-el='f_userinfo_code' v-el:meternumber
                 >
               </div>
               <div class="col-sm-2 form-group">
@@ -19,20 +33,6 @@
                        v-model="model.f_username" placeholder='客户名称'
                        condition="u.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
               </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">客户地址</label>
-              <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
-                     v-model="model.f_address" placeholder='地址'
-                     condition="a.f_address like '%{}%'" v-el:xq v-next-el='address' v-el:area
-              >
-            </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">表&emsp;&emsp;号</label>
-                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
-                       v-model="model.f_meternumber" placeholder='表钢号'
-                       condition="uf.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
-                >
-              </div>
               <div class="span" style="float:right;margin-top:10px">
                 <button class="button_search button_spacing" @click="search()">查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
@@ -40,30 +40,23 @@
                               :field="$parent.$parent.getfield"
                               sqlurl="rs/logic/exportfile" sql-name="webmeter_getNewHandChanceList" template-name='抄表分析'
                               :choose-col="true"></export-excel>
-                <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>
-                <right-tree @re-res="$parent.$parent.getRes"
-                            :initresid='$parent.$parent.orgid'></right-tree>
-<!--                    <label class="font_normal_body">组织机构</label>-->
-<!--                <res-select :initresid="$parent.$parent.orgid"-->
-<!--                            style="width:60%"-->
-<!--                            @res-select="$parent.$parent.getRes"-->
-<!--                            restype='organization'>-->
-<!--                </res-select>-->
+                <label class="font_normal_body">客户地址</label>
+                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                       v-model="model.f_address" placeholder='地址'
+                       condition="a.f_address like '%{}%'" v-el:xq v-next-el='address' v-el:area
+                >
               </div>
-<!--              <res-select-group :initres="$parent.$parent.initres"  :show-component="['company']" @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 style="width:60%" id="f_user_type"
                           v-model="model.f_user_type"
                           placeholder='用户类型'
                           :value.sync="model.f_user_type"
-                          @change="$parent.$parent.userTypeChange()"
                           :options='$parent.$parent.usertypes'
                           condition="uf.f_user_type = '{}'"
                           close-on-select>
@@ -75,61 +68,18 @@
                           v-model="model.f_gasproperties"
                           placeholder='用气性质'
                           :value.sync="model.f_gasproperties"
-                          :options='$parent.$parent.gasproperties'
+                          :options='$parent.$parent.Gasproperties'
                           condition="uf.f_gasproperties = '{}'"
                           close-on-select>
                 </v-select>
               </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">气表品牌</label>
-                <v-select
-                  :options='$parent.$parent.meterbrand'
 
-                  :value.sync="model.f_meter_brand"
-                  close-on-select
-                  condition="f_meter_brand='{}'"
-                  placeholder='气表品牌'
-                  style="width:60%"
-                  v-model="model.f_meter_brand">
-                </v-select>
-              </div>
-<!--              <div class="col-sm-2 form-group">-->
-<!--                <label class="font_normal_body">气表品牌</label>-->
-<!--                <v-select-->
-<!--                  placeholder='气表品牌'-->
-<!--                  :value.sync="model.f_meter_brand"-->
-<!--                  v-model="model.f_meter_brand"-->
-<!--                  :options='$parent.$parent.WarningType'-->
-<!--                  @change="$parent.$parent.getMeterType"-->
-<!--                  close-on-select-->
-<!--                  condition="gb.f_meter_brand='{}'">-->
-<!--                </v-select>-->
-<!--              </div>-->
-              <div class="col-sm-2 form-group" >
-                <label class="font_normal_body">气表型号</label>
-                <v-select
-                          placeholder='气表型号'
-                          :value.sync="model.f_meter_style"
-                          v-model="model.f_meter_style"
-                          :options='$parent.$parent.meterstyle[model.f_meter_brand]'
-                          close-on-select
-                          condition="gm.f_meter_style='{}'">
-                </v-select>
-<!--                <v-select v-if="!$parent.$parent.styles"-->
-<!--                          placeholder='气表型号'-->
-<!--                          :value.sync="model.f_meter_style"-->
-<!--                          v-model="model.f_meter_style"-->
-<!--                          :options='$parent.$parent.Warningstyles'-->
-<!--                          close-on-select-->
-<!--                          condition="f_meter_style='{}'">-->
-<!--                </v-select>-->
-              </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body" style="word-break:keep-all;">上报时间</label>
                 <datepicker style="width:60%" placeholder="起始时间"
                             :value.sync="model.startDate"
                             v-model="model.startDate"
-                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            :format="'yyyy-MM-dd'"
                 ></datepicker>
               </div>
               <div class="col-sm-2 form-group">
@@ -137,34 +87,9 @@
                 <datepicker style="width:60%" placeholder="结束时间"
                             :value.sync="model.endDate"
                             v-model="model.endDate"
-                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            :format="'yyyy-MM-dd'"
                 ></datepicker>
               </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="" :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=""></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=""-->
-<!--                          close-on-select></v-select>-->
-<!--              </div>-->
             </div>
           </div>
         </criteria>
@@ -178,10 +103,12 @@
               <th style="text-align:center" title="停用户数:表具状态为停用的用户数"><nobr>停用户数</nobr></th>
               <th style="text-align:center" title="在用户数:表具状态为正常的用户数"><nobr>在用户数</nobr></th>
 
-              <th style="text-align:center" title="用户使用率=在用户数/正常户数"><nobr>用户使用率</nobr></th>
+<!--              <th style="text-align:center" title="用户使用率=在用户数/正常户数"><nobr>用户使用率</nobr></th>-->
               <th style="text-align:center"><nobr>抄表成功户数</nobr></th>
               <th style="text-align:center"><nobr>总用气量</nobr></th>
-              <th style="text-align:center" title="日均用气量=总用气量/在用户数"><nobr>日均用气量</nobr></th>
+              <th style="text-align:center"><nobr>总用气金额</nobr></th>
+              <th style="text-align:center" title="日均户均用气量=总用气量/抄表成功户数"><nobr>日均户均用气量(成功)</nobr></th>
+              <th style="text-align:center" title="日均户均用气量=总用气量/在用户数"><nobr>日均户均用气量(在用)</nobr></th>
               <!--<th style="text-align:center"><nobr>指令成功户数</nobr></th>-->
               <th style="text-align:center" title="抄表成功率=抄表成功户数/在用户数"><nobr>抄表成功率</nobr></th>
               <!--<th style="text-align:center" title="指令成功率=指令成功户数/抄表成功户数"><nobr>指令成功率</nobr></th>-->
@@ -197,10 +124,12 @@
               <th style="text-align:center">{{row.c0}}</th>
               <td style="text-align:center"><nobr>{{row.c}}</nobr></td>
 
-              <td style="text-align:center"><nobr>{{row.user_bv}}%</nobr></td>
+<!--              <td style="text-align:center"><nobr>{{row.user_bv}}%</nobr></td>-->
               <!--<td style="text-align:center"><nobr>{{row.f_gas}}</nobr></td>-->
               <td style="text-align:center">{{row.c1}}</td>
               <td style="text-align:center">{{row.f_gas_all}}</td>
+              <td style="text-align:center">{{row.f_fee_all}}</td>
+              <td style="text-align:center">{{row.f_gas}}</td>
               <td style="text-align:center">{{row.f_gas1}}</td>
               <td style="text-align:center">{{row.f_bv1}}%</td>
               <!--<td style="text-align:center">{{row.f_bv2}}%</td>-->
@@ -211,30 +140,22 @@
         </data-grid>
       </criteria-paged>
     </div>
-<!--    <div style="height: 40px;width: 100%;" v-show="echarts">-->
-<!--      <button class="button_search button_spacing" @click="showEcharts()">隐藏图表</button>-->
-<!--    </div>-->
-
-  </div>
-  <!--图显示模板-->
-  <div class="flex-row" v-if="echarts" style="width: 100%;height: 98%;">
-    <user-gas-echarts-list :condition="condition" :startdate="startDate"
-                           :enddate="endDate" :echarts="echarts"></user-gas-echarts-list>
+    <div style="height: 40px;width: 100%;" v-show="echarts">
+      <button class="button_search button_spacing" @click="showEcharts()">隐藏图表</button>
+    </div>
+    <!--图显示模板-->
+    <div class="span " v-show="echarts" style="width: 100%;height: 90%;">
+      <user-gas-echarts-list :condition="condition" :startdate="startDate"
+                             :enddate="endDate" :echarts="echarts"></user-gas-echarts-list>
+    </div>
   </div>
 </template>
 <script>
-  import {HttpResetClass, PagedList} from 'vue-client'
+  import {PagedList} from 'vue-client'
   import UserGasEcharts from './UserGasEchartsList'
   import * as Util from '../../../Util'
   import plugins from '../../../plugins/GetLoginInfoService'
-  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
-  let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-    await self.$MagLoadParams.loadParam()
-    self.initQueryParam()
-    self.$refs.paged.$refs.cri.search()
-  }
+
   export default {
     title: '抄表分析',
     props: ['data'],
@@ -244,86 +165,34 @@
         model: new PagedList('rs/sql/webmeter_getNewHandChanceList', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
         condition: '1=1',
         startDate: '',
-        gasproperties:[{label: '全部', value: ''}],
         endDate: '',
-        meterbrand: [],
-        meterstyle: {},
-        WarningType: [
-          {label: '全部', value: ''}
-        ],
-        Warningstyles: [
-          {label: '全部', value: ''}
-        ],
-        styles:false,
         orgid:[this.$login.f.orgid],
         getfield:{"f_insert_date":"上报日期","anzhuang":"安装户数",
           "c0":"停用户数",
           "c":"在用户数","user_bv":"用户使用率",
-          "c1":"抄表成功户数",
+          "c1":"抄表成功户数","f_fee_all":"总用金额",
           "f_gas_all":"总用气量","f_gas":"日均户均用气量(成功)",
           "f_gas1":"日均户均用气量(在用)",
           "f_bv1":"抄表成功率"
-        },
+          },
         criteriaShow:false,
         echarts: false,
         orgCondtionStr: '(' + this.$login.f.orgid + ')',
         searchshow: false,
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
-        },
         obj: {
           userid: this.$login.f.id,
           source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
           res: this.$login.f.f_fengongsi,
           resids: this.$login.f.orgid
-        },
-        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
+        }
       }
     },
     ready () {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
+      this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString()
+      // this.$refs.paged.$refs.cri.search()
     },
     methods: {
-      initQueryParam () {
-        let meters = this.$MagGetSaleParam.getGasbrand().filter(item => item.value.f_meter_type==='物联网表')
-        let arr = meters.map(res => {
-          let sty = res.value.gasmodel.map(row => {
-            return {
-              label: row.label,
-              value: row.value.f_meter_style
-            }
-          })
-          this.meterstyle[res.value.f_meter_brand] = [{label: '全部', value: ''}, ...sty]
-          return {
-            label: res.label,
-            value: res.value.f_meter_brand
-          }
-        })
-        this.meterbrand = [{label: '全部', value: ''}, ...arr]
-      },
-      showMeterStyle() {
-        this.styles = true
-      },
-      userTypeChange () {
-        this.gasproperties=[{label: '全部', value: ''}]
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties=''
-
-          if(this.$refs.paged.$refs.cri.model.f_user_type && this.$refs.paged.$refs.cri.model.f_user_type.length>0){
-            this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-          }
-          // this.gasproperties.push({label: '全部', value: ''})
-        }
-        else{
-          this.gasproperties =[{label: '全部', value: ''}]
-        }
-      },
       hidden(){
         this.criteriaShow = !this.criteriaShow
       },
@@ -356,8 +225,6 @@
       // },
       clearmsg () {
         this.$refs.paged.$refs.cri.model = {}
-        this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
-        this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
       },
       search (args) {
         this.startDate = this.$refs.paged.$refs.cri.model.startDate
@@ -366,32 +233,18 @@
           return this.$showMessage("时间区间的开始和结束时间不能为空！")
         }
         if (this.orgCondtionStr){
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and uf.f_orgid in ${this.orgCondtionStr}`
+          this.condition = this.$refs.paged.$refs.cri.condition + `and uf.f_orgid in ${this.orgCondtionStr}`
         }
         else
           this.condition = this.$refs.paged.$refs.cri.condition
         args.condition = this.condition
         this.model.search(args.condition, args.model)
       },
-      // getRes (obj) {
-      //   this.orgCondtionStr = plugins.convertToIn(obj)
-      // }
       getRes (obj) {
-        this.orgCondtionStr = plugins.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
+        this.orgCondtionStr = plugins.convertToIn(obj)
       }
-      // getRes(condition,obj) {
-      //   this.orgCondtionStr = condition
-      //   this.orgname = obj.orgnames[0]
-      //   this.depname = obj.depnames[0]
-      // }
     },
     computed: {
-      houseTypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
-      },
-      positions() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
-      },
       getCondition() {
         var con=""
         if (this.orgCondtionStr) {
@@ -419,6 +272,9 @@
       valveStatus () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
       },
+      Gasproperties () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
       Getuserstyle () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
       }

package/src/components/webmeter/newwebmeter/UserInstructEchartsList.vue

@@ -72,6 +72,8 @@
               fontSize: 20
             }
           },
+          'backgroundColor': '#F8F8FF',
+          'color': '#384757',
           'tooltip': {
             'trigger': 'axis',
             'extraCssText': 'width: auto;height: auto;'
@@ -79,7 +81,7 @@
           'legend': {
             'data': [
               {
-                'name': '当日表端接收',
+                'name': '指令成功表具数',
                 'icon': 'circle',
                 'textStyle': {
                   'color': '#5b5',
@@ -87,7 +89,7 @@
                 }
               },
               {
-                'name': '当日发送指令',
+                'name': '总表具数',
                 'icon': 'circle',
                 'textStyle': {
                   'color': '#233564',
@@ -95,12 +97,28 @@
                 }
               },
               {
-                'name': '当日接收成功率%',
+                'name': '表具指令成功率%',
+                'icon': 'circle',
+                'textStyle': {
+                  'color': '#ffaa00',
+                  fontSize: 20
+                }
+              },
+              {
+                'name': '指令成功率%',
                 'icon': 'circle',
                 'textStyle': {
                   'color': '#ffaaff',
                   fontSize: 20
                 }
+              },
+              {
+                'name': '综合指令成功率%',
+                'icon': 'circle',
+                'textStyle': {
+                  'color': '#ff0000',
+                  fontSize: 20
+                }
               }
             ],
             'top': '10%',
@@ -161,7 +179,7 @@
           },
           'series': [
             {
-              'name': '当日表端接收',
+              'name': '指令成功表具数',
               nameTextStyle: {
                 fontSize: 15
               },
@@ -187,7 +205,7 @@
               'barGap': '0'
             },
             {
-              'name': '当日发送指令',
+              'name': '总表具数',
               nameTextStyle: {
                 fontSize: 15
               },
@@ -213,7 +231,20 @@
               'barGap': '0'
             },
             {
-              'name': '当日接收成功率%',
+              'name': '表具指令成功率%',
+              'type': 'line',
+              'yAxisIndex': 1,
+              'data': f_bv1,
+              'itemStyle': {
+                'normal': {
+                  'color': '#ffaa00',
+                  fontSize: 15
+                }
+              },
+              'smooth': true
+            },
+            {
+              'name': '指令成功率%',
               'type': 'line',
               'yAxisIndex': 1,
               'data': f_bv2,
@@ -224,6 +255,19 @@
                 }
               },
               'smooth': true
+            },
+            {
+              'name': '综合指令成功率%',
+              'type': 'line',
+              'yAxisIndex': 1,
+              'data': f_bv0,
+              'itemStyle': {
+                'normal': {
+                  'color': '#ff0000',
+                  fontSize: 15
+                }
+              },
+              'smooth': true
             }
           ]
         })