From 9375dfbf2ea9c082d78f82abe072a4ef9521728e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 二月 2025 16:27:57 +0800
Subject: [PATCH] ll
---
h5/pages/polling/detail.vue | 9 +
h5/pages/polling/point.vue | 218 ++++++++++++++++++-----------------
h5/pages/workOrder/edit.vue | 50 ++++---
h5/pages/operation/device.vue | 63 +++++-----
h5/pages/workOrder/problemEdit.vue | 14 +-
h5/pages/polling/task.vue | 3
6 files changed, 188 insertions(+), 169 deletions(-)
diff --git a/h5/pages/operation/device.vue b/h5/pages/operation/device.vue
index 25d7921..9ec4389 100644
--- a/h5/pages/operation/device.vue
+++ b/h5/pages/operation/device.vue
@@ -83,7 +83,7 @@
import {
uploadUrl,
ywDevicePost,
- ywDeviceCreate,
+ ywDeviceCreate,
getFindByCode
} from '@/api'
import dayjs from 'dayjs';
@@ -123,7 +123,7 @@
},
handleP() {
const {
- param,
+ param,
fileList
} = this
ywDeviceCreate({
@@ -132,24 +132,27 @@
dealDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
multifileList: fileList
}).then(res => {
- if (param.status != 0) {
- uni.showModal({
- title: '娓╅Θ鎻愮ず',
- content: '璁惧杩愮淮缁撴灉寮傚父锛屾槸鍚﹀墠寰�鎻愪氦宸ュ崟?',
- success: function(res) {
- if (res.confirm) {
- uni.redirectTo({
- url: '/pages/workOrder/edit'
- })
- } else if (res.cancel) {
- uni.navigateBack()
+ if (res && res.code == 200) {
+ if (param.status != 0) {
+ uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: '璁惧杩愮淮缁撴灉寮傚父锛屾槸鍚﹀墠寰�鎻愪氦宸ュ崟?',
+ success: function(res) {
+ if (res.confirm) {
+ uni.redirectTo({
+ url: '/pages/workOrder/edit'
+ })
+ } else if (res.cancel) {
+ uni.navigateBack()
+ }
}
- }
- });
- }else{
- this.showToast('鎻愪氦鎴愬姛')
- uni.navigateBack()
+ });
+ } else {
+ this.showToast('鎻愪氦鎴愬姛')
+ uni.navigateBack()
+ }
}
+
})
},
getDevice() {
@@ -285,19 +288,19 @@
qrbox: 280 //璁剧疆浜岀淮鐮佹壂鎻忔澶у皬
},
(decodeText, decodeResult) => {
- if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭
- this.stopScan(); //鍏抽棴鎵爜鍔熻兘
- getFindByCode(decodeText).then(ress => {
- if (ress.data) {
- console.log('ress', ress.data);
- this.$set(this.param, 'deviceCode', ress.data.code)
- this.$set(this.param, 'deviceId', ress.data.id)
- this.$set(this.param, 'deviceName', ress.data.name)
- } else {
- this.showToast('鏈尮閰嶅埌宸℃鐐�,璇烽噸鏂版壂鎻�')
- }
+ if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭
+ this.stopScan(); //鍏抽棴鎵爜鍔熻兘
+ getFindByCode(decodeText).then(ress => {
+ if (ress.data) {
+ console.log('ress', ress.data);
+ this.$set(this.param, 'deviceCode', ress.data.code)
+ this.$set(this.param, 'deviceId', ress.data.id)
+ this.$set(this.param, 'deviceName', ress.data.name)
+ } else {
+ this.showToast('鏈尮閰嶅埌宸℃鐐�,璇烽噸鏂版壂鎻�')
+ }
})
-
+
}
},
(err) => {
diff --git a/h5/pages/polling/detail.vue b/h5/pages/polling/detail.vue
index 202dfeb..228733e 100644
--- a/h5/pages/polling/detail.vue
+++ b/h5/pages/polling/detail.vue
@@ -83,7 +83,8 @@
id: '',
info: {},
list: [],
- flag: false,
+ flag: false,
+ userInfo: uni.getStorageSync('userInfo') || {},
statusM: [{
color: '#4593f7',
name: '寰呭紑濮�'
@@ -180,8 +181,10 @@
ywPatrolDetail(id).then(res => {
this.info = res.data
let time = new Date(res.data.startDate).getTime()
- console.log('res.data.startDate', new Date().getTime());
- this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1 || this.info.status == 2)
+ console.log('res.data.startDate', new Date().getTime());
+ if(res.data.userIds.indexOf(this.userInfo.id) > -1){
+ this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1 || this.info.status == 2)
+ }
})
ywPatrolTaskRecord({
capacity: 999,
diff --git a/h5/pages/polling/point.vue b/h5/pages/polling/point.vue
index a71efb0..b85c9d8 100644
--- a/h5/pages/polling/point.vue
+++ b/h5/pages/polling/point.vue
@@ -8,7 +8,8 @@
<template v-if="info.status == 1">
<view class="line">
<div class="la">宸℃缁撴灉锛�</div>
- <div class="val primaryColor" :class="{red: info.dealStatus == 1}">{{ info.dealStatus == 0 ? '姝ｅ父' : info.dealStatus == 1 ? '寮傚父' : '-' }}
+ <div class="val primaryColor" :class="{red: info.dealStatus == 1}">
+ {{ info.dealStatus == 0 ? '姝ｅ父' : info.dealStatus == 1 ? '寮傚父' : '-' }}
</div>
</view>
<view class="line">
@@ -28,11 +29,11 @@
<view class="files">
<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in info.multifileList" :key="i">
<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
- <!-- <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video> -->
- <view v-if="item.type == 1" @click="videoClick(item)" class="video_wrap">
- <video :src="item.fileurlFull" initial-time="0.01" :show-center-play-btn="false" :controls="false"
- class="video" :enable-progress-gesture="false" muted />
- <image src="@/static/play.png" class="play" mode=""></image>
+ <!-- <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video> -->
+ <view v-if="item.type == 1" @click="videoClick(item)" class="video_wrap">
+ <video :src="item.fileurlFull" initial-time="0.01" :show-center-play-btn="false" :controls="false"
+ class="video" :enable-progress-gesture="false" muted />
+ <image src="@/static/play.png" class="play" mode=""></image>
</view>
</view>
</view>
@@ -101,13 +102,13 @@
@cancel="isShowHandleDate = false" mode="datetime"></u-datetime-picker>
<u-picker :show="isShowRes" keyName="name" @cancel="isShowRes = false" @confirm='confirmRes'
:columns="columns"></u-picker>
- <!-- -->
- <view v-if="videoPlay" class="video_app">
- <video controls autoplay muted x5-video-player-type="h5" x5-video-player-fullscreen="true" id="myvideo"
- :src="videoUrl" @fullscreenchange="screenChange"></video>
- <view class="bg" @click="closeVideo"></view>
- </view>
- <!-- -->
+ <!-- -->
+ <view v-if="videoPlay" class="video_app">
+ <video controls autoplay muted x5-video-player-type="h5" x5-video-player-fullscreen="true" id="myvideo"
+ :src="videoUrl" @fullscreenchange="screenChange"></video>
+ <view class="bg" @click="closeVideo"></view>
+ </view>
+ <!-- -->
</view>
</template>
@@ -146,11 +147,11 @@
// name: '璺宠繃'
// },
]
- ],
-
- videoPlay: false,
- videoContext: null,
- videoUrl: ''
+ ],
+
+ videoPlay: false,
+ videoContext: null,
+ videoUrl: ''
};
},
onLoad(option) {
@@ -170,32 +171,35 @@
multifileList: fileList,
id,
}).then(res => {
- if (handleParam.dealStatus == 1) {
- return uni.showModal({
- title: '娓╅Θ鎻愮ず',
- content: '宸℃缁撴灉寮傚父锛屾槸鍚﹀墠寰�鎻愪氦宸ュ崟锛�',
- success: (res) => {
- if (res.confirm) {
- this.showToast('鎿嶄綔鎴愬姛')
- setTimeout(() => {
- uni.redirectTo({
- url: '/pages/workOrder/edit'
- })
- }, 300)
- }else{
- this.showToast('鎿嶄綔鎴愬姛')
- setTimeout(() => {
- uni.navigateBack()
- }, 300)
+ if (res.code == 200) {
+ if (handleParam.dealStatus == 1) {
+ return uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: '宸℃缁撴灉寮傚父锛屾槸鍚﹀墠寰�鎻愪氦宸ュ崟锛�',
+ success: (res) => {
+ if (res.confirm) {
+ this.showToast('鎿嶄綔鎴愬姛')
+ setTimeout(() => {
+ uni.redirectTo({
+ url: '/pages/workOrder/edit'
+ })
+ }, 300)
+ } else {
+ this.showToast('鎿嶄綔鎴愬姛')
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 300)
+ }
}
- }
- });
- } else {
- this.showToast('鎿嶄綔鎴愬姛')
- setTimeout(() => {
- uni.navigateBack()
- }, 300)
+ });
+ } else {
+ this.showToast('鎿嶄綔鎴愬姛')
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 300)
+ }
}
+
})
},
getDetail() {
@@ -219,26 +223,26 @@
this.$set(this.handleParam, 'dealStatus', e.value[0].id)
this.$set(this.handleParam, 'dealName', e.value[0].name)
this.isShowRes = false
- },
- videoClick(item) {
- this.videoPlay = true;
- this.videoContext = uni.createVideoContext("myvideo", this); // this杩欎釜鏄疄渚嬪璞� 蹇呬紶
- this.videoUrl = item.fileurlFull;
- this.videoContext.requestFullScreen();
- this.$nextTick(() => {
- this.videoContext.play();
- })
- },
- screenChange(e) {
- let fullScreen = e.detail.fullScreen // 鍊紅rue涓鸿繘鍏ュ叏灞忥紝false涓洪��鍑哄叏灞�
- if (!fullScreen) {
- //閫�鍑哄叏灞�
- this.videoPlay = false // 闅愯棌鎾斁鐩掑瓙
- }
- },
- closeVideo() {
- this.videoPlay = false
- this.videoContext = null
+ },
+ videoClick(item) {
+ this.videoPlay = true;
+ this.videoContext = uni.createVideoContext("myvideo", this); // this杩欎釜鏄疄渚嬪璞� 蹇呬紶
+ this.videoUrl = item.fileurlFull;
+ this.videoContext.requestFullScreen();
+ this.$nextTick(() => {
+ this.videoContext.play();
+ })
+ },
+ screenChange(e) {
+ let fullScreen = e.detail.fullScreen // 鍊紅rue涓鸿繘鍏ュ叏灞忥紝false涓洪��鍑哄叏灞�
+ if (!fullScreen) {
+ //閫�鍑哄叏灞�
+ this.videoPlay = false // 闅愯棌鎾斁鐩掑瓙
+ }
+ },
+ closeVideo() {
+ this.videoPlay = false
+ this.videoContext = null
},
fileDel(str, i) {
this[str].splice(i, 1);
@@ -505,51 +509,53 @@
image {
width: 100%;
height: 100%;
- }
- video {
- width: 100%;
- height: 100%;
}
- .video_wrap {
- position: relative;
- border: 1px solid;
- width: 156rpx;
- height: 156rpx;
- border-radius: 4rpx;
-
- .play {
- width: 60rpx !important;
- height: 60rpx !important;
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- }
+
+ video {
+ width: 100%;
+ height: 100%;
}
- }
-
- .video_app {
- overflow: hidden;
- position: fixed;
- left: 0;
- top: 0;
- width: 100vw;
- height: 100vh;
- display: flex;
- align-items: center;
- z-index: 9990;
-
- .bg {
- background-color: rgba(0, 0, 0, .6);
- position: absolute;
- width: 100%;
- height: 100%;
- z-index: -1;
- }
-
- video {
- width: 100%;
- height: 42vh;
- }
+
+ .video_wrap {
+ position: relative;
+ border: 1px solid;
+ width: 156rpx;
+ height: 156rpx;
+ border-radius: 4rpx;
+
+ .play {
+ width: 60rpx !important;
+ height: 60rpx !important;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
+ }
+ }
+
+ .video_app {
+ overflow: hidden;
+ position: fixed;
+ left: 0;
+ top: 0;
+ width: 100vw;
+ height: 100vh;
+ display: flex;
+ align-items: center;
+ z-index: 9990;
+
+ .bg {
+ background-color: rgba(0, 0, 0, .6);
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ z-index: -1;
+ }
+
+ video {
+ width: 100%;
+ height: 42vh;
+ }
}
</style>
\ No newline at end of file
diff --git a/h5/pages/polling/task.vue b/h5/pages/polling/task.vue
index 0fcaf6b..0981643 100644
--- a/h5/pages/polling/task.vue
+++ b/h5/pages/polling/task.vue
@@ -195,7 +195,8 @@
this.list = [...this.list, ...res.data.records]
this.list.forEach(item => {
let time = new Date(item.startDate).getTime()
- item.flag = new Date().getTime() > time
+ let userInfo = uni.getStorageSync('userInfo') || {}
+ item.flag = new Date().getTime() > time && item.userIds.indexOf(userInfo.id) > -1
})
this.total = res.data.total
})
diff --git a/h5/pages/workOrder/edit.vue b/h5/pages/workOrder/edit.vue
index ff72df9..653c56c 100644
--- a/h5/pages/workOrder/edit.vue
+++ b/h5/pages/workOrder/edit.vue
@@ -22,7 +22,8 @@
<view class="la"><text class="red">*</text>宸ュ崟鍒嗙被</view>
<view class="line sel_wrap" @click="showCate1 = true">
<view class="left" :class="param.cateName ? '' : 'placeholder9'">
- {{ param.cateName ? param.cateName : '璇烽�夋嫨' }}</view>
+ {{ param.cateName ? param.cateName : '璇烽�夋嫨' }}
+ </view>
<u-icon name="arrow-right" color="#999999" size="15"></u-icon>
</view>
</view>
@@ -51,7 +52,8 @@
<u-icon class="close" size="20" name="close-circle-fill" color="red"
@click="fileDel('fileList', i)"></u-icon>
<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
- <video v-if="item.type == 1" :show-center-play-btn="false" :src="item.fileurlFull" :controls="false"></video>
+ <video v-if="item.type == 1" :show-center-play-btn="false" :src="item.fileurlFull"
+ :controls="false"></video>
</view>
</view>
</view>
@@ -142,20 +144,22 @@
const {
param,
fileList
- } = this
- if (!param.projectId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
- if (!param.buildingId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
- if (!param.floorName && !param.roomNum) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
+ } = this
+ if (!param.projectId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
+ if (!param.buildingId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
+ if (!param.floorName && !param.roomNum) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
if (!param.cateName) return this.showToast('璇烽�夋嫨宸ュ崟鍒嗙被')
ywWorkorderCreate({
...param,
// roomId: '',
fileList
}).then(res => {
- this.showToast('鎻愪氦鎴愬姛')
- uni.redirectTo({
- url: '/pages/workOrder/list'
- })
+ if (res && res.code == 200) {
+ this.showToast('鎻愪氦鎴愬姛')
+ uni.redirectTo({
+ url: '/pages/workOrder/list'
+ })
+ }
})
},
changeHandler(e) {
@@ -167,8 +171,8 @@
// 寰俊灏忕▼搴忔棤娉曞皢picker瀹炰緥浼犲嚭鏉ワ紝鍙兘閫氳繃ref鎿嶄綔
picker = this.$refs.uPicker
} = e
- // 褰撶涓�鍒楀�煎彂鐢熷彉鍖栨椂锛屽彉鍖栫浜屽垪(鍚庝竴鍒�)瀵瑰簲鐨勯�夐」
- console.log(index);
+ // 褰撶涓�鍒楀�煎彂鐢熷彉鍖栨椂锛屽彉鍖栫浜屽垪(鍚庝竴鍒�)瀵瑰簲鐨勯�夐」
+ console.log(index);
console.log(index);
if (columnIndex === 0) {
// picker涓洪�夋嫨鍣╰his瀹炰緥锛屽彉鍖栫浜屽垪瀵瑰簲鐨勯�夐」
@@ -176,13 +180,13 @@
}
},
confirmCate1(e) {
- console.log(e.value[1]);
- if(e.value.length == 2){
- this.$set(this.param, 'cateId', e.value[1].id)
- this.$set(this.param, 'cateName', e.value[1].name)
- this.showCate1 = false
- }
-
+ console.log(e.value[1]);
+ if (e.value.length == 2) {
+ this.$set(this.param, 'cateId', e.value[1].id)
+ this.$set(this.param, 'cateName', e.value[1].name)
+ this.showCate1 = false
+ }
+
},
confirm0(e) {
const item = e.value[0]
@@ -431,9 +435,9 @@
position: absolute;
right: -20rpx;
top: -20rpx;
- z-index: 9999;
- background-color: #fff;
- border-radius: 50%;
+ z-index: 9999;
+ background-color: #fff;
+ border-radius: 50%;
overflow: hidden;
}
@@ -456,7 +460,7 @@
// bottom: 68rpx;
// left: 40rpx;
width: 670rpx;
- height: 88rpx;
+ height: 88rpx;
margin-top: 80rpx;
background: $primaryColor;
box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 104, 255, 0.3);
diff --git a/h5/pages/workOrder/problemEdit.vue b/h5/pages/workOrder/problemEdit.vue
index 0cf8f09..568c592 100644
--- a/h5/pages/workOrder/problemEdit.vue
+++ b/h5/pages/workOrder/problemEdit.vue
@@ -83,12 +83,14 @@
ywProblemCreate({
...param,
fileList
- }).then(res => {
- this.showToast('鎻愪氦鎴愬姛')
- this.param = {}
- uni.navigateTo({
- url: '/pages/workOrder/result'
- })
+ }).then(res => {
+ if(res && res.code == 200){
+ this.showToast('鎻愪氦鎴愬姛')
+ this.param = {}
+ uni.navigateTo({
+ url: '/pages/workOrder/result'
+ })
+ }
})
},
fileDel(str, i) {
--
Gitblit v1.9.3