From 5ef4f310ac10570cde4c51fd48c87930f0d23636 Mon Sep 17 00:00:00 2001
From: liuhr <liuhr@taisoft.com.cn>
Date: Thu, 26 Oct 2023 14:30:18 +0800
Subject: [PATCH] =?UTF-8?q?[FEAT]:=201.=E6=B7=BB=E5=8A=A0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=20q-tooltip=20=E6=A0=B7=E5=BC=8F=202.=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E6=8A=A5=E8=A1=A8=E6=B7=BB=E5=8A=A0=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=80=20=E6=9F=A5=E8=AF=A2=E4=BA=8C=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=203.=E4=B8=BB=E9=A1=B5=E5=9B=BE=E4=BE=8B=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E6=B7=BB=E5=8A=A0=E6=95=B0=E5=80=BC=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=204.=E5=88=A0=E9=99=A4=E8=AE=BE=E5=A4=87=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=9F=E8=AE=A1=E5=9B=BE=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PVDEMCSUI/src/pages/screen/screen1/index.vue | 37 ++++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/PVDEMCSUI/src/pages/screen/screen1/index.vue b/PVDEMCSUI/src/pages/screen/screen1/index.vue
index 923fe78..18c45b4 100644
--- a/PVDEMCSUI/src/pages/screen/screen1/index.vue
+++ b/PVDEMCSUI/src/pages/screen/screen1/index.vue
@@ -22,8 +22,18 @@
                     <div class="col-xl-4 col-lg-4 col-sm-12">
                         <div class="row q-col-gutter-md ">
                             <div class="col-xl-12 col-lg-12 col-sm-12">
-                                <div ref="deviceRef4"
-                                    :style="'width: 100%; height:' + (Number(Screen.height) / 2 - 100) + 'px'">
+                                <div :style="'width: 100%; height:' + (Number(Screen.height) / 2 - 100) + 'px'">
+                                    <div class="col-xl-12 col-lg-12 col-sm-12">
+                                        <div class="text-weight-bold q-pb-md" style="font-size:18px;color: #464646;">设备正常运行率
+                                        </div>
+                                    </div>
+                                    <div class="col-xl-12 col-lg-12 col-sm-12" align="center">
+                                        <q-circular-progress show-value font-size="50px" :value="66" size="270px"
+                                            :thickness="0.34" color="blue" track-color="grey-3"
+                                            class="q-ml-md q-mr-md q-mb-md q-mt-xs text-weight-bold">
+                                            66%
+                                        </q-circular-progress>
+                                    </div>
                                 </div>
                             </div>
                             <div class="col-xl-12 col-lg-12 col-sm-12">
@@ -33,29 +43,18 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-xl-4 col-lg-4 col-sm-12 q-pt-lg" align="center">
+                    <div class="col-xl-4 col-lg-4 col-sm-12">
                         <!-- <div ref="deviceRef3" style="width: 100%; height: 400px"></div> -->
                         <div class="row q-col-gutter-md ">
                             <div class="col-xl-12 col-lg-12 col-sm-12">
-                                <div class="text-h6 text-weight-bold q-pb-xs" style="color: #464646;">设备正常运行率</div>
+                                <div class="text-weight-bold" style="font-size:18px;color: #464646;">当前报警发生设备</div>
                             </div>
-                            <div class="col-xl-12 col-lg-12 col-sm-12">
-                                <q-circular-progress show-value font-size="50px" :value="66" size="250px" :thickness="0.35"
-                                    color="blue" track-color="grey-3"
-                                    class="q-ml-md q-mr-md q-mb-md q-mt-xs text-weight-bold">
-                                    66%
-                                </q-circular-progress>
-                            </div>
-                        </div>
-                        <div class="row q-col-gutter-md ">
-                            <div class="col-xl-12 col-lg-12 col-sm-12">
-                                <div class="text-h6 text-weight-bold q-pt-lg" style="color: #464646;">当前报警发生设备</div>
-                            </div>
-                            <div class="col-xl-12 col-lg-12 col-sm-12">
+                            <div class="col-xl-12 col-lg-12 col-sm-12" align="center">
+                                <!-- 545 -->
                                 <q-table class="my-sticky-header-column-table" :rows="list" row-key="id" separator="cell"
                                     :loading="loading" :columns="columns"
-                                    :table-style="{ height: Number(Screen.height) - 545 + 'px' }" flat bordered
-                                    :rows-per-page-options="[10, 20, 50, 100]">
+                                    :table-style="{ height: Number(Screen.height) - 190 + 'px' }" flat bordered
+                                    :rows-per-page-options="[20, 50, 100]">
                                     <template v-slot:body="props">
                                         <q-tr :props="props" class="tr_hover">
                                             <q-td style="font-size: 14px;" key="index" :props="props">{{ props.rowIndex + 1