From bb191a692725518c8f7b3c96f7cdc39861c56647 Mon Sep 17 00:00:00 2001
From: jn517618 <jn517618@163.com>
Date: Thu, 11 Jan 2024 13:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/energySources/component/dmodal.vue        | 12 ++++++++----
 src/views/energySources/component/dosage.vue        | 13 ++++++++-----
 src/views/energySources/component/emodal.vue        |  9 ++++++---
 src/views/energySources/component/equipmentLoad.vue | 11 +++++------
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/views/energySources/component/dmodal.vue b/src/views/energySources/component/dmodal.vue
index d0b5d51..70468d6 100644
--- a/src/views/energySources/component/dmodal.vue
+++ b/src/views/energySources/component/dmodal.vue
@@ -9,8 +9,8 @@
             <el-option v-for="item in options" :key="item.name" :label="item.name" :value="item.name">
             </el-option>
           </el-select>
-          <img src="../../../../public/img/energySources/close.png" alt="" srcset="" style="width: 12px; height: 12px;"
-            @click="onClose">
+          <img src="../../../../public/img/energySources/close.png" alt="" srcset="" style="width: 12px; height: 12px;
+    cursor: pointer;" @click="onClose">
         </div>
       </tit>
       <div class="emodal">
@@ -24,9 +24,13 @@
             </template>
           </el-table-column>
           <el-table-column prop="sendTime" label="时间" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row.sendTime }}</span>
+            </template>
           </el-table-column>
         </el-table>
-        <el-pagination background layout="prev, pager, next" small :total="total" style="text-align: right;" @current-change="currentChange">
+        <el-pagination background layout="prev, pager, next" small :total="total" style="text-align: right;"
+          @current-change="currentChange">
         </el-pagination>
       </div>
 
@@ -93,7 +97,7 @@ export default {
     getData() {
       getInstrumentRunDetail({
         manufacturerBrand: this.userInfo.dept_name,
-        today:  this.selectDay,
+        today: this.selectDay,
         name: this.value,
         current: this.current,
         size: this.size
diff --git a/src/views/energySources/component/dosage.vue b/src/views/energySources/component/dosage.vue
index a893326..9a14b49 100644
--- a/src/views/energySources/component/dosage.vue
+++ b/src/views/energySources/component/dosage.vue
@@ -2,7 +2,8 @@
   <div class="box dosage">
     <tit :title="'用量分析'">
       <div class="tit-r">
-        <span style="color: #0096FF;" @click="visible=true">监测明细</span>
+        <span style="color: #0096FF;
+    cursor: pointer;" @click="visible = true">监测明细</span>
         &nbsp;&nbsp;&nbsp;
         <span style="color: #fff;">选择时间：</span>
         <el-date-picker size="mini" v-model="selectDay" type="date" placeholder="选择月" @change="changeDate"
@@ -80,8 +81,8 @@
       </div> -->
       <!-- <div id="mainDosage"></div> -->
     </div>
-    
-    <dmodal :visible.sync="visible" @onvisible="v => visible = v" :selectDay="selectDay"/>
+
+    <dmodal :visible.sync="visible" @onvisible="v => visible = v" :selectDay="selectDay" />
   </div>
 </template>
 
@@ -107,7 +108,7 @@ export default {
     this.selectDay = this.$moment().format('YYYY-MM-DD')
     this.getPeriodData()
     // this.$nextTick(() => {
-      
+
     //   this.echartsInit()
     // })
     this.timeFun = setInterval(() => {
@@ -284,6 +285,7 @@ export default {
   background-color: transparent !important;
   border: 0 !important;
 }
+
 .dosage /deep/ .trEven td {
   background: rgba($color: #0de5ff, $alpha: 0.1) !important;
 }
@@ -389,4 +391,5 @@ export default {
     border-radius: 0.08rem;
     margin-left: 0.1rem;
   }
-}</style>
+}
+</style>
diff --git a/src/views/energySources/component/emodal.vue b/src/views/energySources/component/emodal.vue
index 7ceb0c2..6f2179c 100644
--- a/src/views/energySources/component/emodal.vue
+++ b/src/views/energySources/component/emodal.vue
@@ -9,8 +9,8 @@
             <el-option v-for="item in options" :key="item.name" :label="item.name" :value="item.name">
             </el-option>
           </el-select>
-          <img src="../../../../public/img/energySources/close.png" alt="" srcset="" style="width: 12px; height: 12px;"
-            @click="onClose">
+          <img src="../../../../public/img/energySources/close.png" alt="" srcset="" style="width: 12px; height: 12px;
+    cursor: pointer;" @click="onClose">
         </div>
       </tit>
       <div class="emodal">
@@ -24,6 +24,9 @@
             </template>
           </el-table-column>
           <el-table-column prop="sendTime" label="负载最长时段" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row.sendTime }}</span>
+            </template>
           </el-table-column>
         </el-table>
         <el-pagination background layout="prev, pager, next" small :total="total" style="text-align: right;"
@@ -96,7 +99,7 @@ export default {
       this.current = v
       this.getData()
     },
-    change(){
+    change() {
       this.getData()
     },
     onClose() {
diff --git a/src/views/energySources/component/equipmentLoad.vue b/src/views/energySources/component/equipmentLoad.vue
index cbb26f4..494ce5d 100644
--- a/src/views/energySources/component/equipmentLoad.vue
+++ b/src/views/energySources/component/equipmentLoad.vue
@@ -16,6 +16,9 @@
         </template>
       </el-table-column>
       <el-table-column prop="sendTime" label="负载最长时段" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.sendTime }}</span>
+        </template>
       </el-table-column>
     </el-table>
     <emodal :visible.sync="visible" @onvisible="v => visible = v" />
@@ -110,12 +113,7 @@ export default {
   background: rgba($color: #0de5ff, $alpha: 0.1) !important;
   font-family: Acumin-Pro-Condensed-Regular-2;
 }
-.equipmentLoad /deep/ .trEven td div{
-  font-size: 0.18rem !important;
-}
-.equipmentLoad /deep/ .trOdd td div{
-  font-size: 0.18rem !important;
-}
+
 
 .equipmentLoad /deep/.colorFB5E2D td {
   color: #FB5E2D !important;
@@ -135,6 +133,7 @@ export default {
     font-size: 0.14rem;
     color: #0096FF;
     margin-top: 0.04rem;
+    cursor: pointer;
   }
 
 }