Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -374,7 +374,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                 },
                 grid: [{
                     top: 20,
-                    bottom: 35,
+                    bottom: 45,
                     left: 30,
                     right: 5
                 }],
@@ -385,7 +385,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                         color: '#333',
                         show: true,
                         interval:0,
-                        rotate:20
+                        rotate:15
                     },
                     axisLine: {
                         lineStyle: {

@@ -195,7 +195,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         //获取属性值
         function addUserProperty() {
             var arr = [];
-            var $inputs = $("#user_property_html_id").find("input");
+            var $inputs = $("#user_property_html_id").find(".input");
             $.each($inputs, function (i, e) {
                 var obj = {
                     id: $(e).attr("data-id"),
@@ -207,6 +207,33 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 };
                 arr.push(obj)
             })
+            console.log("arr-$inputs",arr)
+            // Start 获取select的值 LSQ 2021/12/28 14:29 TODO
+            var $selects = $("#user_property_html_id").find(".select");
+            $.each($selects, function (i, e) {
+                var obj = {
+                    id: $(e).attr("data-id"),
+                    username: $(e).attr("data-username"),
+                    property: $(e).attr("data-property"),
+                    value: $(e).val(),
+                    sort: $(e).attr("data-sort"),
+                    remark: $(e).attr("data-remark")
+                };
+                arr.push(obj)
+            })
+            var $textareas = $("#user_property_html_id").find(".textarea");
+            $.each($textareas, function (i, e) {
+                var obj = {
+                    id: $(e).attr("data-id"),
+                    username: $(e).attr("data-username"),
+                    property: $(e).attr("data-property"),
+                    value: $(e).val(),
+                    sort: $(e).attr("data-sort"),
+                    remark: $(e).attr("data-remark")
+                };
+                arr.push(obj)
+            })
+            //End LSQ 2021/12/28 14:50 TODO
             return arr;
         }
 
@@ -234,27 +261,83 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             var rowTail = '</div>';
             var content = '';
             $.each(propertyList, function (i, v) {
+                // Start 根据字典配置后缀展示输入框，单选框，文本框 LSQ 2021/12/28 16:34 TODO
+                var str='';
+                var dropStrIndex=v.ddicCode.indexOf('_drop_');
+                var textareaStrIndex=v.ddicCode.indexOf('_textarea_');
+                if(textareaStrIndex!=-1){
+                    str='<textarea data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-textarea textarea" name="' + v.ddicCode + '"></textarea>'
+
+                }else if(dropStrIndex!=-1){
+                    var selectOption='';
+                    var strArr=v.ddicCode.split('_drop_');
+                    if(strArr && strArr.length>1){
+                        var strArrEle=strArr[1].split('_');
+                        if(strArrEle[0]=='yes'){
+                            selectOption='    <option value="0">否</option>'+
+                                '   <option value="1">是</option>';
+                        }else if(strArrEle[0]=='long'){
+                            selectOption='    <option value="0">长期</option>'+
+                                '   <option value="1">短期</option>';
+                        }else{
+                            selectOption='    <option value="0">否</option>'+
+                                '   <option value="1">是</option>';
+                        }
+                    }
+
+                    str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+
+                        '    <option value="" style="display:none;"></option>'+ selectOption +
+                        '</select>';
+                }else{
+                    str='<input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input input" name="' + v.ddicCode + '" autocomplete="off">'
+                }
                 var property = '        <div class="layui-inline ">' +
                     '            <label class="layui-form-label">' + v.ddicName + '</label>' +
-                    '            <div class="layui-input-inline">' +
-                    '                <input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input" name="' + v.ddicCode + '" autocomplete="off">' +
+                    '            <div class="layui-input-inline">' +str+
+                    // '                <input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input" name="' + v.ddicCode + '" autocomplete="off">' +
                     '            </div>' +
                     '        </div>';
+
+                if(textareaStrIndex!=-1){
+                    if (i % 1 == 0 ) {
+                        content += rowTail;
+                    }
+                    if (i % 1 == 0) {//需要添加表头
+                        content += rowHead + property;
+                    } else {//
+                        content += property;
+                    }
+                }else{
                     if (i % 2 == 0 && i != 0) {
                         content += rowTail;
                     }
+
                     if (i % 2 == 0) {//需要添加表头
                         content += rowHead + property;
                     } else {//
                         content += property;
                     }
+                }
+                //End LSQ 2021/12/28 16:35 TODO
+
+               /* if (i % 2 == 0 && i != 0) {
+                    content += rowTail;
+                }
+
+                if (i % 2 == 0) {//需要添加表头
+                    content += rowHead + property;
+                } else {//
+                    content += property;
+                }*/
+
+
             });
             $('#user_property_html_id').append(content);
         }
 
         //回显属性信息
         function evaluation(list){
-            var $inputs = $("#user_property_html_id").find("input");
+            var $inputs = $("#user_property_html_id").find(".input");
             $.each($inputs, function (i, e) {
                 var $that=$(this);
                 $.each(list, function (index,v) {
@@ -267,6 +350,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     }
                 });
             });
+            // Start 回显select的值 LSQ 2021/12/28 14:55 TODO
+            var $selects = $("#user_property_html_id").find(".select");
+            $.each($selects, function (i, e) {
+                var $that=$(this);
+                $.each(list, function (index,v) {
+                    if($that.attr('data-property')== v.property){
+                        $that.attr("data-id",v.id);
+                        $that.attr("data-username",v.username);
+                        $that.val(v.value);
+                        $that.attr("data-sort",v.sort);
+                        $that.attr("data-remark",v.remark);
+                    }
+                });
+            });
+            var $textarea = $("#user_property_html_id").find(".textarea");
+            $.each($textarea, function (i, e) {
+                var $that=$(this);
+                $.each(list, function (index,v) {
+                    if($that.attr('data-property')== v.property){
+                        $that.attr("data-id",v.id);
+                        $that.attr("data-username",v.username);
+                        $that.val(v.value);
+                        $that.attr("data-sort",v.sort);
+                        $that.attr("data-remark",v.remark);
+                    }
+                });
+            });
+            //End LSQ 2021/12/28 14:55 TODO
         }
     })
 })

@@ -467,7 +467,11 @@ layui.extend({
                         new msgTips({
                             dom: ".right-bottom-tips",
                             title: title,
-                            message: `<p style="line-height: 30px;background: url(${imgUrl}) no-repeat;background-size: 70%;height: 178px;padding: 10px;background-position-x: right;padding-left: 106px;padding-top: 96px;">${content}</p>`,
+                            message: `<p style="line-height: 24px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;padding: 10px;background-position-x: right;padding-left: 29px;padding-top: 145px;">
+                                            <span class="title closeFault" style="position: relative;top: -75px;left: 170px;">X</span>
+                                            <span style="position: relative;left: 35px;top: -21px; font-weight: bold;">${title}</span>
+                                            ${content}
+                                      </p>`,
                             duration: 10000,
                             space: 10,
                             firstSpace: 8,
@@ -485,6 +489,7 @@ layui.extend({
                                 //}
                             }
                         })
+
                     }, delay);
                 }else{
                     setTimeout(function () {

@@ -27,7 +27,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
             minus = "";
         }
 
-        if ($('.ez_tips').size() == 0 || $('.ez_tips').size() < options.limit) {
+        if (($('.ez_tips').size() == 0 || $('.ez_tips').size() < options.limit) && (options.toastType!='faultinfo' && options.toastType!='faultprogress' && options.toastType!='faultover')) {
 
             var container = "<div class='ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%)></div>"
 
@@ -97,13 +97,16 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
             },1);
             $(options.dom).append(newContainer);
         } else if(options.toastType=='faultinfo'||options.toastType=='faultprogress'||options.toastType=='faultover'){
-            var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;bottom: 319px;transform:translateX("+minus+"110%);></div>"
 
-            var head = "<div class='faultTitle faultClearfix'><i class='faultTips_icon_l fl'></i><i class='FaultTips_icon_r close'></i></div>";
+            var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%);width: 226px;bottom: 8px !important; ></div>"
+
+            // var head = "<div class='faultTitle faultClearfix'><i class='faultTips_icon_l fl'></i><i class='FaultTips_icon_r close'></i></div>";
+            var head = "";
 
             var content = "<div class='FaultTips-message' style='cursor: pointer; display: flex;justify-content: flex-end;'></div>"
 
-            var newHead = $(head).append(options.title);
+            // var newHead = $(head).append(options.title);
+            var newHead = "";
 
             var newContent = $(content).append(options.message)
 
@@ -122,7 +125,9 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
                 var times = Date.now();
                 $(newContainer).css({
                     'transition-timing-function':options.timingFun,
-                    'width':options.width,
+                    // 'width':options.width,
+                    'width':'226px',
+                    'bottom':'8px'
                 });
                 var height = $(newContainer).outerHeight(true);
                 var len = $('.fault_ez_tips').size();
@@ -159,6 +164,13 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
                         $(newContainer).remove();
                     },700)
                 });
+                $(newContainer).find(".closeFault").click(function (event) {
+                    event.stopPropagation();
+                    $(newContainer).removeClass('active');
+                    setTimeout(function () {
+                        $(newContainer).remove();
+                    },700)
+                })
                 if (options.action) {
                     $(newContent).css('cursor','pointer').on(options.type,options.action);
                 }

@@ -7893,3 +7893,19 @@ form[lay-filter="activewarning-form"] .layui-inline {
 .padding-left-10{
     padding-left:10px;
 }
+/* Start 自定义select的样式*/
+.select-input-my+.layui-form-select .layui-select-title .layui-input::-webkit-input-placeholder {
+    color:#999;
+}
+.select-input-my+.layui-form-select .layui-select-title .layui-input::-moz-placeholder {
+    color:#999;
+}
+.select-input-my+.layui-form-select .layui-select-title .layui-input::-ms-input-placeholder {
+    color:#999;
+}
+
+.select-input-my+.layui-form-select dl dd.layui-this{
+    color:#666666;
+    background-color:rgb(242, 242, 242);
+}
+/* End 自定义select的样式*/

@@ -343,7 +343,15 @@
             {{# }); }}
         </div>
     </div>
-    <span class="index-banner-count">业务共 {{d.count}} 个</span>
+<!--    <span class="index-banner-count">业务共 {{d.count}} 个</span>-->
+    <!--业务统计数更改
+        LSQ 2021/12/28 11:25
+    -->
+    {{# if(d.data[0] && d.data[0].bizList ) { }}
+    <span class="index-banner-count">业务共 {{d.data[0].bizList.length}} 个</span>
+    {{# }else{ }}
+    <span class="index-banner-count">业务共 0 个</span>
+    {{# } }}
 </script>
 
 <!--资源类型监控情况-->

@@ -42,7 +42,7 @@ export default {
                         that.$global.showMsg("删除成功！");
                         that.diagnosisData.splice(index,1);
                     }else{
-                        that.$global.showMsg("删除失败！",'warning')
+                        that.$global.showMsg(res.msg,'warning')
                     }
 
                 })