diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index fca1980e..c86ab748 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -313,7 +313,7 @@ import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";、
import {addTempTask} from "../../api/indexTaskadd";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
export default {
name: "AddFaceteach",
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 4bf5e5af..d70a7200 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -337,7 +337,7 @@ import dayjs from "dayjs";
import { fileUp } from "../../api/indexEval";
import AssessmentList from "../drawers/ AssessmentList.vue";
import { debounce } from "lodash-es";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
// import { useRouter } from "vue-router";
function getBase64(img, callback) {
diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue
index 40422f1f..f3076888 100644
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -7,7 +7,7 @@
"
v-model:value="managerArray"
:placeholder="placeholder"
- :filterOption="true"
+ :filterOption="false"
style="width: 100%"
:options="options"
allowClear
@@ -16,6 +16,7 @@
:disabled="disabled"
@popupScroll="memberScroll"
@search="searchMember"
+ :open="isOpen"
@change="change"
>
@@ -27,7 +28,6 @@
import {computed, defineEmits, defineProps, onMounted, ref, watch} from "vue";
import {scrollLoad, throttle} from "@/api/method";
import * as api1 from "@/api/index1";
-import {useStore} from "vuex";
const props = defineProps({
value: {
@@ -42,15 +42,15 @@ const props = defineProps({
placeholder: String,
mode: String
})
-const store = useStore();
-const managerArray = computed(() => {
- return props.mode === 'select' ? props.value : props.value.split(',')
-})
+
+const options = ref([])
+
+const managerArray = computed(() => props.mode === 'select' ? props.value : (props.value ? props.value.split(',') : []))
const emit = defineEmits({})
-const options = ref([])
+const isOpen = ref(false)
const memberParam = ref({keyWord: '', pageNo: 1, pageSize: 10})
const loading = ref(false)
@@ -58,44 +58,45 @@ const loading = ref(false)
watch(() => memberParam.value.keyWord, throttle(getSearchMember, 500))
watch(() => memberParam.value.pageNo, throttle(getPageMember, 500))
+watch(props, init)
+
+function init() {
+ props.value && (options.value = props.value.split(',').map((e, i) => ({
+ value: e,
+ label: props.name.split(',')[i]
+ })))
+}
onMounted(() => {
console.log('onMounted')
- const memberOptions = store.state.memberInitInfo.map(e => ({
- label: e.realName,
- value: e.id
- }))
- if (props.value) {
- options.value = [...(props.value + '').split(',').map((value, i) => ({
- label: (props.name + '').split(',')[i],
- value
- })), ...memberOptions]
- } else options.value = memberOptions
+ init()
})
function getSearchMember() {
- loading.value = true
- options.value = []
+ console.log('getSearchMember')
+ options.value && options.value.length && (options.value = [])
getMemberData()
}
function getPageMember() {
- loading.value = true
+ console.log('getPageMember')
getMemberData()
}
function getMemberData() {
+ isOpen.value = true
+ loading.value = true
api1.getMemberInfo(memberParam.value).then((res) => {
+ if (!res.data.data.rows || !res.data.data.rows.length) {
+ isOpen.value = false
+ return;
+ }
const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({
label: e.realName,
value: e.id
}));
- if (memberParam.value.pageNo === 1 && props.value) {
- const arrManagerId = (props.value + '').split(',')
- const arrManager = props.name.split(',')
- options.value = [...arrManager.map((e, i) => ({label: e, value: arrManagerId[i]})), ...list]
- } else options.value.push(...list)
+ memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list)
loading.value = false
});
}
@@ -109,17 +110,28 @@ const memberScroll = (e) => {
//搜索学员
const searchMember = (keyWord) => {
+ console.log('searchMember', keyWord)
+ options.value = []
+ isOpen.value = true
keyWord && (memberParam.value = {keyWord, pageNo: 1, pageSize: 10});
};
function change(e, l) {
console.log('change', l)
+ isOpen.value = false
if (Array.isArray(l)) {
- emit('update:value', l.map(t => t.value).join(','))
+ // const selectIds = l.filter(t => t.value).map(t => t.value).join(',')
+ // const arr = props.value ? props.value.split(',').filter(e => !selectIds.includes(e)).map((e, i) => ({
+ // value: e,
+ // name: props.name.split(',')[i]
+ // })) : []
+ // l.push(...arr)
+ // l=l.filter(t => t.label)
emit('update:name', l.map(t => t.label).join(','))
+ emit('update:value', l.map(t => t.value).join(','))
} else {
- emit('update:value', l.value)
emit('update:name', l.label)
+ emit('update:value', l.value)
}
}
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 90b88ea2..f2544912 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3097,7 +3097,7 @@ import * as api1 from "../../api/index1";
import "@wangeditor/editor/dist/css/style.css";
import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
import SeeModal from "./components/seeModal.vue";
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 3eaf1ade..0f619b9f 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -59,6 +59,45 @@
+
+
+
+