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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Captain.B 2020-02-26 17:34:43 +08:00
parent 3fac641990 f8a357a3d0
commit 758165157a
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/performance/components/settings/Member.vue
View File

@ -67,7 +67,7 @@
import {TokenKey} from "../../../common/constants"; import {TokenKey} from "../../../common/constants";
export default { export default {
name: "Member", name: "MsMember",
components: {MsCreateBox}, components: {MsCreateBox},
data() { data() {
return { return {

2
frontend/src/performance/components/settings/OrganizationMember.vue
View File

@ -66,7 +66,7 @@
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import {TokenKey} from "../../../common/constants"; import {TokenKey} from "../../../common/constants";
export default { export default {
name: "OrganizationMember", name: "MsOrganizationMember",
components: {MsCreateBox}, components: {MsCreateBox},
created() { created() {
this.initTableData(); this.initTableData();

2
frontend/src/performance/components/settings/OrganizationWorkspace.vue
View File

@ -65,7 +65,7 @@
import {TokenKey} from "../../../common/constants"; import {TokenKey} from "../../../common/constants";
export default { export default {
name: "OrganizationWorkspace", name: "MsOrganizationWorkspace",
components: {MsCreateBox}, components: {MsCreateBox},
mounted() { mounted() {
this.list(); this.list();

2
frontend/src/performance/components/settings/PersonSetting.vue
View File

@ -92,7 +92,7 @@
} }
} }
}, },
name: "PersonSetting", name: "MsPersonSetting",
created() { created() {
this.initTableData(); this.initTableData();
}, },

2
frontend/src/performance/components/settings/SystemWorkspace.vue
View File

@ -75,7 +75,7 @@
import {Message} from "element-ui"; import {Message} from "element-ui";
export default { export default {
name: "MsWorkspace", name: "MsSystemWorkspace",
components: {MsCreateBox}, components: {MsCreateBox},
mounted() { mounted() {
this.list(); this.list();