diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index af0ca51..4c911df 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -95,6 +95,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false

diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index af0ca51..4c911df 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -95,6 +95,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/data/electricity/detailDialog.vue b/src/views/data/electricity/detailDialog.vue
new file mode 100644
index 0000000..b50d412
--- /dev/null
+++ b/src/views/data/electricity/detailDialog.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+const centerDialogVisible = ref(false)
+const imgurl = ref('')
+const title = ref('')
+const initDialog = (row: any) => {
+  centerDialogVisible.value = true
+  imgurl.value = row.electricityDetail
+  title.value = row.electricityName
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="centerDialogVisible"
+    :title="title"
+    width="30%"
+    align-center
+    append-to-body
+  >
+    <show-photo :minio-file-name="url" width="100%" height="125px" />
+    <!-- <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">
+          Confirm
+        </el-button>
+      </span>
+    </template> -->
+  </el-dialog>
+</template>
+
+<style scoped>
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>

diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index af0ca51..4c911df 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -95,6 +95,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/data/electricity/detailDialog.vue b/src/views/data/electricity/detailDialog.vue
new file mode 100644
index 0000000..b50d412
--- /dev/null
+++ b/src/views/data/electricity/detailDialog.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+const centerDialogVisible = ref(false)
+const imgurl = ref('')
+const title = ref('')
+const initDialog = (row: any) => {
+  centerDialogVisible.value = true
+  imgurl.value = row.electricityDetail
+  title.value = row.electricityName
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="centerDialogVisible"
+    :title="title"
+    width="30%"
+    align-center
+    append-to-body
+  >
+    <show-photo :minio-file-name="url" width="100%" height="125px" />
+    <!-- <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">
+          Confirm
+        </el-button>
+      </span>
+    </template> -->
+  </el-dialog>
+</template>
+
+<style scoped>
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 6d0c8cf..4275323 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -36,7 +36,7 @@
     <!-- tab切换 -->
     <tab :tablist-data="tablistData" @confirm="confirm" />
     <network v-if="select === '配电网'" />
-    <page v-else :type="type" />
+    <page v-else :station-type="type" />
   </div>
 </template>
 

diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index af0ca51..4c911df 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -95,6 +95,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/data/electricity/detailDialog.vue b/src/views/data/electricity/detailDialog.vue
new file mode 100644
index 0000000..b50d412
--- /dev/null
+++ b/src/views/data/electricity/detailDialog.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+const centerDialogVisible = ref(false)
+const imgurl = ref('')
+const title = ref('')
+const initDialog = (row: any) => {
+  centerDialogVisible.value = true
+  imgurl.value = row.electricityDetail
+  title.value = row.electricityName
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="centerDialogVisible"
+    :title="title"
+    width="30%"
+    align-center
+    append-to-body
+  >
+    <show-photo :minio-file-name="url" width="100%" height="125px" />
+    <!-- <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">
+          Confirm
+        </el-button>
+      </span>
+    </template> -->
+  </el-dialog>
+</template>
+
+<style scoped>
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 6d0c8cf..4275323 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -36,7 +36,7 @@
     <!-- tab切换 -->
     <tab :tablist-data="tablistData" @confirm="confirm" />
     <network v-if="select === '配电网'" />
-    <page v-else :type="type" />
+    <page v-else :station-type="type" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index ccea8ee..b175035 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="network">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './networkAdd.vue'
+import detailDialog from './detailDialog.vue'
 import { deleteElectricityList, getElectricityList } from '@/api/api/index'
 // 查询参数
 const searchQuery = reactive({
@@ -87,9 +88,18 @@
   searchQuery.startTime = ''
   searchQuery.endTime = ''
 }
+const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  console.log(row, 'row')
+  if (row.electricityDetail) {
+    detailRef.value.initDialog(row)
+  }
+  else {
+    ElMessage({
+      type: 'info',
+      message: '暂无内容',
+    })
+  }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -115,6 +125,7 @@
 <template>
   <div>
     <edit-list ref="editRef" @refresh="search" />
+    <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>

diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index af0ca51..4c911df 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -95,6 +95,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/data/electricity/detailDialog.vue b/src/views/data/electricity/detailDialog.vue
new file mode 100644
index 0000000..b50d412
--- /dev/null
+++ b/src/views/data/electricity/detailDialog.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+const centerDialogVisible = ref(false)
+const imgurl = ref('')
+const title = ref('')
+const initDialog = (row: any) => {
+  centerDialogVisible.value = true
+  imgurl.value = row.electricityDetail
+  title.value = row.electricityName
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="centerDialogVisible"
+    :title="title"
+    width="30%"
+    align-center
+    append-to-body
+  >
+    <show-photo :minio-file-name="url" width="100%" height="125px" />
+    <!-- <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">
+          Confirm
+        </el-button>
+      </span>
+    </template> -->
+  </el-dialog>
+</template>
+
+<style scoped>
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 6d0c8cf..4275323 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -36,7 +36,7 @@
     <!-- tab切换 -->
     <tab :tablist-data="tablistData" @confirm="confirm" />
     <network v-if="select === '配电网'" />
-    <page v-else :type="type" />
+    <page v-else :station-type="type" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index ccea8ee..b175035 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="network">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './networkAdd.vue'
+import detailDialog from './detailDialog.vue'
 import { deleteElectricityList, getElectricityList } from '@/api/api/index'
 // 查询参数
 const searchQuery = reactive({
@@ -87,9 +88,18 @@
   searchQuery.startTime = ''
   searchQuery.endTime = ''
 }
+const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  console.log(row, 'row')
+  if (row.electricityDetail) {
+    detailRef.value.initDialog(row)
+  }
+  else {
+    ElMessage({
+      type: 'info',
+      message: '暂无内容',
+    })
+  }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -115,6 +125,7 @@
 <template>
   <div>
     <edit-list ref="editRef" @refresh="search" />
+    <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 707c1f4..be3c895 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup name="EditArea">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import showPhoto from './showPhoto.vue'
 import { addElectricityList, updateElectricityList } from '@/api/api/index'
+import { uploadApi } from '@/api/system/notice'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -12,6 +14,7 @@
   electricityArea: '', // 配电网区域
   uploaderName: '', // 上传人
   uploadTime: '', // 上传时间
+  electricityDetail: '', // 详情图片
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -19,10 +22,11 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '配电网区域', trigger: ['blur', 'change'] }],
-  uploaderName: [{ required: true, message: '上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '上传时间', trigger: ['blur', 'change'] }],
+  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
+  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
+  uploaderName: [{ required: true, message: '请输入上传人', trigger: ['blur', 'change'] }],
+  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
+  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -32,6 +36,7 @@
     electricityArea: '', // 配电网区域
     uploaderName: '', // 上传人
     uploadTime: '', // 上传时间
+    electricityDetail: '',
   }
 }
 const deviceTypeList = ref([])
@@ -68,6 +73,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
@@ -113,6 +122,29 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        dataFormRef.value?.clearValidate('electricityDetail')
+        areaForm.value.electricityDetail = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
 </script>
 
 <template>
@@ -146,12 +178,24 @@
             <el-date-picker
               v-model="areaForm.uploadTime"
               type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :placeholder="dialogStatus === 'create' ? '请选择上传时间' : ''"
               style="width: 100%;"
             />
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-form-item label="附件:" prop="electricityDetail">
+            <show-photo :minio-file-name="areaForm.electricityDetail" width="100%" height="125px" />
+            <el-button type="primary" :style="{ 'margin-left': areaForm.electricityDetail === '' ? '0px' : '20px', 'margin-top': areaForm.electricityDetail === '' ? '0px' : '56px' }" @click="upload">
+              {{ areaForm.electricityDetail === '' ? '上传' : '更换图片' }}
+            </el-button>
+            <input v-show="areaForm.electricityDetail === '1.2.3'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">

diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index af0ca51..4c911df 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -95,6 +95,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/data/electricity/detailDialog.vue b/src/views/data/electricity/detailDialog.vue
new file mode 100644
index 0000000..b50d412
--- /dev/null
+++ b/src/views/data/electricity/detailDialog.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+const centerDialogVisible = ref(false)
+const imgurl = ref('')
+const title = ref('')
+const initDialog = (row: any) => {
+  centerDialogVisible.value = true
+  imgurl.value = row.electricityDetail
+  title.value = row.electricityName
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="centerDialogVisible"
+    :title="title"
+    width="30%"
+    align-center
+    append-to-body
+  >
+    <show-photo :minio-file-name="url" width="100%" height="125px" />
+    <!-- <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">
+          Confirm
+        </el-button>
+      </span>
+    </template> -->
+  </el-dialog>
+</template>
+
+<style scoped>
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 6d0c8cf..4275323 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -36,7 +36,7 @@
     <!-- tab切换 -->
     <tab :tablist-data="tablistData" @confirm="confirm" />
     <network v-if="select === '配电网'" />
-    <page v-else :type="type" />
+    <page v-else :station-type="type" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index ccea8ee..b175035 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="network">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './networkAdd.vue'
+import detailDialog from './detailDialog.vue'
 import { deleteElectricityList, getElectricityList } from '@/api/api/index'
 // 查询参数
 const searchQuery = reactive({
@@ -87,9 +88,18 @@
   searchQuery.startTime = ''
   searchQuery.endTime = ''
 }
+const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  console.log(row, 'row')
+  if (row.electricityDetail) {
+    detailRef.value.initDialog(row)
+  }
+  else {
+    ElMessage({
+      type: 'info',
+      message: '暂无内容',
+    })
+  }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -115,6 +125,7 @@
 <template>
   <div>
     <edit-list ref="editRef" @refresh="search" />
+    <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 707c1f4..be3c895 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup name="EditArea">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import showPhoto from './showPhoto.vue'
 import { addElectricityList, updateElectricityList } from '@/api/api/index'
+import { uploadApi } from '@/api/system/notice'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -12,6 +14,7 @@
   electricityArea: '', // 配电网区域
   uploaderName: '', // 上传人
   uploadTime: '', // 上传时间
+  electricityDetail: '', // 详情图片
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -19,10 +22,11 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '配电网区域', trigger: ['blur', 'change'] }],
-  uploaderName: [{ required: true, message: '上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '上传时间', trigger: ['blur', 'change'] }],
+  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
+  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
+  uploaderName: [{ required: true, message: '请输入上传人', trigger: ['blur', 'change'] }],
+  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
+  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -32,6 +36,7 @@
     electricityArea: '', // 配电网区域
     uploaderName: '', // 上传人
     uploadTime: '', // 上传时间
+    electricityDetail: '',
   }
 }
 const deviceTypeList = ref([])
@@ -68,6 +73,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
@@ -113,6 +122,29 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        dataFormRef.value?.clearValidate('electricityDetail')
+        areaForm.value.electricityDetail = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
 </script>
 
 <template>
@@ -146,12 +178,24 @@
             <el-date-picker
               v-model="areaForm.uploadTime"
               type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :placeholder="dialogStatus === 'create' ? '请选择上传时间' : ''"
               style="width: 100%;"
             />
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-form-item label="附件:" prop="electricityDetail">
+            <show-photo :minio-file-name="areaForm.electricityDetail" width="100%" height="125px" />
+            <el-button type="primary" :style="{ 'margin-left': areaForm.electricityDetail === '' ? '0px' : '20px', 'margin-top': areaForm.electricityDetail === '' ? '0px' : '56px' }" @click="upload">
+              {{ areaForm.electricityDetail === '' ? '上传' : '更换图片' }}
+            </el-button>
+            <input v-show="areaForm.electricityDetail === '1.2.3'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 92dbf63..b44aa59 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -5,7 +5,7 @@
 import { deleteMonitorStation, getMonitorStation } from '@/api/api/index'
 const props = defineProps({
   // 根据type发送不同请求
-  type: {
+  stationType: {
     type: String,
     required: true,
   },
@@ -56,13 +56,11 @@
 const editRef = ref()
 // 新增
 const add = () => {
-  console.log(props.type, 'searchQuery.type')
-  editRef.value.initDialog('create', { type: props.type })
+  editRef.value.initDialog('create', { type: props.stationType })
 }
 // 编辑
 const edit = (row: any) => {
-  console.log(props.type, 'searchQuery.type')
-  editRef.value.initDialog('update', { ...row, type: props.type })
+  editRef.value.initDialog('update', { ...row, stationType: props.stationType })
 }
 // 删除
 const del = (row: any) => {
@@ -115,7 +113,7 @@
 onMounted(() => {
   search()
 })
-watch(() => props.type, (newVal) => {
+watch(() => props.stationType, (newVal) => {
   searchQuery.type = newVal
   search()
 })

diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index af0ca51..4c911df 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -95,6 +95,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/data/electricity/detailDialog.vue b/src/views/data/electricity/detailDialog.vue
new file mode 100644
index 0000000..b50d412
--- /dev/null
+++ b/src/views/data/electricity/detailDialog.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+const centerDialogVisible = ref(false)
+const imgurl = ref('')
+const title = ref('')
+const initDialog = (row: any) => {
+  centerDialogVisible.value = true
+  imgurl.value = row.electricityDetail
+  title.value = row.electricityName
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="centerDialogVisible"
+    :title="title"
+    width="30%"
+    align-center
+    append-to-body
+  >
+    <show-photo :minio-file-name="url" width="100%" height="125px" />
+    <!-- <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">
+          Confirm
+        </el-button>
+      </span>
+    </template> -->
+  </el-dialog>
+</template>
+
+<style scoped>
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 6d0c8cf..4275323 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -36,7 +36,7 @@
     <!-- tab切换 -->
     <tab :tablist-data="tablistData" @confirm="confirm" />
     <network v-if="select === '配电网'" />
-    <page v-else :type="type" />
+    <page v-else :station-type="type" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index ccea8ee..b175035 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="network">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './networkAdd.vue'
+import detailDialog from './detailDialog.vue'
 import { deleteElectricityList, getElectricityList } from '@/api/api/index'
 // 查询参数
 const searchQuery = reactive({
@@ -87,9 +88,18 @@
   searchQuery.startTime = ''
   searchQuery.endTime = ''
 }
+const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  console.log(row, 'row')
+  if (row.electricityDetail) {
+    detailRef.value.initDialog(row)
+  }
+  else {
+    ElMessage({
+      type: 'info',
+      message: '暂无内容',
+    })
+  }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -115,6 +125,7 @@
 <template>
   <div>
     <edit-list ref="editRef" @refresh="search" />
+    <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 707c1f4..be3c895 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup name="EditArea">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import showPhoto from './showPhoto.vue'
 import { addElectricityList, updateElectricityList } from '@/api/api/index'
+import { uploadApi } from '@/api/system/notice'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -12,6 +14,7 @@
   electricityArea: '', // 配电网区域
   uploaderName: '', // 上传人
   uploadTime: '', // 上传时间
+  electricityDetail: '', // 详情图片
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -19,10 +22,11 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '配电网区域', trigger: ['blur', 'change'] }],
-  uploaderName: [{ required: true, message: '上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '上传时间', trigger: ['blur', 'change'] }],
+  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
+  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
+  uploaderName: [{ required: true, message: '请输入上传人', trigger: ['blur', 'change'] }],
+  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
+  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -32,6 +36,7 @@
     electricityArea: '', // 配电网区域
     uploaderName: '', // 上传人
     uploadTime: '', // 上传时间
+    electricityDetail: '',
   }
 }
 const deviceTypeList = ref([])
@@ -68,6 +73,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
@@ -113,6 +122,29 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        dataFormRef.value?.clearValidate('electricityDetail')
+        areaForm.value.electricityDetail = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
 </script>
 
 <template>
@@ -146,12 +178,24 @@
             <el-date-picker
               v-model="areaForm.uploadTime"
               type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :placeholder="dialogStatus === 'create' ? '请选择上传时间' : ''"
               style="width: 100%;"
             />
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-form-item label="附件:" prop="electricityDetail">
+            <show-photo :minio-file-name="areaForm.electricityDetail" width="100%" height="125px" />
+            <el-button type="primary" :style="{ 'margin-left': areaForm.electricityDetail === '' ? '0px' : '20px', 'margin-top': areaForm.electricityDetail === '' ? '0px' : '56px' }" @click="upload">
+              {{ areaForm.electricityDetail === '' ? '上传' : '更换图片' }}
+            </el-button>
+            <input v-show="areaForm.electricityDetail === '1.2.3'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 92dbf63..b44aa59 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -5,7 +5,7 @@
 import { deleteMonitorStation, getMonitorStation } from '@/api/api/index'
 const props = defineProps({
   // 根据type发送不同请求
-  type: {
+  stationType: {
     type: String,
     required: true,
   },
@@ -56,13 +56,11 @@
 const editRef = ref()
 // 新增
 const add = () => {
-  console.log(props.type, 'searchQuery.type')
-  editRef.value.initDialog('create', { type: props.type })
+  editRef.value.initDialog('create', { type: props.stationType })
 }
 // 编辑
 const edit = (row: any) => {
-  console.log(props.type, 'searchQuery.type')
-  editRef.value.initDialog('update', { ...row, type: props.type })
+  editRef.value.initDialog('update', { ...row, stationType: props.stationType })
 }
 // 删除
 const del = (row: any) => {
@@ -115,7 +113,7 @@
 onMounted(() => {
   search()
 })
-watch(() => props.type, (newVal) => {
+watch(() => props.stationType, (newVal) => {
   searchQuery.type = newVal
   search()
 })
diff --git a/src/views/data/electricity/pageAdd.vue b/src/views/data/electricity/pageAdd.vue
index bb24931..805d792 100644
--- a/src/views/data/electricity/pageAdd.vue
+++ b/src/views/data/electricity/pageAdd.vue
@@ -11,13 +11,9 @@
 const areaForm = ref({
   id: '',
   deviceId: '',
-  deviceType: '', // 设备类型
-  deviceNo: '', // 设备编号
-  installLocaltion: '', // 安装位置
   electricalVoltage: '', // 电量
   power: '', // 功率
-  uploadTime: '', // 上传时间
-  type: '',
+  stationType: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -36,13 +32,9 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    deviceType: '', // 设备类型
-    deviceNo: '', // 设备编号
-    installLocaltion: '', // 安装位置
     electricalVoltage: '', // 电量
     power: '', // 功率
-    uploadTime: '', // 上传时间
-    type: '',
+    stationType: '',
     id: '',
     deviceId: '',
   }
@@ -63,12 +55,6 @@
 }
 fetchDeviceList()
 fetchDeviceType()
-watch(() => areaForm.value.deviceId, (newVal) => {
-  const selectDevice = deviceList.value.filter(item => item.id === newVal)[0]
-  areaForm.value.deviceType = selectDevice.deviceType
-  areaForm.value.deviceNo = selectDevice.deviceNo
-  areaForm.value.installLocaltion = selectDevice.installLocaltion
-})
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
@@ -85,7 +71,7 @@
     areaForm.value = row
     isEditMode.value = true
   }
-  areaForm.value.type = row.type
+  areaForm.value.stationType = row.stationType
 }
 defineExpose({
   initDialog,
@@ -104,6 +90,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
@@ -168,7 +158,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="设备类型" prop="deviceType">
             <el-select v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''" style="width: 100%;">
@@ -181,21 +171,21 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="设备编号:" prop="deviceNo">
             <el-input v-model="areaForm.deviceNo" :placeholder="dialogStatus === 'create' ? '请输入设备编号' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="安装位置:" prop="installLocaltion">
             <el-input v-model="areaForm.installLocaltion" :placeholder="dialogStatus === 'create' ? '请输入安装位置' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="电量/V:" prop="electricalVoltage">
@@ -210,10 +200,9 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="上传时间:" prop="uploadTime">
-            <!-- <el-input v-model="areaForm.uploadTime" :placeholder="dialogStatus === 'create' ? '请输入电量/V' : ''" /> -->
             <el-date-picker
               v-model="areaForm.uploadTime"
               value-format="YYYY-MM-DD HH:mm:ss"
@@ -223,7 +212,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">

diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index af0ca51..4c911df 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -95,6 +95,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/data/electricity/detailDialog.vue b/src/views/data/electricity/detailDialog.vue
new file mode 100644
index 0000000..b50d412
--- /dev/null
+++ b/src/views/data/electricity/detailDialog.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+const centerDialogVisible = ref(false)
+const imgurl = ref('')
+const title = ref('')
+const initDialog = (row: any) => {
+  centerDialogVisible.value = true
+  imgurl.value = row.electricityDetail
+  title.value = row.electricityName
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="centerDialogVisible"
+    :title="title"
+    width="30%"
+    align-center
+    append-to-body
+  >
+    <show-photo :minio-file-name="url" width="100%" height="125px" />
+    <!-- <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">
+          Confirm
+        </el-button>
+      </span>
+    </template> -->
+  </el-dialog>
+</template>
+
+<style scoped>
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 6d0c8cf..4275323 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -36,7 +36,7 @@
     <!-- tab切换 -->
     <tab :tablist-data="tablistData" @confirm="confirm" />
     <network v-if="select === '配电网'" />
-    <page v-else :type="type" />
+    <page v-else :station-type="type" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index ccea8ee..b175035 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="network">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './networkAdd.vue'
+import detailDialog from './detailDialog.vue'
 import { deleteElectricityList, getElectricityList } from '@/api/api/index'
 // 查询参数
 const searchQuery = reactive({
@@ -87,9 +88,18 @@
   searchQuery.startTime = ''
   searchQuery.endTime = ''
 }
+const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  console.log(row, 'row')
+  if (row.electricityDetail) {
+    detailRef.value.initDialog(row)
+  }
+  else {
+    ElMessage({
+      type: 'info',
+      message: '暂无内容',
+    })
+  }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -115,6 +125,7 @@
 <template>
   <div>
     <edit-list ref="editRef" @refresh="search" />
+    <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 707c1f4..be3c895 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup name="EditArea">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import showPhoto from './showPhoto.vue'
 import { addElectricityList, updateElectricityList } from '@/api/api/index'
+import { uploadApi } from '@/api/system/notice'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -12,6 +14,7 @@
   electricityArea: '', // 配电网区域
   uploaderName: '', // 上传人
   uploadTime: '', // 上传时间
+  electricityDetail: '', // 详情图片
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -19,10 +22,11 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '配电网区域', trigger: ['blur', 'change'] }],
-  uploaderName: [{ required: true, message: '上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '上传时间', trigger: ['blur', 'change'] }],
+  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
+  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
+  uploaderName: [{ required: true, message: '请输入上传人', trigger: ['blur', 'change'] }],
+  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
+  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -32,6 +36,7 @@
     electricityArea: '', // 配电网区域
     uploaderName: '', // 上传人
     uploadTime: '', // 上传时间
+    electricityDetail: '',
   }
 }
 const deviceTypeList = ref([])
@@ -68,6 +73,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
@@ -113,6 +122,29 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        dataFormRef.value?.clearValidate('electricityDetail')
+        areaForm.value.electricityDetail = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
 </script>
 
 <template>
@@ -146,12 +178,24 @@
             <el-date-picker
               v-model="areaForm.uploadTime"
               type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :placeholder="dialogStatus === 'create' ? '请选择上传时间' : ''"
               style="width: 100%;"
             />
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-form-item label="附件:" prop="electricityDetail">
+            <show-photo :minio-file-name="areaForm.electricityDetail" width="100%" height="125px" />
+            <el-button type="primary" :style="{ 'margin-left': areaForm.electricityDetail === '' ? '0px' : '20px', 'margin-top': areaForm.electricityDetail === '' ? '0px' : '56px' }" @click="upload">
+              {{ areaForm.electricityDetail === '' ? '上传' : '更换图片' }}
+            </el-button>
+            <input v-show="areaForm.electricityDetail === '1.2.3'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 92dbf63..b44aa59 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -5,7 +5,7 @@
 import { deleteMonitorStation, getMonitorStation } from '@/api/api/index'
 const props = defineProps({
   // 根据type发送不同请求
-  type: {
+  stationType: {
     type: String,
     required: true,
   },
@@ -56,13 +56,11 @@
 const editRef = ref()
 // 新增
 const add = () => {
-  console.log(props.type, 'searchQuery.type')
-  editRef.value.initDialog('create', { type: props.type })
+  editRef.value.initDialog('create', { type: props.stationType })
 }
 // 编辑
 const edit = (row: any) => {
-  console.log(props.type, 'searchQuery.type')
-  editRef.value.initDialog('update', { ...row, type: props.type })
+  editRef.value.initDialog('update', { ...row, stationType: props.stationType })
 }
 // 删除
 const del = (row: any) => {
@@ -115,7 +113,7 @@
 onMounted(() => {
   search()
 })
-watch(() => props.type, (newVal) => {
+watch(() => props.stationType, (newVal) => {
   searchQuery.type = newVal
   search()
 })
diff --git a/src/views/data/electricity/pageAdd.vue b/src/views/data/electricity/pageAdd.vue
index bb24931..805d792 100644
--- a/src/views/data/electricity/pageAdd.vue
+++ b/src/views/data/electricity/pageAdd.vue
@@ -11,13 +11,9 @@
 const areaForm = ref({
   id: '',
   deviceId: '',
-  deviceType: '', // 设备类型
-  deviceNo: '', // 设备编号
-  installLocaltion: '', // 安装位置
   electricalVoltage: '', // 电量
   power: '', // 功率
-  uploadTime: '', // 上传时间
-  type: '',
+  stationType: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -36,13 +32,9 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    deviceType: '', // 设备类型
-    deviceNo: '', // 设备编号
-    installLocaltion: '', // 安装位置
     electricalVoltage: '', // 电量
     power: '', // 功率
-    uploadTime: '', // 上传时间
-    type: '',
+    stationType: '',
     id: '',
     deviceId: '',
   }
@@ -63,12 +55,6 @@
 }
 fetchDeviceList()
 fetchDeviceType()
-watch(() => areaForm.value.deviceId, (newVal) => {
-  const selectDevice = deviceList.value.filter(item => item.id === newVal)[0]
-  areaForm.value.deviceType = selectDevice.deviceType
-  areaForm.value.deviceNo = selectDevice.deviceNo
-  areaForm.value.installLocaltion = selectDevice.installLocaltion
-})
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
@@ -85,7 +71,7 @@
     areaForm.value = row
     isEditMode.value = true
   }
-  areaForm.value.type = row.type
+  areaForm.value.stationType = row.stationType
 }
 defineExpose({
   initDialog,
@@ -104,6 +90,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
@@ -168,7 +158,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="设备类型" prop="deviceType">
             <el-select v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''" style="width: 100%;">
@@ -181,21 +171,21 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="设备编号:" prop="deviceNo">
             <el-input v-model="areaForm.deviceNo" :placeholder="dialogStatus === 'create' ? '请输入设备编号' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="安装位置:" prop="installLocaltion">
             <el-input v-model="areaForm.installLocaltion" :placeholder="dialogStatus === 'create' ? '请输入安装位置' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="电量/V:" prop="electricalVoltage">
@@ -210,10 +200,9 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="上传时间:" prop="uploadTime">
-            <!-- <el-input v-model="areaForm.uploadTime" :placeholder="dialogStatus === 'create' ? '请输入电量/V' : ''" /> -->
             <el-date-picker
               v-model="areaForm.uploadTime"
               value-format="YYYY-MM-DD HH:mm:ss"
@@ -223,7 +212,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/showPhoto.vue b/src/views/data/electricity/showPhoto.vue
new file mode 100644
index 0000000..3db1dc1
--- /dev/null
+++ b/src/views/data/electricity/showPhoto.vue
@@ -0,0 +1,69 @@
+<script lang="ts" setup name="showPhoto">
+import { getPhotoUrl } from '@/api/system/tool'
+const props = defineProps({
+  minioFileName: {
+    type: String,
+    required: true,
+  },
+  height: {
+    type: String,
+    default: '100px',
+  },
+  width: {
+    type: String,
+    default: '100px',
+  },
+})
+const isPhoto = computed(() => {
+  return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
+})
+const url = ref('')
+const getPhoto = () => {
+  if (props.minioFileName) {
+    getPhotoUrl(props.minioFileName).then((res) => {
+      url.value = res.data
+    })
+  }
+}
+onMounted(() => {
+  getPhoto()
+})
+onUpdated(() => {
+  getPhoto()
+})
+</script>
+
+<template>
+  <div class="container">
+    <el-image
+      v-if="props.minioFileName && isPhoto"
+      :style="{ width: props.width, height: props.height }"
+      :src="url"
+      :preview-src-list="[url]"
+      fit="cover"
+    />
+    <el-link
+      v-else :href="url" type="primary"
+      style="margin-right: 10px;"
+      target="_blank"
+    >
+      {{ props.minioFileName }}
+    </el-link>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .el-link::after {
+      content: "";
+      position: absolute;
+      left: 0;
+      right: 0;
+      height: 0;
+      bottom: 0;
+      border-bottom: 1px solid var(--el-link-hover-text-color);
+    }
+  }
+}
+</style>

diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index af0ca51..4c911df 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -95,6 +95,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/data/electricity/detailDialog.vue b/src/views/data/electricity/detailDialog.vue
new file mode 100644
index 0000000..b50d412
--- /dev/null
+++ b/src/views/data/electricity/detailDialog.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+const centerDialogVisible = ref(false)
+const imgurl = ref('')
+const title = ref('')
+const initDialog = (row: any) => {
+  centerDialogVisible.value = true
+  imgurl.value = row.electricityDetail
+  title.value = row.electricityName
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="centerDialogVisible"
+    :title="title"
+    width="30%"
+    align-center
+    append-to-body
+  >
+    <show-photo :minio-file-name="url" width="100%" height="125px" />
+    <!-- <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">
+          Confirm
+        </el-button>
+      </span>
+    </template> -->
+  </el-dialog>
+</template>
+
+<style scoped>
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 6d0c8cf..4275323 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -36,7 +36,7 @@
     <!-- tab切换 -->
     <tab :tablist-data="tablistData" @confirm="confirm" />
     <network v-if="select === '配电网'" />
-    <page v-else :type="type" />
+    <page v-else :station-type="type" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index ccea8ee..b175035 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="network">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './networkAdd.vue'
+import detailDialog from './detailDialog.vue'
 import { deleteElectricityList, getElectricityList } from '@/api/api/index'
 // 查询参数
 const searchQuery = reactive({
@@ -87,9 +88,18 @@
   searchQuery.startTime = ''
   searchQuery.endTime = ''
 }
+const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  console.log(row, 'row')
+  if (row.electricityDetail) {
+    detailRef.value.initDialog(row)
+  }
+  else {
+    ElMessage({
+      type: 'info',
+      message: '暂无内容',
+    })
+  }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -115,6 +125,7 @@
 <template>
   <div>
     <edit-list ref="editRef" @refresh="search" />
+    <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 707c1f4..be3c895 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup name="EditArea">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import showPhoto from './showPhoto.vue'
 import { addElectricityList, updateElectricityList } from '@/api/api/index'
+import { uploadApi } from '@/api/system/notice'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -12,6 +14,7 @@
   electricityArea: '', // 配电网区域
   uploaderName: '', // 上传人
   uploadTime: '', // 上传时间
+  electricityDetail: '', // 详情图片
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -19,10 +22,11 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '配电网区域', trigger: ['blur', 'change'] }],
-  uploaderName: [{ required: true, message: '上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '上传时间', trigger: ['blur', 'change'] }],
+  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
+  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
+  uploaderName: [{ required: true, message: '请输入上传人', trigger: ['blur', 'change'] }],
+  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
+  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -32,6 +36,7 @@
     electricityArea: '', // 配电网区域
     uploaderName: '', // 上传人
     uploadTime: '', // 上传时间
+    electricityDetail: '',
   }
 }
 const deviceTypeList = ref([])
@@ -68,6 +73,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
@@ -113,6 +122,29 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        dataFormRef.value?.clearValidate('electricityDetail')
+        areaForm.value.electricityDetail = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
 </script>
 
 <template>
@@ -146,12 +178,24 @@
             <el-date-picker
               v-model="areaForm.uploadTime"
               type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :placeholder="dialogStatus === 'create' ? '请选择上传时间' : ''"
               style="width: 100%;"
             />
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-form-item label="附件:" prop="electricityDetail">
+            <show-photo :minio-file-name="areaForm.electricityDetail" width="100%" height="125px" />
+            <el-button type="primary" :style="{ 'margin-left': areaForm.electricityDetail === '' ? '0px' : '20px', 'margin-top': areaForm.electricityDetail === '' ? '0px' : '56px' }" @click="upload">
+              {{ areaForm.electricityDetail === '' ? '上传' : '更换图片' }}
+            </el-button>
+            <input v-show="areaForm.electricityDetail === '1.2.3'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 92dbf63..b44aa59 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -5,7 +5,7 @@
 import { deleteMonitorStation, getMonitorStation } from '@/api/api/index'
 const props = defineProps({
   // 根据type发送不同请求
-  type: {
+  stationType: {
     type: String,
     required: true,
   },
@@ -56,13 +56,11 @@
 const editRef = ref()
 // 新增
 const add = () => {
-  console.log(props.type, 'searchQuery.type')
-  editRef.value.initDialog('create', { type: props.type })
+  editRef.value.initDialog('create', { type: props.stationType })
 }
 // 编辑
 const edit = (row: any) => {
-  console.log(props.type, 'searchQuery.type')
-  editRef.value.initDialog('update', { ...row, type: props.type })
+  editRef.value.initDialog('update', { ...row, stationType: props.stationType })
 }
 // 删除
 const del = (row: any) => {
@@ -115,7 +113,7 @@
 onMounted(() => {
   search()
 })
-watch(() => props.type, (newVal) => {
+watch(() => props.stationType, (newVal) => {
   searchQuery.type = newVal
   search()
 })
diff --git a/src/views/data/electricity/pageAdd.vue b/src/views/data/electricity/pageAdd.vue
index bb24931..805d792 100644
--- a/src/views/data/electricity/pageAdd.vue
+++ b/src/views/data/electricity/pageAdd.vue
@@ -11,13 +11,9 @@
 const areaForm = ref({
   id: '',
   deviceId: '',
-  deviceType: '', // 设备类型
-  deviceNo: '', // 设备编号
-  installLocaltion: '', // 安装位置
   electricalVoltage: '', // 电量
   power: '', // 功率
-  uploadTime: '', // 上传时间
-  type: '',
+  stationType: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -36,13 +32,9 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    deviceType: '', // 设备类型
-    deviceNo: '', // 设备编号
-    installLocaltion: '', // 安装位置
     electricalVoltage: '', // 电量
     power: '', // 功率
-    uploadTime: '', // 上传时间
-    type: '',
+    stationType: '',
     id: '',
     deviceId: '',
   }
@@ -63,12 +55,6 @@
 }
 fetchDeviceList()
 fetchDeviceType()
-watch(() => areaForm.value.deviceId, (newVal) => {
-  const selectDevice = deviceList.value.filter(item => item.id === newVal)[0]
-  areaForm.value.deviceType = selectDevice.deviceType
-  areaForm.value.deviceNo = selectDevice.deviceNo
-  areaForm.value.installLocaltion = selectDevice.installLocaltion
-})
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
@@ -85,7 +71,7 @@
     areaForm.value = row
     isEditMode.value = true
   }
-  areaForm.value.type = row.type
+  areaForm.value.stationType = row.stationType
 }
 defineExpose({
   initDialog,
@@ -104,6 +90,10 @@
           setTimeout(() => {
             emits('refresh')
           })
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
@@ -168,7 +158,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="设备类型" prop="deviceType">
             <el-select v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''" style="width: 100%;">
@@ -181,21 +171,21 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="设备编号:" prop="deviceNo">
             <el-input v-model="areaForm.deviceNo" :placeholder="dialogStatus === 'create' ? '请输入设备编号' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="安装位置:" prop="installLocaltion">
             <el-input v-model="areaForm.installLocaltion" :placeholder="dialogStatus === 'create' ? '请输入安装位置' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="电量/V:" prop="electricalVoltage">
@@ -210,10 +200,9 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="上传时间:" prop="uploadTime">
-            <!-- <el-input v-model="areaForm.uploadTime" :placeholder="dialogStatus === 'create' ? '请输入电量/V' : ''" /> -->
             <el-date-picker
               v-model="areaForm.uploadTime"
               value-format="YYYY-MM-DD HH:mm:ss"
@@ -223,7 +212,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/showPhoto.vue b/src/views/data/electricity/showPhoto.vue
new file mode 100644
index 0000000..3db1dc1
--- /dev/null
+++ b/src/views/data/electricity/showPhoto.vue
@@ -0,0 +1,69 @@
+<script lang="ts" setup name="showPhoto">
+import { getPhotoUrl } from '@/api/system/tool'
+const props = defineProps({
+  minioFileName: {
+    type: String,
+    required: true,
+  },
+  height: {
+    type: String,
+    default: '100px',
+  },
+  width: {
+    type: String,
+    default: '100px',
+  },
+})
+const isPhoto = computed(() => {
+  return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
+})
+const url = ref('')
+const getPhoto = () => {
+  if (props.minioFileName) {
+    getPhotoUrl(props.minioFileName).then((res) => {
+      url.value = res.data
+    })
+  }
+}
+onMounted(() => {
+  getPhoto()
+})
+onUpdated(() => {
+  getPhoto()
+})
+</script>
+
+<template>
+  <div class="container">
+    <el-image
+      v-if="props.minioFileName && isPhoto"
+      :style="{ width: props.width, height: props.height }"
+      :src="url"
+      :preview-src-list="[url]"
+      fit="cover"
+    />
+    <el-link
+      v-else :href="url" type="primary"
+      style="margin-right: 10px;"
+      target="_blank"
+    >
+      {{ props.minioFileName }}
+    </el-link>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .el-link::after {
+      content: "";
+      position: absolute;
+      left: 0;
+      right: 0;
+      height: 0;
+      bottom: 0;
+      border-bottom: 1px solid var(--el-link-hover-text-color);
+    }
+  }
+}
+</style>
diff --git a/src/views/evaluate/page.vue b/src/views/evaluate/page.vue
index d98573e..e7650fe 100644
--- a/src/views/evaluate/page.vue
+++ b/src/views/evaluate/page.vue
@@ -2,7 +2,7 @@
 const $router = useRouter()
 const newPage = ref(
   {
-    url: 'http://192.168.31.31/xphNVJZNhZEJq3Wh/',
+    url: 'https://share.shanhaibi.com/6419c39c03a6d/',
   },
 )
 onMounted(() => {