Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

backendApi/modules/v1/controllers/AtlasController.php

@@ -92,7 +92,7 @@ class AtlasController extends BaseController {
                 'PERIOD_AT' => $baseInfo['PERIOD_AT'],
                 'DEC_LV_NAME' => $decLevelConfig[$baseInfo['DEC_LV']]['LEVEL_NAME'],
                 'EMP_LV_NAME' => isset($empLevelConfig[$baseInfo['EMP_LV']])?$empLevelConfig[$baseInfo['EMP_LV']]['LEVEL_NAME']:'',
-                'STAR_LV_NAME' => $starLevelConfig[$baseInfo['STAR_LV']]['LEVEL_NAME'],
+                'STAR_LV_NAME' => isset($starLevelConfig[$baseInfo['STAR_LV']])?$starLevelConfig[$baseInfo['STAR_LV']]['LEVEL_NAME']:'',
                 'leaf' => false,
                 'icon' => 'el-icon-user-solid',
                 'children' => null,

frontendEle/src/views/login/index.vue

@@ -224,9 +224,9 @@ export default {
     background-color: #0c195d !important;
     border-color: #0c195d !important;
   }
-  .el-input-group--prepend .el-input__inner, .el-input-group__append{border: none;background: none;border-radius: 0;width:94%;float: right;display: block; }
+  .el-input-group--prepend .el-input__inner, .el-input-group__append{/*border: none;*/background: none;border-radius: 0;/*width:94%;*/float: right;display: block; }
   .border-bottom {border-bottom:2px #0c195d solid;}
-  .el-input-group__append, .el-input-group__prepend{border: none;}
+  /*.el-input-group__append, .el-input-group__prepend{border: none;}*/
   input:-webkit-autofill {
     transition: background-color 5000s ease-in-out 0s;
   }