From 6a33ea8023574608044f16fc1af9c285f6e9708e Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Thu, 12 Sep 2024 09:47:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=8F=90=E7=A4=BA=E6=95=99=E6=9D=90?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=97=B6=E9=80=89=E6=8B=A9=E6=95=99=E6=9D=90?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/container/reserv.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/renderer/src/views/prepare/container/reserv.vue b/src/renderer/src/views/prepare/container/reserv.vue index ed2ee39..c76c36f 100644 --- a/src/renderer/src/views/prepare/container/reserv.vue +++ b/src/renderer/src/views/prepare/container/reserv.vue @@ -270,6 +270,11 @@ const updateClassReserv = (formData) => { } const addClassReserv = (formData) => { let ids = formData.resource.join(',') + // 判断是否添加教材 + if(!props.bookId){ + ElMessage.warning('请选择教材') + return + } let param = { className: formData.name, classType: formData.type, From 17b8ce1ddaf27cd7ca7822c54e9079eba8a18233 Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 12 Sep 2024 15:42:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/utils/date.js | 3 + .../views/desktop/container/work-trend.vue | 241 +++++++++++++----- 2 files changed, 183 insertions(+), 61 deletions(-) diff --git a/src/renderer/src/utils/date.js b/src/renderer/src/utils/date.js index 2a178ca..0723da4 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/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue index e4ca636..abca407 100644 --- a/src/renderer/src/views/desktop/container/work-trend.vue +++ b/src/renderer/src/views/desktop/container/work-trend.vue @@ -1,92 +1,211 @@ \ No newline at end of file From d171117f03df772822bb42e5fd10cc64ef4d6bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Thu, 12 Sep 2024 15:58:12 +0800 Subject: [PATCH 3/5] tmp --- src/renderer/src/views/classTask/container/task-item.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/views/classTask/container/task-item.vue b/src/renderer/src/views/classTask/container/task-item.vue index ae63cc1..8eb564b 100644 --- a/src/renderer/src/views/classTask/container/task-item.vue +++ b/src/renderer/src/views/classTask/container/task-item.vue @@ -2,7 +2,7 @@
- {{ item.worktype }} + {{ item.worktype }}
From d4a6f74cfc15b62d81db1d073f5cff51b33886c1 Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 12 Sep 2024 16:03:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/desktop/container/work-trend.vue | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/renderer/src/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue index abca407..7e8a36b 100644 --- a/src/renderer/src/views/desktop/container/work-trend.vue +++ b/src/renderer/src/views/desktop/container/work-trend.vue @@ -4,8 +4,8 @@ 工作动态 - - + +
@@ -99,11 +99,9 @@ const tagType = (time) => { } // 切换 const changeTab = (val) =>{ - - console.log(type.value) switch(val){ case -1: - getClass() + // getClass() getHomework() break; case 1: @@ -117,7 +115,7 @@ const changeTab = (val) =>{ } onMounted(() => { - getClass() + // getClass() getHomework() }) From 1afaed082ac98e823079df458f1891ac24cff005 Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Thu, 12 Sep 2024 16:52:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/renderer/src/plugins/shareStore.js | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 80f69fc..38a2e3a 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@vue-office/excel": "^1.7.11", "@vue-office/pdf": "^2.0.2", "@vueuse/core": "^10.11.0", + "circular-json": "^0.5.9", "cropperjs": "^1.6.2", "crypto-js": "^4.2.0", "echarts": "^5.5.1", 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)