From ba04609631c8fce57a2f8e899e87036fb061e2ba Mon Sep 17 00:00:00 2001
From: wangqiyang <wqy00163@163.com>
Date: Thu, 23 Jul 2026 14:55:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E6=95=85=E9=9A=9C=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Monitoring/index.vue | 198 ++++++++++++++++++++++++++++-----
 1 file changed, 172 insertions(+), 26 deletions(-)

diff --git a/src/views/Monitoring/index.vue b/src/views/Monitoring/index.vue
index 313e115..9c42735 100644
--- a/src/views/Monitoring/index.vue
+++ b/src/views/Monitoring/index.vue
@@ -76,6 +76,28 @@
                             <el-button style="margin-bottom: 0;" class="mode-button active">{{ info.Mode ? '手动' : '自动' }}</el-button>
                         </div>
                     </div>
+                    <div class="fault-section">
+                        <div class="fault-header">
+                            <div>
+                                <div class="fault-title">当前故障</div>
+                                <div class="fault-subtitle">当前扫描设备数：{{ scanDeviceCount }}</div>
+                            </div>
+                            <el-button class="fault-refresh-button" :loading="faultRefreshing" @click="refreshCurrentFaults">
+                                <el-icon>
+                                    <RefreshRight />
+                                </el-icon>
+                                刷新当前故障
+                            </el-button>
+                        </div>
+                        <div v-if="currentFaults.length" class="fault-list">
+                            <div v-for="fault in currentFaults" :key="`${fault.loop_idx}-${fault.code}-${fault.message}`" class="fault-item">
+                                <span class="fault-loop">回路{{ fault.loop_idx }}</span>
+                                <span class="fault-message">{{ fault.message }}</span>
+                                <span v-if="fault.code" class="fault-code">{{ fault.code }}</span>
+                            </div>
+                        </div>
+                        <div v-else class="fault-empty">当前无故障</div>
+                    </div>
                     <div class="circuit-section">
                         <!-- 上排回路 -->
                         <div class="circuit-row">
@@ -202,7 +224,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted, watch } from 'vue'
+import { computed, ref, onMounted, onUnmounted, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import RPC from '@/utils/rpc'
 import dayjs from 'dayjs'
@@ -217,6 +239,7 @@ const systemRuntime = ref('38分钟')
 const brightnessDialogVisible = ref(false)
 const currentBrightness = ref(50)
 const selectedChannelName = ref(null)
+const faultRefreshing = ref(false)
 
 const week = ref('')
 const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
@@ -282,6 +305,7 @@ const energyParams = ref({
 
 const info = ref({
     "Mode": 0,
+    "scan_device_count": 10,
     "backup_byte1": 0,
     "Loops": [
         {
@@ -378,35 +402,68 @@ const info = ref({
     "backup_byte4": 0
 })
 
+const scanDeviceCount = computed(() => {
+    return info.value?.scan_device_count ?? info.value?.ScanDeviceCount ?? info.value?.Loops?.length ?? 0
+})
+
+const currentFaults = computed(() => {
+    const loops = info.value?.Loops || []
+    return loops.flatMap((loop, index) => {
+        const loopIdx = loop.loop_idx || loop.LoopIdx || loop.index + 1 || index + 1
+        const faults = loop.faults || loop.Faults || []
+        if (Array.isArray(faults) && faults.length > 0) {
+            return faults.map((fault) => ({
+                loop_idx: fault.loop_idx || loopIdx,
+                message: fault.message || fault.fault_msg || fault.Message || '',
+                code: fault.code || fault.fault_code || fault.Code || '',
+            })).filter((fault) => fault.message)
+        }
+        const message = loop.fault_msg || loop.FaultMsg
+        if ((loop.has_fault || loop.HasFault) && message) {
+            return [{
+                loop_idx: loopIdx,
+                message,
+                code: loop.fault_code || loop.FaultCode || '',
+            }]
+        }
+        return []
+    })
+})
+
+const loadDeviceStatus = () => {
+    return RPC.post('/m9z/getDeviceStatus2', { comm_uid: commit_uid }).then((res) => {
+        info.value = res
+    })
+}
+
+const loadPowerData = () => {
+    return RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => {
+        powerPhases.value[0].voltage = res.aVoltage + 'V'
+        powerPhases.value[0].current = res.aElectricCurrent + 'A'
+        powerPhases.value[0].power = res.aPower + 'kW'
+        powerPhases.value[0].factor = res.aPowerFactor
+
+        powerPhases.value[1].voltage = res.bVoltage + 'V'
+        powerPhases.value[1].current = res.bElectricCurrent + 'A'
+        powerPhases.value[1].power = res.bPower + 'kW'
+        powerPhases.value[1].factor = res.bPowerFactor
+
+        powerPhases.value[2].voltage = res.cVoltage + 'V'
+        powerPhases.value[2].current = res.cElectricCurrent + 'A'
+        powerPhases.value[2].power = res.cPower + 'kW'
+        powerPhases.value[2].factor = res.cPowerFactor
+
+        energyParams.value.activeEnergy = res.activeEnergy + 'kW·h'
+        energyParams.value.activePower = res.activePower + 'kW'
+        energyParams.value.powerFactor = res.powerFactor
+    })
+}
+
 const getInfo = () => {
     // RPC.post('/m9z/getDeviceManualInfo', { comm_uid: commit_uid }).then(res => {
     //     info.value = res
     // })
-    RPC.post('/m9z/getDeviceStatus2', { comm_uid: commit_uid }).then((res) => {
-        // 直流电流、电源、功率
-        info.value = res
-    }).finally(() => {
-        RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => {
-            powerPhases.value[0].voltage = res.aVoltage + 'V'
-            powerPhases.value[0].current = res.aElectricCurrent + 'A'
-            powerPhases.value[0].power = res.aPower + 'kW'
-            powerPhases.value[0].factor = res.aPowerFactor
-
-            powerPhases.value[1].voltage = res.bVoltage + 'V'
-            powerPhases.value[1].current = res.bElectricCurrent + 'A'
-            powerPhases.value[1].power = res.bPower + 'kW'
-            powerPhases.value[1].factor = res.bPowerFactor
-
-            powerPhases.value[2].voltage = res.cVoltage + 'V'
-            powerPhases.value[2].current = res.cElectricCurrent + 'A'
-            powerPhases.value[2].power = res.cPower + 'kW'
-            powerPhases.value[2].factor = res.cPowerFactor
-
-            energyParams.value.activeEnergy = res.activeEnergy + 'kW·h'
-            energyParams.value.activePower = res.activePower + 'kW'
-            energyParams.value.powerFactor = res.powerFactor
-        })
-    })
+    return loadDeviceStatus().finally(() => loadPowerData())
 
     // RPC.post('/m9z/getDeviceSunRiseTime', { comm_uid: commit_uid }).then(res => {
     //     sunriseTime.value = res.Sunrise ? dayjs(res.Sunrise).format('HH:mm:ss') : ''
@@ -415,6 +472,17 @@ const getInfo = () => {
 }
 getInfo()
 
+const refreshCurrentFaults = () => {
+    faultRefreshing.value = true
+    loadDeviceStatus()
+        .then(() => {
+            ElMessage.success('当前故障已刷新')
+        })
+        .finally(() => {
+            faultRefreshing.value = false
+        })
+}
+
 let timer = null
 RPC.post('/getMessageInterval').then(res => {
     console.log(`获取消息间隔成功，消息间隔为${res * 1000}毫秒`)
@@ -695,6 +763,84 @@ onUnmounted(() => {
     font-weight: 500;
 }
 
+.fault-section {
+    background: rgba(255, 255, 255, 0.08);
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    border-radius: 8px;
+    padding: 10px 14px;
+    color: #fff;
+}
+
+.fault-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 16px;
+}
+
+.fault-title {
+    font-size: 16px;
+    font-weight: 600;
+}
+
+.fault-subtitle {
+    margin-top: 4px;
+    font-size: 12px;
+    color: rgba(255, 255, 255, 0.68);
+}
+
+.fault-refresh-button {
+    flex-shrink: 0;
+    height: 34px;
+    border-radius: 6px;
+    border: none;
+    color: #fff;
+    background: linear-gradient(180deg, rgba(51, 224, 188, 1) 0%, rgba(5, 149, 117, 1) 100%);
+}
+
+.fault-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    margin-top: 10px;
+}
+
+.fault-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    min-height: 28px;
+    padding: 4px 8px;
+    border-radius: 6px;
+    background: rgba(220, 53, 69, 0.16);
+    border: 1px solid rgba(255, 120, 120, 0.35);
+}
+
+.fault-loop {
+    font-size: 12px;
+    color: #ffd4d4;
+}
+
+.fault-message {
+    font-size: 13px;
+    font-weight: 600;
+    color: #fff;
+}
+
+.fault-code {
+    padding: 2px 6px;
+    border-radius: 4px;
+    font-size: 12px;
+    color: #ffd4d4;
+    background: rgba(255, 255, 255, 0.1);
+}
+
+.fault-empty {
+    margin-top: 10px;
+    font-size: 13px;
+    color: rgba(255, 255, 255, 0.75);
+}
+
 .circuit-section {
     display: flex;
     flex-direction: column;

From 74672d31b58f60d2ff54ed4658613137d9480ff6 Mon Sep 17 00:00:00 2001
From: wangqiyang <wqy00163@163.com>
Date: Thu, 23 Jul 2026 15:28:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=89=8D=E7=AB=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/SystemSettings/index.vue | 84 ++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/src/views/SystemSettings/index.vue b/src/views/SystemSettings/index.vue
index 1455c7f..167174a 100644
--- a/src/views/SystemSettings/index.vue
+++ b/src/views/SystemSettings/index.vue
@@ -90,6 +90,26 @@
                                 确认修改
                             </div>
                         </div>
+                        <div class="line config-line">
+                            <div class="item full-width">
+                                <div class="key">扫描数量</div>
+                                <el-input-number v-model="scanLoopCount" :min="minScanLoopCount" :max="maxScanLoopCount" :step="1" controls-position="right" style="flex: 1;" />
+                            </div>
+                        </div>
+                        <div class="line">
+                            <div class="item full-width">
+                                <div class="key">当前数量</div>
+                                <div class="value">{{ currentScanLoopCount }}</div>
+                            </div>
+                        </div>
+                        <div class="buttonBox">
+                            <div class="button save" @click="setScanConfig">
+                                <el-icon>
+                                    <Check />
+                                </el-icon>
+                                保存扫描数量
+                            </div>
+                        </div>
                     </div>
                 </div>
 
@@ -217,6 +237,10 @@ const setSystemTime = async () => {
 // ─── 电表型号 ─────────────────────────────────────
 const currentMeterFirm = ref('')
 const selectedMeterFirm = ref('')
+const minScanLoopCount = ref(1)
+const maxScanLoopCount = ref(10)
+const currentScanLoopCount = ref(10)
+const scanLoopCount = ref(10)
 
 const getMeterFirm = async () => {
     try {
@@ -260,6 +284,58 @@ const setMeterFirm = async () => {
     }
 }
 
+const getScanConfig = async () => {
+    try {
+        const res = await RPC.post('/m9z/scan/getConfig', {})
+        const loopCount = Number(res?.loop_count || 10)
+        minScanLoopCount.value = Number(res?.min_loop_count || 1)
+        maxScanLoopCount.value = Number(res?.max_loop_count || 10)
+        currentScanLoopCount.value = loopCount
+        scanLoopCount.value = loopCount
+    } catch (e) {
+        // 错误由 rpc.js 处理
+    }
+}
+
+const setScanConfig = async () => {
+    const nextLoopCount = Number(scanLoopCount.value)
+    if (!Number.isInteger(nextLoopCount)) {
+        ElMessage.warning('请输入整数扫描数量')
+        return
+    }
+    if (nextLoopCount < minScanLoopCount.value || nextLoopCount > maxScanLoopCount.value) {
+        ElMessage.warning(`扫描数量范围为 ${minScanLoopCount.value}-${maxScanLoopCount.value}`)
+        return
+    }
+    if (nextLoopCount === currentScanLoopCount.value) {
+        ElMessage.info('扫描数量未变更')
+        return
+    }
+    try {
+        await ElMessageBox.confirm(
+            `确认要将扫描数量修改为 ${nextLoopCount} 吗？`,
+            '提示',
+            {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }
+        )
+        const res = await RPC.post('/m9z/scan/setConfig', {
+            loop_count: nextLoopCount,
+        })
+        if (res?.success) {
+            const loopCount = Number(res.loop_count || nextLoopCount)
+            currentScanLoopCount.value = loopCount
+            scanLoopCount.value = loopCount
+            ElMessage.success(`扫描数量已修改为 ${loopCount}`)
+        }
+    } catch (e) {
+        if (e === 'cancel' || e === 'close') return
+        // 其他错误由 rpc.js 处理
+    }
+}
+
 // ─── 修改密码 ─────────────────────────────────────
 const pwdForm = ref({ oldPassword: '', newPassword: '', confirmPassword: '' })
 
@@ -341,6 +417,7 @@ const handleSessionRestored = () => {
     getSystemTime()
     getPasswordStatus()
     getMeterFirm()
+    getScanConfig()
 }
 
 onMounted(() => {
@@ -349,6 +426,7 @@ onMounted(() => {
     getSystemTime()
     getPasswordStatus()
     getMeterFirm()
+    getScanConfig()
 
     // 监听 session 恢复事件
     window.addEventListener('m9z:session-restored', handleSessionRestored)
@@ -510,6 +588,12 @@ onUnmounted(() => {
                     }
                 }
             }
+
+            .config-line {
+                margin-top: 28px;
+                padding-top: 18px;
+                border-top: 1px solid rgba(#0e9228, .35);
+            }
         }
     }
 }

From 15fbd4f429db8a02a935c0f4a992fafba4405656 Mon Sep 17 00:00:00 2001
From: Rice <1840169763@qq.com>
Date: Thu, 23 Jul 2026 19:37:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/style/main.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/style/main.scss b/src/style/main.scss
index 697b2a3..ddfd0a4 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -1,6 +1,6 @@
 @font-face {
   font-family: SourceHanSansCN-Bold;
-  src: url(/public/fonts/SourceHanSansCN-Bold.otf);
+  src: url(/fonts/SourceHanSansCN-Bold.otf);
 }
 
 body {