test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修改页面

This commit is contained in:
Captain.B 2020-04-23 09:50:20 +08:00
parent 78a325b75b
commit 6320bb0173
7 changed files with 29 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/business/components/settings/organization/OrganizationMember.vue
View File

@ -2,18 +2,8 @@
<div v-loading="result.loading"> <div v-loading="result.loading">
<el-card> <el-card>
<template v-slot:header> <template v-slot:header>
<div> <ms-table-header :condition.sync="condition" @search="search" @create="create"
<el-row type="flex" justify="space-between" align="middle"> :create-tip="btnTips" :title="$t('commons.member')"/>
<span class="title">{{$t('commons.member')}}
<ms-create-box :tips="btnTips" :exec="create"/>
</span>
<span class="search">
<el-input type="text" size="small" :placeholder="$t('member.search_by_name')"
prefix-icon="el-icon-search"
maxlength="60" v-model="condition" @change="search" clearable/>
</span>
</el-row>
</div>
</template> </template>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
@ -114,10 +104,11 @@
import MsCreateBox from "../CreateBox"; import MsCreateBox from "../CreateBox";
import {TokenKey} from "../../../../common/js/constants"; import {TokenKey} from "../../../../common/js/constants";
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader";
export default { export default {
name: "MsOrganizationMember", name: "MsOrganizationMember",
components: {MsCreateBox, MsTablePagination}, components: {MsCreateBox, MsTablePagination, MsTableHeader},
created() { created() {
this.initTableData(); this.initTableData();
}, },

17
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
View File

@ -2,18 +2,8 @@
<div> <div>
<el-card v-loading="result.loading"> <el-card v-loading="result.loading">
<template v-slot:header> <template v-slot:header>
<div> <ms-table-header :condition.sync="condition" @search="search" @create="create"
<el-row type="flex" justify="space-between" align="middle"> :create-tip="btnTips" :title="$t('commons.workspace')"/>
<span class="title">{{$t('commons.workspace')}}
<ms-create-box :tips="btnTips" :exec="create"/>
</span>
<span class="search">
<el-input type="text" size="small" :placeholder="$t('workspace.search_by_name')"
prefix-icon="el-icon-search" @change="search"
maxlength="60" v-model="condition" clearable/>
</span>
</el-row>
</div>
</template> </template>
<el-table :data="items" style="width: 100%"> <el-table :data="items" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.name')"/> <el-table-column prop="name" :label="$t('commons.name')"/>
@ -174,10 +164,11 @@
import {Message} from "element-ui"; import {Message} from "element-ui";
import {TokenKey} from "../../../../common/js/constants"; import {TokenKey} from "../../../../common/js/constants";
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader";
export default { export default {
name: "MsOrganizationWorkspace", name: "MsOrganizationWorkspace",
components: {MsCreateBox, MsTablePagination}, components: {MsCreateBox, MsTablePagination, MsTableHeader},
mounted() { mounted() {
this.list(); this.list();
}, },

17
frontend/src/business/components/settings/system/Organization.vue
View File

@ -3,18 +3,8 @@
<el-card> <el-card>
<template v-slot:header> <template v-slot:header>
<div> <ms-table-header :condition.sync="condition" @search="search" @create="create"
<el-row type="flex" justify="space-between" align="middle"> :create-tip="btnTips" :title="$t('commons.organization')"/>
<span class="title">{{$t('commons.organization')}}
<ms-create-box :tips="btnTips" :exec="create"/>
</span>
<span class="search">
<el-input type="text" size="small" :placeholder="$t('organization.search_by_name')"
prefix-icon="el-icon-search" @change="search"
maxlength="60" v-model="condition" clearable/>
</span>
</el-row>
</div>
</template> </template>
<!-- system menu organization table--> <!-- system menu organization table-->
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
@ -199,10 +189,11 @@
<script> <script>
import MsCreateBox from "../CreateBox"; import MsCreateBox from "../CreateBox";
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader";
export default { export default {
name: "MsOrganization", name: "MsOrganization",
components: {MsCreateBox, MsTablePagination}, components: {MsCreateBox, MsTablePagination,MsTableHeader},
data() { data() {
return { return {
queryPath: '/organization/list', queryPath: '/organization/list',

19
frontend/src/business/components/settings/system/SystemWorkspace.vue
View File

@ -2,20 +2,8 @@
<div> <div>
<el-card v-loading="result.loading"> <el-card v-loading="result.loading">
<template v-slot:header> <template v-slot:header>
<div> <ms-table-header :condition.sync="condition" @search="search" @create="create"
<el-row type="flex" justify="space-between" align="middle"> :create-tip="btnTips" :title="$t('commons.workspace')"/>
<span class="title">
{{$t('commons.workspace')}}
<ms-create-box :tips="btnTips" :exec="create"/>
</span>
<span class="search">
<el-input type="text" size="small"
:placeholder="$t('workspace.search_by_name')"
prefix-icon="el-icon-search" @change="search"
maxlength="60" v-model="condition" clearable/>
</span>
</el-row>
</div>
</template> </template>
<!-- workspace table --> <!-- workspace table -->
<el-table :data="items" style="width: 100%"> <el-table :data="items" style="width: 100%">
@ -216,10 +204,11 @@
import MsCreateBox from "../CreateBox"; import MsCreateBox from "../CreateBox";
import {Message} from "element-ui"; import {Message} from "element-ui";
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader";
export default { export default {
name: "MsSystemWorkspace", name: "MsSystemWorkspace",
components: {MsCreateBox, MsTablePagination}, components: {MsCreateBox, MsTablePagination, MsTableHeader},
mounted() { mounted() {
this.list(); this.list();
}, },

17
frontend/src/business/components/settings/system/TestResourcePool.vue
View File

@ -3,18 +3,8 @@
<el-card> <el-card>
<template v-slot:header> <template v-slot:header>
<div> <ms-table-header :condition.sync="condition" @search="search" @create="create"
<el-row type="flex" justify="space-between" align="middle"> :create-tip="btnTips" :title="$t('commons.test_resource_pool')"/>
<span class="title">{{$t('commons.test_resource_pool')}}
<ms-create-box :tips="btnTips" :exec="create"/>
</span>
<span class="search">
<el-input type="text" size="small" :placeholder="$t('test_resource_pool.search_by_name')"
prefix-icon="el-icon-search"
maxlength="60" v-model="condition" @change="search" clearable/>
</span>
</el-row>
</div>
</template> </template>
<el-table :data="items" style="width: 100%"> <el-table :data="items" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.name')"/> <el-table-column prop="name" :label="$t('commons.name')"/>
@ -225,10 +215,11 @@
<script> <script>
import MsCreateBox from "../CreateBox"; import MsCreateBox from "../CreateBox";
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader";
export default { export default {
name: "MsTestResourcePool", name: "MsTestResourcePool",
components: {MsCreateBox, MsTablePagination}, components: {MsCreateBox, MsTablePagination, MsTableHeader},
data() { data() {
return { return {
result: {}, result: {},

19
frontend/src/business/components/settings/system/User.vue
View File

@ -3,18 +3,8 @@
<el-card> <el-card>
<template v-slot:header> <template v-slot:header>
<div> <ms-table-header :condition.sync="condition" @search="search" @create="create"
<el-row type="flex" justify="space-between" align="middle"> :create-tip="btnTips" :title="$t('commons.member')"/>
<span class="title">{{$t('commons.member')}}
<ms-create-box :tips="btnTips" :exec="create"/>
</span>
<span class="search">
<el-input type="text" size="small" :placeholder="$t('member.search_by_name')"
prefix-icon="el-icon-search" maxlength="60" @change="search"
v-model="condition" clearable/>
</span>
</el-row>
</div>
</template> </template>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55"/>
@ -105,8 +95,11 @@
<script> <script>
import MsCreateBox from "../CreateBox"; import MsCreateBox from "../CreateBox";
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader";
export default { export default {
name: "MsUser",
components: {MsCreateBox, MsTablePagination, MsTableHeader},
data() { data() {
return { return {
queryPath: '/user/special/list', queryPath: '/user/special/list',
@ -159,8 +152,6 @@
} }
} }
}, },
name: "MsUser",
components: {MsCreateBox, MsTablePagination},
created() { created() {
this.search(); this.search();
}, },

16
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
View File

@ -2,17 +2,8 @@
<div v-loading="result.loading"> <div v-loading="result.loading">
<el-card> <el-card>
<template v-slot:header> <template v-slot:header>
<div> <ms-table-header :condition.sync="condition" @search="search" @create="create"
<el-row type="flex" justify="space-between" align="middle" v-permission="['test_manager']"> :create-tip="btnTips" :title="$t('commons.member')"/>
<span class="title">{{$t('commons.member')}}
<ms-create-box :tips="btnTips" :exec="create"/>
</span>
<span class="search">
<el-input type="text" size="small" placeholder="根据用户名搜索" prefix-icon="el-icon-search"
maxlength="60" v-model="condition" @change="search" clearable/>
</span>
</el-row>
</div>
</template> </template>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
@ -109,10 +100,11 @@
import MsCreateBox from "../CreateBox"; import MsCreateBox from "../CreateBox";
import {TokenKey} from "../../../../common/js/constants"; import {TokenKey} from "../../../../common/js/constants";
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader";
export default { export default {
name: "MsMember", name: "MsMember",
components: {MsCreateBox, MsTablePagination}, components: {MsCreateBox, MsTablePagination, MsTableHeader},
data() { data() {
return { return {
result: {}, result: {},