修改测试问题

This commit is contained in:
guanj
2026-06-29 11:01:44 +08:00
parent f008bcb4b8
commit 1d73755a43
56 changed files with 2875 additions and 2702 deletions

View File

@@ -9,11 +9,11 @@
</view>
<view class="smallLabel mt20">
<view class="boxCenter">
<view>
<!-- <view>
<checkbox-group @change="changeBox" class="boxCenter"
><checkbox value="true" :checked="checkedAll" />全选 
</checkbox-group></view
>
> -->
已选择 {{ checkedTotal }} 条事件
</view>
<view class="nav-menu nav-menu-btn" @click="selectDevice">申请报告 </view>

View File

@@ -4,7 +4,7 @@
<!-- <view class="nav-menu" :class="{ 'nav-menu-active': select.engineeringName }" @click="openDrawer"
>{{ select.engineeringName || '工程' }}
</view> -->
<picker @change="projectNameChange" @cancel="selectProject = false" :value="select.projectNameIndex"
<picker @change="projectNameChange" @cancel="selectProject = false" :value="select.projectNameIndex"
:range="projectList" range-key="text" v-if="store.params.engineerId">
<view class="nav-menu" :class="{ 'nav-menu-active': select.projectName }" @click="selectProject = true">
{{

View File

@@ -63,7 +63,9 @@
<view class="card-header-info">
<view class="point-name-row">
<text class="point-name ellipsis">{{ point.pointName }}</text>
<text class="event-tag" :class="point.runStatus == 1 ? 'lx-tag' : 'zx-tag'">
{{ point.runStatus == 1 ? '离线' : '在线' }}
</text>
</view>
<view class="meta-row">
<text class="meta-item ellipsis">项目{{ point.projectName }}</text>
@@ -82,7 +84,7 @@
</view>
<view v-if="hasTPhaseData(child)" class="phase-single">
<text class="phase-value-vertical phase-value-vertical--neutral">{{ child.T
}}</text>
}}</text>
</view>
<view v-else class="phase-vertical">
<view class="phase-item-vertical">
@@ -397,16 +399,12 @@ export default {
this.saveSelectedIndicators()
this.closeIndicatorPopup()
},
// 跳转指标详情页;治理测点展示全部指标,普通测点展示未选中的指标
// 跳转指标详情页,展示该监测点全部指标
onMoreIndicators(point) {
uni.setStorageSync('monitorPointDetail', {
...point,
engineeringName: this.engineeringName,
selectedIndicators:
point.lineType === 0
? [...GOVERNANCE_DEFAULT_INDICATORS]
: [...this.selectedIndicators],
showAllIndicators: point.lineType === 0,
showAllIndicators: true,
})
uni.navigateTo({
url: '/pages/index/comp/targetInfo',
@@ -424,14 +422,9 @@ export default {
this.selectedIndicators.some((name) => this.matchIndicator(child.name, name)),
)
},
// 治理测点存在默认四项以外的指标时显示「更多指标」
// 有指标数据时显示「更多指标」
shouldShowMoreBtn(point) {
if (point.lineType !== 0) return true
const children = point.children || []
return children.some(
(child) =>
!GOVERNANCE_DEFAULT_INDICATORS.some((name) => this.matchIndicator(child.name, name)),
)
return (point.children || []).length > 0
},
// 将指标列表按每行两个分组
@@ -477,7 +470,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0 4rpx 16rpx rgba(55, 108, 243, 0.35);
z-index: 99;
z-index: 1;
}
.card {
@@ -691,7 +684,7 @@ export default {
}
.point-name {
flex: 1;
// flex: 1;
min-width: 0;
font-size: 30rpx;
font-weight: 700;
@@ -710,7 +703,7 @@ export default {
.meta-row {
display: grid;
grid-template-columns: 1fr 1fr;
grid-template-columns: 1fr;
gap: 6rpx 12rpx;
}
@@ -867,4 +860,24 @@ export default {
background: #376cf310;
}
}
.event-tag {
font-size: 22rpx;
padding: 2rpx 10rpx;
border-radius: 8rpx;
margin-top: 5rpx;
margin-left: 10rpx;
// height: 38rpx;
}
// 在线
.zx-tag {
background-color: #10b98120;
color: #10b981;
}
.lx-tag {
background-color: #ff3b3020;
color: #ff3b30;
}
</style>

View File

@@ -384,6 +384,9 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0 4rpx 16rpx rgba(55, 108, 243, 0.35);
z-index: 99;
z-index: 1;
}
/deep/ .segmented-control__text {
line-height: 60rpx !important;
}
</style>

View File

@@ -56,7 +56,7 @@
</view>
</view>
<view v-else class="empty-wrap">
<Cn-empty msg="暂无更多指标" :paddingTop="120"></Cn-empty>
<Cn-empty msg="暂无指标数据" :paddingTop="120"></Cn-empty>
</view>
</view>
</scroll-view>
@@ -77,24 +77,13 @@ export default {
},
computed: {
moreChildren() {
const children = this.pointInfo.children || []
// 治理测点「更多指标」页展示全部
if (this.pointInfo.lineType === 0 && this.pointInfo.showAllIndicators) {
return children
}
const selected = this.getSelectedIndicators()
return children.filter(
(child) => !selected.some((name) => this.matchIndicator(child.name, name)),
)
return this.pointInfo.children || []
},
},
onLoad() {
const point = uni.getStorageSync('monitorPointDetail')
if (point) {
this.pointInfo = {
...point,
selectedIndicators: this.getSelectedIndicatorsFromStorage(point.selectedIndicators),
}
this.pointInfo = { ...point }
if (point.pointName) {
uni.setNavigationBarTitle({ title: point.pointName })
}
@@ -104,22 +93,6 @@ export default {
uni.removeStorageSync('monitorPointDetail')
},
methods: {
getSelectedIndicatorsFromStorage(fallback = []) {
const cached = uni.getStorageSync(this.$cacheKey.monitorSelectedIndicators)
if (Array.isArray(cached) && cached.length) {
return cached
}
return Array.isArray(fallback) ? fallback : []
},
getSelectedIndicators() {
return this.getSelectedIndicatorsFromStorage(this.pointInfo.selectedIndicators)
},
matchIndicator(name, selected) {
if (!name || !selected) return false
const base = (name || '').replace(/\(.*\)/, '').trim()
const selectedBase = (selected || '').replace(/\(.*\)/, '').trim()
return base === selectedBase
},
hasTPhaseData(child) {
return child.T !== undefined && child.T !== null && child.T !== '-'
},

View File

@@ -416,6 +416,9 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0 4rpx 16rpx rgba(55, 108, 243, 0.35);
z-index: 99;
z-index: 1;
}
/deep/ .segmented-control__text {
line-height: 60rpx !important;
}
</style>

View File

@@ -363,7 +363,7 @@ export default {
padding: 4rpx 20rpx;
// margin-left: 20rpx;
// margin-bottom: 20rpx;
line-height: 38rpx;
line-height: 40rpx;
font-size: 24rpx;
border-radius: 8rpx;
background: #ebeaec;
@@ -394,6 +394,6 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0 4rpx 16rpx rgba(55, 108, 243, 0.35);
z-index: 99;
z-index: 1;
}
</style>

View File

@@ -343,4 +343,5 @@ export default {
// white-space: nowrap;
line-height: 1;
}
</style>

View File

@@ -82,11 +82,7 @@
<view class="mine-nav-label">关注工程配置</view>
<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
</view>
<!-- <view class="mine-nav" @click="jump('transientSetting')" v-if="userInfo.authorities !== 'tourist'">
<image mode="aspectFill" class="mine-nav-icon" src="/static/tongji.png" />
<view class="mine-nav-label">暂态统计配置</view>
<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
</view> -->
<view class="mine-nav" @click="jump('setup')" style="border-bottom: none">
<image mode="aspectFill" class="mine-nav-icon" src="/static/setup.png" />
<view class="mine-nav-label">设置</view>