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/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 51b8fb33..b7ec2d8b 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -8,7 +8,7 @@ >
-
{{ title }}
+
【{{ title }}】考勤
+
+
签到二维码
+
批量签到
-
-
批量签退
-
导出数据
@@ -173,36 +173,7 @@
- - -
-
-
-
-
- 提示 -
-
-
- 您确定要批量签退吗 -
-
-
-
取消
-
-
-
确定
-
-
-
-
- +
+ + + \ No newline at end of file diff --git a/src/components/drawers/CheckWork.vue b/src/components/drawers/CheckWork.vue new file mode 100644 index 00000000..1dcf08c7 --- /dev/null +++ b/src/components/drawers/CheckWork.vue @@ -0,0 +1,154 @@ + + + + \ No newline at end of file diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue index cc4304de..109f2c2f 100644 --- a/src/components/drawers/CreVote.vue +++ b/src/components/drawers/CreVote.vue @@ -166,20 +166,15 @@ export default { }); }; const delQue = (value,index)=>{ - console.log('gyd',value,index); value.splice(value[index],1) } const addOpt = (value) => { - console.log(value); value.push({ - // title: "选项" + (value.length + 1 * 1), title: "选项", opvalue: "", }); }; const delOpt = (value,index) => { - console.log('gys', value,index); - // delete value value.splice(value[index],1) } const closeDrawer = () => { @@ -202,8 +197,7 @@ export default { ], ctx.emit("update:crevoteVisible", false); }; - const afterVisibleChange = (bool) => { - console.log("state", bool); + const afterVisibleChange = () => { if (props.ballotId != 0) { queryStemText() } @@ -237,14 +231,6 @@ export default { } } } - // for (let i = 0; i < state.questions.length; i++) { - // for (let k = 0; k < state.questions[i].options.length; k++) { - // console.log('1111111111111111', state.questions); - // console.log('2222222222222222', state.questions[i]); - // console.log(' state.questions[i].inputV', state.questions[i].inputV,); - // console.log('state.questions[i].options[k].opvalue',state.questions[i].options[k].opvalue) - // } - // } let obj = { "ballotId": 0, "ballotName": state.inputV1, @@ -286,10 +272,6 @@ export default { api .createOptionMessage(obj) .then((res) => { - console.log("创建成功", res); - // console.log('res.data.data[0].ascriptionId',res.data.data[0].ascriptionId); - // console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId); - // console.log('state.questions[0].inputV',state.questions[0].inputV); message.success("创建成功"); let objstem = { ballotName: state.inputV1, @@ -301,8 +283,8 @@ export default { ctx.emit("getData", objstem); closeDrawer(); }) - .catch((err) => { - console.log(err); + .catch(() => { + message.error("创建失败"); }); }; //删除选项信息 @@ -312,11 +294,11 @@ export default { } api .deleteVoteStemOption(objdelopt) - .then((res) => { - console.log('删除选项信息成功', res); + .then(() => { + message.success("删除成功"); }) - .catch((err) => { - console.log('删除选项信息失败', err); + .catch(() => { + message.error("创建失败"); }); } //根据id获取题干信息 @@ -324,13 +306,9 @@ export default { api .queryStemByStemId({ballotId:props.ballotId}) .then((res) => { - - - console.log('获取题干信息成功', res); state.inputV1 = res.data.data.voteName }) - .catch((err) => { - console.log('获取题干信息失败', err); + .catch(() => { }) } //编辑题干信息 @@ -372,11 +350,11 @@ export default { ] } api.updateStemMessage(objcst) - .then((res) => { - console.log('修改题干信息成功', res); + .then(() => { + message.success("修改题干信息成功") }) - .catch((err) => { - console.log('修改题干信息失败', err); + .catch(() => { + message.error("修改题干信息失败") }) } return { diff --git a/src/components/drawers/ExportHWork.vue b/src/components/drawers/ExportHWork.vue new file mode 100644 index 00000000..f3ca86f8 --- /dev/null +++ b/src/components/drawers/ExportHWork.vue @@ -0,0 +1,243 @@ + + + + \ No newline at end of file diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue new file mode 100644 index 00000000..b1c4f91e --- /dev/null +++ b/src/components/drawers/ExportScore.vue @@ -0,0 +1,356 @@ + + + + + + \ No newline at end of file diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index 317856a2..32bd2e00 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -117,10 +117,9 @@
- +
- + + + \ No newline at end of file diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index ca76fd5a..6cafdba1 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -74,7 +74,7 @@
{ + if(props.itemsType == 10){ + const columns = [ + { + title: "工号", + dataIndex: "workNum", + key: "workNum", + width: 50, + align: "center", + className: "h", + }, + { + title: "姓名", + dataIndex: "name", + key: "name", + width: 50, + align: "center", + className: "h", + }, + { + title: "所在部门", + dataIndex: "deptName", + key: "deptName", + width: 50, + align: "center", + className: "h", + }, + { + title: "所在岗位", + dataIndex: "jobName", + key: "jobName", + width: 50, + align: "center", + className: "h", + }, + { + title: "提交时间", + dataIndex: "cur", + key: "cur", + width: 110, + align: "center", + className: "h", + }, + { + title: "任务状态", + dataIndex: "state", + key: "state", + width: 50, + align: "center", + className: "h", + }, + { + title: "PDF状态", + dataIndex: "pdfstate", + key: "pdfstate", + width: 50, + align: "center", + className: "h", + }, + ]; + return columns; + } else if(props.itemsType == 5){ + const columns = [ + { + title: "工号", + dataIndex: "workNum", + key: "workNum", + width: 50, + align: "center", + className: "h head", + }, + { + title: "姓名", + dataIndex: "userName", + key: "userName", + width: 50, + align: "left", + className: "h head", + }, + { + title: "所在部门", + dataIndex: "deptName", + key: "deptName", + width: 60, + align: "center", + className: "h", + }, + { + title: "所在岗位", + dataIndex: "jobName", + key: "jobName", + width: 60, + align: "center", + className: "h", + }, + { + title: "考试次数", + dataIndex: "testNum", + key: "testNum", + width: 60, + align: "center", + className: "h", + }, + { + title: "成绩", + dataIndex: "score", + key: "score", + width: 60, + align: "center", + className: "h", + }, + { + title: "完成时间", + dataIndex: "time", + key: "time", + width: 100, + align: "center", + className: "h", + }, + { + title: "任务状态", + dataIndex: "status", + key: "status", + width: 60, + align: "center", + className: "h", + }, + { + title: "操作", + dataIndex: "operation", + key: "operation", + width: 60, + align: "center", + className: "h", + }, + ] + return columns; + } + + + }; + //考试、测评管理列表操作 + const ListOpera = () => { + let arr = state.tabledata; + console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-'); + arr.map((value) => { + value.operation = ( +
+
{ + console.log(state.tabledata,'++++++++++++'); + }} + > + 查看 +
+
+ ); + }); + state.tabledata = arr; + console.log(state.tabledata,'-----------'); + }; + ListOpera(); const selectProjectName = (value, index) => { console.log("value", value, index); state.projectName = value; @@ -291,8 +411,9 @@ export default { let timer; onMounted(() => { setTimeout(() => { - // getManageList(); + getManageList(); }, 1000); + timer = setInterval(() => { state.open = false; }, 3000); @@ -304,6 +425,7 @@ export default { ...toRefs(state), selectProjectName, closeDrawer, + tableDataFunc, showopen, onMounted, onUnmounted, @@ -317,26 +439,10 @@ export default { + diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index ed6c398f..c796f13f 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -56,6 +56,7 @@ > 创建投票 + 查看投票
+ + + + + +
{ @@ -220,14 +230,12 @@ export default { ctx.emit("update:addvoteVisible", false); ctx.emit("update:edit", false); }; - const afterVisibleChange = (bool) => { - console.log("state", bool); + const afterVisibleChange = () => { queryVoteInfo(); }; const showDrawerCreVote = () => { state.createVoteVisible = true; state.editChild = props.edit; - console.log("=======前") }; const getStemId = (data) => { @@ -245,8 +253,7 @@ export default { voteStemId:state.voteStemId } api.deleteVoteStem(objdelstem) - .then((res) => { - console.log('删除题干信息成功', res) + .then(() => { message.success('删除题干信息成功') delBox() }) @@ -284,14 +291,13 @@ export default { routerTaskId: props.routerTaskId || 0, type: 12, }) - .then((res) => { - console.log(res, 11111); + .then(() => { message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`) ctx.emit("changeData", false); state.addLoading = false; }) - .catch((err) => { - console.log(err, 1111); + .catch(( ) => { + message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`) }); }else if(props.isLevel ==2){ apiTask @@ -303,12 +309,12 @@ export default { stageId: props.chooseStageId, type: 12, }) - .then((res) => { - console.log("调用项目添加接口后111", res.data, 11111); + .then(() => { + message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`) ctx.emit("changeData", false); }) - .catch((err) => { - console.log(err, 111111); + .catch(() => { + message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`) }); }else if(props.isLevel ==3){ console.log(""); @@ -347,10 +353,10 @@ export default { .then((res) => { updateToTask(res); closeDrawer(); - console.log('修改投票信息成功', res); + message.success("修改投票信息成功") }) - .catch((err) => { - console.log('修改投票信息失败', err); + .catch(() => { + message.error("修改投票信息失败") }) }else{ api @@ -358,14 +364,20 @@ export default { .then((res) => { updateToTask(res); closeDrawer(); - console.log('创建投票信息成功', res); + message.success("创建投票信息成功") }) - .catch((err) => { - console.log('创建投票信息失败', err); + .catch(() => { + message.error("创建投票信息失败") }) } } + const queryStem = () => { + state.addStemVisible = true; + }; + const closeStem = () => { + state.addStemVisible = false; + }; return { ...toRefs(state), showDrawerCreVote, @@ -376,7 +388,8 @@ export default { dleVoteStem, updateVoteInfo, delBox, - + queryStem, + closeStem, }; }, }; diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue index 16563461..4f7d1646 100644 --- a/src/components/vote/CreateVote.vue +++ b/src/components/vote/CreateVote.vue @@ -102,14 +102,11 @@ export default { allFormsData: [], }); - const afterVisibleChange = (bool) => { - console.log("state======进来creates", bool); + const afterVisibleChange = () => { handleTypes(); }; const closeDrawer = () => { ctx.emit("update:createVoteVisible", false); - - console.log("======关闭"); } // 详情 const getInfoDate = async () => { @@ -129,8 +126,6 @@ export default { ]; // sortBy(renderArr, "orderNumber"); //序号 state.allFormsData = parseData(renderArr); //类型 - // console.log("state.allFormsData"); - // console.log(state.allFormsData); } }; getInfoDate(); @@ -306,10 +301,9 @@ export default { ], }; state.allFormsData.push(obj); - console.log("state.allFormsData=====", state.allFormsData, state.allFormsData.length); }; - const handleDel = ({ id, curItem }) => { + const handleDel = ({ id }) => { state.allFormsData.forEach((item, index) => { if (item.id === id) { state.allFormsData.splice(index, 1); @@ -319,7 +313,6 @@ export default { item.id = index + 1; return item; }); - console.log("curItem.orderNumber", curItem.orderNumber); // orderNumber: curItem.orderNumber, }; diff --git a/src/components/vote/VoteQuestion.vue b/src/components/vote/VoteQuestion.vue index d63e2b07..dbbd87df 100644 --- a/src/components/vote/VoteQuestion.vue +++ b/src/components/vote/VoteQuestion.vue @@ -107,12 +107,11 @@ export default { } }); }; - const del = ({ id, optionId }) => { + const del = ({ id }) => { curItem.value.singleList.forEach((item, index) => { if (item.id === id) { curItem.value.singleList.splice(index, 1); } - console.log("删除=====",id,optionId); }); diff --git a/src/components/vote/VoteQuestionItem.vue b/src/components/vote/VoteQuestionItem.vue index 97776f69..a99eda58 100644 --- a/src/components/vote/VoteQuestionItem.vue +++ b/src/components/vote/VoteQuestionItem.vue @@ -99,7 +99,6 @@ export default { const formData = new FormData(); formData.append("file", file); - console.log(file); fileUp(formData).then((res) => { if (res.data.code === 200) { state.hasImgName = file.name; 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 diff --git a/vue.config.js b/vue.config.js index 83ff56c7..278c0e97 100644 --- a/vue.config.js +++ b/vue.config.js @@ -5,6 +5,7 @@ module.exports = defineConfig({ port:8080, proxy: { "/api": { + // target: "http://192.168.100.208:30019/", target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口 changeOrigin: true, //表示是否改变原域名 // secure: false,