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

Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3

This commit is contained in:
fit2-zhao 2020-10-09 16:03:21 +08:00
parent 021e6b51fa b2fc59b398
commit a429bd8d1b
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
View File

@ -39,8 +39,7 @@
:disabled="!row.edit || readOnly" :disabled="!row.edit || readOnly"
size="mini" size="mini"
v-model="row.enable" v-model="row.enable"
active-color="#13ce66" inactive-color="#DCDFE6">
inactive-color="#ff4949">
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>

3
frontend/src/business/components/settings/personal/ApiKeys.vue
View File

@ -37,8 +37,7 @@
<el-table-column prop="status" :label="$t('commons.status')"> <el-table-column prop="status" :label="$t('commons.status')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-switch v-model="scope.row.status" <el-switch v-model="scope.row.status"
active-color="#13ce66" inactive-color="#DCDFE6"
inactive-color="#ff4949"
active-value="ACTIVE" active-value="ACTIVE"
inactive-value="DISABLED" inactive-value="DISABLED"
@change="changeSwitch(scope.row)" @change="changeSwitch(scope.row)"

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

@ -16,8 +16,7 @@
<el-table-column prop="status" :label="$t('test_resource_pool.enable_disable')"> <el-table-column prop="status" :label="$t('test_resource_pool.enable_disable')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-switch v-model="scope.row.status" <el-switch v-model="scope.row.status"
active-color="#13ce66" inactive-color="#DCDFE6"
inactive-color="#ff4949"
active-value="VALID" active-value="VALID"
inactive-value="INVALID" inactive-value="INVALID"
@change="changeSwitch(scope.row)" @change="changeSwitch(scope.row)"

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

@ -19,8 +19,7 @@
<el-table-column prop="status" :label="$t('commons.status')" width="120"> <el-table-column prop="status" :label="$t('commons.status')" width="120">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-switch v-model="scope.row.status" <el-switch v-model="scope.row.status"
active-color="#13ce66" inactive-color="#DCDFE6"
inactive-color="#ff4949"
active-value="1" active-value="1"
inactive-value="0" inactive-value="0"
@change="changeSwitch(scope.row)" @change="changeSwitch(scope.row)"