Merge branch 'master-500-dev-XuHaoJie' into 'master-500-dev'

青海-活动告警-告警设置优化弹窗和提示



See merge request !442

@@ -3616,7 +3616,16 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                             <option value="1">=选择告警策略=</option>
                         </select>
                     </div>
-                 <div class="layui-form-mid layui-word-aux"><a style="height: 50px;line-height: 50px;" class="layui-btn layui-btn-normal" id="form_detail_add_policy"><i class="layui-icon">&#xe654;</i></a></div>
+                 <div style="display: flex;">
+                        <div class="layui-form-mid layui-word-aux">
+                            <a style="height: 50px;line-height: 50px;" class="layui-btn layui-btn-normal" id="form_detail_add_policy"><i class="layui-icon">&#xe654;</i></a>
+                        </div>
+                     <div class="layui-form-mid layui-word-aux" id="show_corn_info_policy"
+                        style="padding: 0!important;position: relative;line-height: 38px;display: flex;justify-content: center;margin: 0px;margin-left: 5px;">
+                            <i class="layui-icon form-btn-icon">&#xe702;</i>
+                      </div>
+                 </div>
+                 
                 </div>
                 <div class="layui-form-item icon-label-item"> 
                     <label class="layui-form-label" style="text-align: center !important;width: 120px">告警订阅</label>
@@ -3661,6 +3670,25 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
             bindAlarmPolicyList(undefined,params.kpiId);
             bindAlarmSubscribeList();
 
+            $('#show_corn_info_policy').unbind("click").on("click",function (){
+                layer.open({
+                    type: 1
+                    , title: '告警策略'
+                    , closeBtn: 1
+                    , area: ['20%', '20%']
+                    , shade: 0.8
+                    , id: 'lay_cron_detail_add_policy' //设定一个id，防止重复弹出
+                    , content: '<div id="icon_tips_alarm_Content" style="color:#000000">\n' +
+                        '        <p style="margin: 10px auto; padding: 0px;">\n' +
+                        '            <strong style="margin: 0px; padding: 0px;"><span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(255, 0, 0);">重点说明</span></strong>\n' +
+                        '        </p>\n' +
+                        '        <p style="margin: 10px auto; padding: 0px;">\n' +
+                        '            <span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(255, 0, 0);"><span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(0, 0, 255);"><span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(0, 0, 0);">（1）</span></span><strong style="margin: 0px; padding: 0px;"><span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(0, 0, 255);"></span></strong>&nbsp;&nbsp;</span>&nbsp;策略类型只包含非默认的策略' +
+                        '        </p>\n' +
+                        '    </div>'
+                });
+            });
+
             //自定义告警策略
             $("#form_detail_add_policy").unbind("click").on("click",function (){
                 params.from = 'detail';