首页大屏开发-修改2超级管理员-管理员跳转bug修复

src/components/manage/main/AdminHomeS.vue

@@ -193,8 +193,8 @@ export default {
     this.institutionNo = sessionStorage.getItem("f7a42fe7211f98ac7a60a285ac3a9527")
     this.institutionNo = this.institutionNo && this.institutionNo !== 'null' ? this.institutionNo : ''
 
-    // this.allTestNum = await this.getAllTestNum()
-    // this.allUserNum = await this.getAllUserNum()
+    this.allTestNum = await this.getAllTestNum()
+    this.allUserNum = await this.getAllUserNum()
     this.TodayUserNum = await this.getTodayUserNum()
 
 
@@ -265,6 +265,7 @@ export default {
     getAllTestNum() {
       return new Promise((resolve, reject) => {
         this.$http.get(`/index/allTestNum?institutionNo=${this.institutionNo}`, {}, (res) => {
+          console.log(res,'==================>allTestNum');
           resolve(res.data.allTestNum)
         })
       })
@@ -274,6 +275,8 @@ export default {
     getAllUserNum() {
       return new Promise((resolve, reject) => {
         this.$http.get(`/index/allUserNum?institutionNo=${this.institutionNo}`, {}, (res) => {
+          console.log(res,'==================>allUserNum');
+          
           resolve(res.data.allUserNum)
         })
       })
@@ -301,6 +304,7 @@ export default {
     finishInstitutionNum() {
       return new Promise((resolve, reject) => {
         this.$http.get(`/index/finishInstitutionNum?institutionNo=${this.institutionNo}`, {}, (res) => {
+          console.log(res,'=====================>resklk');
           resolve(res.data.map((item) => {
             return {
               name: item.institution_name,

src/components/manage/main/CognitiveTaskUserList.vue

@@ -97,6 +97,7 @@ export default {
       tableData: [],
       institutionNo: "",
       name: "", //学校名称
+      userId:'',
       multipleSelection: [], //批量导出选中的对象
       baseUrl: baseUrl,
       time: ["", ""],
@@ -112,6 +113,7 @@ export default {
     this.institutionNo = sessionStorage.getItem(
       "f7a42fe7211f98ac7a60a285ac3a9527"
     );
+    this.userId = sessionStorage.getItem("b80bb7740288fda1f201890375a60c8f");
     this.name = this.$route.query.name;
     this.getData();
     this.groupFun();
@@ -120,7 +122,7 @@ export default {
     //查询年级信息
     groupFun() {
       this.$http.get(
-        "/group/find?institutionNo=" + this.institutionNo,
+        `/group/find?institutionNo=${this.institutionNo}&userId=${this.userId}`,
         {},
         (response) => {
 

src/components/manage/main/SacleUserList.vue

@@ -189,6 +189,7 @@ export default {
       pageSize: 10,
       baseUrl: baseUrl,
       tableData: [],
+      userId:'',
       institutionNo: "",
       name: "", //学校名称
       multipleSelection: [], //批量导出选中的对象
@@ -205,6 +206,7 @@ export default {
     this.institutionNo = sessionStorage.getItem(
       "f7a42fe7211f98ac7a60a285ac3a9527"
     );
+    this.userId = sessionStorage.getItem("b80bb7740288fda1f201890375a60c8f");
     this.name = this.$route.query.name;
     //this.getUserBid()
     this.getData();
@@ -214,7 +216,8 @@ export default {
     //查询年级信息
     groupFun() {
       this.$http.get(
-        "/group/find?institutionNo=" + this.institutionNo,
+        // "/group/find?institutionNo=" + this.institutionNo,
+        `/group/find?institutionNo=${this.institutionNo}&userId=${this.userId}`,
         {},
         (response) => {
           this.groupOptions = response.data;

src/components/manage/main/UserGroupInfo.vue

@@ -242,6 +242,7 @@ export default {
       groupList: [],
       moveType: 1,
       userName: "",
+      createUserId:'',
       pageNum: 1,
       pageSize: 10,
       total: 0,
@@ -260,6 +261,9 @@ export default {
     this.institutionNo = sessionStorage.getItem(
       "f7a42fe7211f98ac7a60a285ac3a9527"
     );
+    this.createUserId = sessionStorage.getItem(
+      "b80bb7740288fda1f201890375a60c8f"
+    );
     this.getData();
     this.getGroupList();
   },
@@ -416,7 +420,8 @@ export default {
     // 查询年级列表
     getGroupList() {
       this.$http.get(
-        "/group/find?institutionNo=" + this.institutionNo,
+        // "/group/find?institutionNo=" + this.institutionNo,
+        `/group/find?institutionNo=${this.institutionNo}&userId=${this.createUserId}`,
         {},
         (response) => {
           // this.groupList = response.data;

src/components/manage/main/UserGroupManagement.vue

@@ -93,6 +93,7 @@ export default {
       gradeOptions: ['一年级', '二年级', '三年级', '四年级', '五年级', '六年级', '七年级', '八年级', '九年级', '高一年级', '高二年级', '高三年级'],
       checkedGrades: [],
       vser: '',
+      createUserId:'',
       optionsgroupUserList: [],
       dialogVisible: false,
       loading: false
@@ -105,6 +106,9 @@ export default {
     this.vser = sessionStorage.getItem(
       "f7a42fe7211f98ac7a60a285ac3a9529"
     );
+    this.createUserId = sessionStorage.getItem(
+      "b80bb7740288fda1f201890375a60c8f"
+    );
     this.getData()
     this.getDatas()
   },
@@ -113,11 +117,13 @@ export default {
     dialogVisibleopen() {
       this.dialogVisible = true
       console.log(this.vser, '========================>this.vser');
-      this.groupUser = [this.vser]
+      // this.groupUser = [this.vser]
+      this.groupUser = []
     },
     getData() {
       this.$http.get(
-        "/group/find?institutionNo=" + this.institutionNo,
+        // "/group/find?institutionNo=" + this.institutionNo,
+        `/group/find?institutionNo=${this.institutionNo}&userId=${this.createUserId}`,
         {},
         (response) => {
           this.tableData = response.data;
@@ -188,12 +194,20 @@ export default {
     },
 
     creatGroup(gradeName) {
+      console.log(this.groupUser,'===================jjjjjjjjjjjjj=========>this.groupUser');
+      
+      let groupUserList = this.groupUser.map(item=>{
+        return {userId:item}
+      })
+      console.log(groupUserList,'=============================>groupUserListgroupUserListgroupUserList');
+      
       return new Promise((resolve, reject) => {
         this.$http.post(
           "/group/add",
           {
             groupName: gradeName.trim(),
             institutionNo: this.institutionNo,
+            // groupUserList:groupUserList
           },
           (response) => {
             //console.log("结果", response);

src/components/manage/main/UserManage.vue

@@ -366,6 +366,7 @@ export default {
       currentPage: 1,
       total: 0,
       pageSize: 10,
+      createUserId:'',
       updatePersonalSecurity: {},
       rules: {
         signature: [
@@ -391,6 +392,9 @@ export default {
     this.institutionNo = sessionStorage.getItem(
       "f7a42fe7211f98ac7a60a285ac3a9527"
     );
+    this.createUserId = sessionStorage.getItem(
+      "b80bb7740288fda1f201890375a60c8f"
+    );
     this.getData();
     this.groupFun();
   },
@@ -399,7 +403,9 @@ export default {
     //查询年级信息
     groupFun() {
       this.$http.get(
-        "/group/find?institutionNo=" + this.institutionNo,
+        // "/group/find?institutionNo=" + this.institutionNo,
+        `/group/find?institutionNo=${this.institutionNo}&userId=${this.createUserId}`,
+
         {},
         (response) => {
           this.groupOptions = response.data;

src/components/manage/main/UserRecords.vue

@@ -184,6 +184,7 @@ export default {
       pageSize: 10,
       tableData: [],
       institutionNo: "",
+      createUserId:'',
       time: ["", ""],
     };
   },
@@ -191,6 +192,9 @@ export default {
     this.institutionNo = sessionStorage.getItem(
       "f7a42fe7211f98ac7a60a285ac3a9527"
     );
+    this.createUserId = sessionStorage.getItem(
+      "b80bb7740288fda1f201890375a60c8f"
+    );
     this.getData();
     this.groupFun();
   },
@@ -198,7 +202,8 @@ export default {
     //查询年级信息
     groupFun() {
       this.$http.get(
-        "/group/find?institutionNo=" + this.institutionNo,
+        // "/group/find?institutionNo=" + this.institutionNo,
+        `/group/find?institutionNo=${this.institutionNo}&userId=${this.createUserId}`,
         {},
         (response) => {
 

src/components/manage/main/testPlan.vue

@@ -1325,6 +1325,8 @@ export default {
     this.createUser = sessionStorage.getItem(
       "f7a42fe7211f98ac7a60a285ac3a9529"
     );
+    // this.userId = sessionStorage.getItem("b80bb7740288fda1f201890375a60c8f");
+
     // this.time[0] = ''
     // this.time[1] = ''
     this.getData();
@@ -1599,7 +1601,8 @@ export default {
     // 查询全部年级
     getAllGroup() {
       this.$http.get(
-        "/group/find?institutionNo=" + this.institutionNo,
+        // "/group/find?institutionNo=" + this.institutionNo,
+        `/group/find?institutionNo=${this.institutionNo}&userId=${this.createUserId}`,
         {},
         (response) => {
           // this.allGroups = response.data;