Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

frontend/src/views/machine/device/components/devicePopup.vue

@@ -428,10 +428,20 @@ const handleDevTypeChange = (value: string) => {
     formContent.value.devVolt = dev.devVolt; // 默认值为1
     formContent.value.icdId = dev.icd
     formContent.value.power = dev.power
+    if(dev.name.includes('882B')){
+      formContent.value.ip = '172.17.102.220'
+    }else if(dev.name.includes('882A')){
+      formContent.value.ip = '172.17.102.221'
+    }else{
+       formContent.value.ip = '172.17.102.200'
+    }
+    
+    
   } else {
     formContent.value.devChns = 1; // 默认值为1
     formContent.value.devCurr = 1; // 默认值为1
     formContent.value.devVolt = 57.74; // 默认值为1
+    formContent.value.ip = '172.17.102.200'
   }
   
 }

frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue

@@ -57,7 +57,7 @@
   import { useDictStore } from '@/stores/modules/dict'
   import { type ErrorSystem } from '@/api/device/interface/error';
   import ErrorSystemDetailTable from '@/views/machine/errorSystem/components/errorSystemDetailTable.vue';
-  import {getDictTreeList} from '@/api/system/dictionary/dictTree'
+  import {getDictTreeByCode} from '@/api/system/dictionary/dictTree'
   import { type Dict } from '@/api/system/dictionary/interface';
   // 定义弹出组件元信息
   const dialogFormRef = ref()
@@ -156,31 +156,31 @@ const handleTableDataUpdate = (newTableData: ErrorSystem.ErrorSystemDetail[]) =>
     }
  // 封装提取第二层节点的逻辑
 const loadSecondLevelOptions = async () => {
-  const dictCode = '误差体系指标项'; // 替换为实际需要的字典代码
-  const dictCode2 = '脚本-误差'; // 替换为实际需要的字典代码
+  const dictCode = 'Err_Sys_Items'; // 替换为实际需要的字典代码
+  const dictCode2 = 'Script_Error'; // 替换为实际需要的字典代码
 
   const resDictTree: Dict.ResDictTree = {
-    name: dictCode,
+    name: '',
     id: '',
     pid: '',
     pids: '',
-    code: '',
+    code: dictCode,
     sort: 0
   };
 
   const resDictTree2: Dict.ResDictTree = {
-    name: dictCode2,
+    name: '',
     id: '',
     pid: '',
     pids: '',
-    code: '',
+    code: dictCode2,
     sort: 0
   };
 
   // 并行请求两个字典树列表
   const [result, result2] = await Promise.all([
-    getDictTreeList(resDictTree),
-    getDictTreeList(resDictTree2)
+    getDictTreeByCode(resDictTree),
+    getDictTreeByCode(resDictTree2)
   ]);
 
   const allOptions = convertToOptions(result.data as Dict.ResDictTree[]);

frontend/src/views/machine/testScript/components/testScriptPopup.vue

@@ -60,7 +60,7 @@ import { useDictStore } from '@/stores/modules/dict'
 import TestScriptDetail from '@/views/machine/testScript/components/testScriptDetail.vue'
 import { type TestScript } from '@/api/device/interface/testScript'
 import type { Dict } from '@/api/system/dictionary/interface'
-import { getDictTreeList } from '@/api/system/dictionary/dictTree'
+import { getDictTreeByCode } from '@/api/system/dictionary/dictTree'
 import type { CascaderOption } from 'element-plus'
 const modeId = ref()
 const secondLevelOptions: any[] = []
@@ -123,16 +123,16 @@ const save = () => {
 
 // 打开弹窗，可能是新增，也可能是编辑
 const open = async (sign: string, row: any, currentMode: string, id: string) => {
-    const dictCode = '测试脚本字典表' // 替换为实际需要的字典代码
+    const dictCode = 'Script_Indicator_Items' // 替换为实际需要的字典代码
     const resDictTree: Dict.ResDictTree = {
-        name: dictCode,
+        name: '',
         id: '',
         pid: '',
         pids: '',
-        code: '',
+        code: dictCode,
         sort: 0
     }
-    const result = await getDictTreeList(resDictTree)
+    const result = await getDictTreeByCode(resDictTree)
     const allOptions = convertToOptions(result.data as Dict.ResDictTree[])
 
     secondLevelOptions.push(...(allOptions[0]?.children || []))