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

青海-域视图-卡片上样式问题调整



See merge request !450

@@ -238,7 +238,6 @@ layui.extend({
         let path = router.path.join('/')
         if(pathURL.indexOf('/user/login') != -1){
             var loginIndex = 'default';
-            debugger
             let loginSkin = sessionStorage.getItem("loginSkin");
             if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){
                 loginIndex = loginSkin;

@@ -185,7 +185,7 @@
     {{#  layui.each(d.list, function(index, item){ }}
     <div class="layui-col-md4" data-restype="{{item.resType}}">
         <div class="layui-cols-items">
-            <div class="layui-card-header">{{ item.resTypeName }}</div>
+            <div class="layui-card-header" style="height: 460px;height: 50px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" lay-tips="{{ item.resTypeName }}">{{ item.resTypeName }}</div>
             <div class="layui-card-body card-main">
                 <ul>
                     <li>