From f008bcb4b848f4701848a6ebc8cdd5b1ca39eb17 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Thu, 18 Jun 2026 16:34:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=BA=E5=88=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |    4 +-
 common/api/user.js                            |    2 +-
 common/js/config.js                           |    2 +-
 common/js/update.js                           |  168 +-
 .../Cn-icon-transient/Cn-icon-transient.vue   |    6 +-
 manifest.json                                 |   10 +-
 pages.json                                    |    2 +-
 pages/device/transfer.vue                     |  299 ++-
 pages/index/comp/apply.vue                    |    6 +-
 pages/index/comp/indexGongCheng.vue           |    6 +-
 pages/index/comp/indexYouKe.vue               |    4 +-
 pages/index/comp/indexYunWei.vue              |    4 +-
 pages/index/comp/indexZhuYongHu.vue           |    6 +-
 pages/index/comp/indexZhuanZhi.vue            |    4 +-
 pages/index/comp/monitoringPoint.vue          | 1682 +++++++++--------
 pages/index/comp/targetInfo.vue               |  619 +++---
 pages/index/index.vue                         |   10 +-
 pages/index/message1.vue                      |    2 +-
 pages/index/mine.vue                          |    2 +-
 pages/message1/comp/alarmDetails.vue          |  570 +++---
 pages/message1/index.scss                     |    4 +-
 pages/message1/transient.vue                  |   12 +-
 22 files changed, 1774 insertions(+), 1650 deletions(-)

diff --git a/App.vue b/App.vue
index 8cca913..44e7001 100644
--- a/App.vue
+++ b/App.vue
@@ -1,11 +1,11 @@
 <script>
 import { queryDictDataCache } from './common/api/dictionary.js'
 import { getImageUrl } from '@/common/api/basic'
-import { checkAppUpdate } from './common/js/update.js'
+
 
 export default {
     onLaunch: function () {
-        checkAppUpdate()
+        
         // uni.onPushMessage((res) => {
         //     console.log("收到推送消息：",res) //监听推送消息
         // })
diff --git a/common/api/user.js b/common/api/user.js
index 33ac8f1..88c4b9b 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -242,4 +242,4 @@ export function getLastData() {
         url: '/cs-system-boot/appVersion/getLastData?versionType=APP',
         method: 'POST',
     })
-}
\ No newline at end of file
+}
diff --git a/common/js/config.js b/common/js/config.js
index f346d07..ad3033a 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -1,7 +1,7 @@
 const debug = true // true 是连地服务端本地，false 是连接线上
 
 const development = {
-    domain: 'http://192.168.2.126:10215',
+    domain: 'http://192.168.1.103:10215',
 }
 
 const production = {
diff --git a/common/js/update.js b/common/js/update.js
index 93c20cc..01cfe1e 100644
--- a/common/js/update.js
+++ b/common/js/update.js
@@ -1,52 +1,102 @@
 import { getLastData } from '../api/user.js'
 
+/** 规范化版本号，如 v1.6.83 → [1, 6, 83] */
+const normalizeVersion = (version) => {
+    if (!version) return []
+    return String(version)
+        .replace(/^v/i, '')
+        .split('.')
+        .map((part) => parseInt(part, 10) || 0)
+}
+
+/**
+ * 比较版本号
+ * @returns 1 远端较新需更新 | 0 相同 | -1 本地较新
+ */
+const compareVersion = (remote, local) => {
+    const remoteParts = normalizeVersion(remote)
+    const localParts = normalizeVersion(local)
+    const len = Math.max(remoteParts.length, localParts.length)
+
+    for (let i = 0; i < len; i++) {
+        const rv = remoteParts[i] || 0
+        const lv = localParts[i] || 0
+        if (rv > lv) return 1
+        if (rv < lv) return -1
+    }
+    return 0
+}
+
+/** 自定义调试基座 / HBuilder 标准基座，不走线上更新 */
+const isCustomDebugBase = (appName = '') => {
+    return /自定义基座|custom debug|HBuilder|DCloud/i.test(appName)
+}
+
 export const checkAppUpdate = () => {
+    // #ifndef APP-PLUS
+    return
+    // #endif
+
     // 开发环境跳过检查
     const isDev = process.env.NODE_ENV === 'development'
-    // if (isDev) {
+    if (isDev) {
         console.log('开发环境，不执行更新检查')
         return
-    // }
+    }
+
+    // 自定义基座调试，跳过更新检查
+    // try {
+    //     const { appName } = uni.getSystemInfoSync()
+    //     if (isCustomDebugBase(appName)) {
+    //         console.log('自定义基座调试中，不执行更新检查')
+    //         return
+    //     }
+    // } catch (e) {}
 
     // 获取当前应用信息
     plus.runtime.getProperty(plus.runtime.appid, (info) => {
+        // if (isCustomDebugBase(info?.name)) {
+        //     console.log('自定义基座调试中，不执行更新检查')
+        //     return
+        // }
+
         const currentVersion = info.version
 
         getLastData()
-        .then((res) => {
+            .then((res) => {
+                // let res = {
+                //     data: {
+                //         versionName: 'v1.6.83',
+                //         forceUpdate: '1',
+                //         androidPath: 'https://app.liuyingyong.cn/build/download/3c26e400-3a33-11f1-8997-a16e76fa35b3',
+                //         // androidPath: 'http://112.4.144.18:8040/shiningCloud/file/canneng_wulian.apk',
+                //         iosPath: 'xxxx',
+                //     },
+                // }
+                if (!res?.data) {
+                    console.log('未获取到版本信息')
+                    return
+                }
 
-        // let res = {
-        //     data: {
-        //         versionName: 'v1.6.83',
-        //         forceUpdate: '1',
-        //         androidPath: 'https://app.liuyingyong.cn/build/download/3c26e400-3a33-11f1-8997-a16e76fa35b3',
-        //         // androidPath: 'http://112.4.144.18:8040/shiningCloud/file/canneng_wulian.apk',
-        //         iosPath: 'xxxx',
-        //     },
-        // }
-        if (!res?.data) {
-            console.log('未获取到版本信息')
-            return
-        }
+                // 适配新的接口返回格式，默认强制更新
+                const { versionName, androidPath, iosPath, forceUpdate = '1' } = res.data
+                console.log('🚀 ~ checkAppUpdate ~ versionName, currentVersion:', versionName, currentVersion)
 
-        // 适配新的接口返回格式
-        const { versionName, androidPath, iosPath, forceUpdate = '1' } = res.data
+                // 版本相同或本地较新则不需要更新
+                if (compareVersion(versionName, currentVersion) <= 0) {
+                    console.log('已是最新版本')
+                    return
+                }
 
-        // 版本相同则不需要更新
-        if (versionName.includes(currentVersion)) {
-            console.log('已是最新版本')
-            return
-        }
+                const isForce = forceUpdate !== '0' // 默认强制更新，'0' 为可选更新
 
-        const isForce = forceUpdate === '1' // 字符串 '1' 表示强制更新
+                const iosUrl = iosPath
 
-        const iosUrl = iosPath
-
-        handleUpdate({ version: versionName, androidPath, iosUrl, isForce })
-        })
-        .catch((err) => {
-            console.error('获取版本接口失败', err)
-        })
+                handleUpdate({ version: versionName, androidPath, iosUrl, isForce })
+            })
+            .catch((err) => {
+                console.error('获取版本接口失败', err)
+            })
     })
 }
 
@@ -58,9 +108,9 @@ const handleUpdate = ({ version, androidPath, iosUrl, isForce }) => {
     const isIOS = plus.os.name === 'iOS'
 
     if (isAndroid) {
-        handleAndroidUpdate({ androidPath, isForce })
+        handleAndroidUpdate({ version, androidPath, isForce })
     } else if (isIOS) {
-        handleIOSUpdate({ iosUrl, isForce })
+        handleIOSUpdate({ version, iosUrl, isForce })
     } else {
         console.warn('未知操作系统')
     }
@@ -69,7 +119,7 @@ const handleUpdate = ({ version, androidPath, iosUrl, isForce }) => {
 /**
  * 处理安卓更新
  */
-const handleAndroidUpdate = ({ androidPath, isForce }) => {
+const handleAndroidUpdate = ({ version, androidPath, isForce }) => {
     if (!androidPath?.length) {
         console.error('未找到安卓安装包')
         uni.showToast({
@@ -80,18 +130,18 @@ const handleAndroidUpdate = ({ androidPath, isForce }) => {
     }
 
     const downloadUrl = androidPath
+    const content = isForce ? `发现新版本 ${version}，请立即更新后继续使用` : `发现新版本 ${version}，是否立即更新？`
 
     uni.showModal({
         title: '更新提示',
-        content: '发现新版本，是否立即更新？',
-        showCancel: !isForce, // 强制更新隐藏取消按钮
+        content,
+        showCancel: false,
         confirmText: '去更新',
-        cancelText: '暂不更新',
         success: (modalRes) => {
             if (modalRes.confirm) {
                 downloadAndInstallApk(downloadUrl)
             } else if (isForce) {
-                // 强制更新且用户取消，退出应用
+                // 强制更新：用户按返回键关闭弹窗时退出
                 plus.runtime.quit()
             }
         },
@@ -101,7 +151,7 @@ const handleAndroidUpdate = ({ androidPath, isForce }) => {
 /**
  * 处理iOS更新
  */
-const handleIOSUpdate = ({ iosUrl, isForce }) => {
+const handleIOSUpdate = ({ version, iosUrl, isForce }) => {
     if (!iosUrl) {
         console.error('未找到iOS下载链接')
         uni.showToast({
@@ -111,22 +161,23 @@ const handleIOSUpdate = ({ iosUrl, isForce }) => {
         return
     }
 
+    const content = isForce
+        ? `发现新版本 ${version}，请前往 App Store 更新后继续使用`
+        : `发现新版本 ${version}，请前往 App Store 更新`
+
     uni.showModal({
         title: '更新提示',
-        content: '发现新版本，请前往 App Store 更新',
-        showCancel: !isForce,
+        content,
+        showCancel: false,
         confirmText: '去更新',
-        cancelText: '暂不更新',
         success: (modalRes) => {
             if (modalRes.confirm) {
                 plus.runtime.openURL(iosUrl)
-            }
-
-            // 强制更新时，无论确认还是取消都退出应用
-            if (isForce) {
                 setTimeout(() => {
                     plus.runtime.quit()
-                }, 300) // 给跳转留一点时间
+                }, 300)
+            } else if (isForce) {
+                // 强制更新且用户取消，退出应用
             }
         },
     })
@@ -143,14 +194,22 @@ const downloadAndInstallApk = (url) => {
         close: false, // 不允许用户关闭
         padlock: true, // 锁定屏幕
     })
+    let progressClosed = false
+
+    const closeProgress = () => {
+        if (progressClosed) return
+        progressClosed = true
+        progressWaiting.close()
+    }
 
     const options = {
         filename: '_doc/update/canneng_wulian.apk',
-        timeout: 120,
+        timeout: 300,
     }
 
+    console.log('🚀 ~ downloadAndInstallApk ~ url:', url)
     const downloadTask = plus.downloader.createDownload(url, options, (downloadedFile, status) => {
-        progressWaiting.close()
+        closeProgress()
 
         if (status === 200) {
             installApk(downloadedFile.filename, url)
@@ -161,9 +220,10 @@ const downloadAndInstallApk = (url) => {
 
     // // 更新进度
     downloadTask.addEventListener('statechanged', (task) => {
+        if (progressClosed) return
         if (task.state === 3 && task.totalSize > 0) {
             const percent = ((task.downloadedSize / task.totalSize) * 100).toFixed(0)
-            console.log("🚀 ~ downloadAndInstallApk ~ percent:", percent)
+            console.log('🚀 ~ downloadAndInstallApk ~ percent:', percent)
             // 直接更新 waiting 的标题，不会闪烁
             progressWaiting.setTitle(`正在下载更新 ${percent}%`)
         }
@@ -197,11 +257,13 @@ const installApk = (filePath, downloadUrl) => {
             uni.showModal({
                 title: '安装失败',
                 content: `安装失败：${error.message}\n请检查是否已开启安装权限`,
+                showCancel: false,
                 confirmText: '重试',
-                cancelText: '取消',
                 success: (res) => {
                     if (res.confirm) {
                         downloadAndInstallApk(downloadUrl)
+                    } else {
+                        plus.runtime.quit()
                     }
                 },
             })
@@ -216,11 +278,13 @@ const handleDownloadError = (downloadUrl) => {
     uni.showModal({
         title: '下载失败',
         content: '网络异常或下载链接失效，是否重试？',
+        showCancel: false,
         confirmText: '重试',
-        cancelText: '取消',
         success: (res) => {
             if (res.confirm) {
                 downloadAndInstallApk(downloadUrl)
+            } else {
+                plus.runtime.quit()
             }
         },
     })
diff --git a/components/Cn-icon-transient/Cn-icon-transient.vue b/components/Cn-icon-transient/Cn-icon-transient.vue
index f4a775f..7e6effd 100644
--- a/components/Cn-icon-transient/Cn-icon-transient.vue
+++ b/components/Cn-icon-transient/Cn-icon-transient.vue
@@ -16,15 +16,15 @@ export default {
   },
   computed: {
     svgHtml() {
-      if (this.name == '电压暂降') {
+      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">
   <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">
   <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>`
diff --git a/manifest.json b/manifest.json
index 70ba654..c46f855 100644
--- a/manifest.json
+++ b/manifest.json
@@ -46,6 +46,7 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
@@ -124,7 +125,10 @@
         "setting" : {
             "urlCheck" : false
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "unipush" : {
+            "enable" : false
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -139,7 +143,7 @@
                 "/api" : {
                     "https" : true,
                     // "target" : "https://pqmcn.com:8092/api",
-                    "target" : "http://192.168.2.126:10215",
+                    "target" : "http://192.168.1.103:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""
@@ -152,7 +156,7 @@
             "base" : ""
         },
         "unipush" : {
-            "enable" : false
+            "enable" : true
         },
         "sdkConfigs" : {
             "maps" : {}
diff --git a/pages.json b/pages.json
index 50cfe05..dfffeab 100644
--- a/pages.json
+++ b/pages.json
@@ -118,7 +118,7 @@
         {
             "path": "pages/mine/setupMessage",
             "style": {
-                "navigationBarTitleText": "个性化推荐"
+                "navigationBarTitleText": "推送通知配置"
             }
         },
 
diff --git a/pages/device/transfer.vue b/pages/device/transfer.vue
index 35ea58c..6c50d7d 100644
--- a/pages/device/transfer.vue
+++ b/pages/device/transfer.vue
@@ -1,157 +1,142 @@
-<template>
-    <view>
-        <Cn-page :loading="loading" beforeRender>
-            <view slot="body">
-                <view class="transfer">
-                    <!-- <div class="transfer-img" ref="qrCodeUrl" /> -->
-                    <!-- <uqrcode ref="uqrcode" canvas-id="qrcode" :value="content" :options="{ margin: 10 }"></uqrcode> -->
-                    <uqrcode
-                        ref="uqrcode"
-                        canvas-id="qrcode"
-                        :value="content"
-                        size="200"
-                        @complete="complete"
-                        :loading="false"
-                    ></uqrcode>
-                    <view style="height: 200rpx"></view>
-                    <view class="transfer-text">请让接收人员扫码接收</view>
-                    <view class="transfer-btn">
-                        <button class="transfer-btn-item" style="background-color: #fff; color: #111" @click="back">
-                            返回
-                        </button>
-                        <button class="transfer-btn-item ml20" @click="scan">扫一扫</button>
-                    </view>
-                </view>
-            </view>
-        </Cn-page>
-       <uni-popup ref="alertDialog" type="dialog">
-       	<uni-popup-dialog
-       		style="width: 90%; margin: 5%"
-       		type="info"
-       		cancelText="禁止"
-       		confirmText="允许"
-       		title="权限说明"
-       		content='是否允许"灿能物联"使用相机?'
-       		@confirm="handleScon('camera')"
-       		@close="dialogClose"
-       	></uni-popup-dialog>
-       </uni-popup>
-       <uni-popup ref="message" type="message">
-       	<uni-popup-message type="info" :duration="0" style="width: 90%; margin: 5%">
-       		<view style="color: #909399; font-style: 16px">相机权限使用说明:</view>
-       		<view style="color: #6c6c6c; margin-top: 3rpx; ">　用于相机扫描二维码!</view>
-       	</uni-popup-message>
-       </uni-popup>
-    </view>
-</template>
-<script>
-// import QRCode from 'qrcodejs2'
-// import UQRCode from '@/uni_modules/Sansnn-uQRCode/js_sdk/uqrcode/uqrcode.js';
-
-import { transferDevice } from '@/common/api/device'
-
-export default {
-    data() {
-        return {
-            loading: true,
-            content: '',
-            options: {},
-        }
-    },
-    methods: {
-        complete() {
-            this.loading = false
-        },
-        back() {
-            uni.navigateBack({ delta: 1 })
-        },
-        home() {
-            uni.navigateBack({ delta: 1 })
-        },
-        transferDevice(userId) {
-            transferDevice(this.options.id, userId).then((res) => {
-                uni.showToast({
-                    title: '移交成功',
-                    icon: 'none',
-                })
-                uni.navigateBack()
-            })
-        },
-        scan() {
-            if (
-                plus.os.name == 'Android' &&
-                plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
-            ) {
-               //未授权
-               this.$refs.message.open()
-               this.$refs.alertDialog.open('bottom')
-            } else {
-                this.handleScon()
-            }
-        },
-        handleScon() {
-			this.$refs.message.close()
-            uni.scanCode({
-                onlyFromCamera:true,
-                success: (res) => {
-                    console.log(res)
-                    let data = JSON.parse(res.result)
-                    if (data.type === 'userId') {
-                        this.transferDevice(data.id)
-                    } else {
-                        uni.showToast({
-                            title: '请扫描正确的二维码',
-                            icon: 'none',
-                        })
-                    }
-                },
-            })
-        },
-        dialogClose() {this.$refs.message.close()},
-    },
-    onLoad(options) {
-        this.options = options
-        this.content = JSON.stringify({
-            type: 'transferDevice',
-            id: options.id,
-        })
-    },
-}
-</script>
-<style lang="scss">
-.transfer {
-    padding: 200rpx 34rpx 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .transfer-img {
-    }
-
-    .transfer-text {
-        font-size: 28rpx;
-        color: #999999;
-        margin-top: 30rpx;
-    }
-
-    .transfer-btn {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        margin-top: 100rpx;
-        width: 100%;
-
-        .transfer-btn-item {
-            flex: 1;
-            height: 80rpx;
-            border-radius: 12rpx;
-            background-color: $uni-theme-color;
-            font-size: 28rpx;
-            color: #fff;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-        }
-    }
-}
-</style>
+<template>
+    <view>
+        <Cn-page :loading="loading" beforeRender>
+            <view slot="body">
+                <view class="transfer">
+                    <!-- <div class="transfer-img" ref="qrCodeUrl" /> -->
+                    <!-- <uqrcode ref="uqrcode" canvas-id="qrcode" :value="content" :options="{ margin: 10 }"></uqrcode> -->
+                    <uqrcode ref="uqrcode" canvas-id="qrcode" :value="content" size="200" @complete="complete"
+                        :loading="false"></uqrcode>
+                    <view style="height: 200rpx"></view>
+                    <view class="transfer-text">请让接收人员扫码接收</view>
+                    <view class="transfer-btn">
+                        <button class="transfer-btn-item" style="background-color: #fff; color: #111" @click="back">
+                            返回
+                        </button>
+                        <button class="transfer-btn-item ml20" @click="scan">扫一扫</button>
+                    </view>
+                </view>
+            </view>
+        </Cn-page>
+        <uni-popup ref="alertDialog" type="dialog">
+            <uni-popup-dialog style="width: 90%; margin: 5%" type="info" cancelText="禁止" confirmText="允许" title="权限说明"
+                content='是否允许"灿能物联"使用相机?' @confirm="handleScon('camera')" @close="dialogClose"></uni-popup-dialog>
+        </uni-popup>
+        <uni-popup ref="message" type="message">
+            <uni-popup-message type="info" :duration="0" style="width: 90%; margin: 5%">
+                <view style="color: #909399; font-style: 16px">相机权限使用说明:</view>
+                <view style="color: #6c6c6c; margin-top: 3rpx; ">　用于相机扫描二维码!</view>
+            </uni-popup-message>
+        </uni-popup>
+    </view>
+</template>
+<script>
+// import QRCode from 'qrcodejs2'
+// import UQRCode from '@/uni_modules/Sansnn-uQRCode/js_sdk/uqrcode/uqrcode.js';
+
+import { transferDevice } from '@/common/api/device'
+
+export default {
+    data() {
+        return {
+            loading: true,
+            content: '',
+            options: {},
+        }
+    },
+    methods: {
+        complete() {
+            this.loading = false
+        },
+        back() {
+            uni.navigateBack({ delta: 1 })
+        },
+        home() {
+            uni.navigateBack({ delta: 1 })
+        },
+        transferDevice(userId) {
+            transferDevice(this.options.id, userId).then((res) => {
+                uni.showToast({
+                    title: '移交成功',
+                    icon: 'none',
+                })
+                uni.navigateBack()
+            })
+        },
+        scan() {
+            if (
+                plus.os.name == 'Android' &&
+                plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
+            ) {
+                //未授权
+                this.$refs.message.open()
+                this.$refs.alertDialog.open('bottom')
+            } else {
+                this.handleScon()
+            }
+        },
+        handleScon() {
+            this.$refs.message.close()
+            uni.scanCode({
+                // onlyFromCamera:false,
+                success: (res) => {
+                    console.log(res)
+                    let data = JSON.parse(res.result)
+                    if (data.type === 'userId') {
+                        this.transferDevice(data.id)
+                    } else {
+                        uni.showToast({
+                            title: '请扫描正确的二维码',
+                            icon: 'none',
+                        })
+                    }
+                },
+            })
+        },
+        dialogClose() { this.$refs.message.close() },
+    },
+    onLoad(options) {
+        this.options = options
+        this.content = JSON.stringify({
+            type: 'transferDevice',
+            id: options.id,
+        })
+    },
+}
+</script>
+<style lang="scss">
+.transfer {
+    padding: 200rpx 34rpx 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .transfer-img {}
+
+    .transfer-text {
+        font-size: 28rpx;
+        color: #999999;
+        margin-top: 30rpx;
+    }
+
+    .transfer-btn {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        margin-top: 100rpx;
+        width: 100%;
+
+        .transfer-btn-item {
+            flex: 1;
+            height: 80rpx;
+            border-radius: 12rpx;
+            background-color: $uni-theme-color;
+            font-size: 28rpx;
+            color: #fff;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+    }
+}
+</style>
diff --git a/pages/index/comp/apply.vue b/pages/index/comp/apply.vue
index 68a3318..8ff34f0 100644
--- a/pages/index/comp/apply.vue
+++ b/pages/index/comp/apply.vue
@@ -222,21 +222,21 @@ export default {
         },
         judgment(val, key) {
             switch (val) {
-                case '电压暂降':
+                case '暂降':
                     return {
                         type: 'sag',
                         icon: 'icon-a-svg4',
                         color: '#2563eb',
                         size: '25',
                     }
-                case '电压暂升':
+                case '暂升':
                     return {
                         type: 'swell',
                         icon: 'icon-a-svg5',
                         color: '#e6a23c',
                         size: '25',
                     }
-                case '电压中断':
+                case '中断':
                     return {
                         type: 'interrupt',
                         icon: 'icon-zhongduan2',
diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue
index e573a36..1b840f1 100644
--- a/pages/index/comp/indexGongCheng.vue
+++ b/pages/index/comp/indexGongCheng.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="index-zhuyonghu">
         <template v-if="devCount.engineeringListLength > 0">
-            <view class="canneng-index-title mb20 canneng-index-title-with-icon">
+            <view class="canneng-index-title mb20 ml20 canneng-index-title-with-icon">
                 <uni-icons custom-prefix="iconfont" type="icon-gongcheng" size="18" color="#376cf3" />
                 <text>所有工程设备统计</text>
             </view>
@@ -33,7 +33,7 @@
             </view>
             <!-- <view class="mt20"></view> -->
         </template>
-        <!-- <view class="canneng-index-title mb20">当前工程设备统计</view>
+        <!-- <view class="canneng-index-title mb20 ml20">当前工程设备统计</view>
 		<view class="header">
 			<view class="header-item" @click="jump('nowEngineering')">
 				<view class="header-item-value"
@@ -50,7 +50,7 @@
 				<view class="header-item-label">离线设备</view>
 			</view>
 		</view> -->
-        <view class="canneng-index-title mt20 canneng-index-title-with-icon">
+        <view class="canneng-index-title mt20 ml20 canneng-index-title-with-icon">
             <uni-icons type="settings" size="18" color="#376cf3" />
             <text>常用功能</text>
         </view>
diff --git a/pages/index/comp/indexYouKe.vue b/pages/index/comp/indexYouKe.vue
index d3f4d00..12242df 100644
--- a/pages/index/comp/indexYouKe.vue
+++ b/pages/index/comp/indexYouKe.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="index-zhuyonghu">
         <template v-if="devCount.engineeringListLength > 1">
-            <view class="canneng-index-title mb20 canneng-index-title-with-icon">
+            <view class="canneng-index-title mb20 ml20 canneng-index-title-with-icon">
                 <uni-icons custom-prefix="iconfont" type="icon-gongcheng" size="18" color="#376cf3" />
                 <text>所有工程设备统计</text>
             </view>
@@ -21,7 +21,7 @@
             </view>
             <view class="mt20"></view>
         </template>
-        <view class="canneng-index-title mb20 canneng-index-title-with-icon">
+        <view class="canneng-index-title mb20 ml20 canneng-index-title-with-icon">
             <uni-icons custom-prefix="iconfont" type="icon-zaixianjianceshebei" size="18" color="#376cf3" />
             <text>当前工程设备统计</text>
         </view>
diff --git a/pages/index/comp/indexYunWei.vue b/pages/index/comp/indexYunWei.vue
index 98a99e3..37e1b7d 100644
--- a/pages/index/comp/indexYunWei.vue
+++ b/pages/index/comp/indexYunWei.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="index-zhuanzhi">
         <template v-if="devCount.engineeringListLength > 1">
-            <view class="canneng-index-title mb20 canneng-index-title-with-icon">
+            <view class="canneng-index-title mb20 ml20 canneng-index-title-with-icon">
                 <uni-icons custom-prefix="iconfont" type="icon-gongcheng" size="18" color="#376cf3" />
                 <text>所有工程设备统计</text>
             </view>
@@ -35,7 +35,7 @@
             </view>
             <view class="mt20"></view>
         </template>
-        <view class="canneng-index-title mb20 canneng-index-title-with-icon">
+        <view class="canneng-index-title mb20 ml20 canneng-index-title-with-icon">
             <uni-icons custom-prefix="iconfont" type="icon-zaixianjianceshebei" size="18" color="#376cf3" />
             <text>当前工程设备统计</text>
         </view>
diff --git a/pages/index/comp/indexZhuYongHu.vue b/pages/index/comp/indexZhuYongHu.vue
index 6b32ab0..76d2dc4 100644
--- a/pages/index/comp/indexZhuYongHu.vue
+++ b/pages/index/comp/indexZhuYongHu.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="index-zhuyonghu">
         <template v-if="devCount.engineeringListLength > 1">
-            <view class="canneng-index-title mb20 canneng-index-title-with-icon">
+            <view class="canneng-index-title mb20 ml20 canneng-index-title-with-icon">
                 <uni-icons custom-prefix="iconfont" type="icon-gongcheng" size="18" color="#376cf3" />
                 <text>所有工程设备统计</text>
             </view>
@@ -21,7 +21,7 @@
             </view>
             <view class="mt20"></view>
         </template>
-        <view class="canneng-index-title mb20 canneng-index-title-with-icon">
+        <view class="canneng-index-title mb20 ml20 canneng-index-title-with-icon">
             <uni-icons custom-prefix="iconfont" type="icon-zaixianjianceshebei" size="18" color="#376cf3" />
             <text>当前工程设备统计</text>
         </view>
@@ -49,7 +49,7 @@
                 <view class="header-item-label">稳态事件数</view>
             </view>
         </view>
-        <view class="canneng-index-title mt20 canneng-index-title-with-icon">
+        <view class="canneng-index-title mt20 ml20 canneng-index-title-with-icon">
             <uni-icons type="settings" size="18" color="#376cf3" />
             <text>常用功能</text>
         </view>
diff --git a/pages/index/comp/indexZhuanZhi.vue b/pages/index/comp/indexZhuanZhi.vue
index c534a63..f3b266b 100644
--- a/pages/index/comp/indexZhuanZhi.vue
+++ b/pages/index/comp/indexZhuanZhi.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="index-zhuanzhi">
         <template v-if="devCount.engineeringListLength > 1">
-            <view class="canneng-index-title mb20 canneng-index-title-with-icon">
+            <view class="canneng-index-title mb20 ml20 canneng-index-title-with-icon">
                 <uni-icons custom-prefix="iconfont" type="icon-gongcheng" size="18" color="#376cf3" />
                 <text>所有工程设备统计</text>
             </view>
@@ -33,7 +33,7 @@
             </view>
             <view class="mt20"></view>
         </template>
-        <view class="canneng-index-title mb20 canneng-index-title-with-icon">
+        <view class="canneng-index-title mb20 ml20 canneng-index-title-with-icon">
             <uni-icons custom-prefix="iconfont" type="icon-zaixianjianceshebei" size="18" color="#376cf3" />
             <text>当前工程设备统计</text>
         </view>
diff --git a/pages/index/comp/monitoringPoint.vue b/pages/index/comp/monitoringPoint.vue
index 396fa4f..ed0de0b 100644
--- a/pages/index/comp/monitoringPoint.vue
+++ b/pages/index/comp/monitoringPoint.vue
@@ -1,812 +1,870 @@
-<template>
-    <view class="itic2-page">
-        <view class="itic2-content">
-            <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 }} {{ child.unit ? `(${child.unit})` : '' }}</text>
-                                    </view>
-                                    <view v-if="hasTPhaseData(child)" class="phase-single">
-                                        <text class="phase-value-vertical phase-value-vertical--neutral">{{ child.T
-                                            }}</text>
-                                    </view>
-                                    <view v-else 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>
-                    <uni-load-more v-if="listStatus == 'loading' || monitoringPoints.length > 0"
-                        :status="listStatus"></uni-load-more>
-                    <Cn-empty v-else style="top: 35%"></Cn-empty>
-                </view>
-            </view>
-        </view>
-
-        <view class="back-top boxClick" v-show="showBackTop" @click="backToTop">
-            <uni-icons type="arrow-up" size="22" color="#fff"></uni-icons>
-        </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>
-                <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>
-                </view>
-            </view>
-        </uni-popup>
-    </view>
-</template>
-
-<script>
-import { queryByCode, queryCsDictTree } from '@/common/api/dictionary'
-import { getLineDataByEngineer } from '@/common/api/harmonic'
-import { getDevCount } from '@/common/api/device.js'
-
-const DEFAULT_INDICATOR_CODES = ['Key_Power_Quality_V', 'Key_Power_Quality_I']
-
-export default {
-    data() {
-        return {
-            targetLists: [],
-            popupSelectedIndicators: [],
-            engineeringName: '',
-            engineeringId: '',
-            summaryStats: [
-                { label: '项目总数', value: 0 },
-                { label: '设备总数', value: 0 },
-                { label: '监测点总数', value: 0 },
-            ],
-            selectedIndicators: [],
-            phaseColors: [
-                { name: 'A相', color: '#F1B22E' },
-                { name: 'B相', color: '#2BA471' },
-                { name: 'C相', color: '#D54941' },
-            ],
-            monitoringPoints: [],
-            listStatus: 'noMore',
-            lineDataRequestId: 0,
-            showBackTop: false,
-        }
-    },
-    onPageScroll(e) {
-        this.showBackTop = e.scrollTop > 200
-    },
-    // 页面显示时同步工程名称
-    onShow() {
-        const engineering = uni.getStorageSync('engineering')
-        if (engineering?.id) {
-            this.engineeringName = engineering.name || ''
-            this.engineeringId = engineering.id
-            this.info()
-        }
-        if (this.targetLists.length) {
-            this.loadSelectedIndicators()
-        }
-    },
-    // 加载电能质量指标字典
-    created() {
-        queryByCode('Key_Power_Quality').then((res) => {
-            queryCsDictTree(res.data.id).then((resp) => {
-                this.targetLists = (resp.data || []).slice().reverse()
-                this.loadSelectedIndicators()
-            })
-        })
-    },
-    // 下拉刷新
-    onPullDownRefresh() {
-        this.info()
-
-    },
-    methods: {
-        // 查询接口
-        info() {
-            if (!this.engineeringId) {
-                uni.stopPullDownRefresh()
-                return
-            }
-            this.loadDevCount()
-            this.loadLineData()
-        },
-        loadDevCount() {
-            getDevCount(this.engineeringId).then((res) => {
-                if (res.code == 'A0000') {
-                    this.updateSummaryStats(res.data)
-                }
-            })
-        },
-        loadLineData() {
-            this.listStatus = 'loading'
-            this.monitoringPoints = []
-            const requestId = ++this.lineDataRequestId
-            const engineerId = this.engineeringId
-            getLineDataByEngineer({ id: engineerId })
-                .then((res) => {
-                    if (requestId !== this.lineDataRequestId) return
-                    if (res.code == 'A0000') {
-                        this.monitoringPoints = this.parseMonitoringPoints(res.data)
-                    } else if (res.message) {
-                        this.$util.toast(res.message)
-                    }
-                })
-                .catch(() => {
-                    if (requestId !== this.lineDataRequestId) return
-                    this.$util.toast('加载失败，请稍后重试')
-                })
-                .finally(() => {
-                    if (requestId !== this.lineDataRequestId) return
-                    this.listStatus = 'noMore'
-                    uni.stopPullDownRefresh()
-                })
-        },
-        // 接口 data 转为页面 monitoringPoints
-        parseMonitoringPoints(data = []) {
-            const list = Array.isArray(data) ? data : []
-            return list.map((point) => ({
-                projectName: point.projectName || '',
-                deviceName: point.deviceName || '',
-                pointName: point.pointName || '',
-                dataTime: point.dataTime || '',
-                children: this.groupChildren(point.children || []),
-            }))
-        },
-        // 将按相别拆分的指标合并为 A/B/C 结构
-        groupChildren(children = []) {
-            const map = {}
-            const order = []
-            children.forEach((item) => {
-                const key = item.targetId || item.name
-                if (!map[key]) {
-                    map[key] = {
-                        targetId: item.targetId,
-                        name: item.name,
-                        unit: item.unit,
-                        A: '-',
-                        B: '-',
-                        C: '-',
-                        T: '-',
-                    }
-                    order.push(key)
-                }
-                const phase = item.phase
-                if (phase === 'A' || phase === 'B' || phase === 'C' || phase === 'T') {
-                    map[key][phase] = this.formatPhaseValue(item.data)
-                }
-            })
-            return order.map((key) => map[key])
-        },
-        formatPhaseValue(value) {
-            if (value === null || value === undefined || value === '') return '-'
-            return String(value)
-        },
-        hasTPhaseData(child) {
-            return child.T !== undefined && child.T !== null && child.T !== '-'
-        },
-        updateSummaryStats(devCount = {}) {
-            const deviceTotal =
-                (devCount.currentOnLineDevCount || 0) + (devCount.currentOffLineDevCount || 0)
-
-            this.summaryStats = [
-                { label: '项目总数', value: devCount.currentProjectCount || 0 },
-                { label: '设备总数', value: deviceTotal },
-                { label: '监测点总数', value: devCount.lineCount || 0 },
-            ]
-        },
-
-        // 指标名称超过6个字截断显示
-        formatIndicatorTag(name) {
-            if (!name || name.length <= 6) return name
-            return `${name.slice(0, 5)}...`
-        },
-        // 判断指标名称是否匹配（兼容括号后缀）
-        matchIndicator(name, selected) {
-            if (!name || !selected) return false
-            const base = (name || '').replace(/\(.*\)/, '').trim()
-            const selectedBase = (selected || '').replace(/\(.*\)/, '').trim()
-            return base === selectedBase
-        },
-        // 从缓存读取已选指标，无缓存时使用默认电压/电流指标
-        loadSelectedIndicators() {
-            const cached = uni.getStorageSync(this.$cacheKey.monitorSelectedIndicators)
-            if (Array.isArray(cached) && cached.length) {
-                const valid = cached.filter((name) =>
-                    this.targetLists.some((item) => this.matchIndicator(item.name, name)),
-                )
-                if (valid.length) {
-                    this.selectedIndicators = valid
-                    return
-                }
-            }
-            this.selectedIndicators = this.getDefaultIndicatorsByCode()
-            this.saveSelectedIndicators()
-        },
-        getDefaultIndicatorsByCode() {
-            return this.targetLists
-                .filter((item) => DEFAULT_INDICATOR_CODES.includes(item.code) && item.name)
-                .map((item) => item.name)
-        },
-        saveSelectedIndicators() {
-            uni.setStorageSync(this.$cacheKey.monitorSelectedIndicators, this.selectedIndicators)
-        },
-        // 跳转切换工程
-        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)
-            this.saveSelectedIndicators()
-        },
-        // 打开指标选择弹窗
-        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.saveSelectedIndicators()
-            this.closeIndicatorPopup()
-        },
-        // 查看更多指标
-        onMoreIndicators(point) {
-            uni.setStorageSync('monitorPointDetail', {
-                ...point,
-                engineeringName: this.engineeringName,
-                selectedIndicators: [...this.selectedIndicators],
-            })
-            uni.navigateTo({
-                url: '/pages/index/comp/targetInfo',
-            })
-        },
-        // 获取监测点当前展示的指标数据
-        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
-        },
-        backToTop() {
-            uni.pageScrollTo({
-                scrollTop: 0,
-                duration: 300,
-            })
-            this.showBackTop = false
-        },
-    },
-}
-</script>
-
-<style lang="scss" scoped>
-.itic2-page {
-    min-height: 100vh;
-    background: #f7f8fa;
-    position: relative;
-}
-
-.itic2-content {
-    padding: 20rpx 0 40rpx;
-    box-sizing: border-box;
-}
-
-.back-top {
-    position: fixed;
-    right: 30rpx;
-    bottom: 60rpx;
-    width: 80rpx;
-    height: 80rpx;
-    border-radius: 50%;
-    background: #376cf3;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    box-shadow: 0 4rpx 16rpx rgba(55, 108, 243, 0.35);
-    z-index: 99;
-}
-
-.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: 6rpx;
-    padding: 6rpx 14rpx;
-    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: 24rpx;
-    color: #666666;
-    line-height: 1.2;
-}
-
-.meta-time {
-    display: block;
-    margin-top: 8rpx;
-    font-size: 24rpx;
-    color: #666666;
-    line-height: 1.2;
-}
-
-.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-single {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 4rpx;
-}
-
-.phase-item-vertical {
-    flex: 1;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 4rpx;
-}
-
-.phase-value-vertical {
-    font-size: 28rpx;
-    font-weight: 700;
-
-    &--neutral {
-        color: #333333;
-    }
-}
-
-.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>
+<template>
+    <page-meta :page-style="'overflow:' + (indicatorPopupShow ? 'hidden' : 'visible')"></page-meta>
+    <view class="itic2-page">
+        <view class="itic2-content">
+            <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">
+                                <view class="point-name-row">
+                                    <text class="point-name ellipsis">{{ point.pointName }}</text>
+
+                                </view>
+                                <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 }} {{ child.unit ? `(${child.unit})` : '' }}</text>
+                                    </view>
+                                    <view v-if="hasTPhaseData(child)" class="phase-single">
+                                        <text class="phase-value-vertical phase-value-vertical--neutral">{{ child.T
+                                            }}</text>
+                                    </view>
+                                    <view v-else 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" v-if="shouldShowMoreBtn(point)" @click="onMoreIndicators(point)">
+                            <uni-icons type="list" size="16" color="#376cf3" />
+                            <text>更多指标</text>
+                        </view>
+                    </view>
+                    <uni-load-more v-if="listStatus == 'loading' || monitoringPoints.length > 0"
+                        :status="listStatus"></uni-load-more>
+                    <Cn-empty v-else style="top: 35%"></Cn-empty>
+                </view>
+            </view>
+        </view>
+
+        <view class="back-top boxClick" v-show="showBackTop" @click="backToTop">
+            <uni-icons type="arrow-up" size="22" color="#fff"></uni-icons>
+        </view>
+
+        <uni-popup ref="indicatorPopup" type="bottom" :safe-area="false" @change="onIndicatorPopupChange">
+            <view class="indicator-popup">
+                <view class="indicator-popup-header" @touchmove.stop.prevent>
+                    <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 :show-scrollbar="false" @touchmove.stop>
+                    <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'
+import { getLineDataByEngineer } from '@/common/api/harmonic'
+import { getDevCount } from '@/common/api/device.js'
+
+/** 无本地缓存时的默认展示指标：电压、电流 */
+const DEFAULT_INDICATOR_CODES = ['Key_Power_Quality_V', 'Key_Power_Quality_I']
+
+/** 治理测点(lineType=0)卡片默认展示的指标 */
+const GOVERNANCE_DEFAULT_INDICATORS = [
+    '电网电流',
+    '电网电压',
+    '负载电流',
+    '总输出电流',
+]
+
+export default {
+    data() {
+        return {
+            targetLists: [],
+            popupSelectedIndicators: [],
+            engineeringName: '',
+            engineeringId: '',
+            summaryStats: [
+                { label: '项目总数', value: 0 },
+                { label: '设备总数', value: 0 },
+                { label: '监测点总数', value: 0 },
+            ],
+            selectedIndicators: [],
+            phaseColors: [
+                { name: 'A相', color: '#F1B22E' },
+                { name: 'B相', color: '#2BA471' },
+                { name: 'C相', color: '#D54941' },
+            ],
+            monitoringPoints: [],
+            listStatus: 'noMore',
+            lineDataRequestId: 0,
+            showBackTop: false,
+            indicatorPopupShow: false,
+        }
+    },
+    onPageScroll(e) {
+        this.showBackTop = e.scrollTop > 200
+    },
+    // 页面显示时同步工程名称
+    onShow() {
+        const engineering = uni.getStorageSync('engineering')
+        if (engineering?.id) {
+            this.engineeringName = engineering.name || ''
+            this.engineeringId = engineering.id
+            this.info()
+        }
+        if (this.targetLists.length) {
+            this.loadSelectedIndicators()
+        }
+    },
+    // 加载电能质量指标字典
+    created() {
+        queryByCode('Key_Power_Quality').then((res) => {
+            queryCsDictTree(res.data.id).then((resp) => {
+                this.targetLists = (resp.data || []).slice().reverse()
+                this.loadSelectedIndicators()
+            })
+        })
+    },
+    // 下拉刷新
+    onPullDownRefresh() {
+        this.info()
+
+    },
+    methods: {
+        // 查询接口
+        info() {
+            if (!this.engineeringId) {
+                uni.stopPullDownRefresh()
+                return
+            }
+            this.loadDevCount()
+            this.loadLineData()
+        },
+        loadDevCount() {
+            getDevCount(this.engineeringId).then((res) => {
+                if (res.code == 'A0000') {
+                    this.updateSummaryStats(res.data)
+                }
+            })
+        },
+        loadLineData() {
+            this.listStatus = 'loading'
+            this.monitoringPoints = []
+            const requestId = ++this.lineDataRequestId
+            const engineerId = this.engineeringId
+            getLineDataByEngineer({ id: engineerId })
+                .then((res) => {
+                    if (requestId !== this.lineDataRequestId) return
+                    if (res.code == 'A0000') {
+                        this.monitoringPoints = this.parseMonitoringPoints(res.data)
+                    } else if (res.message) {
+                        this.$util.toast(res.message)
+                    }
+                })
+                .catch(() => {
+                    if (requestId !== this.lineDataRequestId) return
+                    this.$util.toast('加载失败，请稍后重试')
+                })
+                .finally(() => {
+                    if (requestId !== this.lineDataRequestId) return
+                    this.listStatus = 'noMore'
+                    uni.stopPullDownRefresh()
+                })
+        },
+        // 接口 data 转为页面 monitoringPoints
+        parseMonitoringPoints(data = []) {
+            const list = Array.isArray(data) ? data : []
+            return list.map((point) => ({
+                projectName: point.projectName || '',
+                deviceName: point.deviceName || '',
+                pointName: point.pointName || '',
+                dataTime: point.dataTime || '',
+                lineType: point.lineType,
+                children: this.groupChildren(point.children || []),
+            }))
+        },
+        // 将按相别拆分的指标合并为 A/B/C 结构
+        groupChildren(children = []) {
+            const map = {}
+            const order = []
+            children.forEach((item) => {
+                const key = item.targetId || item.name
+                if (!map[key]) {
+                    map[key] = {
+                        targetId: item.targetId,
+                        name: item.name,
+                        unit: item.unit,
+                        A: '-',
+                        B: '-',
+                        C: '-',
+                        T: '-',
+                    }
+                    order.push(key)
+                }
+                const phase = item.phase
+                if (phase === 'A' || phase === 'B' || phase === 'C' || phase === 'T') {
+                    map[key][phase] = this.formatPhaseValue(item.data)
+                }
+            })
+            return order.map((key) => map[key])
+        },
+        formatPhaseValue(value) {
+            if (value === null || value === undefined || value === '') return '-'
+            const num = Number(value)
+            if (Number.isNaN(num)) return String(value)
+            return num.toFixed(2)
+        },
+        hasTPhaseData(child) {
+            return child.T !== undefined && child.T !== null && child.T !== '-'
+        },
+        updateSummaryStats(devCount = {}) {
+            const deviceTotal =
+                (devCount.currentOnLineDevCount || 0) + (devCount.currentOffLineDevCount || 0)
+
+            this.summaryStats = [
+                { label: '项目总数', value: devCount.currentProjectCount || 0 },
+                { label: '设备总数', value: deviceTotal },
+                { label: '监测点总数', value: devCount.lineCount || 0 },
+            ]
+        },
+
+        // 指标名称超过6个字截断显示
+        formatIndicatorTag(name) {
+            if (!name || name.length <= 6) return name
+            return `${name.slice(0, 5)}...`
+        },
+        // 判断指标名称是否匹配（兼容括号后缀）
+        matchIndicator(name, selected) {
+            if (!name || !selected) return false
+            const base = (name || '').replace(/\(.*\)/, '').trim()
+            const selectedBase = (selected || '').replace(/\(.*\)/, '').trim()
+            return base === selectedBase
+        },
+        // 从缓存读取已选指标，无缓存时使用默认电压/电流指标
+        loadSelectedIndicators() {
+            const cached = uni.getStorageSync(this.$cacheKey.monitorSelectedIndicators)
+            if (Array.isArray(cached) && cached.length) {
+                const valid = cached.filter((name) =>
+                    this.targetLists.some((item) => this.matchIndicator(item.name, name)),
+                )
+                if (valid.length) {
+                    this.selectedIndicators = valid
+                    return
+                }
+            }
+            this.selectedIndicators = this.getDefaultIndicatorsByCode()
+            this.saveSelectedIndicators()
+        },
+        getDefaultIndicatorsByCode() {
+            return this.targetLists
+                .filter((item) => DEFAULT_INDICATOR_CODES.includes(item.code) && item.name)
+                .map((item) => item.name)
+        },
+        saveSelectedIndicators() {
+            uni.setStorageSync(this.$cacheKey.monitorSelectedIndicators, this.selectedIndicators)
+        },
+        // 跳转切换工程
+        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)
+            this.saveSelectedIndicators()
+        },
+        // 打开指标选择弹窗
+        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 = []
+        },
+        onIndicatorPopupChange(e) {
+            this.indicatorPopupShow = !!e.show
+        },
+        // 切换弹窗内指标勾选状态
+        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.saveSelectedIndicators()
+            this.closeIndicatorPopup()
+        },
+        // 跳转指标详情页；治理测点展示全部指标，普通测点展示未选中的指标
+        onMoreIndicators(point) {
+            uni.setStorageSync('monitorPointDetail', {
+                ...point,
+                engineeringName: this.engineeringName,
+                selectedIndicators:
+                    point.lineType === 0
+                        ? [...GOVERNANCE_DEFAULT_INDICATORS]
+                        : [...this.selectedIndicators],
+                showAllIndicators: point.lineType === 0,
+            })
+            uni.navigateTo({
+                url: '/pages/index/comp/targetInfo',
+            })
+        },
+        // 治理测点默认 4 项；普通测点按顶部已选指标过滤
+        getDisplayChildren(point) {
+            const children = point.children || []
+            if (point.lineType === 0) {
+                return GOVERNANCE_DEFAULT_INDICATORS.map((name) =>
+                    children.find((child) => this.matchIndicator(child.name, name)),
+                ).filter(Boolean)
+            }
+            return children.filter((child) =>
+                this.selectedIndicators.some((name) => this.matchIndicator(child.name, name)),
+            )
+        },
+        // 治理测点存在默认四项以外的指标时显示「更多指标」
+        shouldShowMoreBtn(point) {
+            if (point.lineType !== 0) return true
+            const children = point.children || []
+            return children.some(
+                (child) =>
+                    !GOVERNANCE_DEFAULT_INDICATORS.some((name) => this.matchIndicator(child.name, name)),
+            )
+        },
+
+        // 将指标列表按每行两个分组
+        chunkedChildren(children) {
+            const result = []
+            for (let i = 0; i < children.length; i += 2) {
+                result.push(children.slice(i, i + 2))
+            }
+            return result
+        },
+        backToTop() {
+            uni.pageScrollTo({
+                scrollTop: 0,
+                duration: 300,
+            })
+            this.showBackTop = false
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.itic2-page {
+    min-height: 100vh;
+    background: #f7f8fa;
+    position: relative;
+}
+
+.itic2-content {
+    padding: 20rpx 0 0rpx;
+    box-sizing: border-box;
+}
+
+.back-top {
+    position: fixed;
+    right: 30rpx;
+    bottom: 60rpx;
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 50%;
+    background: #376cf3;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0 4rpx 16rpx rgba(55, 108, 243, 0.35);
+    z-index: 99;
+}
+
+.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: 6rpx;
+    padding: 6rpx 14rpx;
+    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-row {
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
+    margin-bottom: 8rpx;
+    min-width: 0;
+}
+
+.point-name {
+    flex: 1;
+    min-width: 0;
+    font-size: 30rpx;
+    font-weight: 700;
+    color: #333333;
+}
+
+.point-type-tag {
+    flex-shrink: 0;
+    padding: 4rpx 12rpx;
+    font-size: 22rpx;
+    color: #2ba471;
+    background: #2ba47115;
+    border-radius: 8rpx;
+    line-height: 1.2;
+}
+
+.meta-row {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 6rpx 12rpx;
+}
+
+.meta-item {
+    font-size: 24rpx;
+    color: #666666;
+    line-height: 1.2;
+}
+
+.meta-time {
+    display: block;
+    margin-top: 8rpx;
+    font-size: 24rpx;
+    color: #666666;
+    line-height: 1.2;
+}
+
+.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-single {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 4rpx;
+}
+
+.phase-item-vertical {
+    flex: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 4rpx;
+}
+
+.phase-value-vertical {
+    font-size: 28rpx;
+    font-weight: 700;
+
+    &--neutral {
+        color: #333333;
+    }
+}
+
+.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 {
+    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>
diff --git a/pages/index/comp/targetInfo.vue b/pages/index/comp/targetInfo.vue
index 78952af..cd0b4b6 100644
--- a/pages/index/comp/targetInfo.vue
+++ b/pages/index/comp/targetInfo.vue
@@ -1,307 +1,312 @@
-<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 v-if="pointInfo.engineeringName" class="meta-item ellipsis">
-                                工程：{{ pointInfo.engineeringName }}
-                            </text>
-                            <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 v-if="moreChildren.length" class="params-section">
-                    <view
-                        v-for="(rowItems, rowIdx) in chunkedChildren(moreChildren)"
-                        :key="rowIdx"
-                        class="double-row"
-                    >
-                        <view v-for="(child, childIdx) in rowItems" :key="child.targetId || childIdx" class="param-group">
-                            <view class="param-title">
-                                <text>{{ child.name }}{{ child.unit ? ` (${child.unit})` : '' }}</text>
-                            </view>
-                            <view v-if="hasTPhaseData(child)" class="phase-single">
-                                <text class="phase-value-vertical phase-value-vertical--neutral">{{ child.T }}</text>
-                            </view>
-                            <view v-else 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 v-else class="empty-wrap">
-                    <Cn-empty msg="暂无更多指标" :paddingTop="120"></Cn-empty>
-                </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' },
-            ],
-        }
-    },
-    computed: {
-        moreChildren() {
-            const children = this.pointInfo.children || []
-            const selected = this.getSelectedIndicators()
-            return children.filter(
-                (child) => !selected.some((name) => this.matchIndicator(child.name, name)),
-            )
-        },
-    },
-    onLoad() {
-        const point = uni.getStorageSync('monitorPointDetail')
-        if (point) {
-            this.pointInfo = {
-                ...point,
-                selectedIndicators: this.getSelectedIndicatorsFromStorage(point.selectedIndicators),
-            }
-            if (point.pointName) {
-                uni.setNavigationBarTitle({ title: point.pointName })
-            }
-        }
-    },
-    onUnload() {
-        uni.removeStorageSync('monitorPointDetail')
-    },
-    methods: {
-        getSelectedIndicatorsFromStorage(fallback = []) {
-            const cached = uni.getStorageSync(this.$cacheKey.monitorSelectedIndicators)
-            if (Array.isArray(cached) && cached.length) {
-                return cached
-            }
-            return Array.isArray(fallback) ? fallback : []
-        },
-        getSelectedIndicators() {
-            return this.getSelectedIndicatorsFromStorage(this.pointInfo.selectedIndicators)
-        },
-        matchIndicator(name, selected) {
-            if (!name || !selected) return false
-            const base = (name || '').replace(/\(.*\)/, '').trim()
-            const selectedBase = (selected || '').replace(/\(.*\)/, '').trim()
-            return base === selectedBase
-        },
-        hasTPhaseData(child) {
-            return child.T !== undefined && child.T !== null && child.T !== '-'
-        },
-        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: 24rpx;
-    color: #666666;
-    line-height: 1.2;
-}
-
-.meta-time {
-    display: block;
-    margin-top: 8rpx;
-    font-size: 24rpx;
-    color: #666666;
-    line-height: 1.2;
-}
-
-.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;
-}
-
-.empty-wrap {
-    position: relative;
-    min-height: 320rpx;
-}
-
-.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-single {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 4rpx;
-}
-
-.phase-item-vertical {
-    flex: 1;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 4rpx;
-}
-
-.phase-value-vertical {
-    font-size: 28rpx;
-    font-weight: 700;
-
-    &--neutral {
-        color: #333333;
-    }
-}
-
-.phase-divider {
-    width: 1px;
-    background: #d2d2d2;
-    margin: 8rpx 0;
-}
-
-.ellipsis {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-</style>
+<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 v-if="pointInfo.engineeringName" class="meta-item ellipsis">
+                                工程：{{ pointInfo.engineeringName }}
+                            </text>
+                            <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 v-if="moreChildren.length" class="params-section">
+                    <view v-for="(rowItems, rowIdx) in chunkedChildren(moreChildren)" :key="rowIdx" class="double-row">
+                        <view v-for="(child, childIdx) in rowItems" :key="child.targetId || childIdx"
+                            class="param-group">
+                            <view class="param-title">
+                                <text>{{ child.name }}{{ child.unit ? ` (${child.unit})` : '' }}</text>
+                            </view>
+                            <view v-if="hasTPhaseData(child)" class="phase-single">
+                                <text class="phase-value-vertical phase-value-vertical--neutral">{{ child.T }}</text>
+                            </view>
+                            <view v-else 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 v-else class="empty-wrap">
+                    <Cn-empty msg="暂无更多指标" :paddingTop="120"></Cn-empty>
+                </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' },
+            ],
+        }
+    },
+    computed: {
+        moreChildren() {
+            const children = this.pointInfo.children || []
+            // 治理测点「更多指标」页展示全部
+            if (this.pointInfo.lineType === 0 && this.pointInfo.showAllIndicators) {
+                return children
+            }
+            const selected = this.getSelectedIndicators()
+            return children.filter(
+                (child) => !selected.some((name) => this.matchIndicator(child.name, name)),
+            )
+        },
+    },
+    onLoad() {
+        const point = uni.getStorageSync('monitorPointDetail')
+        if (point) {
+            this.pointInfo = {
+                ...point,
+                selectedIndicators: this.getSelectedIndicatorsFromStorage(point.selectedIndicators),
+            }
+            if (point.pointName) {
+                uni.setNavigationBarTitle({ title: point.pointName })
+            }
+        }
+    },
+    onUnload() {
+        uni.removeStorageSync('monitorPointDetail')
+    },
+    methods: {
+        getSelectedIndicatorsFromStorage(fallback = []) {
+            const cached = uni.getStorageSync(this.$cacheKey.monitorSelectedIndicators)
+            if (Array.isArray(cached) && cached.length) {
+                return cached
+            }
+            return Array.isArray(fallback) ? fallback : []
+        },
+        getSelectedIndicators() {
+            return this.getSelectedIndicatorsFromStorage(this.pointInfo.selectedIndicators)
+        },
+        matchIndicator(name, selected) {
+            if (!name || !selected) return false
+            const base = (name || '').replace(/\(.*\)/, '').trim()
+            const selectedBase = (selected || '').replace(/\(.*\)/, '').trim()
+            return base === selectedBase
+        },
+        hasTPhaseData(child) {
+            return child.T !== undefined && child.T !== null && child.T !== '-'
+        },
+        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: 24rpx;
+    color: #666666;
+    line-height: 1.2;
+}
+
+.meta-time {
+    display: block;
+    margin-top: 8rpx;
+    font-size: 24rpx;
+    color: #666666;
+    line-height: 1.2;
+}
+
+.legend-row {
+    display: flex;
+    gap: 20rpx;
+    align-items: center;
+    justify-content: end;
+    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;
+}
+
+.empty-wrap {
+    position: relative;
+    min-height: 320rpx;
+}
+
+.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-single {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 4rpx;
+}
+
+.phase-item-vertical {
+    flex: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 4rpx;
+}
+
+.phase-value-vertical {
+    font-size: 28rpx;
+    font-weight: 700;
+
+    &--neutral {
+        color: #333333;
+    }
+}
+
+.phase-divider {
+    width: 1px;
+    background: #d2d2d2;
+    margin: 8rpx 0;
+}
+
+.ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c4907e9..fb7b8f0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -72,6 +72,7 @@ import Engineering from './comp/engineering.vue'
 import list from '../../common/js/list'
 import { getDevCount } from '../../common/api/device.js'
 import { queryEngineering } from '@/common/api/engineering.js'
+import { checkAppUpdate } from '@/common/js/update.js'
 
 export default {
     mixins: [list],
@@ -252,6 +253,11 @@ export default {
         this.showBackTop = e.scrollTop > 200
     },
     onLoad() {
+        // #ifdef APP-PLUS
+        checkAppUpdate()
+        // #endif
+
+
         // 页面加载时，动态配置导航栏按钮
         if (!uni.getStorageSync(this.$cacheKey.access_token)) {
             uni.reLaunch({
@@ -289,6 +295,8 @@ export default {
         // #endif
     },
     onShow() {
+
+
         this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
 
         let access_token = uni.getStorageSync(this.$cacheKey.access_token)
@@ -319,7 +327,7 @@ export default {
     },
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .popup-content {
     background: #fff;
 }
diff --git a/pages/index/message1.vue b/pages/index/message1.vue
index 0621735..ac014d6 100644
--- a/pages/index/message1.vue
+++ b/pages/index/message1.vue
@@ -101,7 +101,7 @@ export default {
         this.getDevCount()
         this.$nextTick(() => {
             if (params.type !== '') {
-                this.current = params.type - 0
+                this.current = (params.type - 0)||0
             }
             if (params.engineeringName != '') {
                 this.$refs.cnFilterCriteria && this.$refs.cnFilterCriteria.external(params)
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 8fd2d47..83af413 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -259,7 +259,7 @@ export default {
         handleScon() {
             this.$refs.message.close()
             uni.scanCode({
-                onlyFromCamera: true,
+                // onlyFromCamera: false,
                 success: (res) => {
                     console.log('条码类型：' + res.scanType)
                     console.log('条码内容：' + res.result)
diff --git a/pages/message1/comp/alarmDetails.vue b/pages/message1/comp/alarmDetails.vue
index 34884ea..48d80e7 100644
--- a/pages/message1/comp/alarmDetails.vue
+++ b/pages/message1/comp/alarmDetails.vue
@@ -1,286 +1,286 @@
-<template>
-    <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.date }}</view>
-            </view>
-            <view class="detail-content" style="padding-top: 0px;padding-bottom: 0px">
-                <view class="detail-content-title pb20 pt20 pl20">终端告警列表</view>
-            </view>
-
-            <view class="event-list">
-                <uni-card class="event-item" :class="item.type" v-for="(item, index) in list" :key="index">
-                    <!-- 头部：图标 + 信息 + 操作 -->
-                    <view class="event-header">
-                        <view class="event-icon"
-                            :class="item.devType == 'Direct_Connected_Device' ? 'zl-bgc' : 'jc-bgc'">
-                           
-                            <Cn-icon-transient :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 class="event-tag"
-                                    :class="item.devType == 'Direct_Connected_Device' ? 'zl-tag' : 'jc-tag'">{{
-                                        item.devType == 'Direct_Connected_Device' ? '治理设备' : '监测设备' }}</text>
-                            </view>
-                            <view class="event-desc">
-                                <text>工程：{{ item.engineeringName }}</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.dataDetails.onlineRate.isAbnormal">
-                            <text>在线率：
-                                <text class="integrity-value">{{ item.dataDetails.onlineRate.value }}%</text>　
-                            </text>
-
-                        </view>
-                        <view v-if="hasIntegrityAbnormal(item)" class="mt10">
-                            数据完整性：
-                            <view class="integrity-grid">
-                                <view
-                                    v-for="(rowItems, rowIdx) in chunkedPoints(getAbnormalPoints(item))"
-                                    :key="rowIdx"
-                                    class="grid-row">
-                                    <view
-                                        v-for="(point, pIdx) in rowItems"
-                                        :key="pIdx"
-                                        class="param-group">
-                                        <view class="param-title">
-                                            <text>{{ point.monitorName }}</text>
-                                        </view>
-                                        <view class="integrity-value-row">
-                                            <text class="integrity-value">{{ point.value }}%</text>
-                                        </view>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                        <view v-if="item.warnCounts" class="mt10 ">
-                            终端告警 {{ item.warnCounts }} 次，详情如下：
-                            <view class="textBox mt10">
-                                <view v-for="val in item.warnDetails" class="textBox mb5" style=" font-size: 26rpx;">
-                                    {{ val.warnEventTime + '发生' + val.warnEventDesc }}
-                                </view>
-                            </view>
-                        </view>
-                    </view>
-                </uni-card>
-            </view>
-        </view>
-    </Cn-page>
-</template>
-<script>
-import { updateStatus, queryAlarmDetail } from '@/common/api/message'
-
-export default {
-    data() {
-        return {
-            loading: true,
-            detail: {},
-            limit: '',
-            collapseValue: '0',
-
-            list: [],
-        }
-    },
-    onLoad(options) {
-        this.loading = true
-        this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%'))
-        this.init()
-        if (this.detail.isRead != 1) {
-            updateStatus({
-                eventIds: [this.detail.eventId],
-            })
-        }
-    },
-    methods: {
-        hasIntegrityAbnormal(item) {
-            const points = item?.dataDetails?.integrity?.monitorPoints
-            if (!Array.isArray(points) || !points.length) return false
-            return points.some((p) => p.isAbnormal === true)
-        },
-        getAbnormalPoints(item) {
-            return item?.dataDetails?.integrity?.monitorPoints?.filter((p) => p.isAbnormal === true) || []
-        },
-        chunkedPoints(points) {
-            const result = []
-            for (let i = 0; i < points.length; i += 3) {
-                result.push(points.slice(i, i + 3))
-            }
-            return result
-        },
-        init() {
-            queryAlarmDetail({
-                devList: this.detail.devIds,
-                time: this.detail.date,
-            })
-                .then((res) => {
-                    this.list = res.data
-                    this.loading = false
-                })
-                .catch(() => {
-                    this.loading = false
-                })
-        },
-    },
-}
-</script>
-<style lang="scss" scoped>
-@import '../index.scss';
-
-.detail {
-    padding: 20rpx 0;
-
-    .detail-content {
-        
-        padding: 20rpx;
-        background: #fff;
-        margin-bottom: 20rpx;
-        font-size: 28rpx;
-
-        .detail-content-title {
-            display: inline-flex;
-            align-items: center;
-            position: relative;
-            padding-left: 20rpx;
-            font-size: 30rpx;
-            color: #111;
-            font-weight: 700;
-
-            &::before {
-                content: '';
-                position: absolute;
-                left: 0;
-                top: 50%;
-                transform: translateY(-50%);
-                width: 8rpx;
-                height: 28rpx;
-                background: $uni-theme-color;
-                border-radius: 3rpx;
-            }
-        }
-    }
-
-    .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: 150rpx;
-    overflow-y: auto;
-}
-
-.integrity-grid {
-    margin-top: 16rpx;
-}
-
-.grid-row {
-    display: grid;
-    grid-template-columns: repeat(3, 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;
-    text-align: center;
-}
-
-.param-title {
-    font-size: 24rpx;
-    color: #666666;
-    // margin-bottom: 8rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.integrity-value-row {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 2rpx;
-}
-
-.integrity-value {
-    font-size: 26rpx;
-    font-weight: 700;
-    color: #333333;
-}
+<template>
+    <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.date }}</view>
+            </view>
+            <view class="detail-content" style="padding-top: 0px;padding-bottom: 0px">
+                <view class="detail-content-title pb20 pt20 pl20">终端告警列表</view>
+            </view>
+
+            <view class="event-list">
+                <uni-card class="event-item" :class="item.type" v-for="(item, index) in list" :key="index">
+                    <!-- 头部：图标 + 信息 + 操作 -->
+                    <view class="event-header">
+                        <view class="event-icon"
+                            :class="item.devType == 'Direct_Connected_Device' ? 'zl-bgc' : 'jc-bgc'">
+                           
+                            <Cn-icon-transient :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 class="event-tag"
+                                    :class="item.devType == 'Direct_Connected_Device' ? 'zl-tag' : 'jc-tag'">{{
+                                        item.devType == 'Direct_Connected_Device' ? '治理设备' : '监测设备' }}</text>
+                            </view>
+                            <view class="event-desc">
+                                <text>工程：{{ item.engineeringName }}</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.dataDetails.onlineRate.isAbnormal">
+                            <text>在线率：
+                                <text class="integrity-value">{{ item.dataDetails.onlineRate.value }}%</text>　
+                            </text>
+
+                        </view>
+                        <view v-if="hasIntegrityAbnormal(item)" class="mt10">
+                            数据完整性：
+                            <view class="integrity-grid">
+                                <view
+                                    v-for="(rowItems, rowIdx) in chunkedPoints(getAbnormalPoints(item))"
+                                    :key="rowIdx"
+                                    class="grid-row">
+                                    <view
+                                        v-for="(point, pIdx) in rowItems"
+                                        :key="pIdx"
+                                        class="param-group">
+                                        <view class="param-title">
+                                            <text>{{ point.monitorName }}</text>
+                                        </view>
+                                        <view class="integrity-value-row">
+                                            <text class="integrity-value">{{ point.value }}%</text>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                        <view v-if="item.warnCounts" class="mt10 ">
+                            终端告警 {{ item.warnCounts }} 次，详情如下：
+                            <view class="textBox mt10">
+                                <view v-for="val in item.warnDetails" class="textBox mb5" style=" font-size: 26rpx;">
+                                    {{ val.warnEventTime + '发生' + val.warnEventDesc }}
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+    </Cn-page>
+</template>
+<script>
+import { updateStatus, queryAlarmDetail } from '@/common/api/message'
+
+export default {
+    data() {
+        return {
+            loading: true,
+            detail: {},
+            limit: '',
+            collapseValue: '0',
+
+            list: [],
+        }
+    },
+    onLoad(options) {
+        this.loading = true
+        this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%'))
+        this.init()
+        if (this.detail.isRead != 1) {
+            updateStatus({
+                eventIds: [this.detail.eventId],
+            })
+        }
+    },
+    methods: {
+        hasIntegrityAbnormal(item) {
+            const points = item?.dataDetails?.integrity?.monitorPoints
+            if (!Array.isArray(points) || !points.length) return false
+            return points.some((p) => p.isAbnormal === true)
+        },
+        getAbnormalPoints(item) {
+            return item?.dataDetails?.integrity?.monitorPoints?.filter((p) => p.isAbnormal === true) || []
+        },
+        chunkedPoints(points) {
+            const result = []
+            for (let i = 0; i < points.length; i += 3) {
+                result.push(points.slice(i, i + 3))
+            }
+            return result
+        },
+        init() {
+            queryAlarmDetail({
+                devList: this.detail.devIds,
+                time: this.detail.date,
+            })
+                .then((res) => {
+                    this.list = res.data
+                    this.loading = false
+                })
+                .catch(() => {
+                    this.loading = false
+                })
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+@import '../index.scss';
+
+.detail {
+    padding: 20rpx 0;
+
+    .detail-content {
+        
+        padding: 20rpx;
+        background: #fff;
+        margin-bottom: 20rpx;
+        font-size: 28rpx;
+
+        .detail-content-title {
+            display: inline-flex;
+            align-items: center;
+            position: relative;
+            padding-left: 20rpx;
+            font-size: 30rpx;
+            color: #111;
+            font-weight: 700;
+
+            &::before {
+                content: '';
+                position: absolute;
+                left: 0;
+                top: 50%;
+                transform: translateY(-50%);
+                width: 8rpx;
+                height: 28rpx;
+                background: $uni-theme-color;
+                border-radius: 3rpx;
+            }
+        }
+    }
+
+    .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: 150rpx;
+    overflow-y: auto;
+}
+
+.integrity-grid {
+    margin-top: 16rpx;
+}
+
+.grid-row {
+    display: grid;
+    grid-template-columns: repeat(3, 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;
+    text-align: center;
+}
+
+.param-title {
+    font-size: 24rpx;
+    color: #666666;
+    // margin-bottom: 8rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.integrity-value-row {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 2rpx;
+}
+
+.integrity-value {
+    font-size: 26rpx;
+    font-weight: 700;
+    color: #333333;
+}
 </style>
\ No newline at end of file
diff --git a/pages/message1/index.scss b/pages/message1/index.scss
index fe94fe3..41eed4c 100644
--- a/pages/message1/index.scss
+++ b/pages/message1/index.scss
@@ -76,11 +76,11 @@
 
         border-radius: 20rpx;
     }
-    /* 电压暂降 - 蓝色系 */
+    /* 暂降 - 蓝色系 */
     .sag .event-icon {
         background-color: #2563eb20;
     }
-    /* 电压暂升 - 橙色系 */
+    /* 暂升 - 橙色系 */
     .swell .event-icon {
         background-color: #e6a23c20;
     }
diff --git a/pages/message1/transient.vue b/pages/message1/transient.vue
index 4334a9c..8b855fa 100644
--- a/pages/message1/transient.vue
+++ b/pages/message1/transient.vue
@@ -115,9 +115,9 @@ export default {
             filterValue: 0,
             dataList: [
                 { value: 0, label: '暂态数量', key: '' },
-                { value: 0, label: '暂降', key: '电压暂降' },
-                { value: 0, label: '中断', key: '电压中断' },
-                { value: 0, label: '暂升', key: '电压暂升' },
+                { value: 0, label: '暂降', key: '暂降' },
+                { value: 0, label: '中断', key: '中断' },
+                { value: 0, label: '暂升', key: '暂升' },
             ],
             status: 'noMore', //more加载前  loading加载中 noMore加载后
             sort: 0,
@@ -177,21 +177,21 @@ export default {
         },
         judgment(val, key) {
             switch (val) {
-                case '电压暂降':
+                case '暂降':
                     return {
                         type: 'sag',
                         icon: 'icon-a-svg4',
                         color: '#2563eb',
                         size: '25',
                     }
-                case '电压暂升':
+                case '暂升':
                     return {
                         type: 'swell',
                         icon: 'icon-a-svg5',
                         color: '#e6a23c',
                         size: '25',
                     }
-                case '电压中断':
+                case '中断':
                     return {
                         type: 'interrupt',
                         icon: 'icon-zhongduan2',