hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 11:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:修改发布学员人数

Browse Source
This commit is contained in:
lixg
2022-12-19 20:45:23 +08:00
parent 27f17155a9
commit d8e0b3c1b5
7 changed files with 894 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/request.js
View File

@@ -138,7 +138,7 @@ export async function request(_url, params) {
}
}
const body = method !== 'get' ? params || {} : {}
url = process.env.VUE_APP_BOE_API_URL + url
// url = process.env.VUE_APP_BOE_API_URL + url
return fetch(url, {
method,
headers: {

53
src/assets/scss/common.scss
View File

@@ -51,31 +51,37 @@ body {
height: 6px;
/*对水平流动条有效*/
}
::-o-scrollbar {
width: 6px;
/*对垂直流动条有效*/
height: 6px;
/*对水平流动条有效*/
}
.scrollbar {
width: 6px;
/*对垂直流动条有效*/
height: 6px;
/*对水平流动条有效*/
}
/*定义滚动条的轨道颜色、内阴影及圆角*/
::-webkit-scrollbar-track {
background-color: rgba(239, 244, 252, 1);
border-radius: 6px;
}
::-moz-scrollbar-track {
background-color: rgba(239, 244, 252, 1);
border-radius: 6px;
}
::-o-scrollbar-track {
background-color: rgba(239, 244, 252, 1);
border-radius: 6px;
}
.scrollbar-track {
background-color: rgba(239, 244, 252, 1);
border-radius: 6px;
@@ -86,14 +92,17 @@ body {
border-radius: 3px;
background-color: rgba(78, 166, 255, 1);
}
::-moz-scrollbar-thumb {
border-radius: 3px;
background-color: rgba(78, 166, 255, 1);
}
::-o-scrollbar-thumb {
border-radius: 3px;
background-color: rgba(78, 166, 255, 1);
}
.scrollbar-thumb {
border-radius: 3px;
background-color: rgba(78, 166, 255, 1);
@@ -104,35 +113,43 @@ body {
background-color: cyan;
display: none;
}
::-moz-scrollbar-button {
background-color: cyan;
display: none;
}
::-o-scrollbar-button {
background-color: cyan;
display: none;
}
.scrollbar-button {
background-color: cyan;
display: none;
}
/*定义右下角汇合处的样式*/
::-webkit-scrollbar-corner {
background: rgba(239, 244, 252, 1);
;
}
::-moz-scrollbar-corner {
background: rgba(239, 244, 252, 1);
;
}
::-o-scrollbar-corner {
background: rgba(239, 244, 252, 1);
;
}
.scrollbar-corner {
background: rgba(239, 244, 252, 1);
;
}
//隐藏滚动条----------------------------------------------------------------
//禁止选中----------------------------------------------------------
@@ -329,7 +346,8 @@ textarea {
//抽屉--------------------------------------------------------
.drawerStyle {
// transform: translateX(0px) !important;
// transform: translateX(0px) !important;
.ant-drawer-content-wrapper {
max-width: 1050px;
@@ -437,29 +455,34 @@ textarea {
}
}
.ant-modal{
.modalHeader{
background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
.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;
.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;
.del_header {
background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
}
}
//弹窗--------------------------------------------------------
//loading--------------------------------------------------------
.aeLoading {
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.2);
display: flex;
align-items: center;
justify-content: center;
position: absolute;
left: 0;
top:0,
background: rgba(0, 0, 0, 0.2);
display: flex;
align-items: center;
justify-content: center;
position: absolute;
left: 0;
top: 0;
z-index: 100
}
//loading--------------------------------------------------------

37
src/views/learningpath/LearningPath.vue
View File

@@ -203,7 +203,7 @@
<!-- <img class="im" src="../../assets/px.jpg" />
<img class="im" src="../../assets/px.jpg" />
<img class="im" src="../../assets/px.jpg" /> -->
<div
@click="chooseImg(item)"
v-for="(item, index) in imgData"
@@ -244,7 +244,7 @@
class="aeLoading"
:style="{ display: lpLoading ? 'flex' : 'none' }"
>
<a-spin :spinning="lpLoading" tip=""/>
<a-spin :spinning="lpLoading" tip="" />
</div>
</div>
</div>
@@ -278,7 +278,7 @@
/>
</div>
<div class="inname">路径图名称</div>
<div class="in" >
<div class="in">
<!-- <a-input-->
<!-- v-model:value="pathName"-->
<!-- maxlength="20"-->
@@ -332,7 +332,7 @@
<!-- <img class="im" src="../../assets/px.jpg" />
<img class="im" src="../../assets/px.jpg" />
<img class="im" src="../../assets/px.jpg" /> -->
<div
@click="chooseImg2(item)"
v-for="(item, index) in imgData"
@@ -709,7 +709,7 @@ import { storage } from "../../api/storage";
import { useStore } from "vuex";
import OrgClass from "@/components/project/OrgClass";
import NameInput from "@/components/project/NameInput";
import { getStuPage } from "@/api/index1";
export default {
name: "learningPath",
components: {
@@ -857,7 +857,7 @@ export default {
state.pathName = "";
state.pathBg = "";
state.pathBgId = "";
if(store.state.userInfo.departId && store.state.userInfo.departName){
if (store.state.userInfo.departId && store.state.userInfo.departName) {
state.organizationSelectName = store.state.userInfo.departName;
state.organizationSelectId = store.state.userInfo.departId;
}
@@ -867,7 +867,7 @@ export default {
const handleOut1 = () => {
state.pathName = "";
state.pathBg = "";
state.pathBgId =1;
state.pathBgId = 1;
state.organizationSelectName = null;
state.organizationSelectId = null;
state.pathIntro = "";
@@ -908,12 +908,12 @@ export default {
let stuobj = {
pageNo: 1,
pageSize: 10,
routerId: router.id,
pid: router.id,
type: 2,
};
api
.getStudent(stuobj)
getStuPage(stuobj)
.then((res) => {
console.log("获取学员列表", res.data.data.total);
console.log("获取学员列表", res.data);
if (res.data.code === 200) {
state.routeStudentsNum = res.data.data.total;
state.pubLoading = false;
@@ -1175,7 +1175,7 @@ export default {
key: "opacation",
width: "20%",
align: "center",
// fixed: "right",
// fixed: "right",
scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
// console.log(text);
@@ -1626,17 +1626,16 @@ export default {
arr.forEach((item) => {
if (item.dictValue === state.pathBg) {
state.pathBgId = item.dictCode;
}
});
//for (let i = 0; i < arr.length; i++) {
// console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
// console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
// if (arr[i].dictValue === state.pathBg) {
// state.pathBgId = arr[i].dictCode;
// state.pathBgId = arr[i].dictCode;
// }
// }
// }
// }
}
})
.catch((err) => {
@@ -1745,7 +1744,7 @@ export default {
state.searchdate = null;
state.startTime = null;
state.endTime = null;
state.createUser=null;
state.createUser = null;
getLearnPath();
};
@@ -1803,7 +1802,7 @@ export default {
// state.imgData = ;
// }
});
const imgData = computed(()=>store.state.pathmapPic)
const imgData = computed(() => store.state.pathmapPic);
//添加权限
watch(
() => state.addAuthList,

101
src/views/learningpath/LevelAdd.vue
View File

@@ -10,26 +10,27 @@
<div class="fort">创建时间：{{ cretime }}</div>
</div>
<div class="right">
<!--
<!--
<img
class="img1"
src="../../assets/images/leveladd/ma.png"
@click="showCodeModel2()"
/>
<div v-if="action == 1 || action == 0" class="line"></div>-->
<div class ="pubIcon" v-if="action == 1 || action == 0" @click="pubIcon(action)">
<img
class="img2"
src="../../assets/images/leveladd/pub.png"
/>
<!-- 已发布的显示 -->
<div class="pub" style="width: 28px">
{{ act }}
<div
class="pubIcon"
v-if="action == 1 || action == 0"
@click="pubIcon(action)"
>
<img class="img2" src="../../assets/images/leveladd/pub.png" />
<!-- 已发布的显示 -->
<div class="pub" style="width: 28px">
{{ act }}
</div>
</div>
</div>
<div class="line"></div>
<router-link to="/learningpath"
><div style="display: flex; ">
><div style="display: flex">
<img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div>
</div>
@@ -507,7 +508,7 @@
<a-tab-pane key="3" tab="学员管理" force-render>
<TableStudent :type="2" :id="routerId" :stage="stage"></TableStudent>
</a-tab-pane>
<!--1211注释 待开放
<!--1211注释 待开放
<a-tab-pane key="4" tab="设置">
<div class="split"></div>
@@ -703,7 +704,6 @@
</a-tabs>
</a-tab-pane>
-->
</a-tabs>
<a-modal
@@ -1114,6 +1114,7 @@ import { codeUrl } from "../../api/method";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import TableStudent from "@/components/student/TableStudent";
// import * as student from "@/api/student";
import { getStuPage } from "@/api/index1";
export default {
name: "LevelAdd",
components: {
@@ -1367,12 +1368,12 @@ export default {
className: "h",
},
// {
// title: "岗位",
// dataIndex: "gang",
// key: "gang",
// width: 110,
// align: "center",
// className: "h",
// title: "岗位",
// dataIndex: "gang",
// key: "gang",
// width: 110,
// align: "center",
// className: "h",
// },
{
title: "当前关卡",
@@ -1382,14 +1383,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",
@@ -1680,10 +1681,10 @@ export default {
let stuobj = {
pageNo: 1,
pageSize: 10,
routerId: state.routerId,
pid: state.routerId,
type: 2,
};
api
.getStudent(stuobj)
getStuPage(stuobj)
.then((res) => {
console.log("获取学员列表", res.data.data.total);
if (res.data.code === 200) {
@@ -1695,14 +1696,13 @@ export default {
console.log("获取学员列表失败", err);
});
};
const pubIcon =(action)=>{
if(action ==1){
const pubIcon = (action) => {
if (action == 1) {
showBackModal();
}else{
} else {
showPub();
}
}
};
//显示撤回弹窗
const showBackModal = () => {
state.backModal = true;
@@ -1868,7 +1868,10 @@ export default {
state.nodata = false;
}
let data = res.data.data.chapterList;
state.stage = res.data.data.chapterList.map(e => ({id: e.chapterId, name: e.name}))
state.stage = res.data.data.chapterList.map((e) => ({
id: e.chapterId,
name: e.name,
}));
state.taskSyllabus = data;
// for(let i in data) {
// state.taskSyllabus[i].name = data[i].name
@@ -2851,23 +2854,23 @@ export default {
background-color: #e8effa;
margin-right: 28px;
}
.pubIcon{
.pubIcon {
display: flex;
align-items: center;
.img2 {
width: 42px;
height: 42px;
margin-right: 22px;
}
width: 42px;
height: 42px;
margin-right: 22px;
}
.pub {
color: #ffb64e;
font-size: 14px;
margin-top: 5px;
margin-right: 30px;
cursor: pointer;
}
.pub {
color: #ffb64e;
font-size: 14px;
margin-top: 5px;
margin-right: 30px;
cursor: pointer;
}
}
.img2 {
@@ -4262,7 +4265,5 @@ export default {
}
}
}
}
</style>

10
src/views/projectcenter/ProjectManage.vue
View File

@@ -51,7 +51,6 @@
format="YYYY-MM-DD"
style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
<div style="display: flex; margin-bottom: 20px">
@@ -829,7 +828,7 @@ import { changeOwnership } from "@/api/method";
import NameInput from "@/components/project/NameInput";
import { validateName } from "@/api/index1";
//import { toDate } from "../../api/method";
import { getStuPage } from "@/api/index1";
export default {
name: "projectManage",
components: {
@@ -1050,10 +1049,10 @@ export default {
let obj = {
pageNo: 0,
pageSize: 0,
projectId: object.projectId,
pid: object.projectId,
type: 1,
};
api
.projectStudent(obj)
getStuPage(obj)
.then((res) => {
if (res.data.code === 200) {
// console.log("res", res.data);
@@ -1699,7 +1698,6 @@ export default {
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
: "",
endTime:
state.searchParam.valueDate &&

1542
src/views/projectcenter/TaskPage.vue
View File

File diff suppressed because it is too large Load Diff

6
src/views/research/ResearchManage.vue
View File

@@ -174,7 +174,11 @@
<!--操作弹窗 -->
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<div
class="aeLoading"
style="z-index: 100"
:style="{ display: addLoading ? 'flex' : 'none' }"
>
<a-spin :spinning="addLoading" tip="" />
</div>
</template>