样式修改

ems-ui-cloud/src/views/adapter/pv/index.vue

@@ -184,7 +184,7 @@
             </el-form-item>
 
 
-            <el-form-item label="设备工艺" prop="psCode" v-if="queryParams.deviceCategory === 'W'">
+            <el-form-item label="功能类型" prop="psCode" v-if="queryParams.deviceCategory === 'W'">
               <el-select v-model="form.psCode">
                 <el-option v-for="item in devOptions" :label="item.psName" :value="item.psCode"
                            :key="item.psCode"

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

@@ -46,7 +46,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="设备工艺" prop="psCode" v-if="queryParams.deviceCategory === 'W'">
+          <el-form-item label="功能类型" prop="psCode" v-if="queryParams.deviceCategory === 'W'">
             <el-select v-model="queryParams.psCode">
               <el-option v-for="item in devOptions" :label="item.psName" :value="item.psCode" :key="item.psCode"/>
             </el-select>
@@ -171,7 +171,7 @@
               <el-form-item label="设备名称" prop="deviceName">
                 <el-input v-model="form.deviceName" placeholder="请输入设备名称"/>
               </el-form-item>
-              <el-form-item label="设备工艺" prop="psCode" v-if="queryParams.deviceCategory === 'W'">
+              <el-form-item label="功能类型" prop="psCode" v-if="queryParams.deviceCategory === 'W'">
                 <el-select v-model="form.psCode">
                   <el-option v-for="item in devOptions" :label="item.psName" :value="item.psCode"
                              :key="item.psCode"
@@ -374,13 +374,12 @@
                 <div>
                   <p><span class="bold">设备名称：</span>{{ curRow.deviceName }}</p>
                   <p><span class="bold">设备代码：</span>{{ curRow.deviceCode }}</p>
-                  <p><span class="bold">子系统：</span>{{ curRow.subsystemName }}</p>
-                  <p><span class="bold">设备类型：</span>{{ curRow.deviceCategoryName }}</p>
+                  <p><span class="bold">归属设施：</span>{{ curRow.refFacsName }}</p>
+                  <p><span class="bold">设备分类：</span>{{ curRow.deviceCategoryName + '-' + curRow.psName}}</p>
                   <p><span class="bold">归属区域：</span>{{ getAreaNameByCode(curRow.areaCode) }}</p>
                   <p><span class="bold">归属子区：</span>{{ curRow.locationRefName }}</p>
                   <p><span class="bold">安装位置：</span>{{ curRow.location}}</p>
-
-
+                  <p><span class="bold">子系统：</span>{{ curRow.subsystemName }}</p>
                 </div>
                 <div class="footer">
                   <div class="footer">

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

@@ -18,7 +18,7 @@
         <el-tabs v-model="queryParams.facsCategory" @tab-click="facsCategoryChange">
           <el-tab-pane label="产能设施" name="E"></el-tab-pane>
           <el-tab-pane label="储能设施" name="C"></el-tab-pane>
-          <el-tab-pane label="输能设施" name="W"></el-tab-pane>
+          <el-tab-pane label="输配设施" name="W"></el-tab-pane>
           <el-tab-pane label="用能设施" name="Z"></el-tab-pane>
         </el-tabs>
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"

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

@@ -53,14 +53,13 @@
               <span>{{ formatDateTime(scope.row.recordTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="时间序列" align="center" prop="timeIndex"/>
-          <el-table-column label="用电量(kW·h)" align="center" prop="elecQuantity"/>
           <el-table-column label="计量类型" align="center" prop="meterType">
             <template slot-scope="scope">
-              <span>{{ getElecMeterType(scope.row.meterType) }}</span>
+              <span>{{ getElecMeterType(scope.row.meterType) + "( "+scope.row.meterUnitPrice + " )"}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="单位电价" align="center" prop="meterUnitPrice"/>
+
+          <el-table-column label="用电量(kW·h)" align="center" prop="elecQuantity"/>
           <el-table-column label="小时电费" align="center" prop="useElecCost"/>
         </el-table>