monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit eb9709af3be5ed5b7928384c0a2c6e76e849310b 1 parent 08216b8b

操作日志优化

Inline Side-by-side
Showing 4 changed files with 34 additions and 12 deletions
... ... @@ -2,9 +2,10 @@
<div :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}" class="cm-card">
<!-- 搜索区域 -->
<el-row>
<el-col :span="14" class="search">
<el-col :span="14" class="search">
<div>
<el-select v-model="search.groupId" clearable v-if="groupList && groupList.length > 0" :size="$global.elementConfig.size.input" placeholder="请选择巡检组" @change="getGroupUser">
<el-select v-model="search.groupId" clearable v-if="groupList && groupList.length > 0"
:size="$global.elementConfig.size.input" placeholder="请选择巡检组" @change="getGroupUser">
<el-option
v-for="item in groupList"
:key="item.groupId"
... ... @@ -12,7 +13,8 @@
:value="item.groupId"/>
</el-select>
<el-select v-model="search.userId" clearable class="m-l-6" :size="$global.elementConfig.size.input" placeholder="请选择用户" >
<el-select v-model="search.userId" clearable class="m-l-6" :size="$global.elementConfig.size.input"
placeholder="请选择用户">
<el-option
v-for="item in userList"
:key="item.username"
... ... @@ -23,22 +25,28 @@
</el-col>
<el-col :span="10" class="search">
<el-button-group class="ml-4">
<el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'yesterday' ? 'primary' : ''"
<el-button :size="$global.elementConfig.size.button"
:type="search.dateType == 'yesterday' ? 'primary' : ''"
@click="loadPage('yesterday')">昨天
</el-button>
<el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'today' ? 'primary' : ''"
<el-button :size="$global.elementConfig.size.button"
:type="search.dateType == 'today' ? 'primary' : ''"
@click="loadPage('today')">今天
</el-button>
<el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'lastWeek' ? 'primary' : ''"
<el-button :size="$global.elementConfig.size.button"
:type="search.dateType == 'lastWeek' ? 'primary' : ''"
@click="loadPage('lastWeek')">上周
</el-button>
<el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'thisWeek' ? 'primary' : ''"
<el-button :size="$global.elementConfig.size.button"
:type="search.dateType == 'thisWeek' ? 'primary' : ''"
@click="loadPage('thisWeek')">本周
</el-button>
<el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'thisMonth' ? 'primary' : ''"
<el-button :size="$global.elementConfig.size.button"
:type="search.dateType == 'thisMonth' ? 'primary' : ''"
@click="loadPage('thisMonth')">本月
</el-button>
<el-button style="border-radius: 0;" :size="$global.elementConfig.size.button" :type="search.dateType == 'all' ? 'primary' : ''"
<el-button style="border-radius: 0;" :size="$global.elementConfig.size.button"
:type="search.dateType == 'all' ? 'primary' : ''"
@click="loadPage('all')">全部
</el-button>
</el-button-group>
... ... @@ -82,7 +90,7 @@
<div class="p-6">
<cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
:height="height - 480"
:pageSizes = '[10,20,50,100, 200, 300, 400]'
:pageSizes='[10,20,50,100, 200, 300, 400]'
:loading="false"
:pageSize="pageSize"
:showBorder="true"
... ... @@ -96,6 +104,13 @@
<div v-if="prop == 'link'">
<operationLogLink :opLink="row.link" :opLinkSource="row.linkSource"></operationLogLink>
</div>
<div v-if="prop == 'dwellTime'">
{{row.dwellTime}}
<el-tooltip placement="top">
<template #content>统计规则<br/>当前操作路径的<span style="color: #67C23A">首次操作时间（{{row.createTime}}）</span>与<span style="color: #67C23A">最后一次的操作时间（{{row.endTime}}）</span>的间隔</template>
<i class="iconfont icon-tishi"style="position: absolute;right: 5px;"></i>
</el-tooltip>
</div>
</template>
</cm-table-page>
</div>
... ...
... ... @@ -152,7 +152,7 @@ export default {
label: '停留总时长',
sortable: true,
align: 'center',
width: '120'
width: '150'
}
]
})
... ...
... ... @@ -61,6 +61,13 @@
<div v-if="prop == 'link'">
<operationLogLink :opLink="row.link" :opLinkSource="row.linkSource"></operationLogLink>
</div>
<div v-if="prop == 'dwellTime'">
{{row.dwellTime}}
<el-tooltip placement="top">
<template #content>统计规则<br/>当前操作路径的<span style="color: #67C23A">首次操作时间（{{row.createTime}}）</span>与<span style="color: #67C23A">最后一次的操作时间（{{row.endTime}}）</span>的间隔</template>
<i class="iconfont icon-tishi"style="position: absolute;right: 5px;"></i>
</el-tooltip>
</div>
</template>
</cm-table-page>
</div>
... ...
... ... @@ -148,7 +148,7 @@ export default {
label: '停留总时长',
sortable: true,
align: 'center',
width: '120'
width: '150'
}
]
})
... ...