From c69d7e9b0d11b9b0e924803cbe379649e4c52a24 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Mon, 3 Jul 2023 10:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/detail.vue | 107 ++++++++++++++++++++------------
 1 file changed, 67 insertions(+), 40 deletions(-)

diff --git a/src/views/statistics/detail.vue b/src/views/statistics/detail.vue
index c0c6d5f..c1ebd13 100644
--- a/src/views/statistics/detail.vue
+++ b/src/views/statistics/detail.vue
@@ -7,13 +7,13 @@
         </div>
         <div class="top-actions">
           <div class="right-btn">
-            <img src="../../assets/images/web-statistics/download.png" alt=""><span>ZIP</span>
+            <img class="icon-download" src="../../assets/images/web-statistics/download.png" alt=""><span>ZIP</span>
           </div>
           <div class="right-btn">
-            <img src="../../assets/images/web-statistics/download.png" alt=""><span>TXT</span>
+            <img class="icon-download" src="../../assets/images/web-statistics/download.png" alt=""><span>TXT</span>
           </div>
           <div class="right-btn">
-            <img src="../../assets/images/web-statistics/view.png" alt=""><span>View Report</span>
+            <img class="icon-view" src="../../assets/images/web-statistics/view.png" alt=""><span>View Report</span>
           </div>
         </div>
       </div>
@@ -22,72 +22,72 @@
           <templete>
             <div class="pane-title">GENERAL INFORMATION</div>
             <a-row>
-              <a-col :span="12">Site Code:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.siteCode }}</a-col>
+              <a-col :span="12" class="info-key">Site Code:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.siteCode }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Detector Code:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.detectorCode }}</a-col>
+              <a-col :span="12" class="info-key">Detector Code:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.detectorCode }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">System Type:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.systemType }}</a-col>
+              <a-col :span="12" class="info-key">System Type:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.systemType }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Sample Geometry:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.sampleGeometry }}</a-col>
+              <a-col :span="12" class="info-key">Sample Geometry:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.sampleGeometry }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Spectrum Qualifier:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.spectrumQualifier }}P</a-col>
+              <a-col :span="12" class="info-key">Spectrum Qualifier:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.spectrumQualifier }}P</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Sample Reference Identification:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.sampleReferenceIdentification }}</a-col>
+              <a-col :span="12" class="info-key">Sample Reference Identification:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.sampleReferenceIdentification }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Measurement Identification:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.measurementIdentification }}</a-col>
+              <a-col :span="12" class="info-key">Measurement Identification:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.measurementIdentification }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Detector Background Measurement Identification:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.detectorBackgroundMeasurementId }}</a-col>
+              <a-col :span="12" class="info-key">Detector Background Measurement Identification:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.detectorBackgroundMeasurementId }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Gas Background Measurement Identification:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.gasBackgroundMeasurementId }}</a-col>
+              <a-col :span="12" class="info-key">Gas Background Measurement Identification:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.gasBackgroundMeasurementId }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Transmit Time:</a-col>
-              <a-col :span="12">{{ allData.headerBlock.transmitDate }}</a-col>
+              <a-col :span="12" class="info-key">Transmit Time:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.headerBlock.transmitDate }}</a-col>
             </a-row>
           </templete>
           <template v-if="allData.commentBlock && allData.commentBlock.text">
             <div class="pane-title">COMMENT</div>
-            <a-row>
+            <a-row style="height: auto;">
               <a-col class="comment-block" :span="24" v-html="commentText"></a-col>
             </a-row>
           </template>
           <template v-if="allData.acquisitionBlock">
             <div class="pane-title">ACQUISITION</div>
             <a-row>
-              <a-col :span="12">Acquisition Time:</a-col>
-              <a-col :span="12">{{ allData.acquisitionBlock.acquisitionStartDate }}</a-col>
+              <a-col :span="12" class="info-key">Acquisition Time:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.acquisitionBlock.acquisitionStartDate }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Acquisition Real Time:</a-col>
-              <a-col :span="12">{{ allData.acquisitionBlock.acquisitionRealTime }}</a-col>
+              <a-col :span="12" class="info-key">Acquisition Real Time:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.acquisitionBlock.acquisitionRealTime }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="12">Acquisition Live Time:</a-col>
-              <a-col :span="12">{{ allData.acquisitionBlock.acquisitionLiveTime }}</a-col>
+              <a-col :span="12" class="info-key">Acquisition Live Time:</a-col>
+              <a-col :span="12" class="info-val">{{ allData.acquisitionBlock.acquisitionLiveTime }}</a-col>
             </a-row>
           </template>
           <template v-if="allData.calibrationBlock">
             <div class="pane-title">CALIBRATION</div>
             <a-row>
-              <a-col :span="12">Date of Last Calibration</a-col>
-              <a-col :span="12">{{ allData.calibrationBlock.dateOfLastCalibration }}</a-col>
+              <a-col :span="12" class="info-key">Date of Last Calibration</a-col>
+              <a-col :span="12" class="info-val">{{ allData.calibrationBlock.dateOfLastCalibration }}</a-col>
             </a-row>
           </template>
         </a-tab-pane>
@@ -128,8 +128,8 @@
           <div class="pane-title" style="margin-bottom: 15px;">GAMMA SPECTRUM</div>
           <div class="gamma-spectrum-row">
               <div>
-                <span>Number of Channels：</span><span class="row-val">{{ allData.gspectrumBlock.numberGChannels }}</span>
-                <span style="margin-left: 35px;">Energy Span：</span><span class="row-val">{{ allData.gspectrumBlock.energySpan }}</span> 
+                <span class="span-key">Number of Channels：</span><span class="row-val">{{ allData.gspectrumBlock.numberGChannels }}</span>
+                <span class="span-key" style="margin-left: 35px;">Energy Span：</span><span class="row-val">{{ allData.gspectrumBlock.energySpan }}</span> 
               </div>
               <div>
                 <a-checkbox style="margin-right: 15px;" @change="yLogChange">Y log scale</a-checkbox>
@@ -141,9 +141,9 @@
         <a-tab-pane key="certificate" tab="CERTIFICATE" v-if="allData.certificateBlock===null?false:true">
           <div class="pane-title" style="margin-bottom: 15px;">CERTIFICATE</div>
           <div class="certificate-row">
-            <span>Total Source Activity [ Bq ]：</span><span class="row-val">{{ allData.certificateBlock.totalSourceActivity }}</span>
-            <span style="margin-left: 35px;">Assay Date：</span><span class="row-val">{{ allData.certificateBlock.assayDate }}</span> 
-            <span style="margin-left: 35px;">Units of Activity：</span><span class="row-val">{{ allData.certificateBlock.unitsOfActivity }}</span> 
+            <span class="span-key">Total Source Activity [ Bq ]：</span><span class="row-val">{{ allData.certificateBlock.totalSourceActivity }}</span>
+            <span class="span-key" style="margin-left: 35px;">Assay Date：</span><span class="row-val">{{ allData.certificateBlock.assayDate }}</span> 
+            <span class="span-key" style="margin-left: 35px;">Units of Activity：</span><span class="row-val">{{ allData.certificateBlock.unitsOfActivity }}</span> 
           </div>
           <custom-table
             size="middle"
@@ -429,6 +429,14 @@ export default {
       padding: 0 12px;
       margin-left: 20px;
 	    background-color: #1397a3;
+      .icon-download{
+        width: 16px;
+        height: 19px;
+      }
+      .icon-view{
+        width: 15px;
+        height: 16px;
+      }
     }
   }
 }
@@ -440,6 +448,7 @@ export default {
       .ant-tabs-tabpane{
         height: 100%;
         overflow: auto;
+        background-color: #02282b;
       }
     }
   }
@@ -526,11 +535,28 @@ export default {
   color: #0cebc9;
   padding: 0 0 0 18px;
 }
+.info-key{
+  font-family: ArialMT;
+	font-size: 16px;
+	font-weight: bold;
+	color: #ffffff;
+}
+.info-val{
+  font-family: ArialMT;
+	font-size: 16px;
+	color: #ade6ee;
+}
+.span-key{
+  font-family: MicrosoftYaHei;
+	font-size: 16px;
+	color: #ffffff;
+}
 .comment-block{
-  background-color: rgba(12, 235, 201, 0.05);
-  margin-top: 10px;
+  background-color: #0d6d76;
+  margin: 10px 0;
   padding: 20px;
   line-height: 24px;
+  border-radius: 4px;
 }
 .gamma-spectrum-row{
   display: flex;
@@ -538,7 +564,8 @@ export default {
   justify-content: space-between;
   .row-val{
     font-family: MicrosoftYaHei;
-	  color: #ade6ee;
+    font-size: 16px;
+    color: #ade6ee;
   }
   .row-btn{
     height: 26px;