App/app-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改关键指标概览 已选指标

Browse Source
This commit is contained in:
guanj
2026-07-14 09:13:20 +08:00
parent fcf702ca3c
commit a2e27e3811
3 changed files with 177 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/api/dictionary.js
View File

@@ -23,6 +23,7 @@ export const queryByCode = (code) => {
return request({ return request({
url: '/system-boot/dictTree/queryByCode', url: '/system-boot/dictTree/queryByCode',
method: 'post', method: 'post',
debounce: false,
data: { data: {
code, code,
}, },
@@ -34,6 +35,7 @@ export const queryCsDictTree = (pid) => {
return request({ return request({
url: '/system-boot/dictTree/query', url: '/system-boot/dictTree/query',
method: 'post', method: 'post',
debounce: false,
data: { data: {
pid, pid,
}, },

3
common/js/cacheKey.js
View File

@@ -7,5 +7,6 @@ export default {
dictData: 'dictData', // 字典数据 dictData: 'dictData', // 字典数据
messageCount: 'messageCount', // 消息数量 messageCount: 'messageCount', // 消息数量
serverConfig: 'serverConfig', // 服务内容配置 serverConfig: 'serverConfig', // 服务内容配置
monitorSelectedIndicators: 'monitorSelectedIndicators', // 监测点已选展示指标 monitorSelectedIndicators: 'monitorSelectedIndicators', // 非治理监测点已选展示指标
monitorSelectedIndicatorsPqCom: 'monitorSelectedIndicatorsPqCom', // 治理监测点已选展示指标
} }

234
pages/index/comp/monitoringPoint.vue
View File

@@ -28,18 +28,38 @@
</view> </view>
</view> </view>
<view class="indicators-card card"> <view class="indicators-card card">
<view class="indicator-tags"> <view class="indicator-group">
<view <text class="indicator-group-title">治理监测点指标</text>
v-for="(tag, idx) in selectedIndicators" <view class="indicator-tags">
:key="tag" <view
class="indicator-tag indicator-tag--active" v-for="(tag, idx) in selectedIndicatorsPqCom"
@click="removeIndicator(idx)" :key="'governance-' + tag"
> class="indicator-tag indicator-tag--active"
<text class="indicator-tag-text">{{ formatIndicatorTag(tag) }}</text> @click="removeIndicator(idx, 'governance')"
<uni-icons type="closeempty" size="12" color="#376cf3" /> >
<text class="indicator-tag-text">{{ formatIndicatorTag(tag) }}</text>
<uni-icons type="closeempty" size="12" color="#376cf3" />
</view>
<view class="indicator-tag indicator-tag--add" @click="openIndicatorPopup('governance')">
<text>+添加指标</text>
</view>
</view> </view>
<view class="indicator-tag indicator-tag--add" @click="openIndicatorPopup"> </view>
<text>+添加指标</text> <view class="indicator-group">
<text class="indicator-group-title">非治理监测点指标</text>
<view class="indicator-tags">
<view
v-for="(tag, idx) in selectedIndicators"
:key="'normal-' + tag"
class="indicator-tag indicator-tag--active"
@click="removeIndicator(idx, 'normal')"
>
<text class="indicator-tag-text">{{ formatIndicatorTag(tag) }}</text>
<uni-icons type="closeempty" size="12" color="#376cf3" />
</view>
<view class="indicator-tag indicator-tag--add" @click="openIndicatorPopup('normal')">
<text>+添加指标</text>
</view>
</view> </view>
</view> </view>
</view> </view>
@@ -153,26 +173,32 @@
<view class="indicator-popup"> <view class="indicator-popup">
<view class="indicator-popup-header" @touchmove.stop.prevent> <view class="indicator-popup-header" @touchmove.stop.prevent>
<text class="indicator-popup-cancel" @click="closeIndicatorPopup">取消</text> <text class="indicator-popup-cancel" @click="closeIndicatorPopup">取消</text>
<text class="indicator-popup-title">{{ indicatorPopupSubtitle }}</text>
<text class="indicator-popup-confirm" @click="confirmIndicatorPopup">确定</text> <text class="indicator-popup-confirm" @click="confirmIndicatorPopup">确定</text>
</view> </view>
<scroll-view class="indicator-popup-list" scroll-y :show-scrollbar="false" @touchmove.stop> <scroll-view class="indicator-popup-list" scroll-y :show-scrollbar="false" @touchmove.stop>
<view v-if="targetLists.length === 0" class="indicator-popup-empty"> <view class="indicator-popup-section">
<text>暂无指标数据</text> <!-- <text class="indicator-popup-subtitle">{{ indicatorPopupSubtitle }}</text> -->
</view> <view v-if="currentPopupTargetLists.length === 0" class="indicator-popup-empty">
<view <text>暂无指标数据</text>
v-for="item in targetLists" </view>
:key="item.id || item.name" <view
class="indicator-popup-item" v-for="item in currentPopupTargetLists"
:class="{ 'indicator-popup-item--active': popupSelectedIndicators.includes(item.name) }" :key="item.id || item.name"
@click="togglePopupIndicator(item.name)" class="indicator-popup-item"
> :class="{
<text>{{ item.name }}</text> 'indicator-popup-item--active': popupSelectedIndicators.includes(item.name),
<uni-icons }"
v-if="popupSelectedIndicators.includes(item.name)" @click="togglePopupIndicator(item.name)"
type="checkmarkempty" >
size="18" <text>{{ item.name }}</text>
color="#376cf3" <uni-icons
/> v-if="popupSelectedIndicators.includes(item.name)"
type="checkmarkempty"
size="18"
color="#376cf3"
/>
</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@@ -188,13 +214,15 @@ import { getDevCount } from '@/common/api/device.js'
/** 无本地缓存时的默认展示指标：电压、电流 */ /** 无本地缓存时的默认展示指标：电压、电流 */
const DEFAULT_INDICATOR_CODES = ['Key_Power_Quality_V', 'Key_Power_Quality_I'] const DEFAULT_INDICATOR_CODES = ['Key_Power_Quality_V', 'Key_Power_Quality_I']
/** 治理测点(lineType=0)卡片默认展示的指标 */ /** 治理测点无缓存时的默认展示指标 */
const GOVERNANCE_DEFAULT_INDICATORS = ['电网电流', '电网电压', '负载电流', '总输出电流'] const GOVERNANCE_DEFAULT_INDICATOR_CODES = ['0', '1']
export default { export default {
data() { data() {
return { return {
targetLists: [], targetLists: [],
targetListsPqCom: [],
indicatorPopupType: 'governance',
popupSelectedIndicators: [], popupSelectedIndicators: [],
engineeringName: '', engineeringName: '',
engineeringId: '', engineeringId: '',
@@ -204,6 +232,7 @@ export default {
{ label: '监测点总数', value: 0 }, { label: '监测点总数', value: 0 },
], ],
selectedIndicators: [], selectedIndicators: [],
selectedIndicatorsPqCom: [],
phaseColors: [ phaseColors: [
{ name: 'A相', color: '#DAA520' }, { name: 'A相', color: '#DAA520' },
{ name: 'B相', color: '#2E8B57' }, { name: 'B相', color: '#2E8B57' },
@@ -219,6 +248,12 @@ export default {
} }
}, },
computed: { computed: {
indicatorPopupSubtitle() {
return this.indicatorPopupType === 'governance' ? '治理监测点指标' : '非治理监测点指标'
},
currentPopupTargetLists() {
return this.indicatorPopupType === 'governance' ? this.targetListsPqCom : this.targetLists
},
filteredMonitoringPoints() { filteredMonitoringPoints() {
const keyword = (this.filterKeyword || '').trim().toLowerCase() const keyword = (this.filterKeyword || '').trim().toLowerCase()
if (!keyword) return this.monitoringPoints if (!keyword) return this.monitoringPoints
@@ -249,18 +284,21 @@ export default {
this.info() this.info()
} }
} }
if (this.targetLists.length && !skipRefresh) { if ((this.targetLists.length || this.targetListsPqCom.length) && !skipRefresh) {
this.loadSelectedIndicators() this.loadSelectedIndicators()
} }
}, },
// 加载电能质量指标字典 // 加载电能质量指标字典
created() { created() {
queryByCode('Key_Power_Quality').then((res) => { const loadDictTree = (code) => queryByCode(code).then((res) => queryCsDictTree(res.data.id))
queryCsDictTree(res.data.id).then((resp) => {
this.targetLists = (resp.data || []).slice().reverse() Promise.all([loadDictTree('Key_Power_Quality'), loadDictTree('Key_Power_Quality_Pq_Com')]).then(
([normalResp, pqComResp]) => {
this.targetLists = (normalResp.data || []).slice().reverse()
this.targetListsPqCom = (pqComResp.data || []).slice().reverse()
this.loadSelectedIndicators() this.loadSelectedIndicators()
}) },
}) )
}, },
// 下拉刷新 // 下拉刷新
onPullDownRefresh() { onPullDownRefresh() {
@@ -347,7 +385,7 @@ export default {
return order.map((key) => map[key]) return order.map((key) => map[key])
}, },
formatPhaseValue(value) { formatPhaseValue(value) {
if (value === null || value === undefined || value === '') return '-' if (value === null || value === undefined || value === '' || value === 3.14159) return '-'
const num = Number(value) const num = Number(value)
if (Number.isNaN(num)) return String(value) if (Number.isNaN(num)) return String(value)
return num.toFixed(2) return num.toFixed(2)
@@ -377,8 +415,13 @@ export default {
const selectedBase = (selected || '').replace(/\(.*\)/, '').trim() const selectedBase = (selected || '').replace(/\(.*\)/, '').trim()
return base === selectedBase return base === selectedBase
}, },
// 从缓存读取已选指标，无缓存时使用默认电压/电流指标 // 从缓存读取已选指标，无缓存时使用默认指标
loadSelectedIndicators() { loadSelectedIndicators() {
this.loadNormalSelectedIndicators()
this.loadGovernanceSelectedIndicators()
},
loadNormalSelectedIndicators() {
if (!this.targetLists.length) return
const cached = uni.getStorageSync(this.$cacheKey.monitorSelectedIndicators) const cached = uni.getStorageSync(this.$cacheKey.monitorSelectedIndicators)
if (Array.isArray(cached) && cached.length) { if (Array.isArray(cached) && cached.length) {
const valid = cached.filter((name) => const valid = cached.filter((name) =>
@@ -392,35 +435,68 @@ export default {
this.selectedIndicators = this.getDefaultIndicatorsByCode() this.selectedIndicators = this.getDefaultIndicatorsByCode()
this.saveSelectedIndicators() this.saveSelectedIndicators()
}, },
loadGovernanceSelectedIndicators() {
if (!this.targetListsPqCom.length) return
const cached = uni.getStorageSync(this.$cacheKey.monitorSelectedIndicatorsPqCom)
if (Array.isArray(cached) && cached.length) {
const valid = cached.filter((name) =>
this.targetListsPqCom.some((item) => this.matchIndicator(item.name, name)),
)
if (valid.length) {
this.selectedIndicatorsPqCom = valid
return
}
}
this.selectedIndicatorsPqCom = this.getDefaultGovernanceIndicators()
this.saveSelectedIndicatorsPqCom()
},
getDefaultIndicatorsByCode() { getDefaultIndicatorsByCode() {
return this.targetLists return this.targetLists
.filter((item) => DEFAULT_INDICATOR_CODES.includes(item.code) && item.name) .filter((item) => DEFAULT_INDICATOR_CODES.includes(item.code) && item.name)
.map((item) => item.name) .map((item) => item.name)
}, },
getDefaultGovernanceIndicators() {
return this.targetListsPqCom
.filter((item) => GOVERNANCE_DEFAULT_INDICATOR_CODES.includes(item.code) && item.name)
.map((item) => item.name)
},
saveSelectedIndicators() { saveSelectedIndicators() {
uni.setStorageSync(this.$cacheKey.monitorSelectedIndicators, this.selectedIndicators) uni.setStorageSync(this.$cacheKey.monitorSelectedIndicators, this.selectedIndicators)
}, },
saveSelectedIndicatorsPqCom() {
uni.setStorageSync(this.$cacheKey.monitorSelectedIndicatorsPqCom, this.selectedIndicatorsPqCom)
},
// 跳转切换工程 // 跳转切换工程
switchEngineering() { switchEngineering() {
uni.navigateTo({ url: '/pages/home/selectEngineering' }) uni.navigateTo({ url: '/pages/home/selectEngineering' })
}, },
// 移除已选指标 // 移除已选指标
removeIndicator(idx) { removeIndicator(idx, type = 'normal') {
if (this.selectedIndicators.length <= 1) { const isGovernance = type === 'governance'
const selected = isGovernance ? this.selectedIndicatorsPqCom : this.selectedIndicators
if (selected.length <= 1) {
uni.showToast({ title: '至少保留一个指标', icon: 'none' }) uni.showToast({ title: '至少保留一个指标', icon: 'none' })
return return
} }
this.selectedIndicators.splice(idx, 1) selected.splice(idx, 1)
this.saveSelectedIndicators() if (isGovernance) {
this.saveSelectedIndicatorsPqCom()
} else {
this.saveSelectedIndicators()
}
}, },
// 打开指标选择弹窗 // 打开指标选择弹窗
openIndicatorPopup() { openIndicatorPopup(type = 'governance') {
if (!this.targetLists.length) { const isGovernance = type === 'governance'
const targetLists = isGovernance ? this.targetListsPqCom : this.targetLists
const selected = isGovernance ? this.selectedIndicatorsPqCom : this.selectedIndicators
if (!targetLists.length) {
uni.showToast({ title: '暂无指标数据', icon: 'none' }) uni.showToast({ title: '暂无指标数据', icon: 'none' })
return return
} }
this.popupSelectedIndicators = this.targetLists this.indicatorPopupType = type
.filter((item) => this.selectedIndicators.some((name) => this.matchIndicator(item.name, name))) this.popupSelectedIndicators = targetLists
.filter((item) => selected.some((name) => this.matchIndicator(item.name, name)))
.map((item) => item.name) .map((item) => item.name)
this.$refs.indicatorPopup.open() this.$refs.indicatorPopup.open()
}, },
@@ -428,6 +504,7 @@ export default {
closeIndicatorPopup() { closeIndicatorPopup() {
this.$refs.indicatorPopup.close() this.$refs.indicatorPopup.close()
this.popupSelectedIndicators = [] this.popupSelectedIndicators = []
this.indicatorPopupType = 'governance'
}, },
onIndicatorPopupChange(e) { onIndicatorPopupChange(e) {
this.indicatorPopupShow = !!e.show this.indicatorPopupShow = !!e.show
@@ -447,8 +524,13 @@ export default {
uni.showToast({ title: '至少保留一个指标', icon: 'none' }) uni.showToast({ title: '至少保留一个指标', icon: 'none' })
return return
} }
this.selectedIndicators = [...this.popupSelectedIndicators] if (this.indicatorPopupType === 'governance') {
this.saveSelectedIndicators() this.selectedIndicatorsPqCom = [...this.popupSelectedIndicators]
this.saveSelectedIndicatorsPqCom()
} else {
this.selectedIndicators = [...this.popupSelectedIndicators]
this.saveSelectedIndicators()
}
this.closeIndicatorPopup() this.closeIndicatorPopup()
}, },
// 跳转指标详情页，展示该监测点全部指标 // 跳转指标详情页，展示该监测点全部指标
@@ -463,17 +545,13 @@ export default {
url: '/pages/index/comp/targetInfo', url: '/pages/index/comp/targetInfo',
}) })
}, },
// 治理测点默认 4 项；普通测点按顶部已选指标过滤 // 按监测点类型取对应已选指标过滤展示
getDisplayChildren(point) { getDisplayChildren(point) {
const children = point.children || [] const children = point.children || []
if (point.lineType === 0) { const selected = point.lineType === 0 ? this.selectedIndicatorsPqCom : this.selectedIndicators
return GOVERNANCE_DEFAULT_INDICATORS.map((name) => return selected
children.find((child) => this.matchIndicator(child.name, name)), .map((name) => children.find((child) => this.matchIndicator(child.name, name)))
).filter(Boolean) .filter(Boolean)
}
return children.filter((child) =>
this.selectedIndicators.some((name) => this.matchIndicator(child.name, name)),
)
}, },
// 有指标数据时显示「更多指标」 // 有指标数据时显示「更多指标」
shouldShowMoreBtn(point) { shouldShowMoreBtn(point) {
@@ -639,6 +717,21 @@ export default {
padding: 24rpx; padding: 24rpx;
} }
.indicator-group {
margin-bottom: 20rpx;
&:last-child {
margin-bottom: 0;
}
}
.indicator-group-title {
display: block;
margin-bottom: 12rpx;
font-size: 26rpx;
color: #666;
}
.section-title-row { .section-title-row {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -919,6 +1012,14 @@ export default {
min-width: 80rpx; min-width: 80rpx;
} }
.indicator-popup-title {
flex: 1;
text-align: center;
font-size: 28rpx;
font-weight: 600;
color: #333333;
}
.indicator-popup-confirm { .indicator-popup-confirm {
font-size: 28rpx; font-size: 28rpx;
color: #376cf3; color: #376cf3;
@@ -928,12 +1029,23 @@ export default {
.indicator-popup-list { .indicator-popup-list {
height: 60vh; height: 60vh;
padding: 16rpx 0; padding: 8rpx 0 16rpx;
box-sizing: border-box; box-sizing: border-box;
} }
.indicator-popup-section {
padding-bottom: 8rpx;
}
.indicator-popup-subtitle {
display: block;
padding: 16rpx 32rpx 8rpx;
font-size: 24rpx;
color: #999999;
}
.indicator-popup-empty { .indicator-popup-empty {
padding: 80rpx 0; padding: 40rpx 0;
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;
@@ -943,8 +1055,8 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 28rpx 32rpx; padding: 20rpx 32rpx;
font-size: 28rpx; font-size: 26rpx;
color: #333333; color: #333333;
&--active { &--active {