Browse Source

Merge pull request '对齐改为左对齐,页码数更改,竖线1px;修改用户分析数据更新时间不显示问题' (#894) from wangjr_pro into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/894
Reviewed-by: zhoupzh <zhoupzh@pcl.ac.cn>
tags/v1.21.12.1
zhoupzh 4 years ago
parent
commit
792a0a900c
2 changed files with 6 additions and 3 deletions
  1. +4
    -2
      web_src/js/components/ProAnalysis.vue
  2. +2
    -1
      web_src/js/components/UserAnalysis.vue

+ 4
- 2
web_src/js/components/ProAnalysis.vue View File

@@ -217,7 +217,7 @@
> >
<el-table-column <el-table-column
label="用户名" label="用户名"
align="center"
align="left"
prop="user"> prop="user">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.mode!=-1" :href="AppSubUrl +'../../../'+ scope.row.user"><img class="ui avatar s16 image js-popover-card" :src="scope.row.relAvatarLink">{{scope.row.user}} </a> <a v-if="scope.row.mode!=-1" :href="AppSubUrl +'../../../'+ scope.row.user"><img class="ui avatar s16 image js-popover-card" :src="scope.row.relAvatarLink">{{scope.row.user}} </a>
@@ -1206,7 +1206,7 @@
} }
.items{ .items{
text-align: center; text-align: center;
border-right:2px solid rgba(219, 219, 219, 100);
border-right:1px solid rgba(219, 219, 219, 100);
} }
.item_l{ .item_l{
margin-right: 5px; margin-right: 5px;
@@ -1218,6 +1218,7 @@
margin-right:5px; margin-right:5px;
border:1px solid rgba(219, 219, 219, 100); border:1px solid rgba(219, 219, 219, 100);
height: 370px; height: 370px;
overflow:auto
} }
.item_echart{ .item_echart{
margin-top: 10px; margin-top: 10px;
@@ -1229,5 +1230,6 @@
.item_content{ .item_content{
color: #409eff; color: #409eff;
margin-top: 10px; margin-top: 10px;
font-weight:bold;
} }
</style> </style>

+ 2
- 1
web_src/js/components/UserAnalysis.vue View File

@@ -149,7 +149,7 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="page" :current-page="page"
:page-size="pageSize" :page-size="pageSize"
:page-sizes="[2,5,10,20]"
:page-sizes="[5,10,20]"
layout="total, sizes, prev, pager, next,jumper" layout="total, sizes, prev, pager, next,jumper"
:total="totalNum"> :total="totalNum">
</el-pagination> </el-pagination>
@@ -423,6 +423,7 @@
mounted() { mounted() {
// document.getElementById("all_usr").style.outline="none" // document.getElementById("all_usr").style.outline="none"
// document.getElementById("all_usr").focus() // document.getElementById("all_usr").focus()
this.getUpdateTime()
this.getUserList("all_usr",7) this.getUserList("all_usr",7)
}, },
created() { created() {


Loading…
Cancel
Save