manage-client 3.2.83-aode → 3.2.83-jb

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-row" v-if="!showdetail">
+  <div class="flex-row" v-show="!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>
@@ -15,7 +15,7 @@
                 <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="f_userinfo_code like '{}%'" v-el:xq v-next-el='userinfocode' v-el:username
+                       condition="f_userinfo_code like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">
@@ -41,21 +41,21 @@
               </div>
             <div style="float:right">
               <button class="button_search button_spacing" @click="search()">查询</button>
-              <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
+              <button class="button_clear button_spacing" @click="clear">清空</button>
               <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                             :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
                             sqlurl="rs/logic/exportfile" sql-name="webmeter_getAllLoseQuery" template-name='失联分析'
                             :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>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <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"
+              <right-tree @re-res="$parent.$parent.getorg" width="60%"
                           :initresid='$parent.$parent.org'></right-tree>
             </div>
             <div class="col-sm-2 form-group">
@@ -64,6 +64,7 @@
                         v-model="model.f_user_type"
                         placeholder='客户类型'
                         :value.sync="model.f_user_type"
+                        @change="$parent.$parent.userTypeChange()"
                         :options='$parent.$parent.usertypes'
                         condition="f_user_type = '{}'"
                         close-on-select>
@@ -75,18 +76,53 @@
                         v-model="model.f_gasproperties"
                         placeholder='用气性质'
                         :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>-->
@@ -121,25 +157,14 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body">阀门状态</label>
-              <v-select
-                placeholder='阀门状态'
-                value-single="true"
-                style="width:60%"
-                :value.sync="model.f_valvestate"
-                v-model="model.f_valvestate"
-                :options='$parent.$parent.ValveState'
-                close-on-select condition="f_valvestate ='{}'">
-              </v-select>
-            </div>
+
 
             <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">最长失联&nbsp;</label>
+              <label class="font_normal_body">最长失联</label>
               <div class="row">
                 <input type="text" style="width:27%" class="input_search" v-model="model.max_interval_day1"
                        condition="max_interval_day >= {} " placeholder="">
-                <label class="font_normal_body"> ≤ x ≤ </label>
+                <label class="font_normal_body"> &nbsp;≤ x ≤ </label>
                 <input type="text" style="width:27%" class="input_search" v-model="model.max_interval_day2"
                        condition="max_interval_day <= {} " placeholder="">
               </div>
@@ -147,11 +172,11 @@
 
 
             <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">合计失联&nbsp;</label>
+              <label class="font_normal_body">合计失联</label>
               <div class="row">
                 <input type="text" style="width:27%" class="input_search" v-model="model.SLdays1"
                        condition="SLdays >= {} " placeholder="">
-                <label class="font_normal_body"> ≤ x ≤ </label>
+                <label class="font_normal_body">&nbsp; ≤ x ≤ </label>
                 <input type="text" style="width:27%" class="input_search" v-model="model.SLdays2"
                        condition="SLdays <= {} " placeholder="">
               </div>
@@ -226,9 +251,7 @@
             <th style="text-align:center">
               <nobr>启用日期</nobr>
             </th>
-            <th style="text-align:center">
-              <nobr>阀门状态</nobr>
-            </th>
+
             <th style="text-align:center">
               <nobr>应报天数</nobr>
             </th>
@@ -244,6 +267,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>
@@ -263,7 +292,7 @@
           <td style="text-align:center">{{row.f_gasproperties}}</td>
           <td style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_startuse_date}}</nobr></td>
-          <td style="text-align:center">{{row.f_valvestate}}</td>
+
           <td style="text-align:center">{{row.ybdays}}</td>
           <td style="text-align:center">{{row.sbdays}}</td>
           <td style="text-align:center">
@@ -275,6 +304,12 @@
           <td style="text-align:center">
             <nobr>{{row.f_meter_brand}}</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>
@@ -283,34 +318,25 @@
       </data-grid>
     </criteria-paged>
   </div>
-  <div v-show="echarts" style="height: 40px;width: 100%;">
-    <div style="display: inline-block;">
-      <button class="button_search button_spacing" @click="notShowEcharts()">隐藏图表</button>
+    <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>
-    <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 class="span" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">
+      <lost-contact-eform :condition="condition"
+      ></lost-contact-eform>
     </div>
   </div>
-  <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 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>-->
-  <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 :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+  <div  class="flex-row" style="width:99%;height:98%;margin-bottom:0px" 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>
 
@@ -319,21 +345,16 @@
   import UserGasEcharts from './UserGasEcharts'
   import * as Util from '../../../Util'
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
-  import {toStandardYearMonth, toStandardYearMonth1} from "../../../Util";
-
+  import {HttpResetClass} from 'vue-client'
   let readySomething = async function (self) {
 
     await self.$MagLoadParams.loadParam()
     self.initParams()
     let year = new Date().getFullYear()
-    let month = new Date().getFullYear()
-    self.$refs.paged.$refs.cri.model.startDate = Util.toStandardYearMonth() +'-01 00:00:00'
-    self.$refs.paged.$refs.cri.model.max_interval_day1 =  0
-    self.$refs.paged.$refs.cri.model.max_interval_day2 =  7
-
+    self.$refs.paged.$refs.cri.model.startDate =  year+'-01-01 00:00:00'
     // self.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-    // self.$refs.paged.$refs.cri.search()
+    self.$refs.paged.$refs.cri.search()
   }
   export default {
     title: '失联分析',
@@ -349,7 +370,7 @@
           "f_userinfo_code":"客户编号","f_user_name":"客户名称",
           "f_address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质",
           "f_meternumber":"表号",
-          "f_valvestate":"阀门状态",
+
           "f_startuse_date":"启用日期",
           "ybdays":"应报天数",
           "sbdays":"实报天数",
@@ -361,10 +382,17 @@
         rowdata:{},
         startDate: '',
         endDate: '',
-        criteriaShow:true,
+        criteriaShow:false,
         outlets: [],
+        gasproperties:[{label: '全部', value: ''}],
         operator: [],
-        meterbrands:[],
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
         filename: '',
         orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
         echarts: false,
@@ -376,7 +404,7 @@
         getgroupname: [
           {label: '客户类型', value: 'f_user_type'},
           {label: '用气性质', value: 'f_gasproperties'},
-          {label: '分公司', value: 'f_orgid'},
+          {label: '分公司', value: 'f_orgname'},
           {label: '最长失联天数', value: 'max_days_type'},
           {label: '合计失联天数', value: 'all_days_type'}
         ],
@@ -386,8 +414,66 @@
     },
     ready() {
       readySomething(this)
+      this.getMeterTypeAndBrand('f_meter_brand', '1=1')
     },
     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) => {
+          for (let i = 0; i < res.data.length; i++) {
+            if (groupname == 'f_meter_brand') {
+              let dr = {}
+              dr.label = res.data[i].f_meter_brand
+              dr.value = res.data[i].f_meter_brand
+              //气表品牌
+              self.WarningType.push(dr)
+            } else if (groupname == 'f_meter_style') {
+              self.Warningstyle= [
+                {label: '全部', value: ''}
+              ],
+              self.$refs.paged.$refs.cri.model.f_meter_style=''
+              let dr = {}
+              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 && this.$refs.paged.$refs.cri.model.f_user_type) {
+          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
       },
@@ -396,7 +482,7 @@
       },
       showmsg(obj){
         this.rowdata=obj
-        this.showdetail=true
+        this.showdetail = true
       },
       cancel() {
         this.showdetail = false
@@ -412,7 +498,7 @@
           }
 
         })
-        this.meterbrands = [{label: '全部', value: ''}, ...arr]
+
       },
       search(args) {
         this.startDate = this.$refs.paged.$refs.cri.model.startDate
@@ -420,7 +506,7 @@
         if (this.endDate == '' || this.startDate == '') {
           return this.$showMessage("时间区间的开始和结束时间不能为空！")
         }
-        args.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`
+        this.condition = args.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`
         this.model.search(args.condition, args.model)
       },
       getorg(obj) {
@@ -448,6 +534,8 @@
       clearmsg() {
         this.$refs.paged.$refs.cri.model = {}
       },
+
+
       close() {
         this.show = false
       },
@@ -484,9 +572,6 @@
       // usertypes () {
       //   return this.$appdate.getParams("客户类型")
       // },
-      ValveState() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')]
-      },
       getCondition() {
         let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
         return {
@@ -499,9 +584,6 @@
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-      Gasproperties() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-      },
       f_outlets() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('网点查询用')]
       },
@@ -510,6 +592,9 @@
       },
       getstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('最新状态')]
+      },
+      userstate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
       }
     }
   }

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

@@ -1,25 +1,41 @@
 <template lang="html">
-  <div id="charts">
-    <div id="infoss" style="height: 98%;width: 98%;padding: 1% 1%;"></div>
+  <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>
 </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, startDate: self.startdate,
-          endDate: self.enddate}},
+      {data:{condition: condition, groupname: self.groupname[0], startDate: self.startdate ? self.startdate:Util.toStandardDateString(),
+          endDate: self.enddate ? self.enddate:Util.toStandardDateString()}},
       {resolveMsg: null, rejectMsg: null})
       .then((res) => {
         let name = []
         let value = []
-        for (var i = 0; i < res.data.length; i++) {
+        for (let i = 0; i < res.data.length; i++) {
           name[i] = res.data[i].res
           value[i] = res.data[i].value
         }
@@ -59,25 +75,26 @@
     methods: {
       set (key, value) {
         let Name = ''
-        if (this.groupname === 'f_user_type')
+        if (this.groupname[0] === 'f_user_type')
         {
           Name = '用户类型'
-        } else if (this.groupname === 'f_gasproperties') {
+        } else if (this.groupname[0] === 'f_gasproperties') {
           Name = '用气性质'
-        }  else if (this.groupname === 'f_orgname') {
+        }  else if (this.groupname[0] === 'f_orgname') {
           Name = '分公司'
-        } else if (this.groupname === 'max_days_type') {
+        } else if (this.groupname[0] === 'max_days_type') {
           Name = '最长失联天数'
-        } else if (this.groupname === 'all_days_type') {
+        } else if (this.groupname[0] === 'all_days_type') {
           Name = '合计失联天数'
         } else {
           Name = '合计'
         }
-        this.xc = echarts.init(document.getElementById('infoss'))
-        var option = {
+        this.xc = this.$echarts.init(document.getElementById('infoss'))
+        console.log('-----55555------', this.xc)
+        let option = {
           title: {
             text: '表具失联(' + Name + ')分析',
-            'left': 'center',
+            left: 'center',
             textStyle: {
               color: '#000',
               fontSize: 15
@@ -141,6 +158,7 @@
           ]
         }
         this.xc.setOption(option)
+        console.log("------------->>>>>>>>",document.getElementById('infoss'))
       },
       searchdata (condition) {
         let getGen = getData(this, condition)