细节

2025-12-09 02:46:45 +08:00 · 2024-05-17 13:28:45 +08:00
parent 9023772e28
commit ecabc8414b
8 changed files with 63 additions and 66 deletions
--- a/src/assets/images/gratefulteacher/e2.png
+++ b/src/assets/images/gratefulteacher/e2.png
--- a/src/assets/images/gratefulteacher/e3.png
+++ b/src/assets/images/gratefulteacher/e3.png
--- a/src/assets/images/gratefulteacher/s1.png
+++ b/src/assets/images/gratefulteacher/s1.png
--- a/src/assets/images/gratefulteacher/success.png
+++ b/src/assets/images/gratefulteacher/success.png
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -497,7 +497,19 @@
                }
                if (
                        n.indexOf("/InstructorCertification") !== -1 ||
-                        n.indexOf("/InstructorCertification") !== -1
+                        n.indexOf("/instructorcertification") !== -1
+                ) {
+                  state.list = [
+                    {
+                      name: "教师专区",
+                    }, {
+                      name:'讲师认证'
+                    }
+                  ];
+                }
+                if (
+                        n.indexOf("/LecturerManagement") !== -1 ||
+                        n.indexOf("/lecturermanagement") !== -1
                ) {
                  state.list = [
                    {
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -339,7 +339,7 @@
          </a-menu-item>
        </a-sub-menu>
        <!-- 教师专区 -->
-        <a-sub-menu key="sub22" @titleClick="titleClick" v-if="checkMenu('gratefulnotice,gratefulcarousel,teacherempowerment,teachertopic,tooldown,teacheropinion,InstructorCertification')">
+        <a-sub-menu key="sub22" @titleClick="titleClick" v-if="checkMenu('gratefulnotice,gratefulcarousel,teacherempowerment,teachertopic,tooldown,teacheropinion,instructorcertification')">
          <template #icon>
            <div class="imgBox">
              <img
@@ -377,14 +377,14 @@
            <router-link to="/teacherempowerment">教师赋能</router-link>
          </a-menu-item>

-          <a-menu-item key="sub22-7" >
+          <a-menu-item key="sub22-7" v-if="checkMenu('instructorcertification')">
            <span
                :class="{
                circleActive: selectedKeys[0] === 'sub22-7' ? true : false,
                circle: selectedKeys[0] === 'sub22-7' ? false : true,
              }"
            ></span>
-            <router-link to="/InstructorCertification">讲师认证</router-link>
+            <router-link to="/instructorcertification">讲师认证</router-link>
          </a-menu-item>

          <a-menu-item key="sub22-4" v-if="checkMenu('teachertopic')">
@@ -950,7 +950,7 @@ export default {
          pagename: "意见",
        },
        {
-          href: "/InstructorCertification",
+          href: "/instructorcertification",
          openKeys: "sub22",
          selectedKeys: "sub22-7",
          pagename: "讲师认证",
--- a/src/views/gratefulteacher/InstructorCertification.vue
+++ b/src/views/gratefulteacher/InstructorCertification.vue
@@ -56,14 +56,6 @@ const ViewReviewcolumns =[
    key: 'id',
    ellipsis: true,
  },
-  {
-    title: "课程分类",
-    name: 'courseContent',
-    dataIndex: 'courseContent',
-    key: 'id',
-    align: "center",
-    ellipsis: true,
-  },
  {
    title: "创建人",
    name: 'createName',
@@ -168,13 +160,10 @@ const ViewReviewDataShow = ref([])
 function selectCourse(row) {
  console.log(row);
  row.courseName = row.name
-  row.courseContent = '在线课'
  row.createName = row.sysCreateBy
  row.createTime = row.publishTime
  row.newId = 2
-  console.log(row,'row')
  if (!ViewReviewDataShow.value.some(item => item.id === row.id)) {
-    console.log('添加')
    ViewReviewdata.value.push(row);
    ViewReviewDataShow.value.push(row);
  }
@@ -228,18 +217,10 @@ const falseData = () => {
  ViewReviewShow.value = false
 }
 const AddList = () => {
-  console.log(ViewReviewdata.value,'数据')
  if(ViewReviewDataShow.value.length==0){
    message.error('请选择课程')
    return
  }
-  // const data = ViewReviewDataShow.value.map(item=>{
-  //   return {
-  //     courseName: item.name,
-  //     courseContent: '',
-  //     courseId: item.orgId
-  //   }
-  // })
  const filteredData = ViewReviewdata.value.filter(item => item.newId === 2);
  if(filteredData.length==0){
    message.error('请选择课程')
@@ -247,7 +228,6 @@ const AddList = () => {
  }
  const transformedData = filteredData.map(item => ({
    courseName: item.name,
-    courseContent: '',
    courseId: item.orgId
  }));
  addCourse(transformedData).then(res=>{
--- a/src/views/gratefulteacher/LecturerManagement.vue
+++ b/src/views/gratefulteacher/LecturerManagement.vue
@@ -423,9 +423,13 @@ const delteacherIds = async (id) => {
        id
      ]
    }
-  )
-  console.log('sha c  sss');
-  getTeacher()
+  ).then(res=>{
+    if(res.code == 200){
+      message.success("删除成功")
+      getTeacher()
+      getTeacher2()
+    }
+  })
 }
 const delteacherIdList = async () => {
  await deleTeTeacher(
@@ -434,6 +438,7 @@ const delteacherIdList = async () => {
  message.info('删除成功');
  console.log('sha c  sss');
  getTeacher()
+  getTeacher2()
 }
 //导出讲师
 const exportExcel = () => {
@@ -462,7 +467,6 @@ function handleOper(record, type, status = "") {
  dialog({
    content: "确认删除吗？数据删除后不可恢复",
    ok: () => {
-
      delteacherIds(record.id)
    }
  });
@@ -473,14 +477,14 @@ const SearchTeachers =async()=>{
  pageNo: 1,
  pageSize: 8,
  examineId: route.query.id,
-  secondResult: value2.value,
+  secondResult: value2.value==null?'1':value2.value,
  reviewResult:value.value,
  keyWord:value3.value
 })
 total.value = res.data.total
 data.value = res.data.records

- if(value2.value=='1'){
+ if(value2.value=='0'){
   getTeacher2()
 }
 }
@@ -512,7 +516,6 @@ const getTeacher2 =async()=>{
  reviewResult:value.value,
  keyWord:value3.value
 })
- console.log(res,'resaaaa')
 total2.value = res.data.total
 data2.value = res.data.records
 }
@@ -776,31 +779,29 @@ const show= async (record)=>{
    //认证流程
    attestation.value =[
      //0: 已上传 1: 未上传 2:已退回
-      {name:{0:'初稿已上传',1:'初稿未上传',2:'初稿已退回'},status:processData?.value.draftStatus,images:{0:'su1.png',1:'s1.png',2:'e2.png'}},
-      {name:{0:'线上学习已完成',1:'线上学习未完成',2:'进行中'},status:processData?.value.onlineLearning,images:{0:'su2.png',1:'s2.png',2:''}},
-      {name:{0:'线下辅导已完成',1:'线上辅导未完成',2:'线上辅导已退回'},status:processData?.value.offlineTutoring,images:{0:'su3.png',1:'s3.png',2:''}},
-      {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatus,images:{0:'su4.png',1:'s4.png',2:'e3.png'}},
-      {
-      name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},
-      status:processData?.value.reviewResult,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',}},
-    ]
-    if(processData.value.secondResult == '0'){
-      processData.value.draftStatus = 0
-      processData.value.onlineLearning = 0
-      processData.value.offlineTutoringOne = 0
-      processData.value.endStatusOne = 0
-      processData.value.reviewResultOne = 1
-      attestation.value = [
-        {name:{0:'初稿已上传',1:'初稿未上传',2:'初稿已退回'},status:processData?.value.draftStatus,images:{0:'su1.png',1:'s1.png',2:'e2.png'}},
-        {name:{0:'线上学习已完成',1:'线上学习未完成',2:'线上学习已退回'},status:processData?.value.onlineLearning,images:{0:'su2.png',1:'s2.png',2:''}},
-        {name:{0:'线下辅导已完成',1:'线上辅导未完成',2:'线上辅导已退回'},status:processData?.value.offlineTutoringOne,images:{0:'su3.png',1:'s3.png',2:''}},
-        {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatusOne,images:{0:'su4.png',1:'s4.png',2:'e3.png'}},
-        {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},status:processData?.value.reviewResultOne,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',}},
-        {name:{0:'线下辅导已完成',1:'线下辅导未通过',2:'线下辅导已退回'},status:processData?.value.offlineTutoring,images:{0:'su3.png',1:'s3.png',2:''}},
-        {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatus,images:{0:'su4.png',1:'s4.png',2:'e3.png'}},
-        {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},status:processData?.value.reviewResult,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',}},
+      {name:{0:'初稿已上传',1:'初稿未上传',2:'初稿已退回'},status:processData?.value.draftStatus,images:{0:'su1.png',1:'s1.png',2:'e2.png'},color:['#3DA8F0','#DEDEDE','#FF4040','#31AF0D']},
+      {name:{0:'线上学习已完成',1:'线上学习未完成',2:'进行中'},status:processData?.value.onlineLearning,images:{0:'su2.png',1:'s2.png',2:'e2.png'},color:['#3DA8F0','#DEDEDE','#FFA050','#31AF0D']},
+      {name:{0:'线下辅导已完成',1:'线上辅导未完成',2:'线上辅导已退回'},status:processData?.value.offlineTutoring,images:{0:'su3.png',1:'s3.png',2:'e2.png'},color:['#3DA8F0','#DEDEDE','#FF4040','#31AF0D']},
+      {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatus,images:{0:'su4.png',1:'s4.png',2:'e3.png'},color:['#3DA8F0','#DEDEDE','#FF4040','#31AF0D']},
+      {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证'},status:processData?.value.reviewResult,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',},color:['#3DA8F0','#31AF0D','#FFA050','#DEDEDE']},
      ]
-    }
+      if(processData.value.secondResult == '0'){
+        processData.value.draftStatus = 0
+        processData.value.onlineLearning = 0
+        processData.value.offlineTutoringOne = 0
+        processData.value.endStatusOne = 0
+        processData.value.reviewResultOne = 1
+        attestation.value = [
+          {name:{0:'初稿已上传',1:'初稿未上传',2:'初稿已退回'},status:processData?.value.draftStatus,images:{0:'su1.png',1:'s1.png',2:'e2.png'},color:['#3DA8F0','#31AF0D','#FF4040','#DEDEDE']},
+          {name:{0:'线上学习已完成',1:'线上学习未完成',2:'线上学习已退回'},status:processData?.value.onlineLearning,images:{0:'su2.png',1:'s2.png',2:'e2.png'},color:['#3DA8F0','#31AF0D','#FF4040','#DEDEDE']},
+          {name:{0:'线下辅导已完成',1:'线上辅导未完成',2:'线上辅导已退回'},status:processData?.value.offlineTutoringOne,images:{0:'su3.png',1:'s3.png',2:'e2.png'},color:['#3DA8F0','#31AF0D','#FF4040','#DEDEDE']},
+          {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatusOne,images:{0:'su4.png',1:'s4.png',2:'e3.png'},color:['#3DA8F0','#31AF0D','#FF4040','#DEDEDE']},
+          {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},status:processData?.value.reviewResultOne,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',},color:['#3DA8F0','#FF4040','#FF4040','#DEDEDE']},
+          {name:{0:'线下辅导已完成',1:'线下辅导未通过',2:'线下辅导已退回'},status:processData?.value.offlineTutoring,images:{0:'su3.png',1:'s3.png',2:'e2.png'},color:['#3DA8F0','#31AF0D','#FF4040','#DEDEDE']},
+          {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatus,images:{0:'su4.png',1:'s4.png',2:'e3.png'},color:['#3DA8F0','#31AF0D','#FF4040','#DEDEDE']},
+          {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},status:processData?.value.reviewResult,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',},color:['#3DA8F0','#31AF0D','#FF4040','#DEDEDE']},
+        ]
+      }
    console.log(attestation.value,'value')
  })
 }
@@ -813,20 +814,24 @@ const returnPage = (record) => {
        teacherId:record.teacherId,
        version:0
      }).then(res=>{
-        console.log(res,'res')
+        message.success('退回成功')
+        getTeacher()
      })
    }
  });
 }
 const returnPageTwo = (record) => {
  dialog({
-    content: "确定退回初稿吗？",
+    content: "确定退回终稿吗？",
    ok:()=>{
      backDraft({
        teacherId:record.teacherId,
        version:1
      }).then(res=>{
-        console.log(res,'res')
+        if(res.code == 200){
+          message.success('退回成功')
+          getTeacher2()
+        }
      })
    }
  });
@@ -870,7 +875,7 @@ const vwtext = ref(null)
        <p style="width:80%;line-height: 35px;height: 40px;" v-if="route.query.description">具体说明：{{ route.query.description }}</p>

      </div>
-      <div @click="$router.push({ path: '/InstructorCertification' })" style="cursor: pointer;">
+      <div @click="$router.push({ path: '/instructorcertification' })" style="cursor: pointer;">
        <img src="../../assets/images/projectadd/return.png" alt="">
        <el-button type="primary" text style="margin-left: 10px;">返回</el-button>
      </div>
@@ -901,8 +906,8 @@ const vwtext = ref(null)
        </div>
        <div class="select" style="margin-left: 15px;">
        <a-select v-model:value="value2" style="width: 270px; border-radius: 8px"  placeholder="请选择二次认证" >
-          <a-select-option value="1">是</a-select-option>
-      <a-select-option value="0">否</a-select-option>
+          <a-select-option value="0">是</a-select-option>
+      <a-select-option value="1">否</a-select-option>
        </a-select>
      </div>
      <div style="display: flex; margin-left: 20px">
@@ -989,7 +994,7 @@ const vwtext = ref(null)
          <a  style="margin-right: 7px;" @click="show(record)">
          查看
          </a>
-          <a v-if="record.endStatus == 0&&uploadAdmin('examine-admin')" style="margin-right: 7px;" @click="returnPage(record)">
+          <a v-if="record.draftStatus == 0&&uploadAdmin('examine-admin')" style="margin-right: 7px;" @click="returnPage(record)">
          退回初稿
          </a>
          <a style="color: #de2139" @click="handleOper(record, 'del')">删除</a>
@@ -1003,8 +1008,8 @@ const vwtext = ref(null)
    <a-pagination  :showSizeChanger="false" v-model:current="current1" show-quick-jumper :total="total" @change="onChangeTeacher" />
  </div>
 <div style="height: 1px; width: 100%; background-color: #eceff4; margin-top: 15px;margin-left: 14px;"></div>
- <div style="margin-left: 14px; margin-top: 15px;margin-bottom: 12px;" >二次认证</div>
- <div style="display: flex; flex-direction: column;margin-left: 15px">
+ <div v-if="data2.length>0" style="margin-left: 14px; margin-top: 15px;margin-bottom: 12px;" >二次认证</div>
+ <div v-if="data2.length>0" style="display: flex; flex-direction: column;margin-left: 15px">
    <div class="table">
      <a-table :row-selection="rowSelection" row-key="id" :columns="twiceolumns" :data-source="data2" :scroll="{ x: 1000 }" :pagination="false">
    <template #headerCell="{ column }">
@@ -1359,7 +1364,7 @@ const vwtext = ref(null)
        <div v-if="index != 0" style="height: 2px;width: 81px;background-color: #DEDEDE;margin-top: -30px;"></div>
        <div style="display: flex;min-width: 70px;height: 78px;flex-direction: column;align-items: center">
          <img style="width: 46px;height: 46px;margin-bottom: 12px;" :src="require(`../../assets/images/gratefulteacher/${item.images[item.status]}`)" alt="">
-          <div style="font-size: 14px;" :style="{color:['#3DA8F0','#DEDEDE','#FF4040','#31AF0D'][item.status]}">{{item.name[item.status]}}</div>
+          <div style="font-size: 14px;" :style="{color:item.color[item.status]}">{{item.name[item.status]}}</div>
        </div>
      </div>
     </div>