From d71fd5702c0dca993742cb421e7203eafefd2d97 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 17 六月 2021 19:22:26 +0800
Subject: [PATCH] 修复朔黄视频标注
---
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 2
src/pages/cameraAccess/components/DataStackInfo.vue | 4 +
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 33 +++++++++++-----
src/api/shuohuang.ts | 6 +++
src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue | 32 +++++++++++++++-
5 files changed, 63 insertions(+), 14 deletions(-)
diff --git a/src/api/shuohuang.ts b/src/api/shuohuang.ts
index 869ca98..c53c2dd 100644
--- a/src/api/shuohuang.ts
+++ b/src/api/shuohuang.ts
@@ -167,4 +167,10 @@
url: '/data/api-c/lkg/uploadLKGExcel',
method: 'post',
data
+ })
+
+export const getLKGData = () =>
+ request({
+ url: '/data/api-c/lkg/getLKGData',
+ method: 'get',
})
\ No newline at end of file
diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index abf7198..7b695db 100644
--- a/src/pages/cameraAccess/components/DataStackInfo.vue
+++ b/src/pages/cameraAccess/components/DataStackInfo.vue
@@ -457,8 +457,10 @@
if (row.type === 1) {
this.videoUrl = "/files/" + row.identifier + ".mp4"
+
+ // 涓烘湐榛勪娇鐢ㄦ暟鎹爤瀹氬埗, 娌℃湁MD5
if (row.identifier == "") {
- this.videoUrl = row.path;
+ this.videoUrl = row.path.replace("/opt/vasystem", "");
}
} else if (row.type === 2) {
this.imgUrl = "/files/" + row.path.substr(row.path.lastIndexOf('/') + 1)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue b/src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue
index e765b28..b4c9115 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue
@@ -17,17 +17,33 @@
multiple
/>
</div>
+
+ <div class="lkg-list">
+ <el-table :data="lkgData" stripe style="width: 100%">
+ <el-table-column type="index" width="100" label="搴忓彿"></el-table-column>
+ <el-table-column prop="CarNumber" label="鏈鸿溅鍙�"></el-table-column>
+ <el-table-column prop="TrainNumber" label="杞︽"></el-table-column>
+ <el-table-column prop="Driver1" label="鍙告満"></el-table-column>
+ <el-table-column prop="Driver2" label="鍓徃鏈�"></el-table-column>
+ <el-table-column prop="StartTime" label="寮�濮嬫椂闂�"></el-table-column>
+ <el-table-column prop="EndTime" label="缁撴潫鏃堕棿"></el-table-column>
+ </el-table>
+ </div>
</div>
</template>
<script>
-import { uploadLKG } from "@/api/shuohuang"
+import { uploadLKG, getLKGData } from "@/api/shuohuang"
export default {
data() {
return {
- uploading: false
+ uploading: false,
+ lkgData: []
}
+ },
+ mounted() {
+ this.fetchLKGData();
},
methods: {
uploadDirectoryTrigger() {
@@ -46,11 +62,19 @@
this.$message.success("涓婁紶鎴愬姛")
}
_this.uploading = false;
+ this.fetchLKGData();
}).catch(err => {
this.$message.warning("涓婁紶澶辫触", err)
_this.uploading = false;
})
},
+ fetchLKGData() {
+ getLKGData().then(rsp => {
+ if (rsp && rsp.success) {
+ this.lkgData = rsp.data;
+ }
+ })
+ }
}
}
</script>
@@ -61,5 +85,9 @@
text-align: left;
margin: 10px 20px;
}
+
+ .lkg-list {
+ margin: 10px 20px;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index 02a834b..be86e3f 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -332,7 +332,7 @@
keyword: "",
IsFollow: "",
searchTime: [
- new Date(2021, 0, 1, 0, 0, 0),
+ new Date(2020, 0, 1, 0, 0, 0),
new Date(2021, 11, 31, 23, 59, 59),
],
curTabPage: 1,
diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
index a8a282d..3bca753 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -76,7 +76,7 @@
@pause="isStop = true"
@play="isStop = false"
@timeupdate="timeUpdate"
- :source="curVideo.VideoPath"
+ :source="curVideo.VideoPath | fixPath"
:markers="curVideo.marks"
:ref="`player_${curVideo.ID}`"
/>
@@ -106,7 +106,7 @@
>
<ali-player
@timeupdate="timeUpdate(e, index)"
- :source="videoArrs[index].VideoPath"
+ :source="videoArrs[index].VideoPath | fixPath"
:markers="videoArrs[index].marks"
@pause="isStop = true"
@play="isStop = false"
@@ -329,6 +329,15 @@
type: Object,
},
},
+ filters: {
+ fixPath(str) {
+ if (!str || str == undefined) {
+ return ""
+ }
+
+ return str.replace("/opt/vasystem", "")
+ }
+ },
data() {
return {
guid: 1,
@@ -518,6 +527,7 @@
handleCommand(cmd) {
let _this = this;
_this.curVideo = cmd;
+ _this.curCamera = _this.curVideo.CameraPosition;
_this.$nextTick(() => {
_this.$refs[`player_${_this.curVideo.ID}`][0].init();
@@ -563,15 +573,19 @@
res.data.forEach((item) => {
_this.popDownArr.push(item);
});
- if (_this.popDownArr.length) {
- _this.curCamera = _this.popDownArr[0].CameraPosition;
- }
+ // if (_this.popDownArr.length) {
+ // _this.curCamera = _this.popDownArr[0].CameraPosition;
+ // }
res.data.forEach((item) => {
item.marks = _this.mergeMarks(item);
});
- _this.curVideo = res.data.find((item) => item.ID == v.ID);
+ _this.curVideo = res.data.find((item) => item.id == v.id);
+
+ // 璁剧疆涓嬫媺鑿滃崟閫変腑椤�
+ _this.curCamera = _this.curVideo.CameraPosition;
+
_this.curVideo.marks.forEach((item) => {
if (item.type == 0) {
_this.eventMarks.push(item);
@@ -669,7 +683,7 @@
submitLabelChecked() {
let _this = this;
let tempArr = [];
- tempArr = this.videoArrs.map((video) => video.ID);
+ tempArr = this.videoArrs.map((video) => video.id);
let desc = this.labelCheckedList.map((lableId) => {
for (let label of this.labelOptions) {
if (label.ID == lableId) {
@@ -680,11 +694,10 @@
let query = {
ID: this.selectedLabelId,
- ParentID: tempArr.join(","),
- ParentUniqID: this.curVideo.GroupID + "",
+ VideoIds: tempArr.join(","),
Time: Math.round(this.setLabelTime) + "",
Codes: this.labelCheckedList.join(","),
- Desc: desc.join("锛�"),
+ Desc: desc.join(","),
};
editLabel(query).then((rsp) => {
--
Gitblit v1.8.0