manage-client 3.2.27 → 3.2.28-aode

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue

@@ -50,13 +50,11 @@
                             sqlurl="rs/logic/exportfile" sql-name="DrillErrorByUserinfo" template-name='异常分析'
                             :choose-col="true"></export-excel>
                 <!--<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>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-<!--            <res-select-group :initres="$parent.$parent.initres"  :show-component="['company']" @re-res="$parent.$parent.getorg" v-ref:sel></res-select-group>-->
-
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
               <right-tree @re-res="$parent.$parent.getorg"
@@ -67,7 +65,6 @@
               <v-select style="width:60%" id="f_user_type"
                         v-model="model.f_user_type"
                         placeholder='客户类型'
-                        @change="$parent.$parent.userTypeChange()"
                         :value.sync="model.f_user_type"
                         :options='$parent.$parent.usertypes'
                         condition="f_user_type = '{}'"
@@ -81,53 +78,18 @@
                         placeholder='用气性质'
                         @keyup.enter="search"
                         :value.sync="model.f_gasproperties"
-                        :options='$parent.$parent.gasproperties'
+                        :options='$parent.$parent.Gasproperties'
                         condition="f_gasproperties = '{}'"
                         close-on-select>
               </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="f_meter_brand='{}'">
-              </v-select>
-            </div>
-            <div class="col-sm-2 form-group" >
-              <label class="font_normal_body">气表型号</label>
-              <v-select v-if="$parent.$parent.styles"
-                        placeholder='气表型号'
-                        :value.sync="model.f_meter_style"
-                        v-model="model.f_meter_style"
-                        :options='$parent.$parent.Warningstyle'
-                        close-on-select
-                        condition="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">用户状态</label>
-              <v-select
-                placeholder='用户状态'
-                value-single="true"
-                style="width:60%"
-                :value.sync="model.f_user_state"
-                v-model="model.f_user_state"
-                :options='$parent.$parent.userstate'
-                close-on-select condition="f_user_state ='{}'">
-              </v-select>
+              <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>
@@ -219,12 +181,6 @@
             <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>
@@ -261,12 +217,6 @@
           <td style="text-align:center">
             <nobr>{{row.f_error_msg}}</nobr>
           </td>
-          <td style="text-align:center">
-            <nobr>{{row.f_meter_style}}</nobr>
-          </td>
-          <td style="text-align:center">
-            <nobr>{{row.f_user_state}}</nobr>
-          </td>
           <td style="text-align:center">
             <nobr>{{row.f_orgname}}</nobr>
           </td>
@@ -298,13 +248,9 @@
     <new-exception-eform-total :condition="condition" :startdate="startDate"
                          :enddate="endDate"></new-exception-eform-total>
   </div>-->
-    <div v-if="echarts" style="width: 100%;height: 98%;">
-      <new-exception-echarts :condition="condition" :startdate="startDate" :groupname="groupname[0]"
-                             :enddate="endDate" :echarts="echarts"></new-exception-echarts>
-    </div>
   </div>
-  <div  class="flex" v-if="showdetail">
-    <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+  <div  class="basic-main" v-if="showdetail">
+    <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
   </div>
 </template>
 
@@ -317,10 +263,9 @@
   let readySomething = async function (self) {
     await self.$MagLoadParams.loadParam()
     self.initParams()
-    self.getMeterTypeAndBrand('f_meter_brand', '1=1')
   }
   export default {
-    title: '异常分析',
+    title: '异常查看',
     props: ['data'],
     data() {
       return {
@@ -329,15 +274,9 @@
         show: false,
         startDate: '',
         endDate: '',
-        WarningType: [
-          {label: '全部', value: ''}
-        ],
-        Warningstyles: [
-          {label: '全部', value: ''}
-        ],
-        styles:false,
+        meterbrands: [],
         f_error_type:'',
-        groupname: ['day'],
+        groupname: ['year'],
         getgroupname: [
           {label: '年份', value: 'year'},
           {label: '月份', value: 'month'},
@@ -351,7 +290,6 @@
         },
         outlets: [],
         operator: [],
-        gasproperties:[{label: '全部', value: ''}],
         showdetail:false,
         rowdata:{},
         filename: '',
@@ -361,11 +299,6 @@
         isActiveTotalForm: false,
         GetErrorLevel:[],
         GetErrorType:[],
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
-        },
         condition: '1=1',
         org:[this.$login.f.orgid],
         orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
@@ -373,8 +306,7 @@
     },
     ready() {
       readySomething(this)
-      this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-2).substring(0,10) + ' 00:00:00'
-      // this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 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'
       // console.log("type:"+this.$refs.paged.$refs.cri.model.f_error_type)
       this.getErrorInfo('f_error_level')
@@ -383,53 +315,6 @@
 
     },
     methods: {
-      getMeterType() {
-        this.Warningstyle = [{label: '全部', value: ''}]
-        this.styles = false
-        let f_meter_brand = this.$refs.paged.$refs.cri.model.f_meter_brand
-        this.getMeterTypeAndBrand('f_meter_style', `f_meter_brand='${f_meter_brand}'`)
-      },
-      getMeterTypeAndBrand(groupname, condition) {
-        condition = `${condition} and ui.f_orgid like '${this.$login.f.orgid}%'`
-        let self = this
-        self.$refs.paged.$refs.cri.model.f_meter_style=''
-        let load = new HttpResetClass()
-        load.load('POST', 'rs/sql/getMeterStyleAndBrand1', {
-          data: {
-            condition: condition,
-            groupname: groupname
-          }
-        }, {warnMsg: null, resolveMsg: null}).then((res) => {
-          for (let i = 0; i < res.data.length; i++) {
-            if (groupname == 'f_meter_brand') {
-              self.WarningType.push({label: res.data[i].f_meter_brand, value:res.data[i].f_meter_brand})
-              console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
-              console.log( self.WarningType)
-            } else if (groupname == 'f_meter_style') {
-              //气表类型
-              self.Warningstyle.push({label: res.data[i].f_meter_style, value:res.data[i].f_meter_style})
-            }
-          }
-          if (self.Warningstyle.length > 1) {
-            self.showMeterStyle()
-          }
-        })
-
-      },
-      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){
-            console.log(this.$refs.paged.$refs.cri.model.f_user_type)
-            this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-          }
-          // this.gasproperties.push({label: '全部', value: ''})
-        }
-      },
       showmsg(obj){
         this.rowdata=obj
         this.showdetail=true
@@ -437,11 +322,6 @@
       cancel() {
         this.showdetail = false
       },
-      getRes(condition,obj) {
-        this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
-      },
       getorg(obj) {
         if (obj.resids.length>0) {
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
@@ -470,9 +350,7 @@
         this.searchshow = !this.searchshow
       },
       getErrorInfo(items){
-        let self = this
-        self.$refs.paged.$refs.cri.model.f_error_type=''
-        console.log("self.model.f_error_type=''",self.model.f_error_type)
+          let self = this
         let f_error_level=''
         if (items!='f_error_level') {
           if(this.$refs.paged.$refs.cri.model.f_error_level){
@@ -487,11 +365,17 @@
               condition:items=='f_error_level'?'1=1 group by '+items:`f_error_level='${f_error_level}' group by `+items
             }
           },{warnMsg:null,resolveMsg:null}).then((res) => {
+            let i = 0
             let rows=res.data
             let array1=[]
             array1.push({label: '全部', value: ''})
-            for (let i = 0; i < rows.length; i++) {
-              array1.push({label: rows[i].f_type,value: rows[i].f_type})
+            console.log("rows========",rows)
+            for (i = 0; i < rows.length; i++) {
+              let dr = {label: '全部', value: ''}
+              dr.label=rows[i].f_type
+              dr.value=rows[i].f_type
+              array1.push(dr)
+              console.log("rows[i]========",rows[i],dr)
             }
             console.log("array1========",array1)
             if (items=='f_error_level'){
@@ -580,9 +464,10 @@
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-      userstate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
+      Gasproperties() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
       }
+
     }
   }
 </script>

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

@@ -0,0 +1,283 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' 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">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " 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_name"
+                         condition=" f_user_name 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.meternumber"
+                         condition="f_meternumber = '{}' " placeholder="表号">
+                </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"
+                            @change='$parent.$parent.getmeterstyle'
+                            :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>
+                  <v-select style="width:60%"
+                            placeholder='气表型号'
+                            :value.sync="model.f_meter_style"
+                            v-model="model.f_meter_style"
+                            :options='$parent.$parent.metertype'
+                            close-on-select
+                            condition="f_meter_style='{}'">
+                  </v-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile" sql-name="getReportDataQuery" template-name='上报数据查询'  :choose-col="true"
+                                class="button_export button_spacing"></export-excel>
+                  <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 v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" 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>单价</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>
+              </tr>
+            </template>
+
+            <template partial='body'>
+              <td style="text-align: left;"><nobr>{{row.f_userinfo_code}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_user_name}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_meternumber}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_tablebase}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_last_tablebase}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_jval}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_hand_date}}</nobr></td>
+
+              <td style="text-align: left;"><nobr>{{row.f_last_hand_date}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_gas_date}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_software_version}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_table_msg}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_last_meter_state_msg}}</nobr></td>
+
+              <td style="text-align: left;"><nobr>{{row.f_insert_date}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_last_insertdate}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_whether_clear}}</nobr></td>
+
+              <td style="text-align: left;"><nobr>{{row.f_super_gas}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_electricity}}</nobr></td>
+
+              <td style="text-align: left;"><nobr>{{row.f_times}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_price}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_signal}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_snr}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_batteryLevel}}</nobr></td>
+
+              <td style="text-align: left;"><nobr>{{row.f_networkShutValve}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_valveState}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_wmprepaytype}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_upload_type}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_moneyState}}</nobr></td>
+
+              <td style="text-align: left;"><nobr>{{row.f_LowLithiumBattery}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_magneticInterference}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_meterBalanceAmt}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_meterDebitAmt}}</nobr></td>
+              <td style="text-align: left;"><nobr>{{row.f_compensateState}}</nobr></td>
+
+              <td style="text-align: left;"><nobr>{{row.f_filiale}}</nobr></td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import exportConfig from '../../sale/config/exportConfig'
+  let readySomething = async function (self) {
+
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+  }
+  export default {
+    title: '上报数据查询',
+    data() {
+      return {
+        model: new PagedList('rs/sql/getReportDataQuery', 20, {}),
+        criteriaShow: false,
+        config: {
+          fieldMapping: {
+            f_userinfo_id: '客户编号',
+            f_user_name: '客户名称'
+          }
+        },
+        meterbrands: [],
+        metertype:[],
+        headData: [],
+        bodyData: [],
+        orgCondtionStr: '',
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: [],
+        }
+      }
+    },
+    async created () {
+      await this.$getConfig(this,'ReportDataQuery')
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        await this.model.search(args.condition, args.model)
+        // 查询到数据进行处理
+        if (this.model.rows.length > 0) {
+          this.bodyData = this.headData = Object.keys(this.model.rows[0])
+        }
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
+        //部门和人员变为全选
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = ''
+        })
+      },
+      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]
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getmeterstyle(){
+        this.metertype=[]
+        this.metertype.push({label:'全部',value:''})
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+
+          if(item.label==this.$refs.paged.$refs.cri.model.f_meter_brand){
+
+            item.value.gasmodel.forEach((model) => {
+              let temp = {}
+
+              temp.label = model.label
+              temp.value = model.value.f_meter_style
+              this.metertype.push(temp)
+            })
+
+
+          }
+
+        })
+      },
+      getRes(condition, obj) {
+
+        this.orgCondtionStr = condition
+        // this.orgname = obj.orgnames[0]
+        // this.depname = obj.depnames[0]
+      },
+    },
+    watch: {
+    },
+    computed: {
+      getfield() {
+
+        return exportConfig.ReportDataQueryConfig
+      },
+      getCondition() {
+
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
+        }
+
+      },
+    }
+  }
+</script>