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

2025-02-17 08:40:19 +08:00
parent bba0ced7f9 e8de7b56d9
commit 9c9b8015a0
15 changed files with 63 additions and 144 deletions
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -380,8 +380,8 @@ const open = async (_deviceId: string, chnNum: string, _scriptType: string | nul

  chnList = resFormContent.chnList.map((item: { value: string, label: string }) => ({
    value: item.value,
-    // label: item.value
-    label: item.label == '1' ? `${item.value}` : item.label == '2' ? `${item.value}（不符合）` : `${item.value}`
+    label: item.value
+    //label: item.label == '1' ? `${item.value}` : item.label == '2' ? `${item.value}（不符合）` : `${item.value}`
  }))

  let dataRuleName = dictStore.getDictData('Data_Rule').find(item => item.id == resFormContent.dataRule)?.name
--- a/frontend/src/views/log/index.vue
+++ b/frontend/src/views/log/index.vue
@@ -102,7 +102,7 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
      },
  },
  {
-    prop: 'operate_Type',
+    prop: 'operateType',
    label: '日志类型',
    width: 100,
  },
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/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'
  }
  
 }
--- a/frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue
+++ b/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[]);
--- a/frontend/src/views/machine/testScript/components/testScriptPopup.vue
+++ b/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 || []))
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -68,7 +68,7 @@ import ImportExcel from "@/components/ImportExcel/index.vue";
 import {useDownload} from "@/hooks/useDownload";
 import {getTestConfig } from '@/api/system/base/index'
 import {type  Base } from '@/api/system/base/interface'
-import { getBoundPqDevList } from '@/api/plan/plan.ts'
+import { getBoundPqDevList ,staticsAnalyse} from '@/api/plan/plan.ts'

 // defineOptions({
 // name: 'planList'
@@ -394,10 +394,9 @@ const showDeviceOpen = (row: Partial<Plan.ReqPlan> = {}) => {

 const myDict = new Map<string, any[]>();

-// 引用图表容器
-const chartContainer = ref<HTMLElement | null>(null);
-let myChart: echarts.ECharts | null = null;
 const statisticalAnalysis = async (row: Partial<Plan.ReqPlan> = {}) => {
+  useDownload(staticsAnalyse,row.name+'分析结果', {planId:row.id}, false,'.xlsx')
+
  //   const response = await getTestConfig() as unknown as  Base.ResTestConfig
  //   const maxTime= response.data.maxTime//检测最大次数
  //   const dev = await getBoundPqDevList({ 'planId': row.id })
--- a/frontend/src/views/system/dictionary/dictTree/index.vue
+++ b/frontend/src/views/system/dictionary/dictTree/index.vue
@@ -3,7 +3,7 @@
      <ProTable
          ref='proTable'
          :columns='columns'
-          :request-api='getDictTreeList'
+          :request-api='getDictTreeByName'
          :pagination="false"
          
      >
@@ -29,7 +29,7 @@
  import {useDictStore} from '@/stores/modules/dict'
  import {useHandleData} from '@/hooks/useHandleData'
  import {
-    getDictTreeList,
+    getDictTreeByName,
    deleteDictTree,
  } from '@/api/system/dictionary/dictTree'
  import { reactive, ref } from 'vue'