+
diff --git a/src/renderer/src/plugins/shareStore.js b/src/renderer/src/plugins/shareStore.js
index e291561..10aec30 100644
--- a/src/renderer/src/plugins/shareStore.js
+++ b/src/renderer/src/plugins/shareStore.js
@@ -4,6 +4,7 @@
const isNode = typeof require !== 'undefined' // 是否支持node函数
const { ipcRenderer } = isNode?require('electron'):{} // app使用
import { sessionStore } from '@/utils/store'
+import CircularJSON from 'circular-json'
// import { diff } from 'jsondiffpatch'
// const Remote = isNode?require('@electron/remote'):{} // 远程模块
@@ -173,6 +174,7 @@ const findDifferences = (obj1, obj2) => {
for (const key in o1) {
if (o1.hasOwnProperty(key)) {
const newPath = path ? `${path}.${key}` : key;
+ if(!o2) return
if (o2.hasOwnProperty(key)) {
const v1 = toJsonStr(o1[key])
const v2 = toJsonStr(o2[key])
@@ -202,6 +204,6 @@ const findDifferences = (obj1, obj2) => {
return differences;
}
// 对象克隆
-const objClone = (obj) => JSON.parse(JSON.stringify(obj))
+const objClone = (obj) => JSON.parse(CircularJSON.stringify(obj))
// 转换为json
-const toJsonStr = (obj) => JSON.stringify(obj)
+const toJsonStr = (obj) => CircularJSON.stringify(obj)
diff --git a/src/renderer/src/utils/date.js b/src/renderer/src/utils/date.js
index 839e60b..2adf3d5 100644
--- a/src/renderer/src/utils/date.js
+++ b/src/renderer/src/utils/date.js
@@ -88,6 +88,9 @@ export const getCurrentTime = (format)=> {
const day = now.getDate().toString().padStart(2, '0');
const hours = now.getHours().toString().padStart(2, '0');
const minutes = now.getMinutes().toString().padStart(2, '0');
+ if(format == 'YYYY-MM-DD HH:mm'){
+ return `${year}-${month}-${day} ${hours}:${minutes}`;
+ }
if(format == 'YYYY-MM-DD'){
return `${year}-${month}-${day}`;
}
diff --git a/src/renderer/src/utils/resourceDict.js b/src/renderer/src/utils/resourceDict.js
index 9a26a2b..c86aaf8 100644
--- a/src/renderer/src/utils/resourceDict.js
+++ b/src/renderer/src/utils/resourceDict.js
@@ -1,14 +1,14 @@
export const tabs = [
{
- label: '平台资源',
+ label: '平台',
value: '平台'
},
{
- label: '校本资源',
+ label: '校本',
value: '校本'
},
{
- label: '第三方资源',
+ label: '第三方',
value: '第三方'
},
]
@@ -57,18 +57,23 @@ export const resourceFormat = [
// 资源类型
export const resourceType = [
{
- label: '素材',
- value: '素材'
+ label: '课例库',
+ value: "'apt','课件','教案'"
+ },
+ {
+ label: '作业库',
+ value: '作业',
+ disabled: true
},
{
- label: '课件',
- value: '课件'
+ label: '素材库',
+ value: "'素材'"
},
-
{
- label: '教案',
- value: '教案'
+ label: '习题库',
+ value: '习题',
+ disabled: true
}
]
// 年级划分
diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue
index d02ba7f..f29b2f3 100644
--- a/src/renderer/src/views/classTask/classTask.vue
+++ b/src/renderer/src/views/classTask/classTask.vue
@@ -140,7 +140,7 @@ const getClassWorkList = () => {
edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
- orderby: 'uniquekey DESC',
+ orderby: 'concat(deaddate,uniquekey) DESC',
pageSize: 100
}).then((response) => {
for (var i = 0; i < response.rows.length; i++) {
@@ -213,7 +213,8 @@ const getStudentClassWorkData = () => {
edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
- orderby: "uniquekey DESC",
+ status: '1', // 作业状态：1-已发布
+ orderby: "uniquekey DESC",// TODO： 这里是否加 deaddate 的排序，后续看
pageSize: 1000
}).then((res) => {
for (var t = 0; t < classWorkList.value.length; t++) {
@@ -369,7 +370,8 @@ const getStudentVisible = async () => {
edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
- orderby: 'uniquekey DESC',
+ status: '1', // 作业状态：1-已发布
+ orderby: 'concat(deaddate,uniquekey) DESC',
pageSize: 100
})
const curWorkList = response.rows
diff --git a/src/renderer/src/views/classTask/container/item-dialog-score.vue b/src/renderer/src/views/classTask/container/item-dialog-score.vue
index 31d0e34..44e84de 100644
--- a/src/renderer/src/views/classTask/container/item-dialog-score.vue
+++ b/src/renderer/src/views/classTask/container/item-dialog-score.vue
@@ -150,6 +150,7 @@
:min-scale="0.2"
:preview-src-list="stuItem.imagefile"
:initial-index="4"
+ fit="contain"
/>
@@ -233,6 +234,7 @@
.map((item) => item.url)
"
:initial-index="4"
+ fit="contain"
/>