gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-753 fix: 修复enabled无效的问题

Browse Source
This commit is contained in:
chenjinsong
2021-06-21 16:28:30 +08:00
parent b8e7658600
commit 4d8dd4e7a0
3 changed files with 90 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nezha-fronted/src/components/common/nezhaColor.vue
View File

@@ -218,6 +218,7 @@ export default {
} }
.color-tab{ .color-tab{
height: 28px; height: 28px;
line-height: 28px;
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
border: 1px solid #EBEEF5; border: 1px solid #EBEEF5;
border-bottom: none; border-bottom: none;
@@ -240,14 +241,14 @@ export default {
/*border-right-color: #DCDFE6;*/ /*border-right-color: #DCDFE6;*/
/*}*/ /*}*/
.color-tab div:hover{ .color-tab div:hover{
color: #409EFF; color: var(--theme-color);
} }
.color-tab .color-active{ .color-tab .color-active{
background-color: #FFF; background-color: #FFF;
font-size: 14px; font-size: 14px;
color: #FA901C; color: var(--theme-color);
font-weight: 700; font-weight: 700;
border-color: #FA901C;; border-color: var(--theme-color);
} }
.color { .color {

165
nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
View File

@@ -10,96 +10,99 @@
<!-- end--标题--> <!-- end--标题-->
<!-- begin--表单--> <!-- begin--表单-->
<div class="right-box-form-box right-box__container"> <div class="right-box__container">
<el-form class="right-box-form right-box-form-left" :model="editAlertSilence" label-position="top" <div class="container__form">
label-width="120px" :rules="rules" ref="alertSilenceForm"> <el-form ref="alertSilenceForm" :model="editAlertSilence"
<el-form-item :label='$t("alert.silence.name")' prop="name" class="range-name"> :rules="rules" label-position="top" label-width="120px">
<el-input <el-form-item :label='$t("alert.silence.name")' class="range-name" prop="name">
maxlength="64" show-word-limit <el-input
:placeholder="''" v-model="editAlertSilence.name" :placeholder="''"
size="small" maxlength="64"
v-model="editAlertSilence.name"> show-word-limit
</el-input> size="small">
</el-form-item> </el-input>
<el-form-item :label='$t("alert.silence.time")' prop="time" class="range-time"> </el-form-item>
<div> <el-form-item :label='$t("alert.silence.time")' class="range-time" prop="time">
<el-radio-group v-model="rangeTime" size="small" @change="rangeTimeChange"> <div>
<el-radio-button label="1">{{ $t("overall.oneHour") }}</el-radio-button> <el-radio-group v-model="rangeTime" size="small" @change="rangeTimeChange">
<el-radio-button label="2">{{ $t("overall.twoHour") }}</el-radio-button> <el-radio-button label="1">{{ $t("overall.oneHour") }}</el-radio-button>
<el-radio-button label="6">{{ $t("overall.sixHour") }}</el-radio-button> <el-radio-button label="2">{{ $t("overall.twoHour") }}</el-radio-button>
<el-radio-button label="12">{{ $t("overall.twelveHour") }}</el-radio-button> <el-radio-button label="6">{{ $t("overall.sixHour") }}</el-radio-button>
<el-radio-button label="24">{{ $t("overall.oneDay") }}</el-radio-button> <el-radio-button label="12">{{ $t("overall.twelveHour") }}</el-radio-button>
<el-radio-button label="48">{{ $t("overall.twoDay") }}</el-radio-button> <el-radio-button label="24">{{ $t("overall.oneDay") }}</el-radio-button>
<el-radio-button label="168">{{ $t("overall.week") }}</el-radio-button> <el-radio-button label="48">{{ $t("overall.twoDay") }}</el-radio-button>
</el-radio-group> <el-radio-button label="168">{{ $t("overall.week") }}</el-radio-button>
</div> </el-radio-group>
<div class="datepicker">
<div class="datepicker-box">
<span class="datepicker-title">{{ $t("overall.startTime") }}</span>
<my-date-picker prefix-icon=" " class=" " size="mini" ref="calendar"
format="yyyy/MM/dd HH:mm:ss" @change="(val)=>{dateChange(val,'startAt')}" v-model="editAlertSilence.startAt"
type="datetime"
:clearable="false"
popper-class="panel-time-picker-popper"
:placeholder="$t('dashboard.panel.startTime')"
align="right"
>
</my-date-picker>
</div> </div>
<div class="datepicker-box"> <div class="datepicker">
<span class="datepicker-title">{{ $t("overall.endTime") }}</span> <div class="datepicker-box">
<my-date-picker prefix-icon=" " class=" " size="mini" ref="calendar" <span class="datepicker-title">{{ $t("overall.startTime") }}</span>
format="yyyy/MM/dd HH:mm:ss" @change="(val)=>{dateChange(val,'endAt')}" v-model="editAlertSilence.endAt" <my-date-picker ref="calendar" v-model="editAlertSilence.startAt" :clearable="false" :placeholder="$t('dashboard.panel.startTime')"
type="datetime" align="right" class=" " format="yyyy/MM/dd HH:mm:ss"
:clearable="false" popper-class="panel-time-picker-popper"
popper-class="panel-time-picker-popper" prefix-icon=" "
:placeholder="$t('dashboard.panel.startTime')" size="mini"
align="right" type="datetime"
> @change="(val)=>{dateChange(val,'startAt')}"
</my-date-picker> >
</my-date-picker>
</div>
<div class="datepicker-box">
<span class="datepicker-title">{{ $t("overall.endTime") }}</span>
<my-date-picker ref="calendar" v-model="editAlertSilence.endAt" :clearable="false" :placeholder="$t('dashboard.panel.startTime')"
align="right" class=" " format="yyyy/MM/dd HH:mm:ss"
popper-class="panel-time-picker-popper"
prefix-icon=" "
size="mini"
type="datetime"
@change="(val)=>{dateChange(val,'endAt')}"
>
</my-date-picker>
</div>
<!--( :range-separator="")-->
</div> </div>
<!--( :range-separator="")--> </el-form-item>
</div>
</el-form-item>
<el-form-item :label='$t("alert.silence.matchers")' prop="matchers" class="matchers"> <el-form-item :label='$t("alert.silence.matchers")' class="matchers" prop="matchers">
<div v-for="(item, index) in editAlertSilence.matchers" :key="index" class="param-box-row"> <div v-for="(item, index) in editAlertSilence.matchers" :key="index" class="param-box-row">
<el-form-item class="param-box-row-key" :rules="[{ required: true, message: $t('validate.required'), trigger: 'change' },]" :prop="'matchers.' + index + '.name'"> <el-form-item :prop="'matchers.' + index + '.name'" :rules="[{ required: true, message: $t('validate.required'), trigger: 'change' },]" class="param-box-row-key">
<el-autocomplete <el-autocomplete
class="inline-input silence-matchers-key" v-model="item.name"
placeholder="key" :fetch-suggestions="querySearch"
size="mini" class="inline-input silence-matchers-key"
v-model="item.name" placeholder="key"
:fetch-suggestions="querySearch" size="mini"
@select="handleSelect" @select="handleSelect"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<span class="param-box-row-eq">=</span> <span class="param-box-row-eq">=</span>
<el-form-item class="param-box-row-value" :prop="'matchers.' + index + '.value'" :rules="[{ required: true, message: $t('validate.required'), trigger: 'change' },]" > <el-form-item :prop="'matchers.' + index + '.value'" :rules="[{ required: true, message: $t('validate.required'), trigger: 'change' },]" class="param-box-row-value" >
<el-input placeholder="value" size="mini" v-model="item.value" class="silence-matchers-value"></el-input> <el-input v-model="item.value" class="silence-matchers-value" placeholder="value" size="mini"></el-input>
<el-checkbox class="silence-matchers-regex" v-model="item.regex" :true-label="1" :false-label="0" >Regex</el-checkbox> <el-checkbox v-model="item.regex" :false-label="0" :true-label="1" class="silence-matchers-regex" >Regex</el-checkbox>
</el-form-item> </el-form-item>
<span class="param-box-row-symbol" :id="'moduel-remove-label-'+index" @click="removematchers(index)"><i class="nz-icon nz-icon-shanchu1" style="color:#666;"></i></span> <span :id="'moduel-remove-label-'+index" class="param-box-row-symbol" @click="removematchers(index)"><i class="nz-icon nz-icon-shanchu1" style="color:#666;"></i></span>
</div> </div>
<div style="text-align: center;" class=""> <div class="" style="text-align: center;">
<span id="module-add-label" type="button" @click="addmatchers" class="right-box-form-add module-add-label right-box-form-minus-box module-add-label" style=""> <span id="module-add-label" type="button" @click="addmatchers" class="right-box-form-add module-add-label right-box-form-minus-box module-add-label" style="">
<span><i style="font-size: 16px;" class="nz-icon nz-icon-create-square"></i></span> <span><i style="font-size: 16px;" class="nz-icon nz-icon-create-square"></i></span>
</span> </span>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label='$t("overall.remark")' prop="remark" class="range-time"> <el-form-item :label='$t("overall.remark")' class="range-time" prop="remark">
<el-input <el-input
type="textarea" v-model="editAlertSilence.remark"
:placeholder="$t('overall.remark')" :placeholder="$t('overall.remark')"
v-model="editAlertSilence.remark" maxlength="256"
maxlength="256" show-word-limit
show-word-limit> type="textarea">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form>
</div>
</el-form>
</div> </div>
<!-- end--表单--> <!-- end--表单-->

5
nezha-fronted/src/components/common/table/settings/userTable.vue
View File

@@ -140,11 +140,10 @@ export default {
methods: { methods: {
statusChange (user) { statusChange (user) {
if (user.roles) { if (user.roles) {
user.roleIds = user.roles.map(t => t.id) user.roleIds = user.roles.map(t => t.id).join(',')
} }
this.$put(this.url, user).then(response => { this.$put(this.api, user).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.rightBox.show = false
this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') }) this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
} else { } else {
this.$message.error(response.msg) this.$message.error(response.msg)