From f089aeb6396a110024eeb34beae8355767942550 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 21:34:13 +0800 Subject: [PATCH 1/9] =?UTF-8?q?---=E7=99=BB=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 2 ++ .env.release | 2 +- src/components/NavTop.vue | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.env.prod b/.env.prod index 451d13bb..66b95318 100644 --- a/.env.prod +++ b/.env.prod @@ -2,6 +2,8 @@ NODE_ENV=prod VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi +VUE_APP_LOGIN_URL=https://u.boe.com/web + VUE_APP_BOE_API_URL=https://u.boe.com VUE_APP_IFRAME_URL=https://u.boe.com/pc/iframe diff --git a/.env.release b/.env.release index b8513712..6fc7f447 100644 --- a/.env.release +++ b/.env.release @@ -1,7 +1,7 @@ NODE_ENV=release VUE_APP_BASE=/manage-release VUE_APP_BASE_API=/manageApi-release -VUE_APP_LOGIN_URL=https://u.boe.com/web +VUE_APP_LOGIN_URL=https://u.boe.com/web-release VUE_APP_BOE_API_URL=https://u.boe.com diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index a1146bdd..9b2ab928 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -62,6 +62,7 @@ import { reactive, toRefs } from "vue"; import DownLoad from "../components/drawers/DownLoad"; import * as api from "../api/index1"; import { studentUrl } from "../api/method"; +import router from "@/router"; export default { name: "NavTop", components: { @@ -137,7 +138,7 @@ export default { localStorage.removeItem("projectId"); localStorage.removeItem("projectTemplateId"); localStorage.removeItem("orgtreeList"); - window.open("https://u-pre.boe.com/web/", "_self"); + process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL) }; return { ...toRefs(state), From 406d2c3e1cbfc2ee7e83f416271e7e57c13f248b Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 21:36:00 +0800 Subject: [PATCH 2/9] =?UTF-8?q?---=E7=99=BB=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.boe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.boe b/.env.boe index 2afea7c4..3bafe80c 100644 --- a/.env.boe +++ b/.env.boe @@ -2,6 +2,8 @@ NODE_ENV=boe VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi +VUE_APP_LOGIN_URL=https://u-pre.boe.com/web + VUE_APP_BOE_API_URL=https://u-pre.boe.com From cd5e3fd0979b40fa3b10948adce7f54e907bace1 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 29 Dec 2022 11:12:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BE=E7=BC=96=E8=BE=91=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E6=97=B6=E6=97=B6=E9=97=B4=E5=9B=9E=E6=98=BE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA=E8=B0=83?= =?UTF-8?q?=E7=A0=94=E9=97=AE=E9=A2=98=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 4 ++-- src/views/research/ResearchAdd.vue | 4 ++-- src/views/research/components/ResearchAddAsk.vue | 3 ++- src/views/research/components/ResearchAddItem.vue | 2 +- src/views/research/components/ResearchAddMulti.vue | 2 +- src/views/research/components/ResearchAddPin.vue | 2 +- src/views/research/components/ResearchAddSingle.vue | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index ebb0a811..8f5c07be 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -593,8 +593,8 @@ export default { state.duration = result.duration; if (result.beginTime && result.endTime) { state.chooseTime = [ - dayjs(result.beginTime, "YYYY-MM-DD"), - dayjs(result.endTime, "YYYY-MM-DD"), + dayjs(result.beginTime, "YYYY-MM-DD HH-mm"), + dayjs(result.endTime, "YYYY-MM-DD HH-mm"), ]; } else { state.chooseTime = []; diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index a2007c8c..e144479d 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -46,7 +46,7 @@ @del="handleDel" /> -
+
@@ -33,6 +33,7 @@
diff --git a/src/views/research/components/ResearchAddItem.vue b/src/views/research/components/ResearchAddItem.vue index bc6318d7..2e1c5b90 100644 --- a/src/views/research/components/ResearchAddItem.vue +++ b/src/views/research/components/ResearchAddItem.vue @@ -10,7 +10,7 @@
diff --git a/src/views/research/components/ResearchAddMulti.vue b/src/views/research/components/ResearchAddMulti.vue index c46bb8af..14afd2e7 100644 --- a/src/views/research/components/ResearchAddMulti.vue +++ b/src/views/research/components/ResearchAddMulti.vue @@ -22,7 +22,7 @@ v-model:value="curItem.valueMutil" placeholder="请输入题干名称" show-count - :maxlength="20" + :maxlength="100" style="border-radius: 8px" />
diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue index d59303e5..fd2ed4d7 100644 --- a/src/views/research/components/ResearchAddPin.vue +++ b/src/views/research/components/ResearchAddPin.vue @@ -22,7 +22,7 @@ v-model:value="curItem.valuePin" placeholder="请输入标题名称" show-count - :maxlength="20" + :maxlength="100" style="border-radius: 8px" /> diff --git a/src/views/research/components/ResearchAddSingle.vue b/src/views/research/components/ResearchAddSingle.vue index 0130ab54..3275828e 100644 --- a/src/views/research/components/ResearchAddSingle.vue +++ b/src/views/research/components/ResearchAddSingle.vue @@ -22,7 +22,7 @@ v-model:value="curItem.valueSingle" placeholder="请输入题干名称" show-count - :maxlength="20" + :maxlength="100" style="border-radius: 8px" /> From d181177f4196822aee10e25085565279d37b9aba Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 29 Dec 2022 12:12:46 +0800 Subject: [PATCH 4/9] =?UTF-8?q?---=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index cace7ae2..e6093d67 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -958,7 +958,7 @@ {{ remark }} -
+
审核意见：
{{ passInfo }} @@ -3351,13 +3351,10 @@ export default { console.log("get task", res.data.data); if (res.data.code === 200) { // 判断当前审核是否通过 - if ( - res.data.data.status == -5 && - res.data.data.projectAuditLogDtoList !== null - ) { + if (res.data.data.projectAuditLogDtoList && res.data.data.projectAuditLogDtoList.length) { console.log("审核信息是什么", res.data.data.projectAuditLogDtoList); let dataset = res.data.data.projectAuditLogDtoList; - state.passInfo = dataset[dataset.length - 1]; + state.passInfo = dataset[dataset.length - 1].description; /** for (let i = 0; i < dataset.length; i++) { From daf8d29570cdfa3e9c5e4306320fdbe0e118a631 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 29 Dec 2022 18:58:49 +0800 Subject: [PATCH 5/9] =?UTF-8?q?---=E9=A1=B9=E7=9B=AE=E7=BB=8F=E7=90=86=20?= =?UTF-8?q?=E5=92=8C=20=E7=BB=84=E7=BB=87=E6=A0=91=E5=BC=82=E6=AD=A5?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/OrgClass.vue | 50 ++++++++++++++++++------ src/components/student/CommonStudent.vue | 34 ++++++++++------ 2 files changed, 60 insertions(+), 24 deletions(-) diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index 73f44421..e5bd8f08 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -5,11 +5,15 @@ return triggerNode.parentNode || document.body; } " - v-model:value="id" + v-model:value="labelValue" style="width: 100%" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择归属组织" + :labelInValue="true" allow-clear + v-model:treeExpandedKeys="stuTreeExpandedKeys" + :loading="orgLoading" + :load-data="onLoadData" :tree-data="options" :fieldNames="{ children: 'treeChildList', @@ -23,30 +27,50 @@ diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 19f097dd..cc9ad30e 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -28,7 +28,7 @@ res.result.map(e => ({...e,isLeaf:false})), +}) const { data: audiData, fetch: searchAudi, @@ -578,9 +585,13 @@ const closeDrawer = () => { visiable.value = false; stuData.value = []; nameSearch.value.keyword = ""; - - }; +function onLoadData(treeNode){ + return request(ORG_CHILD_LIST, {keyword:'',orgId:treeNode.id}).then(r => { + treeNode.dataRef.treeChildList = r.result.directChildList + treeData.value = [...treeData.value] + }) +} const closeChangeModal = () => { stageVisible.value = false; }; @@ -588,9 +599,9 @@ const openDrawer = () => { visiable.value = true; }; //获取组织树 -const treeData = computed(() => { - return store.state.orgtreeList ? store.state.orgtreeList : []; -}); +// const treeData = computed(() => { +// return store.state.orgtreeList ? store.state.orgtreeList : []; +// }); function onSearchStu() { nameSearch.value.page = 1; @@ -654,6 +665,7 @@ const auditChangePagination = (page) => { audienceName.value.page = page; searchAudi(); }; + //重置 function peopleName(name) { console.log('people-name', name.target.value) From 73fa8d9f1ef3379df6924d1d27b72d405f484109 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 29 Dec 2022 20:00:33 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/SeeStu.vue | 48 +++++++++++++------ src/components/student/TableStudent.vue | 5 +- .../courselibrary/components/seeModal.vue | 3 ++ 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index aced870f..95e2fb73 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -1,3 +1,4 @@ + -
+ + + +
+
{{ item.complete }}
+
@@ -433,6 +451,14 @@ export default { color: rgba(51, 51, 51, 1); font-size: 16px; } + + } + .mainbox { + // height: 463px; + margin-right: 37px; + margin-top: 32px; + //border: 1px solid rgba(221, 238, 255, 1); + //border-radius: 6px; .rowbox { width: 64px; height: 24px; @@ -442,6 +468,7 @@ export default { margin-left: 24px; border: 1px solid rgba(64, 158, 255, 1); background: rgba(64, 158, 255, 0.1); + margin-right: 700px; cursor: pointer; .shuom { color: rgba(64, 158, 255, 1); @@ -450,13 +477,6 @@ export default { margin-right: 5px; } } - } - .mainbox { - // height: 463px; - margin-right: 37px; - margin-top: 32px; - //border: 1px solid rgba(221, 238, 255, 1); - //border-radius: 6px; .ant-collapse { background-color: #ffffff; border: 0; diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 643be4e9..ddb5cd51 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -165,9 +165,10 @@ const tablecolumns = ref([ title: "姓名", dataIndex: "studentName", key: "studentName", - width: "8%", + width: "12%", align: "left", className: "h", + ellipsis: true, customRender: ({record: {studentName, topFlag}}) => (topFlag ?
+
+ asterisk +
课程简介：
From e52ea959729953fe766e8c205877403721a47e46 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 29 Dec 2022 20:20:58 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E6=97=A0=E9=98=B6=E6=AE=B5=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/SeeStu.vue | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index 95e2fb73..ec302c1e 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -83,12 +83,11 @@
-