Merge remote-tracking branch 'origin/develop' into develop

2025-12-25 02:32:54 +08:00 · 2022-12-06 23:54:32 +08:00
parent e83e0afed3 51f0fa7367
commit 0fd2267286
14 changed files with 248 additions and 127 deletions
--- 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,
 }
--- 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 {
--- 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;
+            }
          }
        }
      }
--- 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 {
--- 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
@@ -539,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;
@@ -550,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>
@@ -846,11 +854,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
@@ -2756,12 +2760,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>
@@ -3376,11 +3380,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 }) => {
@@ -3391,7 +3417,7 @@ const columns6 = [
    title: "场地",
    dataIndex: "address",
    key: "saddress",
-    width: "25%",
+    width: "15%",
    align: "center",
    ellipsis: true,
    customRender: ({ text }) => {
@@ -4289,7 +4315,7 @@ export default defineComponent({
              let newArr = [];
              arr.forEach((item) => {
                newArr.push({
-                  value: item.dictValue + "," + item.dictCode,
+                  value: item.dictValue,
                  label: item.dictName,
                });
              });
@@ -4645,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") {
            //新建时点击审核按钮
@@ -5216,6 +5243,12 @@ export default defineComponent({
      getTea();
    };

+    // handleTagChange
+    const handleTagChange = () => {
+      console.log(7877878);
+      console.log(state.tagsOptions);
+    };
+
    // 预览弹框 开启和关闭
    const ft_exit_see = () => {
      state.lookCourseModal = false;
@@ -5614,6 +5647,7 @@ export default defineComponent({
      ftsr_exit,
      stm_exit,
      ft_exit_see,
+      handleTagChange,
      createkk,
      handleCancelStu,
      handleSureStu,
--- 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"
                />
--- 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 + (state.currentPage-1) *10,
          name: item.name || "- ",
          type: item.type == 1 ? "线上" : "线下",
          content: item.categoryId,
--- 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 + (state.currentPage-1) *10,
          name: item.name,
          type: item.type == 1 ? "线上" : "线下",
          content: item.categoryId,
--- 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 + (state.currentPage-1) *10
+          numdata.push(obj);
+        });
+
+        state.tableData1 = numdata
      })
    };
    const changePagination = (pagina) => {
--- 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 + (state.currentPage-1) *10
+            numdata.push(obj);
+          });
+
+          state.tableData1 = numdata
+
          // setProjList(result.rows);
        })
        .catch((err) => {
--- 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,8 +1255,8 @@ 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 { codeUrl } from "../../api/method";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 export default {
  name: "LevelAdd",
@@ -1428,6 +1424,9 @@ export default {

      authClassify: 3,
      addAuthList: [],
+
+      codevisible: false, //二维码是否显示
+      codeInfo: null, //二维码标题
    });

    const levelList = reactive({
@@ -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;
@@ -2186,6 +2182,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 +2257,8 @@ export default {
      totask,
      tostudent,
      checkedClose,
+      showCodeModel,
+      showCodeModel2,
    };
  },
 };
--- 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) => {
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -11,7 +11,11 @@
        <div class="fort">起止时间：{{ startTime }}至{{ endTime }}</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 class="line" v-if="action == 1 || action == 0"></div>
        <img
          v-if="action == 1 || action == 0"
@@ -473,7 +477,9 @@
                          </div>
                        </div>
                        <div>
-                          <div class="iconame">「{{ item.name }}」</div>
+                          <div class="iconame">
+                            「{{ checkType(item.type) }}」
+                          </div>
                          <div class="icontext">{{ item.name }}</div>
                        </div>
                      </div>
@@ -550,7 +556,7 @@
                        <div
                          class="operation"
                          style="cursor: pointer"
-                          @click="showCodeModal"
+                          @click="showCodeModel(item)"
                        >
                          二维码
                        </div>
@@ -1613,15 +1619,6 @@
    <!-- 编辑项目弹窗 -->
    <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />

-    <!-- 二维码弹窗 -->
-    <two-dimensional-code
-      v-model:codevisible="codevisible"
-      :codeInfo="codeInfo"
-      index="0"
-      type="课程二维码"
-    />
-    <!-- 二维码弹窗 -->
-
    <!-- 发布弹窗 -->
    <a-modal
      v-model:visible="projectPub"
@@ -1793,6 +1790,15 @@
        </div>
      </div>
    </a-modal>
+
+    <!-- 二维码弹窗 -->
+    <two-dimensional-code
+      v-model:codevisible="codevisible"
+      :codeInfo="codeInfo"
+      index="0"
+      type="课程二维码"
+    />
+    <!-- 二维码弹窗 -->
  </div>
 </template>
 <script>
@@ -1833,7 +1839,7 @@ import { message } from "ant-design-vue";
 import * as apitl from "../../api/index";
 import { getTask } from "../../api/indexTaskadd";
 import { editProj } from "../../api/indexTaskadd";
-import { toDate } from "../../api/method";
+import { toDate, codeUrl } from "../../api/method";
 import projSet from "../../components/Modals/projSet";
 import { overview } from "../../api/indexProjStu";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
@@ -1975,8 +1981,6 @@ export default {
      huodModal: false, //活动二维码弹窗
      allDelete: false, //批量删除弹窗

-      codevisible: false, //二维码弹窗
-      codeInfo: null, //二维码信息
      pubproject: false,
      stugroup: false,
      canclestu: false,
@@ -2490,6 +2494,9 @@ export default {
      isPass: false, // 是否审核未通过
      passInfo: null, // 审核未通过原因说明
      reviewModal: false,
+
+      codevisible: false, //二维码是否显示
+      codeInfo: null, //二维码标题
    });

    const levelList = reactive({
@@ -4020,6 +4027,46 @@ export default {
      // let a = state.attach.split(",")
      // state.fileList = a
    });
+    const checkType = (type) => {
+      let typeRules = [
+        "",
+        "在线",
+        "面授",
+        "案例",
+        "作业",
+        "考试",
+        "直播",
+        "外链",
+        "讨论",
+        "活动",
+        "测评",
+        "评估",
+        "投票",
+        "项目",
+      ];
+      return typeRules[type];
+    };
+
+    //显示二维码弹窗
+    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.name,
+        url: codeUrl,
+      };
+      state.codeInfo = obj;
+    };
    return {
      ...toRefs(state),
      ...toRefs(levelList),
@@ -4116,6 +4163,9 @@ export default {
      submitExamine,
      closeReviewModal,
      recallReviewProject,
+      showCodeModel,
+      showCodeModel2,
+      checkType,
    };
  },
 };
--- 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>