From e45bc3ba9c16e86390224f8bb4d6ad5ede232793 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:00:40 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/components/business/OperaWarningRuleWindow.vue | 66 +++++----------------------------
1 files changed, 10 insertions(+), 56 deletions(-)
diff --git a/admin/src/components/business/OperaWarningRuleWindow.vue b/admin/src/components/business/OperaWarningRuleWindow.vue
index 53869f3..d37adf5 100644
--- a/admin/src/components/business/OperaWarningRuleWindow.vue
+++ b/admin/src/components/business/OperaWarningRuleWindow.vue
@@ -19,7 +19,7 @@
</el-select>
</el-form-item>
<el-form-item label="" style="display: inline-block;margin-left: 10px">
-<!-- <el-select v-model="item.regionId" filterable multiple clearable placeholder="璇烽�夋嫨鍙戠敓鍖哄煙" >
+<!-- <el-select v-model="item.regionId" filterable multiple clearable placeholder="璇烽�夋嫨鍙戠敓鍖哄煙" >
<el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>-->
@@ -34,11 +34,6 @@
noChildrenText="娌℃湁瀛愰�夐」"
noOptionsText="娌℃湁鍙�夐」"
noResultsText="娌℃湁鍖归厤鐨勭粨鏋�" />
- </el-form-item>
- <el-form-item label="" style="display: inline-block;margin-left: 10px; " >
- <el-select v-model="item.deviceId" filterable placeholder="璇烽�夋嫨鐩戞帶鐐�" @change="changeCamera(item)" >
- <el-option v-for="item1 in item.carmeraList" :label="item1.name" :value="item1.indexCode" ></el-option>
- </el-select>
</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>
@@ -91,7 +86,7 @@
components: { GlobalWindow },
data () {
var validIdDetals = (rule, value, callback) => {
- if (this.form.detailList == null || this.form.detailList.length == 0) {
+ if (this.form.detailList == null || this.form.detailList.length==0) {
callback(new Error('璇烽厤缃鍒�'))
return
}
@@ -116,7 +111,7 @@
intervalSec: '',
sortnum: '',
status: 0,
- detailList: [{ random: Math.random(), regionId: null, regionName: null, deviceId: null, deviceName: null, regionCode: null, warningId: null }]
+ detailList: [{ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null }]
},
deviceSelect: [],
memberSelect: [],
@@ -129,8 +124,8 @@
detailList: [{ required: true, validator: validIdDetals, message: '璇锋纭厤缃鍒�', tigger: 'blur' }],
memberNotice: [{ required: true, message: '璇烽�夋嫨閽夐拤閫氱煡' }],
deviceNotice: [{ required: true, message: '璇烽�夋嫨鏄惁骞挎挱閫氱煡' }],
- deviceIds: [{ required: true, message: '璇烽�夋嫨鎾姤骞挎挱' }],
- memberIds: [{ required: true, message: '璇烽�夋嫨閫氱煡浜哄憳' }],
+ deviceIds: [{ required: true, message: '璇烽�夋嫨鎾姤骞挎挱'}],
+ memberIds: [{ required: true, message: '璇烽�夋嫨閫氱煡浜哄憳'}],
status: [{ required: true, message: '璇烽�夋嫨鐘舵��' }]
}
}
@@ -140,7 +135,6 @@
api: '/business/warningRule',
'field.id': 'id'
})
- this.loadRegions()
},
methods: {
normalizeOptions (node) {
@@ -154,48 +148,18 @@
children: node.childList
}
},
- changeCamera (curitem) {
- var list = curitem.carmeraList
- if (list && list.length) {
- list.forEach(item => {
- if (curitem.deviceId === item.indexCode) {
- curitem.deviceName = item.name
- }
- })
- }
- },
changeSel (opt) {
- console.log('=================changeSel',opt,this.form.detailList)
var item = this.form.detailList[opt]
this.form.detailList[opt].regionCode = null
this.form.detailList[opt].regionName = null
- this.form.detailList[opt].carmeraList = []
if (item.regionId) {
var reg = this.getSelectedObject(item.regionId)
if (reg) {
this.form.detailList[opt].regionCode = reg.indexCode
this.form.detailList[opt].regionName = reg.name
- this.form.detailList[opt].carmeraList = reg.carmeraList
}
}
- this.$nextTick(() => {
- console.log('=================changeSel1' , this.form.detailList[opt].carmeraList,this.form.detailList[opt].deviceId)
- if(this.notInCarmeraList( this.form.detailList[opt].carmeraList,this.form.detailList[opt].deviceId) ){
- this.form.detailList[opt].deviceId = null
- this.form.detailList[opt].deviceName = null
- }
- })
- },
- notInCarmeraList (list, id) {
- var r = true
- if (list && list.length) {
- for (const item of list) {
- if (item.indexCode === id) {
- r = false
- }
- }
- }
- return r
+ console.log(' this.form.detailList[opt]', reg, this.form.detailList[opt])
},
getSelectedObject (id) {
if (!id) {
@@ -215,7 +179,7 @@
return findSelected(this.regionList) // 寮�濮嬫悳绱㈠苟杩斿洖缁撴灉
},
addDo () {
- this.form.detailList.push({ random: Math.random(), deviceId: null, deviceName: null, regionId: null, regionName: null, regionCode: null, warningId: null })
+ this.form.detailList.push({ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null })
},
delDo (index) {
if (this.form.detailList.length > 1 && this.form.detailList.length > index) {
@@ -257,7 +221,7 @@
deviceNoticeContent: '',
memberNotice: 1,
status: 0,
- detailList: [{ random: Math.random(), deviceId: null, deviceName: null, regionId: null, regionName: null, regionCode: null, warningId: null }]
+ detailList: [{ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null }]
}
// 鏂板缓
if (target == null) {
@@ -265,29 +229,19 @@
this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
})
+
return
}
// 缂栬緫
this.$nextTick(() => {
- this.form.detailList =target.detailList
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
}
- console.log('===========================', this.form.detailList, target.detailList)
if (!this.form.detailList || !this.form.detailList.length) {
- this.form.detailList = [{ random: Math.random(), deviceId: null, deviceName: null, regionId: null, regionName: null, regionCode: null, warningId: null }]
- } else {
- this.form.detailList.forEach((item, index) => {
- if (item.regionId != null) {
- var region = this.getSelectedObject(item.regionId)
- if (region) {
- item.carmeraList = region.carmeraList || []
- }
- }
- })
+ this.form.detailList = [{ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null }]
}
if (this.form.memberIds) {
this.memberSelect = this.form.memberIds.split(',')
--
Gitblit v1.9.3