|
|
@@ -3,8 +3,8 @@
|
|
|
|
|
|
<view class="ding">
|
|
|
<scroll-view scroll-x class="bg-white nav text-center">
|
|
|
- <view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav" :key="index" @tap="tabSelect"
|
|
|
- :data-id="index">
|
|
|
+ <view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav"
|
|
|
+ :key="index" @tap="tabSelect" :data-id="index">
|
|
|
<view v-if="TabCur==index&&!TabCur" class="cu-tag badge">
|
|
|
<block class="cu-tag badge">{{alarmUntreatedCount}} </block>
|
|
|
</view>
|
|
|
@@ -15,39 +15,40 @@
|
|
|
|
|
|
<block v-if="TabCur==0">
|
|
|
<view class="processList">
|
|
|
- <view class="cu-list menu-avatar">
|
|
|
-
|
|
|
- <view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
|
|
|
- <view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>
|
|
|
- <view class="content">
|
|
|
- <view class="pro-title">
|
|
|
- <view class="cut">{{item.measName}}</view>
|
|
|
- </view>
|
|
|
- <view class="pro-des ">
|
|
|
- <view class="text-cut">
|
|
|
- {{item.digitalValue!=0?"动作":"复归"}}
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="pro-date ">{{item.soeTime}}</view>
|
|
|
+ <view class="cu-list menu-avatar">
|
|
|
+
|
|
|
+ <view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
|
|
|
+ <view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>
|
|
|
+ <view class="content">
|
|
|
+ <view class="pro-title">
|
|
|
+ <view class="cut">{{item.measName}}</view>
|
|
|
</view>
|
|
|
- <view class="action" style="z-index:99;width:170rpx;text-align:right">
|
|
|
- <view class="unProcess" @tap="goUnprocessDetail(item.id)">未处理<text class="icon iconfont margin-left-xs margin-right-xs"></text></view>
|
|
|
+ <view class="pro-des ">
|
|
|
+ <view class="text-cut">
|
|
|
+ {{item.digitalValue!=0?"动作":"复归"}}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <view class=" text-center margin-top" v-if="alarmUntreatedCount === 0">暂无数据...</view>
|
|
|
+ <view class="pro-date ">{{item.soeTime}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="action" style="z-index:99;width:170rpx;text-align:right">
|
|
|
+ <view class="unProcess" @tap="goUnprocessDetail(item.id)">未处理<text
|
|
|
+ class="icon iconfont margin-left-xs margin-right-xs"></text></view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
+ <view class=" text-center margin-top" v-if="alarmUntreatedCount === 0">暂无数据...</view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
</view>
|
|
|
</block>
|
|
|
<block v-if="TabCur==1">
|
|
|
<view class="processList">
|
|
|
<!-- 筛选 start -->
|
|
|
- <view class=" padding-bottom-xs" style="border-bottom:1rpx solid rgba(221,221,221,.3)">
|
|
|
+ <view v-if="this.type==1 " class=" padding-bottom-xs" style="border-bottom:1rpx solid rgba(221,221,221,.3)">
|
|
|
<view class="cu-bar search filter-section">
|
|
|
<view class="search-form border-gray round bg-white">
|
|
|
<select name="" id="" v-model="handleStatus">
|
|
|
@@ -62,8 +63,9 @@
|
|
|
<view>
|
|
|
<checkbox-group class="block " @change="allChoose">
|
|
|
<view class="cu-form-group">
|
|
|
- <checkbox value="all" class='round blue' :class="{'checked':allChecked}" :checked="allChecked?true:false">
|
|
|
- </checkbox>
|
|
|
+ <checkbox value="all" class='round blue' :class="{'checked':allChecked}"
|
|
|
+ :checked="allChecked?true:false">
|
|
|
+ </checkbox>
|
|
|
<view class="title">批量处理</view>
|
|
|
</view>
|
|
|
</checkbox-group>
|
|
|
@@ -72,23 +74,23 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 筛选end -->
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
<checkbox-group @change="changeCheckbox">
|
|
|
- <view class="cu-list menu-avatar ">
|
|
|
-
|
|
|
+ <view class="cu-list menu-avatar " :class="this.handleStatus==2?'handle2scroll':''">
|
|
|
+
|
|
|
<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
|
|
|
-
|
|
|
+
|
|
|
<view class="cu-form-group checkPos">
|
|
|
-
|
|
|
- <!-- <checkbox :value="String(item.owner_code)" :checked="checkedArr.includes(String(item.owner_code))"
|
|
|
- :class="{'checked':checkedArr.includes(String(item.owner_code))}"></checkbox> -->
|
|
|
-
|
|
|
- <checkbox :value="String(item.id)" class='round blue ' :class="{'checked':checkedArr.includes(String(item.id))}" :checked="checkedArr.includes(String(item.id))">
|
|
|
- </checkbox>
|
|
|
+
|
|
|
+ <checkbox :value="String(item.id)" class='round blue '
|
|
|
+ :class="{'checked':checkedArr.includes(String(item.id))}"
|
|
|
+ :checked="checkedArr.includes(String(item.id))">
|
|
|
+ </checkbox>
|
|
|
</view>
|
|
|
-
|
|
|
- <view class="cu-avatar lg" :style="{'left':handleStatus==2 ? '60rpx':'0'}" style="background-image:url(../../static/processed-icon.png);"></view>
|
|
|
+
|
|
|
+ <view class="cu-avatar lg" :style="{'left':handleStatus==2 ? '60rpx':'0'}"
|
|
|
+ style="background-image:url(../../static/processed-icon.png);"></view>
|
|
|
<view class="content" :style="{'left':handleStatus==2 ? '180rpx':'120rpx'}">
|
|
|
<view class="pro-title">
|
|
|
<view class="cut">{{item.measName}}</view>
|
|
|
@@ -101,33 +103,42 @@
|
|
|
<view class="pro-date ">{{item.soeTime}}</view>
|
|
|
</view>
|
|
|
<view class="action" style="z-index:99;width:180rpx;text-align:right">
|
|
|
- <view class="processed" v-if="item.handling_status==1" @tap="goProcessedDetail(item.id)">
|
|
|
+ <view class="processed" v-if="item.handling_status==1"
|
|
|
+ @tap="goProcessedDetail(item)">
|
|
|
已处理
|
|
|
<text class="icon iconfont margin-left-xs margin-right-xs"></text>
|
|
|
</view>
|
|
|
- <view style="color:#FF8125" v-if="item.handling_status==2" @tap="goProcessedDetail(item.id)">待确认
|
|
|
- <text class="icon iconfont margin-left-xs margin-right-xs"></text>
|
|
|
+ <view style="color:#FF8125" v-if="item.handling_status==2"
|
|
|
+ @tap="goProcessedDetail(item)">待确认
|
|
|
+ <text class="icon iconfont margin-left-xs margin-right-xs"></text>
|
|
|
</view>
|
|
|
- <view style="color:#4274E7" v-if="item.handling_status==3" @tap="goProcessedDetail(item.id)">自动回复
|
|
|
- <text class="icon iconfont margin-left-xs margin-right-xs"></text>
|
|
|
+ <view style="color:#4274E7" v-if="item.handling_status==3"
|
|
|
+ @tap="goProcessedDetail(item)">自动回复
|
|
|
+ <text class="icon iconfont margin-left-xs margin-right-xs"></text>
|
|
|
</view>
|
|
|
- <view style="color:#999999" v-if="item.handling_status==4" @tap="goProcessedDetail(item.id)">过期失效
|
|
|
- <text class="icon iconfont margin-left-xs margin-right-xs"></text>
|
|
|
+ <view style="color:#999999" v-if="item.handling_status==4"
|
|
|
+ @tap="goProcessedDetail(item)">过期失效
|
|
|
+ <text class="icon iconfont margin-left-xs margin-right-xs"></text>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
<view class="text-center margin-top" v-if="alarmUntreatedCount1 === 0">暂无数据...</view>
|
|
|
</view>
|
|
|
- </checkbox-group>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ <view v-if="this.handleStatus==2" class="btn-area submitBottomBtn padding-lr-sm">
|
|
|
+ <button class="bg-blue round margin-top" @click="$noMultipleClicks(quickConfirm)">快速确认 </button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </checkbox-group>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
</block>
|
|
|
|
|
|
</view>
|
|
|
@@ -138,8 +149,9 @@
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
- allChecked:false,
|
|
|
-
|
|
|
+ noClick:true,
|
|
|
+ allChecked: false,
|
|
|
+
|
|
|
checkbox: [{
|
|
|
value: 'A',
|
|
|
checked: true
|
|
|
@@ -150,9 +162,9 @@
|
|
|
value: 'C',
|
|
|
checked: false
|
|
|
}],
|
|
|
- handleStatus:0,
|
|
|
- checkedArr:[],
|
|
|
-
|
|
|
+ handleStatus: 0,
|
|
|
+ checkedArr: [],
|
|
|
+
|
|
|
// unporcessList: json.unprocessList,
|
|
|
unporcessList: [],
|
|
|
porcessedList: [],
|
|
|
@@ -167,26 +179,26 @@
|
|
|
alarmUntreatedCount: '',
|
|
|
alarmUntreatedCount1: '',
|
|
|
processingStatus: '',
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
};
|
|
|
},
|
|
|
- watch:{
|
|
|
- handleStatus(val){
|
|
|
+ watch: {
|
|
|
+ handleStatus(val) {
|
|
|
// this.porcessedList={};
|
|
|
this.getProcessData({
|
|
|
"companyCode": this.companyCode,
|
|
|
"type": this.type,
|
|
|
"processingStatus": val
|
|
|
- }, this.TabCur);
|
|
|
-
|
|
|
+ }, this.TabCur);
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
onLoad: function(option) {
|
|
|
|
|
|
console.log(option.type);
|
|
|
@@ -213,6 +225,54 @@
|
|
|
},
|
|
|
methods: {
|
|
|
|
|
|
+ quickConfirm(){
|
|
|
+
|
|
|
+ // alert( this.formMess.start_time)
|
|
|
+ if (!this.checkedArr.length) {
|
|
|
+ uni.showToast({
|
|
|
+ title: "请至少选择一条需要确认的数据",
|
|
|
+ icon: "none"
|
|
|
+ });
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ console.log(this.checkedArr)
|
|
|
+
|
|
|
+ this.quickConfirmRes({
|
|
|
+ "id": this.checkedArr.toString(),
|
|
|
+ "companyCode": this.companyCode,
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+ // 请求
|
|
|
+ async quickConfirmRes(ming = {}) {
|
|
|
+ const res = await this.$myRequest({
|
|
|
+ url: 'IntegratedAlarm/setBatchProcessing',
|
|
|
+ data: ming
|
|
|
+ })
|
|
|
+ if (!res.data.flag) {
|
|
|
+ uni.showToast({
|
|
|
+ title: "添加失败",
|
|
|
+ icon: "none"
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ uni.showToast({
|
|
|
+ title: "添加成功",
|
|
|
+ });
|
|
|
+ }
|
|
|
+ setTimeout(() => {
|
|
|
+ uni.navigateTo({
|
|
|
+
|
|
|
+
|
|
|
+ url: '/pages/processList/processList?companyCode=' + this.companyCode +
|
|
|
+ '&type=1'
|
|
|
+ });
|
|
|
+ }, 1000);
|
|
|
+ },
|
|
|
+
|
|
|
// 全选事件
|
|
|
allChoose(e) {
|
|
|
let chooseItem = e.detail.value;
|
|
|
@@ -231,8 +291,8 @@
|
|
|
this.checkedArr = [];
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
- changeCheckbox(e){
|
|
|
+
|
|
|
+ changeCheckbox(e) {
|
|
|
this.checkedArr = e.detail.value;
|
|
|
// 如果选择的数组中有值，并且长度等于列表的长度，就是全选
|
|
|
if (this.checkedArr.length > 0 && this.checkedArr.length == this.porcessedList.length) {
|
|
|
@@ -245,8 +305,8 @@
|
|
|
async getProcessData(ming = {}, whichTab) {
|
|
|
const res = await this.$myRequest({
|
|
|
url: 'IntegratedAlarm/getElectricAlarmUntreated',
|
|
|
- data: ming,
|
|
|
- showLoading:true
|
|
|
+ data: ming,
|
|
|
+ showLoading: true
|
|
|
|
|
|
})
|
|
|
|
|
|
@@ -254,25 +314,25 @@
|
|
|
this.unporcessList = res.data.data;
|
|
|
this.alarmUntreatedCount = parseInt(res.data.alarmUntreatedCount)
|
|
|
} else {
|
|
|
-
|
|
|
+
|
|
|
this.porcessedList = res.data.data;
|
|
|
this.alarmUntreatedCount1 = parseInt(res.data.alarmUntreatedCount)
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
- console.log(this.porcessedList)
|
|
|
+ console.log(this.porcessedList)
|
|
|
},
|
|
|
|
|
|
tabSelect(e) {
|
|
|
console.log(e.currentTarget);
|
|
|
this.TabCur = e.currentTarget.dataset.id;
|
|
|
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
|
|
|
-
|
|
|
+ this.handleStatus=0
|
|
|
this.getProcessData({
|
|
|
"companyCode": this.companyCode,
|
|
|
"type": this.type,
|
|
|
- "processingStatus": !e.currentTarget.dataset.id?e.currentTarget.dataset.id:'1,2,3,4'
|
|
|
+ "processingStatus": !e.currentTarget.dataset.id ? e.currentTarget.dataset.id : '1,2,3,4'
|
|
|
}, this.TabCur);
|
|
|
|
|
|
|
|
|
@@ -282,7 +342,8 @@
|
|
|
// 页面跳转
|
|
|
goUnprocessDetail(id) {
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/unprocessDetail/unprocessDetail?companyCode=' + this.companyCode + '&processingStatus=0&id=' + id +
|
|
|
+ url: '/pages/unprocessDetail/unprocessDetail?companyCode=' + this.companyCode +
|
|
|
+ '&processingStatus=0&id=' + id +
|
|
|
'&type=1',
|
|
|
success: res => {},
|
|
|
fail: () => {},
|
|
|
@@ -291,17 +352,19 @@
|
|
|
},
|
|
|
goVideoUnprocessDetail(id) {
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/unprocessDetail/unprocessDetail?companyCode=' + this.companyCode + '&processingStatus=0&id=' + id +
|
|
|
+ url: '/pages/unprocessDetail/unprocessDetail?companyCode=' + this.companyCode +
|
|
|
+ '&processingStatus=0&id=' + id +
|
|
|
'&type=2',
|
|
|
success: res => {},
|
|
|
fail: () => {},
|
|
|
complete: () => {}
|
|
|
});
|
|
|
},
|
|
|
- goProcessedDetail(id) {
|
|
|
+ goProcessedDetail(item) {
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/processedDetail/processedDetail?companyCode=' + this.companyCode + '&processingStatus=' + this.processingStatus +
|
|
|
- '&id=' + id + '&type=1',
|
|
|
+ url: '/pages/processedDetail/processedDetail?companyCode=' + this.companyCode +
|
|
|
+ '&handling_status=' + item.handling_status +
|
|
|
+ '&id=' + item.id + '&type=1',
|
|
|
success: res => {},
|
|
|
fail: () => {},
|
|
|
complete: () => {}
|
|
|
@@ -310,14 +373,15 @@
|
|
|
|
|
|
goVideoProcessedDetail(id) {
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/processedDetail/processedDetail?companyCode=' + this.companyCode + '&processingStatus=' + this.processingStatus +
|
|
|
+ url: '/pages/processedDetail/processedDetail?companyCode=' + this.companyCode +
|
|
|
+ '&processingStatus=' + this.processingStatus +
|
|
|
'&id=' + id + '&type=2',
|
|
|
success: res => {},
|
|
|
fail: () => {},
|
|
|
complete: () => {}
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
InputFocus(e) {
|
|
|
this.InputBottom = e.detail.height
|
|
|
},
|
|
|
@@ -329,6 +393,12 @@
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss">
|
|
|
+ .handle2scroll {
|
|
|
+ height: calc(100vh - 400rpx);
|
|
|
+ overflow: scroll;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
//已处理未处理消息个数样式
|
|
|
|
|
|
.nav .cu-item.cur {
|
|
|
@@ -350,5 +420,8 @@
|
|
|
.lines-blue {
|
|
|
color: #4274E7
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
</style>
|
Ming