From 58417c8de3cce002d75402ac805363de1d9b17a9 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期四, 25 二月 2021 18:10:58 +0800
Subject: [PATCH] 视频链接修改
---
src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue | 2 +-
vue.config.js | 2 +-
src/pages/shuohuangMonitorAnalyze/components/taskManage.vue | 3 ++-
src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue | 2 +-
src/pages/shuohuangMonitorAnalyze/components/memberManage.vue | 24 ++++++++++++++++++------
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 4 ++--
6 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue b/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
index bfe6e92..af15e8a 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
@@ -255,7 +255,8 @@
tableTotal: 0,
PageSize: 8,
organizeData: [],
- checkedOrg: '',
+ checkedOrgID: '',
+ checkedOrgName:"",
organizeKeyword: '',
memberEditDialogVisible: false,
toggleOrganizeDialogVisible: false,
@@ -286,13 +287,22 @@
this.renderMemberTable();
},
isPhone (rule, value, callback) {
- if (value.trim()) {
- var pattern = /^1[345789]\d{9}$/
+ if (!value) {
+ return callback()
+ } else if (value.trim()) {
+ var pattern = /^1[345789]\d{9}$/
if (pattern.test(value)) {
return callback()
}
return callback(new Error('杈撳叆鐨勬墜鏈哄彿閿欒'))
}
+ // if (value.trim()) {
+ // var pattern = /^1[345789]\d{9}$/
+ // if (pattern.test(value)) {
+ // return callback()
+ // }
+ // return callback(new Error('杈撳叆鐨勬墜鏈哄彿閿欒'))
+ // }
},
nodeContextMenu (e, data, node, comp) {
this.showMenu = true;
@@ -300,14 +310,16 @@
this.menuLeft = e.pageX;
},
checkOrgNode (a, b, c) {
- this.checkedOrg = a.id
+ this.checkedOrgID = a.id
+ this.checkedOrgName = a.label
},
updateOrg () {
let ids = this.multipleTableSelection.map(row => {
return row.ID
});
let params = {
- DeptID: this.checkedOrg,
+ DeptID: this.checkedOrgID,
+ DeptName:this.checkedOrgName,
Users: ids.join(',')
}
updateUnit(params).then(res => {
@@ -318,6 +330,7 @@
});
this.toggleOrganizeDialogVisible = false;
this.renderMemberTable();
+ this.searchLeftTreeData()
}
})
@@ -420,7 +433,6 @@
//formData.append('files', this.$refs['directoryInput'].files)
uploadDirectory(formData).then(res => {
- debugger
_this.batchImportTableData = res.data;
_this.renderMemberTable();
})
diff --git a/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue b/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
index 640cc00..aab296a 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
@@ -249,7 +249,7 @@
},
watch: {
taskType (n, o) {
- debugger
+ // debugger
this.renderTaskTable();
}
},
@@ -313,6 +313,7 @@
obj.checked = false;
arr.push(obj);
}
+ debugger
_this.trainNoList = arr;
_this.trainNoTotal = res.total;
});
diff --git a/src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue b/src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue
index 8921ac0..f11d59a 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue
@@ -139,7 +139,7 @@
findDeviceIfo () {
let _this = this;
getDeviceInfoById({ DeviceID: this.actTab }).then(res => {
- debugger
+ // debugger
_this.tableData = res.data;
//缁熻褰撳墠鎻掓Ы鐘舵��
let dx = _this.generalIndicators.find(indicator => indicator.id == 'dx');
diff --git a/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue b/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
index cc0bccd..7251adf 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
@@ -46,7 +46,7 @@
<el-table-column prop="tranferDevice" label="杞偍璁惧鍚嶇О">
<template slot-scope="scope">
<div>
- 璁惧{{scope.$index}}
+ 璁惧{{scope.row.DeviceID}}
</div>
</template>
</el-table-column>
diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
index bdf1c20..1811f09 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -57,7 +57,7 @@
<!-- {{curVideo.ID}} -->
<!-- <img :src="curVideo.VideoCover" style="width:100px" /> -->
<ali-player
- :source="'http://' + curVideo.VideoPath"
+ :source="curVideo.VideoPath"
:markers="curVideo.marks"
:ref="`player_${curVideo.ID}`"
/>
@@ -82,7 +82,7 @@
style="width:100px"
/>-->
<ali-player
- :source="'http://' + videoArrs[index].VideoPath"
+ :source="videoArrs[index].VideoPath"
:markers="videoArrs[index].marks"
:ref="`player_${videoArrs[index].ID}`"
/>
diff --git a/vue.config.js b/vue.config.js
index 254db78..8e6eadc 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -87,7 +87,7 @@
// }
// },
"/api-c": {
- target: 'http://192.168.20.10:8004',
+ target: 'http://192.168.20.113:8004',
changeOrigin: true
},
"/api-v": {
--
Gitblit v1.8.0