diff --git a/.env.development b/.env.development
index 42409c5..a76eccb 100644
--- a/.env.development
+++ b/.env.development
@@ -4,8 +4,8 @@ VITE_SERVER_PORT = 8888
 VITE_BASE_API = /api
 VITE_FILE_API = /api
 # VITE_BASE_PATH = http://192.168.1.9:8888
-VITE_BASE_PATH = http://192.168.110.98:8888
-# VITE_BASE_PATH = https://www.xingoil.com/api
+# VITE_BASE_PATH = http://192.168.110.98:8888
+VITE_BASE_PATH = https://www.xingoil.com/api
 VITE_POSITION = open
 VITE_EDITOR = code
 // VITE_EDITOR = webstorm 如果使用webstorm开发且要使用dom定位到代码行功能 请先自定添加 webstorm到环境变量 再将VITE_EDITOR值修改为webstorm
diff --git a/src/view/equipment/list/components/detail/components/alarm/index.vue b/src/view/equipment/list/components/detail/components/alarm/index.vue
index 252c7b4..c76efcf 100644
--- a/src/view/equipment/list/components/detail/components/alarm/index.vue
+++ b/src/view/equipment/list/components/detail/components/alarm/index.vue
@@ -20,7 +20,7 @@
         </el-table-column>
         <el-table-column prop="originalContent" label="报警描述">
           <template #default="{ row }">
-            {{ row.originalContent || '-' }}
+            {{ row.remark || '-' }}
           </template>
         </el-table-column>
         <!-- <el-table-column prop="status" label="处理状态" width="100">
@@ -29,9 +29,16 @@
           </template>
         </el-table-column> -->
       </el-table>
-
-      <div v-if="!tableData.length" class="empty-alarm">
-        <el-empty description="暂无报警记录" />
+      <div class="gva-pagination">
+        <el-pagination
+          :current-page="page"
+          :page-size="pageSize"
+          :page-sizes="[10, 30, 50, 100]"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+        />
       </div>
     </div>
   </div>
@@ -51,18 +58,39 @@
   // 报警数据
   const tableData = ref([])
 
+  // 分页相关
+  const page = ref(1)
+  const pageSize = ref(10)
+  const total = ref(0)
+
+  // 当前页变化
+  const handleCurrentChange = (val) => {
+    page.value = val
+    getTableData()
+  }
+
+  // 每页大小变化
+  const handleSizeChange = (val) => {
+    pageSize.value = val
+    page.value = 1
+    getTableData()
+  }
+
   // 查询报警记录
   const getTableData = async () => {
     const deviceId = props.device?.ID
     if (deviceId) {
       try {
         const table = await serve.getAlarmRecordListByPage({
-          page: 1,
-          pageSize: 10,
-          deviceId
+          page: page.value,
+          pageSize: pageSize.value,
+          deviceId,
+          sortBy: 'CreatedAt',
+          desc: true
         })
         if (table.code === 0) {
           tableData.value = table.data.list || []
+          total.value = table.data.total || 0
           return
         }
       } catch (e) {
diff --git a/src/view/equipment/list/components/detail/components/trend/index.vue b/src/view/equipment/list/components/detail/components/trend/index.vue
index ff47b08..135b167 100644
--- a/src/view/equipment/list/components/detail/components/trend/index.vue
+++ b/src/view/equipment/list/components/detail/components/trend/index.vue
@@ -113,7 +113,11 @@
         pageSize: 999,
         deviceId,
         startCreatedAt: dateRange.value[0],
-        endCreatedAt: dateRange.value[1]
+        endCreatedAt: dateRange.value[1],
+        orderKey: 'voltage',
+        sortBy: 'CreatedAt',
+        order: 'desc',
+        desc: true
       })
 
       if (result.code === 0) {
@@ -124,22 +128,22 @@
         const timeData = []
         const chartData = {
           voltage: [], // 电压（V）
-          leakage: [], // 漏电流值（mA）
-          energy: [], // 累计用电量（kWh）
+          leakageCurrent: [], // 漏电流值（mA）
+          cumulativeElectricity: [], // 累计用电量（kWh）
           current: [], // 电流值（A）
-          innerTemp: [], // 内部温度（℃）
+          internalTemperature: [], // 内部温度（℃）
           powerFactor: [] // 功率因数
         }
 
         list.forEach((item) => {
           timeData.push(item.CreatedAt)
           // 兼容多种命名风格：PascalCase / camelCase
-          chartData.voltage.push(Number(item.LeakageCurrent) || 0)
-          chartData.leakage.push(Number(item.LeakageTotal) || 0)
-          chartData.energy.push(Number(item.CumulativeElectricity) || 0)
-          chartData.current.push(Number(item.Current) || 0)
-          chartData.innerTemp.push(Number(item.InternalTemperature) || 0)
-          chartData.powerFactor.push(Number(item.PowerFactor) || 0)
+          chartData.voltage.push(item.voltage)
+          chartData.leakageCurrent.push(item.leakageCurrent)
+          chartData.cumulativeElectricity.push(item.cumulativeElectricity)
+          chartData.current.push(item.current)
+          chartData.internalTemperature.push(item.internalTemperature)
+          chartData.powerFactor.push(item.powerFactor)
         })
         console.log('[Trend] X轴时间数据:', timeData)
         console.log('[Trend] 处理后的图表数据:', chartData)
@@ -199,7 +203,8 @@
       // console.log('[Trend] 日期范围:', val)
       // 触发图表 resize
       nextTick(() => {
-        triggerResize()
+        // triggerResize()
+        getTableData()
       })
     }
   }
@@ -266,6 +271,8 @@
           type: 'line',
           data,
           smooth: true,
+          // 去掉数据点标点，全一条线
+          symbol: 'none',
           itemStyle: {
             color
           },
@@ -300,14 +307,14 @@
       option: createLineOption('电压', '#409EFF', [], [])
     },
     {
-      key: 'leakage',
+      key: 'leakageCurrent',
       title: '漏电流值',
       unit: 'mA',
       color: '#67C23A',
       option: createLineOption('漏电流', '#67C23A', [], [])
     },
     {
-      key: 'energy',
+      key: 'cumulativeElectricity',
       title: '累计用电量',
       unit: 'kWh',
       color: '#E6A23C',
@@ -321,7 +328,7 @@
       option: createLineOption('电流', '#F56C6C', [], [])
     },
     {
-      key: 'innerTemp',
+      key: 'internalTemperature',
       title: '内部温度',
       unit: '℃',
       color: '#909399',