1

src/views/AlarmInformation/index.vue

@@ -17,7 +17,7 @@
 
             <!-- 主体区域 -->
             <div class="control-content">
-                <div style="width: 100%;">
+                <!-- <div style="width: 100%;">
                     <el-button @click="handleDeal" class="handleBtn" type="success">
                         <el-icon>
                             <Delete />
@@ -30,9 +30,9 @@
                         </el-icon>
                         批量删除
                     </el-button>
-                </div>
-                <el-table :data="tableData" style="width: 100%" height="366" stripe v-loading="loading" @selection-change="handleSelectionChange" row-key="id" ref="multipleTableRef">
-                    <el-table-column type="selection" :selectable="selectable" width="55" />
+                </div> -->
+                <el-table :data="tableData" style="width: 100%" height="450" stripe v-loading="loading" @selection-change="handleSelectionChange" row-key="id" ref="multipleTableRef">
+                    <!-- <el-table-column type="selection" :selectable="selectable" width="55" /> -->
                     <el-table-column align="center" prop="id" label="序号" />
                     <el-table-column align="center" prop="loop_idx" label="回路地址" />
                     <el-table-column align="center" prop="fault_msg" label="故障信息" />
@@ -53,7 +53,7 @@
                         </template>
                     </el-table-column>
                 </el-table>
-                <el-pagination v-if="total > 0" @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[10, 30, 50, 100]" :total="total" :pager-count="5" v-model:page-size="pageSize" v-model:current-page="currentPage" background layout="prev, pager, next,jumper" />
+                <!-- <el-pagination v-if="total > 0" @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[10, 30, 50, 100]" :total="total" :pager-count="5" v-model:page-size="pageSize" v-model:current-page="currentPage" background layout="prev, pager, next,jumper" /> -->
             </div>
         </div>
         <!-- 底部信息 -->
@@ -100,7 +100,7 @@ const commit_uid = localStorage.getItem('central_control_comm_uid')
 
 const loading = ref(false)
 const total = ref(0)
-const pageSize = ref(8)
+const pageSize = ref(10)
 const currentPage = ref(1)
 const handleSizeChange = () => {
     currentPage.value = 1

src/views/Menu/index.vue

@@ -35,7 +35,7 @@
                     设备号：{{ commit_uid }}
                 </div>
                 <div class="status-item">
-                    版本号：1.0.0
+                    版本号：{{ version }}
                 </div>
                 <div class="status-item">
                     系统状态：<span class="status-online">开启</span>
@@ -54,6 +54,7 @@ import {
     VideoPlay,
     Bell
 } from '@element-plus/icons-vue'
+import RPC from '@/utils/rpc'
 const currentTime = ref('')
 const router = useRouter()
 const route = useRoute()
@@ -61,8 +62,14 @@ const route = useRoute()
 if (route.query.comm_uid) {
     localStorage.setItem('central_control_comm_uid', route.query.comm_uid)
 }
-
-const commit_uid = localStorage.getItem('central_control_comm_uid')
+const version = ref('1.0.0')
+const commit_uid = ref('')
+RPC.post('/m9z/touchdisplay/getDeviceID').then(res => {
+    commit_uid.value = res.deviceId
+    version.value = res.version
+    localStorage.setItem('central_control_comm_uid', res.deviceId)
+    localStorage.setItem('central_control_meterAddr', res.meterAddr)
+})
 
 const functionCards = [
     { key: 'monitor', title: '实时监控', icon: Camera, route: '/monitoring' },

src/views/Monitoring/index.vue

@@ -140,13 +140,13 @@
                             </div>
                         </div>
                     </div>
-                    <div class="chartBox">
+                    <!-- <div class="chartBox">
                         <div class="search">
                             <el-date-picker value-format="YYYY-MM-DD" v-model="recdDate" type="date" placeholder="请选择时间" />
                             <el-button type="primary" class="mode-button active" style="width:70px;height: 32px; margin-bottom: 0;" :loading="lineDataLoading" @click="getLineData">查询</el-button>
                         </div>
                         <Linechart :lineData="lineData"></Linechart>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>
@@ -232,15 +232,15 @@ function transformHourlyData(data) {
 const lineData = ref([])
 const recdDate = ref(dayjs().add(-1, 'day').format('YYYY-MM-DD'))
 const lineDataLoading = ref(false)
-const getLineData = () => {
-    lineDataLoading.value = true
-    RPC.post('/lightm/rtu/his', { commUid: commit_uid, recdDate: recdDate.value }).then(res => {
-        lineData.value = transformHourlyData(res)
-    }).finally(() => {
-        lineDataLoading.value = false
-    })
-}
-getLineData()
+// const getLineData = () => {
+//     lineDataLoading.value = true
+//     RPC.post('/lightm/rtu/his', { commUid: commit_uid, recdDate: recdDate.value }).then(res => {
+//         lineData.value = transformHourlyData(res)
+//     }).finally(() => {
+//         lineDataLoading.value = false
+//     })
+// }
+// getLineData()
 
 // 电力参数数据
 const powerPhases = ref([

src/views/ParamsConfig/index.vue

@@ -525,10 +525,10 @@ RPC.post('/m9z/getAllSubLoopParameter', { comm_uid: commit_uid }).then(res => {
     // }
 })
 
-const address = ref('')
-RPC.post('/adl400/getMsgAddress', { comm_uid: commit_uid }).then(res => {
-    address.value = res
-})
+const address = ref(localStorage.getItem('central_control_meterAddr') || '')
+// RPC.post('/adl400/getMsgAddress', { comm_uid: commit_uid }).then(res => {
+//     address.value = res
+// })
 
 const week = ref('')
 const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];