优化

src/views/module_base/energyRate/modules/EnergyRateDetail.vue

@@ -44,6 +44,13 @@
         bordered
         class="j-table-force-nowrap"
         >
+
+        <template slot="pandv" slot-scope="record">
+          <div v-if="record.pandv == 0">尖</div>
+          <div v-if="record.pandv == 1">峰</div>
+          <div v-if="record.pandv == 2">平</div>
+          <div v-if="record.pandv == 3">谷</div>
+        </template>
     </a-table>
 
   </a-drawer>
@@ -98,10 +105,11 @@
               },
               {
                 title: '峰平谷',
-                dataIndex: 'pandv',
+                // dataIndex: 'pandv',
                 key: 'pandv',
                 width:"200px",
                 align: 'center',
+                scopedSlots: { customRender: 'pandv' },
               },
               {
                 title: '价格',

src/views/module_ems/photovoltaic/inverterMonitor/index.vue

@@ -2,7 +2,7 @@
   <div class="page-header-index-wide">
     <a-row>
       <a-col :sm="24" :md="12" :xl="8" :style="{ padding: '0px 12px 0px 0px' }">
-        <a-card :body-style="{ padding: '10px 8px 8px' }" class="topcard" :bordered="false" title="逆变器信息">
+        <a-card :body-style="{ padding: '10px 8px 8px' }" class="topcard" size="small" :bordered="false" title="逆变器信息">
           <div class="tri-colorLight" ref="flexDivGroup">
             <div class="item-content" ref="itemFlexDiv" cl>
               <!-- <div class="item-title">{{ invInfo[0].fInvertername }}</div> -->
@@ -30,6 +30,7 @@
             <a-card
               :loading="loading"
               :body-style="{ padding: '10px 8px 8px' }"
+              size="small"
               class="topcard"
               :bordered="false"
               title="发电量信息"
@@ -64,6 +65,7 @@
             :loading="loading"
             :body-style="{ padding: '10px 8px 8px' }"
             class="topcard"
+            size="small"
             :bordered="false"
             title="收益信息"
           >
@@ -97,6 +99,7 @@
           :loading="loading"
           :body-style="{ padding: '10px 8px 8px' }"
           class="middlecard"
+          size="small"
           :bordered="false"
           title="实时功率"
         >
@@ -112,6 +115,7 @@
         <a-card
           :body-style="{ padding: '0px 8px 8px' }"
           class="middlecard"
+          size="small"
           :bordered="false"
           title="功率及发电量趋势"
           style="margin-left: -4px"
@@ -121,8 +125,8 @@
       </a-col>
     </a-row>
     <a-row>
-      <a-col :sm="24" :md="12" :xl="24" :style="{ padding: '0px 12px 0px 4px' }">
-        <a-card :body-style="{ padding: '0px 8px 8px' }" class="bottomcard" :bordered="false" style="margin-left: -4px">
+      <a-col :sm="24" :md="12" :xl="24" :style="{ padding: '13px 12px 0px 4px' }">
+        <a-card :body-style="{ padding: '0px 8px 8px' }" class="bottomcard" size="small" :bordered="false" style="margin-left: -4px">
           <a-row>
             <a-col :sm="24" :md="12" :xl="10" class="inv_col">
               <a-table size="middle" bordered :pagination="false" :columns="columns1" :dataSource="tableData1">
@@ -584,7 +588,7 @@ export default {
   margin: auto;
 }
 .topcard {
-  height: 295px;
+  height: 255px;
 }
 .middlecard {
   height: 300px;
@@ -611,7 +615,7 @@ export default {
     color: rgba(0, 0, 0, 0.45);
     // padding: 16px 50px 20px;
     // padding-top: 16px;
-    padding-bottom: 20px;
+    // padding-bottom: 20px;
     margin: 10px 6px;
     // box-shadow: 0 2px 10px 2px rgba(59, 78, 128, 0.5) inset;
     text-align: center;
@@ -658,4 +662,15 @@ export default {
   border: 1px solid #e8e8e8;
   height: 285px;
 }
+::v-deep .ant-card{
+  border-radius: 5px;
+  box-shadow: -1px 0 2px rgba(180, 180, 180, 0.156), /*左侧阴影*/
+                1px 0 2px rgba(180, 180, 180, 0.156), /*右侧阴影*/
+                -2px 2px 2px rgba(180, 180, 180, 0.156), /*上方阴影*/
+                2px 2px 2px rgba(180, 180, 180, 0.156);
+}
+::v-deep .ant-card-head{
+  background-color: #01ADA8 !important;
+  color: #fff;
+}
 </style>

src/views/module_tpm/equipment/modulesDetail/EquipmentDetail.vue

@@ -47,13 +47,13 @@
               {{detailData.activeDate}}
             </a-descriptions-item>
             <a-descriptions-item label="责任部门">
-              {{detailData.responseDepartment}}
+              {{detailData.responseDepartment_dictText}}
             </a-descriptions-item>
             <a-descriptions-item label="负责人">
-              {{detailData.responsePerson}}
+              {{detailData.responsePerson_dictText}}
             </a-descriptions-item>
             <a-descriptions-item label="领用人">
-              {{detailData.recipient}}
+              {{detailData.recipient_dictText}}
             </a-descriptions-item>
             <a-descriptions-item label="管理状态">
               {{detailData.manageStatus_dictText}}