From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 一月 2025 15:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/polling/detail.vue | 232 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 178 insertions(+), 54 deletions(-)
diff --git a/h5/pages/polling/detail.vue b/h5/pages/polling/detail.vue
index 41553c2..45ad7fb 100644
--- a/h5/pages/polling/detail.vue
+++ b/h5/pages/polling/detail.vue
@@ -1,14 +1,16 @@
<template>
<view class="main_app">
- <view v-if="info.status || info.status == 0" class="head_bg" :style="{
- background: `linear-gradient(180deg, ${statusM[info.status].color} 0%, rgba(247, 247, 247, 0) 100%)`
+ <view v-if="info.status || info.status == 0" class="head_bg" :style="{
+ background: `linear-gradient(180deg, ${statusM[info.status].color} 0%, rgba(247, 247, 247, 0) 100%)`
}"></view>
<view class="info">
<image v-if="info.status == 2" class="icon" src="@/static/side/ic_dabiaoed.png" mode=""></image>
<image v-if="info.status == 3" class="icon" src="@/static/side/ic_dabiao.png" mode=""></image>
<view class="head">
<view class="name">{{ info.title || info.planTitle }}</view>
- <view class="status" v-if="info.status || info.status == 0" :style="{color: statusM[info.status].color}">{{statusM[info.status].name}}</view>
+ <view class="status" v-if="info.status || info.status == 0" :style="{color: statusM[info.status].color}">
+ {{statusM[info.status].name}}
+ </view>
</view>
<view class="line">
<view class="la">浠诲姟鏃ユ湡锛�</view>
@@ -17,7 +19,8 @@
<view class="line">
<view class="la">鎵ц鏃堕棿锛�</view>
<view class="val" v-if="info.startDate && info.endDate">{{ info.startDate.slice(11,16) }} 鑷�
- {{ info.endDate.slice(11, 16) }}</view>
+ {{ info.endDate.slice(11, 16) }}
+ </view>
</view>
<view class="line">
<view class="la">瀹屾垚鎯呭喌锛�</view>
@@ -31,7 +34,10 @@
<view class="content">
<view class="head">
<view>{{item.pointName}}</view>
- <view class="status" :class="{ gray: item.status == 1 }">{{ item.status == 1 ? '宸插贰妫�' : '寰呭贰妫�' }}</view>
+ <view class="status" :class="{ gray: item.status == 1 }">
+ <image v-if="item.status == 1" src="@/static/plan_ic_finish@2x.png" class="icon" mode=""></image>
+ <text>{{ item.status == 1 ? '宸插贰妫�' : '寰呭贰妫�' }}</text>
+ </view>
</view>
<template v-if="item.status == 1">
<view class="line">
@@ -40,15 +46,22 @@
</view>
<view class="line">
<view class="la">宸℃鏃堕棿锛�</view>
- <view class="val">{{item.dealDate}}</view>
+ <view class="val">
+ <text>{{item.dealDate}}</text>
+ <text v-if="item.status == 1" class="detail">鏌ョ湅璇︽儏</text>
+ </view>
</view>
</template>
<view class="desc" v-else>{{item.content}}</view>
</view>
</view>
</view>
- <view class="footer" v-if="flag">
+ <view class="footer" @click="openSc" v-if="flag">
<view class="sub_btn">鎵爜宸℃</view>
+ </view>
+ <!-- -->
+ <view class="reader-box" @click="stopScan" v-if="isScaning">
+ <view class="reader" id="reader"></view>
</view>
</view>
</template>
@@ -56,34 +69,95 @@
<script>
import {
ywPatrolDetail,
- ywPatrolTaskRecord
- } from '@/api'
+ ywPatrolTaskRecord,
+ getPointRecordByCode
+ } from '@/api'
import dayjs from 'dayjs';
+ import {
+ Html5Qrcode
+ } from 'html5-qrcode';
export default {
data() {
return {
id: '',
info: {},
- list: [],
- flag: false,
- statusM: [
- { color: '#4593f7', name: '寰呭紑濮�' },
- { color: '#73e09a', name: '杩涜涓�' },
- { color: '#f1a93f', name: '宸茶秴鏈�' },
- { color: '#b9b9b9', name: '宸插鐞�' },
- ]
+ list: [],
+ flag: false,
+ statusM: [{
+ color: '#4593f7',
+ name: '寰呭紑濮�'
+ },
+ {
+ color: '#73e09a',
+ name: '杩涜涓�'
+ },
+ {
+ color: '#f1a93f',
+ name: '宸茶秴鏈�'
+ },
+ {
+ color: '#b9b9b9',
+ name: '宸插鐞�'
+ },
+ ],
+ html5Qrcode: null,
+ isScaning: false,
};
},
onLoad(option) {
this.id = option.id
+ // this.getDetail()
+ },
+ onShow() {
this.getDetail()
- },
- onShow() {
- this.getDetail()
},
methods: {
- itemClick(item) {
- if(!this.flag) return
+ openSc() {
+ this.isScaning = true;
+ Html5Qrcode.getCameras().then((devices) => {
+ if (devices && devices.length) {
+ this.html5Qrcode = new Html5Qrcode('reader');
+ this.html5Qrcode.start({
+ facingMode: 'environment'
+ }, {
+ focusMode: 'continuous', //璁剧疆杩炵画鑱氱劍妯″紡
+ fps: 5, //璁剧疆鎵爜璇嗗埆閫熷害
+ qrbox: 280 //璁剧疆浜岀淮鐮佹壂鎻忔澶у皬
+ },
+ (decodeText, decodeResult) => {
+ if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭
+ this.stopScan(); //鍏抽棴鎵爜鍔熻兘
+ getPointRecordByCode({
+ taskId: this.id,
+ pointCode: decodeText
+ }).then(ress => {
+ if (ress.data) {
+ uni.navigateTo({
+ url: '/pages/polling/point?id=' + ress.data.id
+ })
+ } else {
+ this.showToast('鏈尮閰嶅埌宸℃鐐�,璇烽噸鏂版壂鎻�')
+ }
+ })
+ }
+ },
+ (err) => {
+ // console.log(err); //閿欒淇℃伅
+ }
+ );
+ }
+ });
+ },
+
+ stopScan() {
+ console.log('鍋滄鎵爜')
+ this.isScaning = false;
+ if (this.html5Qrcode) {
+ this.html5Qrcode.stop();
+ }
+ },
+ itemClick(item) {
+ if (!this.flag) return
uni.navigateTo({
url: '/pages/polling/point?id=' + item.id
})
@@ -93,9 +167,10 @@
id
} = this
ywPatrolDetail(id).then(res => {
- this.info = res.data
- let time = new Date(res.data.startDate.slice(0, 10) + ' 00:00:00').getTime()
- this.flag = new Date().getTime() > time
+ 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)
})
ywPatrolTaskRecord({
capacity: 999,
@@ -107,22 +182,26 @@
this.list = res.data.records
})
},
- async startScan() {
- try {
- const video = document.getElementById('video');
- const stream = await navigator.mediaDevices.getUserMedia({ video: { facingMode: "environment" } });
- video.srcObject = stream;
-
- // 浣跨敤 QrScanner 瑙ｆ瀽
- const qrScanner = new QrScanner(video, result => {
- alert(`鎵弿缁撴灉: ${result}`);
- qrScanner.stop(); // 鍋滄鎵爜
- });
- qrScanner.start();
- } catch (err) {
- console.error('鎵撳紑鎽勫儚澶村け璐�:', err);
- }
- }
+ async startScan() {
+ try {
+ const video = document.getElementById('video');
+ const stream = await navigator.mediaDevices.getUserMedia({
+ video: {
+ facingMode: "environment"
+ }
+ });
+ video.srcObject = stream;
+
+ // 浣跨敤 QrScanner 瑙ｆ瀽
+ const qrScanner = new QrScanner(video, result => {
+ alert(`鎵弿缁撴灉: ${result}`);
+ qrScanner.stop(); // 鍋滄鎵爜
+ });
+ qrScanner.start();
+ } catch (err) {
+ console.error('鎵撳紑鎽勫儚澶村け璐�:', err);
+ }
+ }
}
}
</script>
@@ -174,9 +253,10 @@
.status {
color: $primaryColor;
- }
- .gray{
- color: gray;
+ }
+
+ .gray {
+ color: gray;
}
}
@@ -194,14 +274,15 @@
margin-bottom: 20rpx;
.la {
- color: #666666;
+ color: #666666;
+
}
}
.list {
- height: calc(100vh - 720rpx);
- overflow: auto;
-
+ height: calc(100vh - 490rpx);
+ overflow: auto;
+ padding-bottom: 160rpx;
.item {
width: 690rpx;
height: 188rpx;
@@ -212,9 +293,22 @@
display: flex;
padding: 20rpx 30rpx 0 16rpx;
margin-bottom: 20rpx;
- .line{
+
+ .line {
margin-bottom: 10rpx;
+ width: 100%;
+ .val{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex: 1;
+ .detail{
+ color: $primaryColor;
+ font-size: 26rpx;
+ }
+ }
}
+
.icon {
width: 10rpx;
height: 148rpx;
@@ -235,12 +329,23 @@
margin-bottom: 16rpx;
.status {
- offset-anchor: 28rpx;
+ font-size: 28rpx;
color: $primaryColor;
- font-weight: 400;
- }
- .gray{
- color: #999999;
+ font-weight: 400;
+ display: flex;
+ align-items: center;
+ .icon{
+ width: 40rpx;
+ height: 40rpx;
+ // border-radius: 50%;
+ // overflow: hidden;
+ background: none;
+ }
+
+ }
+
+ .gray {
+ color: #999999;
}
}
@@ -284,4 +389,23 @@
}
}
+
+ .reader-box {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ background-color: rgba(0, 0, 0, 0.5);
+ }
+
+ .reader {
+ width: 100%;
+ // width: 540rpx;
+ // height: 540rpx;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3