From 26cda335c597146d0933315cac67d8a0fb6fd601 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Tue, 14 Jan 2025 11:43:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/.env.development                     |  2 +-
 frontend/src/routers/index.ts                 |  2 +-
 frontend/src/routers/modules/dynamicRouter.ts |  1 +
 .../views/home/components/channelsTest.vue    | 20 +++++++----
 .../home/components/channelsTestTable.vue     | 36 +++++++++----------
 frontend/src/views/home/components/table.vue  |  2 +-
 frontend/src/views/home/tabs/dashboard.vue    |  2 +-
 .../machine/device/components/devicePopup.vue |  8 +++--
 .../src/views/machine/testScript/index.vue    |  8 +++--
 9 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/frontend/.env.development b/frontend/.env.development
index 8f13788..01e3f04 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -19,6 +19,6 @@ VITE_API_URL=/api
 
 # 开发环境跨域代理，支持配置多个
 
-VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
+VITE_PROXY=[["/api","http://192.168.1.121:18092/"]]
 #VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
 # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文
diff --git a/frontend/src/routers/index.ts b/frontend/src/routers/index.ts
index 3d11a40..fbd5f6e 100644
--- a/frontend/src/routers/index.ts
+++ b/frontend/src/routers/index.ts
@@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => {
   const authStore = useAuthStore()
   // 1.NProgress 开始
   NProgress.start()
-
+  console.log('11111111111111');
   // 2.动态设置标题
   const title = import.meta.env.VITE_GLOB_APP_TITLE
   document.title = to.meta.title ? `${to.meta.title} - ${title}` : title
diff --git a/frontend/src/routers/modules/dynamicRouter.ts b/frontend/src/routers/modules/dynamicRouter.ts
index eaf517e..b0025de 100644
--- a/frontend/src/routers/modules/dynamicRouter.ts
+++ b/frontend/src/routers/modules/dynamicRouter.ts
@@ -36,6 +36,7 @@ export const initDynamicRouter = async () => {
     // 3.添加动态路由
     authStore.flatMenuListGet.forEach(item => {
       item.children && delete item.children;
+ 
       if (item.component && typeof item.component == "string") {
         item.component = modules["/src/views" + item.component + ".vue"];
       }
diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue
index 802a4fa..f3e6c73 100644
--- a/frontend/src/views/home/components/channelsTest.vue
+++ b/frontend/src/views/home/components/channelsTest.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model='dialogVisible' title="系数校准"  v-bind="dialogBig" width="1500px" @close="handleCancel">
+  <el-dialog v-model='dialogVisible' title="系数校准"  v-bind="dialogBig" width="1550px" @close="handleCancel">
     <div class="test-dialog" >
       <div class="dialog-content">
         <div class="right-title">
@@ -241,17 +241,17 @@ watch(webMsgSend,function (newValue,oldValue){
                                                                     item.devName === newValue.data.devName);
                 if (firstCoefficientVO) { // 检查 firstCoefficientVO 是否存在
                   firstCoefficientVO.aVuData = parseFloat(newValue.data.aVuData).toFixed(4);
-                  firstCoefficientVO.aVuXi = newValue.data.aVuXi;
+                  firstCoefficientVO.aVuXi = parseFloat(newValue.data.aVuXi).toFixed(4);
                   firstCoefficientVO.bVuData = parseFloat(newValue.data.bVuData).toFixed(4);
-                  firstCoefficientVO.bVuXi = newValue.data.bVuXi;
+                  firstCoefficientVO.bVuXi = parseFloat(newValue.data.bVuXi).toFixed(4);
                   firstCoefficientVO.cVuData = parseFloat(newValue.data.cVuData).toFixed(4);
-                  firstCoefficientVO.cVuXi = newValue.data.cVuXi;
+                  firstCoefficientVO.cVuXi = parseFloat(newValue.data.cVuXi).toFixed(4);
                   firstCoefficientVO.aIeData = parseFloat(newValue.data.aIeData).toFixed(4);
-                  firstCoefficientVO.aIeXi = newValue.data.aIeXi;
+                  firstCoefficientVO.aIeXi = parseFloat(newValue.data.aIeXi).toFixed(4);
                   firstCoefficientVO.bIeData = parseFloat(newValue.data.bIeData).toFixed(4);
-                  firstCoefficientVO.bIeXi = newValue.data.bIeXi;
+                  firstCoefficientVO.bIeXi = parseFloat(newValue.data.bIeXi).toFixed(4);
                   firstCoefficientVO.cIeData = parseFloat(newValue.data.cIeData).toFixed(4);
-                  firstCoefficientVO.cIeXi = newValue.data.cIeXi;
+                  firstCoefficientVO.cIeXi = parseFloat(newValue.data.cIeXi).toFixed(4);
                   //console.log(newValue.data.devName + '对象:', firstCoefficientVO);
                   activeIndex.value++;
                 } else {
@@ -511,6 +511,11 @@ const updateErrorState = (index: number, hasError: boolean) => {
     //console.log('tableDataMap',tableDataMap);
   }
 
+
+  const emit = defineEmits<{
+      (e: 'quitClicked'): void;
+  }>();
+
   const handleCancel=() => {
       // 清空 name, channel, total
       name.value = [];
@@ -521,6 +526,7 @@ const updateErrorState = (index: number, hasError: boolean) => {
       active.value = 0
       dialogVisible.value = false
       editableTabsValue.value = '0'
+      emit('quitClicked'); // 触发事件
   }
 
 const getTableDataForChannel = (index: number): any[] => {
diff --git a/frontend/src/views/home/components/channelsTestTable.vue b/frontend/src/views/home/components/channelsTestTable.vue
index 63bb9c4..c132fab 100644
--- a/frontend/src/views/home/components/channelsTestTable.vue
+++ b/frontend/src/views/home/components/channelsTestTable.vue
@@ -9,8 +9,8 @@
                     <el-table-column   prop="monitorNum" label="监测点序号" width="80"/>
                     <el-table-column prop="desc" label="描述"  width="90"/>
                     <el-table-column label="电压通道" >
-                        <el-table-column prop="Ua" label="L1(V)">
-                          <el-table-column prop="aVuData" label="被检值">
+                        <el-table-column prop="Ua" label="L1">
+                          <el-table-column prop="aVuData" label="被检值(V)" width="100px">
                             <template #default="scope">
                               <el-icon v-if="scope.row.aVuData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
@@ -20,7 +20,7 @@
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="aVuXi" label="检测结果">
+                          <el-table-column prop="aVuXi" label="检测结果" width="90px">
                             <template #default="scope">
                               <el-tooltip
                                 v-if="scope.row.aVuXi === '不合格'"
@@ -54,8 +54,8 @@
                             </template>
                           </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="Ub" label="L2(V)">
-                          <el-table-column prop="bVuData" label="被检值">
+                        <el-table-column prop="Ub" label="L2">
+                          <el-table-column prop="bVuData" label="被检值(V)" width="100px">
                             <template #default="scope">
                               <el-icon v-if="scope.row.bVuData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
@@ -65,7 +65,7 @@
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="bVuXi" label="检测结果">
+                          <el-table-column prop="bVuXi" label="检测结果" width="90px">
                             <template #default="scope">
                               <el-tooltip
                                 v-if="scope.row.bVuXi === '不合格'"
@@ -93,8 +93,8 @@
                             </template>
                           </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="Uc" label="L3(V)">
-                          <el-table-column prop="cVuData" label="被检值">
+                        <el-table-column prop="Uc" label="L3">
+                          <el-table-column prop="cVuData" label="被检值(V)" width="100px">
                             <template #default="scope">
                               <el-icon v-if="scope.row.cVuData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
@@ -104,7 +104,7 @@
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="cVuXi" label="检测结果">
+                          <el-table-column prop="cVuXi" label="检测结果" width="90px">
                             <template #default="scope">
                               <el-tooltip
                                 v-if="scope.row.cVuXi === '不合格'"
@@ -134,8 +134,8 @@
                         </el-table-column>
                     </el-table-column>
                     <el-table-column label="电流通道" >
-                        <el-table-column prop="Ia" label="L1(A)">
-                          <el-table-column prop="aIeData" label="被检值">
+                        <el-table-column prop="Ia" label="L1">
+                          <el-table-column prop="aIeData" label="被检值(A)" width="100px">
                             <template #default="scope">
                               <el-icon v-if="scope.row.aIeData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
@@ -145,7 +145,7 @@
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="aIeXi" label="检测结果">
+                          <el-table-column prop="aIeXi" label="检测结果" width="90px">
                             <template #default="scope">
                               <el-tooltip
                                 v-if="scope.row.aIeXi === '不合格'"
@@ -173,8 +173,8 @@
                             </template>
                             </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="Ib" label="L2(A)">
-                          <el-table-column prop="bIeData" label="被检值">
+                        <el-table-column prop="Ib" label="L2">
+                          <el-table-column prop="bIeData" label="被检值(A)" width="100px">
                             <template #default="scope">
                               <el-icon v-if="scope.row.bIeData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
@@ -184,7 +184,7 @@
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="bIeXi" label="检测结果">
+                          <el-table-column prop="bIeXi" label="检测结果" width="90px">
                             <template #default="scope">
                               <el-tooltip
                                 v-if="scope.row.bIeXi === '不合格'"
@@ -212,8 +212,8 @@
                             </template>
                           </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="Ic" label="L3(A)">
-                          <el-table-column prop="cIeData" label="被检值">
+                        <el-table-column prop="Ic" label="L3">
+                          <el-table-column prop="cIeData" label="被检值(A)" width="100px">
                             <template #default="scope">
                               <el-icon v-if="scope.row.cIeData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
@@ -223,7 +223,7 @@
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="cIeXi" label="检测结果">
+                          <el-table-column prop="cIeXi" label="检测结果" width="90px">
                             <template #default="scope">
                               <el-tooltip
                                 v-if="scope.row.cIeXi === '不合格'"
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 6024cbc..875ebbe 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -229,7 +229,7 @@
       ></matchPopup>
 
       <!--系数校准-->
-      <ChannelsTest  ref="channelsTest" :webMsgSend="webMsgSend"></ChannelsTest>
+      <ChannelsTest  ref="channelsTest" :webMsgSend="webMsgSend" @quitClicked="handleQuitClicked"></ChannelsTest>
   </div>
 </template>
 
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index a762d72..5214565 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -452,7 +452,7 @@ onUnmounted(() => {
 })
 
 const handleBatchGenerate = () => {
- // console.log('批量生成按钮被点击了');
+  console.log('批量生成按钮被点击了');
   // 在这里添加其他逻辑，比如显示对话框、更新状态等
   getPieData(currentId.value)
 
diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index 469c34c..06b1693 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -200,7 +200,7 @@ const disabledDate = (time: Date) => {
       hardwareVersion: '',
       softwareVersion: '',
       protocol: 'MMS',
-      ip: '192.168.1.200',
+      ip: '172.17.102.200',
       port: 102,
       encryptionFlag: 0,
       reCheckNum:0,
@@ -229,7 +229,7 @@ const disabledDate = (time: Date) => {
         hardwareVersion: '',
         softwareVersion: '',
         protocol: 'MMS',
-        ip: '192.168.1.200',
+        ip: '172.17.102.200',
         port: 102,
         encryptionFlag: 0,
         reCheckNum:0,
@@ -262,7 +262,6 @@ const baseRules: Record<string, Array<FormItemRule>> = {
     { required: true, message: '额定电流必填！', trigger: 'blur' },
     { pattern: /^\d+(\.\d+)?$/, message: '额定电流格式错误', trigger: 'blur' }
   ],
-  createDate: [{ required: true, message: '生产日期必填！', trigger: 'blur' }],
   createId: [{ required: true, message: '出厂编号必填！', trigger: 'blur' }],
   ip: [
     { required: true, message: 'IP地址必填！', trigger: 'blur' },
@@ -292,8 +291,11 @@ const rules = computed(() => {
   if (scene.value !== '2') {
     dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }];
     dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }];
+    dynamicRules.createDate= [{ required: true, message: '出厂日期必填！', trigger: 'blur' }];
   }
 
+  
+
   return dynamicRules;
 });
   
diff --git a/frontend/src/views/machine/testScript/index.vue b/frontend/src/views/machine/testScript/index.vue
index 55d35dc..74ae4cb 100644
--- a/frontend/src/views/machine/testScript/index.vue
+++ b/frontend/src/views/machine/testScript/index.vue
@@ -44,9 +44,11 @@ import ValueTypePopup from './components/valueTypePopup.vue'
 } from '@/api/device/testScript/index'
 import { computed, reactive, ref } from 'vue'
 import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store
-// defineOptions({
-// name: 'machine/testScript'
-// })
+defineOptions({
+name: '/testScript'
+})
+
+
 const comparisonPopup = ref()
 const testScriptPopup = ref()
 const valueTypePopup = ref()