diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index fe4154b..506637a 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -15,7 +15,7 @@ const size = ref('default')
font-family: Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- text-align: center;
+ /* text-align: center; */
color: #2c3e50;
width: 100%;
}
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index c57f831..50526fb 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -7,11 +7,20 @@
-
-
- {{ node.label }}
+
+
+
+
+ {{ node.label }}
+
+
+
+
+ {{ node.label }}
+
@@ -51,6 +60,13 @@ import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+
+const props = defineProps({
+ // 是否为[教学大模型]中使用(作业设计中对应该章节是否存在第三方试题)
+ isClassTask: {
+ default: false
+ },
+})
const isStadium = () => {
let roles = userStore.user.roles
return roles.some(item => item.roleKey === 'stadium')
@@ -179,17 +195,6 @@ const handleNodeClick = (data) => {
emit('nodeClick', curData)
}
-const renderContent = (h, { node, data, store }) => {
- return h(
- 'span',
- {
- style: {
- color: data.bookId==''||data.bookId=='0' ? '#A5B3CA' : 'black',
- },
- },
- node.label
- );
-}
onMounted( async () => {
treeLoading.value = true
try{
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index ab76968..03bb2e6 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -169,6 +169,10 @@ const emits = defineEmits(['getData'])
// 这个代表的是是否从ppt里面添加的作业
const isShow = ref(false)
+const propsQueryTask = {
+ id: route.query.classTaskId, // 需编辑的作业任务id
+ isInit: false, // 是否已编辑
+}
const propsQueryCourseObj = route.query.courseObj;//作业布置的内容对象
const courseObj = reactive({
// 课程相关参数: 教材id,单元id,章节id,课程名称
@@ -198,7 +202,7 @@ const boardLoading = ref(false);
const fileLoading = ref(false); // 常规作业loading
onMounted(() => {
- console.log("----onMounted-------")
+ //console.log("----onMounted-------");
currentRow.value.id = 0
if(propsQueryCourseObj){
if(JSON.parse(propsQueryCourseObj)){
@@ -311,7 +315,7 @@ const selectable=(row, index)=>{
/**
* 获取 entpcourseid 获取作业列表
*/
-const initHomeWork = async()=> {
+const initHomeWork = async ()=> {
tasklist_loading.value = true;
// const { res, chapterId } = await useGetHomework(courseObj.node);
const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
@@ -319,6 +323,16 @@ const initHomeWork = async()=> {
console.log('res', res);
entpcourseid.value = chapterId;
taskList.value = res;
+ // 判断当前是否存在其他页面跳转编辑, 如果初次且存在id,则选中该任务
+ const taskId = propsQueryTask?.id ?? 0;
+ if (!propsQueryTask.isInit && taskId!=0){
+ const activeRow = taskList.value.find(o => o.id == taskId);
+ if (activeRow){
+ propsQueryTask.isInit = true; // 清空避免重新保存后再次选中该任务
+ taskTable.value.setCurrentRow(activeRow);
+ handleCurrentChange(activeRow);
+ }
+ }
tasklist_loading.value = false;
}
@@ -414,7 +428,6 @@ const successHomework = () => {
initHomeWork();
})
}
-
// --------------------作业编辑
let classWorkForm = reactive({
id: '',// cloneDeep(props.propsformobj.id),
@@ -814,11 +827,12 @@ const editWork = async (cform) =>{
let res = await updateClasswork(cform);
if (res.code == 200) {
ElMessage.success('更新成功');
- taskList.value = []
+ taskList.value = [];
// 清空左侧 选中的布置列表 并刷新列表
if(isShow.value){
currentRow.value.id = 1;
}else{
+ handleNewAllClass();
currentRow.value.id = 0;
}
initHomeWork();
diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue
index 7eb9039..7cc18f3 100644
--- a/src/renderer/src/views/model/index.vue
+++ b/src/renderer/src/views/model/index.vue
@@ -1,7 +1,7 @@
-
+