From 400149a2ed414cfde025c11c8d3a2c006ac9cd3d Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 6 Sep 2024 17:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=A7=88=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/site/studentWdkc/studentMenu.vue    |  2 +-
 src/views/zy/zyInfo/StudentZyInfoList.vue     | 28 +++++++++++++------
 .../components/ZyInfoStudentForm.vue          |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/site/studentWdkc/studentMenu.vue b/src/views/site/studentWdkc/studentMenu.vue
index 84b8f5c..1991ad9 100644
--- a/src/views/site/studentWdkc/studentMenu.vue
+++ b/src/views/site/studentWdkc/studentMenu.vue
@@ -50,7 +50,7 @@
               <a-col :lg="0" :xs="{ span: 24 }" style="text-align: right;">
                 <a-menu
                   v-model:selectedKeys="selectedKeys"
-                  style="width: 98%; margin: 10px 0; "
+                  style="width: 98%; margin: 10px 0; height: 53px;"
                   mode="horizontal"
                 >
                 <a-sub-menu key="min0">
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 32bf641..cfce215 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -4,20 +4,20 @@
       <a-col :span="24" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px; border-radius: 10px; overflow: hidden;">
         <div style="width: 100%; height:40px;border-radius: 10px 10px 0 0; background-color: #f7f7f7">
           <!-- <a-col :span="24" style="height:40px; line-height:40px; padding-left:15px; color:#333; overflow: hidden;" > -->
-              <div style="font-size: 18px; font-weight: bold">第{{ item.sort }}次作业(本次作业在总成绩中的占比:{{item.zyzb}}%)</div>
+              <div style="font-size: 18px; font-weight: bold" class="ellipsis">第{{ item.sort }}次作业(本次作业在总成绩中的占比:{{item.zyzb}}%)</div>
             <!-- </a-col> -->
         </div>
-        <a-card style="height: 240px; border: 1px solid #eeeeee">
+        <a-card style="min-height: 240px; border: 1px solid #eeeeee">
           <div class="rotate" :style="classFun(item)">{{ callText(item) }}</div>
           <a-row style="top: -60px; position: relative">
             <a-col :span="24" class="zytitle" :title="item.title" @click="handleDetail(item)"
-              ><span class="zytitle-back">{{ item.title }}</span></a-col
+              ><span class="zytitle-back ellipsis">{{ item.title }}</span></a-col
             >
-            <a-col :span="12" class="zyCon"
+            <a-col :lg="12" class="zyCon ellipsis"
               ><span class="zyCon-word">作业时间：</span>{{ dayjs(item.startTime).format('YYYY.MM.DD HH:mm') }} ~
               {{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</a-col
             >
-            <a-col :span="12" class="zyCon"
+            <a-col :lg="12" class="zyCon ellipsis"
               ><span class="zyCon-word">互评时间：</span
               ><span v-if="item.xshpkg == '1'"
                 >{{ dayjs(item.xshpkssj).format('YYYY.MM.DD HH:mm') }} ~ {{ dayjs(item.xshpjssj).format('YYYY.MM.DD HH:mm') }}</span
@@ -121,6 +121,7 @@ import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListM
 import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue';
 import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
 import { def } from '@vue/shared';
+import { encryptByBase64 } from '/@/utils/cipher';
 
 //当前路由信息
 const { currentRoute } = useRouter();
@@ -333,9 +334,20 @@ function handleShangchuan(record) {
 
 //预览
 function handlePreview(record) {
-  var url2 = getFileAccessHttpUrl(record.stuPdfPath);
-  let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
-  window.open(url, '_blank');
+  const parts = record.stuFilePath.split('.');
+  const filetype = parts[parts.length - 1];
+  if(filetype=='jpg' || filetype=='png' || filetype=='jpeg' || filetype=='xls' || filetype=='xlsx' || filetype=='text' ){
+    var file = baseApiUrl + "/"+record.stuFilePath;
+    console.log('🤬', file);
+    window.open('https://fileview.jeecg.com/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file))); 
+  }else if(filetype=='doc' || filetype=='docx' || filetype=='pdf'){
+    var url2 = getFileAccessHttpUrl(record.stuPdfPath);
+    let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+    window.open(url, '_blank');
+  }else{
+    createMessage.error('暂不支持该文件预览！');
+  }
+ 
 }
 
 function handleDownload(record) {
diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
index d7f95ec..1f50469 100644
--- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
+++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
@@ -87,7 +87,7 @@
                   </a-form-item>
                 </a-form-item>
               </a-col>
-              <a-col :span="24" v-if="!isYl" style="text-align: left; margin-left:220px; margin-top:20px">
+              <a-col :span="24" v-if="!isYl" style="text-align: center; margin-top:20px">
                 <div v-if="zyInfo.sfcc == '1'">
                   <j-upload v-model:value="formData.filePath"  :disabled="disabled" maxCount="1" accept=".doc,.docx,.pdf" :text="`上传作业`" style="background: #ededed; " :forceAcceptVerify="true" ></j-upload>
                 </div>