From 921b70e026dffe9b6e7faa8c8843edfb6a269de9 Mon Sep 17 00:00:00 2001
From: kclf <1195754634@qq.com>
Date: Tue, 6 Dec 2022 21:28:38 +0800
Subject: [PATCH 1/7] t

---
 src/views/courselibrary/CoursewareManage.vue    | 14 +++-----------
 src/views/courselibrary/components/seeModal.vue |  6 +-----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 5799cfef..5e4efcf4 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -400,11 +400,7 @@
                     <img
                       class="i_upload_img"
                       v-if="feng_mian_1"
-                      :src="
-                        feng_mian_1.indexOf(',') > -1
-                          ? feng_mian_1.split(',')[0]
-                          : feng_mian_1
-                      "
+                      :src="feng_mian_1"
                       alt="avatar"
                     />
                     <!-- <a-upload
@@ -846,11 +842,7 @@
                     <img
                       class="i_upload_img"
                       v-if="feng_mian_2"
-                      :src="
-                        feng_mian_2.indexOf(',') > -1
-                          ? feng_mian_2.split(',')[0]
-                          : feng_mian_2
-                      "
+                      :src="feng_mian_2"
                       alt="avatar"
                     />
                     <!-- <a-upload
@@ -4289,7 +4281,7 @@ export default defineComponent({
               let newArr = [];
               arr.forEach((item) => {
                 newArr.push({
-                  value: item.dictValue + "," + item.dictCode,
+                  value: item.dictValue,
                   label: item.dictName,
                 });
               });
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 488c3210..1612b76c 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -59,11 +59,7 @@
                   <span style="margin-right: 14px">封面图：</span>
                 </div>
                 <img
-                  :src="
-                    detail.picUrl.indexOf(',') > -1
-                      ? detail.picUrl.split(',')[0]
-                      : detail.picUrl
-                  "
+                  :src="detail.picUrl"
                   alt="img"
                   style="width: 100px; height: 100px"
                 />

From 1d16211424f146c3d1cd1fa6cb7f5714cc253ac9 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Tue, 6 Dec 2022 21:35:43 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=9B=BE=E6=A6=82=E8=A7=88/=E8=AF=A6=E6=83=85=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue       | 6 +-----
 src/views/learningpath/LevelAddDetail.vue | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 8bba71ef..f3e954c0 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1259,7 +1259,6 @@ import { getRouterOverview } from "@/api/indexLearningPath";
 import { handleLearnPath } from "../../api/index1";
 import { GetRouterDetail } from "@/api/indexTask";
 import * as api from "../../api/index1";
-import { toDate } from "../../api/method";
 import { editRoutered } from "../../api/indexLearningPath";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 export default {
@@ -1893,10 +1892,7 @@ export default {
       GetRouterDetail(state.routerId).then((res) => {
         // console.log("获取路径图详情", res);
         state.styTitle = res.data.data.routerInfo.name;
-        state.cretime = toDate(
-          res.data.data.routerInfo.createTime / 1000,
-          "Y-M-D h:m"
-        );
+        state.cretime = res.data.data.routerInfo.createTime;
         state.picUrl = res.data.data.routerInfo.picUrl;
         state.action = res.data.data.routerInfo.status;
         state.remark = res.data.data.routerInfo.remark;
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 11735c9b..42bb9972 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1059,7 +1059,6 @@ import { editTask } from "../../api/indexTaskadd";
 
 // import { RouterEditTask } from "@/api/indexTask";
 import { useRouter } from "vue-router";
-import { toDate } from "../../api/method";
 // import UnlockMode from "../../components/drawers/UnlockMode.vue";
 export default {
   name: "LevelAddDetail",
@@ -1422,10 +1421,7 @@ export default {
           //给level赋初始值
           state.level = res.data.data.chapterList;
           state.styTitle = res.data.data.routerInfo.name;
-          state.creTime = toDate(
-            res.data.data.routerInfo.createTime / 1000,
-            "Y-M-D h:m"
-          );
+          state.creTime = res.data.data.routerInfo.createTime ;
           state.picUrl = res.data.data.routerInfo.picUrl;
           //增加两个字段
           state.level.forEach((item) => {

From a7dd165d7615d40cb6e8025e8674863cf0a3324a Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Tue, 6 Dec 2022 21:49:14 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E5=9B=9B=E4=B8=AA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BA=8F=E5=8F=B7=E6=98=BE=E7=A4=BAID=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examine/CourseReviewed.vue   |  4 ++--
 src/views/examine/CourseReviewedN.vue  |  4 ++--
 src/views/examine/ProjectReviewed.vue  | 13 ++++++++++---
 src/views/examine/ProjectReviewedN.vue | 16 +++++++++++++---
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index dec15056..84c255f6 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -261,9 +261,9 @@ export default {
       }
       let data = table;
       let array = [];
-      data.map((item) => {
+      data.map((item, n) => {
         let obj = {
-          number: item.offcourseId,
+          number: n+1,
           name: item.name || "- ",
           type: item.type == 1 ? "线上" : "线下",
           content: item.categoryId,
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 1eb8b0c7..04bac080 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -424,9 +424,9 @@ export default {
       }
       let data = tableData;
       let array = [];
-      data.map((item) => {
+      data.map((item, i) => {
         let obj = {
-          number: item.offcourseId,
+          number: i+1,
           name: item.name,
           type: item.type == 1 ? "线上" : "线下",
           content: item.categoryId,
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index a1135d21..b7a7ca5d 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -175,8 +175,8 @@ export default {
       columns1: [
         {
           title: "序号",
-          dataIndex: "projectId",
-          key: "projectId",
+          dataIndex: "number",
+          key: "number",
           align: "center",
         },
         {
@@ -299,7 +299,14 @@ export default {
         console.log('获取已审核项目列表数据',res)
         let result = res.data.data;
         state.total = res.data.data.total;
-        state.tableData1 = result.rows
+        let numdata = []
+        result.rows.map((value, index) => {
+          let obj = value
+          obj.number = index+1
+          numdata.push(obj);
+        });
+
+        state.tableData1 = numdata
       })
     };
     const changePagination = (pagina) => {
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index ec8ec9f8..a78cf98b 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -106,8 +106,8 @@ export default {
       columns1: [
         {
           title: "序号",
-          dataIndex: "projectId",
-          key: "projectId",
+          dataIndex: "number",
+          key: "number",
           align: "center",
         },
         {
@@ -200,7 +200,17 @@ export default {
           console.log("获取待审核项目成功", res);
           let result = res.data.data;
           state.total = result.total;
-          state.tableData1 = result.rows
+          // state.tableData1 = result.rows
+
+          let numdata = []
+          result.rows.map((value, index) => {
+            let obj = value
+            obj.number = index+1
+            numdata.push(obj);
+          });
+
+          state.tableData1 = numdata
+
           // setProjList(result.rows);
         })
         .catch((err) => {

From 8ded8878a325c02b3a4bde23117adfa493739c8c Mon Sep 17 00:00:00 2001
From: kclf <1195754634@qq.com>
Date: Tue, 6 Dec 2022 21:50:17 +0800
Subject: [PATCH 4/7] t

---
 src/views/courselibrary/CoursewareManage.vue | 26 ++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 71b1036c..19173dfd 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3368,11 +3368,33 @@ const columns6 = [
       return index + 1;
     },
   },
+  {
+    title: "创建人",
+    dataIndex: "name",
+    key: "name",
+    width: "10%",
+    align: "center",
+    ellipsis: true,
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
+  },
+  {
+    title: "教师名称",
+    dataIndex: "teacher",
+    key: "teacher",
+    width: "10%",
+    align: "center",
+    ellipsis: true,
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
+  },
   {
     title: "课程名称",
     dataIndex: "organization",
     key: "organization",
-    width: "25%",
+    width: "15%",
     align: "center",
     ellipsis: true,
     customRender: ({ text }) => {
@@ -3383,7 +3405,7 @@ const columns6 = [
     title: "场地",
     dataIndex: "address",
     key: "saddress",
-    width: "25%",
+    width: "15%",
     align: "center",
     ellipsis: true,
     customRender: ({ text }) => {

From 7ea979bc43594875210e244434c91e4f527f990b Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 6 Dec 2022 21:59:37 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E5=B0=81=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/method.js                            |   4 +
 src/components/TwoDimensionalCode.vue        |   2 +
 src/components/drawers/AddLive.vue           |   3 +
 src/components/drawers/SignQR.vue            | 106 +++++++++----------
 src/views/courselibrary/CoursewareManage.vue |   4 +-
 src/views/learningpath/LevelAdd.vue          |  56 +++++++---
 src/views/system/SystemManage.vue            |   4 +-
 7 files changed, 105 insertions(+), 74 deletions(-)

diff --git a/src/api/method.js b/src/api/method.js
index f9a3eb5e..8571f54e 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -271,7 +271,10 @@ const commonData = {
 //组织树
 const organizationalTree = []
 
+//嵌套页面
 const iframeUrl = "https://u-pre.boe.com/pc/iframe"
+//二维码
+const codeUrl = "https://u-pre.boe.com"
 export {
     throttle,
     toDate,
@@ -285,4 +288,5 @@ export {
     commonData,
     organizationalTree,
     iframeUrl,
+    codeUrl,
 }
\ No newline at end of file
diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue
index ca16ef65..681497fb 100644
--- a/src/components/TwoDimensionalCode.vue
+++ b/src/components/TwoDimensionalCode.vue
@@ -242,6 +242,8 @@ export default {
                 color: #333333;
                 line-height: 25px;
                 margin-bottom: 20px;
+                margin-left: 20px;
+                margin-right: 20px;
               }
             }
             .codeUrl {
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index d70a7200..d7f61f40 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -1052,6 +1052,9 @@ export default {
                 }
               }
             }
+            .ant-upload.ant-upload-select-picture-card {
+              border: 0px !important;
+            }
           }
         }
       }
diff --git a/src/components/drawers/SignQR.vue b/src/components/drawers/SignQR.vue
index d6c72fc1..591c4b02 100644
--- a/src/components/drawers/SignQR.vue
+++ b/src/components/drawers/SignQR.vue
@@ -1,62 +1,62 @@
 <template>
-    <a-modal 
-        :visible="signQRvisible" 
-        :footer="null" 
-        :closable="closeCopy" 
-        wrapClassName="signQRModal"
-        centered="true"
-        @cancel="closeModal"
-        >
-        <div class="delete">
-          <div class="del_header"></div>
-          <div class="del_main">
-            <div class="header">
-              <div class="icon"></div>
-                <span>签到二维码</span>
-            <div class="close_exit" @click="closeModal"></div>
-          </div>
-          <div class="body">
-            <div class="tit">{{"时间管理面授课程"}}</div>
-            <div><img src="../../assets/images/taskpage/erweima.png" /></div>
-          </div>
-          <div class="footerr">
-            <div class="onload">下载二维码</div>
-            <div class="onloadpx">200*200</div>
-            <div class="onloadpx">400*400</div>
-            <div class="onloadpx">800*800</div>
-          </div>
+  <a-modal
+    :visible="signQRvisible"
+    :footer="null"
+    :closable="closeCopy"
+    wrapClassName="signQRModal"
+    centered="true"
+    @cancel="closeModal"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="icon"></div>
+          <span>签到二维码</span>
+          <div class="close_exit" @click="closeModal"></div>
+        </div>
+        <div class="body">
+          <div class="tit">{{ "时间管理面授课程" }}</div>
+          <div><img src="../../assets/images/taskpage/erweima.png" /></div>
+        </div>
+        <div class="footerr">
+          <div class="onload">下载二维码</div>
+          <div class="onloadpx">200*200</div>
+          <!-- <div class="onloadpx">400*400</div>
+            <div class="onloadpx">800*800</div> -->
         </div>
       </div>
-    </a-modal>
+    </div>
+  </a-modal>
 </template>
 
 <script>
-import { reactive,toRefs } from '@vue/reactivity';
+import { reactive, toRefs } from "@vue/reactivity";
 export default {
-    name:"SignQR",
-    props:{
-        signQRvisible:{
-            type:Boolean,
-            default:false,
-        },
+  name: "SignQR",
+  props: {
+    signQRvisible: {
+      type: Boolean,
+      default: false,
     },
-    setup(props,ctx){
-        const state = reactive({
-            signQRvisible:false,
-            closeCopy: false, //二维码关闭图标
-        })
-        const closeModal = ()=> {
-            ctx.emit("update:signQRvisible",false)
-        }
-        const afterVisibleChange = (bool) => {
-            console.log(bool);
-        }
-        return{
-            ...toRefs(state),
-            closeModal,
-            afterVisibleChange,
-        }
-    }
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      signQRvisible: false,
+      closeCopy: false, //二维码关闭图标
+    });
+    const closeModal = () => {
+      ctx.emit("update:signQRvisible", false);
+    };
+    const afterVisibleChange = (bool) => {
+      console.log(bool);
+    };
+    return {
+      ...toRefs(state),
+      closeModal,
+      afterVisibleChange,
+    };
+  },
 };
 </script>
 <style lang="scss">
@@ -132,11 +132,11 @@ export default {
               flex-direction: column;
               justify-content: center;
               align-items: center;
-              .tit{
+              .tit {
                 margin-bottom: 15px;
                 font-size: 16px;
                 font-weight: 500;
-                }
+              }
             }
 
             .footerr {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 18446694..400c7ac7 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2753,12 +2753,12 @@
             <div class="qrmbtn">
               <div class="btntext">200*200</div>
             </div>
-            <div class="qrmbtn">
+            <!-- <div class="qrmbtn">
               <div class="btntext">400*400</div>
             </div>
             <div class="qrmbtn">
               <div class="btntext">800*800</div>
-            </div>
+            </div> -->
           </div>
         </div>
       </div>
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 8bba71ef..ee103968 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -10,7 +10,11 @@
         <div class="fort">创建时间：{{ cretime }}</div>
       </div>
       <div class="right">
-        <img class="img1" src="../../assets/images/leveladd/ma.png" />
+        <img
+          class="img1"
+          src="../../assets/images/leveladd/ma.png"
+          @click="showCodeModel2()"
+        />
         <div v-if="action == 1 || action == 0" class="line"></div>
         <img
           v-if="action == 1 || action == 0"
@@ -510,15 +514,7 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        @click="
-                          item.type === 2
-                            ? showCopyModal(item.type)
-                            : item.type === 6
-                            ? showzhibModal(item.type)
-                            : item.type === 9
-                            ? showhuodModal(item.type)
-                            : null
-                        "
+                        @click="showCodeModel(item)"
                       >
                         二维码
                       </div>
@@ -958,8 +954,8 @@
             <div class="footerr">
               <div class="onload">下载二维码</div>
               <div class="onloadpx">200*200</div>
-              <div class="onloadpx">400*400</div>
-              <div class="onloadpx">800*800</div>
+              <!-- <div class="onloadpx">400*400</div>
+              <div class="onloadpx">800*800</div> -->
             </div>
           </div>
         </div>
@@ -986,8 +982,8 @@
             <div class="footerr">
               <div class="onload">下载二维码</div>
               <div class="onloadpx">200*200</div>
-              <div class="onloadpx">400*400</div>
-              <div class="onloadpx">800*800</div>
+              <!-- <div class="onloadpx">400*400</div>
+              <div class="onloadpx">800*800</div> -->
             </div>
           </div>
         </div>
@@ -1014,8 +1010,8 @@
             <div class="footerr">
               <div class="onload">下载二维码</div>
               <div class="onloadpx">200*200</div>
-              <div class="onloadpx">400*400</div>
-              <div class="onloadpx">800*800</div>
+              <!-- <div class="onloadpx">400*400</div>
+              <div class="onloadpx">800*800</div> -->
             </div>
           </div>
         </div>
@@ -1259,7 +1255,7 @@ import { getRouterOverview } from "@/api/indexLearningPath";
 import { handleLearnPath } from "../../api/index1";
 import { GetRouterDetail } from "@/api/indexTask";
 import * as api from "../../api/index1";
-import { toDate } from "../../api/method";
+import { toDate, codeUrl } from "../../api/method";
 import { editRoutered } from "../../api/indexLearningPath";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 export default {
@@ -1428,6 +1424,9 @@ export default {
 
       authClassify: 3,
       addAuthList: [],
+
+      codevisible: false, //二维码是否显示
+      codeInfo: null, //二维码标题
     });
 
     const levelList = reactive({
@@ -2186,6 +2185,27 @@ export default {
       getStudent();
       // state.activeKey1 = "8";
     };
+
+    //显示二维码弹窗
+    const showCodeModel = (item) => {
+      state.codevisible = true;
+      let obj = {
+        title: "[" + checkType(item.type) + "]二维码",
+        name: item.name,
+        url: codeUrl,
+      };
+      state.codeInfo = obj;
+    };
+    //显示二维码弹窗
+    const showCodeModel2 = () => {
+      state.codevisible = true;
+      let obj = {
+        title: "[学习路径]二维码",
+        name: state.styTitle,
+        url: codeUrl,
+      };
+      state.codeInfo = obj;
+    };
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -2240,6 +2260,8 @@ export default {
       totask,
       tostudent,
       checkedClose,
+      showCodeModel,
+      showCodeModel2,
     };
   },
 };
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 347c9d8b..3fb488e2 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -86,8 +86,8 @@
       ></qrcode-vue>
     </div>
     <div @click="downloadQr(200)">下载200</div>
-    <div @click="downloadQr(400)">下载400</div>
-    <div @click="downloadQr(800)">下载800</div>
+    <!-- <div @click="downloadQr(400)">下载400</div>
+    <div @click="downloadQr(800)">下载800</div> -->
   </div>
 
   <div @click="changeCodevisible">显示二维码弹窗</div>

From d466c01db5d029e15c047b799f4278621bf4620e Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Tue, 6 Dec 2022 22:09:36 +0800
Subject: [PATCH 6/7] fix

---
 src/views/examine/CourseReviewed.vue   | 2 +-
 src/views/examine/CourseReviewedN.vue  | 2 +-
 src/views/examine/ProjectReviewed.vue  | 2 +-
 src/views/examine/ProjectReviewedN.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 84c255f6..690c83ee 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -263,7 +263,7 @@ export default {
       let array = [];
       data.map((item, n) => {
         let obj = {
-          number: n+1,
+          number: n+1 + (state.currentPage-1) *10,
           name: item.name || "- ",
           type: item.type == 1 ? "线上" : "线下",
           content: item.categoryId,
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 04bac080..0adce060 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -426,7 +426,7 @@ export default {
       let array = [];
       data.map((item, i) => {
         let obj = {
-          number: i+1,
+          number: i+1 + (state.currentPage-1) *10,
           name: item.name,
           type: item.type == 1 ? "线上" : "线下",
           content: item.categoryId,
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index b7a7ca5d..0e52459e 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -302,7 +302,7 @@ export default {
         let numdata = []
         result.rows.map((value, index) => {
           let obj = value
-          obj.number = index+1
+          obj.number = index+1 + (state.currentPage-1) *10
           numdata.push(obj);
         });
 
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index a78cf98b..d44d29f8 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -205,7 +205,7 @@ export default {
           let numdata = []
           result.rows.map((value, index) => {
             let obj = value
-            obj.number = index+1
+            obj.number = index+1 + (state.currentPage-1) *10
             numdata.push(obj);
           });
 

From 743e0e4c0dcf62117f58929547196730b26e8f60 Mon Sep 17 00:00:00 2001
From: kclf <1195754634@qq.com>
Date: Tue, 6 Dec 2022 22:57:14 +0800
Subject: [PATCH 7/7] EQG-170

---
 src/views/courselibrary/CoursewareManage.vue | 22 +++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 19173dfd..f36f7c64 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -535,7 +535,7 @@
                     <span style="margin-right: 14px">内容标签</span>
                   </div>
                   <div class="item_inp">
-                    <a-select
+                    <!-- <a-select
                       :getPopupContainer="
                         (triggerNode) => {
                           return triggerNode.parentNode || document.body;
@@ -546,6 +546,18 @@
                       style="width: 440px; height: 40px"
                       placeholder="请输入按回车键创建成功"
                       :options="tagsOptions"
+                    ></a-select> -->
+                    <a-select
+                      :getPopupContainer="
+                        (triggerNode) => {
+                          return triggerNode.parentNode || document.body;
+                        }
+                      "
+                      v-model:value="tags_val"
+                      mode="tags"
+                      style="width: 440px; height: 40px"
+                      placeholder="请输入按回车键创建成功"
+                      @change="handleTagChange"
                     ></a-select>
                   </div>
                 </div>
@@ -4659,6 +4671,7 @@ export default defineComponent({
           rest();
           state.addLoading = false;
           state.isEdit = 1;
+          state.statusTingQi = 1;
           // console.log("res.data", res.data);
           if (param === "review") {
             //新建时点击审核按钮
@@ -5230,6 +5243,12 @@ export default defineComponent({
       getTea();
     };
 
+    // handleTagChange
+    const handleTagChange = () => {
+      console.log(7877878);
+      console.log(state.tagsOptions);
+    };
+
     // 预览弹框 开启和关闭
     const ft_exit_see = () => {
       state.lookCourseModal = false;
@@ -5628,6 +5647,7 @@ export default defineComponent({
       ftsr_exit,
       stm_exit,
       ft_exit_see,
+      handleTagChange,
       createkk,
       handleCancelStu,
       handleSureStu,