Prechádzať zdrojové kódy

fix: 恢复点击事件,数详情

刘秀芳 1 mesiac pred
rodič
commit
517897e931

+ 12 - 1
src/views/home/components/treeDetail.vue

@@ -32,10 +32,13 @@
                             <div>生态指标</div>
                         </div>
 
-                        <div class="progress-wrap" v-show="ROLE == 2">
+                        <div class="progress-wrap" v-show="ROLE == 2 && isProgress === 1">
                             <div class="progress-text"><span class="over">150</span>/215</div>
                             <el-progress class="progress-val" :percentage="60" color="#FFD887"></el-progress>
                         </div>
+                        <div class="progress-wrap done-progress" v-show="ROLE == 2 && isProgress === 0">
+                            <div class="progress-text">团购/认养已结束</div>
+                        </div>
                     </div>
                     <img class="tree" src="@/assets/images/foster-home/tree.png" alt="" />
                     <div class="photo-box">
@@ -121,6 +124,8 @@ import { useStore } from "vuex";
 let store = useStore();
 
 const ROLE = store.state.home.userRole;
+// 认养进度-1以结束/0进行中
+const isProgress = ref(1);
 
 const active = ref(0);
 const tabsList = ["全部", "标准", "气象"];
@@ -386,6 +391,12 @@ const handleMore = () => {
                 left: 50%;
                 transform: translateX(-50%);
                 width: 110px;
+                &.done-progress {
+                    top: 50px;
+                    .progress-text {
+                        color: #CFCFCF;
+                    }
+                }
                 .progress-text {
                     font-size: 12px;
                     color: #999999;

+ 1 - 0
src/views/home/homeMap.vue

@@ -81,6 +81,7 @@ const handleKeyUp = (e) => {
 const stopBoxSelect = () => {
     addCluster(mapPoint.value);
     kmap.map.removeInteraction(dragBox);
+    isDrawing.value = false
     // 移除事件监听
     window.removeEventListener("keydown", handleKeyDown);
     window.removeEventListener("keyup", handleKeyUp);

+ 1 - 1
src/views/home/index.vue

@@ -111,7 +111,7 @@ const mapRef = ref(null);
 
 const activeName = ref('认养列表')
 // 用户角色
-store.commit("home/SET_USER_ROLE", 2);
+store.commit("home/SET_USER_ROLE", 1);
 
 let ROLE = ref(null);
 onMounted(() => {