monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 4c0960304e528d1c4a02055dbd0667f180eac226 2 parents 75856881 9badf052

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

…master-v32-lushangqing
Inline Side-by-side
Showing 6 changed files with 28 additions and 29 deletions
... ... @@ -111,7 +111,7 @@ layui.extend({
$.ajax({
url: sessionStorage.getItem('domainName') + '/api-user/menus/current?type=1',
async: false,
data: {'type': '1',access_token:localStorage.getItem("access_token"),},
data: {access_token:localStorage.getItem("access_token"),},
success(response) {
$.each(response.data, function (i, v) {
if(v.subMenus){
... ...
... ... @@ -2,8 +2,7 @@
* 系统公共配置项
*/
/*设置全局请求地址*/
const domainName = "http://127.0.0.1:8183";
var global = {};
... ... @@ -11,10 +10,6 @@ var global = {};
global.layui = window.parent.layui;
global.common = {
domainName: domainName,
tokenKey: 'access_token', // 存放token的key
refreshToken: 'refresh_token', // 存放token的key
hasEnter: false // 登陆状态
};
global.showLoading = (callback) => {
... ...
... ... @@ -71,15 +71,12 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
if (response.success && !response.msg) {//有数据
dataList.legend = response.map.legend;
dataList.x = response.map.x;
if (response.map.y != null && response.map.y.length === 1) {
dataList.y = response.map.y;
} else {
var series=[];
if (response.map.y != null) {
var series = [];
$.each(response.map.y, function (i, v) {
var lineIndex = Math.ceil(Math.random() * 6);
var item = {
name:dataList.legend[i],
stack:'Total',
name: dataList.legend[i],
stack: 'Total',
type: 'line',
emphasis: {
focus: 'series'
... ...
... ... @@ -61,7 +61,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
var data = form.val('add-user-form');
data.userProperty = addUserProperty();
// data.orgId = orgSelect.getValue('valueStr')
data.roleId = roleSelect.getValue('valueStr')
// data.roleId = roleSelect.getValue('valueStr')
var email=/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
if(data.email!=''&&!email.test(data.email)){
layer.msg('邮箱格式不正确',{icon: 5});
layer.close(load);
return false;
}
delete data['select']
$.ajax({
url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken,
... ...
... ... @@ -55,19 +55,20 @@
</div>
</div>
</div>
<div class="layui-form-item hide">
<div class="layui-inline" style="padding: 0 10px">
<label class="layui-form-label">角色<span style="color: red">*</span></label>
<div class="layui-input-block roles">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">所在部门<span style="color: red">*</span></label>
<div class="layui-input-inline">
<div id="userorgId"></div>
</div>
</div>
</div>
<!-- 2021-12-21 xwx注-->
<!-- <div class="layui-form-item hide">-->
<!-- <div class="layui-inline" style="padding: 0 10px">-->
<!-- <label class="layui-form-label">角色<span style="color: red">*</span></label>-->
<!-- <div class="layui-input-block roles">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="layui-inline">-->
<!-- <label class="layui-form-label">所在部门<span style="color: red">*</span></label>-->
<!-- <div class="layui-input-inline">-->
<!-- <div id="userorgId"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存
</button>
... ...
... ... @@ -88,7 +88,7 @@ export default {
obj.value[itemId] = res.data;
}
}
},null,false)
},undefined,true,false)
}
// End Wang 2021/12/14 14:47 展示资产详情
... ...