From f534ffbed15c86cdd4fb0b53f0b2775d0760694a Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Thu, 25 Sep 2025 09:21:56 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=A7=86?=
=?UTF-8?q?=E9=A2=91=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/tree-node/newIndex.vue | 39 +++---
main.js | 5 +-
manifest.json | 4 +-
pages/areaTree/areaTree.vue | 76 ++++++-----
pages/projectEnd/bridgeCraneMonitor/index.vue | 57 ++++++--
pages/videoManage/playBackList.vue | 6 +-
pages/videoManage/playVideo.vue | 123 ++++++++++--------
pages/videoManage/videoGroup.vue | 12 +-
pages/videoManage/videoList.vue | 13 +-
9 files changed, 208 insertions(+), 127 deletions(-)
diff --git a/components/tree-node/newIndex.vue b/components/tree-node/newIndex.vue
index b6014197..f37cb719 100644
--- a/components/tree-node/newIndex.vue
+++ b/components/tree-node/newIndex.vue
@@ -2,16 +2,18 @@
{{ item.groupName }}
-
- {{ item.children.length }}
-
-
-
-
-
+
+
+
@@ -78,17 +78,17 @@
v-if="pageType=='video'&&item4.projectName">({{item4.videoNum}})
+ src="/static/no_alarm.png" style="width: 18rpx;height: 20rpx;">
+ style="width: 20rpx;height: 20rpx;">
+ style="width: 16rpx;height: 13px;">
+ style="width: 16rpx;height: 11px;">
@@ -176,7 +176,8 @@
viewVideoListFn(item) {
if (this.pageType == 'video') {
uni.navigateTo({
- url: '../videoManage/videoList?sn=' + item.projectSn
+ // url: '../videoManage/videoList?sn=' + item.projectSn
+ url: '../videoManage/videoGroup?sn=' + item.projectSn
})
} else if (this.pageType == 'markRoom') {
uni.setStorageSync('projectDetail', JSON.stringify({
@@ -260,7 +261,7 @@
align-items: center;
.icon-status {
- margin-left: 8px;
+ margin-left: 16rpx;
}
}
@@ -271,16 +272,16 @@
}
// .areaTreeBox{
- // padding: 0 10px;
+ // padding: 0 20rpx;
// }
.areaInner {
border-bottom: 1px solid rgba(221, 221, 221, 0.67);
}
.areaTitle {
- font-size: 15px;
+ font-size: 30rpx;
border-bottom: 1px solid rgba(221, 221, 221, 0.67);
- padding: 10px 15px;
+ padding: 20rpx 30rpx;
}
.arrow {
@@ -290,16 +291,16 @@
.areaTitle2 {
font-size: 14px;
- padding: 10px 15px 10px 30px;
+ padding: 20rpx 30rpx 20rpx 30px;
}
.projectTitle {
font-size: 14px;
- padding: 10px 15px 10px 30px;
+ padding: 20rpx 30rpx 20rpx 30px;
}
.projectTitle2 {
- padding-left: 50px;
+ padding-left: 100rpx;
}
.projectBox {
@@ -307,22 +308,25 @@
}
.uni-input {
- border-radius: 15px;
- margin: 10px 10px;
+ border-radius: 30rpx;
+ margin: 20rpx 20rpx;
background-color: #f2f2f2;
- height: 30px;
- line-height: 30px;
- padding: 0 20px;
- font-size: 14px;
+ height: 60rpx;
+ line-height: 60rpx;
+ padding: 0 40rpx;
+ font-size: 28rpx;
width: 65%;
}
-
+ .uni-form-item {
+ position: relative;
+ }
.mini-btn {
position: absolute;
- right: 15px;
- top: 55px;
- border-radius: 15px;
- height: 30px;
- line-height: 30px;
+ right: 30rpx;
+ top: 50%;
+ transform: translateY(-50%);
+ border-radius: 30rpx;
+ height: 60rpx;
+ line-height: 60rpx;
}
diff --git a/pages/projectEnd/bridgeCraneMonitor/index.vue b/pages/projectEnd/bridgeCraneMonitor/index.vue
index ad029fb6..04b40933 100644
--- a/pages/projectEnd/bridgeCraneMonitor/index.vue
+++ b/pages/projectEnd/bridgeCraneMonitor/index.vue
@@ -28,7 +28,7 @@
-
@@ -73,7 +73,7 @@
-
+
-
-
-
- 球机转速
+
+
+
+
+ 球机转速
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -157,15 +159,23 @@
sosSDK: null,
taskCode: [], // 对讲任务码
useConfigInfo: {},
+ webviewStyles: {
+ width: "100%",
+ height: "100%"
+ }
};
},
onLoad(options) {
- this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
//videoType 1萤石云，2乐橙，3ISC，4大华，5宇视，6国标
// this.url = options.url
this.tabActive = options.tabActive;
this.videoInfo = uni.getStorageSync('videoInfo');
- this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
+ if (options.sn) {
+ this.projectSn = options.sn;
+ } else {
+ this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
+ }
+
this.opSize = Number(uni.getStorageSync('videoOpSize') || 20);
this.streamType = this.videoInfo.defaultStreamType;
console.log(7777, this.videoInfo)
@@ -355,7 +365,7 @@
url: `./playBackList?obj=${JSON.stringify({
...this.videoResponseInfo,
...this.videoInfo
- })}&tabActive=${this.tabActive}`
+ })}&tabActive=${this.tabActive}&sn=${this.projectSn}`
})
},
changeStreamFn() {
@@ -498,6 +508,11 @@