Merge branch 'manage' of http://www.sysuimars.cn:3000/lxf/foster-pc-vue into manage

src/views/home/album_compoents/albumCarousel.vue

@@ -29,21 +29,12 @@
                 </div>
                 <div class="overview-file">
                     <div class="box-title">总体档案</div>
-                    <div class="base-data">
+                    <!-- <div class="base-data">
                         <div class="base-item" v-for="item in photoBaseData" :key="item.label">
                             <span class="label">{{ item.label }}</span>
                             <div class="value">{{ item.value }}</div>
                         </div>
-                    </div>
-                    <div class="list">
-                        <div class="list-item" v-for="item in photoList" :key="item.key">
-                            <div class="list-name">
-                                <img src="@/assets/images/common/title-icon.png" alt="" />
-                                {{ item.key }}
-                            </div>
-                            {{ item.statement }}
-                        </div>
-                    </div>
+                    </div> -->
                 </div>
 
                 <div class="overview-file">
@@ -53,8 +44,6 @@
                             class="box-item"
                             v-for="(item, index) in outputBox"
                             :key="index"
-                            @click="toggleAcitve(item.name)"
-                            :class="{ active: activeOuput === item.name }"
                         >
                             <div class="item-name">{{ item.name }}</div>
                             <div class="item-val">{{ item.value }}</div>
@@ -69,8 +58,6 @@
                             class="box-item"
                             v-for="(item, index) in qualityBox"
                             :key="index"
-                            @click="toggleAcitve(item.name)"
-                            :class="{ active: activeOuput === item.name }"
                         >
                             <div class="item-name">{{ item.name }}</div>
                             <div class="item-val">{{ item.value }}</div>
@@ -113,7 +100,6 @@ eventBus.on("change:watermark", function (name) {
 const outputBox = ref([
     { id: 1, name: "产量估计", value: "" },
     { id: 2, name: "高质果率", value: "" },
-    { id: 3, name: "雌花比例", value: "" },
 ]);
 
 const qualityBox = ref([
@@ -147,16 +133,15 @@ function handleClickPoint({ farmId, sampleId, data }) {
     showTag.value = data.nonghu == 1 ? true : false;
 }
 
-eventBus.off("albumCarousel", toggleActiveImg);
-eventBus.on("albumCarousel", toggleActiveImg);
+// eventBus.off("albumCarousel", toggleActiveImg);
+// eventBus.on("albumCarousel", toggleActiveImg);
 
-const currentIndex = ref(0);
-function toggleActiveImg(index) {
-    currentIndex.value = index;
-}
+// const currentIndex = ref(0);
+// function toggleActiveImg(index) {
+//     currentIndex.value = index;
+// }
 
 const getSampleFiles = (geoHash) => {
-    // photoList.value = [];
     VE_API.mini_farm.getSampleFiles({ geoHashSample: geoHash }).then(({ data }) => {
         photoBaseData.value[0].value = data.meta_info.type_id;
         let pj = "--";
@@ -167,20 +152,11 @@ const getSampleFiles = (geoHash) => {
         photoBaseData.value[2].value = data.meta_info.branch_num;
 
         photoBaseData.value[3].value = data.meta_info.age + "年";
-        photoList.value[0].key = data.meta_info.dp_alert_info.key;
-        photoList.value[0].statement = data.meta_info.dp_alert_info.statement;
-        photoList.value[1].key = data.meta_info.grow_alert_info.key;
-        photoList.value[1].statement = data.meta_info.grow_alert_info.statement;
-        photoList.value[2].key = data.meta_info.nutrition_info.key;
-        photoList.value[2].statement = data.meta_info.nutrition_info.statement;
-        photoList.value[3].key = data.meta_info.prescription_info.key;
-        photoList.value[3].statement = data.meta_info.prescription_info.statement;
         // if(data.production_info.production){
         //   data.production_info.production = (data.production_info.production * 1.3).toFixed(1)
         // }
         outputBox.value[0].value = data.production_info.production + "斤";
         outputBox.value[1].value = data.production_info.quality.toFixed(0) + "%";
-        outputBox.value[2].value = data.production_info.cihua_ratio?.toFixed(0) + "%";
         qualityBox.value[0].value = data.ecology_info.ventilation + "%";
         qualityBox.value[1].value = data.ecology_info.transmittance + "%";
         qualityBox.value[2].value = data.ecology_info.dp_situation + "%";
@@ -206,30 +182,9 @@ const photoBaseData = ref([
     },
 ]);
 
-const photoList = ref([
-    { key: "病虫", statement: "--" },
-    { key: "异常", statement: "--" },
-    { key: "营养", statement: "--" },
-    { key: "农事", statement: "--" },
-]);
 
 const activeOuput = ref(null);
 
-// 产量详情
-function toggleAcitve(name) {
-    activeOuput.value = name;
-    if (name.indexOf("开花") > -1) {
-        eventBus.emit("change:watermark", "开花目标框");
-    } else if (name.indexOf("花穗") > -1) {
-        eventBus.emit("change:watermark", "花穗目标框");
-    } else if (name.indexOf("雄花") > -1) {
-        eventBus.emit("change:watermark", "雄花目标框");
-    } else if (name.indexOf("枝条数") > -1) {
-        eventBus.emit("change:watermark", "");
-    } else {
-        eventBus.emit("change:watermark", "");
-    }
-}
 
 function closeDialog() {
     activeOuput.value = null;
@@ -237,8 +192,6 @@ function closeDialog() {
     eventBus.emit("resetImgIndex");
 }
 
-// 质量详情
-function toggleQualityAcitve() {}
 </script>
 
 <style lang="scss" scoped>
@@ -255,12 +208,12 @@ function toggleQualityAcitve() {}
         padding: 12px;
         .file-title {
             font-size: 20px;
-            color: #ffd489;
+            color: #2199F8;
             display: flex;
             align-items: center;
 
             .tag {
-                border: 1px solid #ffd489;
+                border: 1px solid #2199F8;
                 border-radius: 4px;
                 font-size: 12px;
                 display: inline-block;
@@ -281,7 +234,7 @@ function toggleQualityAcitve() {}
                 position: relative;
                 display: flex;
                 justify-content: space-between;
-                color: #fff;
+                color: #000000;
                 &::before {
                     content: "";
                     position: absolute;
@@ -289,7 +242,7 @@ function toggleQualityAcitve() {}
                     top: 3px;
                     width: 3px;
                     height: 16px;
-                    background: #fff;
+                    background: #000000;
                     border-radius: 11px;
                 }
             }
@@ -356,25 +309,24 @@ function toggleQualityAcitve() {}
         .box-wrap {
             display: flex;
             .box-item {
-                min-width: 140px;
+                min-width: 109px;
                 box-sizing: border-box;
                 display: flex;
                 flex-direction: column;
                 justify-content: center;
                 align-items: center;
                 padding: 6px;
-                background: rgba(207, 207, 207, 0.1);
+                background: rgba(169, 169, 169, 0.1);
                 border-radius: 4px;
-                border: 1px solid rgba(207, 207, 207, 0.1);
                 cursor: pointer;
                 .item-name {
                     font-size: 12px;
-                    color: #666666;
+                    color: rgba(102, 102, 102, 0.86);
                     width: max-content;
                 }
                 .item-val {
                     font-size: 18px;
-                    color: #fff;
+                    color: #000000;
                     width: max-content;
                     padding-top: 3px;
                 }