From 2c934204201896027506ae3dac38ae0441657196 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 21 May 2024 21:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=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 +++++++++++--------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/views/gratefulteacher/AddLevelImportTec.vue b/src/views/gratefulteacher/AddLevelImportTec.vue
index 4c3f6daf..5e9b62ac 100644
--- a/src/views/gratefulteacher/AddLevelImportTec.vue
+++ b/src/views/gratefulteacher/AddLevelImportTec.vue
@@ -270,7 +270,7 @@ export default {
         const sizeBig = info.file.size < 50000000
         if(!sizeBig){
           message.destroy();
-          message.error("文件大小不能超过50M")
+          message.error("文件大小超出50M，请重新上传")
           return
         }
       }
diff --git a/src/views/gratefulteacher/InstructorCertification.vue b/src/views/gratefulteacher/InstructorCertification.vue
index f3f56bb1..d9056df9 100644
--- a/src/views/gratefulteacher/InstructorCertification.vue
+++ b/src/views/gratefulteacher/InstructorCertification.vue
@@ -318,13 +318,14 @@ const onChange = (pageNo,pageSize) => {
 const ViewReviewShow =ref(null)
 
 const centerDialogVisible = ref(false)
-const SkipManagement = (id,description,time)=>{
+const SkipManagement = (id,description,time,isView)=>{
   
   router.push({
     path: '/LecturerManagement',
     query: {id,
       description:description,
-      time:time
+      time:time,
+      isView
     },
   //   name:'LecturerManagement',
   //   params:{
@@ -333,13 +334,14 @@ const SkipManagement = (id,description,time)=>{
   // }
   })
 }
-const toLecture = (id,description,time) =>{
+const toLecture = (id,description,time,isView) =>{
   router.push({
     path: '/LecturerManagement',
     query: {id,
       description:description,
       time:time,
     lecture:true,
+    isView
     }
   })
 }
@@ -513,9 +515,9 @@ function handleOper(record, type, status = "") {
         <span  style="text-align: center;">
           <a style="margin-right: 7px;" v-if="record.isView" @click="editFee(record)">编辑</a>
 
-          <a style="margin-right: 7px;" @click='SkipManagement(record.id,record.description,record.name)'>管理</a>
+          <a style="margin-right: 7px;" @click='SkipManagement(record.id,record.description,record.name,record.isView)'>管理</a>
 
-          <a  style="margin-right: 7px;" @click="toLecture(record.id,record.description,record.name)">
+          <a  style="margin-right: 7px;" @click="toLecture(record.id,record.description,record.name,record.isView)">
           评审
           </a>
           <DropDown v-if="uploadAdmin('examine-admin')" value="授权">
diff --git a/src/views/gratefulteacher/LecturerManagement.vue b/src/views/gratefulteacher/LecturerManagement.vue
index c12d08b0..a82eebc4 100644
--- a/src/views/gratefulteacher/LecturerManagement.vue
+++ b/src/views/gratefulteacher/LecturerManagement.vue
@@ -510,6 +510,7 @@ const SearchTeachers =async()=>{
   pageSize: 15,
   examineId: route.query.id,
   second: value2.value==null?'0':value2.value,
+  secondResult:'1',
   reviewResult:value.value,
   keyWord:value3.value
  })
@@ -905,8 +906,8 @@ const vwtext = ref(null)
   <div style="width: 100%;">
     <div class="page-top">
       <div style="margin-top: -16px">
-        <p class="title" :title="route.query.time">认证项目名称：{{ route.query.time }}</p>
-        <p class="item" :title="route.query.description" style="width:80%;line-height: 35px;height: 40px;" v-if="route.query.description">具体说明：{{ route.query.description }}</p>
+        <p class="title" :style="{marginTop:route.query.description?'16px':'36px'}" :title="route.query.time">认证项目名称：{{ route.query.time }}</p>
+        <p class="item" :title="route.query.description" style="line-height: 35px;height: 40px;" v-if="route.query.description">具体说明：{{ route.query.description }}</p>
 
       </div>
       <div @click="$router.push({ path: '/instructorcertification' })" style="cursor: pointer;">
@@ -958,7 +959,7 @@ const vwtext = ref(null)
         </div>
      
 <div style="display: flex; align-items: center; margin-top: 15px;margin-bottom: 15px;">
-  <div class="btns" style="margin-left: 15px;margin-bottom: 4.5px">
+  <div v-if="route.query.isView" class="btns" style="margin-left: 15px;margin-bottom: 4.5px">
     <proj-check-ship :type="13" :id="route.query.id" @finash="translate">
       <div class="btn btn3" >
                         <div class="search"></div>
@@ -1032,7 +1033,7 @@ const vwtext = ref(null)
           <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>
+          <a v-if="route.query.isView" style="color: #de2139" @click="handleOper(record, 'del')">删除</a>
         </span>
       </template>
     </template>
@@ -1094,7 +1095,7 @@ const vwtext = ref(null)
           <a v-if="record.endStatus == 0&&uploadAdmin('examine-admin')" style="margin-right: 7px;" @click="returnPageTwo(record)">
           退回终稿
           </a>
-          <a style="color: #de2139" @click="handleOper(record, 'del')">删除</a>
+          <a v-if="route.query.isView" style="color: #de2139" @click="handleOper(record, 'del')">删除</a>
         </span>
       </template>
     </template>
@@ -1134,7 +1135,7 @@ const vwtext = ref(null)
                   style="color: #fff ;background-color: #4ea6ff; width: 100px; height: 40px; border-radius: 8px;margin-left: 12px;"
                   >重置</a-button>
               </div>
-              <div>
+              <div v-if="route.query.isView">
                 <a-button @click="InitReview()" type="primary" style="color: #fff ;background-color: #4ea6ff;width: 100px; height: 40px;
        border-radius: 8px;margin-left: 15px; padding-left: 10px;">发起评审</a-button>
 
@@ -1181,7 +1182,7 @@ const vwtext = ref(null)
                         <a  style="margin-right: 7px;"
                           @click='getreviewdetail({ reviewId: record.id, examineId: route.query.id},record.examineResult), vwtext = record.id'>查看</a>
 
-                        <a v-if="record.examineResult === 0" @click="editReviewSave(record.reviewName, record.reviewTime, record.id)"
+                        <a v-if="record.examineResult === 0&&route.query.isView" @click="editReviewSave(record.reviewName, record.reviewTime, record.id)"
                           style="margin-right: 7px;">
                           编辑
                         </a>
@@ -1473,18 +1474,23 @@ const vwtext = ref(null)
   // flex-direction: row;
   .title{
     width: 600px;
+    margin-top: 16px;
     overflow: hidden; 
     text-overflow: ellipsis; 
     white-space: nowrap; 
   }
   .item{
-    display: -webkit-box; 
-    -webkit-line-clamp: 2; 
-    -webkit-box-orient: vertical; 
+    width: 800px !important;
     overflow: hidden; 
-    text-overflow: ellipsis;
-    box-sizing: border-box; 
-    word-break: break-word; 
+    text-overflow: ellipsis; 
+    white-space: nowrap; 
+    // display: -webkit-box; 
+    // -webkit-line-clamp: 2; 
+    // -webkit-box-orient: vertical; 
+    // overflow: hidden; 
+    // text-overflow: ellipsis;
+    // box-sizing: border-box; 
+    // word-break: break-word; 
   }
 }