Merge branch 'main' of http://182.92.169.222:3000/dlsx/virtualSimulation

src/layout/loginPage.vue

@@ -424,35 +424,69 @@ const formModel = ref({
 
 const FacultiesList = ref([]);
 const getFacultiesList = async (data: any) => {
-  const res: any = await getFaculties(data);
+  const res: any = await getFaculties(data)
-  console.log(res, "res11");
+  console.log(res, 'res11')
-  FacultiesList.value = res.result;
+  if (data.primaryType == 3){
-};
+    FacultiesList.value = res.result.map((res:any) => {
-const deepValues = ref([]);
+      return {
+        value: res.id,
+        label: res.name,
+        isLeaf: true
+      }
+    })
+  }else{
+    FacultiesList.value = res.result.map((res: any) => {
+      return {
+        value: res.id,
+        label: res.name,
+        isLeaf: false
+      }
+    })
+  }
+  
+}
+const deepValues = ref([])
 // 配置部门级联选择器
 const props = {
   lazy: true,
   checkStrictly: true,
   emitPath: false,
+  isLeaf: 'isLeaf',
   async lazyLoad(node: any, resolve: any) {
     console.log(node);
     deepValues.value = node.pathValues;
     await getFacultiesList({
       primaryType: node.level + 1,
       pid: node.value,
-    });
+    })
-    const nodes = FacultiesList.value.map((item: any) => ({
+    const nodes = FacultiesList.value.map((item: any) => {
-      value: item.id,
+      if (!item.isLeaf) {
-      label: item.name,
+        return {
-    }));
+          value: item.value,
-    resolve(nodes);
+          label: item.label,
+          isLeaf: item.isLeaf,
+          disabled:true
+        }
+      } else {
+        return {
+          value: item.value,
+          label: item.label,
+          isLeaf: item.isLeaf
+        }
+      }
+    })
+    console.log(nodes,'nodes');
+    
+    resolve(nodes)
   },
-};
+}
-
+const cascader = ref(null)
 const handleChange = (e: any) => {
   console.log(e);
-  formModel.value.clssid = e;
+  formModel.value.clssid = e
-};
+  cascader.value.togglePopperVisible()
+}
+
 
 // 添加校验规则
 const rules = {
@@ -538,6 +572,11 @@ const register = async () => {
       studentNumb: "",
       mobile: "",
       captcha: "",
+    }
+    ElMessage.success(`注册成功`)
+    isRegister.value = false
+
+
     };
     ElMessage.success(`注册成功`);
     isRegister.value = false;
@@ -622,6 +661,7 @@ onMounted(() => {
     align-items: center;
     height: 1000px;
     min-height: 100vh;
+
     // margin: 0;
     .middle-content {
       position: relative;