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

Merge branch 'dongwu_develop' into develop

Browse Source
This commit is contained in:
BOE\10867418
2023-03-23 09:36:41 +08:00
parent a182e2c154 4bb111d4ce
commit d65504d8a2
6 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
const store = useStore();
const isLogin = ref(false);
console.log("版本2.2.3------------");
console.log("版本2.2.4------------");
// 监听关闭浏览器
let time1 = ref(0);

2
src/components/drawers/ViewAssess.vue
View File

@@ -128,7 +128,7 @@
<div class="lastbox">
<div class="sorcetext">非常不满意</div>
<div class="sorcebox" v-for="(iittem, index) in [1,2,3,4,5,6,7,8,9,10] " :key="index">
<div v-if="iittem >= values.assessmentMinScore && iittem <= values.assessmentMaxScore" :class="(iittem + 1 - values.assessmentMinScore) == values.selectAnswer ? 'numbox' : 'numbox1'">{{ iittem }}</div>
<div v-if="iittem >= values.assessmentMinScore && iittem <= values.assessmentMaxScore" :class="(iittem - values.assessmentMinScore) == values.selectAnswer ? 'numbox' : 'numbox1'">{{ iittem }}</div>
</div>
<div class="sorcetext">非常满意</div>
</div>

26
src/components/drawers/project/ProjectFaceTaskManage.vue
View File

@@ -121,7 +121,7 @@
</div>
</div>
</a-drawer>
<CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource"/>
<CheckAnsware v-model:CAvisible="CAvisible" :datasource="answerDatasource"/>
<!-- 查看作业抽屉 -->
<CKWork
v-model:CWvisible="CWvisible"
@@ -300,14 +300,6 @@ const columns = ref([
customRender: (text) => {
return (
<div style="display:flex;justify-content:center;">
<a
class="opa"
style="margin-right:12px;"
onClick={() => {
showExamAnswer(text);
}}>
{text.record.answerId ? "查看答卷" : ""}
</a>
{
text.record.answerId ?
<a
@@ -319,13 +311,13 @@ const columns = ref([
查看答卷
</a>
: <div
class="opa"
style="margin-right:12px;color:#666">
查看答卷
</div>
class="opa"
style="margin-right:12px;color:#666">
查看答卷
</div>
}
{
text.record.workScore == 1 ?
text.record.workScore !== -2 ?
<a
class="opa"
onClick={() => {
@@ -379,7 +371,11 @@ const batchFinish = () => {
});
};
const showExamAnswer = () => {
const answerDatasource = ref(props.datasource);
const showExamAnswer = (text) => {
answerDatasource.value.answerId = text.record.answerId;
console.log(answerDatasource.value)
CAvisible.value = true;
};

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

@@ -2673,9 +2673,10 @@ export default {
// "/faceteach?type=2&courseId=" +
// item.courseId +
// "&id=" +
// item.id;
// item.id; pathmappage?routerId=513&chapterId=730&isStudy=true
codeUrl = window.location.protocol + process.env.VUE_APP_H5 + "/pathdetails?routerId=" + state.routerId;
// codeUrl = window.location.protocol + process.env.VUE_APP_H5 + "/pathdetails?routerId=" + state.routerId;
codeUrl = window.location.protocol + process.env.VUE_APP_H5 + "/pathmappage?routerId=" + state.routerId + "&chapterId=" + item.chapterId + "&isStudy=true";
}
if (item.type == 3) return message.error("请在pc端完成");

8
src/views/learningpath/LevelAddDetail.vue
View File

@@ -288,7 +288,13 @@
开课
</span>
<span
v-if="!element.routerTaskId"
v-if="element.type!==2"
style="color: #4ea6ff;cursor: pointer;"
@click="editTaskForType(element,index)">
编辑
</span>
<span
v-if="!element.routerTaskId && element.type===2"
style="color: #4ea6ff;cursor: pointer;"
@click="editTaskForType(element,index)">
编辑

8
src/views/projectcenter/TaskAdd.vue
View File

@@ -258,7 +258,13 @@
开课
</span>
<span
v-if="!element.projectTaskId"
v-if="element.type!==2"
style="color: #4ea6ff;cursor: pointer;"
@click="editTaskForType(element,index)">
编辑
</span>
<span
v-if="!element.projectTaskId && element.type===2"
style="color: #4ea6ff;cursor: pointer;"
@click="editTaskForType(element,index)">
编辑