mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-12 12:26:47 +08:00
fix:修改bug
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
* @Author: lixg lixg@dongwu-inc.com
|
* @Author: lixg lixg@dongwu-inc.com
|
||||||
* @Date: 2022-11-21 14:32:52
|
* @Date: 2022-11-21 14:32:52
|
||||||
* @LastEditors: lixg lixg@dongwu-inc.com
|
* @LastEditors: lixg lixg@dongwu-inc.com
|
||||||
* @LastEditTime: 2022-12-05 16:33:28
|
* @LastEditTime: 2022-12-05 17:39:23
|
||||||
* @FilePath: /fe-manage/src/api/config.js
|
* @FilePath: /fe-manage/src/api/config.js
|
||||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||||
*/
|
*/
|
||||||
@@ -24,7 +24,7 @@ const http = axios.create({
|
|||||||
|
|
||||||
http.interceptors.request.use(
|
http.interceptors.request.use(
|
||||||
(config) => {
|
(config) => {
|
||||||
console.log("config", config);
|
// console.log("config", config);
|
||||||
// const token = localStorage.getItem("token");
|
// const token = localStorage.getItem("token");
|
||||||
// // const token = getCookie('token')
|
// // const token = getCookie('token')
|
||||||
// // console.log('token', token)
|
// // console.log('token', token)
|
||||||
@@ -56,7 +56,7 @@ http.interceptors.response.use(
|
|||||||
return response;
|
return response;
|
||||||
} else {
|
} else {
|
||||||
if (code === 1000) {
|
if (code === 1000) {
|
||||||
window.open("https://u-pre.boe.com/web/", '_self');
|
// window.open("https://u-pre.boe.com/web/", '_self');
|
||||||
// window.open("http://111.231.196.214:12013/manage/login", '_self');
|
// window.open("http://111.231.196.214:12013/manage/login", '_self');
|
||||||
}
|
}
|
||||||
console.log("api %o", msg);
|
console.log("api %o", msg);
|
||||||
|
|||||||
@@ -878,11 +878,16 @@ export default {
|
|||||||
api
|
api
|
||||||
.handleLearnPath(obj)
|
.handleLearnPath(obj)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
console.log("发布成功", res);
|
console.log("发布", res);
|
||||||
|
if (res.data.code === 200) {
|
||||||
message.destroy();
|
message.destroy();
|
||||||
message.success("发布成功");
|
message.success("发布成功");
|
||||||
state.pub = false;
|
state.pub = false;
|
||||||
getLearnPath();
|
getLearnPath();
|
||||||
|
}
|
||||||
|
if (res.data.code === -1) {
|
||||||
|
message.warning(res.data.msg);
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log("发布失败", err);
|
console.log("发布失败", err);
|
||||||
@@ -909,11 +914,16 @@ export default {
|
|||||||
api
|
api
|
||||||
.handleLearnPath(obj)
|
.handleLearnPath(obj)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
if (res.data.code === 200) {
|
||||||
console.log("复制成功", res);
|
console.log("复制成功", res);
|
||||||
message.destroy();
|
message.destroy();
|
||||||
message.success("复制成功");
|
message.success("复制成功");
|
||||||
state.copyModal = false;
|
state.copyModal = false;
|
||||||
getLearnPath();
|
getLearnPath();
|
||||||
|
}
|
||||||
|
if (res.data.code === -1) {
|
||||||
|
message.warning(res.data.msg);
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log("复制失败", err);
|
console.log("复制失败", err);
|
||||||
@@ -937,11 +947,16 @@ export default {
|
|||||||
api
|
api
|
||||||
.handleLearnPath(obj)
|
.handleLearnPath(obj)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
if (res.data.code === 200) {
|
||||||
console.log("停用成功", res);
|
console.log("停用成功", res);
|
||||||
message.destroy();
|
message.destroy();
|
||||||
message.success("停用成功");
|
message.success("停用成功");
|
||||||
state.stopModal = false;
|
state.stopModal = false;
|
||||||
getLearnPath();
|
getLearnPath();
|
||||||
|
}
|
||||||
|
if (res.data.code === -1) {
|
||||||
|
message.warning(res.data.msg);
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log("停用失败", err);
|
console.log("停用失败", err);
|
||||||
@@ -979,11 +994,16 @@ export default {
|
|||||||
api
|
api
|
||||||
.handleLearnPath(obj)
|
.handleLearnPath(obj)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
if (res.data.code === 200) {
|
||||||
console.log("撤回成功", res);
|
console.log("撤回成功", res);
|
||||||
message.destroy();
|
message.destroy();
|
||||||
message.success("撤回成功");
|
message.success("撤回成功");
|
||||||
state.backModal = false;
|
state.backModal = false;
|
||||||
getLearnPath();
|
getLearnPath();
|
||||||
|
}
|
||||||
|
if (res.data.code === -1) {
|
||||||
|
message.warning(res.data.msg);
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log("撤回失败", err);
|
console.log("撤回失败", err);
|
||||||
@@ -1502,11 +1522,16 @@ export default {
|
|||||||
api
|
api
|
||||||
.handleLearnPath(obj)
|
.handleLearnPath(obj)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
if (res.data.code === 200) {
|
||||||
console.log("删除成功", res);
|
console.log("删除成功", res);
|
||||||
message.destroy();
|
message.destroy();
|
||||||
message.success("删除成功");
|
message.success("删除成功");
|
||||||
state.deleteModal = false;
|
state.deleteModal = false;
|
||||||
getLearnPath();
|
getLearnPath();
|
||||||
|
}
|
||||||
|
if (res.data.code === -1) {
|
||||||
|
message.warning(res.data.msg);
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log("删除失败", err);
|
console.log("删除失败", err);
|
||||||
@@ -1579,6 +1604,7 @@ export default {
|
|||||||
api
|
api
|
||||||
.createLearnPath(obj)
|
.createLearnPath(obj)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
if (res.data.code === 200) {
|
||||||
console.log("修改成功", res);
|
console.log("修改成功", res);
|
||||||
message.destroy();
|
message.destroy();
|
||||||
message.success("修改成功");
|
message.success("修改成功");
|
||||||
@@ -1596,6 +1622,10 @@ export default {
|
|||||||
// // router.push("/leveladd");
|
// // router.push("/leveladd");
|
||||||
// getLearnPath();
|
// getLearnPath();
|
||||||
// }, 1000);
|
// }, 1000);
|
||||||
|
}
|
||||||
|
if (res.data.code === -1) {
|
||||||
|
message.warning(res.data.msg);
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log("修改失败", err);
|
console.log("修改失败", err);
|
||||||
|
|||||||
@@ -138,10 +138,11 @@
|
|||||||
<div class="centermain">快速添加学员</div>
|
<div class="centermain">快速添加学员</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 2022-12-2注释 后面放开 -->
|
<!-- 2022-12-2注释 后面放开 -->
|
||||||
<!-- <div
|
<div
|
||||||
class="taskbox"
|
class="taskbox"
|
||||||
@click="showPub"
|
@click="showPub"
|
||||||
style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
|
style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
|
||||||
|
v-if="action === 0"
|
||||||
>
|
>
|
||||||
<div class="leftt">
|
<div class="leftt">
|
||||||
<img src="../../assets/images/taskpage/left3.png" />
|
<img src="../../assets/images/taskpage/left3.png" />
|
||||||
@@ -156,7 +157,7 @@
|
|||||||
发布
|
发布
|
||||||
</div>
|
</div>
|
||||||
<div class="centermain">快速发布项目</div>
|
<div class="centermain">快速发布项目</div>
|
||||||
</div> -->
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 概览(有数据) -->
|
<!-- 概览(有数据) -->
|
||||||
@@ -1770,12 +1771,17 @@ export default {
|
|||||||
};
|
};
|
||||||
handleLearnPath(obj)
|
handleLearnPath(obj)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
if (res.data.code === 200) {
|
||||||
console.log("发布成功", res);
|
console.log("发布成功", res);
|
||||||
message.destroy();
|
message.destroy();
|
||||||
message.success("发布成功");
|
message.success("发布成功");
|
||||||
state.pub = false;
|
state.pub = false;
|
||||||
state.nodata = false;
|
state.nodata = false;
|
||||||
// getLearnPath();
|
// getLearnPath();
|
||||||
|
}
|
||||||
|
if (res.data.code === -1) {
|
||||||
|
message.warning(res.data.msg);
|
||||||
|
}
|
||||||
|
|
||||||
reget();
|
reget();
|
||||||
})
|
})
|
||||||
@@ -2407,7 +2413,9 @@ export default {
|
|||||||
.ant-modal {
|
.ant-modal {
|
||||||
width: 424px !important;
|
width: 424px !important;
|
||||||
height: 258px !important;
|
height: 258px !important;
|
||||||
|
.ant-modal-close-x {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
.ant-modal-content {
|
.ant-modal-content {
|
||||||
width: 424px !important;
|
width: 424px !important;
|
||||||
height: 258px !important;
|
height: 258px !important;
|
||||||
|
|||||||
@@ -905,9 +905,7 @@
|
|||||||
<div class="close_exit" @click="closedeleteAll"></div>
|
<div class="close_exit" @click="closedeleteAll"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="body">
|
<div class="body">
|
||||||
<span
|
<span>请确认是否批量删除任务</span>
|
||||||
>请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}</span
|
|
||||||
>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="del_btnbox">
|
<div class="del_btnbox">
|
||||||
<div class="del_btn btn1" @click="closedeleteAll">
|
<div class="del_btn btn1" @click="closedeleteAll">
|
||||||
|
|||||||
@@ -1333,7 +1333,9 @@
|
|||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div class="headerLeft" style="margin-left: 32px">
|
<div class="headerLeft" style="margin-left: 32px">
|
||||||
<span class="headerLeftText" style="font-size: 16px">创建小组</span>
|
<span class="headerLeftText" style="font-size: 16px">{{
|
||||||
|
stuMemberClassify === 1 ? "创建小组" : "编辑小组"
|
||||||
|
}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
|
<div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
|
||||||
<img
|
<img
|
||||||
@@ -1368,11 +1370,15 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="inname">小组长:</div>
|
<div class="inname">小组长:</div>
|
||||||
<div class="in">
|
<div class="in">
|
||||||
<a-input
|
<ProjectManager
|
||||||
|
v-model:value="stuGroupId"
|
||||||
|
v-model:name="stuGroupName"
|
||||||
|
></ProjectManager>
|
||||||
|
<!-- <a-input
|
||||||
v-model:value="valueaddm"
|
v-model:value="valueaddm"
|
||||||
placeholder="请输入小组长"
|
placeholder="请输入小组长"
|
||||||
style="border-radius: 8px; height: 40px"
|
style="border-radius: 8px; height: 40px"
|
||||||
/>
|
/> -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="pubtn">
|
<div class="pubtn">
|
||||||
@@ -1776,7 +1782,7 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
|
|||||||
import { useStore } from "vuex";
|
import { useStore } from "vuex";
|
||||||
import ProjectLevel from "@/components/project/ProjectLevel";
|
import ProjectLevel from "@/components/project/ProjectLevel";
|
||||||
import TrainClass from "@/components/project/TrainClass";
|
import TrainClass from "@/components/project/TrainClass";
|
||||||
|
import ProjectManager from "@/components/project/ProjectManager";
|
||||||
export default {
|
export default {
|
||||||
name: "taskPage",
|
name: "taskPage",
|
||||||
components: {
|
components: {
|
||||||
@@ -1801,6 +1807,7 @@ export default {
|
|||||||
projSet,
|
projSet,
|
||||||
NoticeHis,
|
NoticeHis,
|
||||||
TwoDimensionalCode,
|
TwoDimensionalCode,
|
||||||
|
ProjectManager,
|
||||||
},
|
},
|
||||||
setup() {
|
setup() {
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
@@ -1940,6 +1947,8 @@ export default {
|
|||||||
valuestugroup: "", //学员管理小组名称
|
valuestugroup: "", //学员管理小组名称
|
||||||
projectGroupId: null, //是编辑小组id
|
projectGroupId: null, //是编辑小组id
|
||||||
stuMemberClassify: null, //1:新建小组 2:编辑小组
|
stuMemberClassify: null, //1:新建小组 2:编辑小组
|
||||||
|
stuGroupId: null, //选择的小组长id
|
||||||
|
stuGroupName: null, //选择的小组长名字
|
||||||
valueDate: "", //排行榜输入日期
|
valueDate: "", //排行榜输入日期
|
||||||
noticeChecked: true,
|
noticeChecked: true,
|
||||||
noticeContent: "",
|
noticeContent: "",
|
||||||
@@ -2651,22 +2660,25 @@ export default {
|
|||||||
state.projectGroupId =
|
state.projectGroupId =
|
||||||
item && item.projectGroupId ? item.projectGroupId : null;
|
item && item.projectGroupId ? item.projectGroupId : null;
|
||||||
state.stugroup = true;
|
state.stugroup = true;
|
||||||
|
console.log("item", item);
|
||||||
if (item) {
|
if (item) {
|
||||||
state.valueaddg = item.groupName;
|
state.valueaddg = item.groupName;
|
||||||
state.valueaddm = item.leaderName;
|
state.stuGroupName = item.leaderName;
|
||||||
|
state.stuGroupId = item.leaderId;
|
||||||
}
|
}
|
||||||
console.log("编辑小组item", item);
|
console.log("编辑小组item", item);
|
||||||
};
|
};
|
||||||
const closeModal2 = () => {
|
const closeModal2 = () => {
|
||||||
state.stugroup = false;
|
state.stugroup = false;
|
||||||
state.valueaddg = null;
|
state.valueaddg = null;
|
||||||
state.valueaddm = null;
|
state.stuGroupName = null;
|
||||||
|
state.stuGroupId = null;
|
||||||
state.projectGroupId = null;
|
state.projectGroupId = null;
|
||||||
state.stuMemberClassify = null;
|
state.stuMemberClassify = null;
|
||||||
};
|
};
|
||||||
//点击确定创建小组
|
//点击确定创建小组
|
||||||
const createG = () => {
|
const createG = () => {
|
||||||
if (state.valueaddm == "" || state.valueaddg == "") {
|
if (state.stuGroupName == "" || state.valueaddg == "") {
|
||||||
message.destroy();
|
message.destroy();
|
||||||
return message.warning("请输入必填项");
|
return message.warning("请输入必填项");
|
||||||
} else {
|
} else {
|
||||||
@@ -3434,8 +3446,8 @@ export default {
|
|||||||
if (state.stuMemberClassify === 1) {
|
if (state.stuMemberClassify === 1) {
|
||||||
let obj = {
|
let obj = {
|
||||||
groupName: state.valueaddg,
|
groupName: state.valueaddg,
|
||||||
leaderId: 0,
|
leaderId: state.stuGroupId,
|
||||||
leaderName: state.valueaddm,
|
leaderName: state.stuGroupName,
|
||||||
// projectGroupId: 0,
|
// projectGroupId: 0,
|
||||||
projectId: state.projectId,
|
projectId: state.projectId,
|
||||||
};
|
};
|
||||||
@@ -3454,8 +3466,8 @@ export default {
|
|||||||
if (state.stuMemberClassify === 2) {
|
if (state.stuMemberClassify === 2) {
|
||||||
let obj = {
|
let obj = {
|
||||||
groupName: state.valueaddg,
|
groupName: state.valueaddg,
|
||||||
leaderId: 0,
|
leaderId: state.stuGroupId,
|
||||||
leaderName: state.valueaddm,
|
leaderName: state.stuGroupName,
|
||||||
projectGroupId: state.projectGroupId,
|
projectGroupId: state.projectGroupId,
|
||||||
projectId: state.projectId,
|
projectId: state.projectId,
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user