学校名字后面拼接ID

src/modules/basic/view/campus.vue

@@ -18,7 +18,7 @@
               filterable
             >
               <el-option
-                v-for="item in rootOrgList"
+                v-for="item in rootSchoolSelect"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -406,6 +406,17 @@ export default {
     },
     isSuperAdmin() {
       return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    },
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     }
   },
   methods: {

src/modules/basic/view/clientConfig.vue

@@ -18,7 +18,7 @@
             filterable
           >
             <el-option
-              v-for="item in rootOrgList"
+              v-for="item in rootSchoolSelect"
               :label="item.name"
               :value="item.id"
               :key="item.id"
@@ -904,7 +904,7 @@ export default {
               defaultValue.push(lt.code);
             }
             this.ruleForm.preventCheatingConfig = defaultValue;
-            console.log(defaultValue);
+            // console.log(defaultValue);
           }
 
           if (this.ruleForm.properties.STUDENT_CLIENT_VERSION) {
@@ -921,7 +921,7 @@ export default {
             //   defaultValue.push(lt.code);
             // }
             this.ruleForm.studentClientVersion = defaultValue;
-            console.log(defaultValue);
+            // console.log(defaultValue);
           }
           let fileUrl = response.data.LOGO_FILE_URL;
           let fname = "";
@@ -1077,7 +1077,7 @@ export default {
     },
     uploadMenuLogoSuccess(response) {
       console.log("uploadSuccess");
-      console.log(response);
+      // console.log(response);
       if (response && response.length > 0) {
         this.$notify({
           message: "上传成功",
@@ -1267,11 +1267,22 @@ export default {
   computed: {
     ...mapState({ user: state => state.user }),
     btnSaveDiabled() {
-      console.log(this.formDataChanged);
+      // console.log(this.formDataChanged);
       return !this.formDataChanged && !this.treeCheckedChanged;
     },
     isSuperAdmin() {
       return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    },
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     }
   }
 };

src/modules/basic/view/resource_list.vue

@@ -17,7 +17,7 @@
               filterable
             >
               <el-option
-                v-for="item in rootOrgList"
+                v-for="item in rootSchoolSelect"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -314,6 +314,17 @@ export default {
     ...mapState({ user: state => state.user }),
     isSuperAdmin() {
       return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    },
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     }
   },
   methods: {

src/modules/basic/view/role_privilege_settings.vue

@@ -15,7 +15,7 @@
                 filterable
               >
                 <el-option
-                  v-for="item in orgList"
+                  v-for="item in rootSchoolSelect"
                   :label="item.name"
                   :value="item.id"
                   :key="item.id"
@@ -96,7 +96,7 @@ export default {
         roleId: null,
         privilegeGroupId: null
       },
-      orgList: [],
+      rootOrgList: [],
       roleList: [],
       privilegeGroupList: [],
       treeChanged: false,
@@ -113,6 +113,17 @@ export default {
     ...mapState({ user: state => state.user }),
     isSuperAdmin() {
       return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    },
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     }
   },
   methods: {
@@ -128,7 +139,7 @@ export default {
         this.$httpWithMsg.post(url2),
         this.$httpWithMsg.get(url3)
       ]).then(([resp1, resp2, resp3]) => {
-        this.orgList = resp1.data;
+        this.rootOrgList = resp1.data;
 
         this.form.orgId = this.user.rootOrgId;
         this.roleList = resp2.data;
@@ -168,8 +179,8 @@ export default {
         this.$httpWithMsg.get(url1),
         this.$httpWithMsg.get(url2)
       ]).then(([resp1, resp2]) => {
-        console.log("initTree(). treeData:", resp1.data.children);
-        console.log("initTree(). checkedKeys:", resp2.data);
+        // console.log("initTree(). treeData:", resp1.data.children);
+        // console.log("initTree(). checkedKeys:", resp2.data);
         this.treeData = resp1.data.children;
         this.checkedKeys = resp2.data;
       });

src/modules/basic/view/school_config.vue

@@ -17,7 +17,7 @@
             filterable
           >
             <el-option
-              v-for="item in rootOrgList"
+              v-for="item in rootSchoolSelect"
               :label="item.name"
               :value="item.id"
               :key="item.id"
@@ -287,6 +287,17 @@ export default {
     },
     isSuperAdmin() {
       return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    },
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     }
   }
 };

src/modules/basic/view/school_privilege_settings.vue

@@ -15,7 +15,7 @@
                 filterable
               >
                 <el-option
-                  v-for="item in orgList"
+                  v-for="item in rootSchoolSelect"
                   :label="item.name"
                   :value="item.id"
                   :key="item.id"
@@ -80,7 +80,7 @@ export default {
         orgId: null,
         privilegeGroupId: null
       },
-      orgList: [],
+      rootOrgList: [],
       privilegeGroupList: [],
       treeChanged: false,
       treeData: [],
@@ -96,6 +96,17 @@ export default {
     ...mapState({ user: state => state.user }),
     isSuperAdmin() {
       return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    },
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     }
   },
   methods: {
@@ -111,7 +122,7 @@ export default {
         this.$httpWithMsg.post(url2),
         this.$httpWithMsg.get(url3)
       ]).then(([resp1, resp2, resp3]) => {
-        this.orgList = resp1.data;
+        this.rootOrgList = resp1.data;
 
         this.form.orgId = this.user.rootOrgId;
         this.roleList = resp2.data;

src/modules/basic/view/sys_login_rule_list.vue

@@ -15,7 +15,7 @@
           class="w180"
         >
           <el-option
-            v-for="item in rootOrgList"
+            v-for="item in rootSchoolSelect"
             :label="item.name"
             :value="item.id"
             :key="item.id"
@@ -189,7 +189,7 @@
             class="w180"
           >
             <el-option
-              v-for="item in rootOrgList"
+              v-for="item in rootSchoolSelect"
               :label="item.name"
               :value="item.id"
               :key="item.id"
@@ -424,6 +424,17 @@ export default {
     ...mapState({ user: state => state.user }),
     isSuperAdmin() {
       return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    },
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     }
   },
   created() {

src/modules/basic/view/sys_prop_list.vue

@@ -331,7 +331,7 @@ export default {
       this.$httpWithMsg
         .get(url)
         .then(response => {
-          console.log("response :", response);
+          // console.log("response :", response);
           this.tableData = response.data.content;
           this.total = response.data.totalElements;
         })

src/modules/basic/view/unimportant_school_config.vue

@@ -17,7 +17,7 @@
             filterable
           >
             <el-option
-              v-for="item in rootOrgList"
+              v-for="item in rootSchoolSelect"
               :label="item.name"
               :value="item.id"
               :key="item.id"
@@ -198,6 +198,17 @@ export default {
     },
     isSuperAdmin() {
       return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    },
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     }
   }
 };

src/modules/basic/view/user.vue

@@ -18,7 +18,7 @@
               filterable
             >
               <el-option
-                v-for="item in rootOrgList"
+                v-for="item in rootSchoolSelect"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -175,7 +175,7 @@
                   filterable
                 >
                   <el-option
-                    v-for="item in rootOrgList"
+                    v-for="item in rootSchoolSelect"
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
@@ -300,7 +300,7 @@
                   :disabled="true"
                 >
                   <el-option
-                    v-for="item in rootOrgList"
+                    v-for="item in rootSchoolSelect"
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
@@ -630,6 +630,17 @@ export default {
     },
     isSuperAdmin() {
       return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    },
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     }
   },
   methods: {