xuhuajiao
/
canvasScreen_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

紧急发布新增 状态的改变

dev
xudanya 3 years ago
parent
5f831b9960
commit
245bdc9e18
5 changed files with 690 additions and 494 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/api/publish/urgentMessage.js
  2. 18
      src/views/device/deviceConfig.vue
  3. 12
      src/views/device/index.vue
  4. 35
      src/views/publishContent/index.vue
  5. 415
      src/views/publishContent/urgentMessage/index.vue

8
src/api/publish/urgentMessage.js
View File

@ -27,3 +27,11 @@ export function reqEditMessage(parameter) {
data: parameter data: parameter
}) })
} }
// 改变紧急通知的状态
export function reqChangeMessage(parameter) {
return request({
url: 'api/release/updateNoticeState',
method: 'post',
data: parameter
})
}

18
src/views/device/deviceConfig.vue
View File

@ -195,18 +195,6 @@
<div class="setting_cont upload_img"> <div class="setting_cont upload_img">
<el-form-item prop="startup_screen"> <el-form-item prop="startup_screen">
<UploadCover ref="childUpload" /> <UploadCover ref="childUpload" />
<!-- <el-upload
class="avatar-uploader"
action=""
:show-file-list="false"
:on-success="handleAvatarSuccess"
>
<img v-if="form.startup_screen" :src="form.startup_screen" class="avatar" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> -->
<!-- <el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt />
</el-dialog>-->
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -416,7 +404,7 @@ export default {
message: '修改设备成功' message: '修改设备成功'
}) })
this.addFromVisible = false this.addFromVisible = false
this.getStartUpList()
this.getStartUpList(this.queryInfo.page)
} }
}) })
} else { } else {
@ -457,7 +445,7 @@ export default {
message: '清空成功', message: '清空成功',
type: 'success' type: 'success'
}) })
this.getStartUpList()
this.getStartUpList(this.deviceList.length>1?this.queryInfo.page:this.queryInfo.page-1)
} }
}).catch(()=>{ }).catch(()=>{
this.$message({ this.$message({
@ -471,7 +459,7 @@ export default {
handleSizeChange(size) { handleSizeChange(size) {
//整理参数 //整理参数
this.queryInfo.size = size this.queryInfo.size = size
this.getPageList();
this.getStartUpList();
}, },
} }
} }

12
src/views/device/index.vue
View File

@ -263,8 +263,8 @@ export default {
}, },
methods: { methods: {
// 获取设备列表的数据 // 获取设备列表的数据
getDevice(){
// this.queryInfo.page=pager
getDevice(pager=1){
this.queryInfo.page=pager
const params = this.queryInfo const params = this.queryInfo
ReqDeviceList(params).then(res => { ReqDeviceList(params).then(res => {
console.log(res) console.log(res)
@ -311,8 +311,8 @@ export default {
type: 'success' type: 'success'
}) })
// 解绑时 如果一页设备只剩下一个 则返回上一页 // 解绑时 如果一页设备只剩下一个 则返回上一页
this.getDevice()
// this.deviceList.length>1?this.queryInfo.page:this.queryInfo.page-1
this.getDevice(this.deviceList.length>1?this.queryInfo.page:this.queryInfo.page-1)
} }
}) })
}).catch(()=>{ }).catch(()=>{
@ -351,7 +351,7 @@ export default {
}); });
} }
this.addFromVisible=false this.addFromVisible=false
this.getDevice()
this.getDevice(this.queryInfo.page)
}) })
} else { } else {
console.log('error submit!!') console.log('error submit!!')
@ -375,7 +375,7 @@ export default {
handleSizeChange(size) { handleSizeChange(size) {
//整理参数 //整理参数
this.queryInfo.size = size this.queryInfo.size = size
this.getPageList();
this.getDevice()
}, },
} }

35
src/views/publishContent/index.vue
View File

@ -1,24 +1,35 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="content_warp"> <div class="content_warp">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="发布列表" name="first">
<el-tabs v-model="activeName"
@tab-click="handleClick">
<el-tab-pane label="发布列表"
name="first">
<PublistList /> <PublistList />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="发布历史" name="second">
<el-tab-pane label="发布历史"
name="second">
<HistoryList /> <HistoryList />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="紧急通知" name="third">
<UrgentMessage />
<el-tab-pane label="紧急通知"
name="third">
<UrgentMessage ref="message" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<div v-if="activeName !== 'third'" class="home_publish_btn">
<el-button round @click="publishHandle(0)">即时发布</el-button>
<el-button round type="primary" @click="publishHandle(1)">定时发布</el-button>
<div v-if="activeName !== 'third'"
class="home_publish_btn">
<el-button round
@click="publishHandle(0)">即时发布</el-button>
<el-button round
type="primary"
@click="publishHandle(1)">定时发布</el-button>
</div> </div>
<div v-else class="home_publish_btn">
<el-button round>紧急发布</el-button>
<div v-else
class="home_publish_btn">
<el-button type="primary"
round
@click="addMessage">紧急发布</el-button>
</div> </div>
</div> </div>
</template> </template>
@ -46,6 +57,10 @@ export default {
path: '/release', query: { tag: index } path: '/release', query: { tag: index }
} }
) )
},
// 紧急发布 通知子组件发请求
addMessage () {
this.$refs.message.addFormData()
} }
} }
} }

415
src/views/publishContent/urgentMessage/index.vue
View File

@ -11,8 +11,18 @@
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<!-- prop="name" --> <!-- prop="name" -->
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column label="发布内容" align="center" prop="context" width="400" >
<el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column
label="发布内容"
align="center"
prop="context"
width="400"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ row.context }}</div> <div>{{ row.context }}</div>
</template> </template>
@ -26,26 +36,49 @@
<el-table-column label="发布人" align="center" prop="creater_name" /> <el-table-column label="发布人" align="center" prop="creater_name" />
<el-table-column label="状态" align="center" prop="is_state"> <el-table-column label="状态" align="center" prop="is_state">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div :class="{ 'stop_txt': row.is_state}">{{ row.is_state==1 ? '发布中' : '停止' }}</div>
<div :class="{ stop_txt: row.is_state }">
{{ row.is_state == 1 ? "发布中" : "停止" }}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="120px" align="center" fixed="right">
<el-table-column
label="操作"
width="120px"
align="center"
fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
class="edit_btn" class="edit_btn"
@click="editFormData(scope.row)" @click="editFormData(scope.row)"
>编辑</el-button>
>编辑</el-button
>
<el-button <el-button
type="primary" type="primary"
:class="['start_btn', { 'stop_btn': scope.row.is_state==1 }]"
:class="['start_btn', { stop_btn: scope.row.is_state == 1 }]"
@click="isStopHandle(scope.$index, scope.row)" @click="isStopHandle(scope.$index, scope.row)"
>{{ scope.row.is_state==1 ? '停止' : '恢复' }}</el-button>
>{{ scope.row.is_state == 1 ? "停止" : "恢复" }}</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-col> </el-col>
</el-row> </el-row>
<!-- 分页器 -->
<el-pagination
style="margin-top: 20px; text-align: center"
:current-page="queryInfo.page"
:total="total"
:page-size="queryInfo.size"
:pager-count="5"
:page-sizes="[3, 5, 10]"
@current-change="getUrgentMessage"
@size-change="handleSizeChange"
layout="prev, pager, next, jumper,->,sizes,total"
>
</el-pagination>
<!-- 编辑紧急通知 --> <!-- 编辑紧急通知 -->
<div class="publish_layer"> <div class="publish_layer">
<el-dialog <el-dialog
@ -60,34 +93,48 @@
label="文本颜色" label="文本颜色"
prop="context_color" prop="context_color"
:rules="[ :rules="[
{ required: true, message: '请选择文本颜色', trigger: '' }
{ required: true, message: '请选择文本颜色', trigger: '' },
]" ]"
> >
<colorPicker v-model="form.context_color" class="txt_color" @change="headleChangeColor" />
<colorPicker
v-model="form.context_color"
class="txt_color"
@change="headleChangeColor"
/>
<el-input v-show="false" v-model="form.context_color" /> <el-input v-show="false" v-model="form.context_color" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="文本内容" label="文本内容"
prop="context" prop="context"
:rules="[ :rules="[
{ required: true, message: '请输入文本内容', trigger: 'blur' }
{ required: true, message: '请输入文本内容', trigger: 'blur' },
]" ]"
> >
<el-input v-model="form.context" type="textarea" rows="6" style="width: 674px;" />
<el-input
v-model="form.context"
type="textarea"
rows="6"
style="width: 674px"
/>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="文本大小" label="文本大小"
prop="context_size"
prop="context_size_name"
:rules="[ :rules="[
{ required: true, message: '请选择文本大小', trigger: 'change' }, { required: true, message: '请选择文本大小', trigger: 'change' },
]" ]"
> >
<el-select v-model="form.context_size" size="small" class="filter-item">
<el-select
v-model="form.context_size_name"
size="small"
class="filter-item"
@change="selectSize"
>
<el-option <el-option
v-for="item in sizeData" v-for="item in sizeData"
:key="item.key" :key="item.key"
:label="item.name" :label="item.name"
:value="item.key"
:value="item"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -98,7 +145,13 @@
{ required: true, message: '请选择文本位置', trigger: 'change' }, { required: true, message: '请选择文本位置', trigger: 'change' },
]" ]"
> >
<el-select v-model="form.context_position_name" size="small" value-key="name" class="filter-item" @change="selectPosition">
<el-select
v-model="form.context_position_name"
size="small"
value-key="name"
class="filter-item"
@change="selectPosition"
>
<el-option <el-option
v-for="item in positionData" v-for="item in positionData"
:key="item.key" :key="item.key"
@ -114,7 +167,12 @@
{ required: true, message: '请选择滚动速度', trigger: 'change' }, { required: true, message: '请选择滚动速度', trigger: 'change' },
]" ]"
> >
<el-select v-model="form.context_speed_name" size="small" class="filter-item" @change="selectSpeed">
<el-select
v-model="form.context_speed_name"
size="small"
class="filter-item"
@change="selectSpeed"
>
<el-option <el-option
v-for="item in speedData" v-for="item in speedData"
:key="item.key" :key="item.key"
@ -130,17 +188,38 @@
{ required: true, message: '请选择设备', trigger: 'change' }, { required: true, message: '请选择设备', trigger: 'change' },
]" ]"
> >
<el-radio-group v-model="form.notice_device" @change="clearCheckbox()">
<el-radio-group
v-model="form.notice_device"
@change="clearCheckbox()"
>
<el-radio :label="1" value="all">所有设备</el-radio> <el-radio :label="1" value="all">所有设备</el-radio>
<el-radio :label="2" value= "other" >部分设备<i v-if="form.notice_device === 2" class="radio_tip" @click="addDeviceTag()">添加</i></el-radio>
<el-radio :label="2" value="other"
>部分设备<i
v-if="form.notice_device === 2"
class="radio_tip"
@click="addDeviceTag()"
>添加</i
></el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<div v-if="form.notice_device === 1" class="select_all_tip">所有设备都将被发送</div>
<div v-if="deviceTags.length>0 && form.notice_device === 2" class="select_other">
<div v-if="form.notice_device === 1" class="select_all_tip">
所有设备都将被发送
</div>
<div
v-if="deviceTags.length > 0 && form.notice_device === 2"
class="select_other"
>
<el-row> <el-row>
<el-col :span="10" class="other_tip">以下设备都将被发送<span>总计{{ deviceTags.length }}个设备</span></el-col>
<el-col :span="10" class="other_tip"
>以下设备都将被发送<span
>总计{{ deviceTags.length }}个设备</span
></el-col
>
<el-col :span="4"> <el-col :span="4">
<el-button round class="delt_btn" @click="clearDevice()">清空</el-button>
<el-button round class="delt_btn" @click="clearDevice()"
>清空</el-button
>
</el-col> </el-col>
</el-row> </el-row>
<el-tag <el-tag
@ -160,11 +239,12 @@
<!-- :loading="crud.status.cu === 2" <!-- :loading="crud.status.cu === 2"
@click="crud.submitCU"--> @click="crud.submitCU"-->
<el-button type="primary" round @click="submit">保存</el-button> <el-button type="primary" round @click="submit">保存</el-button>
<el-button round @click="messageVisible=false">关闭</el-button>
<el-button round @click="closeDialog">关闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
<!-- 添加发布的设备 --> <!-- 添加发布的设备 -->
<!-- 添加发布的设备 -->
<div class="add_device_layer"> <div class="add_device_layer">
<el-dialog <el-dialog
title="请选择设备" title="请选择设备"
@ -189,125 +269,192 @@
</template> </template>
<script> <script>
import { parseTime } from '@/utils/index.js'
import { ReqDeviceList} from '@/api/device/deviceList.js'
import {reqUrgentMessage,reqQueryMessage,reqEditMessage} from '@/api/publish/urgentMessage'
import { parseTime } from "@/utils/index.js";
import { ReqDeviceList } from "@/api/device/deviceList.js";
import {
reqUrgentMessage,
reqQueryMessage,
reqEditMessage,
reqChangeMessage
} from "@/api/publish/urgentMessage";
export default { export default {
name: 'UrgentMessage',
name: "UrgentMessage",
filters: { filters: {
parseTime(time, cFormat) { parseTime(time, cFormat) {
return parseTime(time, cFormat)
}
return parseTime(time, cFormat);
},
}, },
data() { data() {
return { return {
isAddEdit: false,
form: { form: {
context_color: '#ff0000',//文本的颜色
context: '', //文本的内容
context_color: "#ff0000", //文本的颜色
context: "", //文本的内容
context_position: null, //文本的位置 context_position: null, //文本的位置
context_position_name: null, context_position_name: null,
context_speed_name: null, context_speed_name: null,
context_speed: null, //文本的速度 context_speed: null, //文本的速度
context_size_name: null,
context_size: null, //文字的大小 context_size: null, //文字的大小
// create_by:'', //发布人 // create_by:'', //发布人
notice_device: null, notice_device: null,
notice_devices: [], notice_devices: [],
notice_id:'' ,//紧急通知的id
orga_id:'133221333123111',
notice_id: "", //紧急通知的id
orga_id: "133221333123111",
}, },
queryInfo: { queryInfo: {
notice_name:'',
orga_id:'133221333123111',
notice_name: "",
orga_id: "133221333123111",
page: 1, page: 1,
size:3
size: 3,
}, },
total: 0,
messageVisible: false, messageVisible: false,
selectDeviceVisible: false, selectDeviceVisible: false,
sizeData: [{ key: '0', name: 16 }, { key: '1', name: 22 }, { key: '2', name: 24 }, { key: '3', name: 30 }],
positionData: [{ key: 1, name: '顶部' }, { key: 2, name: '中间' }, { key: 3, name: '底部' }],
speedData: [{ key: 0, name: '1s' }, { key: 1, name: '2s' }, { key: 2, name: '3s' }],
sizeData: [
{ key: 0, name: 16 },
{ key: 1, name: 22 },
{ key: 2, name: 24 },
{ key: 3, name: 30 },
],
positionData: [
{ key: 1, name: "顶部" },
{ key: 2, name: "中间" },
{ key: 3, name: "底部" },
],
speedData: [
{ key: 0, name: "1s" },
{ key: 1, name: "2s" },
{ key: 2, name: "3s" },
],
selectedList: [], selectedList: [],
// 部分设备列表的数据 // 部分设备列表的数据
deviceList: [], deviceList: [],
// newArr:[], // newArr:[],
deviceTags: [], deviceTags: [],
// 紧急通知列表 // 紧急通知列表
urgentMessage:[]
}
urgentMessage: [],
};
}, },
mounted() { mounted() {
this.getUrgentMessage()
this.getDevice()
this.getUrgentMessage();
this.getDevice();
}, },
methods: { methods: {
// 获取紧急通知的列表 // 获取紧急通知的列表
getUrgentMessage(){
const params=this.queryInfo
reqUrgentMessage(params).then(res=>{
getUrgentMessage(pager=1) {
this.queryInfo.page=pager
const params = this.queryInfo;
reqUrgentMessage(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.urgentMessage=res.data.content
// console.log( this.urgentMessage)
this.urgentMessage = res.data.content;
this.total = res.data.totalElements;
// console.log(this.urgentMessage);
} }
})
});
}, },
// 获取设备列表的信息 // 获取设备列表的信息
getDevice() { getDevice() {
const params = this.queryInfo
ReqDeviceList(params).then(res => {
const params = this.queryInfo;
ReqDeviceList(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.deviceList=res.data.content
this.deviceList = res.data.content;
} else { } else {
return this.$message.error('获取设备列表失败！')
return this.$message.error("获取设备列表失败！");
} }
})
});
}, },
// 紧急通知的状态 is_state为1 发布中 2 停止
// row.is_state == 1 ? "停止" : "恢复"
isStopHandle(index, row) { isStopHandle(index, row) {
console.log(row)
// console.log(index)
if (row.is_state == 1) { if (row.is_state == 1) {
row.is_state=2
row.is_state = 2;
} else { } else {
row.is_state=1
row.is_state = 1;
} }
const params={
id:row.notice_id,
state:row.is_state
}
reqChangeMessage(params).then(res=>{
// console.log(res)
if(res.code==200){
if(params.state==1){
this.$message({
type: "success",
message:'已发布成功！'
});
}else{
this.$message({
type: "success",
message:'已停止！'
});
}
}else{
return this.$message.error("失败了~~~~");
}
})
}, },
// 编辑 // 编辑
editFormData(row) { editFormData(row) {
console.log(row)
this.messageVisible = true
this.messageVisible = true;
// 根据id查询返回的紧急通知的数据 // 根据id查询返回的紧急通知的数据
const params = { const params = {
notice_id:row.notice_id
}
reqQueryMessage(params).then(res=>{
console.log(res)
notice_id: row.notice_id,
};
reqQueryMessage(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.form.notice_device=res.data.notice.noticeDevice
this.form.context_color=res.data.notice.contextColor
this.form.context=res.data.notice.context
this.form.context_position=res.data.notice.contextPosition
this.form.context_size=res.data.notice.contextSize
this.form.notice_device = res.data.notice.noticeDevice;
this.form.context_color = res.data.notice.contextColor;
this.form.context = res.data.notice.context;
this.form.context_position = res.data.notice.contextPosition;
this.form.context_size = res.data.notice.contextSize;
this.form.notice_id = row.notice_id;
// 判断文字位置 // 判断文字位置
if (this.form.context_position == 1) { if (this.form.context_position == 1) {
this.form.context_position_name='顶部'
this.form.context_position_name = "顶部";
} else if (this.form.context_position == 2) { } else if (this.form.context_position == 2) {
this.form.context_position_name='中部'
this.form.context_position_name = "中部";
} else { } else {
this.form.context_position_name='底部'
this.form.context_position_name = "底部";
} }
// 判断速度 // 判断速度
if(this.form.context_speed==0){
this.form.context_speed_name='1s'
}else if(this.form.context_speed==1){
this.form.context_speed_name='2s'
// if(context_speed_name == 0){
// this.form.context_speed_name='1s'
// }else if(this.form.context_speed==1){
// this.form.context_speed_name='2s'
// }else{
// this.form.context_speed_name='3s'
// }
//判断文字大小
if (this.form.context_size == 0) {
this.form.context_size_name = "16";
} else if (this.form.context_size == 1) {
this.form.context_size_name = "22";
} else if (this.form.context_size == 2) {
this.form.context_size_name = "24";
} else { } else {
this.form.context_speed_name='3s'
this.form.context_size_name = "30";
} }
} }
})
});
},
// 新增
addFormData() {
this.messageVisible = true;
this.$nextTick(() => {
this.form.notice_id = null;
});
}, },
// 提交
submit() { submit() {
this.$refs.form.validate((valid) => {
// 修改
if (valid) {
const params = { const params = {
context: this.form.context, context: this.form.context,
context_color: this.form.context_color, context_color: this.form.context_color,
@ -317,74 +464,112 @@ export default {
notice_device: this.form.notice_device, notice_device: this.form.notice_device,
notice_devices: this.form.notice_devices, notice_devices: this.form.notice_devices,
notice_id: this.form.notice_id, notice_id: this.form.notice_id,
orga_id:'133221333123111'
}
reqEditMessage(params).then(res=>{
console.log(params)
console.log(res)
})
orga_id: "133221333123111",
};
reqEditMessage(params).then((res) => {
if (res.code == 200) {
this.$message({
type: "success",
message: this.form.notice_id
? "修改紧急通知成功"
: "添加紧急通知成功",
});
this.messageVisible = false;
this.getUrgentMessage(this.form.notice_id? this.queryInfo:1);
}
});
}
});
}, },
// 所有设备和部分设备的切换数据处理 // 所有设备和部分设备的切换数据处理
clearCheckbox() { clearCheckbox() {
if (this.form.notice_device == 1) { if (this.form.notice_device == 1) {
this.form.notice_devices=[]
}else{
this.form.AllDevice=this.deviceList
this.form.notice_devices = [];
} }
}, },
// 多选框
handleSelectionChange(val) { handleSelectionChange(val) {
this.selectedList = val
if (val.length > 0) {
this.clearBtnDisabled = false
} else {
this.clearBtnDisabled = true
}
// console.log(val)
this.selectedList = val;
// if (val.length > 0) {
// this.clearBtnDisabled = false;
// } else {
// this.clearBtnDisabled = true;
// }
}, },
// 改变文字的颜色 // 改变文字的颜色
headleChangeColor() { headleChangeColor() {
console.log(this.form.context_color)
this.form.context_size;
},
// 改变文字的大小
selectSize(selVal) {
this.form.context_size = selVal.key;
this.form.context_size_name = selVal.name;
}, },
// 改变文字的位置 // 改变文字的位置
selectPosition(selVal) { selectPosition(selVal) {
// console.log(selVal)
this.form.context_position=selVal.key
this.form.context_position_name=selVal.name
this.form.context_position = selVal.key;
this.form.context_position_name = selVal.name;
}, },
// 速度 // 速度
selectSpeed(selVal) { selectSpeed(selVal) {
this.form.context_speed=selVal.key
this.form.context_speed_name=selVal.name
this.form.context_speed = selVal.key;
this.form.context_speed_name = selVal.name;
}, },
//添加设备的对话框 //添加设备的对话框
addDeviceTag() { addDeviceTag() {
this.selectDeviceVisible = true
this.selectDeviceVisible = true;
}, },
// 添加设备 // 添加设备
tagHandle(tag) { tagHandle(tag) {
this.form.notice_devices.push({deviceId:tag.device_id})
// 收集参数 部分设备的列表
if (this.form.notice_devices.length == 0) {
this.form.notice_devices.push({ deviceId: tag.device_id });
} else {
const result = this.form.notice_devices.some((item) => {
return item.deviceId == tag.device_id;
});
if (!result) {
this.form.notice_devices.push({ deviceId: tag.device_id });
}
}
// 添加设备不能重复 不重复才添加
if (this.deviceTags.length == 0) { if (this.deviceTags.length == 0) {
this.deviceTags.push(tag)
this.deviceTags.push(tag);
} else { } else {
const current = this.deviceTags &&this.deviceTags.some((item) => item.device_name == tag.device_name )
// 查找是否存在相同的
console.log('current', current)
const current =
this.deviceTags &&
this.deviceTags.some((item) => item.device_name == tag.device_name);
if (!current) { if (!current) {
this.deviceTags.push(tag)
this.deviceTags.push(tag);
} else {
this.$message("请勿添加重复的设备！");
} }
// !this.deviceTags.some(item => item.device_name === tag.device_name)
// && this.deviceTags.push(tag)
} }
}, },
// 单独删除某一个设备 // 单独删除某一个设备
handleClose(tag) { handleClose(tag) {
this.deviceTags.splice(this.deviceTags.indexOf(tag), 1)
// console.log(this.deviceTags)
this.deviceTags.splice(this.deviceTags.indexOf(tag), 1);
}, },
// 清空设备 // 清空设备
clearDevice() { clearDevice() {
this.deviceTags = []
this.deviceTags = [];
}, },
}
}
// 关闭重置表单
closeDialog() {
this.messageVisible = false;
this.$refs.form.resetFields();
},
// 每条显示数据改变时的事件
handleSizeChange(size) {
//整理参数
this.queryInfo.size = size
this.getUrgentMessage();
},
},
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -427,7 +612,7 @@ export default {
font-size: 12px; font-size: 12px;
color: #999; color: #999;
background: #fff; background: #fff;
box-shadow: 0 0 5px rgba(0,0,0,.14);
box-shadow: 0 0 5px rgba(0, 0, 0, 0.14);
} }
.select_other { .select_other {
width: 600px; width: 600px;

Write Preview
Loading…
Cancel
Save