diff --git a/src/api/index1.js b/src/api/index1.js index b8f120f7..d7517673 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-10 11:41:52 + * @LastEditTime: 2022-11-17 15:41:45 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ diff --git a/src/api/indexStage.js b/src/api/indexStage.js index 1e6a2587..a39355b9 100644 --- a/src/api/indexStage.js +++ b/src/api/indexStage.js @@ -1,4 +1,14 @@ +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-11-09 09:26:26 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2022-11-17 21:20:05 + * @FilePath: /fe-manage/src/api/indexStage.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ import http from "./config"; //添加阶段 -export const editStage = (obj) => http.post('/admin/project/editStage', obj); \ No newline at end of file +export const editStage = (obj) => http.post('/admin/project/editStage', obj); +// 删除阶段 +export const deleteStage = (obj) => http.delete('/admin/project/deleteStage',{params:obj}); \ No newline at end of file diff --git a/src/api/indexVote.js b/src/api/indexVote.js index fd1a7437..11b05e52 100644 --- a/src/api/indexVote.js +++ b/src/api/indexVote.js @@ -63,7 +63,9 @@ export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOpti export const editVote = (obj) => http.post('/vote/editVote', obj) //根据题干ID获取题干信息 -export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', { params: obj }) +export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', obj,{ + headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'} +}) //修改题干信息接口 export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj); diff --git a/src/assets/images/leveladd/edit1.png b/src/assets/images/leveladd/edit1.png new file mode 100644 index 00000000..e319e324 Binary files /dev/null and b/src/assets/images/leveladd/edit1.png differ diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 09f462c8..a8adc8b1 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -437,6 +437,17 @@ textarea { } } +.ant-modal{ + .modalHeader{ + background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; + } + .top{ + background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; + } + .del_header{ + background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; + } +} //弹窗-------------------------------------------------------- //loading-------------------------------------------------------- diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 2abfc972..c4cb108c 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -273,6 +273,58 @@ export default { }, ]; } + if ( + n.indexOf("/coursereviewed") !== -1 || + n.indexOf("/CourseReiewed") !== -1 + ) { + state.list = [ + { + name: "审核管理", + }, + { + name: "已审核课程", + }, + ]; + } + if ( + n.indexOf("/coursereviewedn") !== -1 || + n.indexOf("/CourseReiewedN") !== -1 + ) { + state.list = [ + { + name: "审核管理", + }, + { + name: "待审核课程", + }, + ]; + } + if ( + n.indexOf("/projectreviewed") !== -1 || + n.indexOf("/ProjectReviewed") !== -1 + ) { + state.list = [ + { + name: "审核管理", + }, + { + name: "已审核项目", + }, + ]; + } + if ( + n.indexOf("/projectreviewedn") !== -1 || + n.indexOf("/ProjectReviewedN") !== -1 + ) { + state.list = [ + { + name: "审核管理", + }, + { + name: "待审核项目", + }, + ]; + } } ); diff --git a/src/components/Modals/projSet.vue b/src/components/Modals/projSet.vue index d41a38c6..92306df8 100644 --- a/src/components/Modals/projSet.vue +++ b/src/components/Modals/projSet.vue @@ -180,7 +180,7 @@ alt="" /> - 培训体系： + 培训分类：
- 待审核项目 + 待审核项目 - 已审核项目 + 已审核项目 @@ -307,13 +307,13 @@ export default { pagename: "已审核课程", }, { - href: "/projectviewedn", + href: "/projectreviewedn", openKeys: "sub10", selectedKeys: "sub10-3", pagename: "待审核项目", }, { - href: "/projectviewed", + href: "/projectrrviewed", openKeys: "sub10", selectedKeys: "sub10-4", pagename: "已审核项目", diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 86be21ed..c796f13f 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -56,6 +56,7 @@ > 创建投票 + 查看投票
+ + + + + +
{ @@ -362,6 +372,12 @@ export default { } } + const queryStem = () => { + state.addStemVisible = true; + }; + const closeStem = () => { + state.addStemVisible = false; + }; return { ...toRefs(state), showDrawerCreVote, @@ -372,7 +388,8 @@ export default { dleVoteStem, updateVoteInfo, delBox, - + queryStem, + closeStem, }; }, }; diff --git a/src/components/vote/queryStem.vue b/src/components/vote/queryStem.vue new file mode 100644 index 00000000..e3be6c23 --- /dev/null +++ b/src/components/vote/queryStem.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/src/views/courselibrary/CourseManage.vue b/src/views/courselibrary/CourseManage.vue index 2a5bf0bc..fb6beea2 100644 --- a/src/views/courselibrary/CourseManage.vue +++ b/src/views/courselibrary/CourseManage.vue @@ -1,458 +1,40 @@ + - + \ No newline at end of file diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue index 1dd9ddc0..57526254 100644 --- a/src/views/projectcenter/ClassAdd.vue +++ b/src/views/projectcenter/ClassAdd.vue @@ -261,7 +261,7 @@ class="nameimg" src="../../assets/images/basicinfo/asterisk.png" /> -
培训体系
+
培训分类
- 考勤 +
- 二维码 +
- 管理 +
@@ -388,7 +388,7 @@
基本信息 - 编辑 + 编辑
@@ -478,11 +478,11 @@
-
培训体系：
+
培训分类：
@@ -593,6 +593,7 @@ import { ref, reactive, defineComponent, toRefs, onMounted} from "vue"; import { message } from "ant-design-vue"; import * as api from "@/api/indexTemplate" +import { useRouter } from "vue-router"; export default defineComponent({ name: "LibraryAdd", setup() { @@ -790,6 +791,7 @@ export default defineComponent({ const value = ref(""); const value2 = ref(""); const textnum = "150"; + const routered = useRouter(); const changeopclo = () => { state.hideshow = !state.hideshow; }; @@ -907,7 +909,15 @@ export default defineComponent({ console.log(err) }) } - + const toEdit = () => { + routered.push({ + path: "/templateAdd", + query: { + projectId: state.projectId, + name: state.name, + }, + }); + } // 新建或编辑阶段 const stateEdit = () => { let obj={ @@ -959,6 +969,7 @@ export default defineComponent({ taskDel, stateEdit, taskEdit, + toEdit, }; }, computed: { diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index deb832c8..a3d759ad 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -247,7 +247,7 @@ class="nameimg" src="../../assets/images/basicinfo/asterisk.png" /> -
培训体系
+
培训分类
+ + \ No newline at end of file