manage-client 3.1.8-aode → 3.1.8-ls

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

@@ -55,6 +55,8 @@
             </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"
@@ -65,6 +67,7 @@
               <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 = '{}'"
@@ -78,18 +81,53 @@
                         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 :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>
+              <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>
             </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">上报区间</label>
@@ -181,6 +219,12 @@
             <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>
@@ -217,6 +261,12 @@
           <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>
@@ -250,7 +300,7 @@
   </div>-->
   </div>
   <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>
+    <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
   </div>
 </template>
 
@@ -263,9 +313,10 @@
   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 {
@@ -274,7 +325,13 @@
         show: false,
         startDate: '',
         endDate: '',
-        meterbrands: [],
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
         f_error_type:'',
         groupname: ['year'],
         getgroupname: [
@@ -290,6 +347,7 @@
         },
         outlets: [],
         operator: [],
+        gasproperties:[{label: '全部', value: ''}],
         showdetail:false,
         rowdata:{},
         filename: '',
@@ -299,6 +357,11 @@
         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}`
@@ -315,6 +378,53 @@
 
     },
     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
@@ -322,6 +432,11 @@
       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)
@@ -350,7 +465,9 @@
         this.searchshow = !this.searchshow
       },
       getErrorInfo(items){
-          let self = this
+        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 f_error_level=''
         if (items!='f_error_level') {
           if(this.$refs.paged.$refs.cri.model.f_error_level){
@@ -365,17 +482,11 @@
               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: ''})
-            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)
+            for (let i = 0; i < rows.length; i++) {
+              array1.push({label: rows[i].f_type,value: rows[i].f_type})
             }
             console.log("array1========",array1)
             if (items=='f_error_level'){
@@ -464,10 +575,9 @@
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-      Gasproperties() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      userstate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
       }
-
     }
   }
 </script>

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

@@ -5,21 +5,7 @@
         <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"
@@ -33,6 +19,20 @@
                        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>
@@ -45,18 +45,24 @@
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
               <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
-                >
+                <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>-->
               </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>
@@ -68,12 +74,42 @@
                           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
+                  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 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="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="起始时间"
@@ -90,6 +126,31 @@
                             :format="'yyyy-MM-dd HH:mm:ss'"
                 ></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>
@@ -149,10 +210,11 @@
   </div>
 </template>
 <script>
-  import {PagedList} from 'vue-client'
+  import {HttpResetClass, 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'
 
   export default {
     title: '抄表分析',
@@ -163,7 +225,15 @@
         model: new PagedList('rs/sql/webmeter_getNewHandChanceList', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
         condition: '1=1',
         startDate: '',
+        gasproperties:[{label: '全部', value: ''}],
         endDate: '',
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
         orgid:[this.$login.f.orgid],
         getfield:{"f_insert_date":"上报日期","anzhuang":"安装户数",
           "c0":"停用户数",
@@ -172,25 +242,89 @@
           "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 () {
       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.getMeterTypeAndBrand('f_meter_brand', '1=1')
       this.$refs.paged.$refs.cri.search()
     },
     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
+        let load = new HttpResetClass()
+        load.load('POST', 'rs/sql/getMeterStyleAndBrand1', {
+          data: {
+            condition: condition,
+            groupname: groupname
+          }
+        }, {warnMsg: null, resolveMsg: null}).then((res) => {
+          let dr = {label: '', value: ''}
+          let i = 0
+          for (i = 0; i < res.data.length; i++) {
+            dr = {label: '', value: ''}
+            if (groupname == 'f_meter_brand') {
+              dr.label = res.data[i].f_meter_brand
+              dr.value = res.data[i].f_meter_brand
+              //气表品牌
+              self.WarningType.push(dr)
+              console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
+              console.log(dr)
+              console.log( self.WarningType)
+            } else if (groupname == 'f_meter_style') {
+              dr.label = res.data[i].f_meter_style
+              dr.value = res.data[i].f_meter_style
+              //气表类型
+              self.Warningstyle.push(dr)
+            }
+          }
+          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=''
+
+          console.log(this.$refs.paged.$refs.cri.model.f_user_type[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
       },
@@ -238,11 +372,25 @@
         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)
+        this.orgCondtionStr = plugins.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
       }
+      // 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) {
@@ -270,9 +418,6 @@
       valveStatus () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
       },
-      Gasproperties () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-      },
       Getuserstyle () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
       }