From 80e3fc6477cfc0284d8c46e45bcdb3ea11732a4a Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 3 Jan 2023 15:51:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ExportScore.vue        | 616 +++++++++---------
 src/components/drawers/FaceStu.vue            |   2 +
 .../drawers/project/ProjectExamManage.vue     |  18 +-
 .../drawers/project/ProjectHomeWorkManage.vue |  10 +-
 4 files changed, 331 insertions(+), 315 deletions(-)

diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index 2bd90d43..f782d44e 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -1,317 +1,316 @@
+
 <template>
-    <a-drawer
-      :visible="eScorevisible"
-      class="drawerStyle ExportScore"
-      placement="right"
-      width="700px"
-      @after-visible-change="afterVisibleChange"
-    >
-      <div class="drawerMain">
-        <div class="header">
-          <div class="headerTitle">导入成绩</div>
-          <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-          />
+  <a-drawer
+    :visible="eScorevisible"
+    class="drawerStyle ExportScore"
+    placement="right"
+    width="700px"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain">
+      <div class="header">
+        <div class="headerTitle">导入成绩</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
+      </div>
+      <div class="main">
+        <div class="minatitl">
+          <div class="up1">请下载</div>
+          <div class="up2">模板</div>
+          <div class="up1">，按要求填写数据并导入</div>
         </div>
-        <div class="main">
-          <div class="minatitl">
-            <div class="up1">请下载</div>
-            <div class="up2">模板</div>
-            <div class="up1">，按要求填写数据并导入</div>
-          </div>
-          <div class="upload">
-            <div class="text">上传：</div>
-            <div class="right">
-              <div class="load">
-                <div class="cloud"></div>
-                <div class="tip">点击或将文件拖拽到此处上传</div>
-                <div class="tipz">支持扩展名：.xls/.xlsx</div>
+        <div class="upload">
+          <div class="text">上传：</div>
+          <div class="right">
+            <div class="load">
+              <div class="cloud"></div>
+              <div class="tip">点击或将文件拖拽到此处上传</div>
+              <div class="tipz">支持扩展名：.xls/.xlsx</div>
+            </div>
+            <div class="loadstate">
+              <div class="loadborder">
+                <div class="content">
+                  <div class="img"></div>
+                  <div class="timebox">
+                    <div class="timetop">
+                      <div class="tit">京东方商业模型.xls</div>
+                      <div class="stateloading">正在上传</div>
+                    </div>
+                    <div class="prog">
+                      <div class="inprogloading"></div>
+                    </div>
+                  </div>
+                  <div class="curloading">
+                    <div class="cur">55%</div>
+                    <div class="cancel" style="margin-left: 20px">暂停</div>
+                    <div class="cancel" style="margin-left: 15px">取消</div>
+                  </div>
+                </div>
               </div>
-              <div class="loadstate">
-                <div class="loadborder">
-                  <div class="content">
-                    <div class="img"></div>
-                    <div class="timebox">
-                      <div class="timetop">
-                        <div class="tit">京东方商业模型.xls</div>
-                        <div class="stateloading">正在上传</div>
-                      </div>
-                      <div class="prog">
-                        <div class="inprogloading"></div>
-                      </div>
+              <div class="loadborder">
+                <div class="content">
+                  <div class="img"></div>
+                  <div class="timebox">
+                    <div class="timetop">
+                      <div class="tit">京东方商业模型.xls</div>
+                      <div class="statedefeat">上传失败</div>
                     </div>
-                    <div class="curloading">
-                      <div class="cur">55%</div>
-                      <div class="cancel" style="margin-left: 20px">暂停</div>
-                      <div class="cancel" style="margin-left: 15px">取消</div>
+                    <div class="prog">
+                      <div class="inprogdefeat"></div>
                     </div>
                   </div>
-                </div>
-                <div class="loadborder">
-                  <div class="content">
-                    <div class="img"></div>
-                    <div class="timebox">
-                      <div class="timetop">
-                        <div class="tit">京东方商业模型.xls</div>
-                        <div class="statedefeat">上传失败</div>
-                      </div>
-                      <div class="prog">
-                        <div class="inprogdefeat"></div>
-                      </div>
-                    </div>
-                    <div class="curloading">
-                      <div class="cur">55%</div>
-                      <div class="cancel" style="margin-left: 20px">暂停</div>
-                      <div class="cancel" style="margin-left: 15px">取消</div>
-                    </div>
-                    <div class="defeat">下载失败数据</div>
+                  <div class="curloading">
+                    <div class="cur">55%</div>
+                    <div class="cancel" style="margin-left: 20px">暂停</div>
+                    <div class="cancel" style="margin-left: 15px">取消</div>
                   </div>
+                  <div class="defeat">下载失败数据</div>
                 </div>
-                <div class="loadborder">
-                  <div class="content">
-                    <div class="img"></div>
-                    <div class="timebox">
-                      <div class="timetop">
-                        <div class="tit">京东方商业模型.xls</div>
-                        <div class="statesucce">上传成功</div>
-                      </div>
-                      <div class="prog">
-                        <div class="inprogsucce"></div>
-                      </div>
+              </div>
+              <div class="loadborder">
+                <div class="content">
+                  <div class="img"></div>
+                  <div class="timebox">
+                    <div class="timetop">
+                      <div class="tit">京东方商业模型.xls</div>
+                      <div class="statesucce">上传成功</div>
                     </div>
-                    <div class="curloading">
-                      <div class="cur">100%</div>
-                      <div class="cancel" style="margin-left: 20px">删除</div>
+                    <div class="prog">
+                      <div class="inprogsucce"></div>
                     </div>
                   </div>
+                  <div class="curloading">
+                    <div class="cur">100%</div>
+                    <div class="cancel" style="margin-left: 20px">删除</div>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <div class="btnn">
-          <button class="btn1">取消</button>
-          <button class="btn2">确定</button>
-        </div>
       </div>
-    </a-drawer>
-  </template>
-  
-  <script>
-  import { reactive, toRefs } from "vue";
-  export default {
-    name: "EScore",
-    props: {
-      eScorevisible: {
-        type: Boolean,
-        default: false,
-      },
+      <div class="btnn">
+        <button class="btn1">取消</button>
+        <button class="btn2">确定</button>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+<script>
+import { reactive, toRefs } from "vue";
+export default {
+  name: "EScore",
+  props: {
+    eScorevisible: {
+      type: Boolean,
+      default: false,
     },
-    setup(props, ctx) {
-      const state = reactive({});
-      const closeDrawer = () => {
-        ctx.emit("update:eScorevisible", false);
-      };
+  },
+  setup(props, ctx) {
+    const state = reactive({});
+    const closeDrawer = () => {
+      ctx.emit("update:eScorevisible", false);
+    };
+
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+    };
+  },
+};
+</script>
   
-      const afterVisibleChange = (bool) => {
-        console.log("state", bool);
-      };
-  
-      return {
-        ...toRefs(state),
-        afterVisibleChange,
-        closeDrawer,
-      };
-    },
-  };
-  </script>
-  
-  <style lang="scss">
-  .ExportScore {
-    .drawerMain {
-      min-width: 600px;
-      margin: 0px 32px 0px 32px;
-      overflow-x: auto;
+<style lang="scss">
+.ExportScore {
+  .drawerMain {
+    min-width: 600px;
+    margin: 0px 32px 0px 32px;
+    overflow-x: auto;
+    display: flex;
+    flex-direction: column;
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
       display: flex;
-      flex-direction: column;
-      .header {
-        height: 73px;
-        border-bottom: 1px solid #e8e8e8;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+      flex-shrink: 0;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+    .main {
+      overflow-y: auto;
+      .minatitl {
         display: flex;
-        justify-content: space-between;
-        align-items: center;
-        // background-color: red;
-        margin-bottom: 20px;
-        flex-shrink: 0;
-        .headerTitle {
-          font-size: 18px;
-          font-weight: 600;
+        .up1 {
+          font-size: 16px;
+          font-weight: 400;
           color: #333333;
-          line-height: 25px;
-          // margin-left: 24px;
+        }
+        .up2 {
+          font-size: 16px;
+          font-weight: 400;
+          color: #4ea6ff;
+          margin-left: 4px;
         }
       }
-      .main {
-        overflow-y: auto;
-        .minatitl {
-          display: flex;
-          .up1 {
-            font-size: 16px;
-            font-weight: 400;
-            color: #333333;
-          }
-          .up2 {
-            font-size: 16px;
-            font-weight: 400;
-            color: #4ea6ff;
-            margin-left: 4px;
-          }
+      .upload {
+        margin-top: 32px;
+        display: flex;
+        .text {
+          font-size: 14px;
+          font-weight: 400;
+          color: #333333;
         }
-        .upload {
-          margin-top: 32px;
-          display: flex;
-          .text {
-            font-size: 14px;
-            font-weight: 400;
-            color: #333333;
-          }
-          .right {
-            margin-left: 6px;
-            .load {
-              width: 500px;
-              height: 176px;
-              background: #f5f9fd;
-              border-radius: 4px;
-              // opacity: 0.3;
-              border: 1px dashed #caddfd;
-              display: flex;
-              flex-direction: column;
-              align-items: center;
-              margin-bottom: 20px;
-              .cloud {
-                margin-top: 52px;
-                width: 28px;
-                height: 28px;
-                background-image: url(../../assets/images/basicinfo/cloud.png);
-              }
-              .tip {
-                font-size: 14px;
-                font-weight: 400;
-                color: #4ea6ff;
-                margin-top: 15px;
-                cursor: pointer;
-              }
-              .tipz {
-                font-size: 14px;
-                font-weight: 400;
-                color: #999999;
-                margin-top: 10px;
-              }
+        .right {
+          margin-left: 6px;
+          .load {
+            width: 500px;
+            height: 176px;
+            background: #f5f9fd;
+            border-radius: 4px;
+            // opacity: 0.3;
+            border: 1px dashed #caddfd;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            margin-bottom: 20px;
+            .cloud {
+              margin-top: 52px;
+              width: 28px;
+              height: 28px;
+              background-image: url(../../assets/images/basicinfo/cloud.png);
             }
-            .loadstate {
+            .tip {
+              font-size: 14px;
+              font-weight: 400;
+              color: #4ea6ff;
+              margin-top: 15px;
+              cursor: pointer;
+            }
+            .tipz {
+              font-size: 14px;
+              font-weight: 400;
+              color: #999999;
+              margin-top: 10px;
+            }
+          }
+          .loadstate {
+            width: 500px;
+            margin-bottom: 100px;
+
+            .loadborder {
               width: 500px;
-              margin-bottom: 100px;
-  
-              .loadborder {
-                width: 500px;
-                height: 173px;
-                border-radius: 4px;
-                border: 1px dashed #eaeaea;
-                margin-bottom: 30px;
+              height: 173px;
+              border-radius: 4px;
+              border: 1px dashed #eaeaea;
+              margin-bottom: 30px;
+              display: flex;
+              align-items: center;
+              .content {
                 display: flex;
-                align-items: center;
-                .content {
-                  display: flex;
-                  margin-left: 20px;
-                  position: relative;
-                  .defeat {
-                    position: absolute;
-                    left: 46px;
-                    top: 38px;
-                    font-size: 14px;
-                    font-weight: 500;
-                    color: #ff7474;
-                  }
-                  .img {
-                    width: 30px;
-                    height: 34px;
-                    background-image: url(../../assets/images/basicinfo/exl.png);
-                  }
-                  .timebox {
-                    margin-left: 15px;
-                    margin-top: -5px;
-                    .timetop {
-                      display: flex;
-                      width: 262px;
-                      justify-content: space-between;
-                      margin-bottom: 8px;
-                      .tit {
-                        font-size: 14px;
-                        font-weight: 400;
-                        color: #333333;
-                      }
-                      .stateloading {
-                        font-size: 14px;
-                        font-weight: 400;
-                        color: #4ea6ff;
-                      }
-                      .statedefeat {
-                        font-size: 14px;
-                        font-weight: 400;
-                        color: #ff7474;
-                      }
-                      .statesucce {
-                        font-size: 14px;
-                        font-weight: 400;
-                        color: #35ae69;
-                      }
-                    }
-                    .prog {
-                      width: 262px;
-                      height: 5px;
-                      background: #eaf1fe;
-                      border-radius: 4px;
-                      .inprogloading {
-                        width: 55%;
-                        height: 5px;
-                        border-radius: 4px;
-  
-                        background: #4ea6ff;
-                      }
-                      //下载失败条
-                      .inprogdefeat {
-                        width: 55%;
-                        height: 5px;
-                        border-radius: 4px;
-  
-                        background: #ff7474;
-                      }
-                      //下载成功条
-                      .inprogsucce {
-                        width: 100%;
-                        height: 5px;
-                        border-radius: 4px;
-  
-                        background: #57c887;
-                      }
-                    }
-                  }
-                  .curloading {
-                    margin-left: 15px;
-                    margin-top: 15px;
+                margin-left: 20px;
+                position: relative;
+                .defeat {
+                  position: absolute;
+                  left: 46px;
+                  top: 38px;
+                  font-size: 14px;
+                  font-weight: 500;
+                  color: #ff7474;
+                }
+                .img {
+                  width: 30px;
+                  height: 34px;
+                  background-image: url(../../assets/images/basicinfo/exl.png);
+                }
+                .timebox {
+                  margin-left: 15px;
+                  margin-top: -5px;
+                  .timetop {
                     display: flex;
-                    .cur {
+                    width: 262px;
+                    justify-content: space-between;
+                    margin-bottom: 8px;
+                    .tit {
                       font-size: 14px;
                       font-weight: 400;
                       color: #333333;
                     }
-                    .cancel {
+                    .stateloading {
                       font-size: 14px;
                       font-weight: 400;
-                      color: #387df7;
+                      color: #4ea6ff;
                     }
+                    .statedefeat {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #ff7474;
+                    }
+                    .statesucce {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #35ae69;
+                    }
+                  }
+                  .prog {
+                    width: 262px;
+                    height: 5px;
+                    background: #eaf1fe;
+                    border-radius: 4px;
+                    .inprogloading {
+                      width: 55%;
+                      height: 5px;
+                      border-radius: 4px;
+
+                      background: #4ea6ff;
+                    }
+                    //下载失败条
+                    .inprogdefeat {
+                      width: 55%;
+                      height: 5px;
+                      border-radius: 4px;
+
+                      background: #ff7474;
+                    }
+                    //下载成功条
+                    .inprogsucce {
+                      width: 100%;
+                      height: 5px;
+                      border-radius: 4px;
+
+                      background: #57c887;
+                    }
+                  }
+                }
+                .curloading {
+                  margin-left: 15px;
+                  margin-top: 15px;
+                  display: flex;
+                  .cur {
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #333333;
+                  }
+                  .cancel {
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #387df7;
                   }
                 }
               }
@@ -319,38 +318,39 @@
           }
         }
       }
-      .btnn {
-        height: 72px;
-        width: 100%;
-        position: absolute;
+    }
+    .btnn {
+      height: 72px;
+      width: 100%;
+      position: absolute;
+      background-color: #fff;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+      .btn1 {
+        width: 100px;
+        height: 40px;
+        border: 1px solid #4ea6ff;
+        border-radius: 8px;
+        color: #4ea6ff;
         background-color: #fff;
-        bottom: 0;
-        left: 0;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-        .btn1 {
-          width: 100px;
-          height: 40px;
-          border: 1px solid #4ea6ff;
-          border-radius: 8px;
-          color: #4ea6ff;
-          background-color: #fff;
-          cursor: pointer;
-        }
-        .btn2 {
-          cursor: pointer;
-          width: 100px;
-          height: 40px;
-          background: #4ea6ff;
-          border-radius: 8px;
-          border: 0;
-          margin-left: 15px;
-          color: #fff;
-        }
+        cursor: pointer;
+      }
+      .btn2 {
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
       }
     }
   }
-  </style>
+}
+</style>
   
\ No newline at end of file
diff --git a/src/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue
index 46b53f2f..a8353a7b 100644
--- a/src/components/drawers/FaceStu.vue
+++ b/src/components/drawers/FaceStu.vue
@@ -426,6 +426,7 @@ export default {
             >
               签到
             </a-checkbox>
+            {/**
             <a-checkbox
               checked={value.signOut}
               onChange={(e) => {
@@ -434,6 +435,7 @@ export default {
             >
               签退
             </a-checkbox>
+           */}
             <a-checkbox
               checked={value.leave}
               onChange={(e) => {
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index 1297df98..b86763d3 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -64,6 +64,9 @@
             <div class="img2"></div>
             <div class="wz">导出数据</div>
           </div>
+          <div class="btn btn2" @click="showEScoreModal">
+            <div class="wz">导入成绩</div>
+          </div>
         </div>
         <!-- <div class="line">
           <div class="inline">
@@ -111,17 +114,21 @@
         <button class="btn2">确定</button>
       </div>
     </div>
+    <!-- 导出成绩抽屉 -->
+    <EScore v-model:eScorevisible="eScorevisible" />
   </a-drawer>
 </template>
 
 <script>
 import { toRefs, reactive } from "vue";
 import { message } from "ant-design-vue";
-
+import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 export default {
   name: "ProjectExamManage",
-
+  components: {
+    EScore,
+  },
   props: {
     TMvisible: {
       type: Boolean,
@@ -161,7 +168,7 @@ export default {
         },
       ],
       selectedRowKeys: [],
-
+      eScorevisible: false, //导入成绩抽屉
       pageNo: 1,
       pageSize: 10,
       currentPage: 1,
@@ -274,6 +281,10 @@ export default {
       message.destroy();
       message.success("催促" + props.title + "成功");
     };
+    //导入成绩
+    const showEScoreModal = () => {
+      state.eScorevisible = true;
+    };
     //表头清空
     const clearLine = () => {
       state.selectedRowKeys = [];
@@ -287,6 +298,7 @@ export default {
       onSelectChange,
       godie,
       clearLine,
+      showEScoreModal,
     };
   },
 };
diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue
index c973d0e9..0da1cd95 100644
--- a/src/components/drawers/project/ProjectHomeWorkManage.vue
+++ b/src/components/drawers/project/ProjectHomeWorkManage.vue
@@ -64,7 +64,7 @@
             <div class="wz">导出作业</div>
           </div>
           <div class="btn btn2">
-            <div class="wz" @click="showEntryScore">录入成绩</div>
+            <div class="wz" @click="showEntryScore">导入成绩</div>
           </div>
         </div>
         <!-- <div class="line">
@@ -117,7 +117,7 @@
   <!-- 批量标注完成 -->
   <ASOver v-model:ASOvervisible="ASOvervisible" />
   <!-- 录入成绩抽屉 -->
-  <entry-scores v-model:Evisible="Evisible" />
+  <EScore v-model:eScorevisible="Evisible" />
   <!-- 查看作业抽屉 -->
   <CKWork v-model:CWvisible="CWvisible" />
   <!-- 查看答卷抽屉 -->
@@ -130,15 +130,17 @@ import { message } from "ant-design-vue";
 import ASOver from "../AllStuOver.vue";
 import CKWork from "../CheckWork.vue";
 import CQue from "../CheckQue.vue";
-import EntryScores from "../EntryScores.vue";
+// import EntryScores from "../EntryScores.vue";
+import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 export default {
   name: "ProjectHomeWorkManage",
   components: {
-    EntryScores,
+    // EntryScores,
     CKWork,
     CQue,
     ASOver,
+    EScore,
   },
   props: {
     Wvisible: {