Merge pull request '【修改】白名单参数移到系统管理下面' (#5) from hyc into master

Reviewed-on: #5

src/api/system/user/index.ts

@@ -87,7 +87,10 @@ export const importUserTemplate = () => {
 export const importUserTemplateStu = () => {
   return request.download({ url: '/system/user/get-import-template-stu' })
 }
-
+// 下载教师导入模板
+export const importUserTemplateTeacher = () => {
+  return request.download({ url: '/system/user/get-import-template-teacher' })
+}
 // 用户密码重置
 export const resetUserPassword = (id: number, password: string) => {
   const data = {

src/api/system/whiteList/index.ts

@@ -0,0 +1,30 @@
+import request from '@/config/axios'
+export interface WhiteVO {
+  name: string
+  
+}
+
+// 获取白名单列表
+export const getAppWhiteListCenter = (params:WhiteVO) => {
+  return request.get({ url: '/exam/white/getAppWhiteListCenter',params })
+}
+
+// 新增
+export const addAppWhite = (data) => {
+  return request.post({ url: '/exam/white/addAppWhite', data })
+}
+
+// 修改
+export const updateAppWhite = (data) => {
+  return request.put({ url: '/exam/white/updateAppWhite', data })
+}
+
+// 删除
+export const delWhite = (id) => {
+  return request.delete({ url: `/exam/white/delWhite/${id}` })
+}
+
+// 获取详情
+export const getWhite = (id) => {
+  return request.get({ url: '/exam/white/getWhite', params: { id } })
+}

src/views/exam/teacher/TeacherImportForm.vue

@@ -53,7 +53,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
 const uploadRef = ref()
 const importUrl =
-  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/student/import'
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/importTeacher'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
 const updateSupport = ref(0) // 是否更新已经存在的用户数据
@@ -132,7 +132,7 @@ const handleExceed = (): void => {
 
 /** 下载模板操作 */
 const importTemplate = async () => {
-  const res = await UserApi.importUserTemplate()
+  const res = await UserApi.importUserTemplateTeacher()
-  download.excel(res, '用户导入模版.xls')
+  download.excel(res, '教师导入模版.xls')
 }
 </script>

src/views/system/role/index.vue

@@ -110,7 +110,6 @@
       <el-table-column :width="300" align="center" label="操作">
         <template #default="scope">
           <el-button
-            v-hasPermi="['system:role:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
@@ -118,7 +117,6 @@
             编辑
           </el-button>
           <el-button
-            v-hasPermi="['system:permission:assign-role-menu']"
             link
             preIcon="ep:basketball"
             title="菜单权限"
@@ -138,7 +136,6 @@
             数据权限
           </el-button> -->
           <el-button
-            v-hasPermi="['system:role:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"

src/views/system/tenant/index.vue

@@ -100,7 +100,7 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
       <el-table-column label="学校用户编号" align="center" prop="id" />
-      <el-table-column label="学校用户名" align="center" prop="name" />
+      <el-table-column label="学校名称" align="center" prop="name" />
       <el-table-column label="学校用户权限" align="center" prop="packageId">
         <template #default="scope">
           <el-tag v-if="scope.row.packageId === 0" type="danger">中心服务器</el-tag>

src/views/system/white/index.vue

@@ -0,0 +1,125 @@
+<template>
+ <ContentWrap>
+   <!-- 搜索栏 --> 
+  <el-form :inline="true" :model="queryParams" class="mb-4"> 
+    <el-form-item label="名称"> <el-input v-model="queryParams.name" placeholder="请输入白名单名称" clearable class="!w-240px" @keyup.enter="getList" />
+      </el-form-item> 
+      <el-form-item> 
+      <el-button type="primary" @click="getList"> 
+        <Icon icon="ep:search" /> 搜索 
+      </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" /> 重置 
+        </el-button> 
+        <el-button type="success" plain @click="openForm('create')"> 
+          <Icon icon="ep:plus" />
+            新增 </el-button> 
+    </el-form-item> 
+  </el-form>
+
+        <!-- 表格区域 -->
+  <el-table :data="list" v-loading="loading" border stripe>
+    <el-table-column prop="id" label="ID" align="center" width="80" />
+    <el-table-column prop="name" label="名称" align="center" />
+    <el-table-column label="操作" align="center" width="180">
+      <template #default="scope">
+        <el-button type="primary" link @click="openForm('update', scope.row.id)">
+          <Icon icon="ep:edit" /> 修改
+        </el-button>
+        <el-button type="danger" link @click="handleDelete(scope.row.id)">
+          <Icon icon="ep:delete" /> 删除
+        </el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+
+<Pagination
+  :total="total"
+  v-model:page="queryParams.pageNo"
+  v-model:limit="queryParams.pageSize"
+  @pagination="getList"
+/>
+
+<!-- 新增/修改弹窗 -->
+<el-dialog v-model="dialogVisible" :title="dialogTitle" width="500px">
+  <el-form ref="formRef" :model="form" label-width="80px">
+    <el-form-item label="名称" prop="name" required>
+      <el-input v-model="form.name" placeholder="请输入名称" />
+    </el-form-item>
+  
+  </el-form>
+  <template #footer>
+    <el-button @click="dialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="submitForm">确定</el-button>
+  </template>
+</el-dialog>
+
+</ContentWrap> </template> <script lang="ts" setup> import { ref, reactive } from 'vue'
+ import { ElMessage, ElMessageBox } from 'element-plus' 
+ import * as WhiteApi from '@/api/system/whiteList'
+// 你可以把 API 封装在这个文件里 // 数据
+ const loading = ref(false)
+const list = ref([]) 
+const total = ref(0) 
+const queryParams = reactive({ pageNo: 1, pageSize: 10, name: '' }) 
+// 弹窗相关
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formRef = ref() 
+const form = reactive({ id: '', name: '', path: '', remark: '' })
+// 获取列表
+  const getList = async () => { loading.value = true
+       const params = {
+      ...queryParams,
+     
+    }
+    try { const res = await WhiteApi.getAppWhiteListCenter(params)
+      list.value = res.list 
+      total.value = res.total 
+       
+    } finally 
+    { 
+      loading.value = false 
+    } } 
+    // 重置 
+  const resetQuery = () => {
+      queryParams.name = '' 
+      getList() 
+    } 
+    // 打开弹窗
+    const openForm = async (type: string, id?: string) => { 
+      dialogVisible.value = true
+        if (type === 'create') {
+          dialogTitle.value = '新增白名单'
+          Object.assign(form, { id: '', name: '', path: '', remark: '' })
+          } else { 
+          dialogTitle.value = '修改白名单' 
+          const data = await WhiteApi.getWhite(id)
+            Object.assign(form, data) } 
+          } // 提交
+  const submitForm = async () => {
+    if (!form.name) {
+      ElMessage.warning('请输入名称') 
+      return 
+    } 
+    if (form.id) {
+        await WhiteApi.updateAppWhite(form) 
+        ElMessage.success('修改成功') 
+      } else {
+          await WhiteApi.addAppWhite(form) 
+          ElMessage.success('新增成功') 
+        } 
+        dialogVisible.value = false
+          getList() 
+        } 
+        // 删除
+  const handleDelete = async (id: string) => {
+      ElMessageBox.confirm('确认删除该白名单？', '提示', {
+        type: 'warning' 
+      }).then(async () => {
+          await WhiteApi.delWhite(id)
+          ElMessage.success('删除成功') 
+          getList() }) } 
+          // 初始化
+          getList() 
+</script>

src/views/task/trans/components/steps/step3/index.vue

@@ -360,7 +360,6 @@ import { CommonStatusEnum } from '@/utils/constants'
 import AppAdd from './components/app-add.vue'
 import * as AppApi from '@/api/exam/app'
 import { time } from 'console'
-
 const props = defineProps({
   taskId: {
     type: String,