解决冲突

pages/NursingNew/component/index.vue

@@ -271,13 +271,13 @@
 				</view>
 			</scroll-view>
 		</view>
-		<view class="mengban" v-if="zzbqshow" @click="zzbqshow = false"></view>
+		<view class="mengban" v-if="zzbqshow" @click="zzbqshow = false;tagtarget=-1"></view>
 		<view class="right-bottom">
 			<view class="bottom-title">
 				<image class="bottom-carmera" src="/static/index/newindex/leftmenu/carmera.png" @click="gotolook" />
 				<view class="blue-button" @click="geteverything()">
 					长者标签
-					<view class="jb" v-if="zzbqshow">
+					<view class="jb" v-show="zzbqshow">
 						<image src="/static/index/card/bj.png" mode="aspectFill"></image>
 					</view>
 					<view class="zzbq guodu" @click.stop :class="zzbqshow?'':'zzh0'">
@@ -287,11 +287,13 @@
 								体重标签
 							</view>
 							<view class="tg" style="border-right: 1px solid rgba(238, 238, 238, 1);">
-								<view v-for="(v,i) in emotionTagList" :key='i'>
+								<view v-for="(v,i) in emotionTagList" :key='i' @click="clicktag(v,i)">
 									<image :src="v.netPic" mode="aspectFill"></image>
 									<text>{{v.tagName}}</text>
 								</view>
-								<image src="/static/index/card/zanw.png" mode="aspectFill" v-if="emotionTagList.length==0" style="width: 5.4vw;height: 5.4vw;margin-top: -0.7vw;"></image>
+								<image src="/static/index/card/zanw.png" mode="aspectFill"
+									v-if="emotionTagList.length==0"
+									style="width: 5.4vw;height: 5.4vw;margin-top: -0.7vw;"></image>
 							</view>
 						</view>
 						<view class="carfd" v-if="zzbqshow">
@@ -300,14 +302,21 @@
 								情绪标签
 							</view>
 							<view class="tg">
-								<view v-for="(v,i) in bodyTagList" :key='i'>
+								<view v-for="(v,i) in bodyTagList" :key='i' @click="clicktag(v,i+2)">
 									<image :src="v.netPic" mode="aspectFill"></image>
 									<text>{{v.tagName}}</text>
 								</view>
-								<image src="/static/index/card/zanw.png" mode="aspectFill" v-if="bodyTagList.length==0" style="width: 5.4vw;height: 5.4vw;margin-top: -0.7vw;"></image>
+								<image src="/static/index/card/zanw.png" mode="aspectFill" v-if="bodyTagList.length==0"
+									style="width: 5.4vw;height: 5.4vw;margin-top: -0.7vw;"></image>
 							</view>
 						</view>
 					</view>
+					<view class="zzbqsmall guodu" @click.stop :class="zzbqshow&&tagtarget!=-1?'':'zzh0'">
+						<view class="jbsmall" v-show="tagtarget!=-1" :style="{left:`${leftnumber}vw`}">
+							<image src="/static/index/card/bj.png" mode="aspectFill"></image>
+						</view>
+						{{ tagtarget==-1?'':detail }}
+					</view>
 				</view>
 			
 			</view>
@@ -1014,9 +1023,109 @@
 			})
 		}
 	}
+	function getStatusDesc(type) {
+		switch (type) {
+			case '稳定':
+				return '标准情绪';
+	
+			case '标准':
+				return '标准体重；女100-120，男：120-150';
+	
+			case '焦虑':
+				return '无法控制情绪（哭泣/大笑）';
+	
+			case '超重':
+				return '女超过120，男超过150';
+	
+			case '抑郁':
+				return '有自杀倾向';
+	
+			case '强直':
+				return '四肢承伸直且僵硬无法弯曲状（标识要区分为左右和手脚）';
+	
+			case '暴力':
+				return '有攻击他人倾向';
+	
+			case '偏瘫':
+				return '四肢无知觉且无法支配但是并无僵硬，可弯曲（标识要区分为左右和手脚）';
+	
+			case '恐惧':
+				return '被害妄想';
+	
+			case '佝偻':
+				return '四肢承弯曲且僵硬无法伸直状（标识要区分为左右和手脚）';
+	
+			case '烦躁':
+				return '对服务和对话都不耐烦';
+	
+			case '易怒':
+				return '骂人';
+	
+			case '臆想':
+				return '骗人/说谎，胡言乱语';
+	
+			default:
+				return '';
+		}
+	}
+	function getleft(index) {
+		switch (index) {
+			case 0:
+				return 2.2;
+	
+			case 1:
+				return 6;
+	
+			case 2:
+				return 9.8;
+	
+			case 3:
+				return 13.4;
+	
+	
+		}
+	}
+	const tagtarget = ref(-1);
+	const detail = ref("")
+	const leftnumber = ref(2.2)
+	const clicktag = (item, index) => {
+		tagtarget.value = index;
+		detail.value = getStatusDesc(item.tagName)
+		leftnumber.value = getleft(index)
+	}
 </script>
 
 <style scoped lang="less">
+	.jbsmall {
+		position: absolute;
+		width: 2.2vw;
+		height: 1.1vw;
+		top: -1vw;
+		left: 2.2vw;
+		z-index: 220;
+		transition: left 0.3s;
+	
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.zzbqsmall {
+			width: 18vw;
+			// height: 6vw;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136, 148, 167, 0.19);
+			border-radius: 1.2vw;
+			right: -0.8vw;
+			top: 15vw;
+			position: absolute;
+			z-index: 200;
+			display: flex;
+			// padding: 1.6vw 1.6vw 0;
+			padding: 1vw 2vw;
+			color: black;
+			font-size: 1vw;
+		}
 	.index-content-right {
 		width: 19.5vw;
 		margin-left: 2vw;

pages/login/newanimationpage.vue

@@ -129,13 +129,13 @@
 	const leftMenuArray = ref([])
 	const exitshow = ref(false);
 	const morerule = ref(false)
-	const fontnumber = ref(uni.getStorageSync('orgListName'))
+	const fontnumber = ref("")
 	const fontSize = computed(() => {
 		const len = (fontnumber.value || '').length
 		if (len === 10) return '1.3vw'      // 恰好10字
-		if (len < 10) return '1.4vw'      // 少于10字
+		if (len < 10) return '1.5vw'      // 少于10字
-		if (len <= 15) return '1.2vw'      // 11~15字
+		if (len <= 15) return '1.1vw'      // 11~15字
-		return '1.1vw'                      // 超过15字
+		return '0.9vw'                      // 超过15字
 	})
 	// 生命周期钩子
 	onShow(() => {
@@ -144,7 +144,7 @@
 			leftMenuArray.value = res.result.records;
 			console.log("????", res)
 		}))
-
+		fontnumber.value = uni.getStorageSync('orgListName')
 	});
 	const filteredMenu = (index : number) => {
 		return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);