From 9f627fb0c09a151ee88d2ceda78a4c2a7be400e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 20 Jun 2024 16:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=B8=8A=E6=8A=A5=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/index.less                 | 18 +++++
 .../src/router/router_modular/index.js        |  2 +-
 yifengdian-company-report/src/views/home.vue  |  4 +-
 .../src/views/vegetableDetails.vue            | 75 +++++++++++++++----
 4 files changed, 80 insertions(+), 19 deletions(-)

diff --git a/yifengdian-company-report/src/assets/css/index.less b/yifengdian-company-report/src/assets/css/index.less
index 7b44320..1f2a451 100644
--- a/yifengdian-company-report/src/assets/css/index.less
+++ b/yifengdian-company-report/src/assets/css/index.less
@@ -57,6 +57,13 @@ body #app {
 .yellow{
   color: #ff9805;
 }
+.border-btn{
+  border-top:  1px solid #E0E9F5;
+}
+.border-btn-yellow{
+  border-bottom:  1px solid #E0E9F5;
+}
+
 .card{
   background-color: #fff;
   border-radius: 8px;
@@ -133,6 +140,9 @@ body #app {
   &-left18{
     margin-left: 18px;
   }
+  &-left25{
+    margin-left: 25px;
+  }
   &-right12{
     margin-right: 12px;
   }
@@ -148,6 +158,9 @@ body #app {
   &-bot5{
     margin-bottom: 5px;
   }
+  &-bot12{
+    margin-bottom: 12px;
+  }
   &-top18{
     margin-top: 18px;
   }
@@ -245,6 +258,10 @@ body #app {
     width: 15px;
     height: 15px;
   }
+  &-20{
+    width: 20px;
+    height: 20px;
+  }
 }
 .required{
   position: relative;
@@ -258,6 +275,7 @@ body #app {
 }
 .text-center{
   text-align: center;
+  
 }
 
 .footer{
diff --git a/yifengdian-company-report/src/router/router_modular/index.js b/yifengdian-company-report/src/router/router_modular/index.js
index 502ca8f..c060016 100644
--- a/yifengdian-company-report/src/router/router_modular/index.js
+++ b/yifengdian-company-report/src/router/router_modular/index.js
@@ -16,7 +16,7 @@ const router_modular = [
         path: '/vegetableDetails',
         name: 'vegetableDetails',
         component: () => import(/* webpackChunkName: "about" */ '@/views/vegetableDetails.vue'),
-        title:'产量上报'
+        title:'企业上报'
     },
     {
         path: '/home',
diff --git a/yifengdian-company-report/src/views/home.vue b/yifengdian-company-report/src/views/home.vue
index 2b262ad..5c6649a 100644
--- a/yifengdian-company-report/src/views/home.vue
+++ b/yifengdian-company-report/src/views/home.vue
@@ -91,9 +91,9 @@
       </div>
     </section>
     <div class="container1">
-      <div class="movable-area" @touchstart="onMovableStart" @touchmove="onMovableMove" @touchend="onMovableEnd" @click="$router.push('/vegetableDetails')">
+      <div class="movable-area" @touchstart="onMovableStart" @touchmove="onMovableMove" @touchend="onMovableEnd" >
         <div class="movable-view" :style="{ left: x + 'px', top: y + 'px' }">
-          <img src="@/assets/images/home/shangbao.gif" class="draggable" alt="draggable image">
+          <img @click="$router.push('/vegetableDetails')" src="@/assets/images/home/shangbao.gif" class="draggable" alt="draggable image">
         </div>
       </div>
     </div>
diff --git a/yifengdian-company-report/src/views/vegetableDetails.vue b/yifengdian-company-report/src/views/vegetableDetails.vue
index 873c2c8..0f50af0 100644
--- a/yifengdian-company-report/src/views/vegetableDetails.vue
+++ b/yifengdian-company-report/src/views/vegetableDetails.vue
@@ -1,11 +1,31 @@
 <template>
   <div>
-    <div class="head">
-      <div class="arrow" @click="goback"><van-icon name="arrow-left" /></div>
-      <div class="head-title">产量上报</div>
-    </div>
-    <div style="height: 54px"></div>
-    <div class="list">
+    <van-tabs @click="onClick">
+      <van-tab title="历史信息">
+        <div class="header font-size17 font-pingfangB text-center flex  flex-center2 ">
+          <van-search v-model="searchKey" shape="round" background="#ffffff" placeholder="请输入搜索关键词" class="flex1" />
+        </div>
+        <div class="container">
+          <div class="card flex flex-y">
+            <div class="flex flex-x  m-bot12  flex-center2" >
+              <img src="../assets/images//icons//date-blue.png" class="img-15">
+              <div class="font-size14  blue m-left5   ">2024-01</div>
+
+            </div>
+            <div  class="border-btn" v-for="item in hisList">
+             <div class="font-pingfangB m-top12">{{ item.vegetable }}</div>
+            <div class="gray">种植时间:{{ item.PlantingTime }}</div>
+            <div class="gray">上市时间:{{ item.launchTime }}</div>
+            <div class="gray m-bot12">产量(吨):{{ item.yield }}</div></div> 
+          </div>
+        </div>
+      </van-tab>
+      <van-tab title="信息填报">
+        <div class="flex flex-y"> 
+       <div class="header font-size17 font-pingfangB text-center flex  flex-center2 ">
+         <div class="m-left25">青岛德龙种业有限公司</div> 
+        </div>
+        <div class="list">
       <div
         class="list-item"
         v-for="(item, i) in vegetableList"
@@ -61,9 +81,13 @@
           />
         </van-cell-group>
       </div>
-      <button @click="addRow" class="login-btn1">
+      <div class="flex flex-x " @click="addRow">
+        <img class="img-20" src="../assets/images/icons/add.png"  >
+        <div >添加品种</div>
+      </div>
+      <!-- <button @click="addRow" class="login-btn1">
         <van-icon name="plus" /> 添加
-      </button>
+      </button> -->
     </div>
     <div v-show="typeShow" class="picker-box">
       <van-picker
@@ -94,9 +118,16 @@
         :value="new Date(vegetableList[index].marketTime)"
       />
     </div>
-    <div class="bottom">
-      <button @click="onSubmit" class="login-btn">上报</button>
+    <div class="flex flex-x flex-center1 flex-center2">   
+         <button @click="onSubmit" class="login-btn">上报</button></div>
+
     </div>
+      
+      </van-tab>
+
+    </van-tabs>
+
+
   </div>
 </template>
 
@@ -105,6 +136,7 @@ import Toast from "vant/es/toast";
 import Dialog from "vant/es/dialog";
 import axios from "axios";
 import config from "@/config/index";
+import { Image } from "vant";
 const baseUrl =
   process.env.NODE_ENV === "development" ? "" : config.baseUrl.pro;
 export default {
@@ -129,6 +161,8 @@ export default {
       placeOrgName: null,
       columns: ["白菜", "土豆", "温州", "嘉兴", "湖州"],
       list: [],
+      hisList:[{time:"2024-02",vegetable:"西红柿",PlantingTime:"2024-20",launchTime:"2024-05-26",yield:"200"},
+      {time:"2024-02",vegetable:"西红柿",PlantingTime:"2024-20",launchTime:"2024-05-26",yield:"200"}]
     };
   },
   mounted() {
@@ -164,7 +198,7 @@ export default {
       method: "post",
       url: `${baseUrl}/api/sys/dict/data/yifengScreen/dictlist`,
       data: {
-        dictType: "vegetable",
+        dictType: "",
       },
     })
       .then((response) => {
@@ -183,7 +217,7 @@ export default {
       });
   },
   methods: {
-    onInput(val) {},
+    onInput(val) { },
     onConfirm(val) {
       this.vegetableList[this.index].vegetableCategory = val;
       this.typeShow = false;
@@ -366,9 +400,14 @@ export default {
 </script>
 
 <style scoped>
+.header {
+  height: 50px;
+  background-color: #fff;
+
+}
 .list {
   padding: 12px;
-  height: calc(100vh - 170px);
+  height: calc(100vh - 150px);
   overflow-y: scroll;
 }
 .list-item {
@@ -401,26 +440,29 @@ export default {
 }
 .picker-box {
   width: 100%;
-  position: absolute;
+  position: fixed;
   bottom: 0px;
   z-index: 100;
 }
 .login-btn {
+  position: fixed;
   padding: 10px;
-  width: 100%;
+  width: 290px;
   height: 42px;
   background: #0089f0;
   border-radius: 21px;
   font-size: 16px;
+  bottom: 5px;
   font-weight: 900;
   background-color: #007bff;
   color: white;
   border: none;
   cursor: pointer;
+
+  
 }
 .login-btn1 {
   padding: 10px;
-  width: calc(100% - 24px);
   margin-left: 12px;
   margin-bottom: 24px;
   height: 42px;
@@ -432,6 +474,7 @@ export default {
   color: white;
   border: none;
   cursor: pointer;
+  
 }
 .bottom {
   width: calc(100% - 48px);