Browse Source

页面调整

shuhao 1 week ago
parent
commit
d058eabf04

+ 3 - 2
src/views/home/album_compoents/albumCarousel.vue

@@ -163,10 +163,11 @@ const getSampleFiles = (geoHash) => {
     // photoList.value = [];
     // photoList.value = [];
     VE_API.mini_farm.getSampleFiles({ geoHashSample: geoHash }).then(({data}) => {
     VE_API.mini_farm.getSampleFiles({ geoHashSample: geoHash }).then(({data}) => {
         photoBaseData.value[0].value = data.meta_info.type_id;
         photoBaseData.value[0].value = data.meta_info.type_id;
+        let pj = "--"
         if(data.meta_info.crown){
         if(data.meta_info.crown){
-          data.meta_info.crown = Math.sqrt(data.meta_info.crown * 1.2).toFixed(2);
+          pj = Math.sqrt(data.meta_info.crown * 1.2).toFixed(1);
         }
         }
-        photoBaseData.value[1].value = data.meta_info.crown + "平方米(蓬径6米)";
+        photoBaseData.value[1].value = data.meta_info.crown + "平方米(蓬径"+pj+"米)";
         photoBaseData.value[2].value = data.meta_info.branch_num ;
         photoBaseData.value[2].value = data.meta_info.branch_num ;
 
 
     photoBaseData.value[3].value = data.meta_info.age + "年"
     photoBaseData.value[3].value = data.meta_info.age + "年"

+ 8 - 0
src/views/workDetail/index.vue

@@ -32,6 +32,13 @@
                                         :executeDate="workList[0].executeDate">
                                         :executeDate="workList[0].executeDate">
                             </service-box>
                             </service-box>
                         </div>
                         </div>
+                        <div class="box-item">
+                          <div class="box-title">
+                            复核对比
+                            <!-- <el-icon class="icon-arrow" size="18"><ArrowUpBold /></el-icon> -->
+                          </div>
+                          <recheck-box2></recheck-box2>
+                        </div>
                     </div>
                     </div>
                 </chart-box>
                 </chart-box>
             </div>
             </div>
@@ -79,6 +86,7 @@ import FarmMap from "@/views/addFarm/farmMap";
 import chartBox from "@/components/chartBox.vue";
 import chartBox from "@/components/chartBox.vue";
 import { useRouter, useRoute } from "vue-router";
 import { useRouter, useRoute } from "vue-router";
 import { useStore } from "vuex";
 import { useStore } from "vuex";
+import RecheckBox2 from "./components/recheckBox2";
 
 
 const components = {
 const components = {
     prescriptionBox,
     prescriptionBox,