From 497b7449cbcbb6011009cfb6cbfe29b9c72990da Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 14 Dec 2022 15:46:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E8=AF=BE=E7=A8=8B=E9=A2=84=E8=A7=88=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 22 +++++++++---------- .../courselibrary/components/seeModal.vue | 10 +++++++-- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 1c4b42f6..5692e525 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2119,7 +2119,7 @@ item.indexOf("-") !== -1 ? item.slice( item.lastIndexOf("/") + 1, - item.indexOf("-") + item.lastIndexOf("-") ) + item.slice(item.lastIndexOf(".")) : item }} @@ -3274,16 +3274,16 @@ const columns7 = [ return text ? text : "-"; }, }, - // { - // title: "岗位", - // width: 300, - // dataIndex: "postion", - // key: "3", - // align: "center", - // customRender: ({ text }) => { - // return text ? text : "-"; - // }, - // }, + // { + // title: "岗位", + // width: 300, + // dataIndex: "postion", + // key: "3", + // align: "center", + // customRender: ({ text }) => { + // return text ? text : "-"; + // }, + // }, { title: "Band", width: 200, diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue index 76ee9e31..1d9971d6 100644 --- a/src/views/courselibrary/components/seeModal.vue +++ b/src/views/courselibrary/components/seeModal.vue @@ -224,7 +224,7 @@ item.indexOf("-") !== -1 ? item.slice( item.lastIndexOf("/") + 1, - item.indexOf("-") + item.lastIndexOf("-") ) + item.slice(item.lastIndexOf(".")) : item }} @@ -410,8 +410,14 @@ export default defineComponent({ ], }, ], + ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx", + ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx", }); - console.log("detail", props.detail); + + // item.slice( + // item.lastIndexOf("/") + 1, + // item.indexOf("-") + // ) + item.slice(item.lastIndexOf(".")) const filterTxt = (txt) => { if (txt) { return txt; From 117dd5f1848b0d91d3c1cfc25e0763959104d264 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Wed, 14 Dec 2022 16:00:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/MemberList.vue | 16 ++++++++-------- src/views/learningpath/LevelAdd.vue | 16 ++++++++-------- src/views/learningpath/LevelAddDetail.vue | 16 ++++++++-------- src/views/projectcenter/ProjectManage.vue | 2 +- src/views/projectcenter/TaskPage.vue | 14 +++++++------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 6fe9f77c..cff40cee 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -239,14 +239,14 @@ export default { // align: "center", // className: "h", // }, - { - title: "进度", - dataIndex: "progress", - key: "progress", - width: 60, - align: "center", - className: "h", - }, + // { + // title: "进度", + // dataIndex: "progress", + // key: "progress", + // width: 60, + // align: "center", + // className: "h", + // }, { title: "操作", dataIndex: "operations", diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index a7f4668a..644ef532 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1499,14 +1499,14 @@ export default { align: "center", className: "h", }, - { - title: "进度", - dataIndex: "jin", - key: "jin", - width: 110, - align: "center", - className: "h", - }, + // { + // title: "进度", + // dataIndex: "jin", + // key: "jin", + // width: 110, + // align: "center", + // className: "h", + // }, { title: "开始时间", dataIndex: "time", diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 15919243..91f232bd 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1547,14 +1547,14 @@ export default { align: "center", className: "h", }, - { - title: "进度", - dataIndex: "jin", - key: "jin", - width: 110, - align: "center", - className: "h", - }, + // { + // title: "进度", + // dataIndex: "jin", + // key: "jin", + // width: 110, + // align: "center", + // className: "h", + // }, { title: "开始时间", dataIndex: "time", diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index d41f3d04..1a45eade 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1328,7 +1328,7 @@ export default { title: "项目名称", dataIndex: "name", key: "name", - width: 480, + width: 380, // align: "center", ellipsis: true, // scopedSlots: { customRender: "action" }, //引入的插槽 diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index fd59ffda..f2d530e8 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -3165,14 +3165,14 @@ export default { // align: "center", // className: "h", // }, - { - title: "进度", - dataIndex: "progress", - key: "progress", + // { + // title: "进度", + // dataIndex: "progress", + // key: "progress", // width: 30, - align: "center", - className: "h", - }, + // align: "center", + // className: "h", + // }, // { // title: "证书", // dataIndex: "diploma", From 4b12a51f516caed139d2a3b51f098fb3de58b1d0 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Wed, 14 Dec 2022 16:04:10 +0800 Subject: [PATCH 3/3] merge --- src/components/project/ProjectClass.vue | 62 +- src/components/project/ProjectLevel.vue | 62 +- src/components/project/TrainClass.vue | 63 +- src/views/courselibrary/CoursewareManage.vue | 1154 +++++++++-------- .../courselibrary/components/seeModal.vue | 168 ++- src/views/projectcenter/LibraryAdd.vue | 38 +- src/views/projectcenter/TaskPage.vue | 36 +- src/views/projectcenter/templateAdd.vue | 83 +- 8 files changed, 867 insertions(+), 799 deletions(-) diff --git a/src/components/project/ProjectClass.vue b/src/components/project/ProjectClass.vue index 854235d3..3a4e9190 100644 --- a/src/components/project/ProjectClass.vue +++ b/src/components/project/ProjectClass.vue @@ -1,46 +1,54 @@ + diff --git a/src/components/project/ProjectLevel.vue b/src/components/project/ProjectLevel.vue index 10b9c9b6..65611995 100644 --- a/src/components/project/ProjectLevel.vue +++ b/src/components/project/ProjectLevel.vue @@ -1,27 +1,34 @@ + diff --git a/src/components/project/TrainClass.vue b/src/components/project/TrainClass.vue index 9ddbebd5..4f944ccf 100644 --- a/src/components/project/TrainClass.vue +++ b/src/components/project/TrainClass.vue @@ -1,27 +1,34 @@ + diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5a1d7369..5692e525 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -82,18 +82,16 @@
-
- -
搜索
-
-
- -
重置
-
- -
-
- +
+ +
搜索
+
+
+ +
重置
+
+
+
@@ -631,8 +629,8 @@ 授课教师
-
- + @@ -813,31 +811,33 @@ ? 'disabled operation' : 'operation', ]" - > -
-
- 编辑 -
+ > +
+
+ 编辑 +
-
- 复制 -
- - + -
- 删除 +
+ 删除 +
-
@@ -1295,7 +1306,7 @@ column.key === 'operation' " > -
-
-
- 编辑 -
-
- 复制 -
- - + -
- 删除 -
+
+ 删除 +
@@ -1720,12 +1734,13 @@
重置
-
- -
- 新建开课 +
+ +
+ 新建开课 +
-
+
@@ -1758,8 +1773,8 @@