From 137db1a441d1e4460675a5ac5b925a290eb03b1b Mon Sep 17 00:00:00 2001 From: wangjuncheng <1> Date: 星期三, 04 六月 2025 11:32:32 +0800 Subject: [PATCH] analysi cross flow tooltips --- src/components/menu/CrossSectionalAnalysis.vue | 80 +++++++++++++++++++++++--- src/components/menu/TimeLine.vue | 37 ++++++------ src/components/menu/flowRate_waterLevel.vue | 53 ++++++++++++++--- 3 files changed, 132 insertions(+), 38 deletions(-) diff --git a/src/components/menu/CrossSectionalAnalysis.vue b/src/components/menu/CrossSectionalAnalysis.vue index 7aa8fc7..7c9db5e 100644 --- a/src/components/menu/CrossSectionalAnalysis.vue +++ b/src/components/menu/CrossSectionalAnalysis.vue @@ -1,16 +1,74 @@ <template> <div style="display: flex; justify-content: space-between;"> - <div @click="initPickHandler"> - <img v-if="!isPicking" src="@/assets/img/timeline/鏂潰.png" style="width: 26px;height: 26px;" /> - <img v-else src="@/assets/img/timeline/宸叉柇闈�.png" style="width: 26px;height: 26px;" /> - </div> - <div @click="confirmPoints"> - <img v-if="!isUploaded" src="@/assets/img/timeline/涓婁紶.png" style="width: 26px;height: 26px;" /> - <img v-else src="@/assets/img/timeline/宸蹭笂浼�.png" style="width: 26px;height: 26px;" /> - </div> - <div @click="clearPoints"> - <img src="@/assets/img/timeline/娓呴櫎.png" style="width: 26px;height: 26px;" /> - </div> + <!-- 绗竴涓寜閽細閫夊彇鏂潰鐐� --> + <el-tooltip placement="top" show-after="1000"> + <template #content> + 鏂潰鍒嗘瀽鍔熻兘璇存槑锛� + <br /><br /> + 馃敼 鐐瑰嚮鎸夐挳鍒囨崲鐘舵�侊細 + <br /> + - 鐧借壊锛氬叧闂嬀鍙栧姛鑳斤紙涓嶅彲閫夌偣锛� + <br /> + - 榛勮壊锛氬紑鍚嬀鍙栧姛鑳斤紙鍙偣鍑诲湴鍥鹃�夋嫨2涓柇闈㈢偣锛� + <br /><br /> + 馃敼 浣跨敤娴佺▼锛� + <br /> + 1. 鐐瑰嚮鎸夐挳鍒囨崲涓洪粍鑹� 鉃� 寮�濮嬫嬀鍙栧潗鏍囩偣 + <br /> + 2. 鍦ㄥ湴鍥句笂鐐瑰嚮閫夋嫨 2 涓柇闈㈢偣锛堝闇�淇敼锛屽彲閲嶆柊鐐瑰嚮锛� + <br /><br /> + 鈿狅笍 娓╅Θ鎻愮ず锛� + <br /> + 姣忔鍙兘鍒嗘瀽涓�鏉℃矡娓犵殑鏂潰锛屽涓柇闈㈠彲鑳藉鑷磋绠楀紓甯革紱 + <br /> + 浣跨敤瀹屾瘯璇峰皢鎸夐挳鍒囧洖鐧借壊锛岄伩鍏嶅奖鍝嶅叾浠栧姛鑳姐�� + </template> + <div @click="initPickHandler" :class="{ active: isPicking }"> + <img v-if="!isPicking" src="@/assets/img/timeline/鏂潰.png" style="width: 26px;height: 26px;" /> + <img v-else src="@/assets/img/timeline/宸叉柇闈�.png" style="width: 26px;height: 26px;" /> + </div> + </el-tooltip> + + <!-- 绗簩涓寜閽細涓婁紶骞跺垎鏋愭柇闈� --> + <el-tooltip placement="top" show-after="1000"> + <template #content> + 涓婁紶骞跺垎鏋愭柇闈㈡暟鎹細 + <br /><br /> + 馃搶 鏉′欢闄愬埗锛� + <br /> + 浠呭綋鎴愬姛閫夋嫨 2 涓柇闈㈢偣鍚庢墠鍙偣鍑� + <br /><br /> + 馃攣 鍔熻兘璇存槑锛� + <br /> + 鐐瑰嚮鍚庡皢瀵瑰綋鍓嶆柇闈㈣繘琛屽垎鏋愶紝绋嶇瓑鐗囧埢鍗冲彲鍦ㄥ浘琛ㄥ尯鍩熸煡鐪嬬粨鏋� + <br /><br /> + 鈿狅笍 娉ㄦ剰浜嬮」锛� + <br /> + 璇ュ姛鑳戒粎鏀寔鍗曟潯娌熸笭鍒嗘瀽锛屽涓柇闈㈠彲鑳藉鑷磋绠椾笉绋冲畾鎴栧嚭閿� + </template> + <div @click="confirmPoints" :class="{ disabled: !isReadyForUpload }"> + <img v-if="!isUploaded" src="@/assets/img/timeline/涓婁紶.png" style="width: 26px;height: 26px;" /> + <img v-else src="@/assets/img/timeline/宸蹭笂浼�.png" style="width: 26px;height: 26px;" /> + </div> + </el-tooltip> + + <!-- 绗笁涓寜閽細娓呴櫎鎵�鏈夌偣鍜屽垎鏋愮粨鏋� --> + <el-tooltip placement="top" show-after="1000"> + <template #content> + 娓呴櫎鎵�鏈夋柇闈㈢偣鍙婂垎鏋愮粨鏋滐細 + <br /><br /> + 馃攣 鍔熻兘璇存槑锛� + <br /> + 鐐瑰嚮鍚庡皢绉婚櫎鍦板浘涓婄殑鎵�鏈夋柇闈㈢偣浠ュ強鐩稿叧鍒嗘瀽鍥捐〃 + <br /><br /> + 鈿狅笍 娓╅Θ鎻愮ず锛� + <br /> + 姝ゆ搷浣滀細娓呯┖褰撳墠鍒嗘瀽杩涘害锛岃纭鍚庡啀鎵ц + </template> + <div @click="clearPoints"> + <img src="@/assets/img/timeline/娓呴櫎.png" style="width: 26px;height: 26px;" /> + </div> + </el-tooltip> </div> </template> diff --git a/src/components/menu/TimeLine.vue b/src/components/menu/TimeLine.vue index 85f15d6..60ab295 100644 --- a/src/components/menu/TimeLine.vue +++ b/src/components/menu/TimeLine.vue @@ -59,7 +59,7 @@ @finish-calculation="handleFinishCalculation" style="margin-top: 12px; margin-left: 28px; margin-right: 10px;justify-content: flex-end;" /> <crossanalysis ref="crossRef" style="margin-top: 12px; margin-left: 16px; margin-right: 20px;justify-content: flex-end;" /> - + </div> <el-button @click="handleBack" style="margin-top: 3px; margin-left: 28px; margin-right: 10px;width: 75%;height: 30%;">缁撴潫妯℃嫙</el-button> </div> @@ -300,8 +300,8 @@ min: 10, max: 24.9, size: 0.7, - speed: 40, - density: 35, + speed: 28, + density: 23, color: '#ADD8E6' }, { @@ -309,8 +309,8 @@ min: 25, max: 49.9, size: 1.0, - speed: 70, - density: 60, + speed: 36, + density: 31, color: '#ADD8E6' }, { @@ -318,16 +318,16 @@ min: 50, max: 99.9, size: 1.3, - speed: 90, - density: 80, + speed: 42, + density: 39, color: '#ADD8E6' }, { name: '澶ф毚闆�', min: 100, size: 1.6, - speed: 110, - density: 100, + speed: 50, + density: 47, color: '#ADD8E6' } ]; @@ -339,7 +339,7 @@ } } // 榛樿鏃犻洦鐘舵�� - return { name: '鏃犻洦', size: 0.5, speed: 30, density: 20, color: '#F0F8FF' }; + return { name: '鏃犻洦', size: 0.3, speed: 10, density: 10, color: '#F0F8FF' }; } // 鏍规嵁鎾斁杩涘害鏇存柊澶╂皵鏁堟灉锛堝凡浼樺寲锛� let lastUsedIndex = -1; // 缂撳瓨涓婁竴娆′娇鐢ㄧ殑绱㈠紩锛岄槻姝㈤噸澶嶆洿鏂� @@ -355,7 +355,8 @@ const nextRain = rainFallValues.value[nextIndex]; // 鍚敤鎻掑�硷紙alpha 骞虫粦杩囨浮锛� const alpha = floatIndex - index; - const rainValue = currentRain + (nextRain - currentRain) * alpha; + // const rainValue = currentRain + (nextRain - currentRain) * alpha; + const rainValue = currentRain + (nextRain - currentRain) // 鎵撳嵃褰撳墠澶勭悊鐨勯洦閲忔暟鎹� // console.log(`姝e湪澶勭悊鐨勯洦閲忔暟鎹偣: 褰撳墠=${currentRain}, 涓嬩竴涓�=${nextRain}, 鎻掑�煎悗=${rainValue.toFixed(2)}, 绱㈠紩=${index}`); // 濡傛灉褰撳墠绱㈠紩鏈彉鍖栦笖鎻掑�煎樊寮備笉澶э紝璺宠繃閲嶅鏇存柊 @@ -370,12 +371,12 @@ // 鑾峰彇瀵瑰簲鐨勯洦褰㈤厤缃� const rainLevel = getRainLevel(rainValue); - if (rainLevel.name === '鏃犻洦') { - // 鏃犻洦鐘舵�侊細娓呴櫎闆ㄦ晥 - mapUtils.delRain(); - console.log('鎵ц浜嗘棤闆ㄧ姸鎬侊紝娓呴櫎浜嗛洦鏁�'); - return; - } + // if (rainLevel.name === '鏃犻洦') { + // // 鏃犻洦鐘舵�侊細娓呴櫎闆ㄦ晥 + // mapUtils.delRain(); + // console.log('鎵ц浜嗘棤闆ㄧ姸鎬侊紝娓呴櫎浜嗛洦鏁�'); + // return; + // } // 闈炴棤闆ㄧ姸鎬侊細鏋勫缓闆ㄦ淮鍙傛暟骞舵洿鏂伴洦鏁� const rainParams = { @@ -384,7 +385,7 @@ rainDensity: rainLevel.density, rainColor: rainLevel.color }; - // console.log('褰撳墠闆ㄩ噺鏁版嵁锛�', rainValue, '褰撳墠闆ㄥ舰锛�', rainLevel); + console.log('褰撳墠闆ㄩ噺鏁版嵁锛�', rainValue, '褰撳墠闆ㄥ舰锛�', rainLevel); // 璋冪敤宸ュ叿鏂规硶鏇存柊闆ㄦ晥 mapUtils.toggleRain(rainParams, true); } diff --git a/src/components/menu/flowRate_waterLevel.vue b/src/components/menu/flowRate_waterLevel.vue index de3a47a..81a8425 100644 --- a/src/components/menu/flowRate_waterLevel.vue +++ b/src/components/menu/flowRate_waterLevel.vue @@ -1,13 +1,48 @@ <template> <div style="display: flex;justify-content: space-between;"> - <!-- 閫夌偣鎸夐挳 --> - <div @click="togglePick" :class="['pick-button', { active: isPickingActive }]"> - <img v-if="!isPickingActive" src="@/assets/img/timeline/娴侀��.png" style="width: 28px;height: 28px;" /> - <img v-else src="@/assets/img/timeline/宸叉祦閫�.png" style="width: 28px;height: 28px;" /> - </div> - <div @click="endCalculation"> - <img src="@/assets/img/timeline/娓呴櫎.png" style="width: 26px;height: 26px;" /> - </div> + <el-tooltip class="box-item" effect="dark" placement="top" show-after="1000"> + <template #content> + 姘存繁/娴侀�熷垎鏋愬姛鑳借鏄庯細 + <br /><br /> + 馃敼 鐐瑰嚮鎸夐挳鍒囨崲鐘舵�侊細 + <br /> + - 鐧借壊锛氬叧闂嬀鍙栧姛鑳斤紙涓嶅彲閫夌偣锛� + <br /> + - 榛勮壊锛氬紑鍚嬀鍙栧姛鑳斤紙鍙偣鍑诲湴鍥鹃�夋嫨鍒嗘瀽鐐癸級 + <br /><br /> + 馃敼 浣跨敤娴佺▼锛� + <br /> + 1. 鐐瑰嚮鎸夐挳鍒囨崲涓洪粍鑹茬姸鎬� 鉃� 寮�濮嬫嬀鍙栧潗鏍囩偣 + <br /> + 2. 鍦ㄥ湴鍥句笂鐐瑰嚮鎵�闇�浣嶇疆 鉃� 娣诲姞姘存繁/娴侀�熷垎鏋愮偣 + <br /> + 3. 瀹屾垚閫夌偣鍚庯紝璇峰皢鎸夐挳鍒囧洖鐧借壊 鉃� 鍏抽棴鎷惧彇鍔熻兘 + <br /><br /> + 鈿狅笍 娓╅Θ鎻愮ず锛� + <br /> + 浣跨敤瀹屾瘯璇峰姟蹇呭叧闂嬀鍙栧姛鑳斤紝閬垮厤璇搷浣滃奖鍝嶅叾浠栧姛鑳姐�� + </template> + <div @click="togglePick" :class="['pick-button', { active: isPickingActive }]"> + <img v-if="!isPickingActive" src="@/assets/img/timeline/娴侀��.png" style="width: 28px;height: 28px;" /> + <img v-else src="@/assets/img/timeline/宸叉祦閫�.png" style="width: 28px;height: 28px;" /> + </div> + </el-tooltip> + <el-tooltip class="box-item" effect="dark" placement="top" show-after="1000"> + <template #content> + 娓呴櫎鎵�鏈夊垎鏋愬潗鏍囩偣鍙婂垎鏋愮粨鏋滐細 + <br /><br /> + 馃攣 鍔熻兘璇存槑锛� + <br /> + 鐐瑰嚮鍚庡皢绉婚櫎鍦板浘涓婄殑鎵�鏈夋按娣�/娴侀�熷垎鏋愮偣浠ュ強鐩稿叧鍒嗘瀽鍥捐〃 + <br /><br /> + 鈿狅笍 娓╅Θ鎻愮ず锛� + <br /> + 姝ゆ搷浣滀細娓呯┖褰撳墠鍒嗘瀽杩涘害锛岃纭鍚庡啀鎵ц + </template> + <div @click="endCalculation"> + <img src="@/assets/img/timeline/娓呴櫎.png" style="width: 26px;height: 26px;" /> + </div> + </el-tooltip> </div> </template> @@ -53,7 +88,7 @@ const displayTime = currentTime.value || "鏈缃椂闂�"; const schemeInfo = selectedScheme.value; serviceInfo = schemeInfo.serviceName; - + // 鍒涘缓 label 瀹炰綋 const labelEntity = viewer.entities.add({ position: point.cartesian, -- Gitblit v1.9.3