页面调整

src/components/fnHeader.vue

@@ -56,7 +56,7 @@ const props = defineProps({
     },
     autoGo: {
         type: Boolean,
-        defalut: false,
+        default: true,
     }
 });
 
@@ -123,7 +123,9 @@ const getGardenList = () => {
             options.value.push({name: item.name,organId:item.id, wkt: item.pointWkt})
           }
           farmVal.value = options.value[0].organId
-          toggleFarm(options.value[0].organId)
+          if(props.autoGo){
+            toggleFarm(options.value[0].organId)
+          }
         })
       }else{
         params["vip"] = 1

src/views/AuthenticLogin.vue

@@ -27,10 +27,10 @@
               :inline="false"
               @keyup.enter="onSubmit"
           >
-            <el-form-item prop="phone">
+            <el-form-item prop="userName">
               <el-input
                   size="large"
-                  v-model.trim="phone"
+                  v-model.trim="userName"
                   placeholder="用户名"
               >
                 <template #prepend>
@@ -38,11 +38,12 @@
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item prop="code">
+            <el-form-item prop="pwd">
               <el-input
                   size="large"
-                  v-model.trim="code"
-                  placeholder="验证码"
+                  type="password"
+                  v-model.trim="pwd"
+                  placeholder="密码"
               >
                 <template #prepend>
                   <el-icon :size="20"><Key /></el-icon>
@@ -76,7 +77,7 @@ import { useStore } from "vuex";
 import { useRouter } from "vue-router";
 
 const rules = {
-  phone: [{ required: true, message: "请输入用户名", trigger: "blur" }]
+  userName: [{ required: true, message: "请输入用户名", trigger: "blur" }]
 };
 
 // const rules = {
@@ -89,10 +90,10 @@ const rules = {
 const store = useStore();
 const router = useRouter();
 const form = reactive({
-  "code": "",
-  "phone": "13797066447"
+  "pwd": "",
+  "userName": "汕头橡胶"
 });
-const { phone, code } = toRefs(form);
+const { userName, pwd } = toRefs(form);
 const ref_form = ref(null);
 const success = ref(false);
 sessionStorage.clear();
@@ -103,7 +104,7 @@ router.options.isAddDynamicMenuRoutes = false;
 const onSubmit = () => {
     ref_form.value.validate(async (valid) => {
         if (valid) {
-            const res = await VE_API.system.phoneLogin(form);
+            const res = await VE_API.system.login(form);
             if (res.code == 0) {
                 const { token, userName, djiCloudToken } = res.data;
                 store.commit(`app/${SET_TOKEN}`, token);

src/views/authentic/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="base-container">
-        <fnHeader :hideSwitch="true" :hideShadow="true"></fnHeader>
+        <fnHeader :hideSwitch="true" :autoGo="false" :hideShadow="true"></fnHeader>
         <div class="top-bg"></div>
         <el-upload
             ref="uploadRef"
@@ -243,6 +243,7 @@ const store = useStore();
 let authenticMap = new AuthenticMap();
 const mapRef = ref();
 const userInfo = JSON.parse(sessionStorage.getItem("userinfo"));
+debugger
 const location = ref(userInfo.location);
 
 onMounted(() => {