|
@@ -2,9 +2,10 @@ |
|
@@ -2,9 +2,10 @@ |
|
2
|
<div :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}" class="cm-card">
|
2
|
<div :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}" class="cm-card">
|
|
3
|
<!-- 搜索区域 -->
|
3
|
<!-- 搜索区域 -->
|
|
4
|
<el-row>
|
4
|
<el-row>
|
|
5
|
- <el-col :span="14" class="search">
|
5
|
+ <el-col :span="14" class="search">
|
|
6
|
<div>
|
6
|
<div>
|
|
7
|
- <el-select v-model="search.groupId" clearable v-if="groupList && groupList.length > 0" :size="$global.elementConfig.size.input" placeholder="请选择巡检组" @change="getGroupUser">
|
7
|
+ <el-select v-model="search.groupId" clearable v-if="groupList && groupList.length > 0"
|
|
|
|
8
|
+ :size="$global.elementConfig.size.input" placeholder="请选择巡检组" @change="getGroupUser">
|
|
8
|
<el-option
|
9
|
<el-option
|
|
9
|
v-for="item in groupList"
|
10
|
v-for="item in groupList"
|
|
10
|
:key="item.groupId"
|
11
|
:key="item.groupId"
|
|
@@ -12,7 +13,8 @@ |
|
@@ -12,7 +13,8 @@ |
|
12
|
:value="item.groupId"/>
|
13
|
:value="item.groupId"/>
|
|
13
|
</el-select>
|
14
|
</el-select>
|
|
14
|
|
15
|
|
|
15
|
- <el-select v-model="search.userId" clearable class="m-l-6" :size="$global.elementConfig.size.input" placeholder="请选择用户" >
|
16
|
+ <el-select v-model="search.userId" clearable class="m-l-6" :size="$global.elementConfig.size.input"
|
|
|
|
17
|
+ placeholder="请选择用户">
|
|
16
|
<el-option
|
18
|
<el-option
|
|
17
|
v-for="item in userList"
|
19
|
v-for="item in userList"
|
|
18
|
:key="item.username"
|
20
|
:key="item.username"
|
|
@@ -23,22 +25,28 @@ |
|
@@ -23,22 +25,28 @@ |
|
23
|
</el-col>
|
25
|
</el-col>
|
|
24
|
<el-col :span="10" class="search">
|
26
|
<el-col :span="10" class="search">
|
|
25
|
<el-button-group class="ml-4">
|
27
|
<el-button-group class="ml-4">
|
|
26
|
- <el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'yesterday' ? 'primary' : ''"
|
28
|
+ <el-button :size="$global.elementConfig.size.button"
|
|
|
|
29
|
+ :type="search.dateType == 'yesterday' ? 'primary' : ''"
|
|
27
|
@click="loadPage('yesterday')">昨天
|
30
|
@click="loadPage('yesterday')">昨天
|
|
28
|
</el-button>
|
31
|
</el-button>
|
|
29
|
- <el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'today' ? 'primary' : ''"
|
32
|
+ <el-button :size="$global.elementConfig.size.button"
|
|
|
|
33
|
+ :type="search.dateType == 'today' ? 'primary' : ''"
|
|
30
|
@click="loadPage('today')">今天
|
34
|
@click="loadPage('today')">今天
|
|
31
|
</el-button>
|
35
|
</el-button>
|
|
32
|
- <el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'lastWeek' ? 'primary' : ''"
|
36
|
+ <el-button :size="$global.elementConfig.size.button"
|
|
|
|
37
|
+ :type="search.dateType == 'lastWeek' ? 'primary' : ''"
|
|
33
|
@click="loadPage('lastWeek')">上周
|
38
|
@click="loadPage('lastWeek')">上周
|
|
34
|
</el-button>
|
39
|
</el-button>
|
|
35
|
- <el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'thisWeek' ? 'primary' : ''"
|
40
|
+ <el-button :size="$global.elementConfig.size.button"
|
|
|
|
41
|
+ :type="search.dateType == 'thisWeek' ? 'primary' : ''"
|
|
36
|
@click="loadPage('thisWeek')">本周
|
42
|
@click="loadPage('thisWeek')">本周
|
|
37
|
</el-button>
|
43
|
</el-button>
|
|
38
|
- <el-button :size="$global.elementConfig.size.button" :type="search.dateType == 'thisMonth' ? 'primary' : ''"
|
44
|
+ <el-button :size="$global.elementConfig.size.button"
|
|
|
|
45
|
+ :type="search.dateType == 'thisMonth' ? 'primary' : ''"
|
|
39
|
@click="loadPage('thisMonth')">本月
|
46
|
@click="loadPage('thisMonth')">本月
|
|
40
|
</el-button>
|
47
|
</el-button>
|
|
41
|
- <el-button style="border-radius: 0;" :size="$global.elementConfig.size.button" :type="search.dateType == 'all' ? 'primary' : ''"
|
48
|
+ <el-button style="border-radius: 0;" :size="$global.elementConfig.size.button"
|
|
|
|
49
|
+ :type="search.dateType == 'all' ? 'primary' : ''"
|
|
42
|
@click="loadPage('all')">全部
|
50
|
@click="loadPage('all')">全部
|
|
43
|
</el-button>
|
51
|
</el-button>
|
|
44
|
</el-button-group>
|
52
|
</el-button-group>
|
|
@@ -82,7 +90,7 @@ |
|
@@ -82,7 +90,7 @@ |
|
82
|
<div class="p-6">
|
90
|
<div class="p-6">
|
|
83
|
<cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
|
91
|
<cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
|
|
84
|
:height="height - 480"
|
92
|
:height="height - 480"
|
|
85
|
- :pageSizes = '[10,20,50,100, 200, 300, 400]'
|
93
|
+ :pageSizes='[10,20,50,100, 200, 300, 400]'
|
|
86
|
:loading="false"
|
94
|
:loading="false"
|
|
87
|
:pageSize="pageSize"
|
95
|
:pageSize="pageSize"
|
|
88
|
:showBorder="true"
|
96
|
:showBorder="true"
|
|
@@ -96,6 +104,13 @@ |
|
@@ -96,6 +104,13 @@ |
|
96
|
<div v-if="prop == 'link'">
|
104
|
<div v-if="prop == 'link'">
|
|
97
|
<operationLogLink :opLink="row.link" :opLinkSource="row.linkSource"></operationLogLink>
|
105
|
<operationLogLink :opLink="row.link" :opLinkSource="row.linkSource"></operationLogLink>
|
|
98
|
</div>
|
106
|
</div>
|
|
|
|
107
|
+ <div v-if="prop == 'dwellTime'">
|
|
|
|
108
|
+ {{row.dwellTime}}
|
|
|
|
109
|
+ <el-tooltip placement="top">
|
|
|
|
110
|
+ <template #content>统计规则<br/>当前操作路径的<span style="color: #67C23A">首次操作时间（{{row.createTime}}）</span>与<span style="color: #67C23A">最后一次的操作时间（{{row.endTime}}）</span>的间隔</template>
|
|
|
|
111
|
+ <i class="iconfont icon-tishi"style="position: absolute;right: 5px;"></i>
|
|
|
|
112
|
+ </el-tooltip>
|
|
|
|
113
|
+ </div>
|
|
99
|
</template>
|
114
|
</template>
|
|
100
|
</cm-table-page>
|
115
|
</cm-table-page>
|
|
101
|
</div>
|
116
|
</div>
|
