manage-client 3.2.83-aode → 3.2.83-jb

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

@@ -1,11 +1,11 @@
 <template lang="html">
-  <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 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>
     <!--图显示模板-->
-    <div class="mystyle" style="display: inline-block;">
+    <div class="row col-sm-3 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 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 style="height: 80%;width: 98%;">
+    <div id="info"></div>
   </div>
   </div>
 </template>
@@ -24,7 +24,6 @@
 <script>
   import * as Util from '../../../Util'
   import co from 'co'
-  import echarts from 'echarts'
   import { HttpResetClass } from 'vue-client'
 
   let getData = function * (self, condition) {
@@ -79,6 +78,7 @@
     },
     methods: {
       set (arrparams, gasdata1, gasdata2) {
+        console.log('--------->>>>>>>>>>>>',arrparams,gasdata1,gasdata2)
         console.log("ec:"+this.echarts)
         let name = ''
         if (this.groupname === 'year')
@@ -91,7 +91,17 @@
         } else {
           name = '日'
         }
-        this.xc = echarts.init(document.getElementById('info'))
+        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.setOption({
           title: {
             text: '用气' + name + '分析图',
@@ -104,7 +114,8 @@
           },
           color: ['#61a0a8', '#2f4554'],
           tooltip: {
-            trigger: 'axis'
+            trigger: 'axis',
+            extraCssText: 'width: auto;height: auto;'
           },
           grid:{
             top:'20%',

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

@@ -1,6 +1,6 @@
 <template lang="html">
-  <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="basic-main" id="unit">
+    <div 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:93%;overflow: scroll;">
-      <table class="table table-bordered" >
+    <div id="table" style="height:600px;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,6 +81,7 @@
         </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>
@@ -103,6 +104,7 @@
       </table>
     </div>
   </div>
+
 </template>
 
 <script>
@@ -131,6 +133,7 @@
     data() {
       return {
         model2: null,
+
         conditionForSql: '1=1',
         nameForSql: [],
         groupNameForSql: '',
@@ -141,6 +144,7 @@
     ready() {
       this.nameForSql=['year']
       this.groupNameForSql= 'year'
+      this.conditionForSql = this.condition
       this.searchData()
     },
     methods: {
@@ -198,9 +202,6 @@
       'nameForSql'() {
         // this.nameForSql =this.groupNameByDate;
         this.getGroupName1()
-      },
-      '$parent.condition'(val) {
-        this.conditionForSql = val
       }
     }
   }

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

@@ -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,25 +81,48 @@
                         close-on-select>
               </v-select>
             </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body">阀门状态</label>
+            <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_valvestate"
-                v-model="model.f_valvestate"
-                :options='$parent.$parent.ValveState'
-                close-on-select condition="f_valvestate ='{}'">
+                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 :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>
+              <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  flex-row" style="white-space: nowrap">
               <label class="font_normal_body">失联天数&nbsp;</label>
@@ -176,15 +199,19 @@
             <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>
@@ -201,6 +228,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>
@@ -221,9 +254,10 @@
           </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">
@@ -235,6 +269,12 @@
             <nobr>{{row.slday}}</nobr>
           </td>
           <td style="text-align:center">{{row.f_meter_brand}}</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>
@@ -244,35 +284,22 @@
         </template>
       </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>
-    <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 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>-->
-  <div class="span" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">
-    <lost-contact-eform :condition="condition"
-                     ></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>
 
@@ -280,14 +307,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: '失联分析',
@@ -301,9 +328,10 @@
           "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":"最后表读数",
@@ -317,7 +345,13 @@
         outlets: [],
         operator: [],
         filename: '',
-        meterbrands: [],
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
         org:[this.$login.f.orgid],
         orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
         echarts: false,
@@ -328,18 +362,62 @@
         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'}
         ]
 
       }
     },
     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
       },
@@ -452,9 +530,6 @@
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-      ValveState() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')]
-      },
       Gasproperties() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
       },
@@ -469,6 +544,9 @@
       },
       getstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('最新状态')]
+      },
+      userstate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
       }
     }
   }

package/src/components/webmeter/WebmeterAnalyse.vue

@@ -0,0 +1,52 @@
+<template>
+  <tab-button class="foot_tabset" :active="-1">
+    <tabs header="指令分析" v-if="permission('指令分析')">
+      <user-instruct-list v-if="show.includes('指令分析')"></user-instruct-list>
+    </tabs>
+    <tabs header="抄表分析" v-if="permission('抄表分析')">
+      <user-gas-list v-if="show.includes('抄表分析')"></user-gas-list>
+    </tabs>
+    <tabs header="异常分析" v-if="permission('异常分析')">
+      <total-exception-by-meter v-if="show.includes('异常分析')"></total-exception-by-meter>
+    </tabs>
+    <tabs header="失联分析" v-if="permission('失联分析')">
+      <lost-contact-analysis-manage v-if="show.includes('失联分析')"></lost-contact-analysis-manage>
+    </tabs>
+    <tabs header="未用气分析" v-if="permission('未用气分析')">
+      <new-webmeter-user-gas-all v-if="show.includes('未用气分析')"></new-webmeter-user-gas-all>
+    </tabs>
+    <tabs header="调价分析" v-if="permission('调价分析')">
+      <price-instruct-manage v-if="show.includes('调价分析')"></price-instruct-manage>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from '../sale/common/TabButton'
+  import Tabs from '../sale/common/Tabs'
+
+  export default {
+    title: '物联分析',
+    data () {
+      return {
+        show: []
+      }
+    },
+    components: {Tabs, TabButton},
+    methods: {
+      permission (name) {
+        // 保留是为了后面可能也会和综合查询一样加权限
+        // if (this.$login.r.find(value => value == '物联查询')) {
+        //   if (!this.$login.r.find(value => value == name)) {
+        //     return false
+        //   }
+        // }
+        return true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/components/webmeter/WebmeterQuery.vue

@@ -0,0 +1,61 @@
+<template>
+  <tab-button class="foot_tabset" :active="-1">
+    <tabs header="指令查询" v-if="permission('指令查询')">
+      <instruct-manage v-if="show.includes('指令查询')"></instruct-manage>
+    </tabs>
+    <tabs header="上报查询" v-if="permission('上报查询')">
+      <report-list v-if="show.includes('上报查询')"></report-list>
+    </tabs>
+    <tabs header="结算查询" v-if="permission('结算查询')">
+      <report-data-query v-if="show.includes('结算查询')"></report-data-query>
+    </tabs>
+    <tabs header="缴费查询" v-if="permission('缴费查询')">
+      <recharge-instruct-query v-if="show.includes('缴费查询')"></recharge-instruct-query>
+    </tabs>
+    <tabs header="异常查询" v-if="permission('异常查询')">
+      <meter-exception-list v-if="show.includes('异常查询')"></meter-exception-list>
+    </tabs>
+    <tabs header="用户失联" v-if="permission('用户失联')">
+      <user-lost-contact-analysis v-if="show.includes('用户失联')"></user-lost-contact-analysis>
+    </tabs>
+    <tabs header="失联查询" v-if="permission('失联查询')">
+      <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
+    </tabs>
+    <tabs header="用气查询" v-if="permission('用气查询')">
+      <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
+    </tabs>
+    <tabs header="未用气查询" v-if="permission('未用气查询')">
+      <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from '../sale/common/TabButton'
+  import Tabs from '../sale/common/Tabs'
+
+  export default {
+    title: '物联查询',
+    data () {
+      return {
+        show: []
+      }
+    },
+    components: {Tabs, TabButton},
+    methods: {
+      permission (name) {
+        // 保留是为了后面可能也会和综合查询一样加权限
+        // if (this.$login.r.find(value => value == '物联查询')) {
+        //   if (!this.$login.r.find(value => value == name)) {
+        //     return false
+        //   }
+        // }
+        return true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/components/webmeter/dataCollection/DataCollection.vue

@@ -238,6 +238,28 @@
                   <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' partial='list' v-ref:grid>
@@ -384,6 +406,30 @@
                          v-if="row.f_xtipllstopflag==='0'" width="17"/>
                   </td>
 
+
+                  <td style="text-align:center">
+                    <nobr>{{row.f_jval}}</nobr>
+                  </td>
+                  <td style="text-align:center">
+                    <nobr>{{row.f_snr}}</nobr>
+                  </td>
+                  <td style="text-align:center">
+                  <nobr>{{row.f_net_provider}}</nobr>
+                  </td>
+                  <td style="text-align:center">
+                    <nobr>{{row.f_magneticInterference,}}</nobr>
+                  </td>
+                  <td style="text-align:center">
+                    <nobr>{{row.f_price}}</nobr>
+                  </td>
+                  <td style="text-align:center">
+                    <nobr>{{row.f_curtotal_fee}}</nobr>
+                  </td>
+                  <td style="text-align:center">
+                    <nobr>{{row.f_using_fee}}</nobr>
+                  </td>
+
+
                 </tr>
               </template>
               <template partial='foot'></template>

package/src/components/webmeter/gasAnalysis/GasAnalysisManage.vue

@@ -153,7 +153,7 @@
   // }
 
   export default {
-    title: '用气分析',
+    title: '',
     props: ['data'],
     components: {GasAnalysisEcharts, GasAnalysisSummary},
     data () {