#334 #305

Merged
liwei03 merged 6 commits from openioctopus/octopus:master into master 2 years ago
  1. +1
    -1
      admin-portal/src/api/modelManager.js
  2. +2
    -2
      admin-portal/src/views/modelManager/Model.vue
  3. +2
    -2
      admin-portal/src/views/timeManager/component/time.vue
  4. +2
    -0
      server/base-server/internal/service/model/query_handle.go

+ 1
- 1
admin-portal/src/api/modelManager.js View File

@@ -1,5 +1,5 @@
import request from '@/utils/request'
export function getMyModel(params) {
export function getUserModel(params) {
return request({
url: '/v1/modelmanage/usermodel',
method: 'get',


+ 2
- 2
admin-portal/src/views/modelManager/Model.vue View File

@@ -55,7 +55,7 @@
<script>
import versionList from './components/versionList.vue'
import createDialog from './components/createDialog.vue'
import { getMyModel, getPreModel, deletePreModel } from '@/api/modelManager.js'
import { getUserModel, getPreModel, deletePreModel } from '@/api/modelManager.js'
import searchForm from '@/components/search/index.vue'
export default {
name: "MyModel",
@@ -149,7 +149,7 @@
if (!data) { data = { pageIndex: this.pageIndex, pageSize: this.pageSize } }
this.type = this.modelTabType
if (this.type === 1) {
getMyModel(data).then(response => {
getUserModel(data).then(response => {
if (response.success) {
this.total = response.data.totalSize
this.tableData = response.data.models


+ 2
- 2
admin-portal/src/views/timeManager/component/time.vue View File

@@ -2,12 +2,12 @@
<div>
<div>
<el-select v-model="userId" filterable :filter-method="getUserOptions" v-loadmore="loadUserName"
@focus='userClick' v-if="type=='user'">
@focus='userClick' v-if="type=='user'" placeholder="用户">
<el-option v-for="op in userOptions" :key="op.id" :label="op.fullName+'('+op.email+')'"
:value="op.id" />
</el-select>
<el-select v-model="spaceId" v-loadmore="loadGroupName"
@focus='groupClick' v-if="type=='group'">
@focus='groupClick' v-if="type=='group'" placeholder="群组">
<el-option v-for="op in groupOptions" :key="op.id" :label="op.name" :value="op.id" />
</el-select>
<el-button type="primary" @click="reset" class="reset">重置</el-button>


+ 2
- 0
server/base-server/internal/service/model/query_handle.go View File

@@ -188,6 +188,8 @@ func (h *modelQueryHandle) ListAllUserModelHandle(ctx context.Context, req *api.
PageIndex: int(req.PageIndex),
PageSize: int(req.PageSize),
SearchKey: req.SearchKey,
UserId: req.UserId,
SpaceId: req.SpaceId,
})
if err != nil {
return nil, err


Loading…
Cancel
Save