fix:合并冲突

src/components/student/TableStudent.vue

@@ -6,7 +6,7 @@
       style="padding-left: 20px; margin-right: 0px"
     >
       <a-col>
-        <a-form-item title="姓名：" @click="getStuList">
+        <a-form-item title="姓名：" >
           <a-input
             class="cus-input"
             v-model:value="tableParam.studentName"
@@ -15,7 +15,7 @@
         </a-form-item>
       </a-col>
       <a-col>
-        <a-button class="cus-btn" style="width: 100px">
+        <a-button class="cus-btn" style="width: 100px"  @click="getStuList">
           <template #icon>
             <img
               style="margin-right: 10px"
@@ -63,12 +63,13 @@
           批量删除
         </a-button>
       </a-col>
-      <a-col :span="1.5" v-if="type === 2">
+      <!--
+      <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-col>-->
     </a-row>
     <div style="margin-top: 20px">
       <a-table
@@ -80,11 +81,44 @@
         :row-selection="stuRowSelection"
       >
         <template #action="{ record }">
-          <div
-            @click="del(record.id)"
-            style="color: #4ea6ff; font-size: 14px; text-align: center"
-          >
-            删除
+          <div style="display: flex; justify-content: center">
+           <!--  <div v-if="type == 2"
+              @click="del(record.id)"
+              style="
+                color: #4ea6ff;
+                font-size: 14px;
+                text-align: center;
+                margin-left: 20px;
+                cursor: pointer;
+              "
+            >
+              查看
+            </div>
+        
+            <div
+              @click="showChangeModal"
+              style="
+                color: #4ea6ff;
+                font-size: 14px;
+                text-align: center;
+                margin-left: 20px;
+                cursor: pointer;
+              "
+            >
+              调整
+            </div> -->
+            <div
+              @click="del(record.id)"
+              style="
+                color: #4ea6ff;
+                font-size: 14px;
+                text-align: center;
+                margin-left: 20px;
+                cursor: pointer;
+              "
+            >
+              删除
+            </div>
           </div>
           <!-- <a-row gutter="12">
             <a-col>
@@ -109,7 +143,7 @@
     </div>
   </div>
   <!-- 批量调整关卡弹窗 -->
-  <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys"  @finash="submitCall"/>
+  <ChangeLevelModal v-model:visiblene="visiblene" :id="id" />
   <!-- 批量调整关卡弹窗 -->
 </template>
 <script setup>
@@ -117,7 +151,7 @@ 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";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 const props = defineProps({
   type: Number,
   id: String,
@@ -191,7 +225,7 @@ const tableData = ref({
 });
 
 const stuRowSelection = computed(() => ({
-  columnWidth: 10,
+  columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
   onChange: onStuSelectChange,
   preserveSelectedRowKeys: true,
@@ -233,9 +267,16 @@ function getStuList() {
   });
 }
 
-function reset() {}
+function reset() {
+  tableParam.value.studentName="";
+}
 
 function bathDel() {
+  if( stuSelectKeys.value &&
+    stuSelectKeys.value.length == 0){
+      message.destroy();
+    return message.warning("请先选中学员");
+  }
   stuSelectKeys.value &&
     stuSelectKeys.value.length &&
     delStudentList({
@@ -259,15 +300,11 @@ function submitCall(flag) {
   flag && getStuList();
 }
 
-//调整关卡
+// 调整关卡;
 const visiblene = ref(false);
-const showChangeModal = () => {
-  if(!stuSelectKeys.value.length){
-    message.error("请选择学员")
-    return
-  }
-  visiblene.value = true;
-};
+//const showChangeModal = () => {
+ // visiblene.value = true;
+//};
 </script>
 <style>
 .studentopea1 {