字段修改

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

@@ -111,8 +111,8 @@
           <div v-if="callLogDetailData">
             <p><strong>对象编号：</strong>{{ callLogDetailData.objCode }}</p>
             <p><strong>对象名称：</strong>{{ callLogDetailData.objName }}</p>
-            <p><strong>设备模型：</strong>{{ callLogDetailData.modelName }}({{ callLogDetailData.modelCode }})</p>
-            <p><strong>对象能力：</strong>{{ callLogDetailData.abilityName }}({{ callLogDetailData.abilityKey}})</p>
+            <p><strong>设备模型：</strong>{{ callLogDetailData.modelName + " (" + callLogDetailData.modelCode + ")"}}</p>
+            <p><strong>对象能力：</strong>{{ callLogDetailData.abilityName + " (" + callLogDetailData.abilityKey + ")"}}</p>
             <p><strong>调用时间：</strong>{{ callLogDetailData.callTime }}</p>
             <p><strong>响应时间：</strong>{{ callLogDetailData.resTime }}</p>
             <p><strong>调用结果：</strong>{{ formatCallStatus(callLogDetailData.callStatus) }}</p>
@@ -172,14 +172,13 @@
                 <el-input v-model="form.deviceName" placeholder="请输入设备名称"/>
               </el-form-item>
               <el-form-item label="功能类型" prop="psCode" v-if="queryParams.deviceCategory === 'W'">
-                <el-select v-model="form.psCode">
+                <el-select v-model="form.psCode" clearable>
                   <el-option v-for="item in devOptions" :label="item.psName" :value="item.psCode"
                              :key="item.psCode"
                   />
                 </el-select>
               </el-form-item>
               <el-form-item label="设备模型" prop="deviceModel">
-
                 <el-select v-model="form.deviceModel" style="width:100%" @change="handleModelChange" clearable>
                   <el-option
                     v-for="item in modelList"
@@ -353,16 +352,16 @@
         </el-drawer>
 
         <!-- 详情弹框 -->
-        <el-dialog :visible.sync="showDrawer" title="设备详情" custom-class="detail-dialog">
+        <el-dialog :visible.sync="showDrawer" title="设备详情" width="65%" custom-class="detail-dialog">
           <div v-if="curRow">
             <!-- 分页导航 -->
             <el-tabs v-model="activeTab">
               <el-tab-pane label="设备基本信息" name="basic"></el-tab-pane>
               <el-tab-pane label="设备参数" name="attr"></el-tab-pane>
-              <el-tab-pane label="设备事件" name="event"></el-tab-pane>
               <el-tab-pane label="设备能力" name="ability"></el-tab-pane>
+              <el-tab-pane label="事件日志" name="eventLog"></el-tab-pane>
               <el-tab-pane label="调用日志" name="callLog"></el-tab-pane>
-              <el-tab-pane label="设备日志" name="reportLog"></el-tab-pane>
+              <el-tab-pane label="上报日志" name="reportLog"></el-tab-pane>
             </el-tabs>
 
             <!-- 设备基本信息 -->
@@ -460,8 +459,8 @@
                 <el-button @click="cancelAbilityEdit">取消</el-button>
               </div>
             </el-dialog>
-            <!-- 设备事件= -->
-            <div v-if="activeTab === 'event'">
+            <!-- 设备事件日志= -->
+            <div v-if="activeTab === 'eventLog'">
               <el-card class="box-card">
                 <div slot="header" class="clearfix">
                   <span class="section-title">设备事件</span>
@@ -482,7 +481,7 @@
                   <el-form-item label="记录时间">
                     <el-date-picker
                       v-model="callDaterangeTime"
-                      style="width: 240px"
+                      style="width: 355px"
                       value-format="yyyy-MM-dd HH:mm"
                       type="datetimerange"
                       range-separator="-"
@@ -491,7 +490,7 @@
                     ></el-date-picker>
                   </el-form-item>
                   <el-form-item label="能力标识">
-                    <el-select v-model="callLogQueryParams.abilityKey" placeholder="请选择能力标识" clearable>
+                    <el-select v-model="callLogQueryParams.abilityKey" style="width: 200px;" clearable>
                       <el-option
                         v-for="item in abilityData"
                         :key="item.abilityKey"
@@ -500,8 +499,8 @@
                       ></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="调用状态">
-                    <el-select v-model="callLogQueryParams.callStatus" placeholder="请选择调用状态" clearable>
+                  <el-form-item label="调用状态" >
+                    <el-select v-model="callLogQueryParams.callStatus" style="width: 100px;" clearable>
                       <el-option
                         v-for="(value, key) in callStatusOptions"
                         :key="key"

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

@@ -127,12 +127,11 @@
         <el-table v-loading="loading" :data="gwPriceList">
           <el-table-column label="用电分类" align="center" prop="elecTypeName" />
           <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="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="fsFlatDegreePrice" />
-            <el-table-column label="低谷时段" align="center" prop="fsLowDegreePrice" />
           </el-table-column>
           <el-table-column label="容(需)量用电价格" align="center">
             <el-table-column label="最大需量 (元/千瓦时·月)" align="center" prop="maxReqPrice" width="80px" />
@@ -165,7 +164,7 @@
             <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">
@@ -174,9 +173,6 @@
             <el-form-item label="高峰时段价格" prop="fsHighDegreePrice">
               <el-input v-model="gwPriceForm.fsHighDegreePrice" placeholder="请输入分时高峰时段价格" />
             </el-form-item>
-            <el-form-item label="平峰时段价格" prop="fsFlatDegreePrice">
-              <el-input v-model="gwPriceForm.fsFlatDegreePrice" placeholder="请输入分时平峰时段价格" />
-            </el-form-item>
             <el-form-item label="低谷时段价格" prop="fsLowDegreePrice">
               <el-input v-model="gwPriceForm.fsLowDegreePrice" placeholder="请输入分时低谷时段价格" />
             </el-form-item>
@@ -546,7 +542,8 @@ export default {
       gwPriceRules: {
         cfgCode: [{ required: true, message: '配置代码不为空', trigger: 'blur' }],
         elecType: [{ required: true, message: '请选择用电分类', trigger: 'change' }],
-        voltageLevel: [{ required: true, message: '电压等级不为空', trigger: 'blur' }]
+        voltageLevel: [{ required: true, message: '电压等级不为空', trigger: 'blur' }],
+        degreePrice: [{ required: true, message: '单位电价不为控', trigger: 'blur' }]
       },
       // 表单校验
       attrRules: {
@@ -690,7 +687,6 @@ export default {
         degreePrice: null,
         fsPeakDegreePrice: null,
         fsHighDegreePrice: null,
-        fsFlatDegreePrice: null,
         fsLowDegreePrice: null,
         maxReqPrice: null,
         transCapacityPrice: null

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

@@ -25,7 +25,7 @@
         </el-tabs>
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="68px">
-          <el-form-item label="记录时间">
+          <el-form-item label="抄表周期">
             <el-date-picker
               v-model="daterangeRecordTime"
               style="width: 240px"
@@ -51,27 +51,27 @@
           </div>
           <el-table :data="[numElecMeterHData]" border style="width: 100%">
             <!-- 第一行：用电量 -->
-            <el-table-column label="低谷电(kW·h)" 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>
               </template>
             </el-table-column>
-            <el-table-column label="平峰电(kW·h)" 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="高峰电(kW·h)" 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>
               </template>
             </el-table-column>
-            <el-table-column label="尖峰电(kW·h)" 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>
               </template>
             </el-table-column>
-            <el-table-column label="总计(kW·h)" 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>
               </template>
@@ -79,27 +79,27 @@
           </el-table>
           <!-- 第二行：总金额 -->
           <el-table :data="[numElecMeterHData]" border style="width: 100%; margin-top: 10px">
-            <el-table-column label="低谷电(元)" align="center">
+            <el-table-column label="低谷-金额(元)" align="center">
               <template slot-scope="scope">
                 <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.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>
               </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>
               </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>
               </template>