feat:合并

This commit is contained in:
lixg
2022-12-16 18:22:34 +08:00
16 changed files with 248 additions and 58 deletions

View File

@@ -67,7 +67,7 @@
</div>
<div
class="progressBox"
:style="{ display: value.status === 1 ? 'block' : 'none' }"
:style="{ display: value.type === 1 ? 'block' : 'none' }"
>
<div>当前进度</div>
<div class="progress">
@@ -154,29 +154,30 @@
{{ data.remark || "暂无公告" }}
</div>
</el-tab-pane>
<el-tab-pane label="共享文档" name="second">
<!-- <div style="padding: 19px 30px 17px 28px">-->
<!-- <div-->
<!-- v-for="(value, index) in sharedoc"-->
<!-- :key="index"-->
<!-- style="-->
<!-- display: flex;-->
<!-- align-items: center;-->
<!-- margin-bottom: 15px;-->
<!-- "-->
<!-- >-->
<!-- <img :src="value.img" style="width: 22px; height: 26px"/>-->
<!-- <div class="sharedocname">{{ value.name }}</div>-->
<!-- <div class="download">-->
<!-- <img-->
<!-- src="../../assets/image/download.png"-->
<!-- style="width: 16px; height: 15px"-->
<!-- />-->
<!-- <div style="margin-left: 7px">下载</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</el-tab-pane>
<!--
<el-tab-pane label="共享文档" name="second"> -->
<!-- <div style="padding: 19px 30px 17px 28px">-->
<!-- <div-->
<!-- v-for="(value, index) in sharedoc"-->
<!-- :key="index"-->
<!-- style="-->
<!-- display: flex;-->
<!-- align-items: center;-->
<!-- margin-bottom: 15px;-->
<!-- "-->
<!-- >-->
<!-- <img :src="value.img" style="width: 22px; height: 26px"/>-->
<!-- <div class="sharedocname">{{ value.name }}</div>-->
<!-- <div class="download">-->
<!-- <img-->
<!-- src="../../assets/image/download.png"-->
<!-- style="width: 16px; height: 15px"-->
<!-- />-->
<!-- <div style="margin-left: 7px">下载</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-tab-pane>-->
</el-tabs>
</div>
<!-- 课程公告及共享文档 -->
@@ -337,8 +338,9 @@ const {
query: { routerId, routerName },
} = useRoute();
const router = useRouter();
const { data } = useRequest(ROUTER_PROCESS, { routerId });
console.log("ROUTER_PROCESS", data);
const userInfo = computed(() => store.state.userInfo);
console.log("userInfo", userInfo);
const activeName = ref("first");
@@ -367,11 +369,11 @@ const types = ref({
toName: {
1: "去上课",
2: "去上课",
3: "案例",
3: "去阅读",
4: "去完成",
5: "去完成",
6: "去签到",
7: "查看",
6: "去观看",
7: "查看",
8: "去讨论",
9: "去签到",
10: "去完成",
@@ -432,7 +434,7 @@ function toFinish(d, sName) {
}
function whiteTypes(type) {
return import.meta.env.VITE_TASK_WHITE_TYPE.includes(type + "");
return import.meta.env.VITE_TASK_WHITE_TYPE.includes("-" + type + "-");
}
</script>