From 0b161080159159d4392c973dbad18e482c3ba62b Mon Sep 17 00:00:00 2001 From: wuyx Date: Thu, 23 Feb 2023 17:40:46 +0800 Subject: [PATCH 01/21] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=89=80=E5=B1=9E=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/examine/ProjectReviewed.vue | 214 ++++++++++--------------- src/views/examine/ProjectReviewedN.vue | 174 ++++++++------------ 2 files changed, 155 insertions(+), 233 deletions(-) diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue index 6ff491cc..a18e1fd2 100644 --- a/src/views/examine/ProjectReviewed.vue +++ b/src/views/examine/ProjectReviewed.vue @@ -14,56 +14,39 @@
- +
- +
- +
-
-
审核时间：
- +
+
审核时间：
+ +
-
@@ -78,40 +61,20 @@
- +
- +
- +
@@ -121,16 +84,9 @@
- +
@@ -156,7 +112,7 @@ export default { setup() { const state = reactive({ - loading:false, + loading: false, optionsproj: [ { value: "jack", @@ -178,19 +134,19 @@ export default { projAuditModal: false, closeBack: false, columns1: [ - // { - // title: "序号", - // dataIndex: "number", - // key: "number", - // align: "center", - // }, + // { + // title: "序号", + // dataIndex: "number", + // key: "number", + // align: "center", + // }, { title: "项目名称", dataIndex: "name", key: "name", align: "center", ellipsis: true, - width:"20%", + width: "20%", }, { @@ -199,14 +155,15 @@ export default { key: "topName", align: "center", ellipsis: true, - width:"20%", + width: "20%", customRender: ({ record: { gaName, faName, name } }) => ( -
- {faName - ? gaName !== null - ? gaName + "/" + faName - : faName - : name} +
+ { + faName ? gaName !== null + ? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName) + : faName.length > 16 ? faName.slice(0, 16) + '...' : faName + : name.length > 16 ? name.slice(0, 16) + '...' : name + }
), }, @@ -216,7 +173,7 @@ export default { key: "manager", align: "center", ellipsis: true, - width:"10%", + width: "10%", }, { title: "审核状态", @@ -224,7 +181,7 @@ export default { key: "status", align: "center", ellipsis: true, - width:"10%", + width: "10%", customRender: ({ record: { status } }) => (
{{ '2': "审核通过", "-5": "未通过" }[status + ""] || '审核通过'}
), @@ -235,7 +192,7 @@ export default { key: "createName", align: "center", ellipsis: true, - width:"10%", + width: "10%", }, { title: "审核时间", @@ -243,7 +200,7 @@ export default { key: "updateTime", align: "center", ellipsis: true, - width:"10%", + width: "10%", }, { title: "审核说明", @@ -251,8 +208,8 @@ export default { key: "description", align: "center", ellipsis: true, - width:"20%", - + width: "20%", + customRender: ({ record: { auditList, description } }) => (
{auditList.length !== 0 @@ -260,8 +217,8 @@ export default { ? auditList[auditList.length - 1].description : "-" : description - ? description - : "-"} + ? description + : "-"}
), }, @@ -271,14 +228,14 @@ export default { dataIndex: "opt", key: "opt", align: "center", - - width:"10%", + + width: "10%", customRender: (value) => { return (
{ - showProjAuditModal(value.record.auditList.length!==0?value.record.auditList:[]); + showProjAuditModal(value.record.auditList.length !== 0 ? value.record.auditList : []); }} style="cursor:pointer;color:#387DF7" > @@ -328,7 +285,7 @@ export default { tableData1: [], }); const getProjList = () => { - state.loading=true + state.loading = true let objn = { beginTime: state.valueDate ? dayjs(state.valueDate[0]).format("YYYY-MM-DD") : "", endTime: state.valueDate ? dayjs(state.valueDate[1]).format("YYYY-MM-DD") : "", @@ -351,7 +308,7 @@ export default { }); state.tableData1 = numdata; - state.loading=false + state.loading = false }); }; const changePagination = (pagina) => { @@ -383,10 +340,10 @@ export default { item.status == 1 ? "提交待审核" : item.status == 2 - ? "通过" - : item.status == 3 - ? "拒绝" - : "-", + ? "通过" + : item.status == 3 + ? "拒绝" + : "-", time: item.createTime, description: item.description, }; @@ -435,6 +392,7 @@ export default { background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); border-radius: 4px; + // position: absolute; // left: 50%; // top: 10%; @@ -443,10 +401,8 @@ export default { position: absolute; width: calc(100%); height: 68px; - background: linear-gradient( - rgba(78, 166, 255, 0.2) 0%, - rgba(78, 166, 255, 0) 100% - ); + background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100%); } .del_main { @@ -546,26 +502,28 @@ export default { .projectviewed { width: 100%; + .addTimeBox { - position: relative; - display: flex; - align-items: center; + position: relative; + display: flex; + align-items: center; - .addTime { - position: absolute; - z-index: 10; - margin-left: 10px; - color: rgba(0, 0, 0, 0.4); + .addTime { + position: absolute; + z-index: 10; + margin-left: 10px; + color: rgba(0, 0, 0, 0.4); + } + + .ant-picker { + padding-left: 85px; + } + + .ant-picker-range .ant-picker-active-bar { + margin-left: 85px; + } } - .ant-picker { - padding-left: 85px; - } - - .ant-picker-range .ant-picker-active-bar { - margin-left: 85px; - } -} .tmpl { width: 100%; diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue index 313ab6ca..68936bc7 100644 --- a/src/views/examine/ProjectReviewedN.vue +++ b/src/views/examine/ProjectReviewedN.vue @@ -14,55 +14,38 @@
- +
- +
- +
-
提交时间：
- -
+
提交时间：
+ +
@@ -78,40 +61,20 @@
- +
- +
- +
+ \ No newline at end of file diff --git a/src/views/system/OldSystemManage.vue b/src/views/system/OldSystemManage.vue new file mode 100644 index 00000000..35643980 --- /dev/null +++ b/src/views/system/OldSystemManage.vue @@ -0,0 +1,54 @@ + + + + \ No newline at end of file diff --git a/src/views/system/ReadingClubManage.vue b/src/views/system/ReadingClubManage.vue new file mode 100644 index 00000000..df61fd71 --- /dev/null +++ b/src/views/system/ReadingClubManage.vue @@ -0,0 +1,54 @@ + + + + \ No newline at end of file From 45fc5683b73ca68572b0ee9ad30fd6d79feec6fb Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 23 Feb 2023 19:35:29 +0800 Subject: [PATCH 04/21] -- fix bug --- src/views/examine/CourseReviewedN.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 2c31befb..24994c86 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -920,7 +920,7 @@ export default { {/* 获取课程审核记录 */} const getCourseRecord = (courseId) => { - state.loading2.value = true; + state.loading2 = true; editCourseRecord(courseId) .then((res) => { console.log("获取修改记录", res); @@ -928,11 +928,11 @@ export default { state.tableData2 = res.data.data.records; // console.log("state.tableData", state.tableData); } - state.loading2.value = false; + state.loading2 = false; }) .catch((err) => { console.log("获取修改记录失败", err); - state.loading2.value = false; + state.loading2 = false; }); } From 1967809b372bfbdfc5fd41d1244039172fbeeb96 Mon Sep 17 00:00:00 2001 From: wuyx Date: Thu, 23 Feb 2023 19:38:51 +0800 Subject: [PATCH 05/21] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=AD=A6=E5=91=98=E6=83=85=E5=86=B5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/ManagePage.vue | 123 +++++++++++++++--------------- 1 file changed, 63 insertions(+), 60 deletions(-) diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index 64d20a0d..9437fd6e 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -6,12 +6,12 @@
- +
-->
评估管理
@@ -27,23 +27,24 @@
评估名称: - {{basicInfo.assessmentName}} + {{ basicInfo.assessmentName }}
创建人: - {{basicInfo.createName}} + {{ basicInfo.createName }}
状态: - {{basicInfo.releaseStatus?basicInfo.releaseStatus==1?"待发布":basicInfo.releaseStatus==2?"已发布":"已结束":''}} + {{ basicInfo.releaseStatus ? basicInfo.releaseStatus == 1 ? "待发布" : basicInfo.releaseStatus == 2 ? "已发布" : "已结束" : '' }}
创建时间: - {{basicInfo.createTime}} + {{ basicInfo.createTime }}
发布时间: - {{basicInfo.releaseTime}} + {{ basicInfo.releaseTime }}
@@ -59,36 +60,22 @@
- +
- +
- + diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 88dc4fc5..958b336f 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -87,39 +87,77 @@ -
+
-