From 33004e081d8a4ea824249dc451a3cfdbeecff64a Mon Sep 17 00:00:00 2001
From: GYYM <704080176@qq.com>
Date: Tue, 3 Dec 2024 17:13:47 +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

---
 .../components/dataCheckChangeErrSysPopup.vue |  5 +--
 .../views/home/components/dataCheckPopup.vue  |  6 ++--
 .../home/components/dataCheckResultTable.vue  |  1 +
 .../dataCheckSingleChannelSingleTestPopup.vue |  2 +-
 .../src/views/home/components/reportPopup.vue |  6 ++--
 .../src/views/home/components/timeTest.vue    | 11 +++++--
 frontend/src/views/home/tabs/dashboard.vue    | 32 ++++++++++++++++---
 7 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
index 3ee7040..6e0dc86 100644
--- a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
+++ b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
@@ -47,7 +47,7 @@
             <div class="change-errsys-content">
                 <div class="tabs-title">
                   <el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">合格92项/共103项</el-button> 
-                  <el-button type="primary" v-if="activeIndex >= activeTotalNum">合格92项/共103项</el-button> 
+                  <el-button type="primary" v-if="activeIndex >= activeTotalNum" disabled>合格92项/共103项</el-button> 
                 </div>
                 <div class="dialog-content">
       <el-table :data="tableData" row-key="id" height="545px" :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%" border>
@@ -232,7 +232,7 @@ const reportDisabled = ref(true)
   const errorSysName = ref('Q/GDW 10650.2 - 2021');
   const dataRule = ref('所有值');
   const scriptSwitch = ref(true);
-  const currentScriptDsc = ref('频率准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
+  const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
   const defaultProps = {
   children: "children",
   label: "name",
@@ -302,6 +302,7 @@ const props = defineProps<{
   const handleCancel = () => {
     emit('update:visible', false); // 关闭对话框
     //clearInterval(timer.value);
+    reportDisabled.value = true;
     activeIndex.value = 0;
     tableData.value.length = 0;
     tableData.value = JSON.parse(JSON.stringify(operatorTableData.value));
diff --git a/frontend/src/views/home/components/dataCheckPopup.vue b/frontend/src/views/home/components/dataCheckPopup.vue
index e1e2ec3..c098b57 100644
--- a/frontend/src/views/home/components/dataCheckPopup.vue
+++ b/frontend/src/views/home/components/dataCheckPopup.vue
@@ -26,7 +26,7 @@
                                     <el-input v-model='deviceName' :disabled="true"/>
                                 </el-form-item>          
                             </el-col>
-                            <el-col :span="8">
+                            <!-- <el-col :span="8">
                                 <el-form-item label='复检次数:'>
                                     <el-select v-model="reCheckIdx">
                                         <el-option
@@ -37,7 +37,7 @@
                                         />
                                     </el-select>
                                 </el-form-item>       
-                            </el-col>
+                            </el-col> -->
                             <el-col :span="8">
                                 <el-form-item label='通道号:'>
                                     <el-select v-model="monitorIdx">
@@ -123,7 +123,7 @@ const deviceName = ref('被检设备1');
   const errorSysName = ref('Q/GDW 10650.2-2021');
   const dataRule = ref('所有值');
   const scriptSwitch = ref(true);
-  const currentScriptDsc = ref('频率准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
+  const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
   const defaultProps = {
   children: "children",
   label: "name",
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index e236161..b0eb869 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -1,6 +1,7 @@
 <template>
 
     <div class="table-container">
+        
         <el-table :data="tableData" max-height="300"  :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" >
 
                 <el-table-column prop="id" label="序号" width="70" />
diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index 17d20ea..7ee8d42 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -66,7 +66,7 @@ const deviceName = ref('被检设备1');
   const errorSysName = ref('Q/GDW 10650.2-2021');
   const dataRule = ref('所有值');
   const scriptSwitch = ref(true);
-  const currentScriptDsc = ref('频率准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
+  const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
   const defaultProps = {
   children: "children",
   label: "name",
diff --git a/frontend/src/views/home/components/reportPopup.vue b/frontend/src/views/home/components/reportPopup.vue
index dce9071..a69c6d5 100644
--- a/frontend/src/views/home/components/reportPopup.vue
+++ b/frontend/src/views/home/components/reportPopup.vue
@@ -47,7 +47,7 @@
                                     </el-table-column>
                                     <el-table-column prop="action" label="操作" width="100">
                                         <template #default="scope">
-                                            <el-button type='primary' link :icon='View' :disabled="scope.row.processValue < 100">查看</el-button>
+                                            <el-button type='primary' link :icon='Download' :disabled="scope.row.processValue < 100">下载</el-button>
                                          </template>
                                     </el-table-column>
                                 </el-table>
@@ -69,7 +69,7 @@ import { ElMessage, type FormItemRule } from 'element-plus'
 import { addPqDev, updatePqDev } from '@/api/device/device'
 import { computed, reactive, type Ref, ref } from 'vue'
 import { useDictStore } from '@/stores/modules/dict'
-import { CirclePlus, Delete, EditPen,View } from '@element-plus/icons-vue'
+import { CirclePlus, Delete, Download,View } from '@element-plus/icons-vue'
 
 
 
@@ -78,7 +78,7 @@ import { CirclePlus, Delete, EditPen,View } from '@element-plus/icons-vue'
   const errorSysName = ref('Q/GDW 10650.2-2021');
   const dataRule = ref('所有值');
   const scriptSwitch = ref(true);
-  const currentScriptDsc = ref('频率准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
+  const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
 
 const reportData = ref([
   { id: '1', deviceName: '被检设备1', processValue: '100' , action:'查看' },
diff --git a/frontend/src/views/home/components/timeTest.vue b/frontend/src/views/home/components/timeTest.vue
index e33c43a..709ce3e 100644
--- a/frontend/src/views/home/components/timeTest.vue
+++ b/frontend/src/views/home/components/timeTest.vue
@@ -2,7 +2,14 @@
     <div>
 <div class = "test-dialog">
     <div class="dialog-left">
-        <el-timeline style="max-width: 600px">
+      <el-steps direction="vertical" :active="activeIndex" :process-status="currentStepStatus" finish-status="success">
+        <el-step title="开始检测" description="2018-04-12 20:46"/>
+        <el-step title="GPS完成上送" description="2018-04-12 20:46"/>
+        <el-step title="设备开始上送时刻"  description="2018-04-12 20:46"/>
+        <el-step title="设备最晚上送时刻"  description="2018-04-12 20:46"/>
+        <el-step title="检测完成"  description="2018-04-12 20:46"/>
+      </el-steps>
+        <!-- <el-timeline style="max-width: 600px">
           <el-timeline-item
             v-for="(activity, index) in activities"
             :key="index"
@@ -15,7 +22,7 @@
           >
             {{ activity.content }}
           </el-timeline-item>
-        </el-timeline>
+        </el-timeline> -->
     </div>
     <div class="dialog-right">
         <div class="right-title">    
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index ea62d0c..500230d 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -33,7 +33,7 @@
             <el-collapse-item title="&nbsp&nbsp&nbsp&nbsp检测进度展示：" name="1">
         <!-- 饼图 -->
         <div class="container_charts">
-          <div class="charts_info">
+          <div class="charts_info" ref="chartsInfoRef">
             <pie
               :customData="{
                 title: '设备检测状态',
@@ -112,6 +112,8 @@ import Table from "../components/table.vue";
 import { data } from "@/api/plan/static.json";
 import deviceDataList from '@/api/device/device/deviceData'
 
+const chartsInfoRef = ref<HTMLElement | null>(null);
+const chartsWidth = ref<number>(0);
 const deviceData = deviceDataList.plan_devicedata
 const treeRef = ref();
 const form: any = ref({
@@ -278,9 +280,9 @@ const getPieData = () => {
   pieRef1.value.init();
   pieRef2.value.init();
   pieRef3.value.init();
-  pieRef1.value.reSize(470,145,true);
-  pieRef2.value.reSize(470,145,true);
-  pieRef3.value.reSize(470,145,true);
+  // pieRef1.value.reSize(470,145,true);
+  // pieRef2.value.reSize(470,145,true);
+  // pieRef3.value.reSize(470,145,true);
 };
 const getTree = () => {
   treeRef.value.getTreeData(data);
@@ -342,11 +344,33 @@ const handleCheckFunction = (val: any) => {
   form.value.activeTabs = val;
 };
 
+
+const resizeObserver = new ResizeObserver(entries => {
+  for (let entry of entries) {
+    chartsWidth.value = entry.contentRect.width;
+    console.log('Charts Info Width:', chartsWidth.value);
+
+    pieRef1.value.reSize(chartsWidth.value * 0.95,145,true);
+    pieRef2.value.reSize(chartsWidth.value * 0.95,145,true);
+    pieRef3.value.reSize(chartsWidth.value * 0.95,145,true);
+  }
+});
+
 onMounted(() => {
  // console.log();
+ if (chartsInfoRef.value) {
+    resizeObserver.observe(chartsInfoRef.value);
+  }
   getTree();
   getPieData();
 });
+
+
+onUnmounted(() => {
+  if (chartsInfoRef.value) {
+    resizeObserver.unobserve(chartsInfoRef.value);
+  }
+});
 </script>
 <style lang="scss" scoped>
 .static {