Merge branch 'master' into dev

# Conflicts:
#	frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue

frontend/src/api/device/testScript/index.ts

@@ -1,5 +1,6 @@
 import type { TestScript } from '@/api/device/interface/testScript'
 import http from '@/api'
+import { Loading } from '@element-plus/icons-vue'
 
 /**
  * @name 检测脚本管理模块
@@ -48,5 +49,5 @@ export const scriptDtlsCheckDataList = (params: any) => {
 }
 // 通讯脚本回显
 export const checkDataList = (params: any) => {
-    return http.post(`/pqScript/checkDataList`, params)
+    return http.post(`/pqScript/checkDataList`, params, { loading: true })
 }

frontend/src/api/system/dictionary/dictTree/index.ts

@@ -1,15 +1,15 @@
 import http from '@/api'
 import { type Dict } from '@/api/system/dictionary/interface'
-import {c} from "vite/dist/node/types.d-aGj9QkWt";
+import { c } from 'vite/dist/node/types.d-aGj9QkWt'
 
 //获取字典类型
 export const getDictTreeByCode = (params: Dict.ResDictTree) => {
-    const code = params.code || '';
-    return http.get(`/dictTree/getTreeByCode?code=${code}`)
+    const code = params.code || ''
+    return http.get(`/dictTree/getTreeByCode?code=${code}`, { loading: true })
 }
 
 export const getDictTreeByName = (params: Dict.ResDictTree) => {
-    const name = params.name || '';
+    const name = params.name || ''
     return http.get(`/dictTree/getTreeByName?name=${name}`)
 }
 
@@ -27,4 +27,3 @@ export const updateDictTree = (params: Dict.ResDictTree) => {
 export const deleteDictTree = (params: Dict.ResDictTree) => {
     return http.post(`/dictTree/delete?id=${params.id}`)
 }
-