File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -47,7 +47,8 @@ export async function handleException(res) {
4747 message : msg || '未知的error_code' ,
4848 type : 'error' ,
4949 } )
50- throw new Error ( res )
50+ // throw new Error(res)
51+ return false
5152}
5253
5354export function handleError ( error ) {
Original file line number Diff line number Diff line change 88 <lin-search @query =" onQueryChange" ref =" searchKeyword" />
99 <el-dropdown style =" margin : 0 10px ;" @command =" handleCommand" v-auth =" '查询日志记录的用户'" >
1010 <el-button >
11- {{searchUser}}
11+ {{searchUser ? searchUser : '全部人员' }}
1212 <i class =" el-icon-arrow-down el-icon--right" ></i >
1313 </el-button >
1414 <el-dropdown-menu slot =" dropdown" >
15- <el-dropdown-item :command =" ['全部人员']" ></el-dropdown-item >
16- <el-dropdown-item v-for =" (user, index) in users" :key =" index" :command =" [user]" >{{user}}
15+ <el-dropdown-item :command =" ['全部人员']" >全部人员 </el-dropdown-item >
16+ <el-dropdown-item icon = " el-icon-user-solid " v-for =" (user, index) in users" :key =" index" :command =" [user]" >{{user}}
1717 </el-dropdown-item >
1818 </el-dropdown-menu >
1919 </el-dropdown >
5151 <i class =" iconfont icon-gengduo" style =" font-size :14px " ></i >
5252 </div >
5353 <div v-if =" finished" >
54- <span >没有更多数据了</span >
54+ <span >{{totalCount === 0 ? '暂无数据' : ' 没有更多数据了'}} </span >
5555 </div >
5656 </div >
5757 </div >
@@ -76,7 +76,7 @@ export default {
7676 value: ' ' ,
7777 logs: [],
7878 users: [],
79- searchUser: ' 全部人员 ' ,
79+ searchUser: ' ' ,
8080 more: false ,
8181 loading: false ,
8282 finished: false ,
@@ -176,10 +176,11 @@ export default {
176176 this .logs = []
177177 this .loading = true
178178 this .finished = false
179+ const name = this .searchUser === ' 全部人员' ? ' ' : this .searchUser
179180 const res = await log .searchLogs ({
180181 page: 0 , // 初始化
181182 keyword: this .searchKeyword ,
182- name: this . searchUser ,
183+ name,
183184 start: this .searchDate [0 ],
184185 end: this .searchDate [1 ],
185186 })
You can’t perform that action at this time.
0 commit comments