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

src/views/learningpath/LevelAdd.vue

@@ -460,11 +460,15 @@
                     </div>
                     <div class="time">
                       <div class="timetext">开始时间</div>
-                      <div class="timetext">{{ item.startTime!==null?item.startTime:''}}</div>
+                      <div class="timetext">
+                        {{ item.startTime !== null ? item.startTime : "" }}
+                      </div>
                     </div>
                     <div class="progress">
                       <div class="progresstext">
-                        {{ item.complete?item.complete:0 }}/{{ item.total?item.total:0 }}人
+                        {{ item.complete ? item.complete : 0 }}/{{
+                          item.total ? item.total : 0
+                        }}人
                       </div>
                       <div style="display: flex">
                         <a-progress
@@ -474,7 +478,7 @@
                           trailColor="rgba(253, 209, 98, 0.2)"
                         />
                         <span class="progresstext" style="margin-left: 10px"
-                          >{{ item.percent?item.percent:0 }}%</span
+                          >{{ item.percent ? item.percent : 0 }}%</span
                         >
                       </div>
                     </div>
@@ -768,7 +772,10 @@
                       <div class="box"></div>
                       <div class="onetitle">上传共享文档</div>
                       <div class="oneedi">
-                        <a-switch v-model:checked="docChecked" @change="checkedClose"></a-switch>
+                        <a-switch
+                          v-model:checked="docChecked"
+                          @change="checkedClose"
+                        ></a-switch>
                       </div>
                     </div>
                     <div class="btnbox" style="margin: 20px">
@@ -1217,6 +1224,15 @@
         </div>
       </div>
     </a-modal>
+
+    <!-- 二维码弹窗 -->
+    <two-dimensional-code
+      v-model:codevisible="codevisible"
+      :codeInfo="codeInfo"
+      index="0"
+      type="课程二维码"
+    />
+    <!-- 二维码弹窗 -->
   </div>
 </template>
 <script>
@@ -1243,6 +1259,7 @@ 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 {
   name: "LevelAdd",
   components: {
@@ -1257,6 +1274,7 @@ export default {
     FaceManage,
     WorkManage,
     SeeStu,
+    TwoDimensionalCode,
   },
   setup() {
     // const routers = useRoute();
@@ -1888,7 +1906,7 @@ export default {
     const getOverview = () => {
       getRouterOverview(state.routerId)
         .then((res) => {
-          console.log(res)
+          console.log(res);
           Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
             levelList.routerInfoOverview[item] =
               res.data.data.routerInfoOverview[item] || 0;
@@ -1911,40 +1929,40 @@ export default {
     };
 
     // 设置上传图片开关
-    const checkedClose = (data,a) => {
-      console.log(data,a)
-      state.docChecked = data
+    const checkedClose = (data, a) => {
+      console.log(data, a);
+      state.docChecked = data;
       console.log({
-          routerId: state.routerId,
-          status: state.action,
-          attachSwitch:  data ? 1: -1
-        })
+        routerId: state.routerId,
+        status: state.action,
+        attachSwitch: data ? 1 : -1,
+      });
       // 更新开关状态
       editRoutered({
-          attach:JSON.stringify(state.fileList),
-          name: state.styTitle,
-          picUrl: state.picUrl,
-          remark: state.remark,
-          routerId: state.routerId,
-          status: state.action,
-          attachSwitch:  data ? 1: -1
+        attach: JSON.stringify(state.fileList),
+        name: state.styTitle,
+        picUrl: state.picUrl,
+        remark: state.remark,
+        routerId: state.routerId,
+        status: state.action,
+        attachSwitch: data ? 1 : -1,
+      })
+        .then((res) => {
+          console.log(res);
         })
-          .then((res) => {
-            console.log(res);
-          })
-          .catch((err) => {
-            console.log(err);
-          });
-
-    }
+        .catch((err) => {
+          console.log(err);
+        });
+    };
 
     // 获取路径列表
     const myGetRouterDetail = () => {
       GetRouterDetail(state.routerId)
         .then((res) => {
-          console.log('router-list',res)
-          state.fileList = JSON.parse(res.data.data.routerInfo.attach)
-          state.docChecked = res.data.data.routerInfo.attachSwitch == 1?true:false
+          console.log("router-list", res);
+          state.fileList = JSON.parse(res.data.data.routerInfo.attach);
+          state.docChecked =
+            res.data.data.routerInfo.attachSwitch == 1 ? true : false;
           if (res.data.data.routerInfo.status == 1) {
             state.nodata = false;
           }
@@ -1990,7 +2008,7 @@ export default {
           remark: state.remark,
           routerId: state.routerId,
           status: state.action,
-          attachSwitch:  state.docChecked?1:-1
+          attachSwitch: state.docChecked ? 1 : -1,
         })
           .then((res) => {
             console.log(res);
@@ -2213,7 +2231,7 @@ export default {
       deleteStu,
       totask,
       tostudent,
-      checkedClose
+      checkedClose,
     };
   },
 };