monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 29beb0d16e67fd255fa5a7d475f1836f6cd0ac09 2 parents ea089559 ae743e8f

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

Inline Side-by-side
Showing 5 changed files with 34 additions and 17 deletions
@@ -11,14 +11,26 @@ layui.define(['sessions', 'form', 'common'],function (exports) { @@ -11,14 +11,26 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
11 , sessions = layui.sessions; 11 , sessions = layui.sessions;
12 12
13 var uuid = Math.uuid(); 13 var uuid = Math.uuid();
  14 + var lockNum = 10;//默认十次登录冻结
  15 + //获取默认配置
  16 + $.ajax({
  17 + url: '/config/getConfig',
  18 + data: {
  19 + configName: 'config.login'
  20 + },
  21 + async: false,
  22 + success(response) {
  23 + lockNum = response.lockNum;
  24 + }
  25 + });
14 26
15 //如果密码输入错误三次，第四次开启验证码 27 //如果密码输入错误三次，第四次开启验证码
16 - if(sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") >= 3){  
17 - if (sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") > 5){ 28 + if (sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") >= 3) {
  29 + if (sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") > 5) {
18 layer.alert('账号已被锁定，请联系管理员！'); 30 layer.alert('账号已被锁定，请联系管理员！');
19 } 31 }
20 //图形验证码 32 //图形验证码
21 - $('.login-captcha').attr("src", common.domainName + "/api-auth/validata/code/"+uuid); 33 + $('.login-captcha').attr("src", common.domainName + "/api-auth/validata/code/" + uuid);
22 $('.login-captcha').attr("style", ""); 34 $('.login-captcha').attr("style", "");
23 //显示验证码区域 35 //显示验证码区域
24 $("#validCodeLine").show(); 36 $("#validCodeLine").show();
@@ -290,10 +302,10 @@ layui.define(['sessions', 'form', 'common'],function (exports) { @@ -290,10 +302,10 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
290 if (field.username === 'admin' || field.username === 'root'){ //admin用户于root用户不锁定 302 if (field.username === 'admin' || field.username === 'root'){ //admin用户于root用户不锁定
291 return; 303 return;
292 } 304 }
293 - if (3 <= loginErrorNum < 5){  
294 - $('.login-tips-span').html('已错误'+loginErrorNum+'次,再错误'+(5-loginErrorNum)+'次账号将被冻结！'); 305 + if (3 <= loginErrorNum < lockNum){
  306 + $('.login-tips-span').html('已错误'+loginErrorNum+'次,再错误'+(lockNum-loginErrorNum)+'次账号将被冻结！');
295 } 307 }
296 - if (sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") >= 5){ 308 + if (sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") >= lockNum){
297 $.ajax({ 309 $.ajax({
298 type : 'get', 310 type : 'get',
299 url : common.domainName + '/api-user/users/setDisabled?username='+ field.username, 311 url : common.domainName + '/api-user/users/setDisabled?username='+ field.username,
@@ -37,3 +37,6 @@ config: @@ -37,3 +37,6 @@ config:
37 tingyun: 37 tingyun:
38 api_key: aZipZbC18BhpG5GrjtiFAtThL1I0OUfn 38 api_key: aZipZbC18BhpG5GrjtiFAtThL1I0OUfn
39 secret_key: nbxay44wx8c3x4n5wcxe63mp87a72xed 39 secret_key: nbxay44wx8c3x4n5wcxe63mp87a72xed
  40 + login:
  41 + ## 冻结账号的次数 默认为10
  42 + lockNum: 10
@@ -155,9 +155,10 @@ @@ -155,9 +155,10 @@
155 </el-option> 155 </el-option>
156 </el-select> 156 </el-select>
157 </div> 157 </div>
158 - <div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;">  
159 - <span>比对分析场景</span>  
160 - </div> 158 +<!-- xwx 2021-12-13注 基于任务167注-->
  159 +<!-- <div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;">-->
  160 +<!-- <span>比对分析场景</span>-->
  161 +<!-- </div>-->
161 <div style="padding: 3px 10px;"> 162 <div style="padding: 3px 10px;">
162 <el-input v-model="form.scene.name" placeholder="请输入场景名称"/> 163 <el-input v-model="form.scene.name" placeholder="请输入场景名称"/>
163 </div> 164 </div>
@@ -41,12 +41,12 @@ @@ -41,12 +41,12 @@
41 <el-col :span="3"> 41 <el-col :span="3">
42 <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==5}]" @click="apmMonitorFunc(5)" shadow="hover"><span class="card-name">APM</span></el-card> 42 <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==5}]" @click="apmMonitorFunc(5)" shadow="hover"><span class="card-name">APM</span></el-card>
43 </el-col> 43 </el-col>
44 - <el-col :span="3">  
45 - <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==6}]" @click="logDetectionFunc(6)" shadow="hover"><span class="card-name">日志检测</span></el-card>  
46 - </el-col>  
47 - <el-col :span="3">  
48 - <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==7}]" @click="subscriptionReportFunc(7)" shadow="hover"><span class="card-name">报告订阅</span></el-card>  
49 - </el-col> 44 +<!-- <el-col :span="3">-->
  45 +<!-- <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==6}]" @click="logDetectionFunc(6)" shadow="hover"><span class="card-name">日志检测</span></el-card>-->
  46 +<!-- </el-col>-->
  47 +<!-- <el-col :span="3">-->
  48 +<!-- <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==7}]" @click="subscriptionReportFunc(7)" shadow="hover"><span class="card-name">报告订阅</span></el-card>-->
  49 +<!-- </el-col>-->
50 </el-row> 50 </el-row>
51 </div> 51 </div>
52 52
@@ -92,6 +92,7 @@ @@ -92,6 +92,7 @@
92 :key="item.value" 92 :key="item.value"
93 :label="item.name" 93 :label="item.name"
94 :value="item.value" 94 :value="item.value"
  95 +
95 > 96 >
96 </el-option> 97 </el-option>
97 </el-select> 98 </el-select>
@@ -171,13 +171,13 @@ export default { @@ -171,13 +171,13 @@ export default {
171 value:'3' 171 value:'3'
172 }]) 172 }])
173 //告警级别值 173 //告警级别值
174 - let triggerValue=Vue.ref('1'); 174 + let triggerValue=Vue.ref('3');
175 //故障定义 告警列表 175 //故障定义 告警列表
176 let alarmDataList=Vue.ref([{ 176 let alarmDataList=Vue.ref([{
177 kpiId:'', 177 kpiId:'',
178 alarmList:[], 178 alarmList:[],
179 alarmLevel:[], 179 alarmLevel:[],
180 - triggerValue:'1' 180 + triggerValue:'3'
181 }]); 181 }]);
182 //添加告警设置列表 182 //添加告警设置列表
183 let addAlarmList=()=>{ 183 let addAlarmList=()=>{