bug修复

ems-ui-cloud/src/views/basecfg/device/model.vue

@@ -241,7 +241,8 @@
             </el-row>
             <el-table v-loading="loading" :data="eventList">
               <el-table-column type="selection" width="55" align="center"/>
-              <el-table-column label="事件名称" align="center" prop="eventKey"/>
+              <el-table-column label="事件名称" align="center" prop="eventName"/>
+              <el-table-column label="事件标识" align="center" prop="eventKey"/>
               <el-table-column label="事件类型" align="center" prop="eventType">
                 <template slot-scope="scope">
                   <span>{{ scope.row.eventType === 1 ? '消息上报' : '异常告警' }}</span>
@@ -266,8 +267,11 @@
             <!-- 添加或修改事件对话框 -->
             <el-dialog :title="title" :visible.sync="eventOpen" width="500px" append-to-body>
               <el-form ref="eventForm" :model="eventForm" :rules="eventRules" label-width="80px">
-                <el-form-item label="事件名称" prop="eventKey">
-                  <el-input v-model="eventForm.eventKey" placeholder="请输入事件名称"/>
+                <el-form-item label="事件名称" prop="eventName">
+                  <el-input v-model="eventForm.eventName" placeholder="请输入事件名称"/>
+                </el-form-item>
+                <el-form-item label="事件标识" prop="eventKey">
+                  <el-input v-model="eventForm.eventKey" placeholder="请输入事件标识"/>
                 </el-form-item>
                 <el-form-item label="事件类型" prop="eventType">
                   <el-select v-model="eventForm.eventType" placeholder="请选择对象类型">

ems-ui-cloud/src/views/basecfg/price/index.vue

@@ -129,9 +129,9 @@
           <el-table-column label="电压等级" align="center" prop="voltageLevel" />
           <el-table-column label="单位电价" align="center" prop="degreePrice" />
           <el-table-column label="峰谷电价" align="center">
-            <el-table-column label="低谷时段" align="center" prop="fsLowDegreePrice" />
-            <el-table-column label="尖峰时段" align="center" prop="fsPeakDegreePrice" />
-            <el-table-column label="高峰时段" align="center" prop="fsHighDegreePrice" />
+            <el-table-column label="低谷段" align="center" prop="fsLowDegreePrice" />
+            <el-table-column label="尖峰段" align="center" prop="fsPeakDegreePrice" />
+            <el-table-column label="高峰段" align="center" prop="fsHighDegreePrice" />
           </el-table-column>
           <el-table-column label="容(需)量用电价格" align="center">
             <el-table-column label="最大需量 (元/千瓦时·月)" align="center" prop="maxReqPrice" width="80px" />
@@ -164,16 +164,16 @@
             <el-form-item label="电压等级" prop="voltageLevel">
               <el-input v-model="gwPriceForm.voltageLevel" placeholder="请输入电压等级" />
             </el-form-item>
-            <el-form-item label="单位电价" prop="degreePrice">
+            <el-form-item label="单位电价（平段）" prop="degreePrice">
               <el-input v-model="gwPriceForm.degreePrice" placeholder="请输入电度用电价格" />
             </el-form-item>
-            <el-form-item label="尖峰时段价格" prop="fsPeakDegreePrice">
+            <el-form-item label="尖峰段价格" prop="fsPeakDegreePrice">
               <el-input v-model="gwPriceForm.fsPeakDegreePrice" placeholder="请输入分时尖峰时段价格" />
             </el-form-item>
-            <el-form-item label="高峰时段价格" prop="fsHighDegreePrice">
+            <el-form-item label="高峰段价格" prop="fsHighDegreePrice">
               <el-input v-model="gwPriceForm.fsHighDegreePrice" placeholder="请输入分时高峰时段价格" />
             </el-form-item>
-            <el-form-item label="低谷时段价格" prop="fsLowDegreePrice">
+            <el-form-item label="低谷段价格" prop="fsLowDegreePrice">
               <el-input v-model="gwPriceForm.fsLowDegreePrice" placeholder="请输入分时低谷时段价格" />
             </el-form-item>
             <el-form-item label="最大需量用电价格" prop="maxReqPrice" v-if="gwPriceForm.elecType === 4">

ems-ui-cloud/src/views/devmgr/meterData/index.vue

@@ -49,39 +49,51 @@
           <div slot="header" class="clearfix">
             <span>用电统计</span>
           </div>
+
+
           <el-table :data="[numElecMeterHData]" border style="width: 100%">
             <!-- 第一行：用电量 -->
-            <el-table-column label="低谷-用量(千瓦时)" align="center">
+            <el-table-column label="" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.lowElec.quantity ? scope.row.lowElec.quantity.toFixed(2) : '0.00' }}</span>
+                <span>{{ '电量（千瓦时）' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合计" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.total.quantity ? scope.row.total.quantity.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="平峰-用量(千瓦时)" align="center">
+            <el-table-column label="平段" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.normalElec.quantity ? scope.row.normalElec.quantity.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="高峰-用量(千瓦时)" align="center">
+            <el-table-column label="谷段" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.highElec.quantity ? scope.row.highElec.quantity.toFixed(2) : '0.00' }}</span>
+                <span>{{ scope.row.lowElec.quantity ? scope.row.lowElec.quantity.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="尖峰-用量(千瓦时)" align="center">
+            <el-table-column label="峰段" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.peakElec.quantity ? scope.row.peakElec.quantity.toFixed(2) : '0.00' }}</span>
+                <span>{{ scope.row.highElec.quantity ? scope.row.highElec.quantity.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="合计电量(千瓦时)" align="center">
+            <el-table-column label="尖峰段" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.total.quantity ? scope.row.total.quantity.toFixed(2) : '0.00' }}</span>
+                <span>{{ scope.row.peakElec.quantity ? scope.row.peakElec.quantity.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
           </el-table>
           <!-- 第二行：总金额 -->
-          <el-table :data="[numElecMeterHData]" border style="width: 100%; margin-top: 10px">
-            <el-table-column label="低谷-金额(元)" align="center">
+          <el-table :data="[numElecMeterHData]" border style="width: 100%; margin-top: 10px" :show-header="false">
+            <el-table-column label="" align="center" >
               <template slot-scope="scope">
-                <span>{{ scope.row.lowElec.useCost ? scope.row.lowElec.useCost.toFixed(2) : '0.00' }}</span>
+                <span>{{ '金额（元）' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合计" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.total.useCost ? scope.row.total.useCost.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="平峰-金额(元)" align="center">
@@ -89,26 +101,25 @@
                 <span>{{ scope.row.normalElec.useCost ? scope.row.normalElec.useCost.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="高峰-金额(元)" align="center">
+            <el-table-column label="低谷段" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.highElec.useCost ? scope.row.highElec.useCost.toFixed(2) : '0.00' }}</span>
+                <span>{{ scope.row.lowElec.useCost ? scope.row.lowElec.useCost.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="尖峰-金额(元)" align="center">
+            <el-table-column label="高峰段" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.peakElec.useCost ? scope.row.peakElec.useCost.toFixed(2) : '0.00' }}</span>
+                <span>{{ scope.row.highElec.useCost ? scope.row.highElec.useCost.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="合计金额(元)" align="center">
+            <el-table-column label="尖峰段" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.total.useCost ? scope.row.total.useCost.toFixed(2) : '0.00' }}</span>
+                <span>{{ scope.row.peakElec.useCost ? scope.row.peakElec.useCost.toFixed(2) : '0.00' }}</span>
               </template>
             </el-table-column>
           </el-table>
         </el-card>
 
         <el-table v-if="activeTab === 'first'" v-loading="loading" :data="elecMeterHList">
-          <el-table-column type="selection" width="55" align="center"/>
           <el-table-column label="表计名称" align="left" prop="deviceName" width="250px"/>
           <el-table-column label="表计编号" align="left" prop="deviceCode"/>
           <el-table-column label="抄表时间" align="center" prop="recordTime" width="180">
@@ -116,9 +127,9 @@
               <span>{{ formatDateTime(scope.row.recordTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="计量类型" align="center" prop="meterType">
+          <el-table-column label="计量时段" align="center" prop="meterType">
             <template slot-scope="scope">
-              <span>{{ getElecMeterType(scope.row.meterType) + "( "+scope.row.meterUnitPrice + " )"}}</span>
+              <span>{{ getElecMeterType(scope.row.meterType) + "( " + scope.row.meterUnitPrice + " )"}}</span>
             </template>
           </el-table-column>
 
@@ -481,10 +492,10 @@ export default {
     },
     getElecMeterType(meterType) {
       const meterTypeMap = {
-        '-1': '低谷电',
-        '0': '平峰电',
-        '1': '高峰电',
-        '2': '尖峰电'
+        '-1': '谷段',
+        '0': '平段',
+        '1': '峰段',
+        '2': '尖峰段'
       }
       return meterTypeMap[meterType] || '未知'
     }

ems-ui-cloud/src/views/devmgr/meterRead/index.vue

@@ -281,10 +281,9 @@ export default {
     },
 
     getHistoryList() {
-      const { areaCode, deviceCode } = this.curRow
+
       listMeterReadingByParam({
-        areaCode,
-        deviceCode,
+        deviceCode: this.recListForm.deviceCode,
         year: this.recListForm.year,
         orderFlag: 'desc'
       }).then(response => {