diff --git a/src/renderer/index.html b/src/renderer/index.html index 32958a9..974cb39 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -8,7 +8,7 @@ http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:" /> --> - + diff --git a/src/renderer/src/api/mode/index.js b/src/renderer/src/api/mode/index.js index a53a36f..59d0380 100644 --- a/src/renderer/src/api/mode/index.js +++ b/src/renderer/src/api/mode/index.js @@ -15,7 +15,7 @@ export function conversation(data) { }) } -// 进行课标研读对话 +// 进行课标研读对话 质点提取 export function completion(data) { return axios({ url: rootPath + '/api/v1/parse/docs', @@ -100,3 +100,22 @@ export function tempResult(params) { }) } +// 新增 doc +export function addDoc(data) { + return request({ + url: '/education/doc', + method: 'post', + data + }) +} + +// 查询 doc +export function docList(params) { + return request({ + url: '/education/doc/list', + method: 'get', + params + }) +} + + diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index bb304c2..2ed2c70 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=1731913617367') format('woff2'), - url('iconfont.woff?t=1731913617367') format('woff'), - url('iconfont.ttf?t=1731913617367') format('truetype'); + src: url('iconfont.woff2?t=1732173266977') format('woff2'), + url('iconfont.woff?t=1732173266977') format('woff'), + url('iconfont.ttf?t=1732173266977') format('truetype'); } .iconfont { @@ -13,6 +13,26 @@ -moz-osx-font-smoothing: grayscale; } +.icon-jiqiren_o:before { + content: "\eb62"; +} + +.icon-zhaoxiangji:before { + content: "\e679"; +} + +.icon-huaban:before { + content: "\e6e2"; +} + +.icon-tubiao_wuxing-:before { + content: "\e612"; +} + +.icon-soutibao-:before { + content: "\e605"; +} + .icon-baocun:before { content: "\e60e"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index 7893178..24b7b1a 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 0db8c88..127b376 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -5,6 +5,41 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "5387814", + "name": "机器人_o", + "font_class": "jiqiren_o", + "unicode": "eb62", + "unicode_decimal": 60258 + }, + { + "icon_id": "630128", + "name": "照相机", + "font_class": "zhaoxiangji", + "unicode": "e679", + "unicode_decimal": 59001 + }, + { + "icon_id": "12592146", + "name": "画板", + "font_class": "huaban", + "unicode": "e6e2", + "unicode_decimal": 59106 + }, + { + "icon_id": "6025688", + "name": "图标_五星-2", + "font_class": "tubiao_wuxing-", + "unicode": "e612", + "unicode_decimal": 58898 + }, + { + "icon_id": "11756625", + "name": "搜题宝-37", + "font_class": "soutibao-", + "unicode": "e605", + "unicode_decimal": 58885 + }, { "icon_id": "11467388", "name": "保存", diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index e7e25fc..1c84d13 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 96e1662..ebaaadf 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 51f82f7..6637ccb 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/header.vue b/src/renderer/src/components/template-study/container/header.vue index 219db88..0846bb1 100644 --- a/src/renderer/src/components/template-study/container/header.vue +++ b/src/renderer/src/components/template-study/container/header.vue @@ -2,7 +2,7 @@
- 高中语文课程标准 + {{ curNode.edustage}}{{ curNode.edusubject }}{{ type == 1 ? '课标研读': '教材分析'}}
@@ -26,7 +26,7 @@ 添加提示词 - 保存模板 + 一键研读
@@ -37,14 +37,14 @@ \ No newline at end of file diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue index b90edd4..8cd77c0 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue @@ -6,7 +6,7 @@ 批量推送
- 设计新作业 + 设计新作业
@@ -22,18 +22,25 @@ @current-change="handleCurrentChange" > - + @@ -122,6 +129,7 @@ import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue' import { ElMessage } from 'element-plus' import { cloneDeep } from 'lodash' +import { Plus } from '@element-plus/icons-vue' import { delClasswork } from '@/api/teaching/classwork' import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork' import { addClassworkReturnId } from '@/api/teaching/classwork' @@ -716,7 +724,7 @@ const editWork = async (cform) =>{ } } .page-left { - width: 300px; + width: 240px; background-color: white; border-radius: 10px; box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06); @@ -735,13 +743,16 @@ const editWork = async (cform) =>{ // overflow: hidden; // flex-direction: row; // text-overflow: ellipsis; - width: 230px; /* 设置容器的宽度 */ + width: 100%; /* 设置容器的宽度 */ overflow: hidden; /* 隐藏超出容器的部分 */ white-space: nowrap; /* 防止文本换行 */ text-overflow: ellipsis; /* 超出部分显示省略号 */ .ellipsis { width: 100%; text-align: left; + overflow: hidden; /* 隐藏超出容器的部分 */ + white-space: nowrap; /* 防止文本换行 */ + text-overflow: ellipsis; /* 超出部分显示省略号 */ } } diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue index 4d5f6ec..503f76c 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue @@ -174,22 +174,22 @@ const initHomeWork = async()=> { // taskList.value = res; // tasklist_loading.value = false; } -const getBase64 = (file) =>{ - return new Promise(function (resolve, reject) { - let reader = new FileReader(); - let imgResult = ""; - reader.readAsDataURL(file); - reader.onload = function () { - imgResult = reader.result; - }; - reader.onerror = function (error) { - reject(error); - }; - reader.onloadend = function () { - resolve(imgResult); - }; - }); -} +// const getBase64 = (file) =>{ +// return new Promise(function (resolve, reject) { +// let reader = new FileReader(); +// let imgResult = ""; +// reader.readAsDataURL(file); +// reader.onload = function () { +// imgResult = reader.result; +// }; +// reader.onerror = function (error) { +// reject(error); +// }; +// reader.onloadend = function () { +// resolve(imgResult); +// }; +// }); +// } /** * @desc: 上传本地图片 * @return: {*} @@ -203,37 +203,7 @@ const handleImportImg = (uploadFile) => { }); return; } - console.log('uploadFile', uploadFile); - // 假设你在渲染进程中 - getBase64(uploadFile.raw).then(res => { - // console.log('res-------', res); - - - // 在 Electron 主进程中使用 URL.createObjectURL - // const base64Data = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD/...'; // Base64 编码的图片数据 - // const base64Data = res; // Base64 编码的图片数据 - // const buffer = Buffer.from(base64Data.split(',')[1], 'base64'); - // const filePath = path.join(Remote.app.getPath('userData'), 'image.jpg'); - // console.log(filePath,'???????????????????'); - // fs.writeFileSync(filePath, buffer); - // const buf = fs.readFileSync(filePath) - // console.log(buf); - // const uint8Buffer = Uint8Array.from(buf) - // cropOption.img = window.URL.createObjectURL(new Blob([uint8Buffer])); - // cropOption.img = URL.createObjectURL(new Blob([fs.readFileSync(filePath)])); - // cropOption.img = URL.createObjectURL(new Blob([buffer])); - cropOption.img = res; - // console.log(cropOption.img); - - - - // cropOption.img = window.URL.createObjectURL(new Blob([res])); - // console.log(cropOption.img); - }) - // cropOption.img = window.URL.createObjectURL(uploadFile.raw); - // cropOption.img = window.URL.createObjectURL(new Blob([uploadFile.raw])); - // cropOption.img = window.URL.createObjectURL(new Blob([uploadFile.raw])); - // console.log(cropOption.img); + cropOption.img = window.URL.createObjectURL(uploadFile.raw); ElMessage.success('上传成功'); }; /** @@ -246,9 +216,6 @@ const getClipboardImg = async() => { for (const item of clipboardItems) { for (const type of item.types) { if (type.includes('image/')) { - console.log('剪贴板图片type', type); - console.log('剪贴板图片item', item); - console.log('剪贴板图片clipboardItems', clipboardItems); const blob = await item.getType(type); // blob 是图片的 Blob 对象 cropOption.img = URL.createObjectURL(blob); diff --git a/src/renderer/src/views/examination-analysis/container/adjust-dialog.vue b/src/renderer/src/views/examination-analysis/container/adjust-dialog.vue new file mode 100644 index 0000000..3b23962 --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/adjust-dialog.vue @@ -0,0 +1,303 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/dialog.vue b/src/renderer/src/views/examination-analysis/container/dialog.vue new file mode 100644 index 0000000..5e81e27 --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/dialog.vue @@ -0,0 +1,211 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/edit-dialog.vue b/src/renderer/src/views/examination-analysis/container/edit-dialog.vue new file mode 100644 index 0000000..fa7ff5d --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/edit-dialog.vue @@ -0,0 +1,78 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/header.vue b/src/renderer/src/views/examination-analysis/container/header.vue new file mode 100644 index 0000000..880debf --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/header.vue @@ -0,0 +1,143 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/keyword-dialog.vue b/src/renderer/src/views/examination-analysis/container/keyword-dialog.vue new file mode 100644 index 0000000..4821d6e --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/keyword-dialog.vue @@ -0,0 +1,161 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/pdf-template.vue b/src/renderer/src/views/examination-analysis/container/pdf.vue similarity index 99% rename from src/renderer/src/views/examination-analysis/container/pdf-template.vue rename to src/renderer/src/views/examination-analysis/container/pdf.vue index ceba60f..c83dfd0 100644 --- a/src/renderer/src/views/examination-analysis/container/pdf-template.vue +++ b/src/renderer/src/views/examination-analysis/container/pdf.vue @@ -3,7 +3,6 @@
- - - \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/read-result.vue b/src/renderer/src/views/examination-analysis/container/read-result.vue deleted file mode 100644 index aa3bd2d..0000000 --- a/src/renderer/src/views/examination-analysis/container/read-result.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/read-template.vue b/src/renderer/src/views/examination-analysis/container/read-template.vue deleted file mode 100644 index 0b2c218..0000000 --- a/src/renderer/src/views/examination-analysis/container/read-template.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/result.vue b/src/renderer/src/views/examination-analysis/container/result.vue new file mode 100644 index 0000000..e1cfa1b --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/result.vue @@ -0,0 +1,505 @@ + + + + + + diff --git a/src/renderer/src/views/examination-analysis/index.vue b/src/renderer/src/views/examination-analysis/index.vue index 9d0044d..7461e1c 100644 --- a/src/renderer/src/views/examination-analysis/index.vue +++ b/src/renderer/src/views/examination-analysis/index.vue @@ -1,177 +1,52 @@ \ 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 index 0c7ef4b..ff0d33c 100644 --- a/src/renderer/src/views/job-management/Left/index.vue +++ b/src/renderer/src/views/job-management/Left/index.vue @@ -127,7 +127,6 @@ onMounted(() => { .title-header{ display: flex; justify-content: space-between; - align-items: center; flex-direction: column; } diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue index da9b87b..b501fa8 100644 --- a/src/renderer/src/views/model/index.vue +++ b/src/renderer/src/views/model/index.vue @@ -1,16 +1,22 @@ - + \ No newline at end of file diff --git a/src/renderer/src/views/profile/components/selectClass.vue b/src/renderer/src/views/profile/components/selectClass.vue index f956927..24e3d48 100644 --- a/src/renderer/src/views/profile/components/selectClass.vue +++ b/src/renderer/src/views/profile/components/selectClass.vue @@ -62,10 +62,18 @@ const handleUserEduStage = (item) => { // 默认语文 userStore.edusubject = '语文' } + else if(item === '高中' && userStore.edusubject === "道德与法治"){ + // 默认语文 + userStore.edusubject = '政治' + } + else if(item != '高中' && userStore.edusubject === "政治"){ + // 默认语文 + userStore.edusubject = '道德与法治' + } } // 选择学科 const handleUserEduSubject = (item) => { - userStore.edusubject = item + userStore.edusubject = item; } onMounted(() => { getSubject() diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue index 9e2cd94..48c1ce3 100644 --- a/src/renderer/src/views/teachingDesign/container/right.vue +++ b/src/renderer/src/views/teachingDesign/container/right.vue @@ -61,7 +61,6 @@ import { completion } from '@/api/mode/index.js' const resultList = ref([]) emitter.on('changeMode', (item) => { - console.log(item, 3000) resultList.value = item.child conversation() })