From 9bc168984655f26e21c916c9875249428dc542e6 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 17 May 2024 21:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=AE=B2=E5=B8=88=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gratefulteacher/AddLevelImportTec.vue     |  2 +-
 .../InstructorCertification.vue               | 12 +++++--
 .../gratefulteacher/LecturerManagement.vue    | 32 +++++++++++++------
 src/views/gratefulteacher/QrCode.vue          | 13 +++++---
 src/views/gratefulteacher/tablemodel.vue      |  4 +--
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/views/gratefulteacher/AddLevelImportTec.vue b/src/views/gratefulteacher/AddLevelImportTec.vue
index 293cdcc7..c6b0eb3f 100644
--- a/src/views/gratefulteacher/AddLevelImportTec.vue
+++ b/src/views/gratefulteacher/AddLevelImportTec.vue
@@ -105,7 +105,7 @@
               </div>
               <div
               v-if="successNum || errfile "
-                :class="downloadErrUrl == '' ? 'succebox' : 'defeatbox'"
+              :class="errfile >0 ? 'defeatbox' : 'succebox'"  
               >
                 <div class="lefimg"></div>
                 <div class="tacl">
diff --git a/src/views/gratefulteacher/InstructorCertification.vue b/src/views/gratefulteacher/InstructorCertification.vue
index a5c278aa..f56acd6c 100644
--- a/src/views/gratefulteacher/InstructorCertification.vue
+++ b/src/views/gratefulteacher/InstructorCertification.vue
@@ -281,6 +281,10 @@ const deleteExamine = async(id)=>{
  await delExamine({
 id
 })
+if (data.value.length == 1) {
+  current1.value = current1.value - 1
+ 
+}
 message.success('删除成功')
 getlist()
 
@@ -331,7 +335,7 @@ const getlist = async() =>{
 const res = await getexamineList({
   pageNo: current1.value,
   pageSize: pageSize.value,
-  name: "",
+  name: !searchValue.value?'':searchValue.value,
   isSuper:Administrator.value
 
 })
@@ -403,7 +407,7 @@ function handleOper(record, type, status = "") {
   
   :row-selection="rowSelection"
     :pagination="false"
-
+    :scroll="{ x: 'max-content' }"
      :columns="ViewReviewcolumns" 
      :data-source="ViewReviewdata" 
 
@@ -706,5 +710,7 @@ margin-left: 44.5px;
           // margin-left: 24px;
         }
       }      
-
+:deep(.ant-table-tbody > tr > td:nth-last-child(4)) {
+text-align: left;
+}
 </style>
diff --git a/src/views/gratefulteacher/LecturerManagement.vue b/src/views/gratefulteacher/LecturerManagement.vue
index be2ebc00..d0605503 100644
--- a/src/views/gratefulteacher/LecturerManagement.vue
+++ b/src/views/gratefulteacher/LecturerManagement.vue
@@ -84,7 +84,7 @@ const startReviewSave = async () => {
       message.info('添加成功');
 
       rwname.value = null
-      getReviewList()
+      searchReview()
       InitiateReviewShow.value = false
 
 
@@ -114,7 +114,7 @@ const startReviewSave = async () => {
       "teacherIds": teacherid.value
     }).then(res => {
       if (res) {
-        getReviewList()
+        searchReview()
         message.info('编辑成功');
         InitiateReviewShow.value = false
 
@@ -347,6 +347,10 @@ const remould = () => {
     for (let i = 0; i < ViewReList.value[arrayLists.value[0]].length; i++) {
       const obj = {};
       for (const key of arrayLists.value) {
+        if (ViewReList.value[key][i]===-1) {
+          obj[key] = null
+          continue;
+        }
         obj[key] = ViewReList.value[key][i];
       }
       ViewReviewdata.value.push(obj);
@@ -382,6 +386,7 @@ if (reviewdata.value.length == 1) {
   ReviewPageNo.value = ReviewPageNo.value - 1
  
 }
+message.success('删除成功')
   getReviewList()
 }
 
@@ -426,6 +431,10 @@ const delteacherIds = async (id) => {
   ).then(res=>{
     if(res.code == 200){
       message.success("删除成功")
+      if (data.value.length == 1) {
+        current1.value = current1.value - 1
+ 
+}
       getTeacher()
       getTeacher2()
     }
@@ -435,8 +444,11 @@ const delteacherIdList = async () => {
   await deleTeTeacher(
     { "teacherIds": selectedRowKeysList.value }
   )
-  message.info('删除成功');
-  console.log('sha c  sss');
+   message.info('删除成功');
+  if (data.value.length == 1) {
+        current1.value = current1.value - 1
+}
+  console.log(data.value.length,'sha c  sss');
   getTeacher()
   getTeacher2()
 }
@@ -501,7 +513,7 @@ const translateTeacher = (flag) => {
   handleRest()
 }
 const translate = (flag) => {
-  handleRest()
+  SearchTeachers()
 }
 //2次认证
 const total2 = ref(null)
@@ -1143,14 +1155,14 @@ const vwtext = ref(null)
                           @click="handleMenuClick(record.reviewName, record.reviewTime.slice(0, 7), record)">二维码</a>
                           <div>
 
-                        <a style="margin-right: 7px;"
+                        <a  style="margin-right: 7px;"
                           @click='getreviewdetail({ reviewId: record.id, examineId: route.query.id},record.examineResult), vwtext = record.id'>查看</a>
 
-                        <a @click="editReviewSave(record.reviewName, record.reviewTime, record.id)"
+                        <a v-if="record.examineResult === 0&&uploadAdmin('examine-admin')" @click="editReviewSave(record.reviewName, record.reviewTime, record.id)"
                           style="margin-right: 7px;">
                           编辑
                         </a>
-                        <a @click="handleOperReview(record.id)" style="color: #de2139">删除</a>
+                        <a v-if="record.examineResult === 0&&uploadAdmin('examine-admin')" @click="handleOperReview(record.id)" style="color: #de2139">删除</a>
                       </div>
                       </span>
                     </div>
@@ -1176,7 +1188,7 @@ const vwtext = ref(null)
                   <div style="font-size: 16px;margin: 20px 0;"> 评审时间：<span>2024.05.30 14:00</span></div>
                   <div style="font-size: 16px;margin-bottom: 20px;">评审结果：</div>
                   <div>
-                    <a-table :pagination="false" :columns="ViewReviewcolumns" :data-source="ViewReviewdata"
+                    <a-table :pagination="false" :columns="ViewReviewcolumns" :scroll="{ x: 'max-content' }" :data-source="ViewReviewdata"
                       class="ant-table-striped" size="middle">
                       <template #bodyCell="{ column, record, index, text }">
                         <template v-if="column.key === 'name'">
@@ -1189,7 +1201,7 @@ const vwtext = ref(null)
                             {{ text === 0 ? '通过' : (text === 1 ? '未通过' : (text === 2 ? '进行中' : '已报名')) }}
                           </span> -->
                           <span>
-                            {{ text === 0 ? '通过' : (text === 1 ? '未通过' : (null)) }}
+                            {{ record.平均分 >= 80 ? '通过' : (record.平均分 < 80 ? '未通过' : (null)) }}
                           </span>
                         </template>
                         <template v-else-if="column.key === '平均分'">
diff --git a/src/views/gratefulteacher/QrCode.vue b/src/views/gratefulteacher/QrCode.vue
index 73afe582..f2ca46bf 100644
--- a/src/views/gratefulteacher/QrCode.vue
+++ b/src/views/gratefulteacher/QrCode.vue
@@ -13,6 +13,7 @@
         <div class="qr_header"></div>
         <div class="qr_main">
           <div class="qrm_header">
+       
             <span>{{ title }}</span>
             <div class="close_exit" @click="close"></div>
           </div>
@@ -27,8 +28,9 @@
     justify-content: center;
     margin-bottom: 10px;
     ">
-            
-                <div  class="codename">{{ name }}</div>
+        
+            <div  class="codename" :title="name">{{ name }}</div>
+                
               
               </div>
               <QrcodeVue :value="url" :size="size" style="width: 200px; height: 200px"></QrcodeVue>
@@ -197,9 +199,9 @@
           text-overflow: ellipsis;
           max-width: 300px;
         }
-        .codename:hover{
-          overflow: visible;
-        }
+        // .codename:hover{
+        //   overflow: visible;
+        // }
       }
   
       .codeUrl {
@@ -289,4 +291,5 @@
   .ant-modal-body {
     padding: 0 !important;
   }
+  
   </style>
\ No newline at end of file
diff --git a/src/views/gratefulteacher/tablemodel.vue b/src/views/gratefulteacher/tablemodel.vue
index 956467cb..c6502971 100644
--- a/src/views/gratefulteacher/tablemodel.vue
+++ b/src/views/gratefulteacher/tablemodel.vue
@@ -118,10 +118,10 @@
             <!-- <span style="margin-top: 20px">数据删除后不可恢复！</span> -->
           </div>
           <div style="width:100%;display:flex;justify-content:center;align-items:center">
-            <div style="width:100px" @click="closeSameModal">
+            <div style=" cursor: pointer;border: none;height: 38px; width: 100px;background: #4ea6ff; line-height: 38px;text-align: center;border-radius: 8px;color: #ffffff;" @click="closeSameModal">
               <div >取消</div>
             </div>
-            <div  @click="sureSameModal">
+            <div style="margin-left: 10px; cursor: pointer;border: none;height: 38px; width: 100px;background: #4ea6ff; line-height: 38px;text-align: center;border-radius: 8px;color: #ffffff;" @click="sureSameModal">
               <div>确定</div>
             </div>
           </div>