添加删除/修改接口调用

src/api/reviewManagement.ts

@@ -27,7 +27,7 @@ export const getQuestionnaireTaskListApi = (data:any) => {
     })
 }
 
-// 新增问卷评价任务
+// 新增评价任务
 export const addQuestionnaireTaskListApi = (data:any) => {
     return request({
         url: `${teacherPrefix}/api/v1/evaluation/addEvaluation`,
@@ -36,6 +36,24 @@ export const addQuestionnaireTaskListApi = (data:any) => {
     })
 }
 
+// 获取评价任务详情 _暂时没用
+export const getQuestionnaireTaskDetailApi = (id:any) => {
+    return request({
+        url: `${teacherPrefix}/api/v1/evaluation/queryEvaluationInfo/${id}`,
+        method: 'get',
+    })
+}
+
+// 修改评价任务
+export const editQuestionnaireTaskListApi = (data:any) => {
+    return request({
+        url: `${teacherPrefix}/api/v1/evaluation/updateEvaluation`,
+        method: 'post',
+        data
+    })
+}
+
+
 // 开启/关闭任务
 export const oppenOrCloseQuestionnaireTaskApi = (id:any,openStatus:any) => {
     return request({
@@ -44,3 +62,10 @@ export const oppenOrCloseQuestionnaireTaskApi = (id:any,openStatus:any) => {
     })
 }
 
+// 删除评价任务数据
+export const deleteQuestionnaireTaskApi = (id:any) => {
+    return request({
+        url: `${teacherPrefix}/api/v1/evaluation/deleteEvaluation/${id}`,
+        method: 'get',
+    })
+}

src/components/statusDict.ts

@@ -1,5 +1,5 @@
-// 问卷使用状态
-export const useStatusConvert = [
+// 问卷管理 问卷状态 行展示
+export const surveyManagementRowStatusConvert = [
     {
         statusFlag:1,
         title:'已使用',
@@ -12,8 +12,23 @@ export const useStatusConvert = [
     },
 ]
 
-// 问卷类型
-export const cardTypeMsg = [
+// 问卷管理 问卷状态 卡片展示
+export const surveyManagementCardStatusMsg = [
+    {
+        statusFlag:0,
+        title:'未使用',
+        themeClass:'unused'
+    },
+    {
+        statusFlag:1,
+        title:'已使用',
+        themeClass:'used'
+    },
+]
+
+
+// 评价管理 问卷任务类型
+export const reviewManageTaskTypeMsg = [
     {
         type:0,
         title:'线上匿名',
@@ -37,8 +52,8 @@ export const cardTypeMsg = [
     },
 ]
 
-// 问卷任务状态
-export const questionnaireTaskStatusMsg = [
+// 评价管理  问卷任务状态 卡片展示
+export const reviewManageCardStatusMsg = [
     {
         statusFlag:0,
         title:'进行中',
@@ -50,3 +65,18 @@ export const questionnaireTaskStatusMsg = [
         themeClass:'end'
     },
 ]
+
+
+// 评价管理  问卷任务状态 行展示
+export const reviewManageRowStatusConvert = [
+    {
+        statusFlag:0,
+        title:'进行中',
+        themeClass: 'normal_icon'
+    },
+    {
+        statusFlag:1,
+        title:'已结束',
+        themeClass: 'not_included_icon'
+    },
+]

src/views/reviewManagement/ReviewManagement.vue

@@ -36,8 +36,8 @@
                     :key="questionnaire.id" 
                 >
                     <QuestionnaireCard 
-                        :cardStatusMsg="questionnaireTaskStatusMsg" 
-                        :cardTypeMsg="cardTypeMsg"
+                        :cardStatusMsg="reviewManageCardStatusMsg" 
+                        :cardTypeMsg="reviewManageTaskTypeMsg"
                         :questionnaire="questionnaire"
                         cardType="reviewManage"
                         @switchOnOff="HandleCardSwitchOnOff"
@@ -71,11 +71,11 @@
                     {{ currentIndex + pageSize * (currentPage - 1)}}
                 </template>
                 <template #evaluationType="{row}">
-                    {{ cardTypeMsg.find(item=>{return item.type === row.evaluationType})?.title }}
+                    {{ reviewManageTaskTypeMsg.find(item=>{return item.type === row.evaluationType})?.title }}
                 </template>
 
                 <template #evaluationStatus="{row}">
-                    <TableRowStatus :useStatus="row.evaluationStatus" :statusMsg="useStatusConvert"></TableRowStatus>
+                    <TableRowStatus :useStatus="row.evaluationStatus" :statusMsg="reviewManageRowStatusConvert"></TableRowStatus>
                 </template>
 
                 <template #openStatus="{row}">
@@ -150,11 +150,12 @@ import SearchBlock from '@/baseComponents/SearchBlock.vue';
 import QuestionnaireCard from '@/components/questionnaireCard/QuestionnaireCard.vue';
 
 
-import {useStatusConvert, cardTypeMsg, questionnaireTaskStatusMsg} from '@/components/statusDict'
+import {reviewManageRowStatusConvert, reviewManageTaskTypeMsg, reviewManageCardStatusMsg} from '@/components/statusDict'
 
 import {
     getGradeListApi,getQuestionnaireTaskListApi,addQuestionnaireTaskListApi,
-    getSchoolYearListApi,oppenOrCloseQuestionnaireTaskApi
+    getSchoolYearListApi,oppenOrCloseQuestionnaireTaskApi,
+    editQuestionnaireTaskListApi,deleteQuestionnaireTaskApi
 
 } from '@/api/reviewManagement'
 
@@ -168,18 +169,14 @@ import { formDialogItmList } from './formDialog'
 interface QuestionnaireItm {
     id:Number | String,
     evaluationName:String,  //标题
-
     teacherName:String,  //创建人
-    // createdAt:String,   //创建时间
-    evaluationStartDatetime:String,   //创建时间
-    evaluationEndDatetime:String,   //创建时间
+    evaluationStartDatetime:String,   //开始时间
+    evaluationEndDatetime:String,   //结束时间
+    time:String,  //开始时间 + 结束时间
     evaluationStatus:Number,   //1 已使用   0 未使用
     cardStatus:Number,
-    openStatus:Boolean,
+    openStatus:Boolean,    // 0 关闭   1 开启 
     evaluationType:Number|String,
-    
-    time:String,
-    openStatus:Boolean,
     evaluationGrade:Array<String>,
     status:Boolean,
 
@@ -206,7 +203,7 @@ const HandleSearchChange = (params,key)=>{
 const GetSchoolYearList =  async()=>{
     let res = await getSchoolYearListApi()
     let schoolYearOpt = []
-    if(res.code == 200){
+    if(res?.code == 200){
         schoolYearOpt = res?.data?.map(item=>{
             return {
                 label:item.schoolYearName,
@@ -259,7 +256,7 @@ const GetQuestionnaireTaskList = async ()=>{
     }
     let res = await getQuestionnaireTaskListApi(params)
 
-    if(res.code == 200){
+    if(res?.code == 200){
         questionnaireList.value = res.data.records.map(item=>{
             return {
                 ...item,
@@ -339,39 +336,39 @@ const HandleFormItmChange = (params)=>{
 // 打开创建问卷弹窗
 const OpenQuestionnaireDialog = async (row?:any)=>{
     formDialogVisible.value = true
-    let gradeListOption = []
-    let res = await getGradeListApi()
-    // 赋值年级下拉
-    if(res?.code == 200){
-        currentEditGradeList.value = res.data || []
-        gradeListOption = res.data.map(item=>{
-            return {
-                label:item.gradeName,
-                value:JSON.stringify({
-                    gradeCode:item.gradeCode,
-                    gradeName:item.gradeName,
-                    gradeId:item.gradeId,
-                })
-            }
-        })
-        formDialogItmList.value = formDialogItmList.value.map(item=>{
-            if(item.key == 'evaluationGrade'){
-                return {
-                    ...item,
-                    selectList:gradeListOption
-                }
-            }else {
-                return item
-            }
-        })
-    }
     if(row.id){
-        // 修改弹窗
+        // 修改
         defaultFormData.value = row
         // 要判断表单的显隐藏
         UpdataEditOrAddFormHideOfDifferReviewType(row.id, row.evaluationType);
     }else{
-        // 新增弹窗
+        // 新增
+        let gradeListOption = []
+        let res = await getGradeListApi()
+        // 赋值年级下拉
+        if(res?.code == 200){
+            currentEditGradeList.value = res.data || []
+            gradeListOption = res.data.map(item=>{
+                return {
+                    label:item.gradeName,
+                    value:JSON.stringify({
+                        gradeCode:item.gradeCode,
+                        gradeName:item.gradeName,
+                        gradeId:item.gradeId,
+                    })
+                }
+            })
+            formDialogItmList.value = formDialogItmList.value.map(item=>{
+                if(item.key == 'evaluationGrade'){
+                    return {
+                        ...item,
+                        selectList:gradeListOption
+                    }
+                }else {
+                    return item
+                }
+            })
+        }
         UpdataFormDialogItmHideList([''])
     }
 }
@@ -394,7 +391,6 @@ const AddQuestionnaireTask = async (params?:any)=>{
             selectStatus: exitAim ? 1 : 0
         }
     })
-
     let finalPrams = {
         evaluationName: formData.evaluationName,
         evaluationType: formData.evaluationType,
@@ -402,10 +398,14 @@ const AddQuestionnaireTask = async (params?:any)=>{
         evaluationEndDatetime: unioformDateTransform(formData.evaluationEndDatetime),
         gradeData:gradeData
     }
-
     let res = undefined
     try{
-        res = await addQuestionnaireTaskListApi(finalPrams)
+        if(formData.id){
+            // 修改
+            res = await editQuestionnaireTaskListApi({...finalPrams,id:formData.id})
+        }else{
+            res = await addQuestionnaireTaskListApi(finalPrams)
+        }
     }catch{}
 
     if(res?.code == 200){
@@ -452,13 +452,12 @@ const HandleDialogConfirm = async ()=>{
     dialogSubmitLoading.value = true
     let res = undefined
     try{
-        // res =  await deleteQuestionnaireApi(currentOperationRow.value.id)
+        res = await deleteQuestionnaireTaskApi(currentOperationRow.value.id)
     }catch{}
     if(res?.code == 200){
         ElMessage.success(res?.msg)
         HandleDialogClose()
-
-
+        await GetQuestionnaireTaskList()
     }else{
         dialogSubmitLoading.value = false
     }

src/views/reviewManagement/formDialog.ts

@@ -1,5 +1,5 @@
 import { ref } from "vue"
-import { cardTypeMsg } from "@/components/statusDict"
+import { reviewManageTaskTypeMsg } from "@/components/statusDict"
 export const formDialogItmList = ref([
     {
         key: 'evaluationName',
@@ -15,7 +15,7 @@ export const formDialogItmList = ref([
         key: 'evaluationType',
         label: '评价方式',
         type: 'radio',
-        selectList:cardTypeMsg,
+        selectList:reviewManageTaskTypeMsg,
         rules: [
             { required: true, message: '请选择评价方式', trigger: 'change' }
         ]

src/views/surveyManagement/SurveyManagement.vue

@@ -28,7 +28,7 @@
                 >
                     <QuestionnaireCard 
                         :questionnaire="questionnaire"
-                        :cardStatusMsg="cardStatusMsg"
+                        :cardStatusMsg="surveyManagementCardStatusMsg"
                         cardType="questionnareManage"
                     >
                         <template #default="{row}">
@@ -61,7 +61,7 @@
                 </template>
 
                 <template #useStatus="{row}">
-                    <TableRowStatus :useStatus="row.useStatus" :statusMsg="useStatusConvert"></TableRowStatus>
+                    <TableRowStatus :useStatus="row.useStatus" :statusMsg="surveyManagementRowStatusConvert"></TableRowStatus>
                 </template>
 
                 <template #operation="{row}">
@@ -108,7 +108,7 @@ import { getQuestionnaireListApi , copyQuestionnaireApi,deleteQuestionnaireApi}
 
 import { viewModeTabList } from './tabSearch';  //视图项配置
 import { questionnaireTableColumns } from './table';
-import {useStatusConvert} from '@/components/statusDict'
+import {surveyManagementCardStatusMsg,surveyManagementRowStatusConvert} from '@/components/statusDict'
 
 
 
@@ -140,19 +140,6 @@ const totalNum = ref(0)
 const pageSize = ref(20)
 const questionnaireList = ref<QuestionnaireItm[]>([]);
 
-// 问卷状态展示
-const cardStatusMsg = ref([
-    {
-        statusFlag:0,
-        title:'未使用',
-        themeClass:'unused'
-    },
-    {
-        statusFlag:1,
-        title:'已使用',
-        themeClass:'used'
-    },
-])
 
 const GetQuestionnaireList = async ()=>{
     let params = {