Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …
…master-v32-lushangqing
Showing
6 changed files
with
28 additions
and
29 deletions
| @@ -111,7 +111,7 @@ layui.extend({ | @@ -111,7 +111,7 @@ layui.extend({ | ||
| 111 | $.ajax({ | 111 | $.ajax({ |
| 112 | url: sessionStorage.getItem('domainName') + '/api-user/menus/current?type=1', | 112 | url: sessionStorage.getItem('domainName') + '/api-user/menus/current?type=1', |
| 113 | async: false, | 113 | async: false, |
| 114 | - data: {'type': '1',access_token:localStorage.getItem("access_token"),}, | 114 | + data: {access_token:localStorage.getItem("access_token"),}, |
| 115 | success(response) { | 115 | success(response) { |
| 116 | $.each(response.data, function (i, v) { | 116 | $.each(response.data, function (i, v) { |
| 117 | if(v.subMenus){ | 117 | if(v.subMenus){ |
| @@ -2,8 +2,7 @@ | @@ -2,8 +2,7 @@ | ||
| 2 | * 系统公共配置项 | 2 | * 系统公共配置项 |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | -/*设置全局请求地址*/ | ||
| 6 | -const domainName = "http://127.0.0.1:8183"; | 5 | + |
| 7 | 6 | ||
| 8 | 7 | ||
| 9 | var global = {}; | 8 | var global = {}; |
| @@ -11,10 +10,6 @@ var global = {}; | @@ -11,10 +10,6 @@ var global = {}; | ||
| 11 | global.layui = window.parent.layui; | 10 | global.layui = window.parent.layui; |
| 12 | 11 | ||
| 13 | global.common = { | 12 | global.common = { |
| 14 | - domainName: domainName, | ||
| 15 | - tokenKey: 'access_token', // 存放token的key | ||
| 16 | - refreshToken: 'refresh_token', // 存放token的key | ||
| 17 | - hasEnter: false // 登陆状态 | ||
| 18 | }; | 13 | }; |
| 19 | 14 | ||
| 20 | global.showLoading = (callback) => { | 15 | global.showLoading = (callback) => { |
| @@ -71,15 +71,12 @@ layui.define(['commonDetail','common', 'admin'], function (exports) { | @@ -71,15 +71,12 @@ layui.define(['commonDetail','common', 'admin'], function (exports) { | ||
| 71 | if (response.success && !response.msg) {//有数据 | 71 | if (response.success && !response.msg) {//有数据 |
| 72 | dataList.legend = response.map.legend; | 72 | dataList.legend = response.map.legend; |
| 73 | dataList.x = response.map.x; | 73 | dataList.x = response.map.x; |
| 74 | - if (response.map.y != null && response.map.y.length === 1) { | ||
| 75 | - dataList.y = response.map.y; | ||
| 76 | - } else { | ||
| 77 | - var series=[]; | 74 | + if (response.map.y != null) { |
| 75 | + var series = []; | ||
| 78 | $.each(response.map.y, function (i, v) { | 76 | $.each(response.map.y, function (i, v) { |
| 79 | - var lineIndex = Math.ceil(Math.random() * 6); | ||
| 80 | var item = { | 77 | var item = { |
| 81 | - name:dataList.legend[i], | ||
| 82 | - stack:'Total', | 78 | + name: dataList.legend[i], |
| 79 | + stack: 'Total', | ||
| 83 | type: 'line', | 80 | type: 'line', |
| 84 | emphasis: { | 81 | emphasis: { |
| 85 | focus: 'series' | 82 | focus: 'series' |
| @@ -61,7 +61,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -61,7 +61,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 61 | var data = form.val('add-user-form'); | 61 | var data = form.val('add-user-form'); |
| 62 | data.userProperty = addUserProperty(); | 62 | data.userProperty = addUserProperty(); |
| 63 | // data.orgId = orgSelect.getValue('valueStr') | 63 | // data.orgId = orgSelect.getValue('valueStr') |
| 64 | - data.roleId = roleSelect.getValue('valueStr') | 64 | + // data.roleId = roleSelect.getValue('valueStr') |
| 65 | + var email=/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; | ||
| 66 | + if(data.email!=''&&!email.test(data.email)){ | ||
| 67 | + layer.msg('邮箱格式不正确',{icon: 5}); | ||
| 68 | + layer.close(load); | ||
| 69 | + return false; | ||
| 70 | + } | ||
| 65 | delete data['select'] | 71 | delete data['select'] |
| 66 | $.ajax({ | 72 | $.ajax({ |
| 67 | url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken, | 73 | url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken, |
| @@ -55,19 +55,20 @@ | @@ -55,19 +55,20 @@ | ||
| 55 | </div> | 55 | </div> |
| 56 | </div> | 56 | </div> |
| 57 | </div> | 57 | </div> |
| 58 | - <div class="layui-form-item hide"> | ||
| 59 | - <div class="layui-inline" style="padding: 0 10px"> | ||
| 60 | - <label class="layui-form-label">角色<span style="color: red">*</span></label> | ||
| 61 | - <div class="layui-input-block roles"> | ||
| 62 | - </div> | ||
| 63 | - </div> | ||
| 64 | - <div class="layui-inline"> | ||
| 65 | - <label class="layui-form-label">所在部门<span style="color: red">*</span></label> | ||
| 66 | - <div class="layui-input-inline"> | ||
| 67 | - <div id="userorgId"></div> | ||
| 68 | - </div> | ||
| 69 | - </div> | ||
| 70 | - </div> | 58 | +<!-- 2021-12-21 xwx注--> |
| 59 | +<!-- <div class="layui-form-item hide">--> | ||
| 60 | +<!-- <div class="layui-inline" style="padding: 0 10px">--> | ||
| 61 | +<!-- <label class="layui-form-label">角色<span style="color: red">*</span></label>--> | ||
| 62 | +<!-- <div class="layui-input-block roles">--> | ||
| 63 | +<!-- </div>--> | ||
| 64 | +<!-- </div>--> | ||
| 65 | +<!-- <div class="layui-inline">--> | ||
| 66 | +<!-- <label class="layui-form-label">所在部门<span style="color: red">*</span></label>--> | ||
| 67 | +<!-- <div class="layui-input-inline">--> | ||
| 68 | +<!-- <div id="userorgId"></div>--> | ||
| 69 | +<!-- </div>--> | ||
| 70 | +<!-- </div>--> | ||
| 71 | +<!-- </div>--> | ||
| 71 | 72 | ||
| 72 | <button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存 | 73 | <button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存 |
| 73 | </button> | 74 | </button> |
-
Please register or login to post a comment