diff --git a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/knowledge/index.html b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/knowledge/index.html
index 5c32094..6cce420 100644
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/knowledge/index.html
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/knowledge/index.html
@@ -33,10 +33,8 @@
                 </template>
                 <template #tools="{scope}">
                     <div class="list-handle">
-                        <span class="icon-bg">
 <!--                            <i class="el-icon-delete" title="处理" @click="handleDelete(scope.row)"></i>-->
-                            <i class="el-icon-view" title="查看" @click="handleView(scope.row)"></i>
-                        </span>
+                            <el-button  @click="handleView(scope.row)" size="mini">查看</el-button>
                     </div>
                 </template>
             </cm-table-page>
diff --git a/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js b/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
index d549f35..9d87b1a 100644
--- a/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
+++ b/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
@@ -259,6 +259,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
                         '<input type="radio" name="noticeFlag" value="true" title="是" >&nbsp;是' +
                         '<input type="radio" name="noticeFlag" value="false" title="否" checked="" style="margin-left: 20px;">&nbsp;否</div> ' //这里content是一个普通的String
                     , yes: function () {
+                        var loading = layer.load(2);
                         admin.req({
                             url: common.domainName + '/api-web/home/alarm/clear'
                             , type: "post"
@@ -269,6 +270,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
                                 noticeFlag: $('input[name="noticeFlag"]:checked').val()
                             }
                             , done: function (res) {
+                                layer.close(loading);
                                 //如果消除成功，关闭弹出框然后重新加载页面
                                 if (res.success) {
                                     layer.close(index);
diff --git a/hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js b/hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js
index bbb25ad..804cc86 100644
--- a/hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js
+++ b/hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js
@@ -209,6 +209,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
                 }
                 $('td[data-field="alarmNo"]').css('color','black');
                 layer.prompt({title: '恢复说明(必填)', formType: 2}, function (text, index) {
+                    var loading = layer.load(2);
                     admin.req({
                         url: common.domainName + '/api-web/home/alarm/resume'
                         , type: "post"
@@ -220,6 +221,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
                             access_token: accessToken
                         }
                         , done: function (res) {
+                            layer.close(loading);
                             //如果消除成功，关闭弹出框然后重新加载页面
                             if (res.success) {
                                 layer.close(index);
@@ -318,10 +320,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
                     , {field: 'alarmTime', title: '首次告警时间', align: 'center', minWidth: 180, sort: true}
                     , {field: 'durationStr', title: '持续时间', align: 'center', width: 190}
                     , {
-                        title: '操作', align: 'center', minWidth: minWidthHandle,
+                        title: '操作', align: 'center', minWidth: 150,
                         templet: `<div>
                           
-                            <span history-data-warn-clear="{{d.id}}" class="layui-table-link">补录</span>
+                            <span history-data-warn-clear="{{d.primaryKey}}" class="layui-table-link">补录</span>
                              <span history-data-warn-view="{{d.id}}" class="layui-table-link">查看</span> 
                             <span history-data-warn-path="{{d.id}}" class="layui-table-link">轨迹</span>
                             </div>`
@@ -407,11 +409,12 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
 
                                     if(resArr){
                                         resArr.map(item=>{
-                                            if(item.id==$(this).attr('history-data-warn-clear')){
+                                            if(item.primaryKey==$(this).attr('history-data-warn-clear')){
                                                 paramsData.push(item);
                                             }
                                         })
                                     }
+                                    debugger
                                     let params=paramsData[0];
                                     for(let key in params){
                                         if(params[key]){
@@ -428,13 +431,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
                                         url: common.domainName + '/api-web/bAlarmManage/manageInto',
                                         type: "get",
                                         data: {
-                                            alarmId: params.id
+                                            alarmId: params.primaryKey,
+                                            alarm: "alarmHis"
                                         },
                                         done: function (data) {
-                                            debugger
                                             if(data.data && data.data.length>0){
                                                 //已存入了草稿
-                                                layer.msg('告警消除已存入草稿中了！', {icon: 2, time: 2000});
+                                                layer.msg('告警已补录', {icon: 2, time: 2000});
                                             }else{
                                                 layer.open({
                                                     title: ['告警消除', 'font-size:18px;'],