diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index d33400a..3bf7ac3 100644 --- a/src/renderer/src/assets/iconfont/iconfont.css +++ b/src/renderer/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4723712 */ - src: url('iconfont.woff2?t=1731315402630') format('woff2'), - url('iconfont.woff?t=1731315402630') format('woff'), - url('iconfont.ttf?t=1731315402630') format('truetype'); + src: url('iconfont.woff2?t=1731393731097') format('woff2'), + url('iconfont.woff?t=1731393731097') format('woff'), + url('iconfont.ttf?t=1731393731097') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-tihuan:before { + content: "\e7ab"; +} + +.icon-fasong:before { + content: "\e692"; +} + .icon-ai1:before { content: "\e70a"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index 9e2529d..8cf9c4d 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4723712='',(l=>{var h=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var a,v,t,i,z,p=function(h,c){c.parentNode.insertBefore(h,c)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4723712,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),a()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(t=a,i=l.document,z=!1,o(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){z||(z=!0,t())}function o(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(o,50)}M()}})(window); \ No newline at end of file +window._iconfont_svg_string_4723712='',(l=>{var h=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var a,v,t,i,z,p=function(h,c){c.parentNode.insertBefore(h,c)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4723712,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),a()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(t=a,i=l.document,z=!1,o(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){z||(z=!0,t())}function o(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(o,50)}M()}})(window); \ No newline at end of file diff --git a/src/renderer/src/assets/iconfont/iconfont.json b/src/renderer/src/assets/iconfont/iconfont.json index 3c05b3c..dc37f21 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -5,6 +5,20 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "12730938", + "name": "替换", + "font_class": "tihuan", + "unicode": "e7ab", + "unicode_decimal": 59307 + }, + { + "icon_id": "34833984", + "name": "发送", + "font_class": "fasong", + "unicode": "e692", + "unicode_decimal": 59026 + }, { "icon_id": "41844021", "name": "ai", diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index 8aa23b4..9d086c8 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.ttf and b/src/renderer/src/assets/iconfont/iconfont.ttf differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff b/src/renderer/src/assets/iconfont/iconfont.woff index 077f1cf..91fa738 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff and b/src/renderer/src/assets/iconfont/iconfont.woff differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff2 b/src/renderer/src/assets/iconfont/iconfont.woff2 index 8dea413..3e6e9e3 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff2 and b/src/renderer/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/renderer/src/components/template-study/container/adjust-dialog.vue b/src/renderer/src/components/template-study/container/adjust-dialog.vue new file mode 100644 index 0000000..0ed1521 --- /dev/null +++ b/src/renderer/src/components/template-study/container/adjust-dialog.vue @@ -0,0 +1,260 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/components/template-study/container/edit-dialog.vue b/src/renderer/src/components/template-study/container/edit-dialog.vue new file mode 100644 index 0000000..852c78b --- /dev/null +++ b/src/renderer/src/components/template-study/container/edit-dialog.vue @@ -0,0 +1,75 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/components/template-study/container/header.vue b/src/renderer/src/components/template-study/container/header.vue index 100545c..4729912 100644 --- a/src/renderer/src/components/template-study/container/header.vue +++ b/src/renderer/src/components/template-study/container/header.vue @@ -20,7 +20,7 @@
- + @@ -31,6 +31,35 @@
+ + +
+ + + + + + + + + + + +
+ + @@ -41,6 +70,7 @@ import { ElMessageBox } from 'element-plus' import { modelList } from '@/api/mode/index' import Dialog from './dialog.vue' +const keywordDialog = ref(false) const props = defineProps({ model: { type: [String, Number], @@ -52,7 +82,7 @@ const emit = defineEmits(['changeTemp', 'onRead']) const showDialog = ref(false) const aiRead = () => { - emit('onRead') + emit('onRead') } @@ -88,6 +118,11 @@ const changeTemplate = (val) => { } +const form = reactive({ + name: '', + desc: '', +}) + onMounted(() => { getTemplateList() @@ -121,4 +156,14 @@ onMounted(() => { font-weight: bold; } } + +.custom-header { + justify-content: space-between; + align-items: center; + + .icon-guanbi { + cursor: pointer; + font-weight: bold; + } +} \ No newline at end of file diff --git a/src/renderer/src/components/template-study/container/result.vue b/src/renderer/src/components/template-study/container/result.vue index 2efeb1e..160ae6a 100644 --- a/src/renderer/src/components/template-study/container/result.vue +++ b/src/renderer/src/components/template-study/container/result.vue @@ -3,7 +3,7 @@
- +
#{{ item.name }}
@@ -17,15 +17,15 @@
- + 重新研读 - + AI对话调整 - + 手动编辑结果 @@ -36,16 +36,21 @@
- + + + +
+ \ No newline at end of file diff --git a/src/renderer/src/views/job-management/Left/index.vue b/src/renderer/src/views/job-management/Left/index.vue new file mode 100644 index 0000000..b4032d1 --- /dev/null +++ b/src/renderer/src/views/job-management/Left/index.vue @@ -0,0 +1,108 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/job-management/Right/index.vue b/src/renderer/src/views/job-management/Right/index.vue new file mode 100644 index 0000000..653e84d --- /dev/null +++ b/src/renderer/src/views/job-management/Right/index.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/job-management/components/button.vue b/src/renderer/src/views/job-management/components/button.vue new file mode 100644 index 0000000..c5104d4 --- /dev/null +++ b/src/renderer/src/views/job-management/components/button.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/job-management/components/customSelect.vue b/src/renderer/src/views/job-management/components/customSelect.vue new file mode 100644 index 0000000..6d82c16 --- /dev/null +++ b/src/renderer/src/views/job-management/components/customSelect.vue @@ -0,0 +1,114 @@ + + + + \ No newline at end of file diff --git a/src/renderer/src/views/job-management/index.vue b/src/renderer/src/views/job-management/index.vue new file mode 100644 index 0000000..5237946 --- /dev/null +++ b/src/renderer/src/views/job-management/index.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue index cf60b22..fe64262 100644 --- a/src/renderer/src/views/model/index.vue +++ b/src/renderer/src/views/model/index.vue @@ -2,6 +2,7 @@
课标研读 + 作业管理
diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue index 6ade321..6216179 100644 --- a/src/renderer/src/views/profile/userInfo.vue +++ b/src/renderer/src/views/profile/userInfo.vue @@ -8,7 +8,7 @@
-
{{ user.deptName }}
+
{{ userStore.DeptInfo.register.schoolName }}
更改学校
@@ -249,8 +249,13 @@ function groupByCondition(arr, condition) { } } onMounted(() => { - getSubject() - getClassInfo() - getTheSection() + console.log(userStore.DeptInfo,'DeptInfo'); + + // 没有加入学校前不能执行以下接口 + if(userStore.user.deptId){ + getSubject() + getClassInfo() + getTheSection() + } }) diff --git a/src/renderer/src/views/schoolManagement/index.vue b/src/renderer/src/views/schoolManagement/index.vue index 9dbcdc1..e5c9a4a 100644 --- a/src/renderer/src/views/schoolManagement/index.vue +++ b/src/renderer/src/views/schoolManagement/index.vue @@ -14,7 +14,7 @@ />
审核状态
- 全部 + 全部 审核中 已通过 已驳回 @@ -85,7 +85,7 @@ import { ElMessage } from 'element-plus' import useUserStore from '@/store/modules/user' const userStore = useUserStore() const searchValue = reactive({ - status:-1, + status:'null', schoolName:null, pageNum:1, pageSize:10,