diff --git a/src/App.vue b/src/App.vue
index 235c735b..7e5bb0b1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,7 +43,7 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
- console.log("版本0.9.1------------");
+ console.log("版本0.9.2------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});
diff --git a/src/api/config.js b/src/api/config.js
index 326b58f4..f860fcc7 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-06 09:02:40
+ * @LastEditTime: 2022-12-06 17:14:47
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -55,10 +55,10 @@ http.interceptors.response.use(
if (code === 0 || code === 200) {
return response;
} else {
- // if (code === 1000) {
- // window.open("https://u-pre.boe.com/web/", '_self');
- // // window.open("http://111.231.196.214:12013/manage/login", '_self');
- // }
+ if (code === 1000) {
+ window.open("https://u-pre.boe.com/web/", '_self');
+ // window.open("http://111.231.196.214:12013/manage/login", '_self');
+ }
console.log("api %o", msg);
}
return response;
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/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index d0270c04..576c8336 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -57,7 +57,7 @@
-
+
{
state.currentPage = page;
- state.selectedRowKeys = []
+ state.selectedRowKeys = [];
getAllOnlineText();
};
const getTableDate = (tableData) => {
@@ -365,9 +365,12 @@ export default {
state.tableDataTotal = res.data.data.count;
if (res.status === 200) {
console.log("获取在线课列表数据", res);
- for(let i=0;i
@@ -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 30238c8e..f2544912 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -695,7 +695,11 @@
-
@@ -3093,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";
@@ -3761,6 +3765,7 @@ export default defineComponent({
valueE2: "",
//确定面授
ft_eidt: false,
+ statusTingQi: 1,
qdms_inputV1: "",
qdms_inputV2: "",
qdms_inputV3: "",
@@ -3892,23 +3897,6 @@ export default defineComponent({
if (editor == null) return;
editor.destroy();
});
- watch(
- () => state,
- (newVal) => {
- console.log("newVal3333333333333333333");
- console.log(newVal.ft_hs);
- if (!newVal.ft_hs) {
- console.log("newVal.ft_hs11111111111111");
- // const editor = editorRef.value;
- // if (editor == null) return;
- // editor.destroy();
- // router.go(0);
- }
- },
- {
- deep: true,
- }
- );
// 富文本 eeeeeeeeeeeeee
const route = useRoute();
@@ -4567,6 +4555,7 @@ export default defineComponent({
state.hideshow = true;
state.offcourseId = null;
+ state.statusTingQi = 1;
state.qdms_inputV1 = "";
state.imageUrl = "";
state.qdms_inputV2 = "";
@@ -5165,11 +5154,20 @@ export default defineComponent({
}).then((res) => {
if (res.data.code === 200) return res.data.data;
});
- console.log("res");
+ console.log("res33333333333");
console.log(item);
console.log(options2.value);
console.log(options3.value);
+ if (Number(item.auditStatus) === 2 && Number(item.status) === 1) {
+ state.statusTingQi = 1;
+ }
+ if (Number(item.auditStatus) === 2 && Number(item.status) === 0) {
+ state.statusTingQi = 0;
+ }
+
+ console.log("res3333333444444444444433333");
+ console.log(state.statusTingQi);
state.qdms_inputV1 = item.name;
// state.imageUrl = item.picUrl;
state.feng_mian_1 = item.picUrl;
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 5b517b80..b2a0f7f8 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -324,7 +324,7 @@ import { useStore } from "vuex";
import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
import ProjectLevel from "@/components/project/ProjectLevel";
import { scrollLoad } from "@/api/method";
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index e0ff2629..3c366c35 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -806,7 +806,7 @@ import ProjCheckShip from "../../components/drawers/ProjCheckPower";
import * as api from "../../api/index";
import * as api1 from "../../api/index1";
import {storage} from "../../api/storage";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
import ProjectClass from "@/components/project/ProjectClass";
import OrgClass from "@/components/project/OrgClass";
import dayjs from "dayjs";
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index be89f9a0..7ebe6ed8 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1832,7 +1832,7 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import { useStore } from "vuex";
import ProjectLevel from "@/components/project/ProjectLevel";
import TrainClass from "@/components/project/TrainClass";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
export default {
name: "taskPage",
components: {