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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2022-12-04 19:47:00 +08:00
parent ef0927c80a a19b87299f
commit ae42180f2a
2 changed files with 901 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -460,11 +460,15 @@
</div>
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">{{ item.startTime!==null?item.startTime:''}}</div>
<div class="timetext">
{{ item.startTime !== null ? item.startTime : "" }}
</div>
</div>
<div class="progress">
<div class="progresstext">
{{ item.complete?item.complete:0 }}/{{ item.total?item.total:0 }}人
{{ item.complete ? item.complete : 0 }}/{{
item.total ? item.total : 0
}}人
</div>
<div style="display: flex">
<a-progress
@@ -768,7 +772,10 @@
<div class="box"></div>
<div class="onetitle">上传共享文档</div>
<div class="oneedi">
<a-switch v-model:checked="docChecked" @change="checkedClose"></a-switch>
<a-switch
v-model:checked="docChecked"
@change="checkedClose"
></a-switch>
</div>
</div>
<div class="btnbox" style="margin: 20px">
@@ -1217,6 +1224,15 @@
</div>
</div>
</a-modal>
<!-- 二维码弹窗 -->
<two-dimensional-code
v-model:codevisible="codevisible"
:codeInfo="codeInfo"
index="0"
type="课程二维码"
/>
<!-- 二维码弹窗 -->
</div>
</template>
<script>
@@ -1243,6 +1259,7 @@ import { GetRouterDetail } from "@/api/indexTask";
import * as api from "../../api/index1";
import { toDate } from "../../api/method";
import { editRoutered } from "../../api/indexLearningPath";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
export default {
name: "LevelAdd",
components: {
@@ -1257,6 +1274,7 @@ export default {
FaceManage,
WorkManage,
SeeStu,
TwoDimensionalCode,
},
setup() {
// const routers = useRoute();
@@ -1888,7 +1906,7 @@ export default {
const getOverview = () => {
getRouterOverview(state.routerId)
.then((res) => {
console.log(res)
console.log(res);
Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
levelList.routerInfoOverview[item] =
res.data.data.routerInfoOverview[item] || 0;
@@ -1912,13 +1930,13 @@ export default {
// 设置上传图片开关
const checkedClose = (data, a) => {
console.log(data,a)
state.docChecked = data
console.log(data, a);
state.docChecked = data;
console.log({
routerId: state.routerId,
status: state.action,
attachSwitch: data ? 1: -1
})
attachSwitch: data ? 1 : -1,
});
// 更新开关状态
editRoutered({
attach: JSON.stringify(state.fileList),
@@ -1927,7 +1945,7 @@ export default {
remark: state.remark,
routerId: state.routerId,
status: state.action,
attachSwitch: data ? 1: -1
attachSwitch: data ? 1 : -1,
})
.then((res) => {
console.log(res);
@@ -1935,16 +1953,16 @@ export default {
.catch((err) => {
console.log(err);
});
}
};
// 获取路径列表
const myGetRouterDetail = () => {
GetRouterDetail(state.routerId)
.then((res) => {
console.log('router-list',res)
state.fileList = JSON.parse(res.data.data.routerInfo.attach)
state.docChecked = res.data.data.routerInfo.attachSwitch == 1?true:false
console.log("router-list", res);
state.fileList = JSON.parse(res.data.data.routerInfo.attach);
state.docChecked =
res.data.data.routerInfo.attachSwitch == 1 ? true : false;
if (res.data.data.routerInfo.status == 1) {
state.nodata = false;
}
@@ -1990,7 +2008,7 @@ export default {
remark: state.remark,
routerId: state.routerId,
status: state.action,
attachSwitch: state.docChecked?1:-1
attachSwitch: state.docChecked ? 1 : -1,
})
.then((res) => {
console.log(res);
@@ -2213,7 +2231,7 @@ export default {
deleteStu,
totask,
tostudent,
checkedClose
checkedClose,
};
},
};

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

@@ -323,7 +323,9 @@
<!-- <button class="btn" @click="showFaceIn" v-if="morFaceT">
批量面授报名
</button> -->
<router-link :to="{path:`/taskadd`,query:{projectId:projectId}}">
<router-link
:to="{ path: `/taskadd`, query: { projectId: projectId } }"
>
<button class="edit">
<img
class="editimg"
@@ -438,9 +440,7 @@
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">
{{
item.startTime !== null ? item.startTime : ''
}}
{{ item.startTime !== null ? item.startTime : "" }}
</div>
</div>
<div class="progress">
@@ -566,7 +566,10 @@
class="taskbox"
@click="
() => {
routered.push({ path: `/taskadd`,query:{projectId:projectId} });
routered.push({
path: `/taskadd`,
query: { projectId: projectId },
});
}
"
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -778,10 +781,11 @@
<img src="../../assets/images/courseManage/add0.png" />
<span class="btn1text">创建小组</span>
</div>
<div class="btn2" @click="showSubset">
<!-- 2022-12-2注释 后面放开 -->
<!-- <div class="btn2" @click="showSubset">
<img src="../../assets/images/courseManage/reset2.png" />
<span class="btn2text">随机分组</span>
</div>
</div> -->
</div>
<!-- 小组列表 -->
<div class="groupmain">
@@ -3211,6 +3215,7 @@ export default {
};
//把小组列表信息放到state里
const setGroupList = (tableData) => {
console.log("tableDatatableDatatableData", tableData);
let data = tableData;
let array = [];
data.map((value) => {
@@ -3223,7 +3228,7 @@ export default {
source: value.source == 1 ? "指定添加" : "随机分组",
completeTaskCnt: value.completeTaskCnt, //完成任务数
totalTaskCnt: value.totalTaskCnt, //累计任务数
completeRatio: value.completeRatio, //完成比例
completeRatio: value.completeRatio ? value.completeRatio : 0, //完成比例
};
array.push(obj);
});
@@ -3322,6 +3327,7 @@ export default {
projectId: state.projectId,
}).then((res) => {
console.log("get task", res.data.data);
if (res.data.code === 200) {
let info = res.data.data.projectInfo;
// let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let start = info.beginTime;
@@ -3372,6 +3378,7 @@ export default {
state.fileList = JSON.parse(luj);
// state.fileList = luj
}
}
});
};
//获取小组列表
@@ -3560,6 +3567,7 @@ export default {
}
};
const reget = () => {
console.log("state.projectId", state.projectId);
getTask({
projectId: state.projectId,
}).then((res) => {