From 32ef1cc47f2ff4b6d8905371c67006f3eec4eba2 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 5 Jun 2024 13:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=8E=B0=E5=9C=BA=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panorama/components/cityMapL.vue          |  2 +-
 .../panorama/components/cityMapR.vue          |  2 +-
 .../panorama/components/details/evaluate.vue  |  2 +-
 .../panorama/components/line/info.vue         | 10 +++--
 .../panorama/components/mapL.vue              | 41 ++++++++++---------
 .../panorama/components/mapR.vue              |  2 +-
 6 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue
index e803004f..f425355a 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue
@@ -302,7 +302,7 @@ defineExpose({ info, show })
 
 .show {
     width: 0px;
-    transition: all 0.3s ease;
+    transition: all 0.1s ease;
     .boxLeft {
         padding: 0;
     }
diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
index fb4ad10a..c8baf29e 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
@@ -581,7 +581,7 @@ defineExpose({ info, show })
 }
 .show {
     width: 0px;
-    transition: all 0.3s ease;
+    transition: all 0.1s ease;
     .boxLeft {
         padding: 0;
     }
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
index ce49e317..b5d1de60 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
@@ -194,7 +194,7 @@ const analysis = (e: any) => {
                 list[num].push(val.score == 3.14159 ? null : val.score)
             })
         })
-        console.log('🚀 ~ getAssessTrend ~ mun:', mun)
+       
 
         list.forEach((item: any, i: any) => {
             picEChart.value.options.series.push({
diff --git a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
index 803ed84b..de82b46b 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
@@ -3,7 +3,9 @@
         <DatePicker ref="datePickerRef" style="display: none" />
         <el-page-header :icon="ArrowLeft" @back="emit('back')">
             <template #content>
-                <span class="text-large font-600 mr-3">{{ dropList.lineName }}详情</span>
+                <span style="font-size: 16px">{{ dropList.lineName }}详情　</span>
+                <span style="font-weight: 500">最新时间：</span>
+                <span style="color: var(--color-primary-default)">{{ dropList.updateTime }}</span>
             </template>
         </el-page-header>
         <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
@@ -114,11 +116,11 @@
                         </el-col>
                     </el-row>
                     <el-row style="width: 96%" v-for="(item, i) in evaluationData" class="row pb4 pt3">
-                        <el-col :span="14" style="display: flex">
+                        <el-col :span="14" style="display: flex; align-items: center">
                             <img :src="url[i]" />
                             <span style="line-height: 20px">{{ item.targetName }}</span>
                         </el-col>
-                        <el-col :span="10" style="display: flex">
+                        <el-col :span="10" style="display: flex; align-items: center">
                             <div style="width: 100%">
                                 评估得分：
                                 <span
@@ -668,6 +670,7 @@ defineExpose({ open })
 .evaluationData {
     display: grid;
     grid-template-rows: repeat(5, auto);
+    height: 87%;
     .row {
         margin: 4px 2% 0;
         width: 100%;
@@ -693,7 +696,6 @@ defineExpose({ open })
     display: inline-block;
     padding: 0 5px;
     height: 20px;
-    line-height: 20px;
     border-radius: 4px;
 }
 .background1 {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
index 7c82b11e..0071ca00 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
@@ -52,7 +52,7 @@
                         <p class="numOne" @click="LookMap(item.list[3].numOneList, item.list[3].numTwoList, 0)">
                             {{ item.list[3].numOne }}
                         </p>
-                        <p style="font-size: 12px; width: 32px; cursor: pointer" @click.stop="open(i)">详情></p>
+                        <p style="font-size: 12px; width: 32px; cursor: pointer;color: var(--el-color-primary);" @click.stop="open(i)">详情</p>
                     </div>
                 </div>
             </div>
@@ -70,7 +70,7 @@
                             <img src="@/assets/img/TJ.png" />
                             {{ item.title }}
                         </div>
-                        <div class="card-Box" v-for="val in item.children">
+                        <div class="card-Box" :style="`height:calc((${boxHeight.height} - 50px )/ 3);`"  v-for="val in item.children">
                             <div>
                                 <span class="line"></span>
                                 <span class="vol">{{ val.title }}</span>
@@ -94,7 +94,7 @@
                 </div>
             </div>
             <!-- 监测点指标统计 -->
-            <div :style="`height:calc(${boxHeight.height} - 50px)`">
+            <div :style="`height:calc(${boxHeight.height} - 55px)`">
                 <div class="title">
                     <span>监测运行统计</span>
                 </div>
@@ -102,7 +102,7 @@
                     <img src="@/assets/img/FGX.png" />
                 </div>
 
-                <div :style="`height:calc(${boxHeight.height} - 80px);overflow-y: auto;`" class="BoxA mt10">
+                <div :style="`height:calc(${boxHeight.height} - 100px);overflow-y: auto;`" class="BoxA mt10">
                     <div class="card-Box" v-for="item in linList">
                         <div>
                             <span class="line"></span>
@@ -281,17 +281,17 @@ const countList: any = ref([
         title: '冀北',
         children: [
             {
-                title: '电网测监测点',
+                title: '电网侧监测点',
                 num: 0,
                 onLineNum: 0,
                 integrityRate: 0
             },
-            { title: '非电网测监测点', num: 0, onLineNum: 0, integrityRate: 0 }
+            { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }
         ]
     },
     {
         title: '上送国网',
-        children: [{ title: '电网测监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
+        children: [{ title: '电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
     }
 ])
 const linList: any = ref([
@@ -367,9 +367,9 @@ const info = async (row: any) => {
     })
     // 监测点指标统计
     getGridDiagramStatistics(form).then(res => {
-        countList.value[0].children[0] = { title: '电网测监测点', ...res.data.data[0] }
-        countList.value[0].children[1] = { title: '非电网测监测点', ...res.data.data[1] }
-        countList.value[1].children[0] = { title: '电网测监测点', ...res.data.gwData[0] }
+        countList.value[0].children[0] = { title: '电网侧监测点', ...res.data.data[0] }
+        countList.value[0].children[1] = { title: '非电网侧监测点', ...res.data.data[1] }
+        countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
     })
     // 监测运行统计
     getGridDiagramRunData(form).then(res => {
@@ -401,7 +401,7 @@ defineExpose({ info, show })
 .boxLeft {
     background-color: #fff;
     width: 100%;
-    padding: 10px 10px 10px 10px;
+    // padding: 10px 10px 10px 10px;
     border-radius: 5px;
     font-size: 13px;
     overflow: hidden;
@@ -470,15 +470,18 @@ defineExpose({ info, show })
 }
 
 .card-Box {
-    display: grid;
-    grid-template-rows: 1fr 1fr;
-
-    align-items: center;
+    // display: grid;
+    // grid-template-rows: 1fr 1fr;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-evenly;
+    // align-items: center;
     margin: 0 5px 5px;
     padding: 10px;
     background-color: #edededc0;
     border-radius: 10px;
-    max-height: 80px;
+    min-height: 60px;
+    max-height: 120px;
     .line {
         display: inline-block;
         width: 0.5rem;
@@ -494,10 +497,7 @@ defineExpose({ info, show })
         text-align: center;
         grid-template-columns: 1fr 1fr 1.5fr;
         font-size: 14px;
-        margin-top: 5px;
 
-        div {
-        }
         span {
             cursor: pointer;
             font-size: 16px;
@@ -508,7 +508,8 @@ defineExpose({ info, show })
 .BoxA {
     display: grid;
     grid-template-columns: 1fr 1fr;
-    grid-template-rows: 80px;
+    grid-template-rows: 1fr 1fr;
+    // grid-template-rows: 80px;
     .num {
         margin-left: 10px;
         display: grid;
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
index 53944960..e39f6ed5 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
@@ -553,7 +553,7 @@ defineExpose({ info, show })
 }
 .show {
     width: 0px;
-    transition: all 0.3s ease;
+    transition: all 0.1s ease;
     .boxLeft {
         padding: 0;
     }