diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 83aa56e..ff65e93 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -55,11 +55,12 @@
     }
     // 整理节点碳排趋势数据
     if (data.emissionsTrends?.data?.length) {
-      xAxisData1.value = data.emissionsTrends?.data?.map((item: any) => item.time)
+      const emissionsTrends = data.emissionsTrends.data
+      xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
           name: '碳排趋势',
-          data: data.emissionsTrends?.data?.map((item: any) => item.value),
+          data: emissionsTrends.map((item: any) => item.value),
         },
       ]
     }
@@ -72,12 +73,15 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  console.log(newVal, '选择时间段')
   fetchDeviceAnalysis()
 },
 {
   deep: true,
 })
+// 监测类型  用来判断碳排趋势chart显不显示
+const monitorType = ref('')
+monitorType.value = $route.query.monitor as string
+console.log(monitorType.value, 'monitorType')
 onMounted(() => {
   fetchDeviceInfo()
   fetchDeviceAnalysis()
@@ -150,18 +154,17 @@
           </el-radio-group>
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin-top: 30px;">
+      <el-row v-show="!loadingChart1" :gutter="24" style="margin-top: 30px;">
         <el-col :span="1" />
-        <!-- :span="data2.length ? 11 : 23" -->
-        <el-col v-loading="loadingChart1" :span="11">
+        <!--  -->
+        <el-col v-loading="loadingChart1" :span="monitorType === '5' ? 11 : 23">
           <div class="chart-title">
             节点监测趋势
           </div>
-          <line-chart height="400px" :width="`${11 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
+          <line-chart height="400px" :width="`${monitorType === '5' ? 11 * width : 23 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
         </el-col>
-        <!--  v-if="data2.length" -->
-        <el-col :span="1" />
-        <el-col v-loading="loadingChart1" :span="11">
+        <el-col v-if="monitorType === '5'" :span="1" />
+        <el-col v-if="monitorType === '5'" v-loading="loadingChart1" :span="11">
           <div class="chart-title">
             节点碳排趋势
           </div>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 83aa56e..ff65e93 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -55,11 +55,12 @@
     }
     // 整理节点碳排趋势数据
     if (data.emissionsTrends?.data?.length) {
-      xAxisData1.value = data.emissionsTrends?.data?.map((item: any) => item.time)
+      const emissionsTrends = data.emissionsTrends.data
+      xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
           name: '碳排趋势',
-          data: data.emissionsTrends?.data?.map((item: any) => item.value),
+          data: emissionsTrends.map((item: any) => item.value),
         },
       ]
     }
@@ -72,12 +73,15 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  console.log(newVal, '选择时间段')
   fetchDeviceAnalysis()
 },
 {
   deep: true,
 })
+// 监测类型  用来判断碳排趋势chart显不显示
+const monitorType = ref('')
+monitorType.value = $route.query.monitor as string
+console.log(monitorType.value, 'monitorType')
 onMounted(() => {
   fetchDeviceInfo()
   fetchDeviceAnalysis()
@@ -150,18 +154,17 @@
           </el-radio-group>
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin-top: 30px;">
+      <el-row v-show="!loadingChart1" :gutter="24" style="margin-top: 30px;">
         <el-col :span="1" />
-        <!-- :span="data2.length ? 11 : 23" -->
-        <el-col v-loading="loadingChart1" :span="11">
+        <!--  -->
+        <el-col v-loading="loadingChart1" :span="monitorType === '5' ? 11 : 23">
           <div class="chart-title">
             节点监测趋势
           </div>
-          <line-chart height="400px" :width="`${11 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
+          <line-chart height="400px" :width="`${monitorType === '5' ? 11 * width : 23 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
         </el-col>
-        <!--  v-if="data2.length" -->
-        <el-col :span="1" />
-        <el-col v-loading="loadingChart1" :span="11">
+        <el-col v-if="monitorType === '5'" :span="1" />
+        <el-col v-if="monitorType === '5'" v-loading="loadingChart1" :span="11">
           <div class="chart-title">
             节点碳排趋势
           </div>
diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue
index ff34d80..284b131 100644
--- a/src/views/data/device/index.vue
+++ b/src/views/data/device/index.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="device">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './pageAdd.vue'
-import { deleteDeviceList, getDeviceList } from '@/api/api/index'
+import { deleteDeviceList, getDeviceListPage } from '@/api/api/index'
 import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 // 查询参数
@@ -29,7 +29,7 @@
 // 获取数据列表
 const fetchDataList = () => {
   loadingTable.value = true
-  getDeviceList(searchQuery).then((res) => {
+  getDeviceListPage(searchQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
     loadingTable.value = false
@@ -99,6 +99,7 @@
     name: 'DdeviceDetail',
     query: {
       id: row.id,
+      monitor: row.monitorObj,
     },
   })
 }

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 83aa56e..ff65e93 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -55,11 +55,12 @@
     }
     // 整理节点碳排趋势数据
     if (data.emissionsTrends?.data?.length) {
-      xAxisData1.value = data.emissionsTrends?.data?.map((item: any) => item.time)
+      const emissionsTrends = data.emissionsTrends.data
+      xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
           name: '碳排趋势',
-          data: data.emissionsTrends?.data?.map((item: any) => item.value),
+          data: emissionsTrends.map((item: any) => item.value),
         },
       ]
     }
@@ -72,12 +73,15 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  console.log(newVal, '选择时间段')
   fetchDeviceAnalysis()
 },
 {
   deep: true,
 })
+// 监测类型  用来判断碳排趋势chart显不显示
+const monitorType = ref('')
+monitorType.value = $route.query.monitor as string
+console.log(monitorType.value, 'monitorType')
 onMounted(() => {
   fetchDeviceInfo()
   fetchDeviceAnalysis()
@@ -150,18 +154,17 @@
           </el-radio-group>
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin-top: 30px;">
+      <el-row v-show="!loadingChart1" :gutter="24" style="margin-top: 30px;">
         <el-col :span="1" />
-        <!-- :span="data2.length ? 11 : 23" -->
-        <el-col v-loading="loadingChart1" :span="11">
+        <!--  -->
+        <el-col v-loading="loadingChart1" :span="monitorType === '5' ? 11 : 23">
           <div class="chart-title">
             节点监测趋势
           </div>
-          <line-chart height="400px" :width="`${11 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
+          <line-chart height="400px" :width="`${monitorType === '5' ? 11 * width : 23 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
         </el-col>
-        <!--  v-if="data2.length" -->
-        <el-col :span="1" />
-        <el-col v-loading="loadingChart1" :span="11">
+        <el-col v-if="monitorType === '5'" :span="1" />
+        <el-col v-if="monitorType === '5'" v-loading="loadingChart1" :span="11">
           <div class="chart-title">
             节点碳排趋势
           </div>
diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue
index ff34d80..284b131 100644
--- a/src/views/data/device/index.vue
+++ b/src/views/data/device/index.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="device">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './pageAdd.vue'
-import { deleteDeviceList, getDeviceList } from '@/api/api/index'
+import { deleteDeviceList, getDeviceListPage } from '@/api/api/index'
 import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 // 查询参数
@@ -29,7 +29,7 @@
 // 获取数据列表
 const fetchDataList = () => {
   loadingTable.value = true
-  getDeviceList(searchQuery).then((res) => {
+  getDeviceListPage(searchQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
     loadingTable.value = false
@@ -99,6 +99,7 @@
     name: 'DdeviceDetail',
     query: {
       id: row.id,
+      monitor: row.monitorObj,
     },
   })
 }
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index d3d46b8..7a7cc58 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -39,6 +39,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
@@ -106,11 +107,14 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     areaForm.value.status2 = areaForm.value.status2.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -181,7 +185,7 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
@@ -299,4 +303,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 83aa56e..ff65e93 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -55,11 +55,12 @@
     }
     // 整理节点碳排趋势数据
     if (data.emissionsTrends?.data?.length) {
-      xAxisData1.value = data.emissionsTrends?.data?.map((item: any) => item.time)
+      const emissionsTrends = data.emissionsTrends.data
+      xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
           name: '碳排趋势',
-          data: data.emissionsTrends?.data?.map((item: any) => item.value),
+          data: emissionsTrends.map((item: any) => item.value),
         },
       ]
     }
@@ -72,12 +73,15 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  console.log(newVal, '选择时间段')
   fetchDeviceAnalysis()
 },
 {
   deep: true,
 })
+// 监测类型  用来判断碳排趋势chart显不显示
+const monitorType = ref('')
+monitorType.value = $route.query.monitor as string
+console.log(monitorType.value, 'monitorType')
 onMounted(() => {
   fetchDeviceInfo()
   fetchDeviceAnalysis()
@@ -150,18 +154,17 @@
           </el-radio-group>
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin-top: 30px;">
+      <el-row v-show="!loadingChart1" :gutter="24" style="margin-top: 30px;">
         <el-col :span="1" />
-        <!-- :span="data2.length ? 11 : 23" -->
-        <el-col v-loading="loadingChart1" :span="11">
+        <!--  -->
+        <el-col v-loading="loadingChart1" :span="monitorType === '5' ? 11 : 23">
           <div class="chart-title">
             节点监测趋势
           </div>
-          <line-chart height="400px" :width="`${11 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
+          <line-chart height="400px" :width="`${monitorType === '5' ? 11 * width : 23 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
         </el-col>
-        <!--  v-if="data2.length" -->
-        <el-col :span="1" />
-        <el-col v-loading="loadingChart1" :span="11">
+        <el-col v-if="monitorType === '5'" :span="1" />
+        <el-col v-if="monitorType === '5'" v-loading="loadingChart1" :span="11">
           <div class="chart-title">
             节点碳排趋势
           </div>
diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue
index ff34d80..284b131 100644
--- a/src/views/data/device/index.vue
+++ b/src/views/data/device/index.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="device">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './pageAdd.vue'
-import { deleteDeviceList, getDeviceList } from '@/api/api/index'
+import { deleteDeviceList, getDeviceListPage } from '@/api/api/index'
 import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 // 查询参数
@@ -29,7 +29,7 @@
 // 获取数据列表
 const fetchDataList = () => {
   loadingTable.value = true
-  getDeviceList(searchQuery).then((res) => {
+  getDeviceListPage(searchQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
     loadingTable.value = false
@@ -99,6 +99,7 @@
     name: 'DdeviceDetail',
     query: {
       id: row.id,
+      monitor: row.monitorObj,
     },
   })
 }
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index d3d46b8..7a7cc58 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -39,6 +39,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
@@ -106,11 +107,14 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     areaForm.value.status2 = areaForm.value.status2.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -181,7 +185,7 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
@@ -299,4 +303,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 064040c..95a6fa5 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -51,6 +51,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 // 获取所有节点
@@ -143,7 +144,7 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     if (row.lng && row.lat) {
       locationData.value = [Number(row.lng), Number(row.lat)]
@@ -152,6 +153,9 @@
     areaForm.value.type = row.type.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -232,7 +236,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="节点名称:" prop="nodeName">
@@ -322,11 +326,11 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="saveData">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="saveData">
           保存
         </el-button>
         <el-button @click="cancel">
-          取消
+          {{ dialogStatus === 'detail' ? '确认' : '取消' }}
         </el-button>
       </div>
     </template>
@@ -341,4 +345,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 83aa56e..ff65e93 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -55,11 +55,12 @@
     }
     // 整理节点碳排趋势数据
     if (data.emissionsTrends?.data?.length) {
-      xAxisData1.value = data.emissionsTrends?.data?.map((item: any) => item.time)
+      const emissionsTrends = data.emissionsTrends.data
+      xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
           name: '碳排趋势',
-          data: data.emissionsTrends?.data?.map((item: any) => item.value),
+          data: emissionsTrends.map((item: any) => item.value),
         },
       ]
     }
@@ -72,12 +73,15 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  console.log(newVal, '选择时间段')
   fetchDeviceAnalysis()
 },
 {
   deep: true,
 })
+// 监测类型  用来判断碳排趋势chart显不显示
+const monitorType = ref('')
+monitorType.value = $route.query.monitor as string
+console.log(monitorType.value, 'monitorType')
 onMounted(() => {
   fetchDeviceInfo()
   fetchDeviceAnalysis()
@@ -150,18 +154,17 @@
           </el-radio-group>
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin-top: 30px;">
+      <el-row v-show="!loadingChart1" :gutter="24" style="margin-top: 30px;">
         <el-col :span="1" />
-        <!-- :span="data2.length ? 11 : 23" -->
-        <el-col v-loading="loadingChart1" :span="11">
+        <!--  -->
+        <el-col v-loading="loadingChart1" :span="monitorType === '5' ? 11 : 23">
           <div class="chart-title">
             节点监测趋势
           </div>
-          <line-chart height="400px" :width="`${11 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
+          <line-chart height="400px" :width="`${monitorType === '5' ? 11 * width : 23 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
         </el-col>
-        <!--  v-if="data2.length" -->
-        <el-col :span="1" />
-        <el-col v-loading="loadingChart1" :span="11">
+        <el-col v-if="monitorType === '5'" :span="1" />
+        <el-col v-if="monitorType === '5'" v-loading="loadingChart1" :span="11">
           <div class="chart-title">
             节点碳排趋势
           </div>
diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue
index ff34d80..284b131 100644
--- a/src/views/data/device/index.vue
+++ b/src/views/data/device/index.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="device">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './pageAdd.vue'
-import { deleteDeviceList, getDeviceList } from '@/api/api/index'
+import { deleteDeviceList, getDeviceListPage } from '@/api/api/index'
 import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 // 查询参数
@@ -29,7 +29,7 @@
 // 获取数据列表
 const fetchDataList = () => {
   loadingTable.value = true
-  getDeviceList(searchQuery).then((res) => {
+  getDeviceListPage(searchQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
     loadingTable.value = false
@@ -99,6 +99,7 @@
     name: 'DdeviceDetail',
     query: {
       id: row.id,
+      monitor: row.monitorObj,
     },
   })
 }
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index d3d46b8..7a7cc58 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -39,6 +39,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
@@ -106,11 +107,14 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     areaForm.value.status2 = areaForm.value.status2.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -181,7 +185,7 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
@@ -299,4 +303,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 064040c..95a6fa5 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -51,6 +51,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 // 获取所有节点
@@ -143,7 +144,7 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     if (row.lng && row.lat) {
       locationData.value = [Number(row.lng), Number(row.lat)]
@@ -152,6 +153,9 @@
     areaForm.value.type = row.type.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -232,7 +236,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="节点名称:" prop="nodeName">
@@ -322,11 +326,11 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="saveData">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="saveData">
           保存
         </el-button>
         <el-button @click="cancel">
-          取消
+          {{ dialogStatus === 'detail' ? '确认' : '取消' }}
         </el-button>
       </div>
     </template>
@@ -341,4 +345,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 35513f5..2ebb537 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -27,21 +27,20 @@
   electricityId: '',
 })
 // 查询时间段范围
-const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
   { text: '支路首端节点', value: 'fbusId', align: 'center' },
   { text: '支路末端节点', value: 'tbusId', align: 'center' },
   { text: '支路电阻标幺值', value: 'r', align: 'center' },
-  { text: '支路电纳标幺值', value: 'b', align: 'center' },
-  { text: '长距离输电容量', value: 'ratea', align: 'center' },
-  { text: '短距离输电容量', value: 'rateb', align: 'center' },
-  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
-  { text: '支路变比', value: 'ratio', align: 'center' },
-  { text: '角度', value: 'angle', align: 'center' },
-  { text: '支路是否运行', value: 'status2', align: 'center' },
-  { text: '支路最小相位角', value: 'angmin', align: 'center' },
-  { text: '支路碳流率', value: 'angmax', align: 'center' },
+  // { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  // { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  // { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  // { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  // { text: '支路变比', value: 'ratio', align: 'center' },
+  // { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2Name', align: 'center' },
+  // { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率(kgCO2/h)', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
@@ -70,6 +69,10 @@
 const edit = (row: any) => {
   editRef.value.initDialog('update', row, props.id)
 }
+// 详情
+const detail = (row: any) => {
+  editRef.value.initDialog('detail', row, props.id)
+}
 // 删除
 const del = (row: any) => {
   ElMessageBox.confirm(
@@ -148,6 +151,9 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
               <el-button type="primary" link size="small" @click="edit(scope.row)">
                 修改
               </el-button>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 83aa56e..ff65e93 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -55,11 +55,12 @@
     }
     // 整理节点碳排趋势数据
     if (data.emissionsTrends?.data?.length) {
-      xAxisData1.value = data.emissionsTrends?.data?.map((item: any) => item.time)
+      const emissionsTrends = data.emissionsTrends.data
+      xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
           name: '碳排趋势',
-          data: data.emissionsTrends?.data?.map((item: any) => item.value),
+          data: emissionsTrends.map((item: any) => item.value),
         },
       ]
     }
@@ -72,12 +73,15 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  console.log(newVal, '选择时间段')
   fetchDeviceAnalysis()
 },
 {
   deep: true,
 })
+// 监测类型  用来判断碳排趋势chart显不显示
+const monitorType = ref('')
+monitorType.value = $route.query.monitor as string
+console.log(monitorType.value, 'monitorType')
 onMounted(() => {
   fetchDeviceInfo()
   fetchDeviceAnalysis()
@@ -150,18 +154,17 @@
           </el-radio-group>
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin-top: 30px;">
+      <el-row v-show="!loadingChart1" :gutter="24" style="margin-top: 30px;">
         <el-col :span="1" />
-        <!-- :span="data2.length ? 11 : 23" -->
-        <el-col v-loading="loadingChart1" :span="11">
+        <!--  -->
+        <el-col v-loading="loadingChart1" :span="monitorType === '5' ? 11 : 23">
           <div class="chart-title">
             节点监测趋势
           </div>
-          <line-chart height="400px" :width="`${11 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
+          <line-chart height="400px" :width="`${monitorType === '5' ? 11 * width : 23 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
         </el-col>
-        <!--  v-if="data2.length" -->
-        <el-col :span="1" />
-        <el-col v-loading="loadingChart1" :span="11">
+        <el-col v-if="monitorType === '5'" :span="1" />
+        <el-col v-if="monitorType === '5'" v-loading="loadingChart1" :span="11">
           <div class="chart-title">
             节点碳排趋势
           </div>
diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue
index ff34d80..284b131 100644
--- a/src/views/data/device/index.vue
+++ b/src/views/data/device/index.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="device">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './pageAdd.vue'
-import { deleteDeviceList, getDeviceList } from '@/api/api/index'
+import { deleteDeviceList, getDeviceListPage } from '@/api/api/index'
 import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 // 查询参数
@@ -29,7 +29,7 @@
 // 获取数据列表
 const fetchDataList = () => {
   loadingTable.value = true
-  getDeviceList(searchQuery).then((res) => {
+  getDeviceListPage(searchQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
     loadingTable.value = false
@@ -99,6 +99,7 @@
     name: 'DdeviceDetail',
     query: {
       id: row.id,
+      monitor: row.monitorObj,
     },
   })
 }
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index d3d46b8..7a7cc58 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -39,6 +39,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
@@ -106,11 +107,14 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     areaForm.value.status2 = areaForm.value.status2.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -181,7 +185,7 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
@@ -299,4 +303,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 064040c..95a6fa5 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -51,6 +51,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 // 获取所有节点
@@ -143,7 +144,7 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     if (row.lng && row.lat) {
       locationData.value = [Number(row.lng), Number(row.lat)]
@@ -152,6 +153,9 @@
     areaForm.value.type = row.type.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -232,7 +236,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="节点名称:" prop="nodeName">
@@ -322,11 +326,11 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="saveData">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="saveData">
           保存
         </el-button>
         <el-button @click="cancel">
-          取消
+          {{ dialogStatus === 'detail' ? '确认' : '取消' }}
         </el-button>
       </div>
     </template>
@@ -341,4 +345,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 35513f5..2ebb537 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -27,21 +27,20 @@
   electricityId: '',
 })
 // 查询时间段范围
-const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
   { text: '支路首端节点', value: 'fbusId', align: 'center' },
   { text: '支路末端节点', value: 'tbusId', align: 'center' },
   { text: '支路电阻标幺值', value: 'r', align: 'center' },
-  { text: '支路电纳标幺值', value: 'b', align: 'center' },
-  { text: '长距离输电容量', value: 'ratea', align: 'center' },
-  { text: '短距离输电容量', value: 'rateb', align: 'center' },
-  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
-  { text: '支路变比', value: 'ratio', align: 'center' },
-  { text: '角度', value: 'angle', align: 'center' },
-  { text: '支路是否运行', value: 'status2', align: 'center' },
-  { text: '支路最小相位角', value: 'angmin', align: 'center' },
-  { text: '支路碳流率', value: 'angmax', align: 'center' },
+  // { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  // { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  // { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  // { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  // { text: '支路变比', value: 'ratio', align: 'center' },
+  // { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2Name', align: 'center' },
+  // { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率(kgCO2/h)', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
@@ -70,6 +69,10 @@
 const edit = (row: any) => {
   editRef.value.initDialog('update', row, props.id)
 }
+// 详情
+const detail = (row: any) => {
+  editRef.value.initDialog('detail', row, props.id)
+}
 // 删除
 const del = (row: any) => {
   ElMessageBox.confirm(
@@ -148,6 +151,9 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
               <el-button type="primary" link size="small" @click="edit(scope.row)">
                 修改
               </el-button>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 1f0bac0..fa89f80 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -30,15 +30,17 @@
 })
 const loadingTable = ref(true)
 const columns = ref([
-  { text: '节点类型', value: 'type', align: 'center' },
-  { text: '节点并联电导', value: 'gs', align: 'center' },
-  { text: '节点并联电纳', value: 'bs', align: 'center' },
-  { text: '母线断面号', value: 'area', align: 'center' },
-  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
-  { text: '节点电压初始相位角', value: 'va', align: 'center' },
-  { text: '母线省损耗区域', value: 'zone', align: 'center' },
-  { text: '节点最大电压', value: 'vmax', align: 'center' },
-  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '节点名称', value: 'nodeName', align: 'center' },
+  // { text: '节点编号', value: 'id', align: 'center' },
+  { text: '节点类型', value: 'typeName', align: 'center' },
+  // { text: '节点并联电导', value: 'gs', align: 'center' },
+  // { text: '节点并联电纳', value: 'bs', align: 'center' },
+  // { text: '母线断面号', value: 'area', align: 'center' },
+  // { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  // { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  // { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  // { text: '节点最大电压', value: 'vmax', align: 'center' },
+  // { text: '节点最小电压', value: 'vmin', align: 'center' },
   { text: '负荷有功功率(MW)', value: 'pd', align: 'center' },
   { text: '负荷无功功率(MW)', value: 'qd', align: 'center' },
   { text: '节点碳势(gCO2/kWh)', value: 'en', align: 'center' },
@@ -69,6 +71,10 @@
 const edit = (row: any) => {
   editRef.value.initDialog('update', row, '')
 }
+// 详情
+const detail = (row: any) => {
+  editRef.value.initDialog('detail', row, '')
+}
 // 删除
 const del = (row: any) => {
   ElMessageBox.confirm(
@@ -135,6 +141,9 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
               <el-button type="primary" link size="small" @click="edit(scope.row)">
                 修改
               </el-button>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 83aa56e..ff65e93 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -55,11 +55,12 @@
     }
     // 整理节点碳排趋势数据
     if (data.emissionsTrends?.data?.length) {
-      xAxisData1.value = data.emissionsTrends?.data?.map((item: any) => item.time)
+      const emissionsTrends = data.emissionsTrends.data
+      xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
           name: '碳排趋势',
-          data: data.emissionsTrends?.data?.map((item: any) => item.value),
+          data: emissionsTrends.map((item: any) => item.value),
         },
       ]
     }
@@ -72,12 +73,15 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  console.log(newVal, '选择时间段')
   fetchDeviceAnalysis()
 },
 {
   deep: true,
 })
+// 监测类型  用来判断碳排趋势chart显不显示
+const monitorType = ref('')
+monitorType.value = $route.query.monitor as string
+console.log(monitorType.value, 'monitorType')
 onMounted(() => {
   fetchDeviceInfo()
   fetchDeviceAnalysis()
@@ -150,18 +154,17 @@
           </el-radio-group>
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin-top: 30px;">
+      <el-row v-show="!loadingChart1" :gutter="24" style="margin-top: 30px;">
         <el-col :span="1" />
-        <!-- :span="data2.length ? 11 : 23" -->
-        <el-col v-loading="loadingChart1" :span="11">
+        <!--  -->
+        <el-col v-loading="loadingChart1" :span="monitorType === '5' ? 11 : 23">
           <div class="chart-title">
             节点监测趋势
           </div>
-          <line-chart height="400px" :width="`${11 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
+          <line-chart height="400px" :width="`${monitorType === '5' ? 11 * width : 23 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
         </el-col>
-        <!--  v-if="data2.length" -->
-        <el-col :span="1" />
-        <el-col v-loading="loadingChart1" :span="11">
+        <el-col v-if="monitorType === '5'" :span="1" />
+        <el-col v-if="monitorType === '5'" v-loading="loadingChart1" :span="11">
           <div class="chart-title">
             节点碳排趋势
           </div>
diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue
index ff34d80..284b131 100644
--- a/src/views/data/device/index.vue
+++ b/src/views/data/device/index.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="device">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './pageAdd.vue'
-import { deleteDeviceList, getDeviceList } from '@/api/api/index'
+import { deleteDeviceList, getDeviceListPage } from '@/api/api/index'
 import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 // 查询参数
@@ -29,7 +29,7 @@
 // 获取数据列表
 const fetchDataList = () => {
   loadingTable.value = true
-  getDeviceList(searchQuery).then((res) => {
+  getDeviceListPage(searchQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
     loadingTable.value = false
@@ -99,6 +99,7 @@
     name: 'DdeviceDetail',
     query: {
       id: row.id,
+      monitor: row.monitorObj,
     },
   })
 }
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index d3d46b8..7a7cc58 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -39,6 +39,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
@@ -106,11 +107,14 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     areaForm.value.status2 = areaForm.value.status2.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -181,7 +185,7 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
@@ -299,4 +303,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 064040c..95a6fa5 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -51,6 +51,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 // 获取所有节点
@@ -143,7 +144,7 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     if (row.lng && row.lat) {
       locationData.value = [Number(row.lng), Number(row.lat)]
@@ -152,6 +153,9 @@
     areaForm.value.type = row.type.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -232,7 +236,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="节点名称:" prop="nodeName">
@@ -322,11 +326,11 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="saveData">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="saveData">
           保存
         </el-button>
         <el-button @click="cancel">
-          取消
+          {{ dialogStatus === 'detail' ? '确认' : '取消' }}
         </el-button>
       </div>
     </template>
@@ -341,4 +345,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 35513f5..2ebb537 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -27,21 +27,20 @@
   electricityId: '',
 })
 // 查询时间段范围
-const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
   { text: '支路首端节点', value: 'fbusId', align: 'center' },
   { text: '支路末端节点', value: 'tbusId', align: 'center' },
   { text: '支路电阻标幺值', value: 'r', align: 'center' },
-  { text: '支路电纳标幺值', value: 'b', align: 'center' },
-  { text: '长距离输电容量', value: 'ratea', align: 'center' },
-  { text: '短距离输电容量', value: 'rateb', align: 'center' },
-  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
-  { text: '支路变比', value: 'ratio', align: 'center' },
-  { text: '角度', value: 'angle', align: 'center' },
-  { text: '支路是否运行', value: 'status2', align: 'center' },
-  { text: '支路最小相位角', value: 'angmin', align: 'center' },
-  { text: '支路碳流率', value: 'angmax', align: 'center' },
+  // { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  // { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  // { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  // { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  // { text: '支路变比', value: 'ratio', align: 'center' },
+  // { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2Name', align: 'center' },
+  // { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率(kgCO2/h)', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
@@ -70,6 +69,10 @@
 const edit = (row: any) => {
   editRef.value.initDialog('update', row, props.id)
 }
+// 详情
+const detail = (row: any) => {
+  editRef.value.initDialog('detail', row, props.id)
+}
 // 删除
 const del = (row: any) => {
   ElMessageBox.confirm(
@@ -148,6 +151,9 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
               <el-button type="primary" link size="small" @click="edit(scope.row)">
                 修改
               </el-button>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 1f0bac0..fa89f80 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -30,15 +30,17 @@
 })
 const loadingTable = ref(true)
 const columns = ref([
-  { text: '节点类型', value: 'type', align: 'center' },
-  { text: '节点并联电导', value: 'gs', align: 'center' },
-  { text: '节点并联电纳', value: 'bs', align: 'center' },
-  { text: '母线断面号', value: 'area', align: 'center' },
-  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
-  { text: '节点电压初始相位角', value: 'va', align: 'center' },
-  { text: '母线省损耗区域', value: 'zone', align: 'center' },
-  { text: '节点最大电压', value: 'vmax', align: 'center' },
-  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '节点名称', value: 'nodeName', align: 'center' },
+  // { text: '节点编号', value: 'id', align: 'center' },
+  { text: '节点类型', value: 'typeName', align: 'center' },
+  // { text: '节点并联电导', value: 'gs', align: 'center' },
+  // { text: '节点并联电纳', value: 'bs', align: 'center' },
+  // { text: '母线断面号', value: 'area', align: 'center' },
+  // { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  // { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  // { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  // { text: '节点最大电压', value: 'vmax', align: 'center' },
+  // { text: '节点最小电压', value: 'vmin', align: 'center' },
   { text: '负荷有功功率(MW)', value: 'pd', align: 'center' },
   { text: '负荷无功功率(MW)', value: 'qd', align: 'center' },
   { text: '节点碳势(gCO2/kWh)', value: 'en', align: 'center' },
@@ -69,6 +71,10 @@
 const edit = (row: any) => {
   editRef.value.initDialog('update', row, '')
 }
+// 详情
+const detail = (row: any) => {
+  editRef.value.initDialog('detail', row, '')
+}
 // 删除
 const del = (row: any) => {
   ElMessageBox.confirm(
@@ -135,6 +141,9 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
               <el-button type="primary" link size="small" @click="edit(scope.row)">
                 修改
               </el-button>
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index 570b1ea..fbaeaa9 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -68,12 +68,10 @@
 }
 // 编辑
 const edit = (row: any) => {
-  console.log(row, 'row')
   editRef.value.initDialog('update', row)
 }
 // 删除
 const del = (row: any) => {
-  console.log(row, 'row')
   ElMessageBox.confirm(
     '确认删除选中的数据吗?',
     '提示',
@@ -224,3 +222,4 @@
     </div>
   </div>
 </template>
+

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 83aa56e..ff65e93 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -55,11 +55,12 @@
     }
     // 整理节点碳排趋势数据
     if (data.emissionsTrends?.data?.length) {
-      xAxisData1.value = data.emissionsTrends?.data?.map((item: any) => item.time)
+      const emissionsTrends = data.emissionsTrends.data
+      xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
           name: '碳排趋势',
-          data: data.emissionsTrends?.data?.map((item: any) => item.value),
+          data: emissionsTrends.map((item: any) => item.value),
         },
       ]
     }
@@ -72,12 +73,15 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  console.log(newVal, '选择时间段')
   fetchDeviceAnalysis()
 },
 {
   deep: true,
 })
+// 监测类型  用来判断碳排趋势chart显不显示
+const monitorType = ref('')
+monitorType.value = $route.query.monitor as string
+console.log(monitorType.value, 'monitorType')
 onMounted(() => {
   fetchDeviceInfo()
   fetchDeviceAnalysis()
@@ -150,18 +154,17 @@
           </el-radio-group>
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin-top: 30px;">
+      <el-row v-show="!loadingChart1" :gutter="24" style="margin-top: 30px;">
         <el-col :span="1" />
-        <!-- :span="data2.length ? 11 : 23" -->
-        <el-col v-loading="loadingChart1" :span="11">
+        <!--  -->
+        <el-col v-loading="loadingChart1" :span="monitorType === '5' ? 11 : 23">
           <div class="chart-title">
             节点监测趋势
           </div>
-          <line-chart height="400px" :width="`${11 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
+          <line-chart height="400px" :width="`${monitorType === '5' ? 11 * width : 23 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
         </el-col>
-        <!--  v-if="data2.length" -->
-        <el-col :span="1" />
-        <el-col v-loading="loadingChart1" :span="11">
+        <el-col v-if="monitorType === '5'" :span="1" />
+        <el-col v-if="monitorType === '5'" v-loading="loadingChart1" :span="11">
           <div class="chart-title">
             节点碳排趋势
           </div>
diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue
index ff34d80..284b131 100644
--- a/src/views/data/device/index.vue
+++ b/src/views/data/device/index.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="device">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './pageAdd.vue'
-import { deleteDeviceList, getDeviceList } from '@/api/api/index'
+import { deleteDeviceList, getDeviceListPage } from '@/api/api/index'
 import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 // 查询参数
@@ -29,7 +29,7 @@
 // 获取数据列表
 const fetchDataList = () => {
   loadingTable.value = true
-  getDeviceList(searchQuery).then((res) => {
+  getDeviceListPage(searchQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
     loadingTable.value = false
@@ -99,6 +99,7 @@
     name: 'DdeviceDetail',
     query: {
       id: row.id,
+      monitor: row.monitorObj,
     },
   })
 }
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index d3d46b8..7a7cc58 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -39,6 +39,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
@@ -106,11 +107,14 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     areaForm.value.status2 = areaForm.value.status2.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -181,7 +185,7 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
@@ -299,4 +303,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 064040c..95a6fa5 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -51,6 +51,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 // 获取所有节点
@@ -143,7 +144,7 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     if (row.lng && row.lat) {
       locationData.value = [Number(row.lng), Number(row.lat)]
@@ -152,6 +153,9 @@
     areaForm.value.type = row.type.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -232,7 +236,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="节点名称:" prop="nodeName">
@@ -322,11 +326,11 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="saveData">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="saveData">
           保存
         </el-button>
         <el-button @click="cancel">
-          取消
+          {{ dialogStatus === 'detail' ? '确认' : '取消' }}
         </el-button>
       </div>
     </template>
@@ -341,4 +345,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 35513f5..2ebb537 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -27,21 +27,20 @@
   electricityId: '',
 })
 // 查询时间段范围
-const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
   { text: '支路首端节点', value: 'fbusId', align: 'center' },
   { text: '支路末端节点', value: 'tbusId', align: 'center' },
   { text: '支路电阻标幺值', value: 'r', align: 'center' },
-  { text: '支路电纳标幺值', value: 'b', align: 'center' },
-  { text: '长距离输电容量', value: 'ratea', align: 'center' },
-  { text: '短距离输电容量', value: 'rateb', align: 'center' },
-  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
-  { text: '支路变比', value: 'ratio', align: 'center' },
-  { text: '角度', value: 'angle', align: 'center' },
-  { text: '支路是否运行', value: 'status2', align: 'center' },
-  { text: '支路最小相位角', value: 'angmin', align: 'center' },
-  { text: '支路碳流率', value: 'angmax', align: 'center' },
+  // { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  // { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  // { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  // { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  // { text: '支路变比', value: 'ratio', align: 'center' },
+  // { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2Name', align: 'center' },
+  // { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率(kgCO2/h)', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
@@ -70,6 +69,10 @@
 const edit = (row: any) => {
   editRef.value.initDialog('update', row, props.id)
 }
+// 详情
+const detail = (row: any) => {
+  editRef.value.initDialog('detail', row, props.id)
+}
 // 删除
 const del = (row: any) => {
   ElMessageBox.confirm(
@@ -148,6 +151,9 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
               <el-button type="primary" link size="small" @click="edit(scope.row)">
                 修改
               </el-button>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 1f0bac0..fa89f80 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -30,15 +30,17 @@
 })
 const loadingTable = ref(true)
 const columns = ref([
-  { text: '节点类型', value: 'type', align: 'center' },
-  { text: '节点并联电导', value: 'gs', align: 'center' },
-  { text: '节点并联电纳', value: 'bs', align: 'center' },
-  { text: '母线断面号', value: 'area', align: 'center' },
-  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
-  { text: '节点电压初始相位角', value: 'va', align: 'center' },
-  { text: '母线省损耗区域', value: 'zone', align: 'center' },
-  { text: '节点最大电压', value: 'vmax', align: 'center' },
-  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '节点名称', value: 'nodeName', align: 'center' },
+  // { text: '节点编号', value: 'id', align: 'center' },
+  { text: '节点类型', value: 'typeName', align: 'center' },
+  // { text: '节点并联电导', value: 'gs', align: 'center' },
+  // { text: '节点并联电纳', value: 'bs', align: 'center' },
+  // { text: '母线断面号', value: 'area', align: 'center' },
+  // { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  // { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  // { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  // { text: '节点最大电压', value: 'vmax', align: 'center' },
+  // { text: '节点最小电压', value: 'vmin', align: 'center' },
   { text: '负荷有功功率(MW)', value: 'pd', align: 'center' },
   { text: '负荷无功功率(MW)', value: 'qd', align: 'center' },
   { text: '节点碳势(gCO2/kWh)', value: 'en', align: 'center' },
@@ -69,6 +71,10 @@
 const edit = (row: any) => {
   editRef.value.initDialog('update', row, '')
 }
+// 详情
+const detail = (row: any) => {
+  editRef.value.initDialog('detail', row, '')
+}
 // 删除
 const del = (row: any) => {
   ElMessageBox.confirm(
@@ -135,6 +141,9 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
               <el-button type="primary" link size="small" @click="edit(scope.row)">
                 修改
               </el-button>
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index 570b1ea..fbaeaa9 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -68,12 +68,10 @@
 }
 // 编辑
 const edit = (row: any) => {
-  console.log(row, 'row')
   editRef.value.initDialog('update', row)
 }
 // 删除
 const del = (row: any) => {
-  console.log(row, 'row')
   ElMessageBox.confirm(
     '确认删除选中的数据吗?',
     '提示',
@@ -224,3 +222,4 @@
     </div>
   </div>
 </template>
+
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 8ac95d6..681ffce 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -158,7 +158,7 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="配电网名称:" prop="electricityName">
@@ -263,4 +263,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4541b77..4aca814 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -19,7 +19,8 @@
   monitorStationUpdate = '/monitorStation/update',
   monitorStationdDelete = '/monitorStation/delete',
   // 设备管理列表
-  device = '/carbonDevice/listPage',
+  device = '/carbonDevice/list',
+  devicePage = '/carbonDevice/listPage',
   deviceAdd = '/carbonDevice/add',
   deviceUpdate = '/carbonDevice/update',
   deviceDelete = '/carbonDevice/delete',
@@ -232,6 +233,13 @@
     params,
   })
 }
+export function getDeviceListPage(params: any) {
+  return request({
+    url: `${api.devicePage}`,
+    method: 'get',
+    params,
+  })
+}
 // 添加 设备管理
 export function addDeviceList(data: any) {
   return request({
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 83aa56e..ff65e93 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -55,11 +55,12 @@
     }
     // 整理节点碳排趋势数据
     if (data.emissionsTrends?.data?.length) {
-      xAxisData1.value = data.emissionsTrends?.data?.map((item: any) => item.time)
+      const emissionsTrends = data.emissionsTrends.data
+      xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
           name: '碳排趋势',
-          data: data.emissionsTrends?.data?.map((item: any) => item.value),
+          data: emissionsTrends.map((item: any) => item.value),
         },
       ]
     }
@@ -72,12 +73,15 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  console.log(newVal, '选择时间段')
   fetchDeviceAnalysis()
 },
 {
   deep: true,
 })
+// 监测类型  用来判断碳排趋势chart显不显示
+const monitorType = ref('')
+monitorType.value = $route.query.monitor as string
+console.log(monitorType.value, 'monitorType')
 onMounted(() => {
   fetchDeviceInfo()
   fetchDeviceAnalysis()
@@ -150,18 +154,17 @@
           </el-radio-group>
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin-top: 30px;">
+      <el-row v-show="!loadingChart1" :gutter="24" style="margin-top: 30px;">
         <el-col :span="1" />
-        <!-- :span="data2.length ? 11 : 23" -->
-        <el-col v-loading="loadingChart1" :span="11">
+        <!--  -->
+        <el-col v-loading="loadingChart1" :span="monitorType === '5' ? 11 : 23">
           <div class="chart-title">
             节点监测趋势
           </div>
-          <line-chart height="400px" :width="`${11 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
+          <line-chart height="400px" :width="`${monitorType === '5' ? 11 * width : 23 * width}px`" :data="data1" :x-axis-data="xAxisData1" />
         </el-col>
-        <!--  v-if="data2.length" -->
-        <el-col :span="1" />
-        <el-col v-loading="loadingChart1" :span="11">
+        <el-col v-if="monitorType === '5'" :span="1" />
+        <el-col v-if="monitorType === '5'" v-loading="loadingChart1" :span="11">
           <div class="chart-title">
             节点碳排趋势
           </div>
diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue
index ff34d80..284b131 100644
--- a/src/views/data/device/index.vue
+++ b/src/views/data/device/index.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="device">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './pageAdd.vue'
-import { deleteDeviceList, getDeviceList } from '@/api/api/index'
+import { deleteDeviceList, getDeviceListPage } from '@/api/api/index'
 import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 // 查询参数
@@ -29,7 +29,7 @@
 // 获取数据列表
 const fetchDataList = () => {
   loadingTable.value = true
-  getDeviceList(searchQuery).then((res) => {
+  getDeviceListPage(searchQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
     loadingTable.value = false
@@ -99,6 +99,7 @@
     name: 'DdeviceDetail',
     query: {
       id: row.id,
+      monitor: row.monitorObj,
     },
   })
 }
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index d3d46b8..7a7cc58 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -39,6 +39,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
@@ -106,11 +107,14 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     areaForm.value.status2 = areaForm.value.status2.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -181,7 +185,7 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
@@ -299,4 +303,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 064040c..95a6fa5 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -51,6 +51,7 @@
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 // 获取所有节点
@@ -143,7 +144,7 @@
     })
     areaForm.value.electricityId = id
   }
-  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
     if (row.lng && row.lat) {
       locationData.value = [Number(row.lng), Number(row.lat)]
@@ -152,6 +153,9 @@
     areaForm.value.type = row.type.toString()
     isEditMode.value = true
   }
+  if (dialogStatus.value === 'detail') {
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -232,7 +236,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="160px" :disabled="!isEditMode">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="节点名称:" prop="nodeName">
@@ -322,11 +326,11 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="saveData">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="saveData">
           保存
         </el-button>
         <el-button @click="cancel">
-          取消
+          {{ dialogStatus === 'detail' ? '确认' : '取消' }}
         </el-button>
       </div>
     </template>
@@ -341,4 +345,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 35513f5..2ebb537 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -27,21 +27,20 @@
   electricityId: '',
 })
 // 查询时间段范围
-const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
   { text: '支路首端节点', value: 'fbusId', align: 'center' },
   { text: '支路末端节点', value: 'tbusId', align: 'center' },
   { text: '支路电阻标幺值', value: 'r', align: 'center' },
-  { text: '支路电纳标幺值', value: 'b', align: 'center' },
-  { text: '长距离输电容量', value: 'ratea', align: 'center' },
-  { text: '短距离输电容量', value: 'rateb', align: 'center' },
-  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
-  { text: '支路变比', value: 'ratio', align: 'center' },
-  { text: '角度', value: 'angle', align: 'center' },
-  { text: '支路是否运行', value: 'status2', align: 'center' },
-  { text: '支路最小相位角', value: 'angmin', align: 'center' },
-  { text: '支路碳流率', value: 'angmax', align: 'center' },
+  // { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  // { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  // { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  // { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  // { text: '支路变比', value: 'ratio', align: 'center' },
+  // { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2Name', align: 'center' },
+  // { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率(kgCO2/h)', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
@@ -70,6 +69,10 @@
 const edit = (row: any) => {
   editRef.value.initDialog('update', row, props.id)
 }
+// 详情
+const detail = (row: any) => {
+  editRef.value.initDialog('detail', row, props.id)
+}
 // 删除
 const del = (row: any) => {
   ElMessageBox.confirm(
@@ -148,6 +151,9 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
               <el-button type="primary" link size="small" @click="edit(scope.row)">
                 修改
               </el-button>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 1f0bac0..fa89f80 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -30,15 +30,17 @@
 })
 const loadingTable = ref(true)
 const columns = ref([
-  { text: '节点类型', value: 'type', align: 'center' },
-  { text: '节点并联电导', value: 'gs', align: 'center' },
-  { text: '节点并联电纳', value: 'bs', align: 'center' },
-  { text: '母线断面号', value: 'area', align: 'center' },
-  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
-  { text: '节点电压初始相位角', value: 'va', align: 'center' },
-  { text: '母线省损耗区域', value: 'zone', align: 'center' },
-  { text: '节点最大电压', value: 'vmax', align: 'center' },
-  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '节点名称', value: 'nodeName', align: 'center' },
+  // { text: '节点编号', value: 'id', align: 'center' },
+  { text: '节点类型', value: 'typeName', align: 'center' },
+  // { text: '节点并联电导', value: 'gs', align: 'center' },
+  // { text: '节点并联电纳', value: 'bs', align: 'center' },
+  // { text: '母线断面号', value: 'area', align: 'center' },
+  // { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  // { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  // { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  // { text: '节点最大电压', value: 'vmax', align: 'center' },
+  // { text: '节点最小电压', value: 'vmin', align: 'center' },
   { text: '负荷有功功率(MW)', value: 'pd', align: 'center' },
   { text: '负荷无功功率(MW)', value: 'qd', align: 'center' },
   { text: '节点碳势(gCO2/kWh)', value: 'en', align: 'center' },
@@ -69,6 +71,10 @@
 const edit = (row: any) => {
   editRef.value.initDialog('update', row, '')
 }
+// 详情
+const detail = (row: any) => {
+  editRef.value.initDialog('detail', row, '')
+}
 // 删除
 const del = (row: any) => {
   ElMessageBox.confirm(
@@ -135,6 +141,9 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
               <el-button type="primary" link size="small" @click="edit(scope.row)">
                 修改
               </el-button>
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index 570b1ea..fbaeaa9 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -68,12 +68,10 @@
 }
 // 编辑
 const edit = (row: any) => {
-  console.log(row, 'row')
   editRef.value.initDialog('update', row)
 }
 // 删除
 const del = (row: any) => {
-  console.log(row, 'row')
   ElMessageBox.confirm(
     '确认删除选中的数据吗?',
     '提示',
@@ -224,3 +222,4 @@
     </div>
   </div>
 </template>
+
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 8ac95d6..681ffce 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -158,7 +158,7 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
+    <el-form ref="dataFormRef" :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="配电网名称:" prop="electricityName">
@@ -263,4 +263,13 @@
 .el-select {
   width: 100%;
 }
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/useHeat/pageAdd.vue b/src/views/data/useHeat/pageAdd.vue
index 725d78c..e473937 100644
--- a/src/views/data/useHeat/pageAdd.vue
+++ b/src/views/data/useHeat/pageAdd.vue
@@ -33,11 +33,10 @@
 // 获取设备列表
 const deviceList = ref<any>([])
 const fetchDeviceList = () => {
-  getDeviceList({ offset: 1, limit: 99999 }).then((res) => {
-    deviceList.value = res.data.rows
+  getDeviceList({ deviceClassify: type.value }).then((res) => {
+    deviceList.value = res.data
   })
 }
-fetchDeviceList()
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
@@ -68,6 +67,8 @@
   }
   // 保存类型
   type.value = row.type
+  // 获取设备列表
+  fetchDeviceList()
 }
 defineExpose({
   initDialog,