manage-client 3.2.59-aode → 3.2.60-aode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.59-aode",
+  "version": "3.2.60-aode",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

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

@@ -121,7 +121,18 @@
                           :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>
@@ -215,7 +226,9 @@
             <th style="text-align:center">
               <nobr>启用日期</nobr>
             </th>
-
+            <th style="text-align:center">
+              <nobr>阀门状态</nobr>
+            </th>
             <th style="text-align:center">
               <nobr>应报天数</nobr>
             </th>
@@ -250,7 +263,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">
@@ -306,19 +319,21 @@
   import UserGasEcharts from './UserGasEcharts'
   import * as Util from '../../../Util'
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+  import {toStandardYearMonth, toStandardYearMonth1} from "../../../Util";
 
   let readySomething = async function (self) {
 
     await self.$MagLoadParams.loadParam()
     self.initParams()
     let year = new Date().getFullYear()
-    self.$refs.paged.$refs.cri.model.startDate =  year+'-01-01 00:00:00'
+    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 = 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: '失联分析',
@@ -334,7 +349,7 @@
           "f_userinfo_code":"客户编号","f_user_name":"客户名称",
           "f_address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质",
           "f_meternumber":"表号",
-
+          "f_valvestate":"阀门状态",
           "f_startuse_date":"启用日期",
           "ybdays":"应报天数",
           "sbdays":"实报天数",
@@ -469,6 +484,9 @@
       // usertypes () {
       //   return this.$appdate.getParams("客户类型")
       // },
+      ValveState() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')]
+      },
       getCondition() {
         let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
         return {

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

@@ -81,6 +81,18 @@
                         close-on-select>
               </v-select>
             </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">
               <label class="font_normal_body">气表品牌</label>
               <v-select :value.sync="model.f_meter_brand"
@@ -170,7 +182,9 @@
             <th style="text-align:center">
               <nobr>启用日期</nobr>
             </th>
-
+            <th style="text-align:center" >
+              <nobr>阀门状态</nobr>
+            </th>
             <th style="text-align:center" >
               <nobr>初次上报日期</nobr>
             </th>
@@ -209,6 +223,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"><nobr>{{row.f_valvestate}}</nobr></td>
           <td style="text-align:center">
             <nobr>{{row.initinsertdate}}</nobr>
           </td> <td style="text-align:center">
@@ -272,7 +287,7 @@
     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: '失联分析',
@@ -288,6 +303,7 @@
           "f_meternumber":"表号",
 
           "f_startuse_date":"启用日期",
+          "f_valvestate":"阀门状态",
           "initinsertdate":"初次上报日期",
           "lastinsertdate":"最后上报日期",
           "f_meter_base":"最后表读数",
@@ -436,6 +452,9 @@
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
+      ValveState() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')]
+      },
       Gasproperties() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
       },