Merge remote-tracking branch 'origin/master'

src/views/module_ems/energyAnalyse/components/commonSearch.vue

@@ -36,12 +36,10 @@
             <a-date-picker
               v-if="type === 'day'"
               v-model="queryParams.day"
-              :editable="false"
-              :clearable="false"
-              value-format="yyyy-MM-dd"
-              type="date"
+              format="YYYY-MM-DD"
+              value-format="yyyy-MM-DD"
               placeholder="选择日期"
-            >
+              >
             </a-date-picker>
           </a-form-item>
         </a-col>

src/views/module_ems/energyAnalyse/energyItem/index.vue

@@ -11,12 +11,12 @@
               <div class="name">当日用能(KWh)</div>
               <div class="value">{{ itemizedStatistics.nowDay }}</div>
             </div>
-            <el-divider direction="vertical"></el-divider>
+            <a-divider type="vertical" />
             <div class="item-info">
               <div class="name">昨日用能(KWh)</div>
               <div class="value">{{ itemizedStatistics.lastDay }}</div>
             </div>
-            <el-divider direction="vertical"></el-divider>
+            <a-divider type="vertical" />
             <div class="item-info">
               <div class="name">环比</div>
               <div class="value">{{ itemizedStatistics.huanbiDay }}%</div>
@@ -33,12 +33,12 @@
               <div class="name">当周用能(KWh)</div>
               <div class="value">{{ itemizedStatistics.nowWeek }}</div>
             </div>
-            <el-divider direction="vertical"></el-divider>
+            <a-divider type="vertical" />
             <div class="item-info">
               <div class="name">上周用能(KWh)</div>
               <div class="value">{{ itemizedStatistics.lastWeek }}</div>
             </div>
-            <el-divider direction="vertical"></el-divider>
+            <a-divider type="vertical" />
             <div class="item-info">
               <div class="name">环比</div>
               <div class="value">{{ itemizedStatistics.huanbiWeek }}%</div>
@@ -54,12 +54,12 @@
               <div class="name">当月用能(KWh)</div>
               <div class="value">{{ itemizedStatistics.nowMonth }}</div>
             </div>
-            <el-divider direction="vertical"></el-divider>
+            <a-divider type="vertical" />
             <div class="item-info">
               <div class="name">上月用能(KWh)</div>
               <div class="value">{{ itemizedStatistics.lastMonth }}</div>
             </div>
-            <el-divider direction="vertical"></el-divider>
+            <a-divider type="vertical" />
             <div class="item-info">
               <div class="name">环比</div>
               <div class="value">{{ itemizedStatistics.huanbiMonth }}%</div>
@@ -118,12 +118,11 @@
       })
     },
     methods: {
-      async getItemizedenergy(){
+      getItemizedenergy(){
         this.loading = true
         var data = this.$refs.commonSearch.queryParams
-        await getAction(this.url.list, data).then(response => {
+        getAction(this.url.list, data).then(response => {
           if(response.success){
-            this.$message.success(response.message);
             var listData = response.result
             // 日
             this.itemizedStatistics.nowDay = (listData.dayStatistics.find(item=>item.type === '当日用能')).howManyValue
@@ -173,18 +172,15 @@
             this.dongli = listData.dongli
             this.zhaoming = listData.zhaoming
             this.qita = listData.qita
-            this.loading = false
-
           }else{
             this.$message.warning(response.message);
-            this.loading = false
           }
         }).finally(() => {
           this.initDayPieCharts()
           this.initWeekPieCharts()
           this.initMonthPieCharts()
           this.initEcharts()
-          // this.loading = false
+          this.loading = false
         })
       },
       initDayPieCharts(){