--项目 学员

src/App.vue

@@ -79,7 +79,7 @@ export default defineComponent({
         store.commit("SET_MEMBER_INFO", JSON.parse(list));
         return;
       }
-      const memberInitInfo = await api1.getMemberInfo({keyWord: '', pageNo: 1, pageSize: 10});
+      const memberInitInfo = await api1.getMemberInfo({keyWord: '', pageNo: 1, pageSize: 10}).then(res=>res.data.data.rows);
       store.commit("SET_MEMBER_INFO", memberInitInfo);
       localStorage.setItem('memberInitInfo', JSON.stringify(memberInitInfo));
     }

src/components/project/ProjectManagerNew.vue

@@ -61,12 +61,16 @@ watch(() => memberParam.value.pageNo, throttle(getPageMember, 500))
 
 onMounted(() => {
   console.log('onMounted')
+  const memberOptions = store.state.memberInitInfo.map(e => ({
+    label: e.realName,
+    value: e.id
+  }))
   if (props.value) {
     options.value = [...(props.value + '').split(',').map((value, i) => ({
       label: (props.name + '').split(',')[i],
       value
-    })), ...store.state.memberInitInfo]
-  } else options.value = store.state.memberInitInfo
+    })), ...memberOptions]
+  } else options.value = memberOptions
 })
 
 function getSearchMember() {

src/views/projectcenter/TaskPage.vue

@@ -674,11 +674,11 @@
                       style="border: 1px solid #f2f6fe"
                       :columns="studentColumns()"
                       :data-source="tabledata"
-                      :loading="tableDataTotal === -1 ? true : false"
                       expandRowByClick="true"
                       :scroll="{ x: 1400 }"
                       @expand="expandTable"
                       :pagination="false"
+                      :loading="loading"
                       :row-selection="{
                       columnWidth: 30,
                       selectedRowKeys: selectedRowKeys,
@@ -1407,11 +1407,11 @@
               <span>您确定要删除此学员吗</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="closeDeleteOne">取消</div>
+              <div class="del_btn btn1" @click="closeDeleteOne">
+                <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2">
-                <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
+              <div class="del_btn btn2" @click="closeDeleteOneConfirm">
+                <div class="btnText">确定</div>
               </div>
             </div>
           </div>
@@ -1475,11 +1475,11 @@
               <span>您确定批量删除吗？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="closeCancelDelete">取消</div>
+              <div class="del_btn btn1" @click="closeCancelDelete">
+                <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2">
-                <div class="btnText" @click="closeAllDelete">确定</div>
+              <div class="del_btn btn2" @click="closeAllDelete">
+                <div class="btnText">确定</div>
               </div>
             </div>
           </div>
@@ -1744,6 +1744,7 @@ export default {
   setup() {
     const store = useStore();
     const state = reactive({
+      loading: false,
       projectId: storage.get("projectId")
           ? JSON.parse(storage.get("projectId"))
           : null,
@@ -3065,6 +3066,7 @@ export default {
     //点击确认删除单个学员
     const closeDeleteOneConfirm = () => {
       state.deleteOneStu = false;
+      state.loading = true
       deleteStu({
         projectId: state.projectId,
         studentIds: state.chooseDeleteOne,
@@ -3095,6 +3097,7 @@ export default {
     };
     //点击确定的批量删除弹窗
     const closeAllDelete = () => {
+      state.loading = true
       deleteStu({
         projectId: state.projectId,
         studentIds: state.selectedRows,
@@ -3254,6 +3257,7 @@ export default {
                 // studentData();
               }
             }
+            state.loading = false
           })
           .catch((err) => {
             console.log("获取学员列表失败", err);
@@ -3706,6 +3710,7 @@ export default {
             projectGroupId: 0,
           };
           console.log("obj", obj);
+          state.loading = true
           api
               .addStudentProject(obj)
               .then((res) => {