From 2838de13cce590506cd3e58ea4ac6552e0cb1f0c Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Sat, 18 May 2024 18:04:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/tree-node/index.vue | 16 ++-
main.js | 4 +-
pages/projectEnd/ekashManage/ekashManage.vue | 11 +-
pages/projectEnd/ukashManage/ukashManage.vue | 11 +-
pages/videoManage/playBackList.vue | 20 ++-
pages/videoManage/playBackVideo.vue | 133 ++++---------------
pages/videoManage/playVideo.vue | 6 +-
pages/videoManage/videoList.vue | 2 +-
static/videoControlIcon/videoIcon.png | Bin 0 -> 5502 bytes
9 files changed, 74 insertions(+), 129 deletions(-)
create mode 100644 static/videoControlIcon/videoIcon.png
diff --git a/components/tree-node/index.vue b/components/tree-node/index.vue
index fcff0383..f06db969 100644
--- a/components/tree-node/index.vue
+++ b/components/tree-node/index.vue
@@ -2,9 +2,11 @@
+
+
{{ item.groupName }}
-
-
+
+
@@ -44,7 +46,7 @@ export default {
\ No newline at end of file
diff --git a/main.js b/main.js
index a722b9a1..f0f913e7 100644
--- a/main.js
+++ b/main.js
@@ -44,8 +44,8 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用)
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
- Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
- // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
+ // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
+ Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
// Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
// Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
diff --git a/pages/projectEnd/ekashManage/ekashManage.vue b/pages/projectEnd/ekashManage/ekashManage.vue
index c03cb09f..8ed54b47 100644
--- a/pages/projectEnd/ekashManage/ekashManage.vue
+++ b/pages/projectEnd/ekashManage/ekashManage.vue
@@ -13,7 +13,7 @@
查看明细
企业: {{item.enterpriseName}}
- 入场时间: {{item.entryTime}}
+ 出场有效时间: {{item.entryBeginTime}}至{{item.entryEndTime}}
@@ -97,7 +97,10 @@
let data = {
pageNo: this.pageNo,
pageSize: this.pageSize,
- name: e.detail.value ? e.detail.value : null
+ type: 2
+ }
+ if(e.detail.value){
+ data.name = e.detail.value;
}
let _this = this
this.sendRequest({
@@ -108,7 +111,7 @@
console.log(res);
// this.dataList = this.dataList.concat(res.result.records)
- this.dataList = [...this.dataList, ...res.result.records]
+ this.dataList = res.result.records
// console.log(this.dataList , res.result.total);
// this.dataList = res.result.records
if (res.result.records.length < this.pageSize) {
@@ -143,7 +146,7 @@
}
.ukashList {
- height: 90px;
+ min-height: 90px;
background-color: #fff;
margin: 10px 10px;
border-radius: 15px;
diff --git a/pages/projectEnd/ukashManage/ukashManage.vue b/pages/projectEnd/ukashManage/ukashManage.vue
index 3d096530..efd8b1b0 100644
--- a/pages/projectEnd/ukashManage/ukashManage.vue
+++ b/pages/projectEnd/ukashManage/ukashManage.vue
@@ -13,7 +13,7 @@
查看明细
企业: {{item.enterpriseName}}
- 入场时间: {{item.entryTime}}
+ 入场有效时间: {{item.entryBeginTime}}至{{item.entryEndTime}}
@@ -97,7 +97,10 @@
let data = {
pageNo: this.pageNo,
pageSize: this.pageSize,
- name: e.detail.value ? e.detail.value : null
+ type: 1
+ }
+ if(e.detail.value){
+ data.name = e.detail.value;
}
let _this = this
this.sendRequest({
@@ -108,7 +111,7 @@
console.log(res);
// this.dataList = this.dataList.concat(res.result.records)
- this.dataList = [...this.dataList, ...res.result.records]
+ this.dataList = res.result.records
// console.log(this.dataList , res.result.total);
// this.dataList = res.result.records
if (res.result.records.length < this.pageSize) {
@@ -143,7 +146,7 @@
}
.ukashList {
- height: 90px;
+ min-height: 90px;
background-color: #fff;
margin: 10px 10px;
border-radius: 15px;
diff --git a/pages/videoManage/playBackList.vue b/pages/videoManage/playBackList.vue
index 2b60edec..2f0accba 100644
--- a/pages/videoManage/playBackList.vue
+++ b/pages/videoManage/playBackList.vue
@@ -16,9 +16,9 @@
- 2024-05-11 00:00:00
+ {{item.beginTime}}
至
- 2024-05-11 00:00:00
+ {{item.endTime}}
@@ -32,6 +32,9 @@
diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue
index 6c3227c6..0edb89cc 100644
--- a/pages/videoManage/playVideo.vue
+++ b/pages/videoManage/playVideo.vue
@@ -26,9 +26,9 @@
-
+
@@ -63,7 +63,7 @@
// 跳转到录像回放列表
toBackList(){
uni.navigateTo({
- url: './playBackList?obj=' + JSON.stringify(this.videoResponseInfo)
+ url: './playBackList?obj=' + JSON.stringify({...this.videoResponseInfo,...this.videoInfo})
})
},
changeStreamFn(){
diff --git a/pages/videoManage/videoList.vue b/pages/videoManage/videoList.vue
index 5b780db9..05b8886c 100644
--- a/pages/videoManage/videoList.vue
+++ b/pages/videoManage/videoList.vue
@@ -24,7 +24,7 @@
-
+
diff --git a/static/videoControlIcon/videoIcon.png b/static/videoControlIcon/videoIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c35f796e86b1fe61448070dc12c1b92d9306cb9a
GIT binary patch
literal 5502
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