From 15c5e70dd90a0389d70b3d855977dfd9070588fc Mon Sep 17 00:00:00 2001 From: web <candymxq888@outlook.com> Date: 星期二, 03 六月 2025 09:48:55 +0800 Subject: [PATCH] fix:修改金川视频播放,弹窗方式 --- src/views/screen/temperature/monitor/index.vue | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/views/screen/temperature/monitor/index.vue b/src/views/screen/temperature/monitor/index.vue index 89bec41..45b5bdc 100644 --- a/src/views/screen/temperature/monitor/index.vue +++ b/src/views/screen/temperature/monitor/index.vue @@ -11,6 +11,7 @@ const menuList = ref([]) const monitorList = ref([]) +const selectDeep = ref([]) const monitorConfig = ref({}) const userType = ref(getUserType()) const monitorRef = ref() @@ -47,7 +48,8 @@ } pointApi().search(data).then(res => { //0-未报警, 1-下限报警, 2-上限报警 - monitorList.value = res.data.list.filter(el => el.parentId !== 0).map(item => { + monitorList.value = res.data.list.filter(el => el.parentId !== 0).map((item, index) => { + selectDeep.value[index] = item?.dataList[0].code return { ...item, errorType: Number(item.waterTemperature) < Number(item.lowWaterLevel) ? 1 : Number(item.waterTemperature) > Number(item.tallWaterLevel) ? 2 : 0 @@ -177,11 +179,25 @@ <div class="item-data"> <div class="data"> <div class="name">水温:</div> - <div class="val"><span>{{ item.waterTemperature }}</span>°C</div> + <div class="val"><span>{{ item?.dataList?.find(f => f.code === selectDeep[index]).value }}</span>°C</div> </div> <div class="data"> <div class="name">水位:</div> - <div class="val"><span>{{ item.waterLevel }}</span>m</div> + <div class="val"> + <el-select + v-model="selectDeep[index]" + class="val-select" + placeholder="Select" + style="width: 12rem" + > + <el-option + v-for="item in item?.dataList" + :key="item.code" + :label='item.code' + :value="item.code" + /> + </el-select>m + </div> </div> </div> <div class="item-status"> @@ -214,11 +230,11 @@ <div class="item-btn"> <el-button size="large" type="success" @click="setMonitorData(item)">应用</el-button> </div> - <div class="item-error" v-if="[1,2].includes(item.errorType)"> - <img src="@/assets/images/warning.png" alt="" /> - <div v-if="item.errorType === 1">水温达到下限值</div> - <div v-else-if="item.errorType === 2">水温达到上限值</div> - </div> +<!-- <div class="item-error" v-if="[1,2].includes(item.errorType)">--> +<!-- <img src="@/assets/images/warning.png" alt="" />--> +<!-- <div v-if="item.errorType === 1">水温达到下限值</div>--> +<!-- <div v-else-if="item.errorType === 2">水温达到上限值</div>--> +<!-- </div>--> </div> </div> </div> @@ -384,11 +400,24 @@ font-size: 22px; .val { - span { + span{ display: inline-block; font-size: 30px; padding: 0 30px; } + .val-select{ + padding: 0 30px; + :deep(.el-select__wrapper){ + background-color: transparent; + box-shadow: none; + border-radius: 0; + border-bottom: 1px solid #fff; + font-size: 20px; + .el-select__caret{ + color: #fff; + } + } + } } } } -- Gitblit v1.9.3