Browse Source

页面调整

shuhao 6 months ago
parent
commit
25d32b2c44
3 changed files with 6 additions and 3 deletions
  1. 5 1
      src/components/fnHeader.vue
  2. 1 1
      src/views/warningHome/index.vue
  3. 0 1
      src/views/workDetail/index.vue

+ 5 - 1
src/components/fnHeader.vue

@@ -54,6 +54,10 @@ const props = defineProps({
         type: Boolean,
         defalut: false,
     },
+    autoGo: {
+        type: Boolean,
+        defalut: false,
+    }
 });
 
 const farmVal = ref(sessionStorage.getItem("farmId")*1 || "");
@@ -118,7 +122,7 @@ const getGardenList = () => {
           resData.push({name: item.name,organId:item.id, wkt: item.pointWkt})
         }
         options.value = resData
-        if(userInfo.userName !== "13797066447"){
+        if(props.autoGo && userInfo.userName !== "13797066447"){
           farmVal.value = resData[0].organId
           toggleFarm(resData[0].organId)
         }

+ 1 - 1
src/views/warningHome/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="base-container no-events">
-        <fnHeader showDate></fnHeader>
+        <fnHeader showDate :autoGo="true"></fnHeader>
         <div class="content">
             <div class="warning-l left">
                 <div class="warning-top">

+ 0 - 1
src/views/workDetail/index.vue

@@ -1,6 +1,5 @@
 <template>
     <div class="base-container">
-        <fnHeader :hideSwitch="true" :hideShadow="true" showDate></fnHeader>
         <div class="content">
             <div class="content-left">
                 <div class="btn" @click="goBack">