微调

frontend/src/views/home/components/test.vue

@@ -303,12 +303,12 @@ watch(testStatus, function (newValue, oldValue) {
 watch(webMsgSend, function (newValue, oldValue) {
   if (activeIndex <= checkTotal) {
     switch (newValue.requestId) {
-      case 'Test_Freq_Start':
-        updateCheckResultView("Freq", true)
+      case 'Test_VOL_Start':
+        updateCheckResultView("VOL", true)
         updateLog(true)
         break;
-      case 'Test_Freq_End':
-        updateCheckResultView("Freq", false)
+      case 'Test_VOL_End':
+        updateCheckResultView("VOL", false)
         updateLog(false)
         updatePercentage()
         if (testStatus.value != 'paused') {
@@ -316,12 +316,12 @@ watch(webMsgSend, function (newValue, oldValue) {
           startTimer()
         }
         break;
-      case 'Test_VOL_Start':
-        updateCheckResultView("VOL", true)
+      case 'Test_Freq_Start':
+        updateCheckResultView("Freq", true)
         updateLog(true)
         break;
-      case 'Test_VOL_End':
-        updateCheckResultView("VOL", false)
+      case 'Test_Freq_End':
+        updateCheckResultView("Freq", false)
         updateLog(false)
         updatePercentage()
         if (testStatus.value != 'paused') {
@@ -515,8 +515,8 @@ const showTestLog = () => {
 // 初始化检测脚本数据
 const initScriptData = () => {
   let map = new Map<string, string>()
-  map.set('Freq', '频率')
-      .set('VOL', '电压')
+  map.set('VOL', '电压')
+      .set('Freq', '频率')
       .set('Harm_V', '谐波电压')
       .set('Harm_I', '谐波电流')
       .set('Harm_P', '谐波有功功率')
@@ -529,8 +529,8 @@ const initScriptData = () => {
       .set('Flicker', '短时闪变')
 
   let response: CheckData.ScriptItem[] = [
-    {id: '1', code: 'Freq', scriptName: '频率准确度检测'},
-    {id: '2', code: 'VOL', scriptName: '电压准确度检测'},
+    {id: '1', code: 'VOL', scriptName: '电压准确度检测'},
+    {id: '2', code: 'Freq', scriptName: '频率准确度检测'},
     {id: '3', code: 'Harm_V', scriptName: '谐波电压准确度检测'},
     {id: '4', code: 'Harm_I', scriptName: '谐波电流准确度检测'},
     {id: '5', code: 'Harm_P', scriptName: '谐波有功功率准确度检测'},
@@ -863,18 +863,6 @@ const startTimer = () => {
   console.log('开始检测第' + activeIndex + '项')
   switch (activeIndex) {
     case 1:
-      emit('update:webMsgSend', {
-        requestId: 'Test_Freq_Start',
-        params: {}
-      })
-      setTimeout(() => {
-        emit('update:webMsgSend', {
-          requestId: 'Test_Freq_End',
-          params: {}
-        })
-      }, 2000);
-      break;
-    case 2:
       emit('update:webMsgSend', {
         requestId: 'Test_VOL_Start',
         params: {}
@@ -886,6 +874,19 @@ const startTimer = () => {
         })
       }, 2000);
       break;
+    case 2:
+      emit('update:webMsgSend', {
+        requestId: 'Test_Freq_Start',
+        params: {}
+      })
+      setTimeout(() => {
+        emit('update:webMsgSend', {
+          requestId: 'Test_Freq_End',
+          params: {}
+        })
+      }, 2000);
+      break;
+
     case 3:
       emit('update:webMsgSend', {
         requestId: 'Test_Harm_V_Start',