diff --git a/js/pages/alarmMge/alarmMge.js b/js/pages/alarmMge/alarmMge.js
index bd7250a..bc2f9a0 100644
--- a/js/pages/alarmMge/alarmMge.js
+++ b/js/pages/alarmMge/alarmMge.js
@@ -12,6 +12,7 @@ layui.use(['layer','table','form','jquery'], function () {
 
 	table.on('tool(test)', function (obj) {
 		var data = obj.data;
+		console.log(data)
 		// console.log(data,'-----row-----')
 		if (obj.event === 'edit') {
 			layer.open({
@@ -82,7 +83,7 @@ layui.use(['layer','table','form','jquery'], function () {
 				area: '600px;',
 				id: 'LAY_layuipro1', //设定一个id，防止重复弹出
 				resize: false,
-				btn: ['确定'],
+				btn: ['确定', '取消'],
 				btnAlign: 'c',
 				moveType: 1, //拖拽模式，0或者1
 				skin:"layui-layer-molv",
@@ -116,11 +117,83 @@ layui.use(['layer','table','form','jquery'], function () {
 					layer.close('LAY_layuipro1')
 				}
 			});
+		}else if(obj.event === 'upload'){
+			layer.open({
+				type: 1,
+				title: '推送', //显示标题栏
+				closeBtn: 1,
+				area: '600px;',
+				id: 'LAY_layuipro2', //设定一个id，防止重复弹出
+				resize: false,
+				btn: ['推送', '取消'],
+				btnAlign: 'c',
+				moveType: 1, //拖拽模式，0或者1
+				skin:"layui-layer-molv",
+				content: $("#upload"),
+				success: function (layero) {
+					$(':focus').blur();
+					// 添加form标识
+					layero.addClass('layui-form');
+					// 将保存按钮改变成提交按钮
+					layero.find('.layui-layer-btn0').attr({
+						'lay-filter': 'formDemo',
+						'lay-submit': ''
+					});
+					// $("#form_info")[0].reset();
+					console.log(data)
+					$("#warnContentTwo").val(data.warnContent);
+					$("#proName").val(data.proName);
+					$("#warnTime").val(data.warnTime);
+					if(data.status=='0'){
+						$("#status").val('未处理');
+					}else if(data.status=='1'){
+						$("#status").val('告警');
+					}else if(data.status=='2'){	
+						$("#status").val('未告警');	
+					}
+					form.render();
+				},
+				yes: function (layero, index) {
+					form.on('submit(formDemo)', function (Fdata) {
+						//表单数据formData
+						var formData = Fdata.field;
+						// console.log(formData,'-----formData-----')
+						const url = commonUrl + "screen/largeScreen/alarmMge/warnUpload";
+						const params = {
+							"warnId": data.warnId,
+							"warnContent": formData.warnContent,
+							"status": data.status,
+							"proName": formData.proName,
+							"warnTime": formData.warnTime,
+						}
+						// console.log(params)
+						let encryptStr = encryptCBC(JSON.stringify(params));
+						ajaxRequest(url, "POST", encryptStr, true, function () {
+						}, function (result) {
+							// console.log(result);
+							if (result.code === 200) {
+								layer.close('LAY_layuipro2')
+								layer.msg(result.msg, { icon: 1 });
+								getQueryList()
+							} else if (result.code === 500) {
+								layer.msg(result.msg, { icon: 2 });
+							}else if(result.code === 401){
+								
+							}
+						}, function (xhr, status, error) {
+								error(xhr, status, error)
+							}, "application/json",aqEnnable);
+					});
+				},
+				cancel: function () {
+					// 右上角关闭事件的逻辑
+					layer.close('LAY_layuipro2')
+				}
+			});
+			
 		}
 	});
 
-
-
 	
 });
 
diff --git a/pages/alarmMge/alarmMge.html b/pages/alarmMge/alarmMge.html
index f73ea80..40b5285 100644
--- a/pages/alarmMge/alarmMge.html
+++ b/pages/alarmMge/alarmMge.html
@@ -92,6 +92,38 @@
 				<!-- <button style="display: none" id="submit" class="layui-btn" lay-submit lay-filter="submit">提交</button> -->
 			</form>
 		</div>
+
+				<!-- 弹窗 -->
+				<div style="display: none" id="upload" class="alarmDialog">
+					<form class="layui-form" id="form_info" lay-filter="alarmForm" style="width: 100%;"  onsubmit="return false;">
+						<div class="layui-form-item">
+							<label class="layui-form-label" >工程名称:</label>
+							<div class="layui-input-block">
+							  <input type="text" name="proName" id="proName" disabled   autocomplete="off" class="layui-input" maxlength="100" style="color: black;">
+							</div>
+						</div>
+						<div class="layui-form-item">
+							<label class="layui-form-label">告警内容:</label>
+							<div class="layui-input-block">
+							  <input type="text" name="warnContentTwo" id="warnContentTwo" disabled   autocomplete="off" class="layui-input" maxlength="100" style="color: black;">
+							</div>
+						</div>
+						<div class="layui-form-item">
+							<label class="layui-form-label">告警时间:</label>
+							<div class="layui-input-block">
+							  <input type="text" name="warnTime" id="warnTime" disabled   autocomplete="off" class="layui-input" maxlength="100" style="color: black;">
+							</div>
+						</div>
+						<div class="layui-form-item">
+							<label class="layui-form-label">处理状态:</label>
+							<div class="layui-input-block">
+							  <input type="text" name="status" id="status" disabled  autocomplete="off" class="layui-input" maxlength="100" style="color: black;">
+							</div>
+						</div>
+						<!-- <button style="display: none" id="submit" class="layui-btn" lay-submit lay-filter="submit">提交</button> -->
+					</form>
+				</div>
+
 		
 	</body>
 	<script type="text/html" id="barDemo">
@@ -100,6 +132,7 @@
 		{{#  }else{ }}
 		<a class="layui-btn" lay-event="view">查看</a>
 		{{#  } }}
+		<a class="layui-btn" lay-event="upload">推送</a>
     </script>
 	<script src="../../js/pages/alarmMge/alarmMge.js" type="text/javascript"></script>
 </html>
\ No newline at end of file