【修改】 修改白名单获取接口

src/api/appControl/index.ts

@@ -1,4 +1,5 @@
 import axios from 'axios'
+import request from '@/config/axios'
 
 /**
  * @description
@@ -50,6 +51,9 @@ export const AppAllApi = () => {
  * @description 用于获取获取关闭应用的白名单
  * @returns
  */
-export const AppCloseWhitelistApi = (taskId, ip) => {
-  return axios.get('http://localhost:48081/white?taskId=' + taskId + '&ip=' + ip)
+// export const AppCloseWhitelistApi = (taskId, ip) => {
+//   return axios.get('http://localhost:48081/white?taskId=' + taskId + '&ip=' + ip)
+// }
+export const AppCloseWhitelistApi = () => {
+  return request.get({ url: '/exam/white/getAppWhiteList' })
 }

src/views/examPaper/index.vue

@@ -842,11 +842,7 @@ const handleConfirm = async () => {
   })
     .then(async () => {
       try {
-        const res = await AppCloseWhitelistApi(
-          examStore.setExamId,
-          localStorage.getItem('serverIP')
-        )
-        const whitelist = JSON.parse(res.data.data)
+        const whitelist = await AppCloseWhitelistApi()
         AppAllApi().then(({ data: { data } }) => {
           // 将data过滤掉checkCloseWhitelist中的值
           const newData = JSON.parse(data)
@@ -854,7 +850,21 @@ const handleConfirm = async () => {
           console.log('获取到的应用列表:', newData)
           console.log('白名单列表:', whitelist)
 
-          const filteredData = newData.filter((item) => !whitelist.includes(item))
+          const filteredData = newData.filter((item) => {
+            // 获取项的可匹配文本（优先 message、name，其次整个项的字符串化）
+            const text = (
+              typeof item === 'string'
+                ? item
+                : item && (item.message || item.name)
+                  ? item.message || item.name
+                  : JSON.stringify(item) || ''
+            ).toLowerCase()
+
+            // 只匹配开头（不区分大小写），若 whitelist 中任一项是 text 的前缀则过滤掉
+            return !whitelist.some((whiteItem) =>
+              text.startsWith(String(whiteItem || '').toLowerCase())
+            )
+          })
           console.log('过滤后的应用列表:', filteredData)
 
           let { process, number } = formatProcessList(filteredData)
@@ -1692,8 +1702,7 @@ const checkCloseWhitelist = ref([])
 // 返回主窗口
 const handleBackView = async () => {
   try {
-    const res = await AppCloseWhitelistApi(examStore.setExamId, localStorage.getItem('serverIP'))
-    const whitelist = JSON.parse(res.data.data)
+    const whitelist = await AppCloseWhitelistApi()
     AppAllApi().then(({ data: { data } }) => {
       // 将data过滤掉checkCloseWhitelist中的值
       const newData = JSON.parse(data)
@@ -1701,7 +1710,21 @@ const handleBackView = async () => {
       console.log('获取到的应用列表:', newData)
       console.log('白名单列表:', whitelist)
 
-      const filteredData = newData.filter((item) => !whitelist.includes(item))
+      const filteredData = newData.filter((item) => {
+        // 获取项的可匹配文本（优先 message、name，其次整个项的字符串化）
+        const text = (
+          typeof item === 'string'
+            ? item
+            : item && (item.message || item.name)
+              ? item.message || item.name
+              : JSON.stringify(item) || ''
+        ).toLowerCase()
+
+        // 只匹配开头（不区分大小写），若 whitelist 中任一项是 text 的前缀则过滤掉
+        return !whitelist.some((whiteItem) =>
+          text.startsWith(String(whiteItem || '').toLowerCase())
+        )
+      })
       console.log('过滤后的应用列表:', filteredData)
 
       let { process, number } = formatProcessList(filteredData)