From 3c4ac50f45f20a7bcbfe95c0c046c0c936c861fe Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 9 Aug 2024 13:58:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/site/studentWdkc/studentWdkc.vue    | 50 +++++++++++++------
 src/views/zy/zyInfo/StudentZyInfoList.vue     | 31 ++++++++----
 src/views/zy/zyInfo/ZyInfoV2List.vue          | 36 ++++++++-----
 src/views/zy/zyInfoStudentHp/ZyhpMainList.vue |  2 +-
 4 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/src/views/site/studentWdkc/studentWdkc.vue b/src/views/site/studentWdkc/studentWdkc.vue
index c576a54..28bdeb3 100644
--- a/src/views/site/studentWdkc/studentWdkc.vue
+++ b/src/views/site/studentWdkc/studentWdkc.vue
@@ -3,8 +3,8 @@
     <div style="margin-top: 20px">
       <span style="margin-left: 30px; font-size: 24px; font-weight: 600">我的课程</span>
     </div>
-    <div style="text-align: right; width: 100%;padding: 0 20px 20px 0;">
-      <a-switch v-model:checked="checked1" checkedChildren="卡片" unCheckedChildren="列表" />
+    <div style="text-align: right; width: 100%; padding-right:20px">
+      <a-switch style="margin-top:-60px" v-model:checked="checked1" checkedChildren="卡片" unCheckedChildren="列表" />
     </div>
     <div v-if="checked1">
       <div style="min-height: 200px">
@@ -17,21 +17,22 @@
             v-for="(item, index2) in dataSource"
             :key="index2"
           >
-            <div style="border: 2px #eef1f2 solid">
+            <div style="border: 1px #eef1f2 solid;  background: #fff; border-radius:10px; ">
               <div>
-                <div class="jtkcTitleClass"></div>
                 <div
                   style="
                     width: 100%;
                     white-space: normal;
                     word-break: break-all;
                     overflow: hidden;
-                    padding: 15px;
+                    padding:10px;
                     font-weight: 600;
                     font-size: 16px;
-                    color: #a50a0a;
-                    height: 70px;
-                  "
+                    color: #333;
+                    height:45px;
+                    font-family: Helvetica Neue, Helvetica, sans-serif;
+                    background: #f7f7f7;
+                     "
                 >
                   <!-- <a-badge :dot="item.dbtxType != null" :offset="[5 | 0]" :numberStyle="{ backgroundColor: '#f00', width: '10px', height: '10px' }"> -->
                     <span  class="ellipsis">{{ item.kcmc }}</span>
@@ -39,17 +40,17 @@
                 </div>
               </div>
               <a-divider style="margin: 0px; color: #eef1f2" />
-              <div class="ellipsis" :title="item.sksj">{{item.sksj}}</div>
-              <div style="padding: 20px; font-weight: 600">
+              <div style="padding:12px;">
                 <a-row>
                   <a-col :span="24">
-                    <div style="font-size: 16px; margin-top: 0px; padding: 0px; height: 45px; color: #0e6393">{{ item.skdd }}</div>
+                    <div class="ellipsis ellipsis-word" :title="item.sksj">{{item.sksj}}</div>
+                    <div class="stu-title">{{ item.skdd }}</div>
                   </a-col>
-                  <a-col :span="24" style="text-align: center">
-                    <span style="font-size: 16px; margin-top: 0px; padding: 0px; height: 45px; width: 50%; float: left; overflow: hidden" class="ellipsis" :title="item.skjs">{{
+                  <a-col :span="24" class="ellipsis-line" >
+                    <span style="font-size:15px; margin-top: 0px; padding: 0px; width: 50%; float: left; overflow: hidden" class="ellipsis" :title="item.skjs">{{
                       item.skjs
                     }}</span>
-                    <span style="font-size: 16px; margin-top: 0px; padding: 0px; height: 45px; width: 50%; float: right"
+                    <span
                       ><a-button type="primary" @click="openKecheng(item)">进入课程</a-button></span
                     >
                   </a-col>
@@ -74,7 +75,7 @@
                 <span>在{{ item.skdd }}上课，</span>
                 <span>授课教师是{{ item.skjs }}。</span>
               </a-col>
-              <a-col :span="6" style="text-align:right;"><a-button type="primary" @click="openKecheng(item)">进入课程</a-button></a-col>
+              <a-col :span="6" style="text-align:right;"><div class="ant-btn" type="primary" @click="openKecheng(item)">进入课程</div></a-col>
             </a-row>
           </a-col>
           <a-col :span="24" v-show="dataSource.length == 0">
@@ -135,4 +136,23 @@ function openKecheng(record) {
   white-space: nowrap; /* 确保文本在一行内显示 */
   text-overflow: ellipsis; /* 超出部分显示省略号 */
 }
+.ellipsis-word{
+  font-size:13px;
+  color: #888;
+  //margin-left: 10px;
+  //margin-top:10px;
+  }
+ .stu-title{
+  font-size:16px;
+  color: #1c84c6;
+  font-weight: 600;
+  font-family: Helvetica Neue, Helvetica, sans-serif;
+  padding: 10px 0;
+  }
+  .ellipsis-line{
+    display: flex;
+    margin-top: 20px;
+    justify-content: space-between;
+    align-items: flex-end;
+  }
 </style>
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 711c583..e2a56df 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff; height: calc(100vh - 225px); overflow-y: auto; overflow-x: hidden; margin: 10px 5px">
+  <div style="background: #fff;  overflow-y: auto; overflow-x: hidden; margin: 10px 5px">
     <!--查询区域-->
     <!-- <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -22,16 +22,16 @@
     </div> -->
     <a-row>
       <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: #cdf5ed">
+        <div style="width: 100%; height:40px;border-radius: 10px 10px 0 0; background-color: #e6f8f4">
           <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;" class="ellipsis">{{item.title}}</div> -->
               <div style="font-size: 18px; font-weight: bold">第{{ item.sort }}次作业(本次作业在期末成绩中的占比:{{item.zyzb}}%)</div>
             </a-col>
         </div>
-        <a-card style="height:165px; border: 1px solid #eeeeee">
+        <a-card style="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)">{{ item.title }}</a-col>
+            <a-col :span="24" class="zytitle" :title="item.title" @click="handleDetail(item)"><span class="zytitle-back">{{ item.title }}</span></a-col>
             <a-col :span="12" class="zyCon"><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"><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><span v-else>未设置互评</span></a-col>
             <a-col :span="12" class="zyCon Score-List">
@@ -96,7 +96,7 @@
               <div style="float: left" class="wpopen"  :title="item.xnsftg" @click="handleOpenCcjg(item, '3')"><span class="zyCon-word">学校作业库查重：</span>{{ getCctype(item, '4') }}</div>
               <div style="float: right" class="wpopen"  :title="item.aigcsftg" @click="handleOpenCcjg(item, '2')"><span class="zyCon-word">Aigc查重：</span>{{ getCctype(item, '3') }}</div>
             </a-col> -->
-            <a-col :span="12" style="text-align: center; margin-top:12px; border-top: 1px solid #f6f6f6; padding-top:15px">
+            <a-col :span="24" style="text-align: left; border-top: 1px solid #f6f6f6; padding-top:10px">
               <a-button class="zyCon-button" type="primary" @click="handleDetail(item)">
                 详情
               </a-button>
@@ -459,13 +459,13 @@ onMounted(() => {
 }
 .zyCon {
   line-height: 30px;
-  color: #999;
+  color: #999; 
 }
 .rotate {
   transform: rotate(45deg);
   background: linear-gradient(90deg, #93d861, #8ddc53, #35C495);
   color: #fff;
-  padding: 10px;
+  padding:17px 10px 10px 10px;
   position: relative;
   top: -68px;
   right: -400px;
@@ -509,12 +509,21 @@ onMounted(() => {
 .zyCon-button{
   margin-right: 10px;
 }
-.zytitle{
-  cursor: pointer;
-  font-size: 16px;
-  font-weight: 700;
+.zytitle{  
   overflow: hidden; /* 确保超出容器的内容被裁剪 */
   white-space: nowrap; /* 确保文本在一行内显示 */
   text-overflow: ellipsis; /* 超出部分显示省略号 */
+  margin-left: -24px;
+  margin-top:5px;
+  margin-bottom:8px;
+}
+.zytitle-back{
+  background: linear-gradient(90deg, #cdf0e9, #edfaf7);
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 700;
+  text-indent:20px;
+  padding: 5px 15px;
+  border-radius:0 30px 30px 0;
 }
 </style>
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index b7ce02e..0f49702 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -464,10 +464,7 @@
                   <span class="ellipsis elli-title" :title="item.title">{{ item.title }}</span>
                   <a class="button-zhta" @click="openXkrs(item)">{{ item.xkxs }}人选课</a>
                 </div>
-                <div style="width: 100%">
-                  <div class="ellip-word">作业发布时间：{{ item.startTime ? dayjs(item.startTime).format('YYYY.MM.DD HH:mm') : '未设置' }}</div>
-                  <div class="ellip-word">作业截止时间：{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
-                </div>
+                
                 <div style="width: 100%; display: flex">
                   <div class="data-suggest zuanqu" @click="handleZyxx(item, '1')"
                     ><span>{{ item.wtjnum }}人</span><span>待提交</span></div
@@ -482,8 +479,12 @@
                     ><span>{{ item.ypynum }}人</span><span>已评阅</span></div
                   >
                 </div>
-
-                <div style="text-align: right; margin-top: 10px; margin-bottom: -10px; width: 100%">
+                <div class="flex">
+                <div style="width:100%;display:flex;margin-top:20px">
+                  <div class="ellip-word"><span class="ellip-word2">作业发布时间：</span>{{ item.startTime ? dayjs(item.startTime).format('YYYY.MM.DD HH:mm') : '未设置' }}</div>
+                  <div class="ellip-word"><span class="ellip-word2">作业截止时间：</span>{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
+                </div>
+                <div style="text-align: right; margin-top: 20px; margin-bottom: -10px; width: 100%">
                   <a @click="handleEdit(item, true)" v-if="item.ytjnum > 0">编辑作业</a>
                   <a @click="handleChehui(item)" v-if="item.ytjnum == 0">撤回作业</a>
                   <a-divider type="vertical" />
@@ -491,6 +492,7 @@
                   <a-divider type="vertical" />
                   <a @click="handleDelete(item)" v-if="item.ytjnum == '0'">删除</a>
                 </div>
+                </div>
               </a-card>
               <a-card
                 :title="'第' + item.sort + '次作业(占比' + item.score + '%)'"
@@ -505,9 +507,9 @@
                   <span class="ellipsis elli-title" :title="item.title">{{ item.title }}</span>
                   <a class="button-zhta" @click="openXkrs(item)">{{ item.xkxs }}人选课</a>
                 </div>
-                <div style="width: 100%">
-                  <div class="ellip-word">作业发布时间：{{ item.startTime ? dayjs(item.startTime).format('YYYY.MM.DD HH:mm') : '未设置' }}</div>
-                  <div class="ellip-word">作业截止时间：{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
+                <div style="width: 100%;">
+                  <div class="ellip-word"><span class="ellip-word2">作业发布时间：</span>{{ item.startTime ? dayjs(item.startTime).format('YYYY.MM.DD HH:mm') : '未设置' }}</div>
+                  <div class="ellip-word"><span class="ellip-word2">作业截止时间：</span>{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
                 </div>
                 <div style="height: 45px">&nbsp;</div>
                 <div style="text-align: right; margin-top: 30px">
@@ -1534,10 +1536,12 @@ onMounted(() => {
 <style lang="less" scoped>
 .title {
   margin-left: 20px;
-  font-size: 18px;
+  font-size: 16px;
+  font-weight: bold;
 }
 .title2 {
-  font-size: 18px;
+  font-size:16px;
+  font-weight: bold;
 }
 .ant-divider-horizontal {
   display: flex;
@@ -1596,14 +1600,22 @@ onMounted(() => {
 .ellip-title {
   display: flex;
   justify-content: space-between;
+  align-items: flex-end;
+  margin-top: -10px;
 }
 .elli-title {
   font-size: 16px;
   font-weight: bold;
 }
 .ellip-word {
-  font-size: 14px;
+  font-size:12px;
   color: #666666;
+  margin-right: 10px;
+}
+.ellip-word2{
+ font-size:12px;
+ color: #333;
+ font-weight: bold;
 }
 .zuanqu:hover {
   cursor: pointer;
diff --git a/src/views/zy/zyInfoStudentHp/ZyhpMainList.vue b/src/views/zy/zyInfoStudentHp/ZyhpMainList.vue
index cd18f3f..1876af4 100644
--- a/src/views/zy/zyInfoStudentHp/ZyhpMainList.vue
+++ b/src/views/zy/zyInfoStudentHp/ZyhpMainList.vue
@@ -2,7 +2,7 @@
   <div style="background: #fff;  margin: 10px 0;padding:10px;">
     <div style="width:100%;">
       <a-row>
-        <a-col :span="24" style="text-align: right;"><a-button type="primary" @click="handleback">返回</a-button></a-col>
+        <a-col :span="24" style="text-align: right;margin-top:-63px;"><a-button type="primary" @click="handleback">返回</a-button></a-col>
       </a-row>
     </div>
     <a-tabs v-model:activeKey="activeKey" @change="handleChange">