From 0b737708e696c45720499759b5c31aced87fdbb6 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 07 七月 2021 14:10:03 +0800
Subject: [PATCH] merge master
---
src/pages/shuohuangMonitorAnalyze/components/taskManage.vue | 81 +++++++++++++---------------------------
1 files changed, 26 insertions(+), 55 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue b/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
index e0130a2..a3d85f7 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
@@ -190,7 +190,7 @@
<el-table-column prop="Title" label="鏈鸿溅鍙�"></el-table-column>
<el-table-column label="瑙嗛鏁伴噺">
<template slot-scope="scope">
- <div>{{ scope.row.LKGList.length }}</div>
+ <div>{{ scope.row.VideoList.length }}</div>
</template>
</el-table-column>
<el-table-column
@@ -214,7 +214,7 @@
>鍙栨秷鍒嗛厤</span
>
<span
- @click="cancelDistribute(scope.row)"
+ @click="cancelAssign(scope.row)"
v-show="taskType == 2"
>鍙栨秷鎸囨淳</span
>
@@ -226,7 +226,7 @@
<template slot-scope="scope">
<div
class="video-item"
- v-for="video in scope.row.LKGList"
+ v-for="video in scope.row.VideoList"
:key="video.ID"
>
{{ video.VideoName }}
@@ -268,7 +268,7 @@
addToAssignList,
getTaskList,
distributeTask,
- cancelMission,
+ cancelMission,cancelAssign,
} from "@/api/shuohuang";
export default {
data() {
@@ -286,7 +286,7 @@
actCollapseName: "",
personList: [],
memberChecked: [],
- taskTableData: null,
+ taskTableData: [],
taskVideoChecked: [],
notAssignedOnly: false,
isIndeterminate: false,
@@ -329,8 +329,20 @@
checkedCount > 0 && checkedCount < this.personList.length;
},
cancelDistribute(row) {
- let arr = row.LKGList.map(x => x.ID);
- cancelMission({ LkgIDs: arr }).then((res) => {
+ let arr = row.VideoList.map(x => x.ID);
+ cancelMission({ VideoIDs: arr }).then((res) => {
+ if (res.success) {
+ this.$notify({
+ type: "success",
+ message: res.msg,
+ });
+ this.refreshAll();
+ }
+ });
+ },
+ cancelAssign(row) {
+ let arr = row.VideoList.map(x => x.ID);
+ cancelAssign({ VideoIDs: arr }).then((res) => {
if (res.success) {
this.$notify({
type: "success",
@@ -358,7 +370,7 @@
this.renderTaskTable();
},
taskTableSelection(val) {
- let arr = val.map((item) => item.LKGList.map((x) => x.ID));
+ let arr = val.map((item) => item.VideoList.map((x) => x.ID));
this.taskVideoChecked = arr;
},
renderTaskTable() {
@@ -408,8 +420,8 @@
return a.map((item) => item.ID);
});
addToAssignList({
- UserID: this.memberChecked,
- LkgIDs: arr,
+ HandlerUserID: this.memberChecked,
+ VideoIDs: arr,
}).then((res) => {
if (res.success) {
this.$notify({
@@ -427,58 +439,15 @@
// _this.orgTreeDialogVisible = false;
});
},
- // deepNodeChildren(node) {
- // if (node.ChildDept && node.ChildDept.length > 0) {
- // return node.ChildDept.map((child) => {
- // let childObj = {};
- // childObj.id = child.ID;
- // childObj.label = child.Name;
- // childObj.Status = child.Status;
- // if (child.ChildDept) {
- // childObj.children = this.deepNodeChildren(child);
- // }
- // if (child.UserLst) {
- // childObj.children = this.deepNodeChildren(child);
- // }
- // return childObj;
- // });
- // } else if (node.UserLst && node.UserLst.length > 0) {
- // return node.UserLst.map((child) => {
- // let childObj = {};
- // childObj.id = child.ID;
- // childObj.label = child.Name;
- // childObj.Status = child.Status;
- // return childObj;
- // });
- // }
- // },
- // checkOrgNode(a, b, c) {
- // this.checkedOrg = a;
- // },
- // getOrganizeTreeData() {
- // let _this = this;
- // getOrganizeTree().then((res) => {
- // _this.organizeData = res.data.map((item) => {
- // let obj = {};
- // obj.id = item.ID;
- // obj.label = item.Name;
- // obj.Status = item.Status;
- // obj.children = _this.deepNodeChildren(item);
- // return obj;
- // });
- // });
- // },
distributeTask() {
let _this = this;
distributeTask({
- LkgIDs: this.taskVideoChecked,
+ VideoIDs: this.taskVideoChecked,
+ distributerID: ""
}).then((res) => {
_this.renderTaskTable();
});
},
- // selOrg () {
- // this.orgTreeDialogVisible = true;
- // },
},
};
</script>
@@ -530,6 +499,8 @@
.video-list {
margin-top: 14px;
text-align: left;
+ height: 420px;
+ overflow: auto;
.el-checkbox-group {
margin-bottom: 20px;
.el-checkbox__label {
--
Gitblit v1.8.0