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

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
zhangyc
2022-12-16 17:47:35 +08:00
parent 6bd7df51f9 9090261a8f
commit 94e0982817
12 changed files with 193 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,7 +244,7 @@
<div class="main_item">
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">考试排序：</span>
<span style="margin-right: 3px">试题排列：</span>
</div>
<div class="btnbox">
<a-radio-group

26
src/components/drawers/AssessmentAll.vue
View File

@@ -164,19 +164,27 @@ export default {
.queryAppraiseDetailById({ assessmentId: props.assessmentId })
.then((res) => {
console.log("查询评估xinxi ", res);
let info = res.data.data;
let n1 = info.essayQuestionVoList
? Number(info.essayQuestionVoList.length)
: 0 ;
let n2 = info.multipleStemVoList
? Number(info.multipleStemVoList.length)
: 0;
let n3 = info.scoringQuestionVoList
? Number(info.scoringQuestionVoList.length)
: 0;
let n4 = info.singleStemVoList
? Number(info.singleStemVoList.length)
: 0;
let num = n1 + n2 + n3 +n4;
let obj = {
assessmentId: info.assessmentId,
name: info.assessmentName,
num: info.essayQuestionVoList
? Number(info.essayQuestionVoList.length)
: 0 + info.multipleStemVoList
? Number(info.multipleStemVoList.length)
: 0 + info.scoringQuestionVoList
? Number(info.scoringQuestionVoList.length)
: 0 + info.singleStemVoList
? Number(info.singleStemVoList.length)
: 0,
num: num,
creator: info.createUser ? info.createUser : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"),
};

25
src/components/drawers/AssessmentList.vue
View File

@@ -182,18 +182,25 @@ export default {
let data = tableData;
let array = [];
data.map((value, index) => {
let n1 = value.essayQuestionVoList
? Number(value.essayQuestionVoList.length)
: 0 ;
let n2 = value.multipleStemVoList
? Number(value.multipleStemVoList.length)
: 0;
let n3 = value.scoringQuestionVoList
? Number(value.scoringQuestionVoList.length)
: 0;
let n4 = value.singleStemVoList
? Number(value.singleStemVoList.length)
: 0;
let num = n1 + n2 + n3 +n4;
let obj = {
key: index,
assessmentId: value.assessmentId,
num:value.essayQuestionVoList
? Number(value.essayQuestionVoList.length)
: 0 + value.multipleStemVoList
? Number(value.multipleStemVoList.length)
: 0 + value.scoringQuestionVoList
? Number(value.scoringQuestionVoList.length)
: 0 + value.singleStemVoList
? Number(value.singleStemVoList.length)
: 0,
num: num,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),

4
src/components/drawers/MemberList.vue
View File

@@ -330,8 +330,8 @@ export default {
gangw: value.userInfoBo.jobName, //岗位
completeStageCnt: value.completeStageCnt, //当前完成阶段数
totalStageCnt: value.totalStageCnt, //总阶段数
//progress: value.completeStageCnt + "/" + value.totalStageCnt, TODO接口返回value.completeStageCnt值不对
progress: 0 + "/" + value.totalStageCnt,
progress: value.completeStageCnt + "/" + value.totalStageCnt,
stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间
};

28
src/components/drawers/ProjectAudit.vue
View File

@@ -43,9 +43,15 @@
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目说明：</span></div>
<div class="setc_name"><span>项目级别：</span></div>
<div class="setc_main">
<span style="color: #999999">{{ projectInfo.remark }}</span>
<ProjectLevel v-model:value="projectInfo.level" :tag="true"></ProjectLevel>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>培训体系：</span></div>
<div class="setc_main">
<TrainClass v-model:value="projectInfo.systemId" :tag="true"></TrainClass>
</div>
</div>
<div class="set_content">
@@ -66,18 +72,6 @@
></a-switch>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目级别：</span></div>
<div class="setc_main">
<ProjectLevel v-model:value="projectInfo.level" :disabled="true"></ProjectLevel>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>培训体系：</span></div>
<div class="setc_main">
<TrainClass v-model:value="projectInfo.systemId" :disabled="true"></TrainClass>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>是否BOEU实施：</span></div>
<div class="setc_main">
@@ -89,6 +83,12 @@
></a-switch>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目说明：</span></div>
<div class="setc_main">
<span style="color: #999999">{{ projectInfo.remark }}</span>
</div>
</div>
</div>
</div>

10
src/components/project/OrgClass.vue
View File

@@ -29,7 +29,11 @@ import {useStore} from "vuex";
const store = useStore();
const props = defineProps({
value: String
value: String,
disabled: {
type: Boolean,
default: false
}
})
const emit = defineEmits({})
@@ -38,9 +42,9 @@ const options = computed(() => store.state.orgtreeList)
const id = computed(() => {
return props.value
})
console.log("store.state.orgtreeList",store.state.orgtreeList);
function change(key, obj) {
console.log(obj[0],key,props.value);
console.log(obj[0], key, props.value);
emit('update:name', obj[0])
emit('update:value', key)
}