Przeglądaj źródła

feat:添加临时入口

wangsisi 1 dzień temu
rodzic
commit
6b482d6e04

+ 3 - 5
src/views/old_mini/create_farm/index.vue

@@ -451,6 +451,7 @@ const ruleForm = reactive({
     fzr: "",
     tel: "",
     userType: 1,
+    baseType: null,
     defaultFarm: 0, // 0:否 1:是
 });
 // 自定义验证规则:验证面积必须是大于0的数字
@@ -489,6 +490,7 @@ const rules = reactive({
         },
     ],
     defaultFarm: [{ required: true, message: "请选择是否为默认农场", trigger: "blur" }],
+    baseType: [{ required: true, message: "请选择基地类别", trigger: "blur" }],
 });
 
 const curRole = localStorage.getItem("SET_USER_CUR_ROLE");
@@ -840,6 +842,7 @@ function populateEditData() {
     ruleForm.name = editData.name || "";
     ruleForm.fzr = editData.fzr || "";
     ruleForm.tel = editData.tel || "";
+    ruleForm.baseType = editData.baseType || null;
     ruleForm.defaultFarm = editData.defaultOption || false;
     ruleForm.mu = editData.mianji || "";
     ruleForm.address = editData.address || "";
@@ -951,11 +954,6 @@ function handleMianjiInput(value) {
             // 标记已创建默认地块
             hasDefaultPolygon.value = true;
         }
-
-        // 如果路由type是farmer且亩数大于等于50,自动调用toSubPage方法
-        if (route.query.type === 'farmer' && mu >= 50) {
-            toSubPage();
-        }
     }, 500);
 }
 </script>

+ 1 - 5
src/views/old_mini/home/index.vue

@@ -22,7 +22,7 @@
         </div>
 
         <!-- <div class="task-list">
-            <div class="task-title" @click="handleJump">待办任务</div>
+            <div class="task-title">待办任务</div>
             <div class="bottom-tag">
                 <div class="tag-card">
                     <div class="card-content">
@@ -84,10 +84,6 @@ import reminderTimePopup from "@/components/popup/reminderTimePopup.vue";
 import executeTracePopup from "@/components/popup/executeTracePopup.vue";
 import knowledgeCard from "./components/knowledgeCard.vue";
 
-const handleJump = () =>{
-    router.push('/create_farm?type=farmer&expertMiniUserId=81881')
-}
-
 const store = useStore();
 const tabBarHeight = computed(() => store.state.home.tabBarHeight);
 const router = useRouter();

+ 5 - 1
src/views/old_mini/monitor/index.vue

@@ -8,7 +8,7 @@
             @changeGarden="changeGarden" :isGarden="true" :gardenId="defaultGardenId"></weather-info>
         <!-- 作物档案 -->
         <div class="archives-time-line">
-            <div class="archives-time-line-header">
+            <div class="archives-time-line-header" @click="handleJump">
                 <div class="line-title">作物档案</div>
                 <el-date-picker style="width: 110px" v-model="date" type="year" placeholder="全部日期" />
             </div>
@@ -53,6 +53,10 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import ArchivesFarmTimeLine from "@/components/pageComponents/ArchivesFarmTimeLine.vue";
 import agriExecutePopup from "@/components/popup/agriExecutePopup.vue";
 
+const handleJump = () =>{
+    router.push('/create_farm?type=farmer&expertMiniUserId=81881')
+}
+
 const showAgriExecutePopup = ref(false); // 农事执行弹窗
 const agriExecuteData = ref({});
 const handleAgriExecuted = () => {