Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-xwx

@@ -229,12 +229,24 @@ layui.extend({
             var loginIndex = 'default';
             // let loginSkin = sessionStorage.getItem("loginSkin");
             //lsq 从cookie中获取登录皮肤 2022-03-31
-            let loginSkin = admin.getCookie("loginSkin");
-            if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){
-                loginIndex = loginSkin;
-            }
-
-            path = path + '-' + loginIndex;
+            //start lsq 从配置文件中获取登录皮肤 2022-06-07
+            // let loginSkin = admin.getCookie("loginSkin");
+            // http.get(window.location.origin + '/config/getConfig',{configName:'url'},function(res){
+            $.ajax({
+                url: '/config/getConfig',
+                data: {
+                    configName: 'login'
+                },
+                async: false,
+                success(response) {
+                    let loginSkin = response.skin;
+                    if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){
+                        loginIndex = loginSkin;
+                    }
+                    path = path + '-' + loginIndex;
+                }
+            });
+            //end lsq 2022-06-07
         }
         container.render(path).done(function(){
         admin.pageType = 'alone';

@@ -23,6 +23,9 @@ url:
   jimuReport: http://192.168.0.41:8085
   #aj设计器
   ajWeb: http://192.168.0.75:6677
+login:
+  # 默认:default,个性化布局:default，skin1，skin2
+  skin: default
 config:
   layer:
     load:

@@ -275,13 +275,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 // start lsq 个人信息修改 扩展中的登录皮肤输入框改为下拉选择 2022-03-12
                 let str='';
                 if(v.ddicCode=="loginSkin"){
-                    var selectOption='    <option value="default">默认布局</option>'+
+                    rowHead = '';
+                    rowTail = '';
+                }else{
+                    rowHead = '<div class="layui-form-item">';
+                    rowTail = '</div>';
+                }
+                if(v.ddicCode=="loginSkin"){
+                    //lsq 只有管理员有权限更改登录皮肤，全局生效，注释，改用配置文件配置，2022-06-07
+                    /*var selectOption='    <option value="default">默认布局</option>'+
                                 '   <option value="skin1">skin1</option>'+
                                 '   <option value="skin2">skin2</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>';
+                        '</select>';*/
                 }else if(v.ddicCode=="userLayout"){
                     var selectOption='    <option value="layout">默认布局</option>'+
                         '   <option value="layout-nx">layout-nx</option>';
@@ -294,17 +302,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
 
                 }
 
-                var property = '        <div class="layui-inline ">' +
-                    '            <label class="layui-form-label">' + v.ddicName + '</label>' +
-                    '            <div class="layui-input-inline">' +
-                    str+
-                    '            </div>' +
-                    '        </div>';
+                var property = '' ;
+                    if(v.ddicCode!="loginSkin"){
+                        property+='        <div class="layui-inline ">'+
+                            ' <label class="layui-form-label">' + v.ddicName + '</label>';
+                        property+= '            <div class="layui-input-inline">' +
+                            str+
+                            '            </div>' +
+                            '        </div>';
+                    }
+
                 //end lsq 2022-03-12
                 if (i % 2 == 0 && i != 0) {
                     content += rowTail;
                 }
-                if (i % 2 == 0) {//需要添加表头
+                //lsq (|| i==1)注释掉了登录皮肤，所有第一个要占一行 2022-06-07
+                if (i % 2 == 0 || i==1) {//需要添加表头
                     content += rowHead + property;
                 } else {//
                     content += property;