From 6607133096b1d960f5397b582f69868d7666df5c Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Mon, 14 Aug 2023 17:14:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue         | 4 ++--
 src/views/faceteach/FaceTeachNoCommon.vue | 4 ++--
 src/views/faceteach/FaceTeachNoCourse.vue | 4 ++--
 src/views/faceteach/FaceTeachSignUp.vue   | 4 ++--
 src/views/faceteach/FaceTeachStuSign.vue  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 74914cc..448ffe4 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -56,7 +56,7 @@
           <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
         </div> -->
       </div>
-      <!-- <div>
+      <div>
         <div style="display: flex">
           <botton
             class="btn"
@@ -82,7 +82,7 @@
           >{{ data.isSurvery ? "已评估" : "评估" }}
           </botton>
         </div>
-      </div> -->
+      </div>
     </div>
     <!-- 基本信息 -->
 
diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue
index 175672d..7fd31f4 100644
--- a/src/views/faceteach/FaceTeachNoCommon.vue
+++ b/src/views/faceteach/FaceTeachNoCommon.vue
@@ -38,8 +38,8 @@
             <img style="width: 16px; height: 18px" src="../../assets/image/position.png"/>
             <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
           </div> -->
-<!--          <div class="time" style="margin-top: 37px">-->
-<!--          <botton class="btn" style="margin-right: 20px;width: 160px;height: 46px;" v-if="data.planDto.applyFlag" @click="onLineSignUp" :style="{	background: data.isSignUp ? '#999' : 'rgb(57, 146, 249)'}">{{data.isSignUp?'已报名':'立即报名'}}</botton>-->
+         <!-- <div class="time" style="margin-top: 37px"> -->
+         <botton class="btn" style="margin-right: 20px;width: 160px;height: 46px;margin-top: 37px;" v-if="data.planDto.applyFlag" @click="onLineSignUp" :style="{	background: data.isSignUp ? '#999' : 'rgb(57, 146, 249)'}">{{data.isSignUp?'已报名':'立即报名'}}</botton>
         </div>
       </div>
       <div style="display: flex">
diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue
index 0adeab8..f88c414 100644
--- a/src/views/faceteach/FaceTeachNoCourse.vue
+++ b/src/views/faceteach/FaceTeachNoCourse.vue
@@ -38,9 +38,9 @@
             <img style="width: 16px; height: 18px" src="../../assets/image/position.png"/>
             <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
           </div> -->
-          <!-- <div class="time" style="margin-top: 37px">
+          <div class="time" style="margin-top: 37px">
             <botton class="btn" style="margin-right: 20px;width: 260px;height: 46px;" :style="{	background: '#999'}">当前任务暂未开放，请联系管理员</botton>
-          </div> -->
+          </div>
         </div>
       </div>
       <div style="display: flex">
diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue
index 84d9171..8bd51c7 100644
--- a/src/views/faceteach/FaceTeachSignUp.vue
+++ b/src/views/faceteach/FaceTeachSignUp.vue
@@ -34,7 +34,7 @@
             <img style="width: 16px; height: 18px" src="../../assets/image/position.png"/>
             <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
           </div> -->
-          <!-- <div class="time" style="margin-top: 37px" v-if="!isCourseEnd">
+          <div class="time" style="margin-top: 37px" v-if="!isCourseEnd">
             <botton
               class="btn"
               style="margin-right: 20px;width: 160px;height: 46px;"
@@ -52,7 +52,7 @@
               @click="onLineSignUp(true)">
               重新报名
             </botton>
-          </div> -->
+          </div>
         </div>
       </div>
       <div style="display: flex">
diff --git a/src/views/faceteach/FaceTeachStuSign.vue b/src/views/faceteach/FaceTeachStuSign.vue
index 4274208..075f1a9 100644
--- a/src/views/faceteach/FaceTeachStuSign.vue
+++ b/src/views/faceteach/FaceTeachStuSign.vue
@@ -56,7 +56,7 @@
           <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
         </div> -->
       </div>
-      <!-- <div>
+      <div>
         <div style="display: flex">
           <botton
             class="btn"
@@ -66,7 +66,7 @@
           >{{ data.signFlag ? "已签到" : "签到" }}
           </botton>
         </div>
-      </div> -->
+      </div>
     </div>
     <!-- 基本信息 -->
 

From 1772ac929d3390010f3d04b088e16bbc87d76e36 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Wed, 1 Nov 2023 15:22:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=8A=E4=BC=A0=E6=A1=86=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homework/HomeworkPage.vue | 139 ++++++++++++++--------------
 1 file changed, 71 insertions(+), 68 deletions(-)

diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 3668133..19a0ee8 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -17,7 +17,8 @@
       <div>{{ sName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700; font-size: 16px">作业详情</div>
-      <div class="preNext">
+      <!-- 注释掉上一个下一个 -->
+      <!-- <div class="preNext">
 		   <span @click="prevPage" v-if="hasPrev">
           <button class="btn btn01"></button>
           <span class="content" style="margin-left: 6px">上一个</span>
@@ -26,7 +27,7 @@
           <span class="content" style="margin-left: 31px">下一个</span>
           <button class="btn btn02" style="margin-left: 6px"></button>
         </span>
-      </div>
+      </div> -->
       <div class="return">
         <div style="display: flex" @click="returnclick">
           <el-button style="color: #0073fb">
@@ -107,73 +108,75 @@
                 </div>
               </div>
             </div>
-            <div
-              class="uploadDetail"
-              :style="{
-                display:
-                  showFileList && fileList && fileList.length > 0
-                    ? 'block'
-                    : 'none',
-              }"
-              @mousemove="showFileList = 1"
-              @mouseout="showFileList = 0"
-              style="padding-top: 60px"
-            >
-              <div class="triangle"></div>
-              <div class="square clearfix">
-                <div
-                  class="squarecontent1"
-                  v-for="(file, i) in fileList"
-                  :key="i"
-                >
-                  <FileTypeImg
-                    v-model="file.name"
-                    :style="{ margin: '12px 15px 0 27px' }"
-                  ></FileTypeImg>
-                  <div class="rarDetail">
-                    <span class="detail1" style="margin-right: 130px">
-                      {{ file.name }}
-                    </span>
-                    <span class="detail2" style="margin-right: 10px"
-                      >{{ file.percentage }}%</span
-                    >
-                    <span class="detail1">{{
-                      {
-                        ready: "正在上传",
-                        abort: "暂停",
-                        uploading: "正在上传",
-                        fail: "上传失败",
-                        success: "上传成功",
-                      }[file.status]
-                    }}</span>
-                    <div class="progress">
-                      <div
-                        class="progressinner"
-                        :style="{ width: `${(291 * file.percentage) / 100}px` }"
-                      ></div>
+            <div style="display: flex;justify-content: flex-end;">
+              <div
+                class="uploadDetail"
+                :style="{
+                  display:
+                    showFileList && fileList && fileList.length > 0
+                      ? 'block'
+                      : 'none',
+                }"
+                @mousemove="showFileList = 1"
+                @mouseout="showFileList = 0"
+                style="padding-top: 60px"
+              >
+                <div class="triangle"></div>
+                <div class="square clearfix">
+                  <div
+                    class="squarecontent1"
+                    v-for="(file, i) in fileList"
+                    :key="i"
+                  >
+                    <FileTypeImg
+                      v-model="file.name"
+                      :style="{ margin: '12px 15px 0 27px' }"
+                    ></FileTypeImg>
+                    <div class="rarDetail">
+                      <span class="detail1" style="margin-right: 130px">
+                        {{ file.name }}
+                      </span>
+                      <span class="detail2" style="margin-right: 10px"
+                        >{{ file.percentage }}%</span
+                      >
+                      <span class="detail1">{{
+                        {
+                          ready: "正在上传",
+                          abort: "暂停",
+                          uploading: "正在上传",
+                          fail: "上传失败",
+                          success: "上传成功",
+                        }[file.status]
+                      }}</span>
+                      <div class="progress">
+                        <div
+                          class="progressinner"
+                          :style="{ width: `${(291 * file.percentage) / 100}px` }"
+                        ></div>
+                      </div>
                     </div>
+                    <button class="btn btndetail" @click="reUpload(i)">
+                      {{
+                        {
+                          ready: "暂停",
+                          uploading: "暂停",
+                          abort: "开始",
+                          fail: "重传",
+                        }[file.status]
+                      }}
+                    </button>
+                    <button class="btn" @click="remove">
+                      {{
+                        {
+                          ready: "取消",
+                          abort: "取消",
+                          uploading: "取消",
+                          fail: "取消",
+                          success: "删除",
+                        }[file.status]
+                      }}
+                    </button>
                   </div>
-                  <button class="btn btndetail" @click="reUpload(i)">
-                    {{
-                      {
-                        ready: "暂停",
-                        uploading: "暂停",
-                        abort: "开始",
-                        fail: "重传",
-                      }[file.status]
-                    }}
-                  </button>
-                  <button class="btn" @click="remove">
-                    {{
-                      {
-                        ready: "取消",
-                        abort: "取消",
-                        uploading: "取消",
-                        fail: "取消",
-                        success: "删除",
-                      }[file.status]
-                    }}
-                  </button>
                 </div>
               </div>
             </div>
@@ -703,7 +706,7 @@ function reUpload(i) {
         }
 
         .uploadDetail {
-          position: absolute;
+          // position: absolute;
           //top: 235px;
           right: 3px;
           z-index: 100;