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

Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8

Browse Source
This commit is contained in:
zhangyu
2023-06-20 09:46:32 +08:00
parent 286ec0391d 5b993ba118
commit 7209d0c5bb
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue
View File

@@ -48,18 +48,18 @@
</el-card>
</div>
<div slot="footer" class="nz-select-img-dialog-footer">
<button class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="uploadPicChange">
<button class="nz-btn nz-btn-size-normal nz-btn-style-light" type="button" @click="uploadPicChange">
<i class="el-icon-plus"></i>
<span>
{{ $t('overall.uploadCustomPicture') }}
</span>
</button>
<span>
<button class="nz-btn nz-btn-size-normal nz-btn-style-light" style="margin-right: 20px" @click="changeSelectBoxShow(false)">
<button class="nz-btn nz-btn-size-normal nz-btn-style-light" style="margin-right: 20px" type="button" @click="changeSelectBoxShow(false)">
{{$t('overall.cancel')}}
</button>
<button class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="changImage" :disabled="prevent_opt.save"
<button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="changImage" :disabled="prevent_opt.save"
:class="{'nz-btn-disabled':prevent_opt.save}"
style="">
{{$t('el.datepicker.confirm')}}
@@ -73,7 +73,7 @@
:visible.sync="uploadPicShow"
custom-class="nz-select-img-dialog nz-new-dialog"
width="452px"
:append-to-body="true"
:append-to-body="false"
:modal-append-to-body="false"
@close="uploadPicShow = false"
destroy-on-close>
@@ -118,11 +118,11 @@
</el-row>
<div slot="footer" class="upload-pic-row" style="text-align: right;margin-bottom: 0;width: 100%">
<span>
<button class="nz-btn nz-btn-size-normal nz-btn-style-light" style="margin-right: 20px" @click="uploadPicShow=false">
<button class="nz-btn nz-btn-size-normal nz-btn-style-light" type="button" style="margin-right: 20px" @click="uploadPicShow=false">
{{$t('project.topology.exit')}}
</button>
<button class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="imgUpload" :disabled="prevent_opt.save"
<button class="nz-btn nz-btn-size-normal nz-btn-style-normal" type="button" @click="imgUpload" :disabled="prevent_opt.save"
:class="{'nz-btn-disabled':prevent_opt.save}"
style="">
{{$t('overall.save')}}
@@ -144,7 +144,7 @@ export default {
imgId: {},
showDefault: {
type: Boolean,
default: true
default: false
}
},
data () {
@@ -311,6 +311,7 @@ export default {
})
},
uploadPicChange () {
console.log(131123123123)
this.unitArr = []
this.tools.forEach((item, index) => {
if (index > 0) {

2
nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
View File

@@ -14,7 +14,7 @@
<!-- begin--表单-->
<div class="right-box-form-box right-box__container chart-right-box">
<el-form ref="chartForm" :model="editChart" :rules="rules" label-position= "top" label-width="120px">
<el-form ref="chartForm" :model="editChart" :rules="rules" label-position= "top" label-width="120px" @submit.native.prevent>
<el-form-item :label='$t("overall.name")' prop="name">
<div style="display:flex;align-items:center">
<el-input style="flex:1;margin-right:10px" maxlength="64" show-word-limit size="small" v-model="editChart.name" id="chart-box-title"></el-input>

1
nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
View File

@@ -6,6 +6,7 @@
:rules="rules"
label-position= "top"
label-width="120px"
@submit.native.prevent
>
<!--title-->
<div class="form__sub-title">

1
nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
View File

@@ -6,6 +6,7 @@
:rules="rules"
label-position= "top"
label-width="120px"
@submit.native.prevent
>
<div v-my-loading="loading" v-for="(item, index) in chartConfig.param.datasource " :key="index" class="chart-system-top-box">

4
nezha-fronted/src/components/common/selectTable.vue
View File

@@ -127,7 +127,9 @@ export default {
this.tableData = response.data.list
this.total = response.data.total
} else {
this.$message.error(response.msg)
if (response.msg || response.error) {
this.$message.error(response.msg || response.error)
}
}
})
},