+
+
+
+
+
+
+
diff --git a/src/api/index1.js b/src/api/index1.js index ced2867e..e72c8d52 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -220,6 +220,8 @@ export const cancelOrAuth = (obj) => http.post('/admin/certificate/cancelOrAuth' export const allPoints = (obj) => http.get('/points/project/allPoints', { params: obj }) export const updateStuCert = (obj) => http.post('/admin/certificate/updateStuCert', obj) +//添加外部考试 +export const createExamination = (obj) => http.post('/examination/createExamination', obj) // 外部考试导入成绩 export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/manage/importExternalExamScore', obj, { headers: { "Content-Type": "multipart/form-data" } }) //分组 diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 7c46804a..bc5bbb1b 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -3,151 +3,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
store.state.userInfo)
+ const userInfo = computed(() => store.state.userInfo);
const state = reactive({
- confirmLoading:false,
+ confirmLoading: false,
tableLoading: false,
out: false,
out1: false,
@@ -857,7 +907,7 @@ export default {
state.pathIntro = "";
state.out = !state.out;
if (userInfo.value.departId && userInfo.value.departName) {
- state.organizationSelectName =userInfo.value.departName;
+ state.organizationSelectName = userInfo.value.departName;
state.organizationSelectId = userInfo.value.departId;
}
};
@@ -874,14 +924,14 @@ export default {
const chooseImg = (item) => {
console.log(item);
state.pathBgId = item.code;
- state.pathBg = item.value.split(',')[0];
- state.mobilePicUrl = item.value.split(',')[1];
+ state.pathBg = item.value.split(",")[0];
+ state.mobilePicUrl = item.value.split(",")[1];
};
const chooseImg2 = (item) => {
// console.log(item);
state.pathBgId = item.code;
- state.pathBg = item.value.split(',')[0];
- state.mobilePicUrl = item.value.split(',')[1];
+ state.pathBg = item.value.split(",")[0];
+ state.mobilePicUrl = item.value.split(",")[1];
};
//发布弹窗
const showPub = (router) => {
@@ -961,10 +1011,14 @@ export default {
const copyLearnPath = () => {
state.copyModal = false;
state.tableLoading = true;
- api.handleLearnPath({
- routerId: state.copyPathId,
- type: 2,
- }).then(() => {getLearnPath();})
+ api
+ .handleLearnPath({
+ routerId: state.copyPathId,
+ type: 2,
+ })
+ .then(() => {
+ getLearnPath();
+ });
message.success("复制成功");
};
@@ -1158,30 +1212,30 @@ export default {
};
//创建学习路径图
const createLearnPath = async () => {
- state.confirmLoading = true
+ state.confirmLoading = true;
if (!state.pathName) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("请输入路径图名称");
}
if (!state.organizationSelectName) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("请选择归属组织");
}
if (!state.pathBg) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("请选择背景图");
}
if (!state.mobilePicUrl) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("未配置H5背景图,请联系管理员!");
}
if (!state.validate) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
message.warning("路径图名称重复");
return;
}
@@ -1194,23 +1248,25 @@ export default {
});
if (offName) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("项目名称重复,请重新填写");
}
- api.createLearnPath({
- name: state.pathName,
- remark: state.pathIntro,
- status: 0,
- organizationId: state.organizationSelectId,
- organizationName: state.organizationSelectName,
- picUrl: state.pathBg,
- mobilePicUrl: state.mobilePicUrl,
- }).then(id => {
- message.destroy();
- state.confirmLoading = false
- message.success("创建成功");
- router.push( {path: "/leveladd",query:{routerId: id.data.data }})
+ api
+ .createLearnPath({
+ name: state.pathName,
+ remark: state.pathIntro,
+ status: 0,
+ organizationId: state.organizationSelectId,
+ organizationName: state.organizationSelectName,
+ picUrl: state.pathBg,
+ mobilePicUrl: state.mobilePicUrl,
})
+ .then((id) => {
+ message.destroy();
+ state.confirmLoading = false;
+ message.success("创建成功");
+ router.push({ path: "/leveladd", query: { routerId: id.data.data } });
+ });
};
//获取学习路径列表
@@ -1260,35 +1316,39 @@ export default {
state.deleteModal = false;
state.tableLoading = true;
message.success("删除成功");
- api.handleLearnPath({routerId: state.deletePathId, type: -2}).then(() => {getLearnPath()})
+ api
+ .handleLearnPath({ routerId: state.deletePathId, type: -2 })
+ .then(() => {
+ getLearnPath();
+ });
};
//编辑学习路径图
const editLearnPath = async () => {
- state.confirmLoading = true
+ state.confirmLoading = true;
if (!state.pathName) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("请输入路径图名称");
}
if (!state.organizationSelectName) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("请选择归属组织");
}
if (!state.pathBgId) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("请选择背景图");
}
if (!state.mobilePicUrl) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("未配置H5背景图,请联系管理员!");
}
if (!state.validate) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("路径图名称重复");
}
// state.pathName = detail.name;
@@ -1308,11 +1368,11 @@ export default {
});
if (offName) {
message.destroy();
- state.confirmLoading = false
+ state.confirmLoading = false;
return message.warning("项目名称重复,请重新填写");
}
state.out1 = false;
- state.confirmLoading = false
+ state.confirmLoading = false;
message.success("修改成功");
state.tableLoading = true;
let obj = {
@@ -1325,7 +1385,9 @@ export default {
organizationId: state.organizationSelectId,
status: 0,
};
- api.createLearnPath(obj).then(() => {getLearnPath()})
+ api.createLearnPath(obj).then(() => {
+ getLearnPath();
+ });
};
//选择状态
const selectStatusClassify = (e, v) => {
@@ -1452,10 +1514,10 @@ export default {
);
function manage(id) {
// TODO 为了点击顶部面包屑导航返回而存储
- localStorage.setItem('routerId',id)
+ localStorage.setItem("routerId", id);
router.push({
path: "/leveladd",
- query:{routerId:id}
+ query: { routerId: id },
});
}
@@ -1463,38 +1525,40 @@ export default {
// console.log("编辑学习路径图id", id);
//获取学习路径详情
api
- .getRouterDetail(id,"draft")
- .then((res) => {
- if (res.data.code === 200) {
- console.log("获取学习路径详情成功", res.data.data);
- let detail = res.data.data.routerInfo;
- state.pathName = detail.name;
- state.pathBg = detail.picUrl;
- state.mobilePicUrl = detail.mobilePicUrl;
- state.pathBgId = "";
- state.organizationSelectName = detail.organizationName;
- state.organizationSelectId = detail.organizationId;
- state.pathIntro = detail.remark;
- state.editPathId = id;
- const imgDict = imgData.value.find((img)=>img.value.split(',')[0] === state.pathBg)
- if(imgDict){
- state.pathBgId = imgDict.code;
- state.pathBg = imgDict.value.split(',')[0];
- state.mobilePicUrl = imgDict.value.split(',')[1];
- }
-
- //for (let i = 0; i < arr.length; i++) {
- // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
- // if (arr[i].dictValue === state.pathBg) {
- // state.pathBgId = arr[i].dictCode;
-
- // }
- // }
+ .getRouterDetail(id, "draft")
+ .then((res) => {
+ if (res.data.code === 200) {
+ console.log("获取学习路径详情成功", res.data.data);
+ let detail = res.data.data.routerInfo;
+ state.pathName = detail.name;
+ state.pathBg = detail.picUrl;
+ state.mobilePicUrl = detail.mobilePicUrl;
+ state.pathBgId = "";
+ state.organizationSelectName = detail.organizationName;
+ state.organizationSelectId = detail.organizationId;
+ state.pathIntro = detail.remark;
+ state.editPathId = id;
+ const imgDict = imgData.value.find(
+ (img) => img.value.split(",")[0] === state.pathBg
+ );
+ if (imgDict) {
+ state.pathBgId = imgDict.code;
+ state.pathBg = imgDict.value.split(",")[0];
+ state.mobilePicUrl = imgDict.value.split(",")[1];
}
- })
- .catch((err) => {
- console.log("获取详情失败", err);
- });
+
+ //for (let i = 0; i < arr.length; i++) {
+ // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
+ // if (arr[i].dictValue === state.pathBg) {
+ // state.pathBgId = arr[i].dictCode;
+
+ // }
+ // }
+ }
+ })
+ .catch((err) => {
+ console.log("获取详情失败", err);
+ });
state.out1 = true;
};
@@ -1541,7 +1605,7 @@ export default {
showLearnBgMore,
closeLearnBgMore,
checkPer,
- getLearnPathInfo
+ getLearnPathInfo,
};
},
};
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 8f594e24..7d5ba1e0 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -12,9 +12,9 @@
+
-
+
-
+
-
+
-
+
编辑
+
-
+
+
-
-
@@ -1406,190 +1082,86 @@
+
- 项目发布
+
+ 项目发布
+
+
+
+
+
- 项目发布
+
+ 项目发布
+