manage-client 3.3.250 → 3.3.251

package/package.json

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

package/src/filiale/WEINAN/UserGasAll.vue

@@ -109,22 +109,22 @@
                     <label class="font_normal_body">时间区间</label>
                     <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
                                 :show-reset-button="reset"
-                                :value.sync="$parent.$parent.startDate1"
+                                :value.sync="$parent.$parent.startDate"
                                 id="startDate"
                                 style="width:60%"
                                 placeholder="开始时间"
-                                v-model="$parent.$parent.startDate1">
+                                v-model="$parent.$parent.startDate">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
                     <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
                                 :show-reset-button="reset"
-                                :value.sync="$parent.$parent.endDate1"
+                                :value.sync="$parent.$parent.endDate"
                                 style="width:60%"
                                 id="endDate"
                                 placeholder="结束日期"
-                                v-model="$parent.$parent.endDate1">
+                                v-model="$parent.$parent.endDate">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
@@ -406,13 +406,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
         operator: [],
         filename: '',
         searchshow: true,
-        startDate1:'',
-        endDate1:'',
         userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
-        // startDate: '',
-        // endDate: '',
+        startDate: '',
+        endDate: '',
         echarts: false,
         isActiveTotalForm: false,
         condition: '1=1',
@@ -456,14 +454,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
       }
     },
     ready() {
-        readyGen(this)
-      console.log('444444444', Util.addDate(new Date(),-6).substring(0,10))
-      this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-4).substring(0,10) + ' 00:00:00'
-        this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-      this.startDate1 = Util.addDate(new Date(),-4).substring(0,10)
-      this.endDate1 = Util.toStandardDateString()
-        // this.$refs.paged.$refs.cri.search()
-        this.getfield = this.config.excelHeaders
+      readyGen(this)
+      this.getfield = this.config.excelHeaders
+      this.startDate = Util.addDate(new Date(),-4).substring(0,10) + ' 00:00:00'
+      this.endDate = Util.toStandardDateString() + ' 23:59:59'
     },
     methods: {
       userUseTypeChange () {
@@ -536,8 +530,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
       search(args) {
         // this.startDate = this.$refs.paged.$refs.cri.model.startDate
         // this.endDate = this.$refs.paged.$refs.cri.model.endDate
-        this.$refs.paged.$refs.cri.model.startDate = this.startDate1 + ' 00:00:00'
-        this.$refs.paged.$refs.cri.model.endDate = this.endDate1 + ' 23:59:59'
+        this.$refs.paged.$refs.cri.model.startDate = this.startDate
+        this.$refs.paged.$refs.cri.model.endDate = this.endDate
         console.log('--------------------', args)
         console.log('--------------------', this)
         if (this.endDate1 == '' || this.startDate1 == '') {
@@ -603,12 +597,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
       }
     },
     computed: {
-      startDate(){
-        return this.startDate1 + ' 00:00:00'
-      },
-      endDate(){
-        return this.endDate1 + ' 23:59:59'
-      },
       houseTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
       },

package/src/filiale/ningjin/MeterExceptionList.vue

@@ -47,7 +47,7 @@
                                 <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
                                 <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                                               :field="$parent.$parent.getfield"
-                                              sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="DrillErrorByUserinfo" template-name='异常分析'
+                                              sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="getExceptionList" template-name='异常分析'
                                               :choose-col="true"></export-excel>
                                 <!--<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>-->