From 4308bbdb6b4893d23ddc2fcaf9c5dee412dd5ebd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 09 十二月 2025 08:50:31 +0800
Subject: [PATCH] 更改头部
---
admin/src/components/business/OperaWarningRuleWindow.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/admin/src/components/business/OperaWarningRuleWindow.vue b/admin/src/components/business/OperaWarningRuleWindow.vue
index 226c5e7..0afd40a 100644
--- a/admin/src/components/business/OperaWarningRuleWindow.vue
+++ b/admin/src/components/business/OperaWarningRuleWindow.vue
@@ -11,7 +11,7 @@
2.鍙戠敓鍖哄煙闈炲繀濉紝涓嶅～鍒欒〃绀鸿瑙勫垯涓嬫墍鏈夊尯鍩熺殑鐩稿簲鎶ヨ绫诲瀷鍧囬�氱煡;<br>
</p>
<el-form :model="form" ref="form" :rules="rules">
- <div style="display: flex;" v-for="(item,index) in form.detailList" :key="'region_'+item.random" >
+ <div style="display: flex;" v-for="(item,index) in form.detailList" :key="'warning_'+index" >
<span style="line-height: 32px;font-size: 14px;"><b style="color: #F56C6C;margin-right: 4px;font-size: 11px;">*</b>{{'瑙勫垯'+(index +1)}}</span>
<el-form-item label="" style="display: inline-block;margin-left: 10px; " >
<el-select v-model="item.warningId" filterable placeholder="璇烽�夋嫨鎶ヨ绫诲瀷" >
@@ -37,7 +37,9 @@
</el-form-item>
<el-button type="danger" style="margin-left: 10px;height: 32px; " @click="delDo(index)" v-if="index>0 || form.detailList.length>1">鍒犻櫎</el-button>
</div>
- <el-button type="primary" style="margin-left: 10px;margin-bottom: 20px;" @click="addDo">澧炲姞瑙勫垯</el-button>
+ <el-form-item label="" prop="detailList" style="width: 150px">
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 20px;" @click="addDo">澧炲姞瑙勫垯</el-button>
+ </el-form-item>
<el-form-item label="鐘舵��" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="0" :value="0">绂佺敤</el-radio>
@@ -47,7 +49,7 @@
<el-form-item label="鍙戠敓闂撮殧鏃堕棿(绉掞級" prop="intervalSec">
<el-input type="number" v-model="form.intervalSec" placeholder="璇疯緭鍏ュ瑙勫垯闂撮殧鏃堕棿(绉掞級" v-trim/>
</el-form-item>
- <el-form-item label="閽夐拤閫氱煡" prop="memberNotice" style="display:inline-block;width: 50%;">
+ <el-form-item label="閽夐拤閫氱煡" prop="memberNotice" >
<el-switch style="margin-right:30px;width:100px" v-model="form.memberNotice" :active-value="1" :inactive-value="0" active-text="寮�" inactive-text="鍏�"></el-switch>
</el-form-item>
<el-form-item label="閫夋嫨閽夐拤閫氱煡浜哄憳" v-if="form.memberNotice ==1" prop="memberIds" style="margin-bottom: 30px" >
@@ -56,7 +58,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="骞挎挱閫氱煡" prop="deviceNotice" style="display:inline-block;width: 50%;" >
+ <el-form-item label="骞挎挱閫氱煡" prop="deviceNotice" >
<el-switch style="margin-right:30px;width: 100px" v-model="form.deviceNotice" :active-value="1" :inactive-value="0" active-text="寮�" inactive-text="鍏�">></el-switch>
</el-form-item>
<el-form-item label="閫夋嫨鎾姤骞挎挱" v-if="form.deviceNotice ==1" prop="deviceIds" style="margin-bottom: 30px" >
@@ -83,6 +85,20 @@
extends: BaseOpera,
components: { GlobalWindow },
data () {
+ var validIdDetals = (rule, value, callback) => {
+ if (this.form.detailList == null || this.form.detailList.length == 0) {
+ callback(new Error('璇烽厤缃鍒�'))
+ return
+ }
+ for (let i = 0; i < this.form.detailList.length; i++) {
+ var item = this.form.detailList[i]
+ if (!item || item.warningId === undefined || !item.warningId || item.warningId == null) {
+ callback(new Error('璇锋纭厤缃鍒�'))
+ return
+ }
+ }
+ callback()
+ }
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -105,10 +121,11 @@
regionList: [],
// 楠岃瘉瑙勫垯
rules: {
+ detailList: [{ required: true, validator: validIdDetals, message: '璇锋纭厤缃鍒�', tigger: 'blur' }],
memberNotice: [{ required: true, message: '璇烽�夋嫨閽夐拤閫氱煡' }],
deviceNotice: [{ required: true, message: '璇烽�夋嫨鏄惁骞挎挱閫氱煡' }],
- deviceIds: [{ required: true, message: '璇烽�夋嫨鎾姤骞挎挱', tigger: 'blur' }],
- memberIds: [{ required: true, message: '璇烽�夋嫨閫氱煡浜哄憳', tigger: 'blur' }],
+ deviceIds: [{ required: true, message: '璇烽�夋嫨鎾姤骞挎挱' }],
+ memberIds: [{ required: true, message: '璇烽�夋嫨閫氱煡浜哄憳' }],
status: [{ required: true, message: '璇烽�夋嫨鐘舵��' }]
}
}
@@ -212,12 +229,16 @@
this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
})
+
return
}
// 缂栬緫
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
+ this.form.memberNotice = this.form.memberNotice || 0
+ this.form.deviceNotice = this.form.deviceNotice || 0
+ this.form.status = this.form.status || 0
}
if (!this.form.detailList || !this.form.detailList.length) {
this.form.detailList = [{ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null }]
--
Gitblit v1.9.3