From 65b367f51fc7b1ce8e005a513bb9365b872894c5 Mon Sep 17 00:00:00 2001
From: whyczyk <525500596@qq.com>
Date: 星期五, 03 九月 2021 12:13:40 +0800
Subject: [PATCH] 代码已提交
---
src/pages/alarm-details.vue | 197 ++++++++++++++++++++++++++++++++----------------
1 files changed, 130 insertions(+), 67 deletions(-)
diff --git a/src/pages/alarm-details.vue b/src/pages/alarm-details.vue
index ae06340..66c0dc6 100644
--- a/src/pages/alarm-details.vue
+++ b/src/pages/alarm-details.vue
@@ -96,83 +96,88 @@
</div>
</div>
</div>
- <div v-if="userPower!=0&&!isNoAlarm">
- <div class="subBtn" @click="startHandle" v-if="alarmInfo.status==1">寮�濮嬪鐞�</div>
- <div class="card" v-if="alarmInfo.status==2">
- <div class="commonTitle cardTitle">
- 璁㈠崟鐘舵�侊細
- </div>
- <van-steps :active="stepsActive">
- <van-step>澶勭悊涓�</van-step>
- <van-step>寰呭鏍�</van-step>
- <van-step>宸插畬鎴�</van-step>
- </van-steps>
+ <!-- 濡傛灉鏄鐞嗕腑鐘舵�� -->
+ <div class="card" v-if="alarmInfo.status==2||alarmInfo.status==3">
+ <div class="commonTitle cardTitle">
+ 璁㈠崟鐘舵�侊細
</div>
- <div class="subBtn" @click="toPage('edit')" v-if="alarmInfo.status==2&&stepsActive==0">缁х画澶勭悊</div>
- <div class="card" v-else-if="alarmInfo.status==2&&stepsActive==1||alarmInfo.status==2&&stepsActive==2">
- <div class="commonTitle cardTitle">
- 鍛婅澶勭悊锛�
+ <van-steps :active="stepsActive">
+ <van-step>澶勭悊涓�</van-step>
+ <van-step>寰呭鏍�</van-step>
+ <van-step>宸插畬鎴�</van-step>
+ </van-steps>
+ </div>
+ <!-- 濡傛灉鏄繘鍏ュ鏍哥姸鎬� -->
+ <div class="card"
+ v-if="alarmInfo.status==2&&stepsActive==1||alarmInfo.status==2&&stepsActive==2||alarmInfo.status==3">
+ <div class="commonTitle cardTitle">
+ 鍛婅澶勭悊锛�
+ </div>
+ <div class="commonTitle">
+ <div class="label">
+ 闂鎻忚堪锛�
</div>
- <div class="commonTitle">
- <div class="label">
- 闂鎻忚堪锛�
- </div>
- <div class="text">
- {{handleInfo.description}}
- </div>
+ <div class="text">
+ {{handleInfo.description}}
</div>
- <div class="commonTitle">
- <div class="label">
- 澶勭悊鍓嶇収鐗囷細
- </div>
- <div class="text">
- <div class="van-uploader__wrapper"
- v-if="handleInfo.imageBefore&&handleInfo.imageBefore.split(',').length>0">
- <div class="van-uploader__preview" v-for="(item,i) in handleInfo.imageBefore.split(',')" :key="i"
- @click="toShowImgpreview(handleInfo.imageBefore.split(','))">
- <div class="van-image van-uploader__preview-image">
- <img :src="item" class="van-image__img" style="object-fit: cover;">
- </div>
+ </div>
+ <div class="commonTitle">
+ <div class="label">
+ 澶勭悊鍓嶇収鐗囷細
+ </div>
+ <div class="text">
+ <div class="van-uploader__wrapper"
+ v-if="handleInfo.imageBefore&&handleInfo.imageBefore.split(',').length>0">
+ <div class="van-uploader__preview" v-for="(item,i) in handleInfo.imageBefore.split(',')" :key="i"
+ @click="toShowImgpreview(handleInfo.imageBefore.split(','))">
+ <div class="van-image van-uploader__preview-image">
+ <img :src="item" class="van-image__img" style="object-fit: cover;">
</div>
</div>
</div>
</div>
- <div class="commonTitle">
- <div class="label">
- 澶勭悊鏂规硶锛�
- </div>
- <div class="text">
- {{handleInfo.workWay}}
- </div>
+ </div>
+ <div class="commonTitle">
+ <div class="label">
+ 澶勭悊鏂规硶锛�
</div>
- <div class="commonTitle">
- <div class="label">
- 澶勭悊鍚庣収鐗囷細
- </div>
- <div class="text">
- <div class="van-uploader__wrapper"
- v-if="handleInfo.imageAfter&&handleInfo.imageAfter.split(',').length>0">
- <div class="van-uploader__preview" v-for="(item,i) in handleInfo.imageAfter.split(',')" :key="i"
- @click="toShowImgpreview(handleInfo.imageAfter.split(','))">
- <div class="van-image van-uploader__preview-image">
- <img :src="item" class="van-image__img" style="object-fit: cover;">
- </div>
+ <div class="text">
+ {{handleInfo.workWay}}
+ </div>
+ </div>
+ <div class="commonTitle">
+ <div class="label">
+ 澶勭悊鍚庣収鐗囷細
+ </div>
+ <div class="text">
+ <div class="van-uploader__wrapper" v-if="handleInfo.imageAfter&&handleInfo.imageAfter.split(',').length>0">
+ <div class="van-uploader__preview" v-for="(item,i) in handleInfo.imageAfter.split(',')" :key="i"
+ @click="toShowImgpreview(handleInfo.imageAfter.split(','))">
+ <div class="van-image van-uploader__preview-image">
+ <img :src="item" class="van-image__img" style="object-fit: cover;">
</div>
</div>
</div>
</div>
- <div class="commonTitle">
- <div class="label">
- 鎰忚寤鸿锛�
- </div>
- <div class="text">
- {{handleInfo.workSuggest}}
- </div>
+ </div>
+ <div class="commonTitle">
+ <div class="label">
+ 鎰忚寤鸿锛�
+ </div>
+ <div class="text">
+ {{handleInfo.workSuggest}}
</div>
</div>
</div>
+ <!-- 濡傛灉鏄淮鎶ゅ憳骞朵笖鏈夊疄鏃跺憡璀� -->
+ <div v-if="userPower!=0&&!isNoAlarm">
+ <div class="subBtn" @click="startHandle" v-if="alarmInfo.status==1">寮�濮嬪鐞�</div>
+ <div class="subBtn" @click="toPage('edit')" v-if="alarmInfo.status==2&&stepsActive==0">缁х画澶勭悊</div>
+ </div>
+ <!-- 濡傛灉鏄淮鎶ゅ憳骞朵笖瀹炴椂鍛婅宸茶嚜鍔ㄦ秷闄� -->
<div class="subBtn" @click="completeAlarm" v-else-if="userPower!=0&&isNoAlarm">纭鍛婅鑷姩娑堥櫎</div>
- <div class="" v-else-if="userPower==0&&alarmInfo.status==0">
+ <!-- 濡傛灉鏄鐞嗗憳鏈淳鍙� -->
+ <div v-if="userPower==0&&alarmInfo.status==0">
<div class="card">
<div class="commonTitle cardTitle">
鎸囨淳浜哄憳锛�
@@ -185,6 +190,17 @@
</div>
<div class="subBtn" @click="toAssign">纭鎸囨淳</div>
</div>
+ <!-- 濡傛灉鏄鐞嗗憳寰呭鏍� -->
+ <div v-if="userPower==0&&alarmInfo.status==2&&stepsActive==1">
+ <div class="card">
+ <van-field v-model="handleInfo.note" rows="2" autosize label="瀹℃牳鎰忚" type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙佲��"
+ show-word-limit />
+ </div>
+ <div class="btnCon">
+ <div class="subBtn" @click="suggest(3)">閫氳繃</div>
+ <div class="subBtn" @click="suggest(-1)">涓嶉�氳繃</div>
+ </div>
+ </div>
</div>
<van-image-preview v-model="showImgPreview" :images="ImgPreviewList">
</van-image-preview>
@@ -196,6 +212,7 @@
updateWorkAlarm,
searchStatusById,
dispatchTask,
+ updateUserWork,
} from '@/assets/js/api'
import {
mapState,
@@ -246,7 +263,6 @@
},
mounted() {
this.alarmInfo = JSON.parse(this.$route.query.alarmData);
- console.log(this.alarmInfo)
let assignUser = sessionStorage.getItem('assignUser')
if (assignUser) {
this.assignUser = JSON.parse(assignUser)
@@ -262,7 +278,8 @@
path: '/alarmHandle',
query: {
id: this.alarmInfo.id,
- type: type
+ type: type,
+ managerId: this.alarmInfo.managerId
}
})
},
@@ -329,11 +346,14 @@
if (resData.data.dispatchTime) {
this.alarmInfo.dispatchTime = resData.data.dispatchTime;
}
- if (resData.data.userWorkList.length > 0) {
- this.handleInfo = resData.data.userWorkList[0];
- this.stepsActive = this.handleInfo.checkStatus
+ if (resData.data.managerId) {
+ this.alarmInfo.managerId = resData.data.managerId;
}
- if (this.alarmInfo.status != 3) {
+ if (resData.data.userWorkList && resData.data.userWorkList.length > 0) {
+ this.handleInfo = resData.data.userWorkList[0];
+ this.stepsActive = this.handleInfo.checkStatus - 1
+ }
+ if (this.alarmInfo.status != 3 && resData.data.flg == 0) {
this.isNoAlarm = true
} else {
this.isNoAlarm = false
@@ -352,6 +372,24 @@
let resData = JSON.parse(res.data.result)
if (resData.code == 1) {
this.toPage('add')
+ }
+ }).catch((err) => {
+ console.log(err)
+ });
+ },
+ suggest(checkStatus) {
+ this.handleInfo.checkStatus = checkStatus;
+ let endTime = this.$units.timeFormat(new Date().getTime, 'yyyy-mm-dd hh:MM:ss');
+ this.handleInfo.endTime = endTime;
+ if (this.handleInfo.note == '') {
+ this.$toast('璇疯緭鍏ュ鏍告剰瑙佲��')
+ return
+ }
+ updateUserWork(this.handleInfo).then((res) => {
+ let resData = JSON.parse(res.data.result)
+ if (resData.code == 1) {
+ this.$toast('瀹℃牳鎴愬姛!')
+ this.loadStatus()
}
}).catch((err) => {
console.log(err)
@@ -419,4 +457,29 @@
font-size: 36px;
margin-top: 48px;
}
+
+ .btnCon {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ }
+
+ .btnCon .subBtn {
+ flex: 1;
+ height: 98px;
+ background: #07c160;
+ border-radius: 8px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #FFFFFF;
+ font-size: 36px;
+ margin-top: 48px;
+ margin-right: 24px;
+ }
+
+ .btnCon .subBtn:last-of-type {
+ margin-right: 0;
+ background: #f9534b;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1