diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 6d5fc9ab..6952daf9 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -940,6 +940,7 @@ export default {
};
const signQR = () => {
console.log("props.datasource", props.datasource);
+ console.log("是项目还是路径图啊")
state.codevisible = true;
state.codeInfo = {
title: "【签到】二维码",
@@ -948,7 +949,7 @@ export default {
process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${
props.datasource.type
- }&type=${1}`,
+ }&type=${props.datasource.routerId?2:1}`,
};
console.log("codeInfo", state.codeInfo);
state.codeIndex = 0;
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index dfce029a..58009db8 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -219,7 +219,7 @@
@@ -228,7 +228,7 @@
考试说明:
@@ -266,7 +266,8 @@ const initValue = {
showAnalysis: 2,
scoringModel: 2,
questionArrangement: 4,
- externalExplain: ""
+ externalExplain: "",
+ examinationExplain: ""
}
const formData = ref(initValue)
const innerRule = {
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index d4846eaa..4dcc8621 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -117,13 +117,22 @@
-
-
{{ item.complete }}
+
{{ item.complete }}
-->
+
![]()
+
+ {{ item.status === 0 ? "进行中" : item.status === 1 ? "已完成" : "未开始" }}
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index d78015cb..5994d21b 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -500,7 +500,6 @@ export default {
// 导出数据
function exportTaskStu() {
- debugger
if(props.datasource.type==1){
{/* 在线课导出 */}
window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 79ba5630..9dcfc1de 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -692,7 +692,6 @@ const deleteId = ref(null);
const deleteTargetId = ref(null);
const deleteType = ref(null);
function del(id, row) {
- debugger
if (row.isLeader === "1") {
return message.warning("" + row.name + "是小组长,请勿删除!");
}
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 3d68b861..a48b7ea3 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1251,6 +1251,7 @@
:id="offcoursePlanId"
:columns="stuColumns"
:visable="sm_hs"
+ :permissions="permissions"
:isgetStudent="isgetStudent"
>
@@ -2154,6 +2155,8 @@ export default defineComponent({
const sysTypeOptions = computed(() => store.state.content_type);
const state = reactive({
+ permissions:null,
+ createId:null,
workInfo: {},
examInfo: {},
tableLoading: false,
@@ -3839,11 +3842,7 @@ export default defineComponent({
key: "8",
align: "center",
customRender: ({ record }) =>
- itm.courseScore === -1
- ? "-"
- : record.assessmentStatus
- ? "已评估"
- : "未评估",
+ record.assessmentStatus?"已评估" : "未评估",
},
{
title: "评分",
@@ -3854,7 +3853,7 @@ export default defineComponent({
customRender: ({ record }) => {
return (
- {record.studentScore !== -1 ? record.studentScore : "-"}
+ {record.assessmentScore || "-"}
);
// switch (String(record.status)) {
@@ -4554,6 +4553,7 @@ export default defineComponent({
}
state.offcourseId = item.id;
state.newCourseName = item.name;
+ state.permissions = item.permissions;
getTableDate3();
state.stm_hs = true;
@@ -4660,6 +4660,8 @@ export default defineComponent({
state.om_1 = true;
state.ft_1 = true;
state.manageStuLoading = true;
+ state.permissions = item.permissions;
+ state.createId = item.createId;
console.log(787666, item);
state.faceClassification = item.contentTxt;
state.faceStatus = item.status;
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 64ef66cb..05587954 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -17,7 +17,7 @@
src="@/assets/images/basicinfo/add.png"
/>
-
+
![]()
{
console.log(
- "组织、岗位、Band、资源归属选择",
- state.orgSelect,
- state.selectJobId,
- state.selectBandId,
- state.sourceBelongId
+ "组织、岗位、Band、资源归属选择" + JSON.stringify(state)
+ // state.orgSelect,
+ // state.selectJobId,
+ // state.selectBandId,
+ // state.sourceBelongId
);
let files = "";
if (state.imgList.length) {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 13a9b10e..0d36ff2b 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -23,25 +23,25 @@

@@ -50,7 +50,7 @@
{{ act }}
@@ -59,7 +59,7 @@
{{ act }}
@@ -68,7 +68,7 @@
{{ act }}
@@ -77,7 +77,7 @@
{{ act }}
@@ -185,7 +185,7 @@
-
+
批量面授报名
-->
-
+
-
+
{{ record.topFlag ? "取消优秀" : "优秀学员" }}
换组
@@ -795,7 +795,7 @@
-
+
创建小组
@@ -826,13 +826,13 @@
>
-
{{ item.groupName }}
+
{{ item.groupName }}
. . .
-
+
编辑
@@ -846,7 +846,7 @@
@@ -1181,7 +1181,7 @@
-->
@@ -1299,7 +1299,7 @@
v-if="docChecked == true"
v-model:file-list="fileList"
name="file"
- :action="uploadAction"
+ :action="process.env.VUE_APP_BASE_API + '/file/uploadunlimit'"
@change="handleChange"
>
{
- debugger;
console.log("state.groupPageList" + state.groupPageList);
const id = state.groupInfo.id;
const d = state.groupPageList
@@ -6794,6 +6790,12 @@ export default {
font-size: 16px;
line-height: 36px;
font-weight: 600;
+
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ cursor: pointer;
+
}
.more {
diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue
index 764cbcbe..1991b9bf 100644
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -52,7 +52,7 @@