绘制关键指标概览页面

common/api/dictionary.js

@@ -39,6 +39,14 @@ export const queryCsDictTree = (pid) => {
         },
     })
 }
+// 字典树接口
+export const queryStatistical = (data) => {
+    return request({
+        url: '/system-boot/csstatisticalset/queryStatistical',
+        method: 'post',
+        data: data,
+    })
+}
 
 // 字典树接口通过id
 export const queryByid = (id) => {

common/api/harmonic.js

@@ -10,7 +10,7 @@ export function getModuleState(params) {
 }
 export function getBaseRealData(id) {
     return request({
-        url: '/cs-harmonic-boot/realData/getBaseRealData?lineId='+id,
+        url: '/cs-harmonic-boot/realData/getBaseRealData?lineId=' + id,
         method: 'post',
     })
 }
@@ -47,3 +47,11 @@ export function queryAppHarmonicLine(params) {
         },
     })
 }
+// 暂态事件波形分析
+export function analyseWave(params) {
+    return request({
+        url: '/cs-harmonic-boot/event/analyseWave',
+        method: 'get',
+        params,
+    })
+}

common/js/mqtt.js

@@ -1,5 +1,5 @@
 // export const MQTT_IP = 'pqmcn.com:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
-export const MQTT_IP = '192.168.1.103:8083/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
+export const MQTT_IP = '192.168.1.103:38083/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
 
 const MQTT_USERNAME = 't_user'//mqtt用户名
 const MQTT_PASSWORD = 'njcnpqs'//密码

components/Cn-MultipleTree/Cn-MultipleTree.vue

@@ -0,0 +1,510 @@
+<template xlang="wxml">
+    <view class="tki-tree">
+        <view class="tki-tree-mask" :class="{ show: showTree }" @tap="_cancel"></view>
+        <view class="tki-tree-cnt" :class="{ show: showTree }">
+            <view class="tki-tree-bar">
+                <view class="tki-tree-bar-cancel" :style="{ color: cancelColor }" hover-class="hover-c" @tap="_cancel">
+                    取消</view>
+                <view class="tki-tree-bar-title" :style="{ color: titleColor }">{{ title }}</view>
+                <view class="tki-tree-bar-confirm" :style="{ color: confirmColor }" hover-class="hover-c"
+                    @tap="_confirm">确定</view>
+            </view>
+            <view class="tki-tree-bar1">
+                <uni-search-bar class="uni-input" radius="5" placeholder="请输入关键字搜索" clearButton="none" @input="input" />
+
+                <!-- <uni-search-bar
+                    v-model="searchValue"
+                    clearButton="none"
+                    bgColor="#fff"
+                    placeholder="请输入关键词"
+                    @input="input"
+                ></uni-search-bar> -->
+            </view>
+
+            <view class="tki-tree-view">
+                <scroll-view class="tki-tree-view-sc" :scroll-y="true">
+                    <block v-for="(item, index) in treeList" :key="index">
+                        <view class="tki-tree-item" :style="[
+                            {
+                                paddingLeft: item.rank * 15 + 'px',
+                                zIndex: item.rank * -1 + 50,
+                            },
+                        ]" :class="{
+                                border: border === true,
+                                show: item.show,
+                                last: item.lastRank,
+                                showchild: item.showChild,
+                                open: item.open,
+                            }">
+                            <view class="tki-tree-label" @tap.stop="_treeItemTap(item, index)">
+                                <image class="tki-tree-icon"
+                                    :src="item.lastRank ? lastIcon : item.showChild ? currentIcon : defaultIcon">
+                                </image>
+                                {{ item.name }}
+                            </view>
+                            <view class="tki-tree-check" @tap.stop="_treeItemSelect(item, index)"
+                                v-if="selectParent ? true : item.lastRank">
+                                <view class="tki-tree-check-yes" v-if="item.checked"
+                                    :style="{ 'border-color': confirmColor }">
+                                    <view class="tki-tree-check-yes-b" :style="{ 'background-color': confirmColor }">
+                                    </view>
+                                </view>
+                                <view class="tki-tree-check-no" v-if="!item.checked"
+                                    :style="{ 'border-color': confirmColor }"></view>
+                            </view>
+                        </view>
+                    </block>
+                </scroll-view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    name: 'Cn-MultipleTree',
+    props: {
+        lazy: {
+            type: Boolean,
+            default: false,
+        },
+        range: {
+            type: Array,
+            default: function () {
+                return []
+            },
+        },
+        idKey: {
+            type: String,
+            default: 'id',
+        },
+        rangeKey: {
+            type: String,
+            default: 'name',
+        },
+        title: {
+            type: String,
+            default: '',
+        },
+        multiple: {
+            type: Boolean,
+            default: true,
+        },
+        selectParent: {
+            //是否可以选父级
+            type: Boolean,
+            default: false,
+        },
+        foldAll: {
+            //折叠时关闭所有已经打开的子集，再次打开时需要一级一级打开
+            type: Boolean,
+            default: false,
+        },
+        confirmColor: {
+            // 确定按钮颜色
+            type: String,
+            default: '#376cf3', // #07bb07
+        },
+        cancelColor: {
+            // 取消按钮颜色
+            type: String,
+            default: '', // #757575
+        },
+        titleColor: {
+            // 标题颜色
+            type: String,
+            default: '', // #757575
+        },
+        currentIcon: {
+            // 展开时候的ic
+            type: String,
+            default:
+                'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MEQ0QTM0MzQ1Q0RBMTFFOUE0MjY4NzI1Njc1RjI1ODIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MEQ0QTM0MzU1Q0RBMTFFOUE0MjY4NzI1Njc1RjI1ODIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowRDRBMzQzMjVDREExMUU5QTQyNjg3MjU2NzVGMjU4MiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowRDRBMzQzMzVDREExMUU5QTQyNjg3MjU2NzVGMjU4MiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PidwepsAAAK0SURBVHja7JxbTsJAFIYHww7ciStgCeoGvGxAiOsgURegoL5720AXYLiIr0aJviq3Zx3PhIEnKG3ndtr+f3KixrSUj/ZjzjClIqUUiFm2gAAQAREQEUAEREAERAQQAREQAREBREAEREBEEqa67h9RFDWllDv0awWYlqlQHmu1WjMRRMoV1QFttA12y3xRtdNczq8EsE4/f8FumX2q77ROvNXk8UGMEKdUz6tYJHljaZAbuyUH+UR1to5BEohTuqwPCeS4pAA/qY6o/kyHOAMCeRK3owJnj+rH1jjxhqpVsstaebCz6TmnHWyXyY+xHjSBWBY/bvSgadtXBj9u9KCN3rnIfkzkQVsTEEX0Y2IP2oKo/HhMICcFAThUcwVZNGU6FdbX/XURzkbVF4+ybGhjPrFdgP66QdXNurGtSdk6Xdb9nAJ8oDo3OQlsQZzkdPw41ONBo6vI5scDefRjZg+6gpg3Pxp50CXEvPjR2IOuIXL3oxUPuobI3Y9WPOgDIlc/WvOgL4iL/vqFCcD7LH0xB4hj7cfQ/fWH9qCT+FhG0tN+DBk1PzjOM0SVllixcsBT1AvYc/kAPhc0hRg/3uvxoCgKRN9+dOrBUBB9+9GpB0NC9OVH5x4MDdG1H714kANEV3705kEOEBf9dcPi/lQnsuvLg1wgSu3Ha0v7Uh4MMgUXeuG71H407a+VBy9CPQkOdw+MtB+nGbd/D+FBbhBNxo9SjwcngJjNj0E9yBFiFj8G9SBXiGn8GNyDnCEm8SMLD3KHGOdHNh7kDjHOj2w8mAeIi/5arX+c6b/fxHz9oADEdGdjR/fXCw/OOB5oVfCOgnepz8IB14PMw03jCmTE+QBx5z0gAmKSqK9OUF+hcAeIhu/QYr4Qie8rjW83hhMBERARQAREQAREBBABERCLnH8BBgA+TQI7U4t53AAAAABJRU5ErkJggg==',
+        },
+        defaultIcon: {
+            // 折叠时候的ic
+            type: String,
+            default:
+                'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAACE0lEQVR4Xu3c200DMRCF4XEltJAOkEugA+ggpUAHoQMqiFMCdEAJUMEiS4mEELlIO7bPOeN9i6K1rG/952myyea1WiCtXmEuYBPR4RBMxInoIOCwhOtJLKVszWyXc/5y2BvNEq6I+/3+kFK6M7OHnPM7jcLKjbZAvD/uaZtzflm5P4rbWyJWgDcze1LPuzVihfxUz7sH4ilJ2bx7Isrm3RtRMu8RiHJ5j0SUyXs0okTeCIj0eSMh0uaNhkiZNyIiXd7IiDR5oyNS5M2ACJ83EyJs3myIkHkzIsLlzYwIkzc7IkTeCojD81ZCHJa3GuKQvBURu+etjNgtb3XELnlHQGyedyTEZnlHQ2ySd0RE97wjI7rlHR3RJe+JeIrbLOecD6ePpZQ6W1kn2epo4MUrPOKyLN8ppYq1+y1VStncOjIdGnFZlo+U0uOtWOeOY2TE12Ouq//pEA7xXL7XfvcufR8K0Svfv6CREN3yDYfYIt9QiK3yjYTYLF95xB75SiP2ylcZsVu+cogj8pVCHJWvEuKwfOkREfKlRkTJlxkRJl86RMR8qRBR82VChM0XHpEhX2hElnyREWnyhUNkzBcKkTVfJETafIcjKuQ7FFEl35GIMvl2R1TMtyuiar49EWXzbY5oZpv/hibXTF2h3+s60FRKeT6+3TjMS3nrA3ZFRD8xrfY3ER1kJ+JEdBBwWGKeRAfEH1wS5WFZSDB/AAAAAElFTkSuQmCC',
+        },
+        lastIcon: {
+            // 没有子集的ic
+            type: String,
+            default: '',
+        },
+        border: {
+            // 是否有分割线
+            type: Boolean,
+            default: false,
+        },
+    },
+    data() {
+        return {
+            showTree: false,
+            treeList: [],
+            selectIndex: -1,
+            returnedItem: [], //定义一个空数组
+            pids: [],
+            ancestorsIds: [],
+            childNums: [],
+            dataTree: [],
+            inputTimer: null, // 节流定时器标识
+            searchValue: '',
+        }
+    },
+    computed: {},
+    methods: {
+        _show() {
+            this.showTree = true
+            if (this.searchValue != '') {
+                this.searchValue = ''
+                this.input('')
+            }
+        },
+        _hide() {
+            this.showTree = false
+        },
+        _cancel() {
+            this._hide()
+            this.$emit('cancel', '')
+        },
+        _confirm() {
+            // 处理所选数据
+            let rt = [],
+                obj = {}
+            this.treeList.forEach((v, i) => {
+                if (this.treeList[i].checked) {
+                    // rt.push(this.treeList[i].id)
+                    rt.push(this.treeList[i])
+                }
+            })
+            this._hide()
+            console.log('🚀 ~ rt:', rt)
+
+            if (rt.length == 0) return
+            this.$emit('confirm', rt)
+        },
+        //扁平化树结构
+        _renderTreeList(list = [], rank = 0, parentId = [], parents = []) {
+            list.forEach((item) => {
+                this.treeList.push({
+                    id: item[this.idKey],
+                    name: item[this.rangeKey],
+                    source: item,
+                    parentId, // 父级id数组
+                    parents, // 父级id数组
+                    rank, // 层级
+                    showChild: false, //子级是否显示
+                    open: false, //是否打开
+                    show: rank === 0, // 自身是否显示
+                    hideArr: [],
+                    orChecked: item.checked ? item.checked : false,
+                    checked: item.checked ? item.checked : false,
+                    childNum: 0,
+                })
+
+                if (Array.isArray(item.children) && item.children.length > 0) {
+                    let parentid = [...parentId],
+                        parentArr = [...parents]
+                    delete parentArr.children
+                    parentid.push(item[this.idKey])
+                    parentArr.push({
+                        [this.idKey]: item[this.idKey],
+                        [this.rangeKey]: item[this.rangeKey],
+                        rank: rank,
+                    })
+                    // lazy
+                    if (!this.lazy) {
+                        this._renderTreeList(item.children, rank + 1, parentid, parentArr)
+                    }
+                } else {
+                    this.treeList[this.treeList.length - 1].lastRank = true
+                }
+            })
+        },
+        // 处理默认选择
+        _defaultSelect() {
+            this.treeList.forEach((v, i) => {
+                if (v.checked) {
+                    this.treeList.forEach((v2, i2) => {
+                        if (v.parentId.toString().indexOf(v2.parentId.toString()) >= 0) {
+                            v2.show = true
+                            if (v.parentId.includes(v2.id)) {
+                                v2.showChild = true
+                                v2.open = true
+                            }
+                        }
+                    })
+                }
+            })
+        },
+        getOwn(id, arr) {
+            //利用foreach循环遍历
+            arr.forEach((item) => {
+                //判断递归结束条件
+                if (item[this.idKey] == id) {
+                    // 存储数据到空数组
+                    this.returnedItem = item
+                } else if (item.children != null) //判断chlidren是否有数据
+                {
+                    //递归调用
+                    this.getOwn(id, item.children)
+                }
+            })
+            return this.returnedItem
+        },
+        setShow(id, arr, isShow) {
+            arr.forEach((item, index) => {
+                if (item.parentId.includes(id)) {
+                    this.treeList[index].showChild = isShow
+                    this.treeList[index].show = isShow
+                } else if (item.children !== undefined) {
+                    this.setShow(id, item.children, isShow)
+                }
+            })
+        },
+        // 点击
+        _treeItemTap(item, index) {
+            // console.log(item)
+            if (item.lastRank === true) {
+                this.treeList[index].checked = !this.treeList[index].checked
+                if (!this.multiple) {
+                    this._fixSingle(index)
+                }
+                return
+            }
+            let id = item.id
+            item.showChild = !item.showChild
+            // qingqian
+            if (item.showChild) {
+                // const range = this.range
+                const range = this.dataTree
+                const parentIdArr = item.parentId
+                // 找到当前元素
+                const own = this.getOwn(id, range)
+                const checkedChildren = own.children
+                // 子元素插入的索引位置
+                const nextIndex = this.treeList.findIndex((itemT) => itemT.id === item.id)
+                console.log(checkedChildren)
+                if (checkedChildren === undefined || checkedChildren.length < 1) {
+                    return
+                }
+                // 子节点数量
+                this.treeList[index].childNum = checkedChildren.length
+                const newRank = item.rank + 1
+                checkedChildren.forEach((itemC) => {
+                    const childObj = {
+                        id: itemC[this.idKey],
+                        name: itemC[this.rangeKey],
+                        source: {},
+                        parentId: [item.id], // 父级id数组
+                        parents: [item], // 父级id数组
+                        rank: newRank, // 层级
+                        showChild: false, //子级是否显示
+                        open: false, //是否打开
+                        show: 1, // 自身是否显示
+                        hideArr: [],
+                        orChecked: this.treeList[index].checked,
+                        checked: this.treeList[index].checked,
+                    }
+                    if (!this.treeList.some((itemT) => itemT.id === itemC[this.idKey])) {
+                        this.treeList.splice(nextIndex + 1, 0, childObj)
+                    }
+                })
+            }
+            // 展开/隐藏子级/孙级
+            let list = this.treeList
+            item.open = item.showChild ? true : !item.open
+            list.forEach((childItem, i) => {
+                if (item.showChild === false) {
+                    //隐藏所有子级
+                    if (!childItem.parentId.includes(id)) {
+                        return
+                    }
+                    //TODO: 修改
+                    if (!this.foldAll) {
+                        if (childItem.lastRank !== true && !childItem.open) {
+                            childItem.showChild = false
+                            this.setShow(childItem.id, this.treeList, false)
+                        }
+                        // 为隐藏的内容添加一个标记
+                        if (childItem.show) {
+                            childItem.hideArr[item.rank] = id
+                        }
+                    } else {
+                        if (childItem.lastRank !== true) {
+                            childItem.showChild = false
+                            // 继续隐藏子级的的子级
+                            this.setShow(childItem.id, this.treeList, false)
+                        }
+                    }
+                    if (childItem.children !== undefined) {
+                        childItem.children.forEach((childItem1, i1) => {
+                            if (!childItem1.parentId.includes(childItem.id)) {
+                                return
+                            }
+                            childItem.children[i1].showChild = false
+                            childItem.children[i1].show = false
+                        })
+                    }
+                    childItem.show = false
+                } else {
+                    // 打开子集
+                    if (childItem.parentId[childItem.parentId.length - 1] === id) {
+                        childItem.show = true
+                    }
+                    // 打开被隐藏的子集
+                    if (childItem.parentId.includes(id) && !this.foldAll) {
+                        // console.log(childItem.hideArr)
+                        if (childItem.hideArr[item.rank] === id) {
+                            childItem.show = true
+                            if (childItem.open && childItem.showChild) {
+                                childItem.showChild = true
+                            } else {
+                                childItem.showChild = false
+                            }
+                            childItem.hideArr[item.rank] = null
+                        }
+                    }
+                }
+            })
+        },
+        // 通过父id处理子级
+        syncChecked(trees, pid, checked) {
+            trees.forEach((item, index) => {
+                if (item.parentId.includes(pid)) {
+                    this.treeList[index].checked = checked
+                    this.syncChecked(trees, item.id, checked)
+                } else if (item.children !== undefined) {
+                    this.syncChecked(item.children, pid, checked)
+                }
+            })
+        },
+        // 获取父级往上所有层级的id 并同步状态
+        setAncestors(pids, checked) {
+            this.treeList.forEach((item, index) => {
+                if (pids.includes(item.id)) {
+                    if (checked && this.childNums[item.id] !== undefined && item.childNum === this.childNums[item.id]) {
+                        // 子级全部选中, 父级才选中
+                        this.treeList[index].checked = true
+                    } else {
+                        this.treeList[index].checked = false
+                    }
+                    this.setAncestors(item.parentId, checked)
+                }
+            })
+        },
+        _treeItemSelect(item, index) {
+            this.treeList[index].checked = !this.treeList[index].checked
+            // 选父级, 子级自动全选
+            this.syncChecked(this.treeList, item.id, this.treeList[index].checked)
+
+            if (item.rank > 0) {
+                item.parentId.forEach((pid, indexP) => {
+                    const parent = this.treeList.filter((i) => i.id === pid)
+                    const childNum = parent.length > 0 ? parent[0].childNum : 0
+                    if (this.childNums[pid] === undefined) {
+                        this.childNums[pid] = 1
+                    } else if (this.childNums[pid] < childNum) {
+                        this.childNums[pid]++
+                    }
+                })
+                //子级选择/选满/取消选择, 父级往上同步状态
+                this.setAncestors(item.parentId, this.treeList[index].checked)
+            }
+            if (!this.multiple) {
+                this._fixSingle(index)
+            }
+        },
+        _fixSingle(index) {
+            this.treeList.forEach((v, i) => {
+                this.treeList[i].checked = i === index
+            })
+        },
+        // 重置数据
+        _reTreeList() {
+            this.treeList.forEach((v, i) => {
+                this.treeList[i].checked = v.orChecked
+            })
+        },
+        _initTree(range = this.range) {
+            this.treeList = []
+            this.dataTree = JSON.parse(JSON.stringify(range))
+            this._renderTreeList(range)
+            this.$nextTick(() => {
+                this._defaultSelect(range)
+            })
+        },
+        // 筛选
+        input(val) {
+            // 清除上一次的定时器，避免频繁执行
+            if (this.inputTimer) {
+                clearTimeout(this.inputTimer)
+            }
+
+            // 设置新的定时器，指定延迟后执行过滤逻辑
+            this.inputTimer = setTimeout(() => {
+                const keyword = val
+                // 执行树形过滤和初始化
+                this._initTree(this.filterNodes(this.range, keyword))
+                // 清空定时器标识
+                clearTimeout(this.inputTimer)
+                this.inputTimer = null
+            }, 500)
+            // this._initTree(this.filterNodes(this.range, val.detail.value))
+        },
+
+        filterNodes(node, query) {
+            const keyword = query.trim() // 获取搜索关键字并转换为小写
+            const nodes = node
+            // 使用递归函数过滤树形数据
+            const filteredNodes = []
+            for (const node of nodes) {
+                if (node.name.includes(keyword)) {
+                    // 如果节点的标签包含关键字，将其添加到结果中
+                    filteredNodes.push(node)
+                } else if (node.children && node.children.length > 0) {
+                    // 如果节点有子节点，则递归过滤子节点
+                    const filteredChildren = this.filterNodes(node.children, keyword)
+                    if (filteredChildren.length > 0) {
+                        // 如果子节点中有匹配的结果，则添加父节点
+                        const clonedNode = { ...node, children: filteredChildren }
+                        filteredNodes.push(clonedNode)
+                    }
+                }
+            }
+            return filteredNodes
+        },
+    },
+    watch: {
+        range(list) {
+            this._initTree(list)
+        },
+        multiple() {
+            if (this.range.length) {
+                this._reTreeList()
+            }
+        },
+        selectParent() {
+            if (this.range.length) {
+                this._reTreeList()
+            }
+        },
+    },
+    mounted() {
+        this._initTree()
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+@import './style.css';
+
+/deep/ .uni-searchbar__box {
+    justify-content: left !important;
+}
+
+/deep/ .uni-input {
+    background: #ffffff
+}
+</style>

components/Cn-MultipleTree/style.css

@@ -0,0 +1,195 @@
+.tki-tree-mask {
+    position: fixed;
+    top: 0rpx;
+    right: 0rpx;
+    bottom: 0rpx;
+    left: 0rpx;
+    z-index: 9998;
+    background-color: rgba(0, 0, 0, 0.6);
+    opacity: 0;
+    transition: all 0.3s ease;
+    visibility: hidden;
+}
+.tki-tree-mask.show {
+    visibility: visible;
+    opacity: 1;
+}
+.tki-tree-cnt {
+    position: fixed;
+    top: 0rpx;
+    right: 0rpx;
+    bottom: 0rpx;
+    left: 0rpx;
+    z-index: 9999;
+    top: 40%;
+    transition: all 0.3s ease;
+    transform: translateY(100%);
+}
+.tki-tree-cnt.show {
+    transform: translateY(0);
+}
+.tki-tree-bar {
+    background-color: #fff;
+    height: 72rpx;
+    padding-left: 20rpx;
+    padding-right: 20rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    border-bottom-width: 1rpx !important;
+    border-bottom-style: solid;
+    border-bottom-color: #f5f5f5;
+    font-size: 32rpx;
+    color: #757575;
+    line-height: 1;
+}
+.tki-tree-bar1 {
+    background-color: #fff;
+}
+.tki-tree-bar-confirm {
+    color: #07bb07;
+}
+.tki-tree-view {
+    position: absolute;
+    top: 0rpx;
+    right: 0rpx;
+    bottom: 0rpx;
+    left: 0rpx;
+    top: 160rpx;
+    background-color: #fff;
+    padding-top: 20rpx;
+    padding-right: 20rpx;
+    padding-bottom: 20rpx;
+    padding-left: 20rpx;
+}
+.tki-tree-view-sc {
+    height: 100%;
+    overflow: hidden;
+}
+.tki-tree-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 26rpx;
+    /* color: #757575; */
+    line-height: 1;
+    height: 0;
+    opacity: 0;
+    transition: 0.2s;
+    position: relative;
+    overflow: hidden;
+}
+.tki-tree-item.show {
+    height: 80rpx;
+    opacity: 1;
+}
+.tki-tree-item.showchild:before {
+    transform: rotate(90deg);
+}
+.tki-tree-item.last:before {
+    opacity: 0;
+}
+.tki-tree-icon {
+    width: 26rpx;
+    height: 26rpx;
+    margin-right: 8rpx;
+}
+.tki-tree-label {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    height: 100%;
+    line-height: 1.2;
+}
+.tki-tree-check {
+    width: 40px;
+    height: 40px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.tki-tree-check-yes,
+.tki-tree-check-no {
+    width: 20px;
+    height: 20px;
+    border-top-left-radius: 20%;
+    border-top-right-radius: 20%;
+    border-bottom-right-radius: 20%;
+    border-bottom-left-radius: 20%;
+    border-top-width: 1rpx;
+    border-left-width: 1rpx;
+    border-bottom-width: 1rpx;
+    border-right-width: 1rpx;
+    border-style: solid;
+    border-color: #07bb07;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    box-sizing: border-box;
+}
+.tki-tree-check-yes-b {
+    width: 12px;
+    height: 12px;
+    border-top-left-radius: 20%;
+    border-top-right-radius: 20%;
+    border-bottom-right-radius: 20%;
+    border-bottom-left-radius: 20%;
+    background-color: #07bb07;
+}
+.tki-tree-check .radio {
+    border-top-left-radius: 50%;
+    border-top-right-radius: 50%;
+    border-bottom-right-radius: 50%;
+    border-bottom-left-radius: 50%;
+}
+.tki-tree-check .radio .tki-tree-check-yes-b {
+    border-top-left-radius: 50%;
+    border-top-right-radius: 50%;
+    border-bottom-right-radius: 50%;
+    border-bottom-left-radius: 50%;
+}
+.hover-c {
+    opacity: 0.6;
+}
+
+.search {
+    position: absolute;
+    left: 35rpx;
+}
+
+/* 基础输入框样式 */
+.uni-input {
+    width: 95%;
+    height: 60rpx;
+    line-height: 60rpx;
+    border-radius: 20rpx;
+    /* font-size: 32rpx;
+    color: #333;
+    background: #f5f5f5;
+    width: 100%;
+
+    padding: 0 24rpx 0 60rpx;
+    box-sizing: border-box;
+    border: none; */
+}
+
+/* 聚焦态样式 */
+.uni-input:focus {
+    background: #fff;
+    border: 2rpx solid #007aff;
+}
+
+/* 占位符样式 */
+.uni-input::placeholder {
+    color: #999;
+    font-size: 28rpx;
+}
+
+/* 兼容微信小程序 */
+.uni-input::-webkit-input-placeholder {
+    color: #999;
+    font-size: 28rpx;
+}
+
+

components/Cn-device-card/Cn-device-card.vue

@@ -1,13 +1,6 @@
 <template>
-    <uni-card
+    <uni-card :title="device.equipmentName" :sub-title="device.mac" :extra="device.isPrimaryUser == 1 ? '主设备' : '分享设备'"
-        :title="device.equipmentName"
+        padding="0" @click="jump(device)" class="boxClick" :thumbnail="deviceIcon(device.runStatus)">
-        :sub-title="device.mac"
-        :extra="device.isPrimaryUser == 1 ? '主设备' : '分享设备'"
-        padding="0"
-        @click="jump(device)"
-        class="boxClick"
-        :thumbnail="deviceIcon(device.runStatus)"
-    >
         <template v-slot:title>
             <!-- 卡片标题 -->
             <view class="uni-card__header" @click="jump(device)">
@@ -25,34 +18,38 @@
                                 :color="device.runStatus == 1 ? '#ff3b30' : '#10B981'"
                                 :size="device.devType == 'Direct_Connected_Device' ? '35' : '40'"
                             ></uni-icons> -->
-                            <Cn-icon-device
+                            <Cn-icon-device :devType="device.devType" :runStatus="device.runStatus"
-                                :devType="device.devType"
+                                :alarmStatus="device.isAlarm ? 1 : 0"></Cn-icon-device>
-                                :runStatus="device.runStatus"
-                                :alarmStatus="device.isAlarm ? 1 : 0"
-                            ></Cn-icon-device>
                         </view>
                     </view>
                     <view class="uni-card__header-content">
                         <text class="uni-card__header-content-title uni-ellipsis">
                             {{ device.equipmentName }}
                         </text>
-                        <text class="uni-card__header-content-subtitle uni-ellipsis">
+                        <!-- <text class="uni-card__header-content-subtitle uni-ellipsis">
-                            {{ device.mac }}
+                                                       {{ device.mac }}
-                        </text>
+                        </text> -->
+                        <view class="event-desc mt4 mb8">
+                            <text>
+                                工程：{{ device.engineeringName }}
+                            </text>
+                            <text>
+                                项目：{{ device.projectName }}
+                            </text>
+                        </view>
+
                         <view class="tagBox">
-                            <text class="event-tag" :class="device.runStatus == 1 ? 'lx-tag' : 'zx-tag'">{{
+                            <text class="event-tag" :class="device.runStatus == 1 ? 'lx-tag' : 'zx-tag'">
-                                device.runStatus == 1 ? '离线' : '在线'
+                                {{ device.runStatus == 1 ? '离线' : '在线' }}
-                            }}</text>
+                            </text>
-                            <text
+                            <text class="event-tag"
-                                class="event-tag"
+                                :class="device.devType == 'Direct_Connected_Device' ? 'zl-tag' : 'jc-tag'">
-                                :class="device.devType == 'Direct_Connected_Device' ? 'zl-tag' : 'jc-tag'"
-                            >
                                 {{ device.devType == 'Direct_Connected_Device' ? '治理设备' : '监测设备' }}
                             </text>
-                            <text class="event-tag" :class="device.isPrimaryUser == 1 ? 'z-tag' : 'fx-tag'">{{
+                            <text class="event-tag" :class="device.isPrimaryUser == 1 ? 'z-tag' : 'fx-tag'">
-                                device.isPrimaryUser == 1 ? '主设备' : '分享设备'
+                                {{ device.isPrimaryUser == 1 ? '我的设备' : '他人设备' }}
-                            }}</text></view
+                            </text>
-                        >
+                        </view>
                     </view>
                 </view>
                 <view class="uni-card__header-extra" style="position: relative" @click.stop>
@@ -62,21 +59,21 @@
             </view>
             <!-- <slot name="title"></slot> -->
         </template>
-        <view class="device-body">
+        <!-- <view class="device-body">
-            <view class="device-body-item">
+           <view class="device-body-item">
-                <text>工程名称</text>
+                <text>工程</text>
                 <text>{{ device.engineeringName }}</text>
             </view>
             <view class="device-body-item mt6">
-                <text>项目名称</text>
+                <text>项目</text>
                 <text>{{ device.projectName }}</text>
             </view>
             <view class="device-body-item mt6" v-if="device.process == 2 || device.process == 3">
                 <text>调试阶段</text>
                 <text>{{ device.process == 2 ? '功能调试' : '出厂调试' }}</text>
             </view> 
-        </view>
+        </view> -->
-        <view class="pinToTop" v-if="device.isTop == 1"> 置顶 </view>
+        <view class="pinToTop" v-if="device.isTop == 1"> 置顶</view>
     </uni-card>
 </template>
 <script>
@@ -87,7 +84,8 @@ export default {
     props: {
         device: {
             type: Object,
-            default: () => {},
+            default: () => {
+            },
         },
     },
     methods: {
@@ -152,6 +150,7 @@ export default {
         line-height: 1.2;
     }
 }
+
 .uni-card {
     /deep/ .uni-card__header-box {
         display: flex;
@@ -160,25 +159,30 @@ export default {
         align-items: center;
         overflow: hidden;
     }
+
     /deep/ .uni-card__header {
         display: flex;
-        border-bottom: 2rpx #ebeef5 solid;
+        // border-bottom: 2rpx #ebeef5 solid;
         flex-direction: row;
         align-items: center;
-        padding: 20rpx 20rpx 10rpx 0;
+        padding: 20rpx  0;
         overflow: hidden;
     }
 }
+
 .uni-card .uni-card__header .uni-card__header-content .uni-card__header-content-title {
     font-size: 30rpx;
     color: #3a3a3a;
     font-weight: 700;
 }
+
 .uni-card .uni-card__header .uni-card__header-content .uni-card__header-content-subtitle {
+    margin-top: 15rpx;
     font-size: 24rpx;
     // margin-top: 5px;
     color: #666666;
 }
+
 .uni-card .uni-card__header .uni-card__header-avatar .uni-card__header-avatar-image {
     width: 40px;
     height: 40px;
@@ -186,6 +190,7 @@ export default {
     border-radius: 5px;
     margin-right: 10px;
 }
+
 .uni-card .uni-card__header .uni-card__header-content {
     display: flex;
     flex-direction: column;
@@ -193,10 +198,12 @@ export default {
     flex: 1;
     overflow: hidden;
 }
+
 .tagBox {
     display: flex;
     gap: 15rpx;
 }
+
 .event-icon {
     position: relative;
     width: 100rpx;
@@ -207,6 +214,7 @@ export default {
     align-items: center;
     margin-right: 20rpx;
 }
+
 .event-tag {
     font-size: 22rpx;
     padding: 2rpx 10rpx;
@@ -220,28 +228,34 @@ export default {
     background-color: #10b98120;
     color: #10b981;
 }
+
 .lx-tag {
     background-color: #ff3b3020;
     color: #ff3b30;
 }
+
 .z-tag {
     background-color: #2563eb20;
     color: #2563eb;
 }
+
 .fx-tag {
     background-color: #90939920;
     color: #909399;
 }
+
 .zl-tag {
     // background-color: #007aff20;
     // color: #007aff;
     background-color: #007aff20;
     color: #007aff;
 }
+
 .jc-tag {
     background-color: #007aff20;
     color: #007aff;
 }
+
 .pinToTop {
     background-color: $uni-theme-color;
     width: 100rpx;
@@ -261,4 +275,16 @@ export default {
     transform: rotate(45deg) translate(50rpx, -10rpx);
     transform-origin: top right;
 }
+
+.event-desc {
+    display: flex;
+    flex-direction: column;
+    gap: 8rpx;
+}
+
+.event-desc text {
+    font-size: 24rpx;
+    color: #666666;
+    line-height: 1.2;
+}
 </style>

components/Cn-filterInformation/Cn-filterInformation.vue

@@ -0,0 +1,234 @@
+<template>
+    <view class="nav choose">
+        <view class="nav-menu nav-menu1" @click="selectEngineering" v-if="showQianTree">
+            <view class="nav-text">
+                {{ lineDisplayText }}
+            </view>
+
+            <uni-icons type="bottom" size="14"></uni-icons>
+        </view>
+        <view class="nav-menu nav-menu1" @click="selectEngineering" v-if="showQianTree">
+            <view class="nav-text">
+                {{
+                    '指标配置'
+                }}
+            </view>
+
+            <uni-icons type="bottom" size="14"></uni-icons>
+        </view>
+        <!-- 弹框组件 -->
+        <Cn-MultipleTree ref="qiantree" :selectParent="true" :multiple="true" :range="list" :foldAll="true"
+            @confirm="treeConfirm" @cancel="treeCancel"></Cn-MultipleTree>
+
+
+
+        <slot />
+    </view>
+</template>
+<script>
+import { lineTree } from '@/common/api/device'
+export default {
+    components: {},
+    props: {
+        level: { type: Number, default: 3 },
+
+        singleChoice: { type: Boolean, default: false },
+        showQianTree: { type: Boolean, default: true },
+    },
+    data() {
+
+        return {
+            select: {
+                lineList: []//监测点id
+            },
+            list: [],
+        }
+    },
+    created() { },
+    onShow() { },
+
+    mounted() { },
+
+    methods: {
+        getTree() {
+            this.clear()
+            lineTree().then((res) => {
+                let list = {}
+                // if (this.singleChoice) {
+                //     let result = this.findFirstLevel(res.data)
+
+                // } else {
+                //     list = {
+                //         id: '',
+                //         pid: '0',
+                //         pids: '0',
+                //         name: '全部工程',
+                //         path: null,
+                //         provinceId: null,
+                //         cityId: null,
+                //         area: null,
+                //         remark: null,
+                //         sort: 0,
+                //         level: 0,
+                //         comFlag: null,
+                //         type: null,
+                //         lineType: null,
+                //         conType: null,
+                //         process: null,
+                //         isTop: 0,
+                //         children: [],
+                //         ndid: null,
+                //     }
+                // }
+
+                this.list = this.filterTreeByLevel(this.singleChoice ? res.data : [...res.data])
+                // this.findFirstLevel( this.list)
+            })
+        },
+        // 递归过滤函数：去除level > 2的节点
+        filterTreeByLevel(tree) {
+            // 遍历每一个节点
+            return tree.map((node) => {
+                // 复制当前节点（避免修改原数据）
+                const newNode = { ...node }
+
+                // 如果当前节点有子节点，并且当前节点的level <= 2（因为level=2的节点的子节点是level=3，需要过滤）
+                if (newNode.children && newNode.children.length > 0) {
+                    // 递归过滤子节点：只保留子节点中level <= 2的
+                    newNode.children = this.filterTreeByLevel(
+                        newNode.children.filter((child) => child.level <= this.level),
+                    )
+                }
+
+                return newNode
+            })
+        },
+
+
+
+        selectEngineering() {
+            this.$refs.qiantree._show()
+        },
+
+        // 确定回调事件
+        treeConfirm(e) {
+            this.select.lineList = e.filter(item => item.rank == 3)
+        },
+        // 清空
+        clear() {
+            this.select.lineList = []//监测点id
+        },
+
+
+        // 取消回调事件
+        treeCancel(e) {
+            console.log(e)
+        },
+        findFirstLevel(list, parents = []) {
+            for (const item of list) {
+                // 当前就是 level=3
+                if (item.level === 3) {
+                    return {
+                        node: item, // 第一个 level=3
+                        parents: parents, // 它的所有上级
+                    }
+                }
+
+                // 递归子节点
+                if (item.children && item.children.length) {
+                    const res = this.findFirstLevel(item.children, [...parents, item])
+                    if (res) return res // 找到直接返回，不再循环
+                }
+            }
+            return null
+        },
+    },
+
+    computed: {
+        lineDisplayText() {
+            const list = this.select.lineList || []
+            if (!list.length) {
+                return '筛选监测点'
+            }
+            const text = list
+                .map((item) => item.name)
+                .filter(Boolean)
+                .join('、')
+            if (text.length > 8) {
+                return text.slice(0, 8) + '...'
+            }
+            return text
+        },
+    },
+
+    watch: {
+        select: {
+            handler(val, oldVal) {
+                console.log("🚀 ~ val:", val)
+                if (this.loading) return
+                this.$emit('select', val)
+            },
+            deep: true,
+            immediate: true,
+        },
+        level: {
+            handler(val, oldVal) {
+                this.getTree()
+            },
+            deep: true,
+            immediate: true,
+        },
+        // showDatetime: {
+        //     handler(val, oldVal) {
+        //         if (val == false) {
+
+        //             console.log("🚀 ~  this.select.range:",  this.select.range)
+        //         }
+        //     },
+        //     deep: true,
+        // },
+    },
+}
+</script>
+<style lang="scss" scoped>
+/deep/ .uni-date-editor {
+    width: 360rpx;
+}
+
+.nav-menu {
+    display: flex;
+    align-items: center;
+}
+
+// .nav-menu1 {
+//     max-width: calc(100vw - 150px);
+//     overflow: hidden !important;
+//     -webkit-line-clamp: 1;
+//     display: -webkit-box;
+//     -webkit-box-orient: vertical;
+//     text-overflow: ellipsis;
+//     word-break: break-all;
+//     white-space: nowrap;
+// }
+.nav-menu1 {
+    display: flex;
+    align-items: center;
+    max-width: calc(100vw - 150px);
+}
+
+/* 文字容器：单行溢出省略 */
+.nav-text {
+    flex: 1;
+    overflow: hidden;
+    white-space: nowrap;
+    /* 强制不换行 */
+    text-overflow: ellipsis;
+    // -webkit-line-clamp: 1;
+    // display: -webkit-box;
+    // -webkit-box-orient: vertical;
+    // text-overflow: ellipsis;
+    // word-break: break-all;
+    // white-space: nowrap;
+    line-height: 1;
+}
+</style>

components/Cn-icon-transient/Cn-icon-transient.vue

@@ -1,45 +1,45 @@
 <template>
-    <view v-html="svgHtml" class="svg-container"></view>
+  <view v-html="svgHtml" class="svg-container"></view>
 </template>
 
 <script>
 export default {
-    props: {
+  props: {
-        // 父组件传递的参数
+    // 父组件传递的参数
-        name: {
+    name: {
-            type: String,
+      type: String,
-            default: '',
+      default: '',
-        },
     },
-    data() {
+  },
-        return {}
+  data() {
-    },
+    return {}
-    computed: {
+  },
-        svgHtml() {
+  computed: {
-            if (this.name == '电压暂降') {
+    svgHtml() {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
+      if (this.name == '电压暂降') {
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
   <path d="M8,50 L15,50 L18,38 L21,28 L24,38 L27,50 L30,62 L33,72 L36,62 L39,50 L42,38 L45,28 L48,38 L51,50 L54,56 L56,54 L58,55 L60,54 L63,56 L66,60 L68,62 L70,60 L72,56 L75,54 L77,52 L79,54 L81,56 L84,50 L87,38 L90,28 L93,38 L96,50" fill="none" stroke="#2563eb" stroke-width="4"/>
 </svg>`
-            } else if (this.name == '电压暂升') {
+      } else if (this.name == '电压暂升') {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
   <path d="M8,50 L15,50 L18,38 L21,28 L24,38 L27,50 L30,62 L33,72 L36,62 L39,50 L42,38 L45,28 L48,38 L51,50 L54,43 L56,34 L58,26 L60,34 L63,43 L66,54 L68,60 L70,54 L72,43 L75,34 L77,26 L79,34 L81,43 L84,50 L87,38 L90,28 L93,38 L96,50" fill="none" stroke="#e6a23c" stroke-width="4"/>
 </svg>`
-            } else if (this.name == '电压中断') {
+      } else if (this.name == '电压中断') {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
   <path d="M8,50 L15,50 L18,38 L21,28 L24,38 L27,50 L30,62 L33,72 L36,62 L39,50 L42,38 L45,28 L48,38 L51,50 L54,50 L57,50 L60,50 L63,50 L66,50 L69,50 L72,50 L75,50 L78,50 L81,50 L84,50 L87,38 L90,28 L93,38 L96,50" fill="none" stroke="#6b7280" stroke-width="4"/>
 </svg>`
-            } else if (this.name == '瞬态') {
+      } else if (this.name == '瞬态') {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
   <path d="M8,50 L15,50 L18,38 L21,28 L24,38 L27,50 L30,62 L33,72 L36,62 L39,50 L42,38 L45,28 L48,38 L51,50 L53,50 L55,50 L57,20 L59,50 L61,50 L63,50 L66,60 L68,62 L70,60 L72,56 L75,54 L77,52 L79,54 L81,56 L84,50 L87,38 L90,28 L93,38 L96,50" fill="none" stroke="#8b5cf6" stroke-width="4"/>
 
 </svg>`
-            } else if (this.name == '未知') {
+      } else if (this.name == '未知') {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
   <path d="M8,50 L15,50 L18,38 L21,28 L24,38 L27,50 L30,62 L33,72 L36,62 L39,50 L42,38 L45,28 L48,38 L51,50 L54,56 L56,54 L58,55 L60,54 L63,56 L66,60 L68,62 L70,60 L72,56 L75,54 L77,52 L79,54 L81,56 L84,50 L87,38 L90,28 L93,38 L96,50" fill="none" stroke="#6b7280" stroke-width="4"/>
   <text x="50" y="82" text-anchor="middle" font-size="18" fill="#6b7280" font-family="Arial, sans-serif" font-weight="bold">?</text>
 </svg>`
-            } else if (this.name == '稳态越限') {
+      } else if (this.name == '稳态越限') {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">
   <!-- Limit line -->
   <line x1="5" y1="40" x2="95" y2="40" stroke="#e6a23c" stroke-width="2" stroke-dasharray="4,4"/>
   
@@ -70,14 +70,14 @@ export default {
     </marker>
   </defs>
 </svg>`
-            } else if (this.name == '运行告警') {
+      } else if (this.name == '运行告警') {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="40" height="40">
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="40" height="40">
   <path d="M78.43 4H20.06C9.48 4 1.16 12.33 1.16 22.9v38.37c0 10.57 8.32 18.9 18.9 18.9h26.49v7.27H25.77v7.41h47.96v-7.41H53.96v-7.27h26.47c10.58 0 18.9-8.33 18.9-18.9V22.9c0-10.57-8.32-18.9-18.9-18.9z m11.49 57.27c0 6.33-5.14 11.49-11.49 11.49H20.06c-6.34 0-11.49-5.15-11.49-11.49V22.9c0-6.33 5.14-11.49 11.49-11.49h59.37c6.34 0 11.49 5.15 11.49 11.49v38.37z" fill="#007aff"/>
   <line x1="50" y1="28" x2="50" y2="50" stroke="#007aff" stroke-width="6" stroke-linecap="round"/>
   <circle cx="50" cy="62" r="4" fill="#007aff"/>
 </svg>`
-            } else if (this.name == '治理设备') {
+      } else if (this.name == '治理设备') {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="38" height="38">
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="38" height="38">
   <rect x="0" y="0" width="100" height="100" rx="8" ry="8" fill="#007aff30" stroke="#007aff" stroke-width="2"/>
   <rect x="8" y="8" width="84" height="84" rx="4" ry="4" fill="#FFFFFF" stroke="#007aff" stroke-width="1.5"/>
   <rect x="10" y="12" width="80" height="16" rx="2" ry="2" fill="#007aff30" stroke="#CCC" stroke-width="0.8"/>
@@ -95,8 +95,8 @@ export default {
   <circle cx="86" cy="69" r="2" fill="#007aff"/>
   <polygon points="88,65 86,70 84,65" fill="#007aff" opacity="0.7"/>
 </svg>`
-            } else if (this.name == '监测设备') {
+      } else if (this.name == '监测设备') {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="38" height="38">
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="38" height="38">
   <style>
     text { font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif; }
   </style>
@@ -119,8 +119,8 @@ export default {
   <text x="54" y="65" font-size="7" fill="#007aff">Ic: 125.1A</text>
 
 </svg>`
-            } else if (this.name == '报告') {
+      } else if (this.name == '报告') {
-                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="47" height="47">
+        return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="37" height="37">
   <path d="M12,12 L78,12 L88,22 L88,88 L12,88 Z" fill="none" stroke="#007aff" stroke-width="4" stroke-linejoin="round"/>
   <path d="M78,12 L78,22 L88,22" fill="none" stroke="#007aff" stroke-width="4" stroke-linejoin="round"/>
   <polyline points="20,50 26,50 28,46 30,42 32,46 34,50 36,54 38,58 40,54 42,50 44,46 46,42 48,46 50,50 56,50" fill="none" stroke="#007aff" stroke-width="4" stroke-linecap="round"/>
@@ -129,18 +129,20 @@ export default {
   <circle cx="70" cy="68" r="9" fill="none" stroke="#007aff" stroke-width="4"/>
   <line x1="76" y1="74" x2="86" y2="84" stroke="#007aff" stroke-width="4" stroke-linecap="round"/>
 </svg>`
-            }
+      } else if (this.name == '监测点') {
-        },
+        return `<svg t="1779762122379" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3577" width="33" height="33"><path d="M875.17148 230.296136c30.706152 56.294611 46.059227 122.824606 46.059227 194.472293 0 107.47153-40.941535 209.825369-107.47153 286.590748 0 0 0 5.117692-5.117692 5.117692l-261.002288 286.590748c0 5.117692-5.117692 10.235384-5.117692 10.235383-15.353076 10.235384-30.706152 15.353076-46.059227 5.117692-5.117692 0-10.235384-5.117692-15.353076-10.235384v-5.117691L209.87153 716.476869s-5.117692-5.117692-5.117692-10.235384c-66.529995-76.765379-102.353838-174.001525-102.353838-281.473056C102.4 189.354601 286.636909 0 511.815354 0c81.883071 0 153.530758 25.58846 220.060752 66.529995 5.117692 0 5.117692 5.117692 10.235384 5.117692h5.117692c46.059227 35.823843 81.883071 81.883071 112.589222 133.05999 10.235384 5.117692 15.353076 15.353076 15.353076 25.588459z m-163.766141-92.118454c-5.117692 0-10.235384-5.117692-15.353076-10.235384-51.176919-35.823843-112.589222-56.294611-179.119217-56.294611-189.354601 0-337.767667 158.64845-337.767667 353.120742 0 92.118455 30.706152 174.001525 87.000762 235.413829l20.470768 20.470767 20.470768 20.470768 143.295374 153.530758L511.815354 931.41993l71.647687-76.765379 143.295373-153.530758 5.117692-5.117692 35.823844-40.941535c0-5.117692 5.117692-5.117692 10.235384-5.117692 51.176919-61.412303 81.883071-143.295374 81.88307-230.296136-5.117692-112.589222-66.529995-214.943061-148.413065-281.473056z m-199.589985 460.592273c-92.118455 0-163.766141-76.765379-163.766142-174.001526C348.049212 332.649975 419.696899 255.884596 511.815354 255.884596c92.118455 0 163.766141 76.765379 163.766141 174.001525 0 92.118455-71.647687 168.883833-163.766141 168.883834z m0-271.237672c-51.176919 0-97.236146 46.059227-97.236147 102.353838s46.059227 102.353838 97.236147 102.353839c51.176919 0 97.236146-46.059227 97.236146-102.353839s-46.059227-102.353838-97.236146-102.353838z" fill="#007aff" p-id="3578"></path></svg>`
+      }
     },
-    methods: {},
+  },
+  methods: {},
 }
 </script>
 
 <style scoped>
 .svg-container {
-    width: 100rpx;
+  width: 100rpx;
-    display: flex;
+  display: flex;
-    justify-content: center;
+  justify-content: center;
-    align-items: center;
+  align-items: center;
 }
 </style>

manifest.json

@@ -139,7 +139,8 @@
                 "/api" : {
                     "https" : true,
                     // "target" : "https://pqmcn.com:8092/api",
-                    "target" : "http://192.168.1.103:10215",
+                    // "target" : "http://192.168.1.103:10215",
+					"target" : "http://192.168.1.103:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""

pages.json

@@ -121,6 +121,19 @@
                 "navigationBarTitleText": "个性化推荐"
             }
         },
+
+        {
+            "path": "pages/index/comp/monitoringPoint",
+            "style": {
+                "navigationBarTitleText": "监测点电能质量信息"
+            }
+        },
+        {
+            "path": "pages/index/comp/targetInfo",
+            "style": {
+                "navigationBarTitleText": "指标详情"
+            }
+        },
         {
             "path": "pages/mine/system",
             "style": {
@@ -420,6 +433,7 @@
                 "navigationBarTitleText": "关注工程配置"
             }
         },
+  
         {
             "path": "pages/mine/serverSetting",
             "style": {

pages/device/APF/comp/IO.vue

@@ -6,20 +6,16 @@
                 <view class="grid-card-title">温度</view>
                 <view class="grid-card-content-4">
                     <template v-for="item in renderData">
-                        <view class="item item-title"
+                        <view class="item item-title">{{ item[0].clDid }}
-                            >{{ item[0].clDid }}
                             <template v-if="item[0].clDid"> (°C)</template>
                         </view>
-                        <view class="item item-title"
+                        <view class="item item-title">{{ item[1].clDid }}
-                            >{{ item[1].clDid }}
                             <template v-if="item[1].clDid"> (°C)</template>
                         </view>
-                        <view class="item item-title"
+                        <view class="item item-title">{{ item[2].clDid }}
-                            >{{ item[2].clDid }}
                             <template v-if="item[2].clDid"> (°C)</template>
                         </view>
-                        <view class="item item-title"
+                        <view class="item item-title">{{ item[3].clDid }}
-                            >{{ item[3].clDid }}
                             <template v-if="item[3].clDid"> (°C)</template>
                         </view>
                         <view class="item">{{ item[0].clDid ? Math.round(item[0].value) || '-' : '' }}</view>
@@ -30,27 +26,21 @@
                 </view>
             </view>
             <!-- 运维管理员、工程用户 可看 -->
-            <view
+            <view class="grid-card"
-                class="grid-card"
+                v-if="(userInfo.authorities == 'operation_manager' || userInfo.authorities == 'engineering_user') && moduleData.length > 0">
-                v-if="userInfo.authorities == 'operation_manager' || userInfo.authorities == 'engineering_user'"
-            >
                 <view class="grid-card-title">状态</view>
                 <view class="grid-card-content-4">
                     <template v-for="(item, index) in moduleData">
-                        <view class="item item-title"
+                        <view class="item item-title">{{ item[0].moduleName }}
-                            >{{ item[0].moduleName }}
                             <template v-if="item[0].moduleName"></template>
                         </view>
-                        <view class="item item-title"
+                        <view class="item item-title">{{ item[1].moduleName }}
-                            >{{ item[1].moduleName }}
                             <template v-if="item[1].moduleName"></template>
                         </view>
-                        <view class="item item-title"
+                        <view class="item item-title">{{ item[2].moduleName }}
-                            >{{ item[2].moduleName }}
                             <template v-if="item[2].moduleName"></template>
                         </view>
-                        <view class="item item-title"
+                        <view class="item item-title">{{ item[3].moduleName }}
-                            >{{ item[3].moduleName }}
                             <template v-if="item[3].moduleName"></template>
                         </view>
                         <!-- <uni-tag :text="item[0].moduleState" :type=" item[0].moduleState=='离线'?'error' : 'success'" /> -->
@@ -101,6 +91,7 @@ export default {
     computed: {
         renderData() {
             let arr = []
+
             // 把IOData转换成每4个一组的二维数组
             for (let i = 0; i < this.IOData.length; i += 4) {
                 this.IOData.slice(i, i + 4).forEach((item) => {
@@ -120,7 +111,6 @@ export default {
                     }
                 }
             })
-            console.warn(arr)
             return arr
         },
         moduleData() {
@@ -159,6 +149,5 @@ export default {
 }
 </script>
 <style lang="scss">
-.basic {
+.basic {}
-}
 </style>

pages/device/APF/comp/basic.vue

@@ -1,6 +1,7 @@
 <template>
     <view>
-        <uni-load-more status="loading" v-if="basicData.length == 0"></uni-load-more>
+        <uni-load-more status="loading"
+            v-if="renderData.电网电流.length == 0 || renderData.电网电压.length == 0 || renderData.负载电流.length == 0 || renderData.补偿电流.length == 0 "></uni-load-more>
         <view class="basic" v-else>
             <view class="grid-card">
                 <view class="grid-card-title">电网电流</view>
@@ -12,10 +13,10 @@
                         <view class="item">{{ item.phase }}</view>
                         <view class="item">{{
                             item['Apf_RmsI_Sys(A)'] > 0 ? item['Apf_RmsI_Sys(A)'].toFixed(2) : item['Apf_RmsI_Sys(A)']
-                        }}</view>
+                            }}</view>
                         <view class="item">{{
                             item['Apf_ThdA_Sys(%)'] > 0 ? item['Apf_ThdA_Sys(%)'].toFixed(2) : item['Apf_ThdA_Sys(%)']
-                        }}</view>
+                            }}</view>
                     </template>
                 </view>
             </view>
@@ -30,13 +31,13 @@
                         <view class="item">{{ item.phase }}</view>
                         <view class="item">{{
                             item['Apf_PhV_Sys(V)'] > 0 ? item['Apf_PhV_Sys(V)'].toFixed(2) : item['Apf_PhV_Sys(V)']
-                        }}</view>
+                            }}</view>
                         <view class="item">{{
                             item['Apf_Freq(Hz)'] > 0 ? item['Apf_Freq(Hz)'].toFixed(2) : item['Apf_Freq(Hz)']
-                        }}</view>
+                            }}</view>
                         <view class="item">{{
                             item['Apf_ThdU_Sys(%)'] > 0 ? item['Apf_ThdU_Sys(%)'].toFixed(2) : item['Apf_ThdU_Sys(%)']
-                        }}</view>
+                            }}</view>
                     </template>
                 </view>
             </view>
@@ -73,15 +74,15 @@
                             item['Apf_RmsI_TolOut(A)'] == 3.1415926
                                 ? '-'
                                 : item['Apf_RmsI_TolOut(A)'] > 0
-                                  ? item['Apf_RmsI_TolOut(A)'].toFixed(2)
+                                    ? item['Apf_RmsI_TolOut(A)'].toFixed(2)
-                                  : item['Apf_RmsI_TolOut(A)']
+                                    : item['Apf_RmsI_TolOut(A)']
                         }}</view>
                         <view class="item">{{
                             item['load_Rate'] == 3.1415926
                                 ? '-'
                                 : item['load_Rate'] > 0
-                                  ? item['load_Rate'].toFixed(2)
+                                    ? item['load_Rate'].toFixed(2)
-                                  : item['load_Rate']
+                                    : item['load_Rate']
                         }}</view>
                     </template>
                 </view>
@@ -179,6 +180,5 @@ export default {
 }
 </script>
 <style lang="scss">
-.basic {
+.basic {}
-}
 </style>

pages/device/APF/comp/power.vue

@@ -1,6 +1,6 @@
 <template>
     <view>
-        <uni-load-more status="loading" v-if="basicData.length == 0"></uni-load-more>
+        <uni-load-more status="loading" v-if="renderData.电网侧.length == 0 || renderData.负载侧.length == 0"></uni-load-more>
         <view class="basic" v-else>
             <view class="grid-card">
                 <view class="grid-card-title">电网侧</view>
@@ -12,14 +12,14 @@
                     <view class="item item-title">功率因数</view>
                     <template v-for="(item, index) in renderData.电网侧">
                         <view class="item">{{ item.phase }}</view>
-                        <view class="item"
+                        <view class="item">{{ item['Apf_P_Sys(W)'] == '-' ? '-' : (item['Apf_P_Sys(W)'] /
-                            >{{ item['Apf_P_Sys(W)'] == '-' ? '-' : (item['Apf_P_Sys(W)'] / 1000).toFixed(2) }}
+                            1000).toFixed(2) }}
                         </view>
-                        <view class="item"
+                        <view class="item">{{ item['Apf_Q_Sys(Var)'] == '-' ? '-' : (item['Apf_Q_Sys(Var)'] /
-                            >{{ item['Apf_Q_Sys(Var)'] == '-' ? '-' : (item['Apf_Q_Sys(Var)'] / 1000).toFixed(2) }}
+                            1000).toFixed(2) }}
                         </view>
-                        <view class="item"
+                        <view class="item">{{ item['Apf_S_Sys(VA)'] == '-' ? '-' : (item['Apf_S_Sys(VA)'] /
-                            >{{ item['Apf_S_Sys(VA)'] == '-' ? '-' : (item['Apf_S_Sys(VA)'] / 1000).toFixed(2) }}
+                            1000).toFixed(2) }}
                         </view>
                         <view class="item">{{ item['Apf_PF_Sys(null)'] || '-' }}</view>
                     </template>
@@ -35,14 +35,14 @@
                     <view class="item item-title">功率因数</view>
                     <template v-for="(item, index) in renderData.负载侧">
                         <view class="item">{{ item.phase }}</view>
-                        <view class="item"
+                        <view class="item">{{ item['Apf_P_Load(W)'] == '-' ? '-' : (item['Apf_P_Load(W)'] /
-                            >{{ item['Apf_P_Load(W)'] == '-' ? '-' : (item['Apf_P_Load(W)'] / 1000).toFixed(2) }}
+                            1000).toFixed(2) }}
                         </view>
                         <view class="item">{{
                             item['Apf_Q_Load(Var)'] == '-' ? '-' : (item['Apf_Q_Load(Var)'] / 1000).toFixed(2)
-                        }}</view>
+                            }}</view>
-                        <view class="item"
+                        <view class="item">{{ item['Apf_S_Load(VA)'] == '-' ? '-' : (item['Apf_S_Load(VA)'] /
-                            >{{ item['Apf_S_Load(VA)'] == '-' ? '-' : (item['Apf_S_Load(VA)'] / 1000).toFixed(2) }}
+                            1000).toFixed(2) }}
                         </view>
                         <view class="item">{{ item['Apf_PF_Load(null)'] || '-' }}</view>
                     </template>
@@ -130,6 +130,5 @@ export default {
 }
 </script>
 <style lang="scss">
-.basic {
+.basic {}
-}
 </style>

pages/device/APF/detail.vue

@@ -5,18 +5,10 @@
                 <view class="detail-header">
                     <Cn-htmlToImg domId="header" @renderFinish="renderFinish">
                         <view class="header" id="header" ref="header" @click="previewImg">
-                            <img
+                            <img :src="topoImg" style="width: 375px; display: block" mode="widthFix"
-                                :src="topoImg"
+                                @load="domLoading = false" />
-                                style="width: 375px; display: block"
+                            <view class="point" :style="{ left: item.lat + 'px', top: item.lng + 'px' }"
-                                mode="widthFix"
+                                v-for="(item, index) in topolodyData" :key="index">
-                                @load="domLoading = false"
-                            />
-                            <view
-                                class="point"
-                                :style="{ left: item.lat + 'px', top: item.lng + 'px' }"
-                                v-for="(item, index) in topolodyData"
-                                :key="index"
-                            >
                                 <view class="grid-card mt10" style="width: fit-content">
                                     <view class="grid-card-content-1">
                                         <view class="item">{{ item.label }}</view>
@@ -51,13 +43,9 @@
                         <text class="ml10">设备状态</text>
                     </view> -->
                     <view class="nav" style="margin-top: -10rpx">
-                        <view
+                        <view class="nav-menu" :class="{ 'nav-menu-active': navMenuActive == index }"
-                            class="nav-menu"
+                            v-for="(item, index) in navMenuList" :key="index" @click="navMenuClick(index)">{{ item.text
-                            :class="{ 'nav-menu-active': navMenuActive == index }"
+                            }}
-                            v-for="(item, index) in navMenuList"
-                            :key="index"
-                            @click="navMenuClick(index)"
-                            >{{ item.text }}
                         </view>
                     </view>
                 </view>
@@ -107,22 +95,10 @@
                 </uni-popup> -->
                 <!-- 输入框示例 -->
                 <uni-popup ref="inputDialog" type="dialog">
-                    <uni-popup-dialog
+                    <uni-popup-dialog ref="inputClose" type="info" mode="input" :title="dialogType" value="对话框预置提示内容!"
-                        ref="inputClose"
+                        placeholder="请输入内容" @confirm="dialogInputConfirm">
-                        type="info"
+                        <uni-easyinput type="textarea" :maxlength="250" autoHeight v-model="remarkContent"
-                        mode="input"
+                            placeholder="请输入备注"></uni-easyinput>
-                        :title="dialogType"
-                        value="对话框预置提示内容!"
-                        placeholder="请输入内容"
-                        @confirm="dialogInputConfirm"
-                    >
-                        <uni-easyinput
-                            type="textarea"
-                            :maxlength="250"
-                            autoHeight
-                            v-model="remarkContent"
-                            placeholder="请输入备注"
-                        ></uni-easyinput>
                     </uni-popup-dialog>
                 </uni-popup>
             </view>
@@ -140,6 +116,7 @@ import { manualAccess } from '@/common/api/accessBoot'
 import { MQTT_IP, MQTT_OPTIONS } from '@/common/js/mqtt.js'
 import mqtt from 'mqtt/dist/mqtt.js'
 import { base64ToPath, pathToBase64 } from 'image-tools'
+import { queryByCode, queryStatistical } from '@/common/api/dictionary'
 import hoverMenu from '@/hover-menu/components/hover-menu/hover-menu.vue'
 export default {
     components: {
@@ -164,6 +141,7 @@ export default {
             navHeight: 0,
             img: '',
             topoImg: '',
+            targetLists: [],
             navMenuList: [
                 {
                     text: '基本',
@@ -177,9 +155,6 @@ export default {
                     text: '功率',
                     id: 'a16aceae7d1565bf9f94dd7410cf9bce',
                 },
-                // {
-                //     text: '波形',
-                // },
                 {
                     text: '其他',
                 },
@@ -358,11 +333,21 @@ export default {
                 },
             })
         },
-        init() {
+
+        getTarget() {
+            return queryByCode('app_harmonic_code').then((res) => {
+                return queryStatistical({ id: res.data.id }).then((resp) => {
+                    this.targetLists = resp.data.selectedList
+                })
+            })
+        },
+
+        async init() {
             console.log('init')
             this.loading = true
             this.domLoading = true
-            queryTopologyDiagram(this.devId).then((res) => {
+
+            await queryTopologyDiagram(this.devId).then((res) => {
                 res.data.filePath = this.$config.static + res.data.filePath
                 this.deviceInfo = res.data
                 this.downloadImg()
@@ -371,6 +356,7 @@ export default {
                     let index = this.deviceInfo.appsLineTopologyDiagramPO?.findIndex((element) => {
                         element.label = element.name
                         item.label = element.name
+                        item.target = element.target
                         return element.linePostion === item.linePostion
                     })
                     if (index > -1) {
@@ -384,10 +370,14 @@ export default {
                 })
                 console.log(this.topolodyData)
                 if (this.client) {
+                    this.client.publish(`/zl/askDevData/${this.devId}/${this.navMenuList[0].id}`)
                     this.loading = false
                 } else {
                     this.initMqtt(this.navMenuList[0].id)
                 }
+                console.log("🚀 ~ this.client:", this.client)
+
+
             })
         },
         renderFinish(e) {
@@ -460,22 +450,28 @@ export default {
                     console.log('连接断开')
                 })
                 .on('message', (topic, message) => {
-                    console.log('接收推送信息：', JSON.parse(message.toString()), topic)
+                    // console.log('接收推送信息：', JSON.parse(message.toString()), topic)
-                    console.log('🚀 ~ .on ~ topic:', topic)
+                    // console.log('🚀 ~ .on ~ topic:', topic)
 
                     if (topic === `/zl/devData/${this.devId}/${id}`) {
+
+                        const data = JSON.parse(message.toString())
+                        if (Array.isArray(data) && !data.length) return
+
                         if ((!message.toString() || message.toString().length < 10) && this.loading) {
                             this.$util.toast('该设备暂无数据')
                         }
                         this.loading = false
-                        this.handlerData(JSON.parse(message.toString()))
+                        this.handlerData(data)
                     } else if (topic === `/zl/TemperData/${this.devId}`) {
+                        const data = JSON.parse(message.toString())
+                        if (Array.isArray(data) && !data.length) return
                         // this.basicData.forEach((item) => {
                         //     if (item.statisticalName === '温度' && item.phase === 'avg') {
                         //         item.statisticalData = message.toString()
                         //     }
                         // })
-                        this.IOData = JSON.parse(message.toString())
+                        this.IOData = data
                         // this.IOData = this.IOData.filter((item) => item.value !== 0)
                         this.IOData.forEach((item) => {
                             if (!item.value) {
@@ -490,37 +486,60 @@ export default {
                 })
         },
 
-        handlerData(data) {
+        async handlerData(data) {
             this.basicData = data
 
             this.topolodyData.forEach((element) => {
                 let arr = []
+                let list = this.targetLists.filter(key => key.dataType == element.target)
 
-                element.showKey.forEach((key) => {
+                if (list.length > 0) {
+                    let id = list[0]?.eleEpdPqdVOS.filter(key => key.phase == 'A')[0]?.id || ''
                     data.forEach((item) => {
-                        if (item.statisticalName === key && item.phase === 'avg') {
+                        if (item.statisticalIndex === id && item.phase === 'avg') {
-                            if (key === 'Apf_RmsI_TolOut(A)') {
+
-                                arr.push({
+                            arr.push({
-                                    label: '总输出电流:',
+                                label: list[0].dataTypeName.split('-')[1] + ':',
-                                    value: Math.round(item.statisticalData) + 'A',
+                                value: (item.statisticalData) + `${item.unit || ''}`,
-                                })
+                            })
-                            } else {
+
-                                arr.push({
-                                    label: '电流畸变率:',
-                                    value: Math.round(item.statisticalData) + '%',
-                                })
-                                // arr.push('电流畸变率:' + item.statisticalData + '%')
-                            }
                         }
                         if (item.time) {
                             this.dataTime = item.time.seconds
                             this.time = this.$util.parseTime(this.dataTime - 8 * 60 * 60)
-                            // console.log(11111111,this.dataTime);
                         }
+
                     })
-                })
+                }
+                else {
+                    element.showKey.forEach((key) => {
+                        data.forEach((item) => {
+                            if (item.statisticalName === key && item.phase === 'avg') {
+                                if (key === 'Apf_RmsI_TolOut(A)') {
+                                    arr.push({
+                                        label: '总输出电流:',
+                                        value: (item.statisticalData) + 'A',
+                                    })
+                                } else {
+                                    arr.push({
+                                        label: '电流畸变率:',
+                                        value: (item.statisticalData) + '%',
+                                    })
+                                }
+                            }
+                            if (item.time) {
+                                this.dataTime = item.time.seconds
+                                this.time = this.$util.parseTime(this.dataTime - 8 * 60 * 60)
+                            }
+                        })
+                    })
+                }
+
+
                 element.value = arr
             })
+            console.log("🚀 ~  this.topolodyData:", this.topolodyData)
+
             console.log(this.topolodyData)
             this.$forceUpdate()
         },
@@ -539,13 +558,16 @@ export default {
         }, 1000)
     },
 
-    onLoad(options) {
+    async onLoad(options) {
+        await this.getTarget()
+
         this.pageOptions = options
         this.device = JSON.parse(options.device)
-        console.log('🚀 ~ options:', options)
+
         this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
         this.devId = options.id
         this.isPrimaryUser = options.isPrimaryUser
+
         if (this.pageOptions.process == 2 || this.pageOptions.process == 3) {
             this.content.splice(
                 0,
@@ -588,7 +610,7 @@ export default {
                     })
                 }
             }
-            if (this.userInfo.authorities !== 'tourist') {
+            if (this.userInfo.authorities !== 'tourist' && this.device.isPrimaryUser === '1') {
                 this.content.splice(0, 0, {
                     iconPath: '/static/subordinate.png',
                     text: '用户',
@@ -626,9 +648,11 @@ export default {
                     lng: '',
                     showKey: item.showKey, //要展示的指标key
                     value: [],
+                    target: item.target
                 }
             })
         })
+
         this.init()
     },
 }
@@ -636,6 +660,7 @@ export default {
 
 <style lang="scss">
 .detail {
+
     // background: $uni-theme-white;
     .header-bg {
         position: absolute;
@@ -666,7 +691,7 @@ export default {
             z-index: 2;
             text-align: center;
             color: #111;
-            width: 110rpx;
+            width: 150rpx;
             font-size: 16rpx;
             opacity: 0.8;
 

pages/device/APF/report.vue

@@ -19,8 +19,8 @@
                     <view class="content-item-header-right">
                         <view class="content-item-header-right-title">{{ item.equipmentName }}</view>
 
-                        <view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view>
+                        <view class="content-item-header-right-des">工程：{{ item.engineeringName }}</view>
-                        <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
+                        <view class="content-item-header-right-des">项目：{{ item.projectName }}</view>
 
                     </view>
                     <view class="ml10" v-if="type === '0' || item.status != '1'">

pages/device/edit.vue

@@ -5,7 +5,7 @@
                 <uni-forms>
                     <uni-forms-item label="设备识别码">
                         <view style="display: flex">
-                            <uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码"/>
+                            <uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码" />
                             <!-- <uni-icons
                                 type="camera"
                                 color="#007aff"
@@ -25,13 +25,8 @@
             <view class="content">
                 <uni-forms>
                     <uni-forms-item label="项目">
-                        <uni-data-select
+                        <uni-data-select v-model="formData.projectId" :localdata="projectRange"
-                            v-model="formData.projectId"
+                            @change="queryTopologyDiagramPage" disabled :clear="false"></uni-data-select>
-                            :localdata="projectRange"
-                            @change="queryTopologyDiagramPage"
-                            disabled
-                            :clear="false"
-                        ></uni-data-select>
                     </uni-forms-item>
                     <!-- <uni-forms-item label="型号">
                         <uni-data-select v-model="formData.type" :localdata="typeRange"
@@ -41,26 +36,17 @@
                         <view style="display: flex">
                             <view style="flex: 1">
                                 <view v-if="formData.topologyDiagramUrl">
-                                    <image :src="formData.topologyDiagramUrl" style="width: 100%" mode="widthFix"/>
+                                    <image :src="formData.topologyDiagramUrl" style="width: 100%" mode="widthFix" />
                                 </view>
                                 <view v-else class="gplot gplot-empty center" @click="chooseGplot"> 选择拓扑图</view>
                             </view>
-                            <uni-icons
+                            <uni-icons type="image" color="#007aff" size="26" class="ml20"
-                                type="image"
+                                @click="chooseGplot"></uni-icons>
-                                color="#007aff"
-                                size="26"
-                                class="ml20"
-                                @click="chooseGplot"
-                            ></uni-icons>
                         </view>
                     </uni-forms-item>
                     <uni-forms-item label="监测点" v-if="pointList.length && formData.topologyDiagramUrl">
-                        <view
+                        <view class="point-item" v-for="(item2, index2) in pointList" :key="index2"
-                            class="point-item"
+                            @click="editPoint(item2, index2)">
-                            v-for="(item2, index2) in pointList"
-                            :key="index2"
-                            @click="editPoint(item2, index2)"
-                        >
                             <view style="flex: 1" v-if="item2.name">{{ item2.name }}</view>
                             <view style="flex: 1; color: #999" v-else>请选择监测点</view>
                             <uni-icons type="compose" color="#007aff" size="26" class="ml20"></uni-icons>
@@ -68,7 +54,7 @@
                     </uni-forms-item>
                 </uni-forms>
             </view>
-            <image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix"/>
+            <image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix" />
             <view class="btn-wrap">
                 <!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
                 <view class="btn-wrap-item" @click="submit"> 提交</view>
@@ -76,15 +62,9 @@
             <uni-drawer ref="gplot" mode="right" :mask-click="false">
                 <scroll-view style="height: 100%" scroll-y="true">
                     <view class="content">
-                        <image
+                        <image class="gplot gplot-box" mode="aspectFill" :class="{ 'gplot-active': key == activeGplot }"
-                            class="gplot gplot-box"
+                            :src="item.filePath" @click="activeGplot = key" v-for="(item, key) in imageList"
-                            mode="aspectFill"
+                            :key="key" />
-                            :class="{ 'gplot-active': key == activeGplot }"
-                            :src="item.filePath"
-                            @click="activeGplot = key"
-                            v-for="(item, key) in imageList"
-                            :key="key"
-                        />
                         <view class="btn-wrap">
                             <view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
                             <view class="btn-wrap-item ml20" @click="confirmGplot"> 确定</view>
@@ -96,7 +76,7 @@
                 <scroll-view style="height: 100%" scroll-y="true">
                     <view style="background: #fff">
                         <view class="map-pin-box">
-                            <image class="gplot" mode="widthFix" :src="formData.topologyDiagramUrl"/>
+                            <image class="gplot" mode="widthFix" :src="formData.topologyDiagramUrl" />
 
                             <movable-area class="map-pin-box-area">
                                 <movable-view :x="point.lat" :y="point.lng" direction="all" @change="dragPoint">
@@ -109,22 +89,18 @@
                     </view>
                     <view class="content">
                         <view class="content-des">请拖动图中的文字选择监测点位置</view>
-                        <uni-forms>
+                        <uni-forms labelWidth="70px">
-                            <uni-data-select
+                            <uni-forms-item label="位置">
-                                v-model="point.linePostion"
+                                <uni-data-select v-model="point.linePostion" :localdata="positionList"
-                                :localdata="positionList"
+                                    @change="positionChange" :clear="false" disabled></uni-data-select>
-                                @change="positionChange"
+                            </uni-forms-item>
-                                :clear="false"
+                            <uni-forms-item label="别名">
-                                disabled
+                                <uni-easyinput :clearable="false" type="text" v-model="point.alias"
-                            ></uni-data-select>
+                                    @change="aliasChange" placeholder="别名（非必填）" />
-                            <uni-easyinput
+                            </uni-forms-item>
-                                :clearable="false"
+                            <uni-forms-item label="绑定指标">
-                                class="mt20"
+                                <uni-data-select v-model="point.target" :localdata="targetList"></uni-data-select>
-                                type="text"
+                            </uni-forms-item>
-                                v-model="point.alias"
-                                @change="aliasChange"
-                                placeholder="别名（非必填）"
-                            />
                         </uni-forms>
                         <view class="btn-wrap">
                             <view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
@@ -137,9 +113,9 @@
     </view>
 </template>
 <script>
-import {registerDevice, getModel, addDevice, queryByTopoId, updateDevice} from '@/common/api/device.js'
+import { registerDevice, getModel, addDevice, queryByTopoId, updateDevice } from '@/common/api/device.js'
-import {getProjectList, queryTopologyDiagramPage} from '@/common/api/project.js'
+import { getProjectList, queryTopologyDiagramPage } from '@/common/api/project.js'
-
+import { queryByCode, queryStatistical } from '@/common/api/dictionary'
 export default {
     data() {
         return {
@@ -159,6 +135,9 @@ export default {
             imageList: [],
             isAdaptive: false, // 是否适应当前项目
             deviceInfo: {},
+            targetLists: [],//总数据
+            targetList: [],//根据位置切换数据
+
         }
     },
     onLoad(options) {
@@ -194,18 +173,27 @@ export default {
             ]
             this.projectRange = arr
         })
-        let dictData = uni.getStorageSync(this.$cacheKey.dictData)
+        queryByCode('app_harmonic_code').then((res) => {
-        dictData.forEach((item) => {
+            queryStatistical({ id: res.data.id }).then((resp) => {
-            if (item.code == 'Line_Position') {
+                this.targetLists = resp.data.selectedList.map((item) => {
-                this.positionList = item.children.map((item) => {
                     return {
                         ...item,
-                        text: item.name,
+                        text: item.dataTypeName,
-                        value: item.id,
+                        value: item.dataType,
                     }
                 })
-            }
+            })
         })
+
+        const dictData = uni.getStorageSync(this.$cacheKey.dictData) || []
+        const linePosition = dictData.find((d) => d.code === 'Line_Position')
+        this.positionList = (linePosition?.children || [])
+            .filter((child) => child.name !== 'PCC公共点')
+            .map((child) => ({
+                ...child,
+                text: child.name,
+                value: child.id,
+            }))
     },
     methods: {
         resize() {
@@ -238,13 +226,13 @@ export default {
                 queryTopologyDiagramPage({
                     projectId: this.formData.projectId,
                 }).then((res) => {
-                    this.imageList = res.data.records.map(item=>{
+                    this.imageList = res.data.records.map((item) => {
                         return {
                             ...item,
-                            filePath: this.$config.static + item.filePath
+                            filePath: this.$config.static + item.filePath,
                         }
                     })
-                    this.activeGplot = this.imageList.findIndex(item => {
+                    this.activeGplot = this.imageList.findIndex((item) => {
                         return item.id === this.deviceInfo.id
                     })
                 })
@@ -253,11 +241,12 @@ export default {
         aliasChange(e) {
             this.$forceUpdate()
         },
+
         positionChange(e) {
+            point.target = ''
             this.point.name = this.positionList.find((item) => item.id == e).name
         },
-        projectChange(e) {
+        projectChange(e) { },
-        },
         scanCode() {
             uni.scanCode({
                 success: function (res) {
@@ -331,9 +320,9 @@ export default {
             this.pointList.splice(index, 1)
         },
         editPoint(item, index) {
-            console.log(item)
+            // console.log(item)
             this.point = item
-            console.log(this.point)
+            // console.log(this.point)
             this.editIndex = index
             if (!this.point.alias) {
                 let every = this.positionList.every((item) => item.name != this.point.name)
@@ -344,9 +333,23 @@ export default {
                     this.point.alias = ''
                 }
             }
+            this.settarget()
             this.$refs.point.open()
             this.$forceUpdate()
         },
+        // 设置绑定指标
+        settarget(e) {
+            let pointName = this.positionList.find((item) => item.id == this.point.linePostion).name
+
+            this.targetList = this.targetLists.filter(item => item.dataTypeName.includes(pointName)).map((item) => {
+                return {
+                    ...item,
+                    text: item.dataTypeName.split('-')[1],
+                    value: item.dataType,
+                }
+            })
+
+        },
         dragPoint(e) {
             console.log(e)
             this.point.coordinate = {
@@ -369,7 +372,7 @@ export default {
             }
             updateDevice({
                 pointList: this.pointList,
-                id: this.imageList[this.activeGplot].id
+                id: this.imageList[this.activeGplot].id,
             }).then((res) => {
                 console.log(res)
                 this.$util.toast('提交成功')
@@ -377,7 +380,7 @@ export default {
                 console.log(prePage.$vm)
                 prePage.$vm.init()
                 setTimeout(() => {
-                    uni.navigateBack({delta: 1})
+                    uni.navigateBack({ delta: 1 })
                 }, 1500)
             })
         },

pages/device/list.vue

@@ -4,7 +4,7 @@
             <view class="device">
                 <view class="nav" :style="{ top: navTabHeight + 'px' }">
                     <view class="nav-menu" @click="selectEngineering"
-                        >{{
+                    >{{
                             select.engineeringName
                                 ? select.engineeringName.length > 6
                                     ? select.engineeringName.substring(0, 6) + '...'
@@ -40,7 +40,7 @@
                         :range="projectType"
                         range-key="text"
                     >
-                        <view class="nav-menu" >
+                        <view class="nav-menu">
                             {{
                                 select.runStatusName
                                     ? select.runStatusName.length > 12
@@ -67,13 +67,13 @@
                             v-if="
                                 userInfo.authorities === 'app_vip_user' || userInfo.authorities === 'engineering_user'
                             "
-                            >移交
+                        >移交
                         </view>
                         <view
                             class="nav-menu nav-menu-btn"
                             @click="selectDevice('share')"
                             v-if="userInfo.authorities === 'app_vip_user'"
-                            >分享
+                        >分享
                         </view>
                     </template>
                 </view>
@@ -89,7 +89,6 @@
                             <Cn-device-card :device="item" :key="index">
                                 <template v-slot:title>
                                     <!-- 卡片标题 -->
-
                                     <switch
                                         v-if="transfer || share"
                                         :checked="checkList.indexOf(item.equipmentId) > -1"
@@ -97,8 +96,7 @@
                                         @change="switchChange(item)"
                                     />
                                     <view class="star-icon" v-else>
-                                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                                        <uni-icons type="search" size="25" color="#376cf3"></uni-icons>
-                                        🔍
                                     </view>
                                 </template>
                             </Cn-device-card>
@@ -119,6 +117,7 @@ import { getProjectList } from '@/common/api/project'
 import { queryDictData } from '@/common/api/dictionary'
 import list from '@/common/js/list'
 import { engineeringPinToTop } from '@/common/api/device'
+
 export default {
     mixins: [list],
     data() {
@@ -458,15 +457,7 @@ export default {
             } else {
                 this[type] = true
             }
-        },
+        }
-        switchChange(e) {
-            let index = this.checkList.indexOf(e.equipmentId)
-            if (index > -1) {
-                this.checkList.splice(index, 1)
-            } else {
-                this.checkList.push(e.equipmentId)
-            }
-        },
     },
 }
 </script>

pages/device/new.vue

@@ -6,13 +6,8 @@
                     <uni-forms-item label="设备识别码">
                         <view style="display: flex">
                             <uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码" />
-                            <uni-icons
+                            <uni-icons type="camera" color="#007aff" size="26" class="ml20"
-                                type="camera"
+                                @click="scanCode"></uni-icons>
-                                color="#007aff"
-                                size="26"
-                                class="ml20"
-                                @click="scanCode"
-                            ></uni-icons>
                         </view>
                     </uni-forms-item>
                 </uni-forms>
@@ -28,36 +23,18 @@
                 <uni-forms>
                     <uni-forms-item label="工程">
                         <view style="display: flex; align-items: center">
-                            <uni-data-select
+                            <uni-data-select v-model="formData.engineeringId" :localdata="engineeringList"
-                                v-model="formData.engineeringId"
+                                @change="engineeringChang($event, true)" :clear="false"></uni-data-select>
-                                :localdata="engineeringList"
+                            <uni-icons type="plusempty" color="#007aff" size="26" class="ml20"
-                                @change="engineeringChang($event, true)"
+                                @click="createEngineering"></uni-icons>
-                                :clear="false"
-                            ></uni-data-select>
-                            <uni-icons
-                                type="plusempty"
-                                color="#007aff"
-                                size="26"
-                                class="ml20"
-                                @click="createEngineering"
-                            ></uni-icons>
                         </view>
                     </uni-forms-item>
                     <uni-forms-item label="项目">
                         <view style="display: flex; align-items: center">
-                            <uni-data-select
+                            <uni-data-select v-model="formData.projectId" :localdata="projectRange"
-                                v-model="formData.projectId"
+                                @change="queryTopologyDiagramPage" :clear="false"></uni-data-select>
-                                :localdata="projectRange"
+                            <uni-icons type="plusempty" color="#007aff" size="26" class="ml20"
-                                @change="queryTopologyDiagramPage"
+                                @click="createProject"></uni-icons>
-                                :clear="false"
-                            ></uni-data-select>
-                            <uni-icons
-                                type="plusempty"
-                                color="#007aff"
-                                size="26"
-                                class="ml20"
-                                @click="createProject"
-                            ></uni-icons>
                         </view>
                     </uni-forms-item>
 
@@ -69,25 +46,14 @@
                                 </view>
                                 <view v-else class="gplot gplot-empty center" @click="chooseGplot"> 选择拓扑图</view>
                             </view>
-                            <uni-icons
+                            <uni-icons type="image" color="#007aff" size="26" class="ml20"
-                                type="image"
+                                @click="chooseGplot"></uni-icons>
-                                color="#007aff"
-                                size="26"
-                                class="ml20"
-                                @click="chooseGplot"
-                            ></uni-icons>
                         </view>
                     </uni-forms-item>
-                    <uni-forms-item
+                    <uni-forms-item label="监测点"
-                        label="监测点"
+                        v-if="pointList.length && formData.topologyDiagramUrl && formData.projectId">
-                        v-if="pointList.length && formData.topologyDiagramUrl && formData.projectId"
+                        <view class="point-item" v-for="(item2, index2) in pointList" :key="index2"
-                    >
+                            @click="editPoint(item2, index2)">
-                        <view
-                            class="point-item"
-                            v-for="(item2, index2) in pointList"
-                            :key="index2"
-                            @click="editPoint(item2, index2)"
-                        >
                             <view style="flex: 1" v-if="item2.name">{{ item2.name }}</view>
                             <view style="flex: 1; color: #999" v-else>请选择监测点</view>
                             <uni-icons type="compose" color="#007aff" size="26" class="ml20"></uni-icons>
@@ -106,17 +72,10 @@
             <uni-drawer ref="gplot" mode="right" :mask-click="false">
                 <scroll-view style="height: 100%" scroll-y="true">
                     <view class="content">
-                        <image
+                        <image class="gplot gplot-box" mode="aspectFill" :class="{ 'gplot-active': key == activeGplot }"
-                            class="gplot gplot-box"
+                            :src="item.filePath" @click="activeGplot = key" v-for="(item, key) in imageList"
-                            mode="aspectFill"
+                            :key="key" />
-                            :class="{ 'gplot-active': key == activeGplot }"
+                        <view v-if="imageList.length === 0" style="text-align: center" class="mt50 mb50">暂无拓扑图
-                            :src="item.filePath"
-                            @click="activeGplot = key"
-                            v-for="(item, key) in imageList"
-                            :key="key"
-                        />
-                        <view v-if="imageList.length === 0" style="text-align: center" class="mt50 mb50"
-                            >暂无拓扑图
                         </view>
                         <view class="btn-wrap">
                             <view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
@@ -142,22 +101,18 @@
                     </view>
                     <view class="content">
                         <view class="content-des">请拖动图中的文字选择监测点位置</view>
-                        <uni-forms>
+                        <uni-forms labelWidth="70px">
-                            <uni-data-select
+                            <uni-forms-item label="位置">
-                                v-model="point.position"
+                                <uni-data-select v-model="point.position" :localdata="positionList"
-                                :localdata="positionList"
+                                    @change="positionChange" disabled :clear="false"></uni-data-select>
-                                @change="positionChange"
+                            </uni-forms-item>
-                                disabled
+                            <uni-forms-item label="别名">
-                                :clear="false"
+                                <uni-easyinput :clearable="false"  type="text" v-model="point.alias"
-                            ></uni-data-select>
+                                    @change="aliasChange" placeholder="别名（非必填）" />
-                            <uni-easyinput
+                            </uni-forms-item>
-                                :clearable="false"
+                            <uni-forms-item label="绑定指标">
-                                class="mt20"
+                                <uni-data-select v-model="point.target" :localdata="targetList"></uni-data-select>
-                                type="text"
+                            </uni-forms-item>
-                                v-model="point.alias"
-                                @change="aliasChange"
-                                placeholder="别名（非必填）"
-                            />
                         </uni-forms>
                         <view class="btn-wrap">
                             <view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
@@ -181,6 +136,7 @@ import {
 } from '@/common/api/device.js'
 import { getProjectList, queryTopologyDiagramPage } from '@/common/api/project.js'
 import ykAuthpup from '@/components/yk-authpup/yk-authpup'
+import { queryByCode, queryStatistical } from '@/common/api/dictionary'
 export default {
     components: {
         ykAuthpup,
@@ -204,6 +160,8 @@ export default {
             activeGplot: 0,
             positionList: [],
             imageList: [],
+            targetLists: [],//总数据
+            targetList: [],//根据位置切换数据
             isAdaptive: false, // 是否适应当前项目
             dialogOpen: false,
             options: {},
@@ -226,9 +184,20 @@ export default {
     onLoad(o) {
         this.options = o
         let dictData = uni.getStorageSync(this.$cacheKey.dictData)
+        queryByCode('app_harmonic_code').then((res) => {
+            queryStatistical({ id: res.data.id }).then((resp) => {
+                this.targetLists = resp.data.selectedList.map((item) => {
+                    return {
+                        ...item,
+                        text: item.dataTypeName,
+                        value: item.dataType,
+                    }
+                })
+            })
+        })
         dictData.forEach((item) => {
             if (item.code == 'Line_Position') {
-                this.positionList = item.children.map((item) => {
+                this.positionList = item.children.filter((child) => child.name !== 'PCC公共点').map((item) => {
                     return {
                         ...item,
                         text: item.name,
@@ -264,6 +233,19 @@ export default {
         //     })
     },
     methods: {
+        // 设置绑定指标
+        settarget(e) {
+            let pointName = this.positionList.find((item) => item.id == this.point.position).name
+
+            this.targetList = this.targetLists.filter(item => item.dataTypeName.includes(pointName)).map((item) => {
+                return {
+                    ...item,
+                    text: item.dataTypeName.split('-')[1],
+                    value: item.dataType,
+                }
+            })
+
+        },
         getEngineering() {
             queryEngineeringPage({ pageNum: 1, pageSize: 9999 }).then((res) => {
                 let arr = [
@@ -377,7 +359,7 @@ export default {
             console.log(e)
         },
 
-        projectChange(e) {},
+        projectChange(e) { },
         scanCode() {
             if (plus.os.name == 'Android') {
                 this.$refs['authpup'].open()
@@ -509,6 +491,7 @@ export default {
                     this.point.alias = ''
                 }
             }
+            this.settarget()
             this.dialogOpen = true
             this.$refs.point.open()
             this.$forceUpdate()

pages/device/realTime/index.vue

@@ -6,20 +6,16 @@
                 <view class="info-card-wrap">
                     <view class="info-card">
                         <view class="info-item">
-                            监测点名称：<view
+                            监测点名称：<view>
-                                ><picker
+                                <picker @change="lineChange" @cancel="selectProject = false" :value="lineKey"
-                                    @change="lineChange"
+                                    :range="lineList" range-key="name">
-                                    @cancel="selectProject = false"
-                                    :value="lineKey"
-                                    :range="lineList"
-                                    range-key="name"
-                                >
                                     <view class="nav-menu" @click="selectProject = true">
                                         {{ lineList[lineKey].name }}
 
                                         <uni-icons type="bottom" size="18" color="#fff"></uni-icons>
-                                    </view> </picker
+                                    </view>
-                            ></view>
+                                </picker>
+                            </view>
                         </view>
                         <view class="info-item">
                             所属工程：<view>{{ device.engineeringName }}</view>
@@ -29,10 +25,9 @@
                         </view>
 
                         <view class="info-item status">
-                            通讯状态：<view
+                            通讯状态：<view class="status-normal"
-                                class="status-normal"
+                                :style="{ color: device.runStatus == 1 ? '#ff3b30' : '#00ff88' }">{{ device.runStatus ==
-                                :style="{ color: device.runStatus == 1 ? '#ff3b30' : '#00ff88' }"
+                                    1 ? '离线' : '在线' }}
-                                >{{ device.runStatus == 1 ? '离线' : '在线' }}
                             </view>
                         </view>
                     </view>
@@ -47,80 +42,78 @@
                             {{ disabled ? `刷新(${countdown}s)` : '刷新' }}
                         </button>
                     </view>
+                   
                     <!-- 仪表盘 -->
                     <view>
                         <view class="chartBox">
                             <view>
                                 <view class="chart">
-                                    <l-echart
+                                    <l-echart ref="echartV1"
-                                        ref="echartV1"
+                                        @finished="initChart('echartV1', 'echartsDataV1')"></l-echart>
-                                        @finished="initChart('echartV1', 'echartsDataV1')"
-                                    ></l-echart>
                                 </view>
                                 <view class="chart">
-                                    <l-echart
+                                    <l-echart ref="echartV2"
-                                        ref="echartV2"
+                                        @finished="initChart('echartV2', 'echartsDataV2')"></l-echart>
-                                        @finished="initChart('echartV2', 'echartsDataV2')"
-                                    ></l-echart>
                                 </view>
                                 <view class="chart">
-                                    <l-echart
+                                    <l-echart ref="echartV3"
-                                        ref="echartV3"
+                                        @finished="initChart('echartV3', 'echartsDataV3')"></l-echart>
-                                        @finished="initChart('echartV3', 'echartsDataV3')"
-                                    ></l-echart>
                                 </view>
                                 <view class="text" style="left: 20rpx"> 电压有效值(kV) </view>
                             </view>
                             <view class="middle" style="width: 100%">
-                                <l-echart
+                                <l-echart class="echart1" ref="echart0"
-                                    class="echart1"
+                                    @finished="initChart('echart0', 'echartsData0')"></l-echart>
-                                    ref="echart0"
+                                <l-echart class="echart1" ref="echart1"
-                                    @finished="initChart('echart0', 'echartsData0')"
+                                    @finished="initChart('echart1', 'echartsData1')"></l-echart>
-                                ></l-echart>
-                                <l-echart
-                                    class="echart1"
-                                    ref="echart1"
-                                    @finished="initChart('echart1', 'echartsData1')"
-                                ></l-echart>
                                 <view class="text text_center"> 基波电压/电流<br />幅值(相位) </view>
                             </view>
                             <view>
                                 <view class="chart">
-                                    <l-echart
+                                    <l-echart ref="echartA1"
-                                        ref="echartA1"
+                                        @finished="initChart('echartA1', 'echartsDataA1')"></l-echart>
-                                        @finished="initChart('echartA1', 'echartsDataA1')"
-                                    ></l-echart>
                                 </view>
                                 <view class="chart">
-                                    <l-echart
+                                    <l-echart ref="echartA2"
-                                        ref="echartA2"
+                                        @finished="initChart('echartA2', 'echartsDataA2')"></l-echart>
-                                        @finished="initChart('echartA2', 'echartsDataA2')"
-                                    ></l-echart>
                                 </view>
                                 <view class="chart">
-                                    <l-echart
+                                    <l-echart ref="echartA3"
-                                        ref="echartA3"
+                                        @finished="initChart('echartA3', 'echartsDataA3')"></l-echart>
-                                        @finished="initChart('echartA3', 'echartsDataA3')"
-                                    ></l-echart>
                                 </view>
                                 <view class="text" style="right: 20rpx"> 电流有效值(A) </view>
                             </view>
                         </view>
                     </view>
 
-                    <!-- 底部数据表格 -->
+                    <!-- 底部指标数据 -->
-                    <view class="data-table">
+                    <view class="params-wrap">
-                        <view class="table-header">
+
-                            <text></text>
+                        <view class="params-section">
-                            <text>A相</text>
+                            <view v-for="(rowItems, rowIdx) in chunkedChildren(realTimeData)" :key="rowIdx"
-                            <text>B相</text>
+                                class="double-row">
-                            <text>C相</text>
+                                <view v-for="(child, childIdx) in rowItems" :key="childIdx" class="param-group">
-                        </view>
+                                    <view class="param-title">
-                        <view class="table-row" v-for="value in realTimeData">
+                                        <text>{{ child.name }}</text>
-                            <text>{{ value.name }}</text>
+                                    </view>
-                            <text>{{ value.A }}</text>
+                                    <view class="phase-vertical">
-                            <text>{{ value.B }}</text>
+                                        <view class="phase-item-vertical">
-                            <text>{{ value.C }}</text>
+                                            <text class="phase-value-vertical"
+                                                :style="{ color: phaseColors[0].color }">{{ child.A }}</text>
+                                        </view>
+                                        <view class="phase-divider" />
+                                        <view class="phase-item-vertical">
+                                            <text class="phase-value-vertical"
+                                                :style="{ color: phaseColors[1].color }">{{ child.B }}</text>
+                                        </view>
+                                        <view class="phase-divider" />
+                                        <view class="phase-item-vertical">
+                                            <text class="phase-value-vertical"
+                                                :style="{ color: phaseColors[2].color }">{{ child.C }}</text>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
                         </view>
                     </view>
                 </view>
@@ -173,12 +166,17 @@ export default {
                 { name: '电压有效值(kV)', A: '/', B: '/', C: '/' },
                 { name: '电流有效值(A)', A: '/', B: '/', C: '/' },
                 { name: '基波电压幅值(kV)', A: '/', B: '/', C: '/' },
-                { name: '基波电压相位(°)', A: '/', B: '/', C: '/' },
                 { name: '基波电流幅值(A)', A: '/', B: '/', C: '/' },
+                { name: '基波电压相位(°)', A: '/', B: '/', C: '/' },
                 { name: '基波电流相位(°)', A: '/', B: '/', C: '/' },
                 { name: '电压偏差(%)', A: '/', B: '/', C: '/' },
                 { name: '电压总谐波畸变率(%)', A: '/', B: '/', C: '/' },
             ],
+            phaseColors: [
+                { name: 'A相', color: '#F1B22E' },
+                { name: 'B相', color: '#2BA471' },
+                { name: 'C相', color: '#D54941' },
+            ],
             disabled: false,
             countdown: 30,
             lineId: '00B78D00A87A1',
@@ -238,7 +236,7 @@ export default {
                 })
             }
         }
-        if (this.userInfo.authorities !== 'tourist') {
+        if (this.userInfo.authorities !== 'tourist' && this.device.isPrimaryUser === '1') {
             this.content.splice(0, 0, {
                 iconPath: '/static/subordinate.png',
                 text: '用户',
@@ -267,6 +265,14 @@ export default {
     },
 
     methods: {
+        // 将指标列表按每行两个分组
+        chunkedChildren(children) {
+            const result = []
+            for (let i = 0; i < children.length; i += 2) {
+                result.push(children.slice(i, i + 2))
+            }
+            return result
+        },
         initEcharts0() {
             return {
                 tooltip: { show: false },
@@ -740,125 +746,128 @@ export default {
                     if (!this.connection) return
                     // console.log('🚀 ~ .on ~ topic:', topic, this.userInfo.userIndex)
 
-
+                    if (
-                    if (topic == `/Web/RealData/${this.lineId}`) {
+                        topic == `/Web/RealData/${this.lineId}` ||
+                        topic == `/Web/RealData/${this.userInfo.userIndex}`
+                    ) {
                         let list = JSON.parse(message.toString())
+                        if (list.lineId != this.lineId) return
                         // if (list.userId == this.userInfo.userIndex) {
-                            // console.log(list)
+                        // console.log(list)
-                            this.realTime = list.dataTime
+                        this.realTime = list.dataTime
-                            let pt = list.pt || 0
+                        let pt = list.pt || 0
-                            let ct = list.ct || 0
+                        let ct = list.ct || 0
 
-                            let data = {
+                        let data = {
-                                vRmsA: ((list.vRmsA * pt) / 1000).toFixed(2),
+                            vRmsA: ((list.vRmsA * pt) / 1000).toFixed(2),
-                                vRmsB: ((list.vRmsB * pt) / 1000).toFixed(2),
+                            vRmsB: ((list.vRmsB * pt) / 1000).toFixed(2),
-                                vRmsC: ((list.vRmsC * pt) / 1000).toFixed(2),
+                            vRmsC: ((list.vRmsC * pt) / 1000).toFixed(2),
-                                iRmsA: (list.iRmsA * ct).toFixed(2),
+                            iRmsA: (list.iRmsA * ct).toFixed(2),
-                                iRmsB: (list.iRmsB * ct).toFixed(2),
+                            iRmsB: (list.iRmsB * ct).toFixed(2),
-                                iRmsC: (list.iRmsC * ct).toFixed(2),
+                            iRmsC: (list.iRmsC * ct).toFixed(2),
-                                v1A: ((list.v1A * pt) / 1000).toFixed(2),
+                            v1A: ((list.v1A * pt) / 1000).toFixed(2),
-                                v1B: ((list.v1B * pt) / 1000).toFixed(2),
+                            v1B: ((list.v1B * pt) / 1000).toFixed(2),
-                                v1C: ((list.v1C * pt) / 1000).toFixed(2),
+                            v1C: ((list.v1C * pt) / 1000).toFixed(2),
-                                v1AngA: list.v1AngA.toFixed(2),
+                            v1AngA: list.v1AngA.toFixed(2),
-                                v1AngB: list.v1AngB.toFixed(2),
+                            v1AngB: list.v1AngB.toFixed(2),
-                                v1AngC: list.v1AngC.toFixed(2),
+                            v1AngC: list.v1AngC.toFixed(2),
 
-                                i1A: (list.i1A * ct).toFixed(2),
+                            i1A: (list.i1A * ct).toFixed(2),
-                                i1B: (list.i1B * ct).toFixed(2),
+                            i1B: (list.i1B * ct).toFixed(2),
-                                i1C: (list.i1C * ct).toFixed(2),
+                            i1C: (list.i1C * ct).toFixed(2),
-                                i1AngA: list.i1AngA.toFixed(2),
+                            i1AngA: list.i1AngA.toFixed(2),
-                                i1AngB: list.i1AngB.toFixed(2),
+                            i1AngB: list.i1AngB.toFixed(2),
-                                i1AngC: list.i1AngC.toFixed(2),
+                            i1AngC: list.i1AngC.toFixed(2),
-                                vDevA: list.vDevA.toFixed(2),
+                            vDevA: list.vDevA.toFixed(2),
-                                vDevB: list.vDevB.toFixed(2),
+                            vDevB: list.vDevB.toFixed(2),
-                                vDevC: list.vDevC.toFixed(2),
+                            vDevC: list.vDevC.toFixed(2),
-                                vThdA: list.vThdA.toFixed(2),
+                            vThdA: list.vThdA.toFixed(2),
-                                vThdB: list.vThdB.toFixed(2),
+                            vThdB: list.vThdB.toFixed(2),
-                                vThdC: list.vThdC.toFixed(2),
+                            vThdC: list.vThdC.toFixed(2),
+                        }
+                        this.realTimeData = [
+                            { name: '电压有效值(kV)', A: data.vRmsA, B: data.vRmsB, C: data.vRmsC },
+                            { name: '电流有效值(A)', A: data.iRmsA, B: data.iRmsB, C: data.iRmsC },
+                            { name: '基波电压幅值(kV)', A: data.v1A, B: data.v1B, C: data.v1C },
+                            { name: '基波电流幅值(A)', A: data.i1A, B: data.i1B, C: data.i1C },
+                            { name: '基波电压相位(°)', A: data.v1AngA, B: data.v1AngB, C: data.v1AngC },
+                            { name: '基波电流相位(°)', A: data.i1AngA, B: data.i1AngB, C: data.i1AngC },
+                            { name: '电压偏差(%)', A: data.vDevA, B: data.vDevB, C: data.vDevC },
+                            { name: '电压总谐波畸变率(%)', A: data.vThdA, B: data.vThdB, C: data.vThdC },
+                        ]
+                        // 电压
+                        let vMax =
+                            Math.ceil(
+                                (Math.max(
+                                    ...[
+                                        Math.floor(data.vRmsA * 100) / 100 || 1,
+                                        Math.floor(data.vRmsB * 100) / 100 || 1,
+                                        Math.floor(data.vRmsC * 100) / 100 || 1,
+                                    ],
+                                ) *
+                                    1.2) /
+                                10,
+                            ) * 10
+                        this.echartsDataV1.series[0].max = vMax
+                        this.echartsDataV2.series[0].max = vMax
+                        this.echartsDataV3.series[0].max = vMax
+                        this.echartsDataV1.series[0].data[0].value = data.vRmsA
+                        this.echartsDataV2.series[0].data[0].value = data.vRmsB
+                        this.echartsDataV3.series[0].data[0].value = data.vRmsC
+
+                        // 电流
+                        let aMax =
+                            Math.ceil(
+                                (Math.max(
+                                    ...[
+                                        Math.floor(data.iRmsA * 100) / 100 || 1,
+                                        Math.floor(data.iRmsB * 100) / 100 || 1,
+                                        Math.floor(data.iRmsC * 100) / 100 || 1,
+                                    ],
+                                ) *
+                                    1.2) /
+                                10,
+                            ) * 10
+                        this.echartsDataA1.series[0].max = aMax
+                        this.echartsDataA2.series[0].max = aMax
+                        this.echartsDataA3.series[0].max = aMax
+                        this.echartsDataA1.series[0].data[0].value = data.iRmsA
+                        this.echartsDataA2.series[0].data[0].value = data.iRmsB
+                        this.echartsDataA3.series[0].data[0].value = data.iRmsC
+
+                        this.echartsData0.series[0].data[0].value = data.i1AngA
+                        this.echartsData0.series[0].data[1].value = data.i1AngB
+                        this.echartsData0.series[0].data[2].value = data.i1AngC
+
+                        this.echartsData1.series[0].data[0].value = data.v1AngA
+                        this.echartsData1.series[0].data[1].value = data.v1AngB
+                        this.echartsData1.series[0].data[2].value = data.v1AngC
+
+                        const charts = [
+                            { instance: this.echart0, data: this.echartsData0 },
+                            { instance: this.echart1, data: this.echartsData1 },
+                            { instance: this.echartV1, data: this.echartsDataV1 },
+                            { instance: this.echartV2, data: this.echartsDataV2 },
+                            { instance: this.echartV3, data: this.echartsDataV3 },
+                            { instance: this.echartA1, data: this.echartsDataA1 },
+                            { instance: this.echartA2, data: this.echartsDataA2 },
+                            { instance: this.echartA3, data: this.echartsDataA3 },
+                        ]
+
+                        charts.forEach(({ instance, data }) => {
+                            if (instance && instance.setOption) {
+                                instance.setOption(data, true)
                             }
-                            this.realTimeData = [
+                        })
-                                { name: '电压有效值(kV)', A: data.vRmsA, B: data.vRmsB, C: data.vRmsC },
-                                { name: '电流有效值(A)', A: data.iRmsA, B: data.iRmsB, C: data.iRmsC },
-                                { name: '基波电压幅值(kV)', A: data.v1A, B: data.v1B, C: data.v1C },
-                                { name: '基波电压相位(°)', A: data.v1AngA, B: data.v1AngB, C: data.v1AngC },
-                                { name: '基波电流幅值(A)', A: data.i1A, B: data.i1B, C: data.i1C },
-                                { name: '基波电流相位(°)', A: data.i1AngA, B: data.i1AngB, C: data.i1AngC },
-                                { name: '电压偏差(%)', A: data.vDevA, B: data.vDevB, C: data.vDevC },
-                                { name: '电压总谐波畸变率(%)', A: data.vThdA, B: data.vThdB, C: data.vThdC },
-                            ]
-                            // 电压
-                            let vMax =
-                                Math.ceil(
-                                    (Math.max(
-                                        ...[
-                                            Math.floor(data.vRmsA * 100) / 100 || 1,
-                                            Math.floor(data.vRmsB * 100) / 100 || 1,
-                                            Math.floor(data.vRmsC * 100) / 100 || 1,
-                                        ],
-                                    ) *
-                                        1.2) /
-                                        10,
-                                ) * 10
-                            this.echartsDataV1.series[0].max = vMax
-                            this.echartsDataV2.series[0].max = vMax
-                            this.echartsDataV3.series[0].max = vMax
-                            this.echartsDataV1.series[0].data[0].value = data.vRmsA
-                            this.echartsDataV2.series[0].data[0].value = data.vRmsB
-                            this.echartsDataV3.series[0].data[0].value = data.vRmsC
 
-                            // 电流
+                        // this.echart0.setOption(this.echartsData0, true)
-                            let aMax =
+                        // this.echart1.setOption(this.echartsData1, true)
-                                Math.ceil(
+                        // this.echartV1.setOption(this.echartsDataV1, true)
-                                    (Math.max(
+                        // this.echartV2.setOption(this.echartsDataV2, true)
-                                        ...[
+                        // this.echartV3.setOption(this.echartsDataV3, true)
-                                            Math.floor(data.iRmsA * 100) / 100 || 1,
+                        // this.echartA1.setOption(this.echartsDataA1, true)
-                                            Math.floor(data.iRmsB * 100) / 100 || 1,
+                        // this.echartA2.setOption(this.echartsDataA2, true)
-                                            Math.floor(data.iRmsC * 100) / 100 || 1,
+                        // this.echartA3.setOption(this.echartsDataA3, true)
-                                        ],
-                                    ) *
-                                        1.2) /
-                                        10,
-                                ) * 10
-                            this.echartsDataA1.series[0].max = aMax
-                            this.echartsDataA2.series[0].max = aMax
-                            this.echartsDataA3.series[0].max = aMax
-                            this.echartsDataA1.series[0].data[0].value = data.iRmsA
-                            this.echartsDataA2.series[0].data[0].value = data.iRmsB
-                            this.echartsDataA3.series[0].data[0].value = data.iRmsC
-
-                            this.echartsData0.series[0].data[0].value = data.i1AngA
-                            this.echartsData0.series[0].data[1].value = data.i1AngB
-                            this.echartsData0.series[0].data[2].value = data.i1AngC
-
-                            this.echartsData1.series[0].data[0].value = data.v1AngA
-                            this.echartsData1.series[0].data[1].value = data.v1AngB
-                            this.echartsData1.series[0].data[2].value = data.v1AngC
-
-                            const charts = [
-                                { instance: this.echart0, data: this.echartsData0 },
-                                { instance: this.echart1, data: this.echartsData1 },
-                                { instance: this.echartV1, data: this.echartsDataV1 },
-                                { instance: this.echartV2, data: this.echartsDataV2 },
-                                { instance: this.echartV3, data: this.echartsDataV3 },
-                                { instance: this.echartA1, data: this.echartsDataA1 },
-                                { instance: this.echartA2, data: this.echartsDataA2 },
-                                { instance: this.echartA3, data: this.echartsDataA3 },
-                            ]
-
-                            charts.forEach(({ instance, data }) => {
-                                if (instance && instance.setOption) {
-                                    instance.setOption(data, true)
-                                }
-                            })
-
-                            // this.echart0.setOption(this.echartsData0, true)
-                            // this.echart1.setOption(this.echartsData1, true)
-                            // this.echartV1.setOption(this.echartsDataV1, true)
-                            // this.echartV2.setOption(this.echartsDataV2, true)
-                            // this.echartV3.setOption(this.echartsDataV3, true)
-                            // this.echartA1.setOption(this.echartsDataA1, true)
-                            // this.echartA2.setOption(this.echartsDataA2, true)
-                            // this.echartA3.setOption(this.echartsDataA3, true)
                         // }
                     }
                 })
@@ -870,8 +879,8 @@ export default {
                 { name: '电压有效值(kV)', A: '/', B: '/', C: '/' },
                 { name: '电流有效值(A)', A: '/', B: '/', C: '/' },
                 { name: '基波电压幅值(kV)', A: '/', B: '/', C: '/' },
-                { name: '基波电压相位(°)', A: '/', B: '/', C: '/' },
                 { name: '基波电流幅值(A)', A: '/', B: '/', C: '/' },
+                { name: '基波电压相位(°)', A: '/', B: '/', C: '/' },
                 { name: '基波电流相位(°)', A: '/', B: '/', C: '/' },
                 { name: '电压偏差(%)', A: '/', B: '/', C: '/' },
                 { name: '电压总谐波畸变率(%)', A: '/', B: '/', C: '/' },
@@ -990,30 +999,38 @@ export default {
         padding: 20rpx;
         background-color: #fff;
     }
+
     // padding: 20rpx;
     .info-card {
         background-image: url('/static/background.png');
-        background-position: center center; /* 水平+垂直居中 */
+        background-position: center center;
-        background-repeat: no-repeat; /* 不平铺 */
+        /* 水平+垂直居中 */
-        background-size: 100% 100%; /* 覆盖整个容器（可选，根据需求调整） */
+        background-repeat: no-repeat;
+        /* 不平铺 */
+        background-size: 100% 100%;
+        /* 覆盖整个容器（可选，根据需求调整） */
         color: #fff;
         padding: 20rpx 40rpx;
         border-radius: 20rpx;
+
         .info-item {
             display: flex;
             align-items: center;
             font-size: 28rpx;
             margin-bottom: 10rpx;
+
             view {
                 // font-size: 28rpx;
                 // .nav-menu {
                 //     font-size: 32rpx;
                 // }
             }
+
             &:last-child {
                 margin-bottom: 0rpx;
             }
         }
+
         .status {
             .status-normal {
                 // font-weight: bold;
@@ -1021,32 +1038,92 @@ export default {
         }
     }
 
-    .data-table {
+    .params-wrap {
         margin-top: 20rpx;
         background-color: #fff;
+        border-radius: 10rpx;
         overflow: hidden;
-        .table-header,
+    }
-        .table-row {
+
-            display: flex;
+    .legend-row {
-            justify-content: space-between;
+        display: flex;
-            padding: 20rpx 30rpx;
+        gap: 20rpx;
-            border-bottom: 1rpx solid #eee;
+        align-items: center;
-            text {
+        justify-content: flex-end;
-                flex: 1;
+        padding: 0rpx 20rpx 0;
-                text-align: center;
+        background-color: #fff;
-                font-size: 28rpx;
+    }
-                // color: #333;
+
-                &:first-child {
+    .legend-item {
-                    text-align: left;
+        display: flex;
-                    flex: 2;
+        align-items: center;
-                }
+        gap: 8rpx;
-            }
+    }
-        }
+
-        .table-header {
+    .legend-dot {
-            // background-color: #fafafa;
+        width: 16rpx;
-            font-weight: bold;
+        height: 16rpx;
+        border-radius: 50%;
+    }
+
+    .legend-text {
+        font-size: 24rpx;
+        color: #666666;
+    }
+
+    .params-section {
+        padding: 16rpx 16rpx 20rpx;
+    }
+
+    .double-row {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        gap: 16rpx;
+        margin-bottom: 16rpx;
+
+        &:last-child {
+            margin-bottom: 0;
         }
     }
+
+    .param-group {
+        min-width: 0;
+        background: #f3f3f3;
+        border-radius: 16rpx;
+        padding: 16rpx 8rpx 12rpx;
+    }
+
+    .param-title {
+        font-size: 26rpx;
+        color: #666666;
+        margin-bottom: 8rpx;
+        padding-left: 4rpx;
+    }
+
+    .phase-vertical {
+        display: flex;
+        align-items: stretch;
+    }
+
+    .phase-item-vertical {
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 4rpx;
+    }
+
+    .phase-value-vertical {
+        font-size: 28rpx;
+        font-weight: 700;
+    }
+
+    .phase-divider {
+        width: 1px;
+        background: #d2d2d2;
+        margin: 8rpx 0;
+    }
+
     .time-bar {
         display: flex;
         justify-content: space-between;
@@ -1055,50 +1132,59 @@ export default {
         background-color: #fff;
         margin: 20rpx 0 0;
         border-radius: 10rpx;
+
         .time {
             display: flex;
             align-items: center;
             flex: 1;
             font-size: 28rpx;
+
             text {
                 margin-left: 20rpx;
             }
         }
     }
 }
+
 .chartBox {
     background-color: #fff;
     padding: 0 0rpx 20rpx;
     display: flex;
     padding-bottom: 55rpx;
+
     .middle {
         display: flex;
         position: relative;
         height: 600rpx;
         margin: 0 10rpx;
         flex: 1;
+
         .echart1 {
             position: absolute;
             height: 500rpx;
             top: 0;
         }
     }
+
     .chart {
         width: 170rpx;
         height: 200rpx;
         margin-bottom: 5rpx;
     }
+
     .text {
         text-align: center;
         font-size: 28rpx;
         position: absolute;
     }
+
     .text_center {
         bottom: -5px;
         left: 50%;
         transform: translateX(-50%) translateY(50%);
     }
 }
+
 .mini-btn {
     font-size: 24rpx;
     border-radius: 45rpx;

pages/engineering/detail.vue

@@ -24,9 +24,10 @@
                 </view>
                 <view class="content" :style="{ minHeight: 'calc(100vh - ' + navHeight + 'px)' }">
                     <view v-show="navMenuActive == 0">
+                        <!-- extra="🔍" -->
                         <uni-card
                             :title="item.name"
-                            extra="🔍"
+                       
                             @click="jumpProject(item)"
                             v-for="(item, index) in store.data"
                             :key="index"
@@ -258,7 +259,7 @@ export default {
 .term-list-bottom {
     .term-list-bottom-item {
         font-size: 28rpx;
-        margin-bottom: 20rpx;
+        // margin-bottom: 20rpx;
         display: flex;
         justify-content: space-between;
         // view:first-of-type{
@@ -270,4 +271,10 @@ export default {
         margin-bottom: 0;
     }
 }
+/deep/ .uni-card__content {
+    padding: 5px 10px 10px !important;
+}
+/deep/ .uni-card__header-content-title {
+    font-weight: 700;
+}
 </style>

pages/engineering/list.vue

@@ -14,7 +14,8 @@
                 <uni-swipe-action-item v-for="(item, index) in store.data"
                     :style="{ marginTop: index === 0 ? '0' : '' }" :key="index" :threshold="0"
                     :right-options="item.isTop == 0 ? options1 : options12" @click="bindClick($event, item)">
-                    <uni-card class="boxClick" :title="item.name" extra="🔍" @click="jump(item)">
+                    <!-- extra="🔍" -->
+                    <uni-card class="boxClick" :title="item.name"  @click="jump(item)">
                         <view class="term-list-bottom">
                             <view class="term-list-bottom-item">
                                 <view>区域</view>

pages/index/comp/apply.vue

@@ -61,9 +61,9 @@
                             }}</text>
                         </view>
                         <view class="event-desc">
-                            <text>工程名称：{{ item.engineeringName }}</text>
+                            <text>工程：{{ item.engineeringName }}</text>
-                            <text>项目名称：{{ item.projectName }}</text>
+                            <text>项目：{{ item.projectName }}</text>
-                            <text>设备名称：{{ item.equipmentName }}</text>
+                            <text>设备：{{ item.equipmentName }}</text>
                         </view>
                     </view>
                     <view class="event-action" @click="handleWrapperClick(item, !item.wavePath)">
@@ -92,6 +92,11 @@
                                 ? '，相别：' + item.evtParamPhase
                                 : ''
                         }}
+                        {{
+                            item.landPoint != null && item.landPoint !== ''
+                                ? '，落点区域：' + item.landPoint
+                                : ''
+                        }}
                     </text>
                 </view>
             </uni-card>

pages/index/comp/device.vue

@@ -44,13 +44,13 @@
                     class="nav-menu nav-menu-btn"
                     @click="selectDevice('transfer')"
                     v-if="userInfo.authorities === 'app_vip_user' || userInfo.authorities === 'engineering_user'"
-                    >移交
+                >移交
                 </view>
                 <view
                     class="nav-menu nav-menu-btn"
                     @click="selectDevice('share')"
                     v-if="userInfo.authorities === 'app_vip_user'"
-                    >分享
+                >分享
                 </view>
             </template>
             <!-- <picker @change="projectTypeChange" :value="select.projectTypeIndex" :range="projectType" range-key="text">
@@ -70,7 +70,6 @@
                     <Cn-device-card :device="item" :key="index">
                         <template v-slot:title>
                             <!-- 卡片标题 -->
-
                             <switch
                                 v-if="transfer || share"
                                 :checked="checkList.indexOf(item.equipmentId) > -1"
@@ -78,8 +77,7 @@
                                 @change="switchChange(item)"
                             />
                             <view class="star-icon" v-else>
-                                <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                                <uni-icons type="search" size="25" color="#376cf3"></uni-icons>
-                                🔍
                             </view>
                         </template>
                     </Cn-device-card>
@@ -97,6 +95,7 @@
 import { getProjectList } from '@/common/api/project'
 import { queryDictData } from '@/common/api/dictionary'
 import { engineeringPinToTop } from '@/common/api/device'
+
 export default {
     props: {
         store: {
@@ -143,6 +142,7 @@ export default {
     },
     computed: {
         deviceListFilter() {
+   
             let arr = this.store.data.filter((item) => {
                 if (this.select.projectName && this.select.projectType) {
                     return item.project === this.select.projectName && item.type === this.select.projectType
@@ -167,7 +167,8 @@ export default {
     created() {
         this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
     },
-    mounted() {},
+    mounted() {
+    },
     methods: {
         bindClick(e, item) {
             engineeringPinToTop({
@@ -373,9 +374,11 @@ export default {
     .nav-menu {
     }
 }
+
 /deep/ .button-group--right {
     padding: 0 0 20rpx;
 }
+
 .star-icon {
     font-size: 40rpx;
 }

pages/index/comp/engineering.vue

@@ -151,8 +151,8 @@ export default {
                 // 存储参数
                 uni.setStorageSync('messageParams', {
         
-                    engineeringName: this.device.engineeringName,
+                    engineeringName: item.engineeringName,
-                    engineeringId: this.device.engineeringId, //工程ID
+                    engineeringId: item.engineeringId, //工程ID
                     projectName: '',
                     projectId: '', //項目ID
                     deviceName: '',

pages/index/comp/monitoringPoint.vue

@@ -0,0 +1,663 @@
+<template>
+    <view class="itic2-page">
+        <scroll-view class="itic2-scroll" scroll-y :show-scrollbar="false">
+            <view class="project-header card">
+                <view class="project-title-row">
+                    <view class="project-title-left">
+                        <uni-icons custom-prefix="iconfont" type="icon-gongcheng" size="22" color="#376cf3" />
+                        <text class="project-name">{{ engineeringName }}</text>
+                    </view>
+                    <view class="switch-btn" @click="switchEngineering">
+                        <uni-icons type="loop" size="14" color="#376cf3" />
+                        <text>切换工程</text>
+                    </view>
+                </view>
+                <view class="stats-row">
+                    <view class="stats-item" v-for="(item, idx) in summaryStats" :key="idx">
+                        <text class="stats-num">{{ item.value }}</text>
+                        <text class="stats-label">{{ item.label }}</text>
+                    </view>
+                </view>
+            </view>
+
+            <view class="monitor-section-header">
+                <view class="section-title-row section-title-row--no-mb">
+                    <uni-icons type="settings" size="18" color="#376cf3" />
+                    <text class="section-title">已选展示指标</text>
+                </view>
+            </view>
+            <view class="indicators-card card">
+                <view class="indicator-tags">
+                    <view
+                        v-for="(tag, idx) in selectedIndicators"
+                        :key="tag"
+                        class="indicator-tag indicator-tag--active"
+                        @click="removeIndicator(idx)"
+                    >
+                        <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">
+                        <text>+添加指标</text>
+                    </view>
+                </view>
+            </view>
+
+            <view class="monitor-section">
+                <view class="monitor-section-header">
+                    <view class="section-title-row section-title-row--no-mb">
+                        <uni-icons type="map-pin-ellipse" size="20" color="#376cf3" />
+                        <text class="section-title">监测点信息</text>
+                    </view>
+                    <view class="legend-row">
+                        <view class="legend-item" v-for="phase in phaseColors" :key="phase.name">
+                            <view class="legend-dot" :style="{ background: phase.color }" />
+                            <text class="legend-text">{{ phase.name }}</text>
+                        </view>
+                    </view>
+                </view>
+
+                <view class="monitor-list">
+                    <view class="monitor-card card" v-for="(point, idx) in monitoringPoints" :key="idx">
+                        <view class="card-header">
+                            <view class="event-icon">
+                                <Cn-icon-transient name="监测点" />
+                            </view>
+                            <view class="card-header-info">
+                                <text class="point-name ellipsis">{{ point.pointName }}</text>
+                                <view class="meta-row">
+                                    <text class="meta-item ellipsis">项目：{{ point.projectName }}</text>
+                                    <text class="meta-item ellipsis">设备：{{ point.deviceName }}</text>
+                                </view>
+                                <text class="meta-time ellipsis">最新数据时间：{{ point.dataTime || '-' }}</text>
+                            </view>
+                        </view>
+
+                        <view class="params-section">
+                            <view
+                                v-for="(rowItems, rowIdx) in chunkedChildren(getDisplayChildren(point))"
+                                :key="rowIdx"
+                                class="double-row"
+                            >
+                                <view v-for="(child, childIdx) in rowItems" :key="childIdx" class="param-group">
+                                    <view class="param-title">
+                                        <text>{{ child.name }}</text>
+                                    </view>
+                                    <view class="phase-vertical">
+                                        <view class="phase-item-vertical">
+                                            <text class="phase-value-vertical" :style="{ color: phaseColors[0].color }">{{ child.A }}</text>
+                                        </view>
+                                        <view class="phase-divider" />
+                                        <view class="phase-item-vertical">
+                                            <text class="phase-value-vertical" :style="{ color: phaseColors[1].color }">{{ child.B }}</text>
+                                        </view>
+                                        <view class="phase-divider" />
+                                        <view class="phase-item-vertical">
+                                            <text class="phase-value-vertical" :style="{ color: phaseColors[2].color }">{{ child.C }}</text>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+
+                        <view class="more-btn" @click="onMoreIndicators(point)">
+                            <uni-icons type="list" size="16" color="#376cf3" />
+                            <text>更多指标</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+
+        <uni-popup ref="indicatorPopup" type="bottom">
+            <view class="indicator-popup">
+                <view class="indicator-popup-header">
+                    <text class="indicator-popup-cancel" @click="closeIndicatorPopup">取消</text>
+                    <text class="indicator-popup-confirm" @click="confirmIndicatorPopup">确定</text>
+                </view>
+                <scroll-view class="indicator-popup-list" scroll-y>
+                    <view v-if="targetLists.length === 0" class="indicator-popup-empty">
+                        <text>暂无指标数据</text>
+                    </view>
+                    <view
+                        v-for="item in targetLists"
+                        :key="item.id || item.name"
+                        class="indicator-popup-item"
+                        :class="{ 'indicator-popup-item--active': popupSelectedIndicators.includes(item.name) }"
+                        @click="togglePopupIndicator(item.name)"
+                    >
+                        <text>{{ item.name }}</text>
+                        <uni-icons
+                            v-if="popupSelectedIndicators.includes(item.name)"
+                            type="checkmarkempty"
+                            size="18"
+                            color="#376cf3"
+                        />
+                    </view>
+                </scroll-view>
+            </view>
+        </uni-popup>
+    </view>
+</template>
+
+<script>
+import { queryByCode, queryCsDictTree } from '@/common/api/dictionary'
+
+const DEFAULT_INDICATOR_CODES = ['Key_Power_Quality_V', 'Key_Power_Quality_I']
+
+export default {
+    data() {
+        return {
+            targetLists: [],
+            popupSelectedIndicators: [],
+            engineeringName: '',
+            summaryStats: [
+                { label: '项目总数', value: 10 },
+                { label: '设备总数', value: 8 },
+                { label: '监测点总数', value: 12 },
+            ],
+            selectedIndicators: [],
+            phaseColors: [
+                { name: 'A相', color: '#F1B22E' },
+                { name: 'B相', color: '#2BA471' },
+                { name: 'C相', color: '#D54941' },
+            ],
+            monitoringPoints: [
+                {
+                    pointName: '测试监测点',
+                    projectName: '测试项目',
+                    deviceName: '测试设备',
+                    dataTime: '2026-05-29 12:00:00',
+                    children: [
+                        { name: '电压总有效值', A: '10.52', B: '10.52', C: '10.52' },
+                        { name: '电流总有效值', A: '10.52', B: '10.52', C: '10.52' },
+                        { name: '基波电压幅值', A: '10.52', B: '10.52', C: '10.52' },
+                        { name: '基波电流幅值', A: '10.52', B: '10.52', C: '10.52' },
+                    ],
+                },
+            ],
+        }
+    },
+    // 页面显示时同步工程名称
+    onShow() {
+        const engineering = uni.getStorageSync('engineering')
+        if (engineering?.name) {
+            this.engineeringName = engineering.name
+        }
+    },
+    // 加载电能质量指标字典
+    created() {
+        queryByCode('Key_Power_Quality').then((res) => {
+            queryCsDictTree(res.data.id).then((resp) => {
+                this.targetLists = (resp.data || []).slice().reverse()
+                this.initDefaultIndicators()
+            })
+        })
+    },
+    methods: {
+        // 指标名称超过6个字截断显示
+        formatIndicatorTag(name) {
+            if (!name || name.length <= 6) return name
+            return `${name.slice(0, 6)}...`
+        },
+        // 判断指标名称是否匹配（兼容括号后缀）
+        matchIndicator(name, selected) {
+            const base = (name || '').replace(/\(.*\)/, '')
+            return base.indexOf(selected) === 0 || selected.indexOf(base) === 0
+        },
+        // 初始化默认勾选指标
+        initDefaultIndicators() {
+            if (this.selectedIndicators.length) return
+            this.selectedIndicators = this.targetLists
+                .filter((item) => DEFAULT_INDICATOR_CODES.includes(item.code) && item.name)
+                .map((item) => item.name)
+        },
+        // 跳转切换工程
+        switchEngineering() {
+            uni.navigateTo({ url: '/pages/home/selectEngineering' })
+        },
+        // 移除已选指标
+        removeIndicator(idx) {
+            if (this.selectedIndicators.length <= 1) {
+                uni.showToast({ title: '至少保留一个指标', icon: 'none' })
+                return
+            }
+            this.selectedIndicators.splice(idx, 1)
+        },
+        // 打开指标选择弹窗
+        openIndicatorPopup() {
+            if (!this.targetLists.length) {
+                uni.showToast({ title: '暂无指标数据', icon: 'none' })
+                return
+            }
+            this.popupSelectedIndicators = this.targetLists
+                .filter((item) => this.selectedIndicators.some((name) => this.matchIndicator(item.name, name)))
+                .map((item) => item.name)
+            this.$refs.indicatorPopup.open()
+        },
+        // 关闭指标选择弹窗
+        closeIndicatorPopup() {
+            this.$refs.indicatorPopup.close()
+            this.popupSelectedIndicators = []
+        },
+        // 切换弹窗内指标勾选状态
+        togglePopupIndicator(name) {
+            const idx = this.popupSelectedIndicators.indexOf(name)
+            if (idx > -1) {
+                this.popupSelectedIndicators.splice(idx, 1)
+            } else {
+                this.popupSelectedIndicators.push(name)
+            }
+        },
+        // 确认指标选择
+        confirmIndicatorPopup() {
+            if (!this.popupSelectedIndicators.length) {
+                uni.showToast({ title: '至少保留一个指标', icon: 'none' })
+                return
+            }
+            this.selectedIndicators = [...this.popupSelectedIndicators]
+            this.closeIndicatorPopup()
+        },
+        // 查看更多指标
+        onMoreIndicators(point) {
+            const params = encodeURIComponent(
+                JSON.stringify({
+                    ...point,
+                    engineeringName: this.engineeringName,
+                    selectedIndicators: this.selectedIndicators,
+                }),
+            )
+            uni.navigateTo({
+                url: `/pages/index/comp/targetInfo?point=${params}`,
+            })
+        },
+        // 获取监测点当前展示的指标数据
+        getDisplayChildren(point) {
+            return (point.children || []).filter((child) =>
+                this.selectedIndicators.some((name) => this.matchIndicator(child.name, name)),
+            )
+        },
+        // 将指标列表按每行两个分组
+        chunkedChildren(children) {
+            const result = []
+            for (let i = 0; i < children.length; i += 2) {
+                result.push(children.slice(i, i + 2))
+            }
+            return result
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.itic2-page {
+    min-height: 100vh;
+    background: #f7f8fa;
+   
+}
+
+.itic2-scroll {
+    height: 100vh;
+    padding-top: 20rpx;
+    box-sizing: border-box;
+}
+
+.card {
+    background: #ffffff;
+    border-radius: 10px;
+  box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px;
+    margin: 0 10px 10px;
+    overflow: hidden;
+}
+
+.project-header {
+    padding: 20rpx;
+    // margin-top: 20rpx;
+}
+
+.project-title-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20rpx;
+}
+
+.project-title-left {
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
+    flex: 1;
+    min-width: 0;
+}
+
+.project-name {
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #333333;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.switch-btn {
+    display: flex;
+    align-items: center;
+    gap: 6rpx;
+    padding: 8rpx 20rpx;
+    border: 1rpx solid #376cf380;
+    background-color: #266FFF10;
+    border-radius: 16rpx;
+    flex-shrink: 0;
+
+    text {
+        font-size: 24rpx;
+        color: #376cf3;
+    }
+}
+
+.stats-row {
+    display: flex;
+    gap: 20rpx;
+}
+
+.stats-item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 4rpx;
+    padding: 16rpx 12rpx;
+    background: #376cf3;
+    border-radius: 16rpx;
+    color: #ffffff;
+}
+
+.stats-num {
+    font-size: 44rpx;
+    font-weight: 700;
+    line-height: 1.2;
+}
+
+.stats-label {
+    font-size: 26rpx;
+}
+
+.indicators-card {
+    padding: 24rpx;
+}
+
+.section-title-row {
+    display: flex;
+    align-items: center;
+    gap: 10rpx;
+    margin-bottom: 20rpx;
+
+    &--no-mb {
+        margin-bottom: 0;
+    }
+}
+
+.section-title {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.indicator-tags {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+}
+
+.indicator-tag {
+    display: flex;
+    align-items: center;
+    gap: 8rpx;
+    padding: 6rpx 16rpx;
+    border-radius: 16rpx;
+    font-size: 26rpx;
+    max-width: 100%;
+
+    .indicator-tag-text {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    &--active {
+        background: #376cf315;
+        color: #376cf3;
+    }
+
+    &--add {
+        background: #f5f5f5;
+        color: #666666;
+        border: 1rpx dashed #dcdfe6;
+    }
+}
+
+.monitor-section-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    gap: 12rpx;
+    padding: 0 10px 16rpx;
+}
+
+.legend-row {
+    display: flex;
+    gap: 20rpx;
+    align-items: center;
+}
+
+.legend-item {
+    display: flex;
+    align-items: center;
+    gap: 8rpx;
+}
+
+.legend-dot {
+    width: 16rpx;
+    height: 16rpx;
+    border-radius: 50%;
+}
+
+.legend-text {
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.monitor-list {
+    display: flex;
+    flex-direction: column;
+    padding-bottom: 40rpx;
+}
+
+.monitor-card {
+    border: 1rpx solid #eef2f6;
+  box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px;
+}
+
+.card-header {
+    padding: 20rpx 20rpx 12rpx;
+    display: flex;
+    align-items: center;
+    border-bottom: 1rpx solid #eef2f6;
+}
+
+.event-icon {
+    width: 90rpx;
+    height: 90rpx;
+    border-radius: 16rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-right: 20rpx;
+    background-color: #376cf320;
+    flex-shrink: 0;
+}
+
+.card-header-info {
+    flex: 1;
+    min-width: 0;
+}
+
+.point-name {
+    display: block;
+    font-size: 30rpx;
+    font-weight: 700;
+    color: #333333;
+    margin-bottom: 8rpx;
+}
+
+.meta-row {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 6rpx 12rpx;
+}
+
+.meta-item {
+    font-size: 26rpx;
+    color: #666666;
+    line-height: 1.3;
+}
+
+.meta-time {
+    display: block;
+    margin-top: 8rpx;
+    font-size: 26rpx;
+    color: #666666;
+    line-height: 1.3;
+}
+
+.params-section {
+    padding: 20rpx 16rpx;
+}
+
+.double-row {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 16rpx;
+    margin-bottom: 16rpx;
+
+    &:last-child {
+        margin-bottom: 0;
+    }
+}
+
+.param-group {
+    min-width: 0;
+    background: #f3f3f3;
+    border-radius: 16rpx;
+    padding: 16rpx 8rpx 12rpx;
+}
+
+.param-title {
+    font-size: 24rpx;
+    color: #666666;
+    margin-bottom: 8rpx;
+    padding-left: 4rpx;
+}
+
+.phase-vertical {
+    display: flex;
+    align-items: stretch;
+}
+
+.phase-item-vertical {
+    flex: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 4rpx;
+}
+
+.phase-value-vertical {
+    font-size: 28rpx;
+    font-weight: 700;
+}
+
+.phase-divider {
+    width: 1px;
+    background: #d2d2d2;
+    margin: 8rpx 0;
+}
+
+.more-btn {
+    margin: 0 20rpx 20rpx;
+    height: 72rpx;
+    line-height: 72rpx;
+    text-align: center;
+    border: 1rpx solid #376cf380;
+    background-color: #266FFF10;
+    border-radius: 16rpx;
+
+    text {
+        font-size: 28rpx;
+        color: #376cf3;
+        font-weight: 500;
+    }
+}
+
+.ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.indicator-popup {
+    background: #ffffff;
+    overflow: hidden;
+}
+
+.indicator-popup-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 18rpx 32rpx;
+    border-bottom: 1rpx solid #eef2f6;
+}
+
+.indicator-popup-cancel {
+    font-size: 27rpx;
+    color: #666666;
+    min-width: 80rpx;
+}
+
+
+.indicator-popup-confirm {
+    font-size: 28rpx;
+    color: #376cf3;
+    min-width: 80rpx;
+    text-align: right;
+}
+
+.indicator-popup-list {
+    max-height: 60vh;
+    padding: 16rpx 0;
+    box-sizing: border-box;
+}
+
+.indicator-popup-empty {
+    padding: 80rpx 0;
+    text-align: center;
+    font-size: 28rpx;
+    color: #999999;
+}
+
+.indicator-popup-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 28rpx 32rpx;
+    font-size: 28rpx;
+    color: #333333;
+
+    &--active {
+        color: #376cf3;
+        background: #376cf310;
+    }
+}
+</style>

pages/index/comp/steadyState.vue

@@ -332,6 +332,8 @@ export default {
     /* 图标区域（按类型区分背景色） */
     .event-icon {
         background-color: #376cf320;
+        width: 90rpx;
+        height: 90rpx;
     }
 
     .event-tags {

pages/index/comp/targetInfo.vue

@@ -0,0 +1,245 @@
+<template>
+    <view class="target-info-page">
+        <scroll-view class="target-info-scroll" scroll-y :show-scrollbar="false">
+            <view class="monitor-card card">
+                <view class="card-header">
+                    <view class="event-icon">
+                        <Cn-icon-transient name="监测点" />
+                    </view>
+                    <view class="card-header-info">
+                        <text class="point-name ellipsis">{{ pointInfo.pointName }}</text>
+                        <view class="meta-row">
+                            <text class="meta-item ellipsis">项目：{{ pointInfo.projectName }}</text>
+                            <text class="meta-item ellipsis">设备：{{ pointInfo.deviceName }}</text>
+                        </view>
+                        <text class="meta-time ellipsis">最新数据时间：{{ pointInfo.dataTime || '-' }}</text>
+                    </view>
+                </view>
+
+                <view class="legend-row">
+                    <view class="legend-item" v-for="phase in phaseColors" :key="phase.name">
+                        <view class="legend-dot" :style="{ background: phase.color }" />
+                        <text class="legend-text">{{ phase.name }}</text>
+                    </view>
+                </view>
+
+                <view class="params-section">
+                    <view
+                        v-for="(rowItems, rowIdx) in chunkedChildren(pointInfo.children || [])"
+                        :key="rowIdx"
+                        class="double-row"
+                    >
+                        <view v-for="(child, childIdx) in rowItems" :key="childIdx" class="param-group">
+                            <view class="param-title">
+                                <text>{{ child.name }}</text>
+                            </view>
+                            <view class="phase-vertical">
+                                <view class="phase-item-vertical">
+                                    <text class="phase-value-vertical" :style="{ color: phaseColors[0].color }">{{ child.A }}</text>
+                                </view>
+                                <view class="phase-divider" />
+                                <view class="phase-item-vertical">
+                                    <text class="phase-value-vertical" :style="{ color: phaseColors[1].color }">{{ child.B }}</text>
+                                </view>
+                                <view class="phase-divider" />
+                                <view class="phase-item-vertical">
+                                    <text class="phase-value-vertical" :style="{ color: phaseColors[2].color }">{{ child.C }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            pointInfo: {},
+            phaseColors: [
+                { name: 'A相', color: '#F1B22E' },
+                { name: 'B相', color: '#2BA471' },
+                { name: 'C相', color: '#D54941' },
+            ],
+        }
+    },
+    onLoad(options) {
+        if (options.point) {
+            this.pointInfo = JSON.parse(decodeURIComponent(options.point))
+        }
+    },
+    methods: {
+        // 将指标列表按每行两个分组
+        chunkedChildren(children) {
+            const result = []
+            for (let i = 0; i < children.length; i += 2) {
+                result.push(children.slice(i, i + 2))
+            }
+            return result
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.target-info-page {
+    min-height: 100vh;
+    background: #f7f8fa;
+}
+
+.target-info-scroll {
+    height: 100vh;
+    box-sizing: border-box;
+    padding: 20rpx 0 40rpx;
+}
+
+.card {
+    background: #ffffff;
+    border-radius: 10px;
+    box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 1px 1px;
+    margin: 0 10px;
+    overflow: hidden;
+}
+
+.monitor-card {
+    border: 1rpx solid #eef2f6;
+}
+
+.card-header {
+    padding: 20rpx 20rpx 12rpx;
+    display: flex;
+    align-items: center;
+    border-bottom: 1rpx solid #eef2f6;
+}
+
+.event-icon {
+    width: 90rpx;
+    height: 90rpx;
+    border-radius: 16rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-right: 20rpx;
+    background-color: #376cf320;
+    flex-shrink: 0;
+}
+
+.card-header-info {
+    flex: 1;
+    min-width: 0;
+}
+
+.point-name {
+    display: block;
+    font-size: 30rpx;
+    font-weight: 700;
+    color: #333333;
+    margin-bottom: 8rpx;
+}
+
+.meta-row {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 6rpx 12rpx;
+}
+
+.meta-item {
+    font-size: 26rpx;
+    color: #666666;
+    line-height: 1.3;
+}
+
+.meta-time {
+    display: block;
+    margin-top: 8rpx;
+    font-size: 26rpx;
+    color: #666666;
+    line-height: 1.3;
+}
+
+.legend-row {
+    display: flex;
+    gap: 20rpx;
+    align-items: center;
+    padding: 16rpx 20rpx;
+}
+
+.legend-item {
+    display: flex;
+    align-items: center;
+    gap: 8rpx;
+}
+
+.legend-dot {
+    width: 16rpx;
+    height: 16rpx;
+    border-radius: 50%;
+}
+
+.legend-text {
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.params-section {
+    padding: 0 16rpx 20rpx;
+}
+
+.double-row {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 16rpx;
+    margin-bottom: 16rpx;
+
+    &:last-child {
+        margin-bottom: 0;
+    }
+}
+
+.param-group {
+    min-width: 0;
+    background: #f9fafb;
+    border-radius: 16rpx;
+    padding: 16rpx 8rpx 12rpx;
+}
+
+.param-title {
+    font-size: 26rpx;
+    color: #666666;
+    margin-bottom: 8rpx;
+    padding-left: 4rpx;
+}
+
+.phase-vertical {
+    display: flex;
+    align-items: stretch;
+}
+
+.phase-item-vertical {
+    flex: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 4rpx;
+}
+
+.phase-value-vertical {
+    font-size: 28rpx;
+    font-weight: 700;
+}
+
+.phase-divider {
+    width: 1px;
+    background: #d2d2d2;
+    margin: 8rpx 0;
+}
+
+.ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+</style>

pages/index/comp/transient.vue

@@ -39,9 +39,9 @@
                                 <text class="event-id">{{ item.lineName }}</text>
                             </view>
                             <view class="event-desc">
-                                <text>工程名称：{{ item.engineeringName }}</text>
+                                <text>工程：{{ item.engineeringName }}</text>
-                                <text>项目名称：{{ item.projectName }}</text>
+                                <text>项目：{{ item.projectName }}</text>
-                                <text>设备名称：{{ item.deviceName }}</text>
+                                <text>设备：{{ item.deviceName }}</text>
                                 <!-- <text>申请时间：{{ item.time }}</text>
                                 <text>事件数：{{ item.eventNums }}</text> -->
                             </view>
@@ -327,11 +327,12 @@ export default {
 .device-body-item {
     display: flex;
     // justify-content: space-between;
-    font-size: 28rpx;
+    font-size: 26rpx;
     color: #666666;
     line-height: 1.5;
     
 
+    
 }
 
 // }

pages/index/index.vue

@@ -1,33 +1,20 @@
 <template>
     <Cn-page :loading="loading" noPadding>
         <view slot="body" class="canneng-index">
-            <uni-nav-bar
+            <uni-nav-bar rightWidth="300rpx" leftWidth="300rpx" dark :fixed="true" status-bar background-color="#fff"
-                rightWidth="300rpx"
+                color="#111" @clickRight="selectEngineering">
-                leftWidth="300rpx"
-                dark
-                :fixed="true"
-                status-bar
-                background-color="#fff"
-                color="#111"
-                @clickRight="selectEngineering"
-            >
                 <template slot="left">
                     <text style="font-size: 32rpx; font-weight: 500">灿能物联</text>
                 </template>
                 <template slot="right">
-                    <text class="hide-txt mr5" style="font-size: 28rpx"
+                    <text class="hide-txt mr5" style="font-size: 28rpx">{{
-                        >{{
+                        userInfo.authorities === 'engineering_user'
-                            userInfo.authorities === 'engineering_user'
+                            ? '创建工程'
-                                ? '创建工程'
+                            : select.engineeringName || emptyEngineeringName
-                                : select.engineeringName || emptyEngineeringName
+                    }}
-                        }}
                     </text>
-                    <uni-icons
+                    <uni-icons type="bottom" size="16" color="#111"
-                        type="bottom"
+                        v-if="select.engineeringName && userInfo.authorities != 'engineering_user'"></uni-icons>
-                        size="16"
-                        color="#111"
-                        v-if="select.engineeringName && userInfo.authorities != 'engineering_user'"
-                    ></uni-icons>
                 </template>
             </uni-nav-bar>
             <view class="index">
@@ -48,7 +35,10 @@
                 </template>
                 <!-- 设备列表 -->
                 <template v-else v-show="engineeringList.length">
-                    <view class="canneng-index-title mt20">设备列表</view>
+                    <view class="canneng-index-title mt20">
+                        <view>设备列表</view>
+                        <view class="nav-menu nav-menu-btn boxClick" @click="jump">关键指标概览 </view>
+                    </view>
                     <Device ref="device" :store="store" />
                 </template>
             </view>
@@ -227,6 +217,11 @@ export default {
             })
         },
         // 动态配置导航栏按钮
+        jump() {
+            uni.navigateTo({
+                url: `/pages/index/comp/monitoringPoint`,
+            })
+        }
     },
     onLoad() {
         // 页面加载时，动态配置导航栏按钮
@@ -308,6 +303,7 @@ export default {
 .canneng-index-title {
     padding: 0 20rpx;
     font-weight: 500;
+    display: flex;
 }
 
 /deep/ .uni-card {
@@ -317,4 +313,28 @@ export default {
 /deep/ .uni-drawer__content {
     width: 100vw !important;
 }
+
+.nav-menu {
+    height: 40rpx;
+    padding: 4rpx 20rpx;
+    // margin-left: 20rpx;
+    // margin-bottom: 20rpx;
+    line-height: 38rpx;
+    font-size: 24rpx;
+    border-radius: 8rpx;
+    background: #ebeaec;
+    color: #666;
+
+    &-active {
+        background: #dfe5f7;
+        color: $uni-theme-color;
+    }
+
+    &-btn {
+        background: $uni-theme-color;
+        color: #fff;
+    }
+
+    margin-left: auto;
+}
 </style>

pages/index/message1.vue

@@ -2,13 +2,8 @@
     <Cn-page :loading="loading" class="messageBox" style="padding-top: 10px">
         <view slot="body" class="message">
             <view class="tabsBox">
-                <uni-segmented-control
+                <uni-segmented-control :current="current" :values="items" style-type="text" active-color="#376cf3"
-                    :current="current"
+                    @clickItem="onClickItem" />
-                    :values="items"
-                    style-type="text"
-                    active-color="#376cf3"
-                    @clickItem="onClickItem"
-                />
                 <!-- 角标 -->
                 <view class="badge-container">
                     <span v-for="(item, index) in items" :key="index" class="badge">
@@ -17,42 +12,28 @@
                     </span>
                 </view>
                 <!-- 筛选条件 -->
-                <Cn-filterCriteria
+                <Cn-filterCriteria ref="cnFilterCriteria" :level="current === 0 ? 3 : current === 1 ? 3 : 2"
-                    ref="cnFilterCriteria"
+                    @select="select">
-                    :level="current === 0 ? 3 : current === 1 ? 3 : 2"
+                    <picker v-if="current === 0" @change="bindPickerChange" :value="sortIndex" :range="sortOptions">
-                    @select="select"
+                        <view class="nav-menu nav-menu1">
-                >
+                            <view class="nav-text">
+                                {{ sortOptions[sortIndex] }}排序
+                            </view>
+
+                            <uni-icons type="bottom" size="14"></uni-icons>
+                        </view>
+                    </picker>
                 </Cn-filterCriteria>
             </view>
             <view class="content">
-                <Transient
+                <Transient ref="TransientRef" v-if="current === 0" :navHeight="navHeight" :selectValue="selectValue"
-                    ref="TransientRef"
+                    :sortIndex="sortIndex" @getDevCount="getDevCount" />
-                    v-if="current === 0"
+                <SteadyState ref="SteadyStateRef" v-if="current === 1" :navHeight="navHeight" :selectValue="selectValue"
-                    :navHeight="navHeight"
+                    @getDevCount="getDevCount" />
-                    :selectValue="selectValue"
+                <Alarm ref="AlarmRef" v-if="current === 2" :navHeight="navHeight" :selectValue="selectValue"
-                    @getDevCount="getDevCount"
+                    @getDevCount="getDevCount" />
-                />
+                <Run ref="RunRef" v-if="current === 3" :navHeight="navHeight" :selectValue="selectValue"
-                <SteadyState
+                    @getDevCount="getDevCount" />
-                    ref="SteadyStateRef"
-                    v-if="current === 1"
-                    :navHeight="navHeight"
-                    :selectValue="selectValue"
-                    @getDevCount="getDevCount"
-                />
-                <Alarm
-                    ref="AlarmRef"
-                    v-if="current === 2"
-                    :navHeight="navHeight"
-                    :selectValue="selectValue"
-                    @getDevCount="getDevCount"
-                />
-                <Run
-                    ref="RunRef"
-                    v-if="current === 3"
-                    :navHeight="navHeight"
-                    :selectValue="selectValue"
-                    @getDevCount="getDevCount"
-                />
             </view>
         </view>
     </Cn-page>
@@ -79,10 +60,11 @@ export default {
             navHeight: 0,
             selectValue: {},
             devCount: [],
-            // 筛选数据
+            sortIndex: 0,
+            sortOptions: ['发生时间', '暂降深度', '持续时间'],
         }
     },
-    onLoad() {},
+    onLoad() { },
     mounted() {
         this.setHeight()
     },
@@ -124,8 +106,6 @@ export default {
             if (params.engineeringName != '') {
                 this.$refs.cnFilterCriteria && this.$refs.cnFilterCriteria.external(params)
             }
-            // this.refresh()
-            this.$refs.TransientRef && this.$refs.TransientRef.getConfig()
         })
     },
     // 页面销毁
@@ -186,6 +166,14 @@ export default {
                 this.setHeight()
             }, 100)
         },
+        bindPickerChange(e) {
+            this.sortIndex = e.detail.value
+            setTimeout(() => {
+                if (this.$refs.TransientRef) {
+                    this.$refs.TransientRef.init()
+                }
+            }, 0)
+        },
         // 设置角标
         getDevCount() {
             if (uni.getStorageSync('projectList')[1] != undefined) {
@@ -253,13 +241,16 @@ export default {
 <style lang="scss">
 .messageBox {
     overflow: hidden;
+
     /deep/.tabsBox {
         position: relative;
         background-color: #fff;
+
         .segmented-control {
             // height: 40px;
             background-color: #fff;
             border-bottom: 1px solid #cccccc70;
+
             .segmented-control__item {
                 align-items: baseline;
                 margin-top: 5px;
@@ -270,10 +261,12 @@ export default {
             font-size: 30rpx !important;
             color: rgb(96, 98, 102);
         }
+
         .segmented-control__item--text {
             font-weight: bold;
             padding: 0 0 5rpx;
         }
+
         .choose {
             // padding: 20rpx;
             // display: flex;
@@ -287,38 +280,67 @@ export default {
         width: 90%;
         margin: 20rpx auto;
     }
+
     .badge-container {
         position: absolute;
-        top: -10rpx; /* 徽章向上偏移，与控件重叠 */
+        top: -10rpx;
+        /* 徽章向上偏移，与控件重叠 */
         display: flex;
         justify-content: space-around;
         right: 0;
         width: 100%;
         height: 0;
-        pointer-events: none; /* 确保徽章不干扰点击事件 */
+        pointer-events: none;
+        /* 确保徽章不干扰点击事件 */
     }
+
     /deep/ .uni-badge--error {
         background-color: #ff3b30;
     }
 
     .badge {
         flex: 1;
-        // position: absolute;
-        // min-width: 18px;
-        // height: 16px;
-        // padding: 0 4px;
-        // background-color: #ff3b30; /* 红色徽章 */
-        // color: white;
-        // font-size: 22rpx;
-        // line-height: 16px;
-        // text-align: center;
-        // border-radius: 9px;
-        //
         text-align: center;
-        // transform: translateX(-110%); /* 使徽章中心对齐右上角 */
+
         .uni-badge--x {
             left: 70rpx;
         }
     }
+
+    .sort-picker {
+        font-size: 24rpx;
+        color: #2563eb;
+        display: flex;
+        align-items: center;
+        white-space: nowrap;
+    }
+}
+
+.nav-menu {
+    display: flex;
+    align-items: center;
+}
+
+
+.nav-menu1 {
+    display: flex;
+    align-items: center;
+    max-width: calc(100vw - 150px);
+}
+
+/* 文字容器：单行溢出省略 */
+.nav-text {
+    flex: 1;
+    overflow: hidden;
+    white-space: nowrap;
+    /* 强制不换行 */
+    text-overflow: ellipsis;
+    // -webkit-line-clamp: 1;
+    // display: -webkit-box;
+    // -webkit-box-orient: vertical;
+    // text-overflow: ellipsis;
+    // word-break: break-all;
+    // white-space: nowrap;
+    line-height: 1;
 }
 </style>

pages/index/mine.vue

@@ -52,6 +52,7 @@
                 <view class="mine-nav-label">项目管理</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
+    
             <view class="mine-nav" @click="jump('feedback')" v-if="userInfo.authorities !== 'tourist'">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/feedback.png" />
                 <view class="mine-nav-label">反馈列表</view>
@@ -75,18 +76,17 @@
             <view
                 class="mine-nav"
                 @click="jump('engineering/setting')"
-                v-if="userInfo.authorities === 'engineering_user' || userInfo.authorities !== 'tourist'"
+                v-if="userInfo.authorities === 'engineering_user' || userInfo.authorities == 'operation_manager'"
             >
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/like.png" />
                 <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'">
+            <!-- <view class="mine-nav" @click="jump('transientSetting')" v-if="userInfo.authorities !== 'tourist'">
-                <!-- 调试内容配置  serverSetting-->
                 <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> -->
             <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>

pages/message/message.vue

@@ -18,20 +18,21 @@
                     <view class="content-item-header-right">
                         <view class="content-item-header-right-title">{{ item.equipmentName }}</view>
                         <!-- <view class="content-item-header-right-des">{{ item.engineeringName }} {{ item.projectName }}</view> -->
-                        <view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view>
+                        <view class="content-item-header-right-des">工程：{{ item.engineeringName }}</view>
-                        <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
+                        <view class="content-item-header-right-des">项目：{{ item.projectName }}</view>
                         <view class="content-item-header-right-des" v-if="type == '0' || type == '1'"
-                            >监测点名称：{{ item.lineName }}</view
+                        >监测点：{{ item.lineName }}
+                        </view
                         >
                         <view class="content-item-header-right-des" v-if="type == '0'"
-                            >暂态类型：{{ item.showName }}</view
+                        >暂态类型：{{ item.showName }}
+                        </view
                         >
                         <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
                     </view>
                     <view class="ml10" v-if="type === '0' || item.status != '1'">
-                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                        <uni-icons type="search" size="25" color="#376cf3"></uni-icons>
-                            🔍
+                    </view>
-                </view>
                 </view>
                 <view class="content-item-footer">{{ item.subTitle }}</view>
             </view>

pages/message/messageDetail.vue

@@ -7,10 +7,10 @@
             </view>
             <view class="detail-content">
                 <view class="detail-content-title mb20">基础信息</view>
-                <view class="mb5"> 设备名称：{{ detail.equipmentName }}</view>
+                <view class="mb5"> 设备：{{ detail.equipmentName }}</view>
-                <view class="mb5"> 项目名称：{{ detail.projectName }} </view>
+                <view class="mb5"> 项目：{{ detail.projectName }} </view>
-                <view class="mb5"> 工程名称：{{ detail.engineeringName }} </view>
+                <view class="mb5"> 工程：{{ detail.engineeringName }} </view>
-                <view class="mb5"> 事件名称：{{ detail.showName }}</view>
+                <view class="mb5"> 事件：{{ detail.showName }}</view>
                 <view class="mb5" v-for="(item, textIndex) in detail.dataSet" :key="textIndex">
                     {{ item.showName + '：' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }}
                 </view>

pages/message1/alarm.vue

@@ -3,23 +3,12 @@
         <!-- 运行告警 -->
 
         <!-- 卡片 -->
-        <scroll-view
+        <scroll-view scroll-y="true" @refresherrefresh="refresherrefresh" @scrolltolower="scrolltolower"
-            scroll-y="true"
+            :refresher-triggered="triggered" refresher-enabled="true" class="event-list"
-            @refresherrefresh="refresherrefresh"
+            :style="{ height: 'calc(100vh - ' + (navHeight + 10) + 'px)', overflow: 'auto' }">
-            @scrolltolower="scrolltolower"
-            :refresher-triggered="triggered"
-            refresher-enabled="true"
-            class="event-list"
-            :style="{ height: 'calc(100vh - ' + (navHeight + 10) + 'px)', overflow: 'auto' }"
-        >
             <!-- 循环渲染事件项 -->
-            <uni-card
+            <uni-card class="event-item boxClick" :class="item.type" v-for="(item, index) in this.store.data"
-                class="event-item boxClick"
+                :key="index" @click="jump(item)">
-                :class="item.type"
-                v-for="(item, index) in this.store.data"
-                :key="index"
-                @click="jump(item)"
-            >
                 <!-- 头部：图标 + 信息 + 操作 -->
                 <view class="event-header">
                     <view class="event-icon">
@@ -31,38 +20,37 @@
                             color="#376cf3"
                         ></uni-icons> -->
                         <Cn-icon-transient :name="`运行告警`" />
-                        <view class="badge1" v-if="item.isRead == 0"> </view>
+                        <view class="badge1" v-if="item.isRead == 0"></view>
                     </view>
                     <view class="event-info">
                         <view class="event-title">
                             <text class="event-id">{{ item.date }}</text>
                         </view>
                         <view class="event-desc">
-                            <text>告警终端：{{ item.warnNums }}台</text>
+                            <text>告警终端总数：{{ item.warnNums }}台</text>
-                            <text>通讯中断：{{ item.interruptCounts }}次</text>
+                            <text v-if="item.onlineRateIsWarn">在线率偏低</text>
-                            <text>终端告警：{{ item.warnCounts}}次</text>
+                            <text v-if="item.integrityIsWarn">完整性偏低</text>
+                            <text v-if="item.warnCounts > 0">事件触发终端告警：{{ item.warnCounts }}次</text>
 
                         </view>
                     </view>
                     <view class="event-action">
-                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                        <uni-icons type="search" size="25" color="#376cf3"></uni-icons>
-                        🔍
                     </view>
                 </view>
                 <!-- <view class="event-detail">
-                    <text> 告警终端{{ item.warnNums }}台 </text>
+                    <text> 告警终端总数{{ item.warnNums }}台 </text>
                 </view> -->
             </uni-card>
-            <uni-load-more
+            <uni-load-more v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
-                v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+                :status="store.status"></uni-load-more>
-                :status="store.status"
-            ></uni-load-more>
             <Cn-empty v-else style="top: 20%"></Cn-empty>
         </scroll-view>
     </view>
 </template>
 <script>
 import list from '@/common/js/list'
+
 export default {
     components: {},
     props: {
@@ -82,7 +70,8 @@ export default {
             status: 'noMore', //more加载前  loading加载中 noMore加载后
         }
     },
-    mounted() {},
+    mounted() {
+    },
 
     methods: {
         init() {
@@ -101,8 +90,9 @@ export default {
         },
         jump(item) {
             let str = JSON.stringify(item).replace(/%/g, '百分比')
-            item.status = '1'
             uni.navigateTo({ url: '/pages/message1/comp/alarmDetails?detail=' + encodeURIComponent(str) })
+            item.isRead = 1
+
         },
         // 下拉
         refresherrefresh() {
@@ -137,6 +127,7 @@ export default {
 
 <style lang="scss" scoped>
 @import './index.scss';
+
 /* 列表容器 */
 .event-list {
     margin-top: 20rpx;
@@ -160,7 +151,12 @@ export default {
         flex: 1;
     }
 }
+
 /deep/ .uni-scroll-view-refresher {
     display: none;
 }
+
+.event-header {
+    margin-bottom: 0rpx !important;
+}
 </style>

pages/message1/comp/F47.vue

@@ -225,7 +225,7 @@ export default {
                 // 点击查看详情
                 let item = params.value[3]
                 let str = JSON.stringify(item).replace(/%/g, '百分比')
-                uni.navigateTo({ url: '/pages/message1/comp/transientDetails?detail=' + encodeURIComponent(str) })
+                // uni.navigateTo({ url: '/pages/message1/comp/transientDetails?detail=' + encodeURIComponent(str) })
             })
         },
     },

pages/message1/comp/ITIC.vue

@@ -217,7 +217,7 @@ export default {
                 // 点击查看详情
                 let item = params.value[3]
                 let str = JSON.stringify(item).replace(/%/g, '百分比')
-                uni.navigateTo({ url: '/pages/message1/comp/transientDetails?detail=' + encodeURIComponent(str) })
+                // uni.navigateTo({ url: '/pages/message1/comp/transientDetails?detail=' + encodeURIComponent(str) })
             })
         },
     },

pages/message1/comp/alarmDetails.vue

@@ -13,10 +13,8 @@
                 <uni-card class="event-item" :class="item.type" v-for="(item, index) in list" :key="index">
                     <!-- 头部：图标 + 信息 + 操作 -->
                     <view class="event-header">
-                        <view
+                        <view class="event-icon"
-                            class="event-icon"
+                            :class="item.devType == 'Direct_Connected_Device' ? 'zl-bgc' : 'jc-bgc'">
-                            :class="item.devType == 'Direct_Connected_Device' ? 'zl-bgc' : 'jc-bgc'"
-                        >
                             <!-- 动态图标：根据类型切换 -->
                             <!-- <uni-icons
                                 custom-prefix="iconfont"
@@ -25,46 +23,55 @@
                                 color="#FF0000"
                             ></uni-icons> -->
                             <!-- <Cn-icon-transient :name="`运行告警`" /> -->
-                            <Cn-icon-transient
+                            <Cn-icon-transient :name="item.devType == 'Direct_Connected_Device' ? '治理设备' : '监测设备'" />
-                                :name="item.devType == 'Direct_Connected_Device' ? '治理设备' : '监测设备'"
-                            />
                             <view class="badge1" v-if="item.status == 0"> </view>
                         </view>
                         <view class="event-info">
                             <view class="event-title">
                                 <text class="event-id">{{ item.devName }}</text>
-                                <text
+                                <text class="event-tag"
-                                    class="event-tag"
+                                    :class="item.devType == 'Direct_Connected_Device' ? 'zl-tag' : 'jc-tag'">{{
-                                    :class="item.devType == 'Direct_Connected_Device' ? 'zl-tag' : 'jc-tag'"
+                                        item.devType == 'Direct_Connected_Device' ? '治理设备' : '监测设备' }}</text>
-                                    >{{ item.devType == 'Direct_Connected_Device' ? '治理设备' : '监测设备' }}</text
-                                >
                             </view>
                             <view class="event-desc">
-                                <text>工程名称：{{ item.engineeringName }}</text>
+                                <text>工程：{{ item.engineeringName }}</text>
-                                <text>项目名称：{{ item.projectName }}</text>
+                                <text>项目：{{ item.projectName }}</text>
+                                <!-- <text v-if="item.dataDetails.onlineRate.isAbnormal">在线率：{{
+                                    item.dataDetails.onlineRate.value }}%　限值：{{ item.dataDetails.onlineRate.threshold
+                                    }}% </text> -->
                                 <!-- <text>事件时间：{{ item.startTime }}</text> -->
                             </view>
                         </view>
                     </view>
                     <!-- 详情区域 -->
                     <view class="event-detail">
-                        <view v-if="item.interruptCounts">
+                        <view v-if="item.dataDetails.onlineRate.isAbnormal">
-                            通讯中断 {{ item.interruptCounts }} 次，详情如下：
+                            <text>在线率：
-                            <view class="textBox">
+                                {{item.dataDetails.onlineRate.value }}%　
-                                <view
+                            </text>
-                                    v-for="date in String(item.interruptDetails || '').split('，')"
+
-                                    class="textBox mb5"
-                                    >{{ date }}</view
-                                ></view
-                            >
                         </view>
-                        <view v-if="item.warnCounts">
+                        <view v-if="hasIntegrityAbnormal(item)" class="mt10">
+                            数据完整性：
+                            <view class="data-table">
+                                <view class="table-header">
+                                    <text>监测点</text>
+                                    <text>完整性</text>
+                                </view>
+                                <view class="table-row"
+                                    v-for="value in item.dataDetails.integrity.monitorPoints.filter((p) => p.isAbnormal === true)">
+                                    <text>{{ value.monitorName }}</text>
+                                    <text>{{ value.value }}%</text>
+                                </view>
+                            </view>
+                        </view>
+                        <view v-if="item.warnCounts" class="mt10">
                             终端告警 {{ item.warnCounts }} 次，详情如下：
                             <view class="textBox">
                                 <view v-for="val in item.warnDetails" class="textBox mb5">
                                     {{ val.warnEventTime + '发生' + val.warnEventDesc }}
-                                </view></view
+                                </view>
-                            >
+                            </view>
                         </view>
                     </view>
                 </uni-card>
@@ -97,6 +104,11 @@ export default {
         }
     },
     methods: {
+        hasIntegrityAbnormal(item) {
+            const points = item?.dataDetails?.integrity?.monitorPoints
+            if (!Array.isArray(points) || !points.length) return false
+            return points.every((p) => p.isAbnormal === true)
+        },
         init() {
             queryAlarmDetail({
                 devList: this.detail.devIds,
@@ -115,6 +127,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import '../index.scss';
+
 .detail {
     padding: 20rpx 0;
 
@@ -130,60 +143,102 @@ export default {
             font-weight: 700;
         }
     }
+
     .collapseTop {
         padding: 10rpx 0;
         margin-left: 15px;
+
         .name {
             font-size: 28rpx;
             font-weight: 700;
             color: #333333;
         }
     }
+
     .frequency {
         display: flex;
         font-size: 28rpx;
         // color: #666666;
     }
 }
+
 .textBox {
     // border-bottom: 1px solid #eee;
     font-size: 28rpx;
     color: #666666;
     text-indent: 2em;
 }
+
 .event-list {
     // background: #fff;
     padding-bottom: 10rpx;
+
     // .event-icon {
     //     background-color: #376cf320;
     // }
     .zl-bgc {
         background-color: #376cf320;
     }
+
     .jc-bgc {
         background-color: #376cf320;
     }
+
     .zl-tag {
         background-color: #007aff20;
         color: #007aff;
     }
+
     .jc-tag {
         background-color: #007aff20;
         color: #007aff;
     }
 }
+
 /deep/ .uni-collapse-item__title-box {
     padding: 0 15px 0 0;
     height: 56rpx;
     line-height: 56rpx;
     font-size: 26rpx !important;
     color: #666666;
+
     span {
         font-size: 26rpx !important;
     }
 }
+
 .textBox {
     max-height: 120rpx;
     overflow-y: auto;
 }
+
+.data-table {
+    margin-top: 10rpx;
+    background-color: #fff;
+    overflow: hidden;
+
+    .table-header,
+    .table-row {
+        display: flex;
+        justify-content: space-between;
+        padding: 15rpx 0rpx;
+        border-bottom: 1rpx solid #eee;
+        height: 20px;
+
+        text {
+            text-align: center;
+            font-size: 28rpx;
+            flex: 1;
+
+
+
+
+        }
+    }
+
+    .table-header {
+        padding: 0rpx;
+        padding-bottom: 10rpx;
+    }
+}
 </style>

pages/message1/comp/steadyStateDetails.vue

@@ -7,19 +7,17 @@
             </view>
             <view class="detail-content">
                 <view class="detail-content-title mb20">基础信息</view>
-                <view class="mb5"> 工程名称：{{ detail.engineeringName }} </view>
+                <view class="mb5"> 工程：{{ detail.engineeringName }} </view>
-                <view class="mb5"> 项目名称：{{ detail.projectName }} </view>
+                <view class="mb5"> 项目：{{ detail.projectName }} </view>
-                <view class="mb5"> 设备名称：{{ detail.devName }} </view>
+                <view class="mb5"> 设备：{{ detail.devName }} </view>
-                <view class="mb5"> 监测点名称：{{ detail.lineName }}</view>
+                <view class="mb5"> 监测点：{{ detail.lineName }}</view>
                 <view class="mb5" style="display: flex">
                     越限详情：
-                    <view style="flex: 1" class="details">{{ detail.overLimitDesc }}</view></view
+                    <view style="flex: 1" class="details">{{ detail.overLimitDesc }}</view>
-                >
+                </view>
             </view>
             <view class="detail-content">
-                <view class="detail-content-title mb20"
+                <view class="detail-content-title mb20">指标越限详情<text class="prompt">（仅显示最严重的10组数据）</text></view>
-                    >指标越限详情<text class="prompt">（仅显示最严重的10组数据）</text></view
-                >
 
                 <uni-collapse accordion v-model="collapseValue">
                     <uni-collapse-item :title="item.targetName" v-for="item in list">
@@ -35,7 +33,7 @@
                             </view>
                             <view class="table-row" v-for="value in item.harmDetailList">
                                 <text>{{ value.statisticsTime }}</text>
-                                <text>{{ value.valueType }}</text>
+                                <text>{{ value.valueType || '/' }}</text>
                                 <text v-if="!value.hasT">{{ value.dataA }}</text>
                                 <text v-if="!value.hasT">{{ value.dataB }}</text>
                                 <text v-if="!value.hasT">{{ value.dataC }}</text>
@@ -105,6 +103,7 @@ export default {
             font-weight: 700;
         }
     }
+
     .limit {
         display: flex;
         align-items: center;
@@ -112,46 +111,58 @@ export default {
         width: 450rpx;
         margin-left: auto;
     }
+
     .prompt {
         font-size: 24rpx;
         color: #111;
         font-weight: 500;
     }
 }
+
 .data-table {
     margin-top: 20rpx;
     background-color: #fff;
     overflow: hidden;
+    color: #666;
+
     .table-header,
     .table-row {
         display: flex;
         justify-content: space-between;
-        padding: 20rpx 0rpx;
+        padding: 15rpx 0rpx;
+        height: 20px;
         border-bottom: 1rpx solid #eee;
+
         text {
             width: 100rpx;
             text-align: center;
             font-size: 28rpx;
+
             // color: #333;
             &:nth-child(1) {
                 flex: 1;
             }
+
             &:nth-child(2) {
                 flex: 1;
             }
         }
     }
+
     .table-header {
         padding: 0rpx;
         padding-bottom: 10rpx;
     }
 }
+
 /deep/ .uni-collapse-item__title-text {
     font-weight: 700;
+
     span {
         font-size: 28rpx;
     }
 }
+
 .details {
     max-height: 70px;
     overflow-y: auto;

pages/message1/comp/transientDetails.vue

@@ -2,60 +2,97 @@
     <Cn-page :loading="loading">
         <view class="detail" slot="body">
             <view class="detail-content" style="font-size: 32rpx">
-                <!-- <view class="detail-content-title mb20">发生时间</view> -->
                 <view>{{ detail.startTime }}</view>
             </view>
             <view class="detail-content">
                 <view class="detail-content-title mb20">基础信息</view>
-                <view class="mb5"> 工程名称：{{ detail.engineeringName }} </view>
+                <view class="mb5"> 工程：{{ detail.engineeringName }} </view>
-                <view class="mb5"> 项目名称：{{ detail.projectName }} </view>
+                <view class="mb5"> 项目：{{ detail.projectName }} </view>
-                <view class="mb5"> 设备名称：{{ detail.equipmentName }}</view>
+                <view class="mb5"> 设备：{{ detail.equipmentName }}</view>
-                <view class="mb5"> 监测点名称：{{ detail.lineName }}</view>
+                <view class="mb5"> 监测点：{{ detail.lineName }}</view>
                 <view class="mb5"> 暂态类型：{{ detail.showName }}</view>
                 <view class="mb5" v-if="detail.evtParamTm"> 持续时间：{{ detail.evtParamTm }}s</view>
                 <view class="mb5" v-if="detail.evtParamVVaDepth"> 幅值：{{ detail.evtParamVVaDepth }}%</view>
                 <view class="mb5" v-if="detail.evtParamPhase"> 相别：{{ detail.evtParamPhase }}</view>
-                <!-- <view class="mb5" v-for="(item, textIndex) in detail.dataSet" :key="textIndex">
+                <view class="mb5" v-if="detail.landPoint"> 落点区域：{{ detail.landPoint }}</view>
-                    {{ item.showName + '：' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }}
-                </view> -->
             </view>
-            <view class="detail-content">
+            <view class="detail-tabs">
-                <view class="detail-content-title mb20">瞬时波形图</view>
+                <uni-segmented-control :current="detailTab" active-color="#376cf3" :values="['波形图', 'ITIC', 'F47']"
-                <image
+                    @clickItem="onDetailTabChange" />
-                    style="width: 100%"
-                    :src="detail.instantPics"
-                    mode="widthFix"
-                    v-if="detail.instantPics"
-                    @click="previewImage(detail.instantPics)"
-                />
-                <text v-else>暂无</text>
             </view>
-            <view class="detail-content">
+            <view v-if="detailTab == 0">
-                <view class="detail-content-title mb20">RMS波形图</view>
+                <view class="detail-content">
-                <image
+                    <view class="detail-content-title mb20">瞬时波形图</view>
-                    style="width: 100%"
+                    <!-- <image style="width: 100%" :src="detail.instantPics" mode="widthFix" v-if="detail.instantPics"
-                    :src="detail.rmsPics"
+                        @click="previewImage(detail.instantPics)" />
-                    mode="widthFix"
+                    <text v-else>暂无</text> -->
-                    v-if="detail.rmsPics"
+                    <view v-if="listWaveData.length > 0">
-                    @click="previewImage(detail.rmsPics)"
+                        <waveform v-for="(value, ind) in listWaveData" :index="ind" :unit="unit" :data="value"
-                />
+                            style="height: 150px;" />
-                <text v-else>暂无</text>
+                    </view>
+                    <text v-else>暂无</text>
+                </view>
+                <view class="detail-content">
+                    <view class="detail-content-title mb20">RMS波形图</view>
+                    <!-- <image style="width: 100%" :src="detail.rmsPics" mode="widthFix" v-if="detail.rmsPics"
+                        @click="previewImage(detail.rmsPics)" />
+                    <text v-else>暂无</text> -->
+                    <view v-if="listRmsData.length > 0">
+                        <waveform v-for="(value, ind) in listRmsData" :index="ind" :unit="unit" :data="value"
+                            style="height: 150px;" />
+                    </view>
+                    <text v-else>暂无</text>
+                </view>
+            </view>
+            <view v-if="detailTab == 1" class="chart-wrapper">
+                <ITIC :store="eventStore" style="height: calc(100vh - 360px);" />
+            </view>
+            <view v-if="detailTab == 2" class="chart-wrapper">
+                <F47 :store="eventStore" style="height: calc(100vh - 360px);" />
             </view>
         </view>
     </Cn-page>
 </template>
 <script>
 import { updateStatus } from '@/common/api/message'
+import ITIC from './ITIC.vue'
+import F47 from './F47.vue'
+import waveform from './waveform.vue'
+import { analyseWave } from '@/common/api/harmonic.js';
 
 export default {
+    components: { ITIC, F47, waveform },
     data() {
         return {
             loading: true,
             detail: {},
+            detailTab: 0,
+            listWaveData: [],
+            listRmsData: [],
+            unit: [],
+            list: {},
+
         }
     },
+    computed: {
+        eventStore() {
+            const hasData = this.detail && (this.detail.id || this.detail.equipmentId)
+            if (!hasData) {
+                return { data: [], status: 'noMore' }
+            }
+            const item = {
+                ...this.detail,
+                evtParamTm: this.detail.evtParamTm || '0s',
+                evtParamVVaDepth: this.detail.evtParamVVaDepth || '0%',
+            }
+            return {
+                data: [item],
+                status: 'noMore',
+            }
+        },
+    },
     onLoad(options) {
-        // console.log(options.detail)
+        console.log("🚀 ~ options:", options)
         this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%'))
         this.detail.rmsPics && (this.detail.rmsPics = this.$config.static + this.detail.rmsPics)
         this.detail.instantPics && (this.detail.instantPics = this.$config.static + this.detail.instantPics)
@@ -66,16 +103,79 @@ export default {
                 eventIds: [this.detail.id],
             })
         }
+        analyseWave({
+            eventId: this.detail.id,
+            isApp: true
+        }).then(res => {
+            this.list = res.data
+            this.uni = []
+            // 数据
+            this.listWaveData = this.bindChartClickEvent(this.list.listWaveData)
+            this.listRmsData = this.bindChartClickEvent(this.list.listRmsData)
+            // 单位 
+            this.unit = this.list.waveTitle.slice(1).reduce((acc, _, i, arr) => {
+                if (i % 3 === 0) {
+                    const group = arr.slice(i, i + 3);
+                    const type = group[0]?.startsWith('U') ? 'kV' :
+                        group[0]?.startsWith('I') ? 'A' : '';
+                    acc.push(type);
+                }
+                return acc;
+            }, []);
+        })
+
+
+
+
+
     },
     methods: {
+        onDetailTabChange(e) {
+            this.detailTab = e.currentIndex
+        },
         previewImage(url) {
-            // uni.previewImage({
-            //     urls: [url],
-            // })
             uni.navigateTo({
                 url: `/pages/message1/comp/preview?url=${encodeURIComponent(url)}`,
             })
         },
+        bindChartClickEvent(data) {
+            let unit = this.list.waveTitle.slice(1).reduce((acc, _, i, arr) => {
+                const group = arr.slice(i, i + 3);
+                const type = group[0]?.startsWith('U') ? 'kV' :
+                    group[0]?.startsWith('I') ? 'A' : '';
+                acc.push(type);
+                return acc;
+
+            }, []);
+
+            const result = [];
+            // 从第2列开始遍历（索引1），每3个一列分组
+            for (let i = 1; i < data[0].length; i += 3) {
+
+
+                const group = {
+                    A: data.map(row => [row[0], this.calculate(row[i], unit[i])]),     // 每组第1个 → A
+                    B: data.map(row => [row[0], this.calculate(row[i + 1], unit[i])]), // 每组第2个 → B
+                    C: data.map(row => [row[0], this.calculate(row[i + 2], unit[i])]), // 每组第3个 → C
+                };
+                result.push(group);
+            }
+            return result;
+        },
+        calculate(num, key) {
+            if (num === null) return null
+            let nums = ''
+            switch (key) {
+                case 'kV':
+                    nums = num * Number(this.list.pt) / 1000
+                    break
+                case 'A':
+                    nums = num * Number(this.list.ct)
+                    break
+            }
+            return nums
+        }
+
     },
 }
 </script>
@@ -95,5 +195,26 @@ export default {
             font-weight: 700;
         }
     }
+
+    .detail-tabs {
+        padding: 0 20rpx;
+        margin-bottom: 20rpx;
+    }
+
+    .chart-container {
+        min-height: 600rpx;
+    }
+
+    .chart-wrapper {
+        background: #fff;
+        margin-bottom: 20rpx;
+        padding: 20rpx;
+    }
+}
+
+.segmented-control {
+    flex: 1;
+    margin-right: 24rpx;
+    height: 60rpx;
 }
 </style>

pages/message1/comp/waveform.vue

@@ -0,0 +1,237 @@
+<template>
+    <!-- ITIC -->
+    <view>
+
+        <l-echart ref="echartRef" @finished="initChart"></l-echart>
+    </view>
+</template>
+<script>
+
+
+const echarts = require('../../../uni_modules/lime-echart/static/echarts.min')
+export default {
+    components: {},
+    props: {
+        data: {
+            type: [Object],
+        },
+        index: {
+            type: [Number],
+        },
+        unit: {
+            type: [Array],
+        }
+
+    },
+    data() {
+        return {
+            option: {
+                backgroundColor: '#fff',
+                grid: {
+                    left: '0px',
+                    right: '10rpx',
+                    bottom: '0rpx',
+                    top: '25px',
+                    containLabel: true,
+                },
+                legend: {
+                    right: '10px',
+                    top: '0px',
+                    icon: 'rect',
+                    itemWidth: 20,
+                    itemHeight: 2,
+                    itemGap: 8,
+                    itemStyle: {
+                        borderWidth: 0,
+                    },
+                    textStyle: {
+                        fontSize: 10,
+                    },
+                    padding: [5, 5, 5, 10],
+                },
+
+
+                xAxis: {
+                    type: 'category',
+                    boundaryGap: false,
+                    splitLine: { show: false },
+                    axisLine: { show: true },
+                    axisTick: { show: false },
+                    axisLabel: {
+                        fontSize: 10,
+                        interval: 0,
+                    },
+                },
+                yAxis: {
+                    type: 'value',
+                    name: '',
+                    nameLocation: 'end',
+                    nameGap: 10,
+                    minInterval: 1,
+                    nameTextStyle: {
+                        fontSize: 12,
+                        padding: [28, 10, 0, 0],
+                    },
+                    axisLine: {
+                        show: true,
+
+                    },
+                    axisTick: {
+                        show: true,
+
+                    },
+
+                },
+                series: [
+                    {
+                        name: 'A相',
+                        type: 'line',
+                        data: [
+
+                        ],
+                        showSymbol: false,
+                        smooth: true,
+                        tooltips: {
+                            show: false,
+                        },
+                        color: '#DAA520',
+                    },
+                    {
+                        name: 'B相',
+                        type: 'line',
+                        data: [
+
+                        ],
+                        showSymbol: false,
+                        smooth: true,
+                        tooltips: {
+                            show: false,
+                        },
+                        color: '#2E8B57',
+                    },
+                    {
+                        name: 'C相',
+                        type: 'line',
+                        data: [
+
+                        ],
+                        showSymbol: false,
+                        smooth: true,
+                        tooltips: {
+                            show: false,
+                        },
+                        color: '#A52a2a',
+                    },
+                ],
+            },
+            status: 'loading',
+            echartRef: null,
+            pointI: [],
+            xLabelShowIndices: new Set(),
+        }
+    },
+    mounted() {
+        // this.initChart()
+        // console.log('🚀 ~ props.data:', this.props.data)
+    },
+
+    methods: {
+        init() { },
+        async initChart() {
+            if (!this.$refs.echartRef) return
+            try {
+                this.echartRef = await this.$refs.echartRef.init(echarts)
+                this.setOption()
+
+
+                this.echartRef.setOption(this.option, true)
+            } catch (error) {
+                console.error('图表初始化失败:', error)
+            }
+        },
+        formatXAxisLabel(val, index) {
+            return this.xLabelShowIndices.has(index) ? String(val) : ''
+        },
+        getYAxisRange() {
+            const values = []
+                ;['A', 'B', 'C'].forEach((key) => {
+                    ; (this.data[key] || []).forEach((p) => {
+                        const v = p[1]
+                        if (v !== null && v !== undefined && !Number.isNaN(Number(v))) {
+                            values.push(Number(v))
+                        }
+                    })
+                })
+            if (!values.length) return {}
+            const dataMax = Math.max(...values)
+            const dataMin = Math.min(...values)
+            let min = 0
+            let max = 0
+            if (dataMin > 0) {
+                min = Math.floor(dataMin / 1.3)
+            } else {
+                min = Math.floor(dataMin * 1.3)
+            }
+            if (dataMax > 0) {
+                max = Math.ceil(dataMax * 1.3)
+            } else {
+                max = Math.ceil(dataMax / 1.3)
+            }
+
+            
+            if (min === max) {
+                min -= 1
+                max += 1
+            }
+            return { min, max }
+        },
+        buildXLabelShowIndices(xLabels) {
+            const len = xLabels.length
+            if (len === 0) return new Set()
+            const showIndices = new Set([0, len - 1])
+            const zeroIdx = xLabels.findIndex((x) => Number(x) === 0)
+            if (zeroIdx >= 0) {
+                showIndices.add(zeroIdx)
+            } else if (len > 2) {
+                showIndices.add(Math.floor((len - 1) / 2))
+            }
+            return showIndices
+        },
+        setOption() {
+            if (!this.data) return
+            if (this.index == 0) {
+                this.option.legend.show = true
+            } else {
+                this.option.legend.show = false
+            }
+            this.option.yAxis.name = this.unit[this.index]
+
+            const points = this.data.A || []
+            const xLabels = points.map((p) => p[0])
+            this.xLabelShowIndices = this.buildXLabelShowIndices(xLabels)
+
+            this.option.xAxis.data = xLabels
+            this.option.xAxis.axisLabel.formatter = (val, index) => this.formatXAxisLabel(val, index)
+            this.option.series[0].data = points.map((p) => p[1])
+            this.option.series[1].data = (this.data.B || []).map((p) => p[1])
+            this.option.series[2].data = (this.data.C || []).map((p) => p[1])
+
+            const { min, max } = this.getYAxisRange()
+            this.option.yAxis.min = min
+            this.option.yAxis.max = max
+        },
+
+
+
+
+    },
+
+    computed: {},
+
+    watch: {
+
+
+    },
+}
+</script>
+<style lang="scss" scoped></style>

pages/message1/index.scss

@@ -150,7 +150,7 @@
         gap: 8rpx;
     }
     .event-desc text {
-        font-size: 28rpx;
+        font-size: 24rpx;
         color: #666666;
         line-height: 1.2;
     }
@@ -172,7 +172,7 @@
 
     /* 详情文本 */
     .event-detail {
-        font-size: 28rpx;
+        font-size: 26rpx;
         color: #666666;
         line-height: 1.5;
         padding-top: 10rpx;

pages/message1/run.vue

@@ -25,9 +25,9 @@
                                     == 'Direct_Connected_Device' ? '治理设备' : '监测设备' }}</text>
                         </view>
                         <view class="event-desc">
-                            <text>工程名称：{{ item.engineeringName }}</text>
+                            <text>工程：{{ item.engineeringName }}</text>
-                            <text>项目名称：{{ item.projectName }}</text>
+                            <text>项目：{{ item.projectName }}</text>
-                            <text>事件时间：{{ item.startTime }}</text>
+                            <text>事件时间：{{ item.startTime2 }}</text>
                         </view>
                     </view>
                 </view>
@@ -155,4 +155,5 @@ export default {
 /deep/ .uni-scroll-view-refresher {
     display: none;
 }
+
 </style>

pages/message1/steadyState.vue

@@ -4,8 +4,8 @@
         <view class="transientBox">
             <view class="statistics pd20">
                 <view
-                    class="box"
+                    class="box boxClick"
-                    :class="{ boxClick: item.label == filterValue }"
+                    :class="{ boxClick1: item.label == filterValue }"
                     v-for="item in list"
                     @click="
                         filterValue = item.label
@@ -17,9 +17,9 @@
                 </view>
             </view>
         </view>
-        <!-- 稳态数量 -->
+        <!-- 越限数量 -->
         <scroll-view
-            v-if="filterValue == '稳态数量'"
+            v-if="filterValue == '越限数量'"
             scroll-y="true"
             @refresherrefresh="refresherrefresh"
             @scrolltolower="scrolltolower"
@@ -47,27 +47,26 @@
                             color="#E6A23C"
                         ></uni-icons> -->
                         <Cn-icon-transient :name="`稳态越限`" />
-                        <view class="badge1" v-if="item.isRead == 0"> </view>
+                        <view class="badge1" v-if="item.isRead == 0"></view>
                     </view>
                     <view class="event-info">
                         <view class="event-title">
                             <text class="event-id">{{ item.lineName }}</text>
                         </view>
                         <view class="event-desc">
-                            <text>工程名称：{{ item.engineeringName }}</text>
+                            <text>工程：{{ item.engineeringName }}</text>
-                            <text>项目名称：{{ item.projectName }}</text>
+                            <text>项目：{{ item.projectName }}</text>
-                            <text>设备名称：{{ item.devName }}</text>
+                            <text>设备：{{ item.devName }}</text>
                             <!-- <text>统计日期：{{ item.statisticsDate }}</text> -->
                         </view>
                     </view>
                     <view class="event-action">
-                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                        <uni-icons type="search" size="25" color="#376cf3"></uni-icons>
-                        🔍
                     </view>
                 </view>
                 <!-- 详情区域 -->
                 <view class="event-detail textBox" @touchmove.stop>
-                    <text>{{ item.statisticsDate }}发生 {{ item.overLimitDesc }} </text>
+                    <text>{{ item.statisticsDate }}发生 {{ item.overLimitDesc }}</text>
                 </view>
             </uni-card>
 
@@ -118,9 +117,9 @@
                             <text class="event-id">{{ item.lineName }}</text>
                         </view>
                         <view class="event-desc">
-                            <text>工程名称：{{ item.engineeringName }}</text>
+                            <text>工程：{{ item.engineeringName }}</text>
-                            <text>项目名称：{{ item.projectName }}</text>
+                            <text>项目：{{ item.projectName }}</text>
-                            <text>设备名称：{{ item.devName }}</text>
+                            <text>设备：{{ item.devName }}</text>
                             <!-- <text>统计日期：{{ item.statisticsDate }}</text> -->
                         </view>
                     </view>
@@ -149,6 +148,7 @@
 <script>
 import list from '@/common/js/list'
 import { queryAppHarmonicCounts, queryAppHarmonicLine } from '../../common/api/harmonic.js'
+
 export default {
     components: {},
     props: {
@@ -165,9 +165,9 @@ export default {
     data() {
         return {
             height: 0,
-            filterValue: '稳态数量',
+            filterValue: '越限数量',
             list: [
-                { value: 0, label: '稳态数量' },
+                { value: 0, label: '越限数量' },
                 { value: 0, label: '越限天数' },
                 { value: 0, label: '越限测点数' },
             ],
@@ -235,7 +235,7 @@ export default {
 
         jump(item) {
             let str = JSON.stringify(item).replace(/%/g, '百分比')
-            item.status = '1'
+            item.isRead = '1'
 
             uni.navigateTo({ url: '/pages/message1/comp/steadyStateDetails?detail=' + encodeURIComponent(str) })
         },
@@ -276,6 +276,7 @@ export default {
 .box:first-child {
     flex: 1.3 !important;
 }
+
 /* 列表容器 */
 .event-list {
     /* 头部：图标 + 信息 + 操作 */
@@ -294,9 +295,11 @@ export default {
         font-size: 24rpx;
     }
 }
+
 /deep/ .uni-scroll-view-refresher {
     display: none;
 }
+
 .textBox {
     max-height: 110rpx;
     overflow-y: auto;
@@ -308,15 +311,18 @@ export default {
     // text-overflow: ellipsis;
     // word-break: break-all;
 }
+
 /deep/ .uni-calendar-item--checked {
     background-color: #ffffff00;
     color: #000000e6;
     opacity: 1;
 }
+
 /deep/ .uni-calendar-item--isDay {
     background-color: #ffffff00;
     color: #000000e6;
     opacity: 1;
+
     .uni-calendar-item__weeks-lunar-text {
         background-color: #ffffff00;
         color: #000000e6;
@@ -327,9 +333,11 @@ export default {
 /deep/ .uni-calendar-item__weeks-box-text {
     z-index: 1;
 }
+
 /deep/ .uni-calendar-item--isDay-text {
     color: #333 !important; /* 改成你想要的颜色 */
 }
+
 /deep/ .uni-calendar-item__weeks-box-circle {
     position: absolute;
     top: 7px;
@@ -340,30 +348,38 @@ export default {
     z-index: 0;
     background-color: #e6a23c;
 }
+
 /* 核心：选中圆圈下的 子元素（日期数字） */
 /deep/ .uni-calendar-item__weeks-box-circle + .uni-calendar-item__weeks-box-text {
     color: #fff !important; /* 改成你想要的颜色 */
 }
+
 /deep/ .uni-calendar__backtoday,
 /deep/ .uni-calendar__header-btn-box {
     display: none;
 }
+
 /deep/ .uni-calendar-item__weeks-lunar-text {
     display: none;
 }
+
 /deep/ .uni-calendar__header {
     pointer-events: none !important;
 }
+
 .event-detail {
     /deep/ .uni-calendar__header {
         display: none !important;
     }
+
     /deep/ .uni-calendar__weeks-day {
         height: 35px;
     }
+
     /deep/ .uni-calendar-item__weeks-box-item {
         height: 40px;
     }
+
     /deep/ .uni-calendar-item__weeks-box-circle {
         position: absolute;
         top: 3px;

pages/message1/transient.vue

@@ -17,28 +17,7 @@
                     <text class="label">{{ item.label }}</text>
                 </view>
             </view>
-            <view class="smallLabel">
+            <!-- <view class="smallLabel"> </view> -->
-                <uni-segmented-control
-                    :current="curSub"
-                    active-color="#376cf3"
-                    :values="subsectionList"
-                    @clickItem="sectionChange"
-                    v-if="subsectionList.length > 1"
-                />
-                <view style="width: 180rpx">
-                    <picker @change="bindPickerChange" :value="sort" :range="array" v-if="curSub == 0">
-                        <view class="uni-input"
-                            >{{ array[sort] }}排序
-                            <uni-icons
-                                custom-prefix="iconfont"
-                                type="icon-paixu1"
-                                size="10"
-                                color="#2563EB"
-                            ></uni-icons>
-                        </view>
-                    </picker>
-                </view>
-            </view>
         </view>
         <!-- 卡片 -->
         <scroll-view
@@ -48,7 +27,6 @@
             :refresher-triggered="triggered"
             refresher-enabled="true"
             class="event-list"
-            v-if="curSub == 0"
             :style="{ height: 'calc(100vh - ' + (navHeight + height) + 'px)', overflow: 'auto' }"
         >
             <!-- 循环渲染事件项 -->
@@ -81,14 +59,13 @@
                             }}</text>
                         </view>
                         <view class="event-desc">
-                            <text>工程名称：{{ item.engineeringName }}</text>
+                            <text>工程：{{ item.engineeringName }}</text>
-                            <text>项目名称：{{ item.projectName }}</text>
+                            <text>项目：{{ item.projectName }}</text>
-                            <text>设备名称：{{ item.equipmentName }}</text>
+                            <text>设备：{{ item.equipmentName }}</text>
                         </view>
                     </view>
                     <view class="event-action">
-                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                         <uni-icons type="search" size="25" color="#376cf3"></uni-icons>
-                        🔍
                     </view>
                 </view>
                 <!-- 详情区域 -->
@@ -109,6 +86,10 @@
                             item.evtParamPhase != null && item.evtParamPhase !== ''
                                 ? '，相别：' + item.evtParamPhase
                                 : ''
+                        }} {{
+                            item.landPoint != null && item.landPoint !== ''
+                                ? '，落点区域：' + item.landPoint
+                                : ''
                         }}
                     </text>
                 </view>
@@ -119,29 +100,13 @@
             ></uni-load-more>
             <Cn-empty v-else style="top: 20%"></Cn-empty>
         </scroll-view>
-        <!-- ITIC 列表 -->
-        <ITIC
-            v-if="subsectionList[curSub] == 'ITIC'"
-            :store="store"
-            :style="{ height: 'calc(100vh - ' + (navHeight + height) + 'px)', overflow: 'auto' }"
-        ></ITIC>
-        <!-- F47 列表 -->
-        <F47
-            v-if="subsectionList[curSub] == 'F47'"
-            :store="store"
-            :style="{ height: 'calc(100vh - ' + (navHeight + height) + 'px)', overflow: 'auto' }"
-        ></F47>
     </view>
 </template>
 <script>
 import list from '@/common/js/list'
-import { queryUserPushConfig } from '@/common/api/mine'
-import ITIC from './comp/ITIC.vue'
-import F47 from './comp/F47.vue'
 import { queryAppEventCounts } from '../../common/api/harmonic.js'
 
 export default {
-    components: { ITIC, F47 },
     props: {
         navHeight: {
             type: Number,
@@ -151,6 +116,10 @@ export default {
             type: Object,
             // default: () => {},
         },
+        sortIndex: {
+            type: [Number,String],
+            // default: () => {},
+        },
     },
     mixins: [list],
     data() {
@@ -163,20 +132,12 @@ export default {
                 { value: 0, label: '中断', key: '电压中断' },
                 { value: 0, label: '暂升', key: '电压暂升' },
             ],
-            curSub: 0,
-            subsectionList: [], //'列表', 'ITIC', 'F47'
             status: 'noMore', //more加载前  loading加载中 noMore加载后
             sort: 0,
             triggered: true,
-            // config: {},
-            array: ['发生时间', '暂降深度', '持续时间'],
         }
     },
 
-    mounted() {
-        this.getConfig()
-    },
-
     methods: {
         getHeight() {
             uni.createSelectorQuery()
@@ -197,7 +158,7 @@ export default {
             this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
             this.store.params.type = 0
             // this.store.params.pageSize = 10000
-            this.store.params.sortField = this.sort
+            this.store.params.sortField = this.sortIndex
             this.store.params.engineeringid = this.selectValue.engineeringId
             this.store.params.projectId = this.selectValue.projectId
             this.store.params.deviceId = this.selectValue.deviceId
@@ -224,19 +185,6 @@ export default {
             }
             this.store.reload()
         },
-        getConfig() {
-            queryUserPushConfig().then((res) => {
-                // this.config = res.data
-                let list = [
-                    '列表',
-                    res.data.iticFunction == 1 ? 'ITIC' : '',
-                    res.data.f47Function == 1 ? 'F47' : '',
-                ].filter((item) => item)
-                this.curSub = !list[this.curSub] ? 0 : this.curSub
-                this.subsectionList = JSON.parse(JSON.stringify(list))
-            })
-        },
-
         judgment(val, key) {
             switch (val) {
                 case '电压暂降':
@@ -283,14 +231,12 @@ export default {
             item.status = '1'
             uni.navigateTo({ url: '/pages/message1/comp/transientDetails?detail=' + encodeURIComponent(str) })
         },
-        // 切换排序
+        setSort(index) {
-        bindPickerChange(e) {
+            console.log(123,this.sortIndex);
-            this.sort = e.detail.value
+            
+            // this.sort = index
             this.init()
         },
-        sectionChange(e) {
-            this.curSub = e.currentIndex
-        },
         // 下拉
         refresherrefresh() {
             this.triggered = true
@@ -306,9 +252,6 @@ export default {
             }
         },
     },
-    onShow() {
-        this.curSub = 0
-    },
     computed: {},
 
     watch: {

pages/project/detail.vue

@@ -33,6 +33,12 @@
                         >
                         </uni-card> -->
                         <Cn-device-card v-for="(item, index) in store.data" :device="item" :key="index">
+                            <template v-slot:title>
+                                   
+                                    <view class="star-icon">
+                                        <uni-icons type="search" size="25" color="#376cf3"></uni-icons>
+                                    </view>
+                                </template>
                         </Cn-device-card>
                         <Cn-empty v-if="store.empty"></Cn-empty>
                         <uni-load-more
@@ -40,24 +46,7 @@
                             :status="store.status"
                         ></uni-load-more>
                     </view>
-                    <!--                    <view style="padding: 0 20rpx" v-show="navMenuActive == 1">-->
+                   
-                    <!--                        <uni-list>-->
-                    <!--                            <uni-list-item-->
-                    <!--                                title="张三"-->
-                    <!--                                note="2023-02-10 14:55"-->
-                    <!--                                thumb="/static/head.png"-->
-                    <!--                                thumb-size="lg"-->
-                    <!--                            >-->
-                    <!--                            </uni-list-item>-->
-                    <!--                            <uni-list-item-->
-                    <!--                                title="李四"-->
-                    <!--                                note="2023-02-10 14:55"-->
-                    <!--                                thumb="/static/head.png"-->
-                    <!--                                thumb-size="lg"-->
-                    <!--                            >-->
-                    <!--                            </uni-list-item>-->
-                    <!--                        </uni-list>-->
-                    <!--                    </view>-->
                     <view style="padding: 0 20rpx" v-show="navMenuActive == 1">
                         <!-- <image
                             class="gplot gplot-box"

pages/project/list.vue

@@ -8,7 +8,8 @@
         <uni-search-bar v-model="store.params.searchValue" clearButton="none" bgColor="#fff" placeholder="请输入关键词"
             @input="store.search()"></uni-search-bar>
         <view class="message">
-            <uni-card class="boxClick" :title="item.name" @click="jump(item)" extra="🔍"
+            <!-- extra="🔍" -->
+            <uni-card class="boxClick" :title="item.name" @click="jump(item)"
                 v-for="(item, index) in store.data" :key="index" :style="{ marginTop: index === 0 ? '0' : '' }">
                 <view class="term-list-bottom">
                     <view class="term-list-bottom-item">

pages/user/login.vue

@@ -93,7 +93,7 @@ import { sm3Digest } from '@/common/js/sm3.js'
 export default {
     data() {
         return {
-            checkbox: false,
+            checkbox: true,
             loading: false,
             loginType: 'pwd',
             phone: '',

pages/user/register.vue

@@ -77,7 +77,7 @@ export default {
     name: 'jiaban',
     data() {
         return {
-            checkbox: false,
+            checkbox: true,
             step: 1,
             loading: false,
             waitTime: 0,

uni_modules/uni-card/components/uni-card/uni-card.vue

@@ -136,9 +136,9 @@
 	.uni-card {
 		margin: $uni-card-spacing;
 		padding: 0 $uni-spacing-sm;
-		border-radius: 4px;
+		border-radius: 20rpx;
 		overflow: hidden;
-		font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+		// font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
 		background-color: #fff;
 		flex: 1;