统计时间bug修改

epmet-oper-web/src/views/modules/dataExport/operStatic.vue

@@ -4,8 +4,7 @@
              class="aui-card--fill">
       <div class="mod-demo__demo}">
         <el-form :inline="true"
-                 :model="tableParams"
+                 :model="tableParams">
-                 @keyup.enter.native="loadData()">
 
           <div>
             <el-form-item label="选择客户"
@@ -36,10 +35,11 @@
             <div>
               <el-form-item label="统计类型"
                             :label-width="labelWidth">
-                <el-radio v-model="tableParams.type"
+                <el-radio-group v-model="tableParams.type"
-                          label="end">截止累计值</el-radio>
+                                @change="handleTypeChange">
-                <el-radio v-model="tableParams.type"
+                  <el-radio label="end">截止累计值</el-radio>
-                          label="Interval">区间新增值</el-radio>
+                  <el-radio label="Interval">区间新增值</el-radio>
+                </el-radio-group>
 
                 <el-date-picker style="margin-left:30px"
                                 v-if="tableParams.type==='Interval'"
@@ -104,12 +104,6 @@ const customerId = localStorage.getItem('customerId')
 export default {
   data () {
     return {
-
-      tableData1: [
-        { 'name': 'lgk', 'sex': '男', 'username': 'liqing' },
-        { 'name': 'll', 'sex': '女', 'username': 'yaoyao' }
-      ],
-
       tableData: [],
 
       downloadLoading: false,
@@ -131,16 +125,6 @@ export default {
         checkStrictly: true
       },
 
-      //组织树
-      agencyUrl: "/gov/org/customeragency/agencylist",//组织树url
-      agencyExpandKeys: [0],//树默认展开节点
-      agencyNodeKey: 0,//树默认选中节点
-      selBtnDisabled: true,
-      treeParams: {
-        customerId: ''
-      },
-
-
       pickerOptions: { //控制时间范围
         disabledDate (time) {
           return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
@@ -200,6 +184,30 @@ export default {
       console.log(value)
       this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
     },
+    handleTypeChange (value) {
+      if (value === 'end') {
+
+        const endTimeArray = util.dateFormatter(this.endTimeModel, 'date').split('-')
+        this.tableParams.startTime = ''
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+
+        this.startTimeShow = ''
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        if (this.timeArray[0]) {
+          const startTimeArray = util.dateFormatter(this.timeArray[0], 'date').split('-')
+          this.tableParams.startTime = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
+          this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        } else {
+          this.tableParams.startTime = ''
+          this.startTimeShow = ''
+        }
+
+        const endTimeArray = util.dateFormatter(this.timeArray[1], 'date').split('-')
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      }
+    },
     initDate () {
       //设置默认结束日期为前一天
       let date = new Date()
@@ -247,10 +255,6 @@ export default {
     handelChangeCustomer (index) {
       this.customerName = this.customerList[index].customerName
       this.getAgencylist()//获取组织级别
-      // debugger
-      this.treeParams.customerId = this.customerList[index].customerId
-      this.selBtnDisabled = false
-      this.$refs['agencyCTreeDialog'].loadData()
 
     },
 
@@ -306,20 +310,6 @@ export default {
       }
     },
 
-    handleAgencyOk (data) {//查询界面——组织弹出树的【确认】
-
-      this.tableParams.agencyId = data.id
-      console.log(this.tableParams.agencyId)
-
-    },
-
-    handleAgencyClear () {//查询界面——组织弹出树的【清空】
-      this.tableParams.agencyId = ""
-      this.$nextTick(() => {
-        this.agencyExpandKeys = [0];
-        this.$refs['agencyCTreeDialog'].loadData(null, 0, this.agencyExpandKeys);
-      })
-    },
 
     validate () {
 

epmet-oper-web/src/views/modules/workPc/gridmemberStatic/gridmemberList.vue

@@ -5,8 +5,7 @@
                class="aui-card--fill">
         <div class="mod-demo__demo}">
           <el-form :inline="true"
-                   :model="tableParams"
+                   :model="tableParams">
-                   @keyup.enter.native="loadTable()">
 
             <div>
 
@@ -24,10 +23,11 @@
               <div>
                 <el-form-item label="统计类型"
                               :label-width="labelWidth">
-                  <el-radio v-model="staticType"
+                  <el-radio-group v-model="staticType"
-                            label="end">截止累计值</el-radio>
+                                  @change="handleTypeChange">
-                  <el-radio v-model="staticType"
+                    <el-radio label="end">截止累计值</el-radio>
-                            label="Interval">区间新增值</el-radio>
+                    <el-radio label="Interval">区间新增值</el-radio>
+                  </el-radio-group>
 
                   <el-date-picker style="margin-left:30px"
                                   v-if="staticType==='Interval'"
@@ -265,11 +265,11 @@ export default {
 
   methods: {
     async initData () {
-      this.startLoading()
+      // this.startLoading()
       this.initDate()
       await this.getAgencylist()//获取组织级联列表
       await this.loadTable()//获取组织级联列表
-      this.endLoading()
+      // this.endLoading()
     },
 
     async getAgencylist () {
@@ -383,6 +383,31 @@ export default {
 
       }
     },
+    handleTypeChange (value) {
+      if (value === 'end') {
+
+        const endTimeArray = util.dateFormatter(this.endTimeModel, 'date').split('-')
+        this.tableParams.startTime = ''
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+
+        this.startTimeShow = ''
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+
+        if (this.timeArray[0]) {
+          const startTimeArray = util.dateFormatter(this.timeArray[0], 'date').split('-')
+          this.tableParams.startTime = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
+          this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        } else {
+          this.tableParams.startTime = ''
+          this.startTimeShow = ''
+        }
+
+        const endTimeArray = util.dateFormatter(this.timeArray[1], 'date').split('-')
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      }
+    },
 
     handleSizeChange (val) {
       this.tableParams.pageSize = val
@@ -447,6 +472,7 @@ export default {
 
 
     validate () {
+
       if (this.staticType === 'Interval' && (!this.tableParams.endTime || !this.tableParams.startTime)) {
         this.$message.info("请选择起止日期")
         return false

epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue

@@ -5,8 +5,7 @@
                class="aui-card--fill">
         <div class="mod-demo__demo}">
           <el-form :inline="true"
-                   :model="tableParams"
+                   :model="tableParams">
-                   @keyup.enter.native="loadTable()">
 
             <div>
 
@@ -24,10 +23,11 @@
               <div>
                 <el-form-item label="统计类型"
                               :label-width="labelWidth">
-                  <el-radio v-model="staticType"
+                  <el-radio-group v-model="staticType"
-                            label="end">截止累计值</el-radio>
+                                  @change="handleTypeChange">
-                  <el-radio v-model="staticType"
+                    <el-radio label="end">截止累计值</el-radio>
-                            label="Interval">区间新增值</el-radio>
+                    <el-radio label="Interval">区间新增值</el-radio>
+                  </el-radio-group>
 
                   <el-date-picker style="margin-left:30px"
                                   v-if="staticType==='Interval'"
@@ -64,6 +64,7 @@
           </el-form>
 
           <el-table :data="tableData"
+                    v-loading="tableLoading"
                     ref="ref_table"
                     style="width: 100%;margin-bottom: 20px;"
                     row-key="categoryCode"
@@ -136,7 +137,7 @@ export default {
     return {
       flag: "classify",//页面标识
       tableData: [],
-
+      tableLoading: false,
       downloadLoading: false,
 
       //查询条件标题宽度
@@ -186,11 +187,11 @@ export default {
 
   methods: {
     async initData () {
-      this.startLoading()
+
       this.initDate()
       await this.getAgencylist()//获取组织级联列表
       await this.loadTable()//获取组织级联列表
-      this.endLoading()
+
     },
 
     async getAgencylist () {
@@ -239,7 +240,11 @@ export default {
         if (this.staticType === 'end') {
           this.tableParams.startTime = ''
         }
+
+        this.tableLoading = true
+
         const { data, code, msg } = await requestPost(url, this.tableParams)
+        this.tableLoading = false
         if (code === 0) {
           this.tableData = data
 
@@ -282,7 +287,7 @@ export default {
       date.setTime(date.getTime() - 24 * 60 * 60 * 1000);
       const month = date.getMonth() + 1 > 9 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)
       const day = date.getDate() > 9 ? (date.getDate()) : '0' + (date.getDate())
-      
+
       const yesterday = date.getFullYear() + '-' + month + '-' + day
       this.timeArray = ['', yesterday]
       this.endTimeModel = yesterday
@@ -294,7 +299,30 @@ export default {
       this.endTimeShow = yesterdayArray[0] + '年' + yesterdayArray[1] + '月' + yesterdayArray[2] + '日'
     },
 
+    handleTypeChange (value) {
+      if (value === 'end') {
 
+        const endTimeArray = util.dateFormatter(this.endTimeModel, 'date').split('-')
+        this.tableParams.startTime = ''
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+
+        this.startTimeShow = ''
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        if (this.timeArray[0]) {
+          const startTimeArray = util.dateFormatter(this.timeArray[0], 'date').split('-')
+          this.tableParams.startTime = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
+          this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        } else {
+          this.tableParams.startTime = ''
+          this.startTimeShow = ''
+        }
+
+        const endTimeArray = util.dateFormatter(this.timeArray[1], 'date').split('-')
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      }
+    },
     handleEndTimeChange (item) {
       if (item) {
         const endTimeArray = util.dateFormatter(item, 'date').split('-')
@@ -327,6 +355,7 @@ export default {
 
 
     validate () {
+
       if (this.staticType === 'Interval' && (!this.tableParams.endTime || !this.tableParams.startTime)) {
         this.$message.info("请选择起止日期")
         return false

epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue

@@ -4,8 +4,7 @@
              class="aui-card--fill">
       <div class="mod-demo__demo}">
         <el-form :inline="true"
-                 :model="tableParams"
+                 :model="tableParams">
-                 @keyup.enter.native="loadTable()">
 
           <div>
             <el-form-item style="margin-left:10px">
@@ -30,10 +29,11 @@
             <div>
               <el-form-item label="统计类型"
                             :label-width="labelWidth">
-                <el-radio v-model="staticType"
+                <el-radio-group v-model="staticType"
-                          label="end">截止累计值</el-radio>
+                                @change="handleTypeChange">
-                <el-radio v-model="staticType"
+                  <el-radio label="end">截止累计值</el-radio>
-                          label="Interval">区间新增值</el-radio>
+                  <el-radio label="Interval">区间新增值</el-radio>
+                </el-radio-group>
 
                 <el-date-picker style="margin-left:30px"
                                 v-if="staticType==='Interval'"
@@ -319,7 +319,30 @@ export default {
       this.tableParams.endTime = yesterdayArray[0] + yesterdayArray[1] + yesterdayArray[2]
       this.endTimeShow = yesterdayArray[0] + '年' + yesterdayArray[1] + '月' + yesterdayArray[2] + '日'
     },
+    handleTypeChange (value) {
+      if (value === 'end') {
 
+        const endTimeArray = util.dateFormatter(this.endTimeModel, 'date').split('-')
+        this.tableParams.startTime = ''
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+
+        this.startTimeShow = ''
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        if (this.timeArray[0]) {
+          const startTimeArray = util.dateFormatter(this.timeArray[0], 'date').split('-')
+          this.tableParams.startTime = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
+          this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        } else {
+          this.tableParams.startTime = ''
+          this.startTimeShow = ''
+        }
+
+        const endTimeArray = util.dateFormatter(this.timeArray[1], 'date').split('-')
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      }
+    },
 
     handleEndTimeChange (item) {
       if (item) {

epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/searchBar.vue

@@ -32,10 +32,11 @@
             <div>
               <el-form-item label="统计类型"
                             :label-width="labelWidth">
-                <el-radio v-model="staticType"
+                <el-radio-group v-model="staticType"
-                          label="end">截止累计值</el-radio>
+                                @change="handleTypeChange">
-                <el-radio v-model="staticType"
+                  <el-radio label="end">截止累计值</el-radio>
-                          label="Interval">区间新增值</el-radio>
+                  <el-radio label="Interval">区间新增值</el-radio>
+                </el-radio-group>
 
                 <el-date-picker style="margin-left:30px"
                                 v-if="staticType==='Interval'"
@@ -329,7 +330,30 @@ export default {
 
       this.endTimeShow = yesterdayArray[0] + '年' + yesterdayArray[1] + '月' + yesterdayArray[2] + '日'
     },
+    handleTypeChange (value) {
+      if (value === 'end') {
 
+        const endTimeArray = util.dateFormatter(this.endTimeModel, 'date').split('-')
+        this.tableParams.startTime = ''
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+
+        this.startTimeShow = ''
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        if (this.timeArray[0]) {
+          const startTimeArray = util.dateFormatter(this.timeArray[0], 'date').split('-')
+          this.tableParams.startTime = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
+          this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        } else {
+          this.tableParams.startTime = ''
+          this.startTimeShow = ''
+        }
+
+        const endTimeArray = util.dateFormatter(this.timeArray[1], 'date').split('-')
+        this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+        this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      }
+    },
 
     handleEndTimeChange (item) {
       if (item) {