页面调整

src/components/fnHeader.vue

@@ -125,6 +125,7 @@ const getGardenList = () => {
             {name: "从化井岗基地",organId:90263, wkt: "POINT(113.5081595 23.5320866)"},
             {name: "湛江荔枝先生",organId:26196, wkt: "POINT(110.4909544 21.4152538)"},
             {name: "增城北园绿基地",organId:91774, wkt: "POINT(113.78320599711542 23.420720252709344)"},
+            {name: "中山农场",organId:81179, wkt: "POINT(113.544619 22.464267)"},
         );
       });
     }

src/views/home/album_compoents/albumCarousel.vue

@@ -24,7 +24,7 @@
             <div class="file-wrap">
                 <div class="file-title">
                     <img src="@/assets/images/common/chart-yellow.png" alt="" />
-                    果树档案
+                    作物档案
                     <span class="tag" v-if="showTag">小农户</span>
                 </div>
                 <div class="overview-file">
@@ -128,7 +128,7 @@ eventBus.on("click:point",function({farmId,sampleId, data}){
   photoBaseData.value[0].value = data.pz;
     isLoadingImg.value = true
   let startDate = new Date(currentDate);
-  startDate.setMonth(currentDate.getMonth() - 2);
+  startDate.setFullYear(currentDate.getFullYear() - 2);
 
 // 格式化日期
   let params = {sampleId,farmId,startDate:dateFormat(startDate, "YY-mm-dd")}

src/views/home/album_compoents/albumDrawBox.vue

@@ -58,11 +58,11 @@ let ctx = null;
 let data = {year:props.photo.uploadDate.substring(0,4),
   monthDay:dateFormat(new Date(props.photo.uploadDate),'mm/dd'),
   address:props.photo.district.replaceAll("\"","") + props.photo.gardenName,
-  tempImg:imageCache.get("temp"),temp:"10°C-20°C",wendu:"适宜",
+  tempImg:imageCache.get("temp"),temp:"--°C--°C",wendu:"--",
   feiniao:imageCache.get("feiniao"),
   baseMap:imageCache.get("base_map_"+props.photo.treeId),
-  fusheImg:imageCache.get("fushe"),fushe:"光照优",
-  shiduImg:imageCache.get("shidu"),shidu:"湿度适宜",
+  fusheImg:imageCache.get("fushe"),fushe:"----",
+  shiduImg:imageCache.get("shidu"),shidu:"----",
   text:"病害风险，及时喷药",
   shotCode:props.photo.shotCode,
   treeCode:props.photo.treeCode,

src/views/home/album_compoents/compareDialog.vue

@@ -23,7 +23,7 @@
                 <div class="file-wrap">
                     <div class="file-title">
                         <img src="@/assets/images/common/chart-yellow.png" alt="" />
-                        果树档案
+                        作物档案
                         <span v-show="showTag" class="tag">小农户</span>
                     </div>
 
@@ -98,7 +98,7 @@
                 <div class="file-wrap">
                     <div class="file-title">
                         <img src="@/assets/images/common/chart-yellow.png" alt="" />
-                        果树档案
+                        作物档案
                         <span v-show="showTag2" class="tag">小农户</span>
                     </div>
                     <div class="box-wrap">

src/views/home/index.vue

@@ -17,24 +17,44 @@
                 </div>
             </div>
             <div class="right yes-events">
-              <div class="list adopt-list-wrap">
-                <chart-box name="认养管理" arrow="">
-                  <el-tabs v-model="activeName" class="demo-tabs">
-                    <el-tab-pane label="认养列表" name="认养列表">
-                      <adopt-list></adopt-list>
-                    </el-tab-pane>
-                    <el-tab-pane label="客户列表" name="客户列表">
-                      <client-list></client-list>
-                    </el-tab-pane>
-                    <el-tab-pane label="认养申请" name="认养申请">
-                      <apply-list></apply-list>
-                    </el-tab-pane>
-                    <el-tab-pane label="确认地址" name="确认地址">
-                      <address-list></address-list>
-                    </el-tab-pane>
-                  </el-tabs>
-                </chart-box>
-              </div>
+                <div class="list album-r">
+                    <chart-box name="农事列表" arrow="arrow-left" :class="{ 'list-wrap': rightIndex === 0 }">
+                        <template v-if="rightIndex === 0">
+                            <album></album>
+                            <!-- <img class="tabs" src="@/assets/images/home/ns-tabs.png" alt="">
+              <div class="img-box">
+                <img @click="handleAct(item)" v-for="item in 2" :key="item" :src="require(`@/assets/images/home/0${act<=2&&act==item?item+'-act':item}.png`)" alt="">
+              </div> -->
+                        </template>
+                        <template v-if="rightIndex === 1">
+                            <div class="img-box1">
+                                <img src="@/assets/images/home/fh01.png" alt="" />
+                                <img src="@/assets/images/home/fh02.png" alt="" />
+                            </div>
+                        </template>
+                        <template v-if="rightIndex === 2">
+                            <div class="btn-wrap">
+                                <div :class="{ active: btnIndex === 0 }" @click="handleBtn(0)">
+                                    {{ btnIndex === 0 && btnName != "" ? "采样分区：" + btnName : "选择采样分区" }}
+                                </div>
+                                <div :class="{ active: btnIndex === 1 }" @click="handleBtn(1)">
+                                    {{ btnIndex === 1 && btnName != "" ? "单树编号：" + btnName : "选择树" }}
+                                </div>
+                            </div>
+                            <div class="img-box2" v-show="showPoint">
+                                <img v-if="showType === 'point'" src="@/assets/images/home/line-chart.png" alt="" />
+                                <img v-else src="@/assets/images/home/line-chart2.png" alt="" />
+                                <img src="@/assets/images/home/fh01.png" alt="" />
+                            </div>
+                            <div class="img-box2" v-show="!showPoint">
+                                <img v-if="showType === 'point'" src="@/assets/images/home/line-chart1.png" alt="" />
+                                <img v-else src="@/assets/images/home/line-chart3.png" alt="" />
+                                <img src="@/assets/images/home/fh02.png" alt="" />
+                            </div>
+                        </template>
+                    </chart-box>
+                </div>
+                <tool-list direction="right" :list="rightToolList" @handleActive="handleActiveRight"></tool-list>
             </div>
 
             <!-- 图例 -->
@@ -71,7 +91,6 @@
     <PicturePreview :imageUrl="urls" :curIndex="urlsIndex"></PicturePreview>
     <album-carousel></album-carousel>
     <PdfDialog title="果园报告"></PdfDialog>
-    <ImageDialog title="溯源报告"></ImageDialog>
 
     <!-- 对比 -->
     <compareDialog></compareDialog>
@@ -80,11 +99,11 @@
         <img src="@/assets/images/home/compare-btn.png" alt="" />
     </div>
 
-    <!-- 果树档案 -->
+    <!-- 作物档案 -->
     <div class="file-wrap map-file" id="popup-file">
         <div class="file-title">
             <img src="@/assets/images/common/chart-yellow.png" alt="" />
-            果树档案
+            作物档案
             <span id="tag-nh" class="tag">小农户</span>
         </div>
         <div class="overview-file">
@@ -151,12 +170,6 @@ import compareDialog from "./album_compoents/compareDialog.vue";
 import album from "./album/index.vue";
 import PdfDialog from "../../components/PdfDialog";
 import StaticMapLayers from "@/components/static_map_change/Layers.js"
-import adoptList from "./components/foster/adoptList.vue";
-import clientList from "./components/foster/clientList.vue";
-import applyList from "./components/foster/applyList.vue";
-import addressList from "./components/foster/addressList.vue";
-import ImageDialog from "../../components/ImageDialog";
-
 let store = useStore();
 const components = {
     homePage,
@@ -168,7 +181,6 @@ const currentFarm = {
     id: store.getters.userinfo.curFarmId,
     name: store.getters.userinfo.curFarmName,
 };
-const activeName = ref('认养列表')
 //当前区域
 const currentRegion = {
     id: null,
@@ -662,39 +674,6 @@ const photoList = ref([
         }
         .right {
             width: calc(376px + 54px + 10px);
-
-            .adopt-list-wrap {
-              ::v-deep {
-                .el-tabs {
-                  height: 100%;
-                }
-                .el-tabs__content {
-                  height: calc(100% - 40px - 15px);
-                  position: static;
-                }
-                .el-tabs__item {
-                  color: #727272;
-                }
-                .el-tabs__active-bar {
-                  background-color: #FFFFFF;
-                  height: 1px;
-                }
-                .el-tabs__item.is-active {
-                  color: #fff;
-                }
-                .el-tabs__nav-wrap:after {
-                  height: 1px;
-                  background-color: rgba(127, 127, 127, 0.3);
-                }
-                .el-tabs__nav {
-                  left: 50%;
-                  transform: translateX(-50%) !important;
-                }
-                .el-tab-pane {
-                  height: 100%;
-                }
-              }
-            }
             .album-r {
                 .list-wrap {
                     width: 375px;

src/views/home/index - 副本.vue → src/views/home/index有认养管理.vue

@@ -17,44 +17,24 @@
                 </div>
             </div>
             <div class="right yes-events">
-                <div class="list album-r">
-                    <chart-box name="农事列表" arrow="arrow-left" :class="{ 'list-wrap': rightIndex === 0 }">
-                        <template v-if="rightIndex === 0">
-                            <album></album>
-                            <!-- <img class="tabs" src="@/assets/images/home/ns-tabs.png" alt="">
-              <div class="img-box">
-                <img @click="handleAct(item)" v-for="item in 2" :key="item" :src="require(`@/assets/images/home/0${act<=2&&act==item?item+'-act':item}.png`)" alt="">
-              </div> -->
-                        </template>
-                        <template v-if="rightIndex === 1">
-                            <div class="img-box1">
-                                <img src="@/assets/images/home/fh01.png" alt="" />
-                                <img src="@/assets/images/home/fh02.png" alt="" />
-                            </div>
-                        </template>
-                        <template v-if="rightIndex === 2">
-                            <div class="btn-wrap">
-                                <div :class="{ active: btnIndex === 0 }" @click="handleBtn(0)">
-                                    {{ btnIndex === 0 && btnName != "" ? "采样分区：" + btnName : "选择采样分区" }}
-                                </div>
-                                <div :class="{ active: btnIndex === 1 }" @click="handleBtn(1)">
-                                    {{ btnIndex === 1 && btnName != "" ? "单树编号：" + btnName : "选择树" }}
-                                </div>
-                            </div>
-                            <div class="img-box2" v-show="showPoint">
-                                <img v-if="showType === 'point'" src="@/assets/images/home/line-chart.png" alt="" />
-                                <img v-else src="@/assets/images/home/line-chart2.png" alt="" />
-                                <img src="@/assets/images/home/fh01.png" alt="" />
-                            </div>
-                            <div class="img-box2" v-show="!showPoint">
-                                <img v-if="showType === 'point'" src="@/assets/images/home/line-chart1.png" alt="" />
-                                <img v-else src="@/assets/images/home/line-chart3.png" alt="" />
-                                <img src="@/assets/images/home/fh02.png" alt="" />
-                            </div>
-                        </template>
-                    </chart-box>
-                </div>
-                <tool-list direction="right" :list="rightToolList" @handleActive="handleActiveRight"></tool-list>
+              <div class="list adopt-list-wrap">
+                <chart-box name="认养管理" arrow="">
+                  <el-tabs v-model="activeName" class="demo-tabs">
+                    <el-tab-pane label="认养列表" name="认养列表">
+                      <adopt-list></adopt-list>
+                    </el-tab-pane>
+                    <el-tab-pane label="客户列表" name="客户列表">
+                      <client-list></client-list>
+                    </el-tab-pane>
+                    <el-tab-pane label="认养申请" name="认养申请">
+                      <apply-list></apply-list>
+                    </el-tab-pane>
+                    <el-tab-pane label="确认地址" name="确认地址">
+                      <address-list></address-list>
+                    </el-tab-pane>
+                  </el-tabs>
+                </chart-box>
+              </div>
             </div>
 
             <!-- 图例 -->
@@ -91,6 +71,7 @@
     <PicturePreview :imageUrl="urls" :curIndex="urlsIndex"></PicturePreview>
     <album-carousel></album-carousel>
     <PdfDialog title="果园报告"></PdfDialog>
+    <ImageDialog title="溯源报告"></ImageDialog>
 
     <!-- 对比 -->
     <compareDialog></compareDialog>
@@ -99,11 +80,11 @@
         <img src="@/assets/images/home/compare-btn.png" alt="" />
     </div>
 
-    <!-- 果树档案 -->
+    <!-- 作物档案 -->
     <div class="file-wrap map-file" id="popup-file">
         <div class="file-title">
             <img src="@/assets/images/common/chart-yellow.png" alt="" />
-            果树档案
+            作物档案
             <span id="tag-nh" class="tag">小农户</span>
         </div>
         <div class="overview-file">
@@ -170,6 +151,12 @@ import compareDialog from "./album_compoents/compareDialog.vue";
 import album from "./album/index.vue";
 import PdfDialog from "../../components/PdfDialog";
 import StaticMapLayers from "@/components/static_map_change/Layers.js"
+import adoptList from "./components/foster/adoptList.vue";
+import clientList from "./components/foster/clientList.vue";
+import applyList from "./components/foster/applyList.vue";
+import addressList from "./components/foster/addressList.vue";
+import ImageDialog from "../../components/ImageDialog";
+
 let store = useStore();
 const components = {
     homePage,
@@ -181,6 +168,7 @@ const currentFarm = {
     id: store.getters.userinfo.curFarmId,
     name: store.getters.userinfo.curFarmName,
 };
+const activeName = ref('认养列表')
 //当前区域
 const currentRegion = {
     id: null,
@@ -674,6 +662,39 @@ const photoList = ref([
         }
         .right {
             width: calc(376px + 54px + 10px);
+
+            .adopt-list-wrap {
+              ::v-deep {
+                .el-tabs {
+                  height: 100%;
+                }
+                .el-tabs__content {
+                  height: calc(100% - 40px - 15px);
+                  position: static;
+                }
+                .el-tabs__item {
+                  color: #727272;
+                }
+                .el-tabs__active-bar {
+                  background-color: #FFFFFF;
+                  height: 1px;
+                }
+                .el-tabs__item.is-active {
+                  color: #fff;
+                }
+                .el-tabs__nav-wrap:after {
+                  height: 1px;
+                  background-color: rgba(127, 127, 127, 0.3);
+                }
+                .el-tabs__nav {
+                  left: 50%;
+                  transform: translateX(-50%) !important;
+                }
+                .el-tab-pane {
+                  height: 100%;
+                }
+              }
+            }
             .album-r {
                 .list-wrap {
                     width: 375px;