Merge branch 'bigdata' of gitlab.gongsibao.com:jiangyong/zhichan into bigdata

bigdata/app/front/vues/pages/gtbhome/gtbhome.css

 .gtb-home{
 .gtb-home{
     width: 100%;
     width: 100%;
     height: 100%;
     height: 100%;
-    background:url('/imgs/bkhome.png') no-repeat;
+    background:url('https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_239101574154954768201919171554768bkhome.png') no-repeat;
     background-size: 100% 100%;
     background-size: 100% 100%;
 
 
 }
 }

bigdata/app/front/vues/pages/gtbhome/gtbhome.html

@@ -18,7 +18,7 @@
         <div v-for="(item,key) in myapps" :key="key" class="app-child" :style="bgimg(item)" @click="goapplogin(item)" >
         <div v-for="(item,key) in myapps" :key="key" class="app-child" :style="bgimg(item)" @click="goapplogin(item)" >
             <img :src="item.logoUrl" alt="">
             <img :src="item.logoUrl" alt="">
             <div>{{item.name}}</div>
             <div>{{item.name}}</div>
-            <span @click.stop="systemsetting(item)" v-if="currentUser && currentUser.roles.indexOf(\'common\')>=0"  style="position: absolute;left:5px;top: 10px;font-size:20px;color:red;padding: 5px;cursor: pointer;"><i  class="el-icon-setting"></i></span>
+            <span @click.stop="systemsetting(item)" v-if="currentUser && currentUser.roles.indexOf(\'common\')>=0"  style="position: absolute;left:5px;top: 10px;font-size:20px;color:#fff;padding: 5px;cursor: pointer;"><i  class="el-icon-setting"></i></span>
         </div> 
         </div> 
     </div>
     </div>
 </div>
 </div>
\ No newline at end of file

bigdata/app/front/vues/pages/login/login.js

@@ -12,7 +12,7 @@
                 "colnum":1,
                 "colnum":1,
                  ctls:[
                  ctls:[
                    {"type":"input","label":"账号","prop":"userName","placeHolder":"请输入登录账号","style":"width:230px",rules:[  { "required": true, "message": ' ', "trigger": 'blur' },,]},
                    {"type":"input","label":"账号","prop":"userName","placeHolder":"请输入登录账号","style":"width:230px",rules:[  { "required": true, "message": ' ', "trigger": 'blur' },,]},
-                   {"type":"input","label":"密码","prop":"password","placeHolder":"请输入登录密码","style":"width:230px",rules:[ { "required": true, "message": ' ', "trigger": 'blur' },]},
+                   {"type":"password","label":"密码","prop":"password","placeHolder":"请输入登录密码","style":"width:230px",rules:[ { "required": true, "message": ' ', "trigger": 'blur' },]},
                    {"type":"btn","label":"开始登录","prop":"btnLogin","placeHolder":"请输入手机号","style":{"width":"150px","margin-left":"45px","margin-top":"20px"},"face":"warning"},
                    {"type":"btn","label":"开始登录","prop":"btnLogin","placeHolder":"请输入手机号","style":{"width":"150px","margin-left":"45px","margin-top":"20px"},"face":"warning"},
                 ]
                 ]
               },
               },

bigdata/app/front/vues/pages/tlogin/tlogin.css

@@ -5,7 +5,7 @@
     flex-direction: column;
     flex-direction: column;
     align-items: center;
     align-items: center;
     padding-top: 200px;
     padding-top: 200px;
-    background:url('/imgs/bklogin.png') no-repeat;
+    background:url('https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_81101574154972666201919171612666bklogin.png') no-repeat;
     background-size: 100% 100%;
     background-size: 100% 100%;
     box-sizing: border-box;
     box-sizing: border-box;
 }
 }