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

src/components/drawers/ProjectAudit.vue

@@ -417,7 +417,7 @@ export default {
         message.error(`请输入审核意见！`);
         return;
       }
-
+      ctx.emit("update:ProjAuditvisible", false);
       auditView({
         createId: props.chooseCreateId,
         createName: props.chooseCreater,
@@ -437,7 +437,8 @@ export default {
         });
     };
     const getDictList = async (param) =>
-      api1.getDict({
+      api1
+        .getDict({
           pageNo: 1,
           pageSize: 20,
           setCode: param,
@@ -648,7 +649,6 @@ export default {
           background-color: #fafafa;
         }
         .reworkCon {
-          height: 56px;
           display: flex;
           align-items: center;
           border-bottom: 1px solid #f0f6fc;

src/components/drawers/ViewAssess.vue

@@ -194,7 +194,7 @@ export default {
         console.log('我是传递过来的参数', props.datasource)
         console.log('我是传递过来的参数2', props.basicdata)
         api.QueryAssessmentDetail({
-          "assessmentSubmitId": props.datasource.assessmentSubmitId,
+          "assessmentSubmitId": props.datasource.assessmentSubmitId?props.datasource.assessmentSubmitId:props.datasource.assessmentResultIds,
           "courseId": props.basicdata.id,
           "studentId": props.datasource.studentId
         }).then(res=>{

src/components/student/ChangeGroupModal.vue

@@ -48,6 +48,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  checkBatch: {
+    type: Boolean,
+    default: false,
+  },
   groupList: {
     type: Array,
     default: () => [],
@@ -56,10 +60,10 @@ const props = defineProps({
     type: Number,
     default: null,
   },
+
 });
 
 const option = computed(() => {
-  debugger
   console.log("props.groupList", props.groupList);
   return props.groupList.map((e) => ({
     label: e.groupName,
@@ -81,13 +85,13 @@ const selectGroup = (e, v) => {
 };
 //确认换组
 const changeGroup = (item) => {
-  // debugger
+  debugger
   console.log("换组", selectGroupId.value, item);
   props.checkgroupStuId.forEach(stu => {
     let obj = {
       groupId: selectGroupId.value,
       groupName: selectGroupName.value,
-      studentId: stu,
+      id: stu,
     };
     console.log("换组obj", obj);
     api

src/components/student/CommonStudent.vue

@@ -295,7 +295,8 @@ import {
   AUDIENCE_LIST,
   ORG_CHILD_LIST,
   ORG_LIST,
-  USER_LIST, USER_LIST_PAGE,
+  // USER_LIST, 
+  USER_LIST_PAGE,
 } from "@/api/ThirdApi";
 import {
   saveStu,

src/components/student/TableStudent.vue

@@ -164,7 +164,7 @@
   <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall" />
 
   <!-- 换组弹窗 -->
-  <ChangeGroupModal v-model:changegroupV="checkgroupParam.changegroupV" :groupList="groupList"
+  <ChangeGroupModal v-model:changegroupV="checkgroupParam.changegroupV" :groupList="groupList" :checkBatch="checkgroupParam.checkBatch"
     :checkgroupStuId="stuSelectKeys" />
   <!-- 批量调整关卡弹窗 -->
   <!-- 取消学员弹窗 -->
@@ -407,6 +407,7 @@ const checkgroupParam = ref({
   changegroupV: false, //学员名称
   checkgroupList: "", //学员小组
   checkgroupStuId: null,
+  checkBatch: true
 });
 
 const stuSelectKeys = ref([]);
@@ -426,10 +427,13 @@ const stuRowSelection = computed(() => ({
 
 //显示学员换组弹窗
 function showChangeGroupModal() {
+  debugger
+  console.log("批量")
   const d = props.groupList
   console.log("d" + d)
   // debugger
   checkgroupParam.value.changegroupV = true;
+  checkgroupParam.value.checkBatch = true;
 }
 
 // 导出数据

src/views/DownLoad.vue

@@ -149,7 +149,7 @@ export default {
       api.DownLoadTotalSize().then(res=>{
         console.log(res)
         if(res.data.code==200){
-          state.capacity = res.data.data;
+          state.capacity = res.data.data && res.data.data !== {} ? res.data.data : 0;
         }else{
           state.capacity = 0;
         }
@@ -177,6 +177,7 @@ export default {
     }
 
     function formatCapacityGB(data) {
+      debugger
       let num = Number(data);
       let CMB = (num / (1048576*1024)).toFixed(2);
       return CMB

vue.config.js

@@ -15,8 +15,8 @@ module.exports = defineConfig({
         port: 8070,
         proxy: {
             "/manageApi": {
-                target: 'http:' + process.env.VUE_APP_PROXY_URL,
-                // target: 'http://localhost:30001',
+                //target: 'http:' + process.env.VUE_APP_PROXY_URL,
+                 target: 'http://localhost:30001',
                 changeOrigin: true, //表示是否改变原域名
                 pathRewrite: {
                     "^/manageApi": "",