manage-client 3.2.91-1 → 3.2.91-aode

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

@@ -1,11 +1,11 @@
 <template lang="html">
-  <div class="basic-main" style="height: 100%;">
-  <div class="row" style="height: 15%;width: 100%;" v-show="echarts">
-    <div class="col-sm-2" style="display: inline-block;">
-      <button @click="$parent.notShowEcharts()" class="button_clear button_spacing">隐藏图表</button>
+  <div class="basic-main">
+  <div style="height: 40px;width: 100%;" v-show="echarts">
+    <div style="display: inline-block;">
+      <button @click="$parent.notShowEcharts()" class="btn btn-success">隐藏图表</button>
     </div>
     <!--图显示模板-->
-    <div class="row col-sm-3 mystyle" style="display: inline-block;">
+    <div class="mystyle" style="display: inline-block;">
       <label class="font_normal_body">图表统计项</label>
       <v-select :options='$parent.getgroupname' :value.sync="groupname"
                 close-on-select
@@ -15,8 +15,8 @@
                 value-single="true"></v-select>
     </div>
   </div>
-  <div style="height: 80%;width: 98%;">
-    <div id="info"></div>
+  <div id="charts" style=" height: 98%;width: 98%;padding: 1% 1%;">
+    <div id="info" style=" height: 98%;width: 98%;padding: 1% 1%;min-width:98%;min-height: 98%"></div>
   </div>
   </div>
 </template>
@@ -24,6 +24,7 @@
 <script>
   import * as Util from '../../../Util'
   import co from 'co'
+  import echarts from 'echarts'
   import { HttpResetClass } from 'vue-client'
 
   let getData = function * (self, condition) {
@@ -78,7 +79,6 @@
     },
     methods: {
       set (arrparams, gasdata1, gasdata2) {
-        console.log('--------->>>>>>>>>>>>',arrparams,gasdata1,gasdata2)
         console.log("ec:"+this.echarts)
         let name = ''
         if (this.groupname === 'year')
@@ -91,17 +91,7 @@
         } else {
           name = '日'
         }
-        const statInfo = document.getElementById('info') // 获取图表元素
-        statInfo.style.width = window.innerWidth - 200 + "px";  //初始化echarts图表宽度
-        statInfo.style.height = window.innerHeight - 200 + "px";  //初始化echarts图表宽度
-        this.xc = this.$echarts.init(statInfo)
-        // 设置宽度自适应
-        window.addEventListener('resize', () => {
-          statInfo.style.width = window.innerWidth - 200 + "px";
-          statInfo.style.height = window.innerHeight - 200 + "px";
-          this.xc.resize();
-        })
-        // this.xc.resize({height: '100%',width: '100%'})
+        this.xc = echarts.init(document.getElementById('info'))
         this.xc.setOption({
           title: {
             text: '用气' + name + '分析图',
@@ -114,8 +104,7 @@
           },
           color: ['#61a0a8', '#2f4554'],
           tooltip: {
-            trigger: 'axis',
-            extraCssText: 'width: auto;height: auto;'
+            trigger: 'axis'
           },
           grid:{
             top:'20%',

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

@@ -1,6 +1,6 @@
 <template lang="html">
-  <div class="basic-main" id="unit">
-    <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+  <div class="basic-main" id="unit" style="height: 100%">
+    <div style="height:7%" class="form-horizontal select-overspread container-fluid auto" novalidate partial>
     <div class="row">
       <div class="col-sm-1 form-group">
         <label class="font_normal_body">汇总项</label>
@@ -51,8 +51,8 @@
                       width='100%'></report-print></span>
     </div>
   </div>
-    <div id="table" style="height:600px;overflow:scroll;">
-      <table class="table table-bordered">
+    <div id="table" style="height:93%;overflow: scroll;">
+      <table class="table table-bordered" >
         <thead class="text-left">
         <tr style="text-align:center">
           <p style="padding: 8px;text-align:center;" class="font_normal_body">用户用气汇总</p>
@@ -81,7 +81,6 @@
         </tr>
         </thead>
         <tbody>
-
         <tr v-for="item in model2">
           <td style="text-align:center" v-if="nameForSql.includes('year')">{{item.year}}</td>
           <td style="text-align:center" v-if="nameForSql.includes('month')">{{item.month}}</td>
@@ -104,7 +103,6 @@
       </table>
     </div>
   </div>
-
 </template>
 
 <script>
@@ -133,7 +131,6 @@
     data() {
       return {
         model2: null,
-
         conditionForSql: '1=1',
         nameForSql: [],
         groupNameForSql: '',
@@ -144,7 +141,6 @@
     ready() {
       this.nameForSql=['year']
       this.groupNameForSql= 'year'
-      this.conditionForSql = this.condition
       this.searchData()
     },
     methods: {
@@ -202,6 +198,9 @@
       'nameForSql'() {
         // this.nameForSql =this.groupNameByDate;
         this.getGroupName1()
+      },
+      '$parent.condition'(val) {
+        this.conditionForSql = val
       }
     }
   }

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

@@ -1,4 +1,4 @@
-<template>
+<template xmlns="http://www.w3.org/1999/html">
   <div class="flex-row" v-if="!showdetail">
     <div id='app1' class="basic-main" v-show="(!echarts)&&(!isActiveTotalForm)">
       <criteria-paged :model="model" :pager='true' v-ref:paged>
@@ -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">
@@ -81,49 +81,26 @@
                         close-on-select>
               </v-select>
             </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">气表品牌</label>
+            <div class="col-sm-2">
+              <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='用户状态'
+                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 ='{}'">
+                :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">
+              <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>
+            </div>
             <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
               <label class="font_normal_body">失联天数&nbsp;</label>
               <div class="row">
@@ -145,7 +122,18 @@
                         close-on-select>
               </v-select>
             </div>
-
+            <div class="col-sm-2 form-group ">
+              <label for="contain_newfile" class="font_normal_body">用户状态</label>
+              <v-select id="contain_newfile"
+                        v-model="model.user_state"
+                        style="width:60%"
+                        :value.sync="model.user_state"
+                        :options='$parent.$parent.user_state'
+                        :value-single="true"
+                        condition="f_user_state='{}'"
+                        close-on-select>
+              </v-select>
+            </div>
           </div>
 
 
@@ -199,19 +187,15 @@
             <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>
@@ -229,14 +213,11 @@
               <nobr>气表厂家</nobr>
             </th>
             <th style="text-align:center" >
-              <nobr>气表型号</nobr>
+              <nobr>组织机构</nobr>
             </th>
             <th style="text-align:center" >
               <nobr>用户状态</nobr>
             </th>
-            <th style="text-align:center" >
-              <nobr>组织机构</nobr>
-            </th>
           </tr>
 
         </template>
@@ -254,10 +235,9 @@
           </td>
           <td style="text-align:center">{{row.f_user_type}}</td>
           <td style="text-align:center">{{row.f_gasproperties}}</td>
-          <td style="text-align:center">{{row.f_user_phone}}</td>
-          <td style="text-align:center">{{row.f_balance_amount}}</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"><nobr>{{row.f_valvestate}}</nobr></td>
           <td style="text-align:center">
             <nobr>{{row.initinsertdate}}</nobr>
           </td> <td style="text-align:center">
@@ -270,36 +250,46 @@
           </td>
           <td style="text-align:center">{{row.f_meter_brand}}</td>
           <td style="text-align:center">
-            <nobr>{{row.f_meter_style}}</nobr>
+            <nobr>{{row.f_orgname}}</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>
           <!--<td style="text-align:center">{{row.new_days}}</td>-->
           <!--<td style="text-align:center">{{row.f_state}}</td>-->
 
         </template>
       </data-grid>
     </criteria-paged>
-
   </div>
-<!--    <div class="flex-row" v-show="echarts" style="width: 100%;height: 90%;">-->
-<!--      <lost-contact-echarts :groupname="groupname[0]" :condition="condition"-->
-<!--                            :echarts="echarts"></lost-contact-echarts>-->
-<!--    </div>-->
-<!--&lt;!&ndash;  <div v-show="isActiveTotalForm" style="height: 40px;width: 100%;">&ndash;&gt;-->
-<!--&lt;!&ndash;    <button class="button_search button_spacing" @click="notShowTotalForm()">隐藏汇总</button>&ndash;&gt;-->
-<!--&lt;!&ndash;  </div>&ndash;&gt;-->
-<!--  <div class="span" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">-->
-<!--    <lost-contact-eform :condition="condition"-->
-<!--                     ></lost-contact-eform>-->
+  <div v-show="echarts" style="height: 40px;width: 100%;">
+    <div style="display: inline-block;">
+      <button class="button_search button_spacing" @click="notShowEcharts()">隐藏图表</button>
+    </div>
+    <div class="mystyle" style="display: inline-block;">
+      <label class="font_normal_body">图表统计项</label>
+       <v-select style="width:60%" id="Groupname" v-model="groupname"
+                placeholder='分组项'
+                value-single="true"
+                :value.sync="groupname"
+                :options='getgroupname'
+                close-on-select></v-select>
+    </div>
+  </div>
+  <div class="span" v-show="echarts" style="width: 100%;height: 90%;">
+    <lost-contact-echarts :groupname="groupname[0]" :condition="condition"
+                         :echarts="echarts"></lost-contact-echarts>
+  </div>
+<!--  <div v-show="isActiveTotalForm" style="height: 40px;width: 100%;">-->
+<!--    <button class="button_search button_spacing" @click="notShowTotalForm()">隐藏汇总</button>-->
 <!--  </div>-->
+  <div class="span" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">
+    <lost-contact-eform :condition="condition"
+                     ></lost-contact-eform>
   </div>
-  <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>
+  <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>
 
@@ -307,14 +297,14 @@
   import {PagedList} from 'vue-client'
   import UserGasEcharts from './UserGasEcharts'
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
-  import {HttpResetClass} from 'vue-client'
+
   let readySomething = async function (self) {
 
     await self.$MagLoadParams.loadParam()
     self.initParams()
     self.$refs.paged.$refs.cri.model.notappear='不包含'
     self.$refs.paged.$refs.cri.model.SLday1=10
-    self.$refs.paged.$refs.cri.search()
+    // self.$refs.paged.$refs.cri.search()
   }
   export default {
     title: '失联分析',
@@ -328,15 +318,14 @@
           "f_userinfo_code":"客户编号","f_user_name":"客户名称",
           "f_address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质",
           "f_meternumber":"表号",
-          "f_user_phone":"联系电话",
-          "f_balance_amount":"表上剩余金额",
 
           "f_startuse_date":"启用日期",
+          "f_valvestate":"阀门状态",
           "initinsertdate":"初次上报日期",
           "lastinsertdate":"最后上报日期",
           "f_meter_base":"最后表读数",
           "slday":"失联天数",
-          "f_meter_brand":"气表厂家","f_orgname":"组织机构"},
+          "f_meter_brand":"气表厂家","f_orgname":"组织机构","f_user_state":"用户状态"},
         reportStr: null,
         show: false,
         showdetail:false,
@@ -345,13 +334,7 @@
         outlets: [],
         operator: [],
         filename: '',
-        WarningType: [
-          {label: '全部', value: ''}
-        ],
-        Warningstyles: [
-          {label: '全部', value: ''}
-        ],
-        styles:false,
+        meterbrands: [],
         org:[this.$login.f.orgid],
         orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
         echarts: false,
@@ -362,62 +345,18 @@
         getgroupname: [
           {label: '客户类型', value: 'f_user_type'},
           {label: '用气性质', value: 'f_gasproperties'},
-          {label: '分公司', value: 'f_orgname'},
+          {label: '分公司', value: 'f_orgid'},
           {label: '最长失联天数', value: 'max_days_type'},
+          {label: '合计失联天数', value: 'all_days_type'}
         ]
 
       }
     },
     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
-      },
       hidden(){
         this.criteriaShow = !this.criteriaShow
       },
@@ -530,6 +469,9 @@
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
+      ValveState() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')]
+      },
       Gasproperties() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
       },
@@ -545,8 +487,8 @@
       getstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('最新状态')]
       },
-      userstate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
+      user_state(){
+        return [...this.$appdata.getParam('用户状态'),{label:'预备',value:'预备'} ]
       }
     }
   }