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

src/App.vue

@@ -44,7 +44,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.18------------");
+    console.log("版本0.9.19------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/components/student/ChangeLevelModal.vue

@@ -0,0 +1,85 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-20 17:00:37
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-20 17:08:12
+ * @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <a-modal
+    style="padding: 0"
+    :closable="sh"
+    :visible="visiblene"
+    :footer="null"
+    centered="true"
+    wrapClassName="changeModal"
+  >
+    <div class="con">
+      <div class="header">
+        <div class="inhe">
+          <div class="mod"></div>
+          <div class="tz">调整关卡</div>
+          <div class="mg" @click="closeChangeModal"></div>
+        </div>
+      </div>
+      <div class="mid">
+        <div class="inher">
+          <div class="cur">当前关卡：关卡2</div>
+          <div class="select">
+            <a-select
+              v-model:value="curLevel"
+              style="width: 100%"
+              placeholder="请选择关卡"
+              :options="projectNameList4"
+              @change="selectProjectName4"
+              allowClear
+              showSearch
+            ></a-select>
+          </div>
+          <div class="btn">
+            <button
+              class="sameb btn1"
+              @click="closeChangeModal"
+              style="cursor: pointer"
+            >
+              取消
+            </button>
+            <button
+              class="sameb btn2"
+              @click="changelevel"
+              style="cursor: pointer"
+            >
+              确定
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
+</template>
+<script>
+export default {
+  name: "ChangeLevelModal",
+  props: {
+    visiblene: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props, ctx) {
+    const closeChangeModal = () => {
+      ctx.emit("update:visiblene", false);
+    };
+    const changelevel = () => {
+      console.log("点击调整关卡");
+    };
+    //获取关卡列表
+
+    return {
+      closeChangeModal,
+      changelevel,
+    };
+  },
+};
+</script>

src/components/student/TableStudent.vue

@@ -63,6 +63,12 @@
           批量删除
         </a-button>
       </a-col>
+      <a-col :span="1.5" v-if="type == 2">
+        <a-button class="cus-btn white" @click="showChangeModal">
+          <template #icon></template>
+          批量调整关卡
+        </a-button>
+      </a-col>
     </a-row>
     <div style="margin-top: 20px">
       <a-table
@@ -102,12 +108,15 @@
       </a-table>
     </div>
   </div>
+  <!-- 批量调整关卡弹窗 -->
+  <ChangeLevelModal v-model:visiblene="visiblene" />
+  <!-- 批量调整关卡弹窗 -->
 </template>
 <script setup>
 import { computed, defineProps, onMounted, ref, watch } from "vue";
 import { delStudentList, getStuPage } from "@/api/index1";
 import CommonStudent from "@/components/student/CommonStudent";
-
+import ChangeLevelModal from "./ChangeLevelModal.vue";
 const props = defineProps({
   type: Number,
   id: String,
@@ -125,7 +134,7 @@ const tablecolumns = ref([
     title: "姓名",
     dataIndex: "studentName",
     key: "studentName",
-    width: "10%",
+    width: "8%",
     align: "left",
     className: "h",
   },
@@ -248,6 +257,12 @@ function submitCall(flag) {
   tableData.value.loading = true;
   flag && getStuList();
 }
+
+//调整关卡
+const visiblene = ref(false);
+const showChangeModal = () => {
+  visiblene.value = true;
+};
 </script>
 <style>
 .studentopea1 {

src/views/learningpath/LevelAdd.vue

@@ -2684,7 +2684,9 @@ export default {
   .ant-modal {
     width: 549px !important;
     height: 245px !important;
-
+    .ant-modal-close-x {
+      display: none;
+    }
     .ant-modal-content {
       width: 549px !important;
       height: 245px !important;