|
|
@@ -1,8 +1,7 @@
|
|
|
<template>
|
|
|
<view class="padding-sm messagePush" style="padding-bottom:150rpx">
|
|
|
<form action="">
|
|
|
- <checkbox-group class="block" @change="CheckboxChange" style="height: calc(100vh - 200rpx);
|
|
|
- overflow: scroll">
|
|
|
+ <checkbox-group class="block" @change="CheckboxChange" style="height: calc(100vh - 200rpx);overflow: scroll">
|
|
|
<view class="margin-top ">
|
|
|
<view class="flex align-left checkItems" v-for="(item,index) in checkbox">
|
|
|
<checkbox class="blue" :class="item.checked==1?'checked':''"
|
|
|
@@ -17,7 +16,6 @@
|
|
|
</form>
|
|
|
</view>
|
|
|
</template>
|
|
|
-
|
|
|
<script>
|
|
|
export default {
|
|
|
data() {
|
|
|
@@ -101,7 +99,7 @@
|
|
|
checked: false,
|
|
|
title: '测温点1超温'
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
{
|
|
|
value: 'm16',
|
|
|
checked: false,
|
|
|
@@ -127,7 +125,7 @@
|
|
|
checked: false,
|
|
|
title: 'A相燃弧'
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
{
|
|
|
value: 'm21',
|
|
|
checked: false,
|
|
|
@@ -138,7 +136,7 @@
|
|
|
checked: false,
|
|
|
title: 'C相燃弧'
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
{
|
|
|
value: 'm23',
|
|
|
checked: false,
|
|
|
@@ -159,7 +157,7 @@
|
|
|
checked: false,
|
|
|
title: '视在需量超限'
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
{
|
|
|
value: 'm27',
|
|
|
checked: false,
|
|
|
@@ -185,7 +183,7 @@
|
|
|
checked: false,
|
|
|
title: '开出2'
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
],
|
|
|
|
|
|
}
|
|
|
@@ -199,7 +197,6 @@
|
|
|
var items = this.checkbox,
|
|
|
values = e.detail.value;
|
|
|
this.checkedValue = values;
|
|
|
-
|
|
|
for (var i = 0, lenI = items.length; i < lenI; ++i) {
|
|
|
items[i].checked = false;
|
|
|
for (var j = 0, lenJ = values.length; j < lenJ; ++j) {
|
|
|
@@ -219,14 +216,12 @@
|
|
|
showLoading: true
|
|
|
})
|
|
|
console.log(res.data.data)
|
|
|
- // console.log(JSON.parse(res.data.data))
|
|
|
this.getData = res.data.data[0];
|
|
|
|
|
|
// 遍历checkbox数组对象
|
|
|
for (let i = 0; i < this.checkbox.length; i++) {
|
|
|
//判断value是否存在于返回对象中.存在的话checked重新赋值
|
|
|
if (this.getData.hasOwnProperty(this.checkbox[i].value)) {
|
|
|
- // console.log(this.checkbox[i].value)
|
|
|
this.checkbox[i].checked = true
|
|
|
}
|
|
|
}
|
|
|
@@ -236,7 +231,7 @@
|
|
|
async pushSubmit() {
|
|
|
|
|
|
let mingParams = {};
|
|
|
-
|
|
|
+
|
|
|
if (!this.flag) {
|
|
|
//不点击默认传参
|
|
|
var obgj = this.getData;
|
|
|
@@ -248,6 +243,7 @@
|
|
|
console.log(obgj[key])
|
|
|
arr.push([key][0])
|
|
|
}
|
|
|
+ console.log(arr)
|
|
|
arr.map((e) => {
|
|
|
mingParams[e] = true;
|
|
|
});
|
|
|
@@ -263,33 +259,22 @@
|
|
|
console.log(mingParams)
|
|
|
}
|
|
|
|
|
|
- console.log(this.getData)
|
|
|
- console.log(mingParams)
|
|
|
-
|
|
|
//验证是否有变动
|
|
|
- let newValue=[];
|
|
|
- let oldValue=[];
|
|
|
- for(var key in mingParams){
|
|
|
- newValue.push(key)
|
|
|
- }
|
|
|
- for(var key in this.getData){
|
|
|
- oldValue.push(key)
|
|
|
- }
|
|
|
- if(oldValue.toString()==newValue.toString()){
|
|
|
+ if(!this.flag){
|
|
|
uni.showToast({
|
|
|
title: "无修改!",
|
|
|
icon: "none"
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//验证是否为空
|
|
|
- if(Object.keys(mingParams).length==0){
|
|
|
+ if (Object.keys(mingParams).length == 0) {
|
|
|
uni.showToast({
|
|
|
title: "请至少选择一条消息",
|
|
|
icon: "none"
|
|
|
});
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
|
|
|
let res = await this.PushSettings(mingParams);
|
|
|
@@ -326,6 +311,7 @@
|
|
|
display: inline-block;
|
|
|
text-align: left;
|
|
|
margin-bottom: 30rpx;
|
|
|
+
|
|
|
.title {
|
|
|
display: inline-block;
|
|
|
margin-left: 10rpx;
|
ming