diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index f2ef8db..2fb6228 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -16,6 +16,7 @@
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择日期"/>
@@ -36,7 +37,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
-            <el-select v-model="deviceForm.modelId" placeholder="请选择设备型号">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
               <el-option
                 v-for="item in deviceModelList"
                 :key="item.value"
@@ -49,17 +50,17 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="窨井编号" prop="wellCode">
-            <el-input v-model.trim="deviceForm.wellCode" type="text" placeholder="必填"/>
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="集中器编号" prop="concenCode">
-            <el-input v-model.trim="deviceForm.concenCode" type="text" placeholder="非必填"/>
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <div slot="footer" class="dialog-footer">
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
@@ -74,7 +75,7 @@
   data() {
     return {
       dialogFormVisible: false, // 对话框是否显示
-      dialogStatus: '', // 对话框类型：create,update
+      dialogStatus: '', // 对话框类型：create,update,detail
       deviceForm: {
         id: '',
         deviceName: '',
@@ -102,7 +103,8 @@
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      isEditMode: false
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
     }
   },
   watch: {
@@ -122,6 +124,7 @@
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.isEditMode = false
+        this.isDetailMode = false
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
@@ -140,6 +143,23 @@
           this.fetchDeviceModel(row.deviceType)
         }
         this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
       }
     },
     // 重置表单

diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index f2ef8db..2fb6228 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -16,6 +16,7 @@
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择日期"/>
@@ -36,7 +37,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
-            <el-select v-model="deviceForm.modelId" placeholder="请选择设备型号">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
               <el-option
                 v-for="item in deviceModelList"
                 :key="item.value"
@@ -49,17 +50,17 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="窨井编号" prop="wellCode">
-            <el-input v-model.trim="deviceForm.wellCode" type="text" placeholder="必填"/>
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="集中器编号" prop="concenCode">
-            <el-input v-model.trim="deviceForm.concenCode" type="text" placeholder="非必填"/>
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <div slot="footer" class="dialog-footer">
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
@@ -74,7 +75,7 @@
   data() {
     return {
       dialogFormVisible: false, // 对话框是否显示
-      dialogStatus: '', // 对话框类型：create,update
+      dialogStatus: '', // 对话框类型：create,update,detail
       deviceForm: {
         id: '',
         deviceName: '',
@@ -102,7 +103,8 @@
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      isEditMode: false
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
     }
   },
   watch: {
@@ -122,6 +124,7 @@
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.isEditMode = false
+        this.isDetailMode = false
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
@@ -140,6 +143,23 @@
           this.fetchDeviceModel(row.deviceType)
         }
         this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
       }
     },
     // 重置表单
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 408b535..eafa3c8 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -68,6 +68,7 @@
           <template slot-scope="scope">
             <el-button type="text" @click="datalist(scope.row)">历史数据</el-button>
             <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="text" @click="detail(scope.row)">详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -232,6 +233,9 @@
       this.editShow = true
       this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
     },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
     // 删除设备
     del() {
       if (this.checkSelection()) {