From b44e07006915cc990b502f7ffe3015dbefc912be Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 19:18:49 +0800
Subject: [PATCH 1/6] =?UTF-8?q?--=20=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index b65a3f71..fc5abe89 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -82,7 +82,7 @@
         <template #action="{ record }">
           <div
             @click="del(record.id)"
-            style="color: #4ea6ff; font-size: 14px; text-align: center"
+            style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
           >
             删除
           </div>

From 6fa476aa1cd5ae004198699ce77e26cee9c73c65 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 22:30:37 +0800
Subject: [PATCH 2/6] =?UTF-8?q?--=20=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0ur?=
 =?UTF-8?q?l?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                       | 10 +++++-----
 src/components/common/BaseUpload.vue    |  3 ++-
 src/components/drawers/AddFaceteach.vue |  4 +++-
 src/components/drawers/AddHomework.vue  |  4 +++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index b570c677..8035a778 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -6,7 +6,7 @@
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
 import axios from "axios";
 import router from "@/router";
 // import { getCookie } from '../api/method'
@@ -14,13 +14,13 @@ import router from "@/router";
 
 // axios.defaults.headers.post["Content-Type"] =
 //   "application/x-www-form-urlencoded";
-
+export const FILE_UPLOAD_URL = process.env.VUE_APP_BASE_API + '/file/upload'
 axios.defaults.withCredentials = true;
 const http = axios.create({
     baseURL: process.env.VUE_APP_BASE_API,
     timeout: 1000 * 15,
     // headers: { "Content-Type": "multipart/form-data" },
-    headers: { "Content-Type": "application/json" },
+    headers: {"Content-Type": "application/json"},
 });
 
 http.interceptors.request.use(
@@ -50,14 +50,14 @@ http.interceptors.response.use(
     (response) => {
         // console.log('response', response)
         const {
-            data: { code, msg },
+            data: {code, msg},
         } = response;
         // console.log('code', code)
         if (code === 0 || code === 200) {
             return response;
         } else {
             if (code === 1000) {
-                process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+                process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
             }
             console.log("api %o", msg);
         }
diff --git a/src/components/common/BaseUpload.vue b/src/components/common/BaseUpload.vue
index 3a3406d3..b9146eeb 100644
--- a/src/components/common/BaseUpload.vue
+++ b/src/components/common/BaseUpload.vue
@@ -1,7 +1,7 @@
 <template>
   <a-upload
       :file-list="files"
-      :action="`${process.env.VUE_APP_BASE_API}/file/upload`"
+      :action="FILE_UPLOAD_URL"
       :show-upload-list="showUploadList"
       :multiple="multiple"
       :before-upload="beforeUpload"
@@ -16,6 +16,7 @@
 <script setup>
 import {defineProps, defineEmits, defineExpose, ref, watch} from "vue";
 import {message} from "ant-design-vue";
+import {FILE_UPLOAD_URL} from "@/api/config";
 
 const props = defineProps({
   value: {
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index d7658962..6f3518a8 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -354,7 +354,7 @@
             <div class="btnbox">
               <a-upload
                 @change="handleChange"
-                :action="`${process.env.VUE_APP_BASE_API}/file/upload`"
+                :action="FILE_UPLOAD_URL"
                 v-model:file-list="fileList"
               >
                 <button class="xkbtn">上传附件</button>
@@ -392,6 +392,7 @@ import { detail } from "../../api/indexCourse";
 import { queryAppraiseDetailById } from "../../api/indexInvist";
 import { queryWorkDetailById } from "@/api/indexWork";
 import { queryExaminationDetailById } from "@/api/indexExam";
+import {FILE_UPLOAD_URL} from "@/api/config";
 export default {
   name: "AddFaceteach",
   components: {
@@ -841,6 +842,7 @@ export default {
     };
     return {
       ...toRefs(state),
+      FILE_UPLOAD_URL,
       showDrawerSelFacet,
       showDrawerAddHomework,
       showDrawerAddTest,
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 825b96e5..1c6a53e8 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -45,7 +45,7 @@
 								<span style="margin-right: 3px">附件：</span>
 							</div>
 							<div class="btnbox">
-								<a-upload v-model:file-list="fileList" name="file" action="/manageApi/file/upload"
+								<a-upload v-model:file-list="fileList" name="file" :action="FILE_UPLOAD_URL"
 									@change="handleChange">
 									<button class="xkbtn" type="button">上传附件</button>
 								</a-upload>
@@ -82,6 +82,7 @@ import {
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import { addTempTask } from "../../api/indexTaskadd";
+import {FILE_UPLOAD_URL} from "@/api/config";
 
 export default {
 	name: "AddHomework",
@@ -513,6 +514,7 @@ export default {
 			disabledDate,
 			disabledDateTime,
 			afterVisibleChange,
+      FILE_UPLOAD_URL,
 			closeDrawer,
 			closeDrawer2,
 			handleChange,

From 94f83e53608c81741cda819f7630312fd628a441 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 23:20:31 +0800
Subject: [PATCH 3/6] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectManage.vue | 54 ++++++++++++-----------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index a4409f77..e337e5f2 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -78,7 +78,7 @@
       <a-table
           :columns="columns"
           :data-source="tableData"
-          :loading="tableDataTotal === -1 ? true : false"
+          :loading="tableLoading"
           :scroll="{ x: 700 }"
           @expand="expandTable"
           :pagination="false"
@@ -845,6 +845,7 @@ export default {
   },
   setup() {
     const state = reactive({
+      tableLoading:false,
       projectName: null,
       selectTime: null,
       sonproject: false,
@@ -1671,31 +1672,34 @@ export default {
         },
       },
     ]);
-    const getTableDate = () =>
-        api
-            .getProjectList({
-              ...state.searchParam,
-              beginTime:
-                  state.searchParam.valueDate &&
-                  state.searchParam.valueDate.length === 2
-                      ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
+    const getTableDate = () =>{
+      state.tableLoading = true
+      api.getProjectList({
+        ...state.searchParam,
+        beginTime:
+            state.searchParam.valueDate &&
+            state.searchParam.valueDate.length === 2
+                ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
+
+                : "",
+        endTime:
+            state.searchParam.valueDate &&
+            state.searchParam.valueDate.length === 2
+                ? dayjs(state.searchParam.valueDate[1]).format("YYYY-MM-DD")
+                : "",
+      })
+          .then((res) => {
+            // console.log("搜索", res, state.searchParam);
+            state.tableDataTotal = Number(res.data.data.total);
+            state.tableLoading = false
+            const data = res.data.data.rows;
+            initDataSublist("", data);
+            console.log(data);
+            tableData.value = data;
+            console.log("tableData", tableData);
+          });
+    }
 
-                      : "",
-              endTime:
-                  state.searchParam.valueDate &&
-                  state.searchParam.valueDate.length === 2
-                      ? dayjs(state.searchParam.valueDate[1]).format("YYYY-MM-DD")
-                      : "",
-            })
-            .then((res) => {
-              // console.log("搜索", res, state.searchParam);
-              state.tableDataTotal = Number(res.data.data.total);
-              const data = res.data.data.rows;
-              initDataSublist("", data);
-              console.log(data);
-              tableData.value = data;
-              console.log("tableData", tableData);
-            });
 
     function initDataSublist(parentName, data) {
       if (data && data.length) {

From 3b898181151d7fe1a821a17aab3fbf16766099eb Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 23 Dec 2022 00:39:44 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=94=B9=E4=B8=BA=E5=88=A0=E9=99=A4=E9=A2=98?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/components/ResearchAddAsk.vue    | 2 +-
 src/views/research/components/ResearchAddItem.vue   | 2 ++
 src/views/research/components/ResearchAddMulti.vue  | 2 +-
 src/views/research/components/ResearchAddPin.vue    | 2 +-
 src/views/research/components/ResearchAddSingle.vue | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/research/components/ResearchAddAsk.vue b/src/views/research/components/ResearchAddAsk.vue
index 0b4836d9..62c40105 100644
--- a/src/views/research/components/ResearchAddAsk.vue
+++ b/src/views/research/components/ResearchAddAsk.vue
@@ -6,7 +6,7 @@
       <div class="tagname">问答题</div>
       <div class="deleteop" @click="handleTypesDel(3)">
         <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
       </div>
     </div>
     <div class="name">
diff --git a/src/views/research/components/ResearchAddItem.vue b/src/views/research/components/ResearchAddItem.vue
index f3b87e8b..bc6318d7 100644
--- a/src/views/research/components/ResearchAddItem.vue
+++ b/src/views/research/components/ResearchAddItem.vue
@@ -17,6 +17,7 @@
       </div>
       <div class="delete" @click="handleDel">删除</div>
     </div>
+    <!--
     <div class="name uploadContent">
       <a-upload
         v-show="!curItem.imgVal"
@@ -43,6 +44,7 @@
         />
       </div>
     </div>
+    -->
   </div>
 </template>
 <script>
diff --git a/src/views/research/components/ResearchAddMulti.vue b/src/views/research/components/ResearchAddMulti.vue
index 7873d68d..c46bb8af 100644
--- a/src/views/research/components/ResearchAddMulti.vue
+++ b/src/views/research/components/ResearchAddMulti.vue
@@ -6,7 +6,7 @@
       <div class="tagname">多选题</div>
       <div class="deleteop" @click="handleTypesDel(2)">
         <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
       </div>
     </div>
     <div class="name">
diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue
index 50f33df7..d59303e5 100644
--- a/src/views/research/components/ResearchAddPin.vue
+++ b/src/views/research/components/ResearchAddPin.vue
@@ -6,7 +6,7 @@
       <div class="tagname">评分题</div>
       <div class="deleteop" @click="handleTypesDel(4)">
         <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
       </div>
     </div>
     <div class="name">
diff --git a/src/views/research/components/ResearchAddSingle.vue b/src/views/research/components/ResearchAddSingle.vue
index 6ee30ae6..0130ab54 100644
--- a/src/views/research/components/ResearchAddSingle.vue
+++ b/src/views/research/components/ResearchAddSingle.vue
@@ -6,7 +6,7 @@
       <div class="tagname">单选题</div>
       <div class="deleteop" @click="handleTypesDel(1)">
         <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
       </div>
     </div>
     <div class="name">

From 2a6678fb23bfc776149b67e9e24051cea5161c89 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 23 Dec 2022 01:38:22 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue      | 110 ++++++++++++------------
 src/components/project/NameInput.vue    |  36 ++------
 src/components/student/TableStudent.vue |   1 +
 src/views/learningpath/LearningPath.vue |   2 +-
 4 files changed, 64 insertions(+), 85 deletions(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 3bcce3ed..97649ceb 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -130,6 +130,26 @@
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
           </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">及格线：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="test.passLine"
+                type="number"
+                style="width: 400px; height: 40px; border-radius: 8px"
+              />
+
+              <span style="color: #999999; margin-left: 8px">分</span>
+            </div>
+          </div>
           <div class="main_item2">
             <div class="signbox">
               <span style="margin-right: 3px">考试说明：</span>
@@ -147,7 +167,7 @@
           </div>
           <div class="main_item2">
             <div class="signbox">
-              <span style="margin-right: 3px">考试限制：</span>
+              <span style="margin-right: 3px;margin-top: 10px;">考试限制：</span>
             </div>
             <div class="kqszbox">
               <div class="setbox">
@@ -227,64 +247,45 @@
               </a-radio-group>
             </div>
           </div>
+        
+         
           <div class="main_item">
             <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">及格线：</span>
+              <span style="margin-right: 3px">试题排列：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                v-model:value="test.passLine"
-                type="number"
-                style="width: 400px; height: 40px; border-radius: 8px"
-              />
-
-              <span style="color: #999999; margin-left: 8px">分</span>
-            </div>
-          </div>
-          <div class="main_item">
-            <div class="main_item">
-              <div class="signbox">
-                <span style="margin-right: 3px">试题排列：</span>
-              </div>
-              <div class="btnbox">
-                <a-radio-group
-                  style="margin-right: 12px"
-                  v-model:value="test.questionArrangement"
-                >
-                  <a-radio
-                    v-model:checked="checked"
-                    :value="1"
-                    @click="cloradio4"
-                    >试题乱序
-                  </a-radio>
-                  <a-radio
-                    v-model:checked="checked"
-                    :value="2"
-                    @click="cloradio4"
-                    >选项乱序
-                  </a-radio>
-                  <a-radio
-                    v-model:checked="checked"
-                    :value="3"
-                    @click="cloradio4"
-                    >全部乱序
-                  </a-radio>
-                  <a-radio
-                    v-model:checked="checked"
-                    :value="4"
-                    @click="cloradio4"
-                    >不乱序
-                  </a-radio>
-                </a-radio-group>
-              </div>
+              <a-radio-group
+                style="margin-right: 12px"
+                v-model:value="test.questionArrangement"
+              >
+                <a-radio
+                  v-model:checked="checked"
+                  :value="1"
+                  @click="cloradio4"
+                  >试题乱序
+                </a-radio>
+                <a-radio
+                  v-model:checked="checked"
+                  :value="2"
+                  @click="cloradio4"
+                  >选项乱序
+                </a-radio>
+                <a-radio
+                  v-model:checked="checked"
+                  :value="3"
+                  @click="cloradio4"
+                  >全部乱序
+                </a-radio>
+                <a-radio
+                  v-model:checked="checked"
+                  :value="4"
+                  @click="cloradio4"
+                  >不乱序
+                </a-radio>
+              </a-radio-group>
             </div>
           </div>
+          <div class="main_item" style="height: 20px;"></div>
         </div>
       </div>
       <div class="main_btns">
@@ -811,8 +812,7 @@ export default {
             .setbox {
               display: flex;
               flex-wrap: wrap;
-              margin-top: 10px;
-              margin-bottom: 24px;
+            
 
               .timerbox {
                 margin-top: 6px;
diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue
index 8d2a6eee..a96f1ab7 100644
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -86,45 +86,23 @@ function validateProName() {
 }
 </script>
 <style lang="scss">
-.in {
+
   .pro {
     .ant-input-affix-wrapper {
-      position: relative;
-      display: inline-block;
-      width: 99%;
-      min-width: 0;
       padding: 4px 8px;
-      color: rgba(0, 0, 0, 0.85);
-      font-size: 14px;
-      line-height: 1.5715;
-      background-color: #fff;
-      background-image: none;
-      border: 1px solid #d9d9d9;
       border-radius: 8px;
-      transition: all 0.3s;
-      display: inline-flex;
+    
     }
   }
-}
-
-.in {
+  .road {
   .ant-input-affix-wrapper {
-    position: relative;
-    display: inline-block;
-    width: 99%;
-    min-width: 0;
     padding: 0px 8px;
-    color: rgba(0, 0, 0, 0.85);
-    font-size: 14px;
-    line-height: 1.5715;
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #d9d9d9;
     border-radius: 8px;
-    transition: all 0.3s;
-    display: inline-flex;
   }
-}
+  }
+
+
+
 
 .b_input,
 .i1_input {
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index fc5abe89..556c407f 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -235,6 +235,7 @@ function getStuList() {
 
 function reset() {
   tableParam.value.studentName="";
+  getStuList();
 }
 
 function bathDel() {
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 7efd5fba..b7af07a2 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -150,7 +150,7 @@
               />
             </div>
             <div class="inname">路径图名称</div>
-            <div class="in">
+            <div class="in road">
               <!--              <a-input-->
               <!--                  v-model:value="pathName"-->
               <!--                  maxlength="20"-->

From 25f8dbd6b45c272118ba54050f23a783472151b5 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 23 Dec 2022 01:39:49 +0800
Subject: [PATCH 6/6] =?UTF-8?q?--=20=E5=BC=80=E8=AF=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index d1e3afb0..837c45dc 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3281,11 +3281,11 @@ const columns7 = [
     key: "5",
     align: "center",
     customRender: ({ record }) => {
-      switch (String(record.source)) {
+      switch (String(record.status)) {
         case "0":
-          return "待审核";
-        case "1":
           return "审核通过";
+        case "1":
+          return "待审核";
         case "2":
           return "审核拒绝";
       }
@@ -3403,11 +3403,11 @@ export default defineComponent({
           key: "5",
           align: "center",
           customRender: ({ record }) => {
-            switch (String(record.source)) {
+            switch (String(record.status)) {
               case "0":
-                return "待审核";
-              case "1":
                 return "审核通过";
+              case "1":
+                return "待审核";
               case "2":
                 return "审核拒绝";
             }