diff --git a/src/App.vue b/src/App.vue index 9d385244..b22bbd4d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本2.1.2------------"); + console.log("版本2.1.3------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index 4158b413..e0b7558f 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -1,4 +1,5 @@ -export const USER_LIST = '/userbasic/user/list post' +// export const USER_LIST = '/userbasic/user/list post' +export const USER_LIST = '/userbasic/user/searchList post' export const ORG_LIST = '/userbasic/org/list post' export const ORG_CHILD_LIST = '/userbasic/org/info post' export const AUDIENCE_LIST = '/userbasic/audience/list post' \ No newline at end of file diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue index 7e02a166..329ff3f9 100644 --- a/src/components/drawers/NoticeHis.vue +++ b/src/components/drawers/NoticeHis.vue @@ -9,15 +9,15 @@
- - 
{{item.content}}
+ style="margin-top: -10px; height: 220px;background-color: #fff;border:1px solid #fff;" + /> +
{{ item.pubtime }}
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue index 59d3deef..be42d539 100644 --- a/src/components/drawers/NoticePub.vue +++ b/src/components/drawers/NoticePub.vue @@ -17,14 +17,14 @@ - - 
{{noticeContent1}}
+ style="margin-top: -10px; height: 220px;border:1px solid #fff; resize: none;background-color: #fff;color:#666;" + /> +
编辑
@@ -34,13 +34,20 @@ - 
{{noticeContent1}}
+ +

编辑新公告：

取消 diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index 0a546d83..748f4191 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -302,6 +302,7 @@ export default { ? "投票" : "-", name: value.name, + projectTaskId: value.projectTaskId, complete: value.status == -1 ? "未开始" @@ -316,6 +317,8 @@ export default { }; array.push(obj); }); + array.sort((a,b)=>{return a.projectTaskId - b.projectTaskId}) + console.log('我排序了吗--------------------------》', array) return array; }; const setStageList = (tableData) => { diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue index 7638f33c..cee1d9f1 100644 --- a/src/components/drawers/SelFacet.vue +++ b/src/components/drawers/SelFacet.vue @@ -120,6 +120,8 @@ import { reactive, toRefs, computed } from "vue"; // import { planList } from "../../api/indexTaskadd"; //import {detail} from "../../api/indexCourse"; import { list } from "../../api/indexTaskadd"; +import {useStore} from "vuex"; + const columns1 = [ @@ -147,14 +149,14 @@ const columns1 = [ align: "center", ellipsis: true, }, - { - title: "授课教师", - width: "15%", - dataIndex: "teacher", - key: "teacher", - align: "center", - ellipsis: true, - }, + // { + // title: "授课教师", + // width: "15%", + // dataIndex: "teacher", + // key: "teacher", + // align: "center", + // ellipsis: true, + // }, { title: "创建人", width: "15%", @@ -194,6 +196,7 @@ export default { }, }, setup(props, ctx) { + const store = useStore(); const state = reactive({ classTableData: [ // { @@ -417,6 +420,17 @@ export default { }); }; + const sysTypeOptions = computed(() => store.state.sysType); + + function findClassFullName(list,classify, name = '') { + console.log(list,classify) + return list && list.length && list + .map(e => classify == e.dictCode ? name ? name + '-' + e.dictName : e.dictName : findClassFullName(e.children, classify,name ? name + '-' + e.dictName : e.dictName)) + .filter(name => name) + .join('') || '' + } + + const getClassData = (tabledata) => { let data = tabledata; let array = []; @@ -429,8 +443,8 @@ export default { teacher: value.teacher || "-", creator: value.createName || "-", time: value.publishTime, - categoryId: value.categoryId, - category: changeTreeSelectValue(String(value.categoryId)), + categoryId: value.sysTypeId, + category: value.sysTypeId, //需要判断content }; console.log("obj", obj); @@ -455,43 +469,48 @@ export default { // break; // } // } - if (!obj.category) { - obj.category = "-"; - } - console.log("obj. obj.category22 ", obj.category); + // if (!obj.category) { + // obj.category = "-"; + // } + // console.log("obj. obj.category22 ", obj.category); array.push(obj); }); + + array.forEach((itm) => { + itm.category = findClassFullName(sysTypeOptions.value,itm.categoryId) || '-' + }); + console.log(array) state.classTableData = array; }; // 格式化树型结构选择数据 - const changeTreeSelectValue = (values) => { - let data = state.options2222; - console.log(values, data) - let str = '' - for (let i = 0; i < data.length; i++) { - if (data[i].value == values) { - str = data[i].title - } else { - for (let j = 0; j < data[i].children.length; j++) { - if (data[i].children[j].value == values) { - str = data[i].title + '/' + data[i].children[j].title - } else { - if (data[i].children[j].children) { - for (let k = 0; k < data[i].children[j].children.length; k++) { - if (data[i].children[j].children[k].value == values) { - str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title - } - } - } - } - } - } - } - console.log('str-str-str-str', str) - state.fen_lei1 = str; - return str; - } + // const changeTreeSelectValue = (values) => { + // let data = state.options2222; + // console.log(values, data) + // let str = '' + // for (let i = 0; i < data.length; i++) { + // if (data[i].value == values) { + // str = data[i].title + // } else { + // for (let j = 0; j < data[i].children.length; j++) { + // if (data[i].children[j].value == values) { + // str = data[i].title + '/' + data[i].children[j].title + // } else { + // if (data[i].children[j].children) { + // for (let k = 0; k < data[i].children[j].children.length; k++) { + // if (data[i].children[j].children[k].value == values) { + // str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title + // } + // } + // } + // } + // } + // } + // } + // console.log('str-str-str-str', str) + // state.fen_lei1 = str; + // return str; + // } diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 38feca10..f57a2136 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -162,9 +162,9 @@ diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index 829ee738..baf63238 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -569,7 +569,7 @@ export default { `${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.projectTaskInfo.stageId - }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=${4}` + }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=${4}&taskId=${props.projectTaskInfo.projectTaskId}` ); // api // .exportTaskStudent({ diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 63cd9666..59caaee0 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -388,13 +388,12 @@ export default { "thirdId": props.datasource.targetId, "type": 1 }); - + {/* "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, */} api.QueryOnlineManagementDetail({ - "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, "status": state.projectName, "studentName": state.name, "targetId":props.datasource.projectId, - "taskId": props.datasource.projectTaskId, + "taskId": props.datasource.courseId, "thirdId": props.datasource.targetId, "type": 1 }).then(res=>{ diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 84f11ede..40cba7dc 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -397,7 +397,7 @@ export default { "status": state.projectName, "studentName": state.name, "targetId":props.datasource.routerId, - "taskId": props.datasource.routerTaskId, + "taskId": props.datasource.courseId, "thirdId": props.datasource.targetId, "type": 1 }).then(res=>{ diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index 43d1a8e8..7c0ae81a 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -139,9 +139,9 @@ diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index fff442af..97a2b0bf 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -560,7 +560,7 @@ export default { `${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.datasource.chapterId - }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}` + }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}&taskId=${props.datasource.routerTaskId}` ); // api // .exportTaskStudent({ diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 3fbeda80..41510e4e 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -196,7 +196,7 @@ :scroll="{ x: 1500 }" row-key="id" :row-selection="stuRowSelection" - > + >