From 4db47902d2b4aac8dcf4e062fc91f112660cf5c2 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期三, 28 一月 2026 10:00:27 +0800
Subject: [PATCH] 修改bug
---
screen/src/view/projectList/index.vue | 71 ++++++++++++++++++-----
screen/src/view/hiddenDanger/index.vue | 32 ++++++----
screen/src/view/equipmentList/index.vue | 45 ++++++++++++--
3 files changed, 110 insertions(+), 38 deletions(-)
diff --git a/screen/src/view/equipmentList/index.vue b/screen/src/view/equipmentList/index.vue
index 93f36ae..7655f6b 100644
--- a/screen/src/view/equipmentList/index.vue
+++ b/screen/src/view/equipmentList/index.vue
@@ -32,29 +32,43 @@
</el-select>
<img src="../../assets/img/down-circle@2x.png" class="w--15 h--16 shrink0" />
</div>
- <div @click="handleClick(1)" class="flex a-center j-between px--20 w--300 h--40 relative bgcolor1 picker">
+ <div class="flex a-center j-between px--20 w--300 h--40 relative bgcolor1 picker">
<el-date-picker v-model="dateTime" ref="datetime1" type="datetime" placeholder="" @change="handleSearch" clearable>
</el-date-picker>
- <div class="absolute w100 h100 flex a-center c-fff fs--14 SHS" style="width: calc(100% - 20px)"
+ <div @click.stop="handleClick(1)" class="absolute h100 flex a-center c-fff fs--14 SHS pointer-events-none" style="left: 20px; right: 60px; z-index: 1;"
v-if="startTime">
{{ startTime }}
</div>
- <div v-else class="absolute w100 h100 flex a-center c-fff fs--14 SHSR">
+ <div @click.stop="handleClick(1)" v-else class="absolute h100 flex a-center c-fff fs--14 SHSR pointer-events-none" style="left: 20px; right: 60px; z-index: 1;">
请选择日期
</div>
- <img src="../../assets/img/home/Shape@2x (6).png" class="w--13 h--13 shrink0" />
+ <div class="flex a-center gap--5" style="position: relative; z-index: 2;">
+ <i
+ @click.stop="clearStartTime"
+ class="el-icon-circle-close c-fff cursor-pointer"
+ v-show="dateTime"
+ />
+ <img @click="handleClick(1)" src="../../assets/img/home/Shape@2x (6).png" class="w--13 h--13 shrink0 cursor-pointer" />
+ </div>
</div>
- <div @click="handleClick(2)" class="flex a-center j-between px--20 w--300 h--40 relative bgcolor1 picker">
+ <div class="flex a-center j-between px--20 w--300 h--40 relative bgcolor1 picker">
<el-date-picker v-model="dateTime2" ref="datetime2" type="datetime" placeholder="" @change="handleSearch" clearable>
</el-date-picker>
- <div class="absolute w100 h100 flex a-center c-fff fs--14 SHS" style="width: calc(100% - 20px)"
+ <div @click="handleClick(2)" class="absolute h100 flex a-center c-fff fs--14 SHS pointer-events-none" style="left: 20px; right: 60px; z-index: 1;"
v-if="endTime">
{{ endTime }}
</div>
- <div v-else class="absolute w100 h100 flex a-center c-fff fs--14 SHSR">
+ <div @click="handleClick(2)" v-else class="absolute h100 flex a-center c-fff fs--14 SHSR pointer-events-none" style="left: 20px; right: 60px; z-index: 1;">
请选择日期
</div>
- <img src="../../assets/img/home/Shape@2x (6).png" class="w--13 h--13 shrink0" />
+ <div class="flex a-center gap--5" style="position: relative; z-index: 2;">
+ <i
+ @click.stop="clearEndTime"
+ class="el-icon-circle-close c-fff cursor-pointer"
+ v-show="dateTime2"
+ />
+ <img @click="handleClick(2)" src="../../assets/img/home/Shape@2x (6).png" class="w--13 h--13 shrink0 cursor-pointer" />
+ </div>
</div>
<div class="flex a-center j-between w--300 pl--20 h--40 relative bgcolor1 searchBox">
<el-input v-model="content" placeholder="请输入搜索内容" class="flex1" @keyup.enter="handleSearch"></el-input>
@@ -380,6 +394,9 @@
pageNum: this.currentPage,
pageSize: this.pageSize
}
+ if(this.isClient){
+ params.clientId = localStorage.getItem('clientId')
+ }
// 使用统一方法，根据用户类型调用对应接口
getDeviceListByType({ ...params }, this.isClient).then(res => {
@@ -452,6 +469,18 @@
this.$refs[`datetime${type}`].focus();
},
+ // 清除开始时间
+ clearStartTime() {
+ this.dateTime = null;
+ this.handleSearch();
+ },
+
+ // 清除结束时间
+ clearEndTime() {
+ this.dateTime2 = null;
+ this.handleSearch();
+ },
+
backFun() {
this.$router.go(-1);
},
diff --git a/screen/src/view/hiddenDanger/index.vue b/screen/src/view/hiddenDanger/index.vue
index dd0d10d..33cc771 100644
--- a/screen/src/view/hiddenDanger/index.vue
+++ b/screen/src/view/hiddenDanger/index.vue
@@ -154,7 +154,6 @@
<!-- 开始时间 -->
<div
- @click="handleClick(1)"
class="flex a-center j-between px--20 w--300 h--40 relative bgcolor1 picker"
>
<el-date-picker
@@ -165,34 +164,37 @@
>
</el-date-picker>
<div
- class="absolute w100 h100 flex a-center c-fff fs--14 SHS"
- style="width: calc(100% - 20px)"
+ @click.stop="handleClick(1)"
+ class="absolute h100 flex a-center c-fff fs--14 SHS pointer-events-none"
+ style="left: 20px; right: 60px; z-index: 1;"
v-if="startDateTxt"
>
{{ startDateTxt }}
</div>
<div
+ @click.stop="handleClick(1)"
v-else
- class="absolute w100 h100 flex a-center c-fff fs--14 SHSR"
+ class="absolute h100 flex a-center c-fff fs--14 SHSR pointer-events-none"
+ style="left: 20px; right: 60px; z-index: 1;"
>
开始时间
</div>
- <div class="flex a-center gap--5">
+ <div class="flex a-center gap--5" style="position: relative; z-index: 2;">
<i
@click.stop="clearDateTime('start')"
class="el-icon-circle-close c-fff cursor-pointer"
v-show="startDateTxt"
/>
<img
+ @click="handleClick(1)"
src="../../assets/img/home/Shape@2x (6).png"
- class="w--13 h--13 shrink0"
+ class="w--13 h--13 shrink0 cursor-pointer"
/>
</div>
</div>
<!-- 结束时间 -->
<div
- @click="handleClick(2)"
class="flex a-center j-between px--20 w--300 h--40 relative bgcolor1 picker"
>
<el-date-picker
@@ -203,27 +205,31 @@
>
</el-date-picker>
<div
- class="absolute w100 h100 flex a-center c-fff fs--14 SHS"
- style="width: calc(100% - 20px)"
+ @click="handleClick(2)"
+ class="absolute h100 flex a-center c-fff fs--14 SHS pointer-events-none"
+ style="left: 20px; right: 60px; z-index: 1;"
v-if="endDateTxt"
>
{{ endDateTxt }}
</div>
<div
+ @click="handleClick(2)"
v-else
- class="absolute w100 h100 flex a-center c-fff fs--14 SHSR"
+ class="absolute h100 flex a-center c-fff fs--14 SHSR pointer-events-none"
+ style="left: 20px; right: 60px; z-index: 1;"
>
结束时间
</div>
- <div class="flex a-center gap--5">
+ <div class="flex a-center gap--5" style="position: relative; z-index: 2;">
<i
@click.stop="clearDateTime('end')"
class="el-icon-circle-close c-fff cursor-pointer"
v-show="endDateTxt"
/>
<img
+ @click="handleClick(2)"
src="../../assets/img/home/Shape@2x (6).png"
- class="w--13 h--13 shrink0"
+ class="w--13 h--13 shrink0 cursor-pointer"
/>
</div>
</div>
@@ -973,7 +979,7 @@
// 使用统一方法
const res = await getHiddenDangerDetailByType(
- row.problemId,
+ row.id,
this.isClient
);
diff --git a/screen/src/view/projectList/index.vue b/screen/src/view/projectList/index.vue
index e7dea23..7be51d8 100644
--- a/screen/src/view/projectList/index.vue
+++ b/screen/src/view/projectList/index.vue
@@ -105,7 +105,6 @@
</div>
</div>
<div
- @click="handleClick(1)"
class="flex a-center j-between px--20 w--300 h--40 relative bgcolor1 picker"
>
<el-date-picker
@@ -118,25 +117,35 @@
>
</el-date-picker>
<div
- class="absolute w100 h100 flex a-center c-fff fs--14 SHS"
- style="width: calc(100% - 20px)"
+ @click.stop="handleClick(1)"
+ class="absolute h100 flex a-center c-fff fs--14 SHS pointer-events-none"
+ style="left: 20px; right: 60px; z-index: 1;"
v-if="startTimeTxt"
>
{{ startTimeTxt }}
</div>
<div
+ @click.stop="handleClick(1)"
v-else
- class="absolute w100 h100 flex a-center c-fff fs--14 SHSR"
+ class="absolute h100 flex a-center c-fff fs--14 SHSR pointer-events-none"
+ style="left: 20px; right: 60px; z-index: 1;"
>
请选择开始日期
</div>
- <img
- src="../../assets/img/home/Shape@2x (6).png"
- class="w--13 h--13 shrink0"
- />
+ <div class="flex a-center gap--5" style="position: relative; z-index: 2;">
+ <i
+ @click.stop="clearStartTime"
+ class="el-icon-circle-close c-fff cursor-pointer"
+ v-show="startTime"
+ />
+ <img
+ @click="handleClick(1)"
+ src="../../assets/img/home/Shape@2x (6).png"
+ class="w--13 h--13 shrink0 cursor-pointer"
+ />
+ </div>
</div>
<div
- @click="handleClick(2)"
class="flex a-center j-between px--20 w--300 h--40 relative bgcolor1 picker"
>
<el-date-picker
@@ -149,22 +158,33 @@
>
</el-date-picker>
<div
- class="absolute w100 h100 flex a-center c-fff fs--14 SHS"
- style="width: calc(100% - 20px)"
+ @click="handleClick(2)"
+ class="absolute h100 flex a-center c-fff fs--14 SHS pointer-events-none"
+ style="left: 20px; right: 60px; z-index: 1;"
v-if="endTimeTxt"
>
{{ endTimeTxt }}
</div>
<div
+ @click="handleClick(2)"
v-else
- class="absolute w100 h100 flex a-center c-fff fs--14 SHSR"
+ class="absolute h100 flex a-center c-fff fs--14 SHSR pointer-events-none"
+ style="left: 20px; right: 60px; z-index: 1;"
>
请选择结束日期
</div>
- <img
- src="../../assets/img/home/Shape@2x (6).png"
- class="w--13 h--13 shrink0"
- />
+ <div class="flex a-center gap--5" style="position: relative; z-index: 2;">
+ <i
+ @click.stop="clearEndTime"
+ class="el-icon-circle-close c-fff cursor-pointer"
+ v-show="endTime"
+ />
+ <img
+ @click="handleClick(2)"
+ src="../../assets/img/home/Shape@2x (6).png"
+ class="w--13 h--13 shrink0 cursor-pointer"
+ />
+ </div>
</div>
<div
class="flex a-center j-between w--300 pl--20 h--40 relative bgcolor1 searchBox"
@@ -318,7 +338,7 @@
<template #reference>
<el-button
type="text"
- class="btnColor"
+ :class="hasAnyReport(row) ? 'btnColor' : 'btnDisabled'"
:disabled="!hasAnyReport(row)"
@click="checkReportAvailability(row)"
>
@@ -620,6 +640,18 @@
// 清除风险等级
clearRiskLevel() {
this.riskLevel = null;
+ this.handleSearch();
+ },
+
+ // 清除开始时间
+ clearStartTime() {
+ this.startTime = null;
+ this.handleSearch();
+ },
+
+ // 清除结束时间
+ clearEndTime() {
+ this.endTime = null;
this.handleSearch();
},
@@ -1061,6 +1093,11 @@
color: #00ebfc;
}
+.btnDisabled {
+ color: #666666 !important;
+ cursor: not-allowed !important;
+}
+
.report-btn {
cursor: pointer;
transition: all 0.3s ease;
--
Gitblit v1.7.1