fix: 确权

src/components/common/goBack.vue

@@ -0,0 +1,39 @@
+<template>
+    <div class="back btn yes-events" @click="goBack">
+        <img class="icon" src="@/assets/images/common/back-icon.png" alt="" />
+        <span>返回</span>
+    </div>
+</template>
+
+<script setup>
+import { useRouter } from "vue-router";
+
+const router = useRouter();
+// 返回
+const goBack = () => {
+    router.go(-1);
+};
+</script>
+
+<style lang="scss" scoped>
+.back {
+    position: absolute;
+    top: 52px;
+    left: 20px;
+    display: flex;
+    align-items: center;
+    border: 1px solid rgba(255, 255, 255, 0.78);
+    padding: 4px 8px;
+    border-radius: 4px;
+    width: 90px;
+    text-align: center;
+    justify-content: center;
+    height: 32px;
+    box-sizing: border-box;
+    cursor: pointer;
+    .icon {
+        width: 13px;
+        padding-right: 10px;
+    }
+}
+</style>

src/views/authentic/index.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="base-container">
         <fnHeader></fnHeader>
+        <go-back></go-back>
         <div class="top-bg"></div>
         <el-upload
             ref="uploadRef"
@@ -84,6 +85,7 @@
                         :class="{ 'disabled-button': !disabledForm && isEdit }"
                         type="primary"
                         @click="onSearch"
+                         color="#00CF9F"
                         >查询</el-button
                     >
                     <el-button class="btn reset" :class="{ 'disabled-button': !disabledForm && isEdit }" @click="onRest"
@@ -116,7 +118,7 @@
                 <div class="edit-popup" v-show="isEdit">
                     <div class="edit-title">
                         <div class="name">
-                            <img src="@/assets/images/common/chart-icon.png" alt="" />
+                            <img class="title-bg" src="@/assets/images/common/title-bg-long.png" alt="" />
                             <span>地块属性</span>
                         </div>
                         <div class="btn-group">
@@ -226,6 +228,7 @@ import { useRouter } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { dateFormat } from "@/utils/date_util";
 import { exportExcel, parseMultiPolygon } from "@/utils/index";
+import goBack from "@/components/common/goBack.vue";
 import { useStore } from "vuex";
 import Pdf from "./Pdf";
 import {Feature} from "ol";
@@ -480,11 +483,6 @@ const handlePrint = () => {
     pdfShow.value = true;
 };
 
-// 返回
-const goBack = () => {
-    router.go(-1);
-};
-
 function updateFormInline(newData, name) {
     Object.assign(formInline, newData);
 }
@@ -687,6 +685,9 @@ watch(
     .el-upload-list {
         display: none;
     }
+    .el-upload:focus {
+        color: #fff;
+    }
 }
 .base-container {
     width: 100%;
@@ -699,7 +700,7 @@ watch(
         position: absolute;
         top: 0;
         width: 100%;
-        height: 74px;
+        height: 87px;
         background: #101010;
         z-index: -1;
     }
@@ -711,7 +712,7 @@ watch(
         background: #101010;
     }
     .blue {
-        background: #2199f8;
+        background: #00CF9F;
     }
     .btn {
         display: flex;
@@ -726,6 +727,7 @@ watch(
         span {
             margin-left: 10px;
         }
+        &:hover {color: #fff;}
     }
 
     .disabled-button {
@@ -771,7 +773,7 @@ watch(
             }
 
             .upload {
-                background: #2199f8;
+                background: #00CF9F;
                 margin-left: 25px;
             }
             .add {
@@ -784,7 +786,7 @@ watch(
 
     .content {
         width: 100%;
-        height: calc(100% - 74px - 40px - 32px);
+        height: calc(100% - 87px - 40px - 32px);
         box-sizing: border-box;
         background: #101010;
         padding: 13px 20px 20px 20px;
@@ -865,7 +867,7 @@ watch(
                 border-radius: 8px;
                 background: #232323;
                 .edit-title {
-                    padding: 0 10px;
+                    padding-right: 10px;
                     background: rgba(68, 68, 68, 0.4);
                     border-bottom: 1px solid rgba(68, 68, 68, 0.4);
                     display: flex;
@@ -873,6 +875,7 @@ watch(
                     justify-content: space-between;
                     .btn-group {
                         display: flex;
+                        z-index: 2;
                         .ml {
                             margin-left: 20px;
                         }
@@ -881,16 +884,23 @@ watch(
                         display: flex;
                         padding: 12px 0px;
                         align-items: center;
+                        position: relative;
+                        .title-bg {
+                            position: absolute;
+                            bottom: 0;
+                            left: 0;
+                        }
                     }
                     span {
-                        margin-left: 8px;
+                        margin-left: 50px;
                         font-size: 18px;
                         font-family: "SOURCEHANTIFINE";
+                        z-index: 2;
                     }
                     .edit {
-                        color: #2199f8;
+                        color: #00CF9F;
                         padding: 6px 20px;
-                        border: 1px solid #2199f8;
+                        border: 1px solid #00CF9F;
                         border-radius: 4px;
                         cursor: pointer;
                     }
@@ -968,7 +978,7 @@ watch(
                         margin-right: 16px;
                     }
                     .save {
-                        background: #2199f8;
+                        background: #00CF9F;
                     }
                 }
             }

src/views/home/album/index.vue

@@ -5,6 +5,23 @@
                 农情动态
             </div> -->
             <div class="album-content">
+                <div class="album-top" v-show="farmDetail?.name">
+                    <div class="album-img">
+                        <img src="@/assets/img/gallery/t.png" />
+                        <!-- <img :src="farmDetail.icon" /> -->
+                    </div>
+                    <div class="garden-content">
+                        <div class="garden-name">
+                            {{ farmDetail.name }}
+                            <div class="tag-wrap">
+                                <div class="type-tag">{{ farmDetail.speciesName }}</div>
+                                <div class="type-tag item-type">{{ farmDetail.typeName }}</div>
+                            </div>
+                        </div>
+                        <div class="garden-desc">农场面积：{{ farmDetail.mianji }}亩</div>
+                        <div class="garden-desc">农场位置：{{ farmDetail.address }}</div>
+                    </div>
+                </div>
                 <div class="album-bottom">
                     <el-affix :offset="108">
                         <div class="album-l">
@@ -589,7 +606,7 @@ function addNsRecord(){
                     .garden-name {
                         font-weight: bold;
                         font-size: 16px;
-                        color: #000000;
+                        color: #fff;
                         display: flex;
                         align-items: center;
                         flex-wrap: wrap;
@@ -597,6 +614,7 @@ function addNsRecord(){
                             display: flex;
                             flex-wrap: wrap;
                             flex: 1;
+                            margin-left: 4px;
                         }
                         .type-tag {
                             margin-top: 2px;
@@ -605,15 +623,11 @@ function addNsRecord(){
                             padding: 0 6px;
                             height: 21px;
                             line-height: 21px;
-                            background: rgba(255, 149, 61, 0.32);
+                            border: 1px solid #09F3C8;
                             border-radius: 2px;
                             // border: 0.5px solid #FF953D;
                             font-size: 12px;
-                            color: #fc8a2c;
-                            &.item-type {
-                                background: #f0e0fe;
-                                color: #ac4dff;
-                            }
+                            color: #09F3C8;
                         }
                     }
                     .garden-text {
@@ -635,36 +649,15 @@ function addNsRecord(){
                     .garden-desc {
                         padding-top: 4px;
                         font-size: 13px;
-                        color: #666666;
+                        color: #9F9F9F;
                     }
                 }
             }
-            .album-camera {
-                width: 100%;
-                padding: 0 10px 10px;
-                box-sizing: border-box;
-                position: relative;
-                .tips-text {
-                    position: absolute;
-                    left: calc(50% + 20px);
-                    top: 8px;
-                    height: 17px;
-                    padding: 1px 5px 2px 8px;
-                    color: #fff;
-                    font-size: 12px;
-                    border-radius: 24px 20px 20px 0;
-                    line-height: 18px;
-                    background: linear-gradient(45deg, #00d4ff, #008eff);
-                }
-                img {
-                    width: 100%;
-                }
-            }
             .album-bottom {
                 display: flex;
                 position: relative;
                 background: rgba(73, 73, 73, 0.3);
-                height: 100%;
+                height: calc(100% - 104px);
                 justify-content: center;
                 overflow: hidden;
 
@@ -757,7 +750,7 @@ function addNsRecord(){
                                     }
                                 }
                                 &.active {
-                                    background: #232323;
+                                    background: rgba(9, 243, 200, 0.2);
                                     color: #09F3C8;
                                     .menu-name {
                                         color: #09F3C8;

src/views/home/index.vue

@@ -1,10 +1,7 @@
 <template>
     <div class="base-container no-events">
         <fnHeader showDate></fnHeader>
-        <div class="back btn yes-events" @click="goBack">
-          <img class="icon" src="@/assets/images/common/back-icon.png" alt="" />
-          <span>返回</span>
-        </div>
+        <go-back></go-back>
         <div class="content">
             <!-- <navigation></navigation> -->
             <div class="left yes-events">
@@ -73,6 +70,7 @@ import fnHeader from "@/components/fnHeader.vue";
 import chartBox from "@/components/chartBox.vue";
 import toolList from "@/components/toolList.vue";
 import fileBar from "@/components/fileBar.vue";
+import goBack from "@/components/common/goBack.vue";
 import HomeMap from "./map/homeMap";
 import homePage from "./components/homePage.vue";
 import weatherPage from "./components/weatherPage.vue";
@@ -359,10 +357,6 @@ const toFilePage = () => {
     router.push("/garden-file");
 };
 
-// 返回
-const goBack = () => {
-    router.go(-1);
-};
 </script>
 
 <style lang="scss" scoped>
@@ -373,20 +367,6 @@ const goBack = () => {
     position: absolute;
     box-sizing: border-box;
     z-index: 1;
-    .back {
-      position: absolute;
-      top: 52px;
-      left: 8px;
-      display: flex;
-      align-items: center;
-      border: 1px solid rgba(255, 255, 255, 0.78);
-      padding: 4px 8px;
-      border-radius: 4px;
-      .icon {
-        width: 13px;
-        padding-right: 10px;
-      }
-    }
 
     .content {
         width: 100%;
@@ -394,6 +374,7 @@ const goBack = () => {
         display: flex;
         justify-content: space-between;
         box-sizing: border-box;
+        padding-top: 12px;
         .left,
         .right {
             width: 376px;

src/views/warningHome/index.vue

@@ -111,6 +111,12 @@
                 <div class="map-legend chat-legend" v-show="!legendImg">
                     <StaticMapLegend></StaticMapLegend>
                 </div>
+
+                <!-- 农场确权 -->
+                <div class="authentic-btn yes-events PangMenZhengDao-FONT" @click="toAuthentic">
+                    农场确权
+                    <el-icon class="right-icon" size="18"><CaretRight /></el-icon>
+                </div>
             </div>
             <!-- <div class="warning-search yes-events">
                 <img src="@/assets/images/warningHome/search-img.png" />
@@ -260,6 +266,10 @@ const toggleBox = (name) => {
     legendImg.value = warningLayers.value[`${name}图例`];
     eventBus.emit("warningHome:toggleMapLayer", name);
 };
+
+function toAuthentic() {
+    router.push('/authentic')
+}
 </script>
 
 <style lang="scss" scoped>
@@ -356,6 +366,21 @@ const toggleBox = (name) => {
             .chat-legend {
                 bottom: -12px;
             }
+
+            .authentic-btn {
+                position: absolute;
+                top: -34px;
+                left: 78px;
+                width: 200px;
+                height: 40px;
+                background: url('@/assets/images/warningHome/select-bg-right.png') no-repeat center;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 20px;
+                color: #fff;
+                cursor: pointer;
+            }
         }
         .warning-search {
             position: absolute;