diff --git a/src/views/dms/dmsRecordAlarmInfo/index.vue b/src/views/dms/dmsRecordAlarmInfo/index.vue
index c27707d..aeb3600 100644
--- a/src/views/dms/dmsRecordAlarmInfo/index.vue
+++ b/src/views/dms/dmsRecordAlarmInfo/index.vue
@@ -11,26 +11,26 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="报警类型" prop="alarmType">
-        <el-select v-model="queryParams.alarmType" placeholder="请选择报警类型" clearable>
-          <el-option
-            v-for="dict in dict.type.dms_alarm_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="报警级别" prop="alarmLevel">
-        <el-select v-model="queryParams.alarmLevel" placeholder="请选择报警级别" clearable>
-          <el-option
-            v-for="dict in dict.type.dms_alarm_level"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="报警类型" prop="alarmType">-->
+<!--        <el-select v-model="queryParams.alarmType" placeholder="请选择报警类型" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.dms_alarm_type"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="报警级别" prop="alarmLevel">-->
+<!--        <el-select v-model="queryParams.alarmLevel" placeholder="请选择报警级别" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.dms_alarm_level"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="报警状态" prop="alarmStatus">
         <el-select v-model="queryParams.alarmStatus" placeholder="请选择报警状态" clearable>
           <el-option
@@ -41,16 +41,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="通知状态" prop="noticeStatus">
-        <el-select v-model="queryParams.noticeStatus" placeholder="请选择通知状态" clearable>
-          <el-option
-            v-for="dict in dict.type.dms_notice_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="通知状态" prop="noticeStatus">-->
+<!--        <el-select v-model="queryParams.noticeStatus" placeholder="请选择通知状态" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.dms_notice_status"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="报警开始时间">
         <el-date-picker
           v-model="daterangeAlarmBeginTime"
@@ -152,28 +152,28 @@
       <el-table-column label="主键标识" align="center" prop="alarmId" v-if="columns[0].visible"/>
       <el-table-column label="设备名称" align="center" prop="deviceName" v-if="columns[1].visible"/>
       <el-table-column label="设备报警规则id" align="center" prop="alarmRuleId" v-if="columns[2].visible"/>
-      <el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[19].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.dms_alarm_type" :value="scope.row.alarmType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="报警级别" align="center" prop="alarmLevel" v-if="columns[20].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.dms_alarm_level" :value="scope.row.alarmLevel"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[19].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.dms_alarm_type" :value="scope.row.alarmType"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="报警级别" align="center" prop="alarmLevel" v-if="columns[20].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.dms_alarm_level" :value="scope.row.alarmLevel"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 <!--      <el-table-column label="通知方式" align="center" prop="noticeType" v-if="columns[21].visible" width="100">-->
 <!--        <template slot-scope="scope">-->
 <!--          <dict-tag :options="dict.type.dms_notice_type"-->
 <!--                    :value="scope.row.noticeType ? scope.row.noticeType.split(',') : []"/>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="自动恢复标识" align="center" prop="recoverType" v-if="columns[22].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.dms_recover_type" :value="scope.row.recoverType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="报警状态字" align="center" prop="alarmStatusWord" v-if="columns[23].visible" width="90"/>
+<!--      <el-table-column label="自动恢复标识" align="center" prop="recoverType" v-if="columns[22].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.dms_recover_type" :value="scope.row.recoverType"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="报警状态字" align="center" prop="alarmStatusWord" v-if="columns[23].visible" width="90"/>-->
       <el-table-column label="报警状态" align="center" prop="alarmStatus" v-if="columns[8].visible" width="90">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.dms_alarm_status" :value="scope.row.alarmStatus"/>
@@ -181,15 +181,15 @@
       </el-table-column>
       <el-table-column label="报警原因" align="center" prop="alarmReason" v-if="columns[6].visible"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="报警数据" align="center" prop="alarmData" v-if="columns[7].visible"
-                       :show-overflow-tooltip="true"/>
-      <el-table-column label="处理建议" align="center" prop="handleSuggest" v-if="columns[9].visible"
-                       :show-overflow-tooltip="true"/>
-      <el-table-column label="通知状态" align="center" prop="noticeStatus" v-if="columns[10].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.dms_notice_status" :value="scope.row.noticeStatus"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="报警数据" align="center" prop="alarmData" v-if="columns[7].visible"-->
+<!--                       :show-overflow-tooltip="true"/>-->
+<!--      <el-table-column label="处理建议" align="center" prop="handleSuggest" v-if="columns[9].visible"-->
+<!--                       :show-overflow-tooltip="true"/>-->
+<!--      <el-table-column label="通知状态" align="center" prop="noticeStatus" v-if="columns[10].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.dms_notice_status" :value="scope.row.noticeStatus"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="报警开始时间" align="center" prop="alarmBeginTime" width="180" v-if="columns[3].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.alarmBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -201,12 +201,12 @@
         </template>
       </el-table-column>
       <el-table-column label="报警持续时间(ms)" align="center" prop="continueTime" v-if="columns[5].visible" width="130"/>
-      <el-table-column label="处理人员" align="center" prop="handleUser" v-if="columns[11].visible"/>
-      <el-table-column label="处理时间" align="center" prop="handleTime" width="180" v-if="columns[12].visible">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="处理人员" align="center" prop="handleUser" v-if="columns[11].visible"/>-->
+<!--      <el-table-column label="处理时间" align="center" prop="handleTime" width="180" v-if="columns[12].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="原因分析" align="center" prop="causeAnalysis" v-if="columns[13].visible"/>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[14].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
@@ -269,24 +269,24 @@
         <!--          <el-input v-model="form.continueTime" placeholder="请输入报警持续时间(ms)"/>-->
         <!--        </el-form-item>-->
         <el-form-item label="报警原因" prop="alarmReason">
-          <el-input v-model="form.alarmReason" type="textarea" disabled/>
-        </el-form-item>
-        <el-form-item label="报警数据" prop="alarmData">
-          <el-input v-model="form.alarmData" type="textarea" disabled/>
-        </el-form-item>
-        <el-form-item label="报警状态" prop="alarmStatus">
-          <el-radio-group v-model="form.alarmStatus" disabled>
-            <el-radio
-              v-for="dict in dict.type.dms_alarm_status"
-              :key="dict.value"
-              :label="dict.value"
-            >{{ dict.label }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="处理建议" prop="handleSuggest">
-          <el-input v-model="form.handleSuggest" type="textarea" disabled/>
+          <el-input v-model="form.alarmReason" type="textarea" placeholder="请输入报警原因"/>
         </el-form-item>
+<!--        <el-form-item label="报警数据" prop="alarmData">-->
+<!--          <el-input v-model="form.alarmData" type="textarea" disabled/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="报警状态" prop="alarmStatus">-->
+<!--          <el-radio-group v-model="form.alarmStatus" disabled>-->
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.dms_alarm_status"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.value"-->
+<!--            >{{ dict.label }}-->
+<!--            </el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="处理建议" prop="handleSuggest">-->
+<!--          <el-input v-model="form.handleSuggest" type="textarea" disabled/>-->
+<!--        </el-form-item>-->
         <!--        <el-form-item label="通知状态" prop="noticeStatus">-->
         <!--          <el-radio-group v-model="form.noticeStatus" disabled>-->
         <!--            <el-radio-->
@@ -298,11 +298,11 @@
         <!--          </el-radio-group>-->
         <!--        </el-form-item>-->
         <el-form-item label="原因分析" prop="causeAnalysis">
-          <el-input v-model="form.causeAnalysis" type="textarea" placeholder="请输入内容"/>
+          <el-input v-model="form.causeAnalysis" type="textarea" placeholder="请输入原因分析"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"/>
         </el-form-item>
-        <!--        <el-form-item label="备注" prop="remark">-->
-        <!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>-->
-        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">处 理</el-button>
@@ -396,23 +396,23 @@ export default {
         {key: 4, label: `报警结束时间`, visible: true},
         {key: 5, label: `报警持续时间(ms)`, visible: true},
         {key: 6, label: `报警原因`, visible: true},
-        {key: 7, label: `报警数据`, visible: true},
+        {key: 7, label: `报警数据`, visible: false},
         {key: 8, label: `报警状态`, visible: true},
-        {key: 9, label: `处理建议`, visible: true},
-        {key: 10, label: `通知状态`, visible: true},
-        {key: 11, label: `处理人员`, visible: true},
-        {key: 12, label: `处理时间`, visible: true},
+        {key: 9, label: `处理建议`, visible: false},
+        {key: 10, label: `通知状态`, visible: false},
+        {key: 11, label: `处理人员`, visible: false},
+        {key: 12, label: `处理时间`, visible: false},
         {key: 13, label: `原因分析`, visible: true},
-        {key: 14, label: `备注`, visible: false},
-        {key: 15, label: `创建人`, visible: true},
-        {key: 16, label: `创建时间`, visible: true},
-        {key: 17, label: `更新人`, visible: true},
-        {key: 18, label: `更新时间`, visible: true},
-        {key: 19, label: `报警类型`, visible: true},
-        {key: 20, label: `报警级别`, visible: true},
-        {key: 21, label: `通知方式`, visible: true},
+        {key: 14, label: `备注`, visible: true},
+        {key: 15, label: `创建人`, visible: false},
+        {key: 16, label: `创建时间`, visible: false},
+        {key: 17, label: `更新人`, visible: false},
+        {key: 18, label: `更新时间`, visible: false},
+        {key: 19, label: `报警类型`, visible: false},
+        {key: 20, label: `报警级别`, visible: false},
+        {key: 21, label: `通知方式`, visible: false},
         {key: 22, label: `自动恢复标识`, visible: false},
-        {key: 23, label: `报警状态字`, visible: true},
+        {key: 23, label: `报警状态字`, visible: false},
       ],
       //设备名称选项
       deviceLedgerList: []
diff --git a/src/views/dms/shutDownRecord/index.vue b/src/views/dms/shutDownRecord/index.vue
index 9fd79f8..0432498 100644
--- a/src/views/dms/shutDownRecord/index.vue
+++ b/src/views/dms/shutDownRecord/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备ID" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="设备ID" prop="deviceId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.deviceId"-->
+<!--          placeholder="请输入设备ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="停机原因" prop="shutReason">
         <el-input
           v-model="queryParams.shutReason"
@@ -116,7 +116,18 @@
     <el-table v-loading="loading" :data="shutDownList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="主键标识;scada上报的记录" align="center" prop="recordShutDownId" />-->
-      <el-table-column label="设备ID" align="center" prop="deviceId" />
+      <el-table-column label="设备" align="center" prop="deviceName" >
+        <template slot-scope="scope">
+          <span>
+            v-for="(item, index) in ledgerList"
+              :key="index"
+              :value="item.ledgerList"
+              v-if="scope.row.deviceId == item.deviceId"
+              >
+                {{ item.deviceId }}
+          </span>
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="设备名称" align="center" prop="deviceId" >-->
 <!--        <template slot-scope="scope">-->
 <!--            <span-->