Merge branch '绿色触摸屏' into 触摸屏-直流

src/views/ParamsConfig/index.vue

@@ -119,7 +119,7 @@
                         <div class="line">
                             <div class="item">
                                 <div class="key">电能表型号</div>
-                                <div class="value">ADL400</div>
+                                <div class="value">{{ currentMeterFirm || '--' }}</div>
                                 <!-- <el-input v-model="formField.g" style="width: 100px" placeholder="请输入" /> -->
                             </div>
                         </div>
@@ -633,6 +633,18 @@ const goBack = () => {
 
 let timeInterval = null
 
+const currentMeterFirm = ref('')
+
+const getMeterFirm = async () => {
+    try {
+        const res = await RPC.post('/m9z/meter/getMeterFirm', {})
+        currentMeterFirm.value = res?.meter_firm || ''
+    } catch (e) {
+        // 错误由 rpc.js 处理
+    }
+}
+getMeterFirm()
+
 // 处理 session 恢复后的重新加载
 const handleSessionRestored = () => {
     console.log('Session 已恢复，重新加载数据')
@@ -652,12 +664,13 @@ const handleSessionRestored = () => {
     RPC.post('/m9z/getAllSubLoopParameter', { comm_uid: commit_uid }).then(res => {
         subLoopParameter.value = res
     })
+    getMeterFirm()
 }
 
 onMounted(() => {
     updateTime()
     timeInterval = setInterval(updateTime, 1000)
-    
+
     // 监听 session 恢复事件
     window.addEventListener('m9z:session-restored', handleSessionRestored)
 })
@@ -666,7 +679,7 @@ onUnmounted(() => {
     if (timeInterval) {
         clearInterval(timeInterval)
     }
-    
+
     // 移除事件监听
     window.removeEventListener('m9z:session-restored', handleSessionRestored)
 })