monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit b19e803e6ac605f5be215d5b059c62fae91f3362 2 parents 36330835 61b53211

Merge branch 'master-mj-ztq' into 'master-mj' 

feat:样式统一调整



See merge request !1193
Inline Side-by-side
Showing 4 changed files with 12 additions and 10 deletions
... ... @@ -86,6 +86,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'sessions',
where: {access_token},
height: 'full-200',
even: true,
limit: common.limit,
limits: common.limits,
cols: [[{
type: 'checkbox'
}, {
... ...
... ... @@ -30,8 +30,8 @@ layui.define(['xmSelect', 'md5'], function (exports) {
lineTimer: null,//性能曲线图全局定时器
detailTimer: [],//详细页的全局定时器
alarmTimer: null,//首页告警刷新定时器
limit: 50,//全局分页条目数
limits: [50, 100, 150, 200],//全局分页条目数组
limit: 20,//全局分页条目数
limits: [20, 50, 100, 200],//全局分页条目数组
//base64加密
Base64: {
_keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
... ... @@ -298,7 +298,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
},
//业务下拉选择数据绑定
bizTypeSelect: function (targtetId, callback) {
var options = "<option value=''>=所属业务=</option>";
var options = "<option value=''>所属业务</option>";
admin.req({
url: this.domainName + '/api-web/home/business/findAllBusType',
data: {'type': 'per'}
... ... @@ -318,7 +318,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
},
//资源类型下拉选择数据绑定
resTypeSelect: function (targtetId, callback, ajaxParams) {
var options = "<option value=''>=资源类型=</option>";
var options = "<option value=''>资源类型</option>";
admin.req(Object.assign({
url: this.domainName + '/api-web/home/restype/getAllResType',
async: false
... ... @@ -345,7 +345,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
var resTypeTree = obj.pidToChildren(resTypeList, "resTypeCode", "parentId");
xmSelect.render(Object.assign({
el: '#',
tips: '=资源类型=',
tips: '资源类型',
filterable: true,
radio: false,
clickClose: false,
... ...
... ... @@ -963,7 +963,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common'
elem: 'layui-table-page' + options.index
, count: count
, limit: options.limit
, limits: [10, 20, 50, 100, 200, 300, 400]
, limits: [20, 50, 100, 200]
, groups: 3
, layout: ['prev', 'page', 'next', 'skip', 'count', 'limit']
, prev: '<i class="layui-icon">&#xe603;</i>'
... ...
... ... @@ -32,7 +32,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
detailTimer: [],//详细页的全局定时器
alarmTimer: null,//首页告警刷新定时器
limit: 20,//全局分页条目数
limits:[10, 20, 50, 100, 200, 300, 400],//全局分页条目数组
limits:[20, 50, 100, 200],//全局分页条目数组
/**
* 获取墨镜平台的token
... ... @@ -321,7 +321,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
},
//业务下拉选择数据绑定
bizTypeSelect: function (targtetId, callback) {
var options = "<option value=''>=所属业务=</option>";
var options = "<option value=''>所属业务</option>";
admin.req({
url: this.domainName + '/api-web/home/business/findAllBusType',
data: {'type': 'per'}
... ... @@ -341,7 +341,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
},
//资源类型下拉选择数据绑定
resTypeSelect: function (targtetId, callback, ajaxParams) {
var options = "<option value=''>=资源类型=</option>";
var options = "<option value=''>资源类型</option>";
admin.req(Object.assign({
url: this.domainName + '/api-web/home/restype/getAllResType'
}, ajaxParams)).done(function (res) {
... ... @@ -367,7 +367,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
var resTypeTree = obj.pidToChildren(resTypeList, "resTypeCode", "parentId");
xmSelect.render(Object.assign({
el: '#',
tips: '=资源类型=',
tips: '资源类型',
filterable: true,
radio: false,
clickClose: false,
... ...