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

fix:合并冲突

Browse Source
This commit is contained in:
wyx
2022-12-22 19:01:28 +08:00
parent 52bf37a00d 52db18777d
commit d1dcb4ecab
25 changed files with 5654 additions and 5764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/components/drawers/AddCase.vue
View File

@@ -46,7 +46,7 @@
</div>
<div class="main_table">
<!--
<!--
<a-table
v-if="edit"
class="ant-table-striped"
@@ -64,7 +64,6 @@
:pagination="false"
/>-->
<a-table
class="ant-table-striped"
:row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
@@ -80,19 +79,20 @@
:pagination="false"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="handelChangePage"
/>
</div></div>
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="handelChangePage"
/>
</div>
</div>
</div>
</div>
<div class="main_btns">
@@ -171,7 +171,7 @@ export default {
time: undefined,
caseId: null,
caseName: "",
isClick: false
isClick: false,
});
const closeDrawer = () => {
ctx.emit("update:addcaseVisible", false);
@@ -202,13 +202,13 @@ export default {
width: "200px",
align: "center",
},
// {
// title: "导入时间",
// dataIndex: "time",
// key: "time",
// width: "400px",
// align: "center",
// },
// {
// title: "导入时间",
// dataIndex: "time",
// key: "time",
// width: "400px",
// align: "center",
// },
];
return columns;
};
@@ -218,6 +218,7 @@ export default {
}
state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows;
console.log("selectedRows", selectedRows);
};
const handelChangePage = (page, pageSize) => {
state.selectedRowKeys = [];
@@ -276,16 +277,16 @@ export default {
};
const updateTask = () => {
if (props.isLevel == 1) {
if(!props.isactive){
if (!props.isactive) {
message.destroy();
return message.warning("请先选中关卡");
}
if(state.isClick){
message.destroy();
message.error('请勿频繁点击')
return
}
state.isClick = true;
if (state.isClick) {
message.destroy();
message.error("请勿频繁点击");
return;
}
state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) {
RouterEditTask({
chapterId: props.isactive,
@@ -308,12 +309,12 @@ export default {
});
}
} else if (props.isLevel == 2) {
if(state.isClick){
message.destroy();
message.error('请勿频繁点击')
return
}
state.isClick = true;
if (state.isClick) {
message.destroy();
message.error("请勿频繁点击");
return;
}
state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) {
apiTask
.addTask({
@@ -338,19 +339,21 @@ export default {
});
}
} else if (props.isLevel == 3) {
if(state.isClick){
message.destroy();
message.error('请勿频繁点击')
return
}
state.isClick = true;
if (state.isClick) {
message.destroy();
message.error("请勿频繁点击");
return;
}
state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) {
apiTask
.addTaskTemplate({
courseId: Number(state.apiTaskList[i].casesId),
name: state.apiTaskList[i].title,
projectTaskId: props.projectTaskId,
projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
projectTemplateId: Number(
localStorage.getItem("projectTemplateId")
),
stageId: Number(props.chooseStageId) || 0,
type: 3,
})
@@ -371,6 +374,7 @@ export default {
};
//搜索案例列表
const searchList = () => {
state.selectedRowKeys = [];
if (state.inputV1 !== "") {
getAllCaseText();
} else {
@@ -432,7 +436,7 @@ export default {
.main_items {
margin-top: 32px;
display: flex;
margin-bottom: 12px;
flex-wrap: wrap;
.mi_ipts {

1328
src/components/drawers/AddHomework.vue
View File

File diff suppressed because it is too large Load Diff

1634
src/components/drawers/AddOnline.vue
View File

File diff suppressed because it is too large Load Diff

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

@@ -374,9 +374,11 @@ export default {
// this.selectedRows = selectedRows;
// };
const searchProjectList = () => {
state.selectedRowKeys = [];
getAllProjText();
};
const resetProjectList = () => {
state.selectedRowKeys = [];
state.inputV1 = "";
state.inputV2 = "";
state.inputV3 = "";

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

File diff suppressed because it is too large Load Diff

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

@@ -9,7 +9,7 @@
maxlength="20"
/>
</div>
<div class="btns" @click="getAllInvistText">
<div class="btns" @click="searchList">
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
@@ -43,10 +43,11 @@
>创建人：
<span class="data">{{ assessment.creator }}</span>
</span>
<!--
<span class="title"
>创建时间：
<span class="data">{{ assessment.time }}</span>
</span>
</span>-->
</div>
<!--
<div v-else>
@@ -144,14 +145,19 @@ export default {
assessmentId: null,
assessmentName: null,
});
const afterVisibleChange=()=>{
}
const closeDrawer = () => {
ctx.emit("update:assessmentVisible", false);
};
//清空所选
const clearLine = () => {
console.log("state.selectedRowKeys", state.selectedRowKeys);
state.selectedRowKeys = [];
state.addOnlineList = [];
state.inputV1 = "";
};
const queryInfo = () => {
//if (props.edit) {
@@ -185,8 +191,8 @@ export default {
assessmentId: info.assessmentId,
name: info.assessmentName,
num: num,
creator: info.createUser ? info.createUser : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"),
creator: info.createUserName ? info.createUserName : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD HH:mm"),
};
//更新讨论信息
state.assessment = obj;
@@ -277,8 +283,8 @@ export default {
assessmentId: value.assessmentId,
num: num,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),
creator: value.createUserName ? value.createUserName : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
};
array.push(obj);
});
@@ -287,6 +293,7 @@ export default {
};
//获取全部评估信息接口
const getAllInvistText = () => {
api
.queryAssessmentDetailList({
assessmentName: state.inputV1,
@@ -308,9 +315,15 @@ export default {
// state.createLoading = false;
});
};
//重置评估信息
const searchList = () => {
state.selectedRowKeys = [];
getAllInvistText();
};
//重置评估信息
const resetInvist = () => {
state.selectedRowKeys = [];
state.inputV1 = "";
getAllInvistText();
};
@@ -321,10 +334,7 @@ export default {
state.selectedRowKeys,
state.assessmentId
);
if (!state.assessmentId) {
clearLine();
}
state.inputV1 = "";
queryInfo();
getAllInvistText();
});
@@ -332,10 +342,11 @@ export default {
() => props.assessmentId,
() => {
if (!props.assessmentId) {
clearLine();
clearLine();
state.assessment = null;
} else {
queryInfo();
console.log("dd");
}
console.log("props.assessmentId", props.assessmentId);
},
@@ -353,6 +364,8 @@ export default {
resetInvist,
handelChangePage,
queryInfo,
searchList,
afterVisibleChange,
};
},
};

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

@@ -202,8 +202,8 @@ export default {
assessmentId: value.assessmentId,
num: num,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),
creator: value.createUserName ? value.createUserName : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
};
array.push(obj);
});

62
src/components/drawers/EvList.vue
View File

@@ -24,7 +24,7 @@
<div class="fi_input">
<a-input
v-model:value="inputV1"
style="width:424px; height: 40px; border-radius: 8px"
style="width: 424px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称"
/>
</div>
@@ -54,20 +54,21 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox" style="margin-top:85px;">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePagination"
/>
</div></div>
<div class="tableBox" style="margin-top: 85px">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePagination"
/>
</div>
</div>
</div>
</div>
<div class="main_btns">
@@ -131,20 +132,20 @@ export default {
align: "center",
ellipsis: true,
},
// {
// {
// title: "状态",
// width: "13%",
// dataIndex: "status",
// key: "status",
// align: "center",
// },
// {
// width: "13%",
// dataIndex: "status",
// key: "status",
// align: "center",
// },
// {
// title: "价格",
// width: "13%",
// dataIndex: "quiz_price",
// key: "price",
// align: "center",
// },
// key: "price",
// align: "center",
// },
{
title: "可答题人数",
width: "20%",
@@ -161,7 +162,7 @@ export default {
}
state.selectedRowKeys = selectedRowKeys;
state.evListData = selectedRows[0] ? selectedRows[0] : {};
console.log("state.evListData",state.evListData);
console.log("state.evListData", state.evListData);
};
const closeDrawer = () => {
state.selectedRowKeys = [];
@@ -229,19 +230,20 @@ export default {
//获取测评列表
const getAllEvalText = () => {
let objael = {
keyword:state.inputV1,
keyword: state.inputV1,
};
api
.choiceEvaluation(objael)
.then((res) => {
state.tableDataTotal=9;
state.tableDataTotal = 9;
// console.log("测评列表", res.data.data);
getTableDataList(res.data.data);
})
.catch(() => {});
};
//搜索测评列表
const searchList = () => {
state.selectedRowKeys = [];
if (state.inputV1 !== "") {
getAllEvalText();
} else {
@@ -311,7 +313,7 @@ export default {
}
.mi_btns {
display: flex;
cursor: pointer;
.btn {
padding: 0px 26px 0px 26px;

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

@@ -63,16 +63,12 @@
:unCheckedValue="0"
:disabled="true"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
style="width: 100%;color: rgba(109, 117, 132, 1);font-size: 14px;"
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-switch>
</div>
</div>
<div class="set_content">
<div class="set_content" v-if="projectInfo.boeFlag">
<div class="setc_name"><span>是否BOEU实施：</span></div>
<div class="setc_main">
<a-switch
@@ -83,7 +79,7 @@
></a-switch>
</div>
</div>
<div class="set_content">
<div class="set_content" v-if="projectInfo.remark ">
<div class="setc_name"><span>项目说明：</span></div>
<div class="setc_main">
<span style="color: #999999">{{ projectInfo.remark }}</span>

1
src/components/drawers/SelFacet.vue
View File

@@ -527,6 +527,7 @@ export default {
};
//搜索
const search = () => {
state.selectedRows = [];
//重新获取列表
getClassList();
};

1
src/components/drawers/SelectTest.vue
View File

@@ -245,6 +245,7 @@ export default {
// };
//获取选择考试列表
const getManageList = () => {
state.selectedRowKeys = [];
let obj = {
keyWord: state.inputPname,
pageIndex: state.currentPage,

80
src/components/student/ChangeLevelModal.vue
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-20 17:00:37
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-20 17:59:40
* @LastEditTime: 2022-12-21 17:54:18
* @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -28,11 +28,13 @@
<!-- <div class="cur">当前关卡：关卡2</div> -->
<div class="select">
<a-select
v-model:value="selectStage"
style="width: 100%"
placeholder="请选择关卡"
:options="option"
allowClear
v-model:value="chapterSelect"
style="width: 100%"
placeholder="请选择关卡"
:options="chapterList"
@change="changeChapter"
allowClear
showSearch
></a-select>
</div>
<div class="btn">
@@ -56,15 +58,63 @@
</div>
</a-modal>
</template>
<script setup>
import {computed, defineEmits, defineProps, ref} from "vue";
import {moveStudent} from "@/api/index1";
import {message} from "ant-design-vue";
const props = defineProps({
visiblene: {
type: Boolean,
default: false,
<script>
import { reactive, toRefs, onMounted } from "vue";
import { message } from "ant-design-vue";
import { GetRouterDetail } from "../../api/indexTask";
export default {
name: "ChangeLevelModal",
props: {
visiblene: {
type: Boolean,
default: false,
},
id: String,
},
setup(props, ctx) {
const state = reactive({
chapterList: [],
chapterSelect: null, //选择的关卡
chapterSelectId: null, //选择关卡的id
});
const closeChangeModal = () => {
ctx.emit("update:visiblene", false);
state.chapterSelect = null; //选择的关卡
state.chapterSelectId = null; //选择关卡的id
};
const changelevel = () => {
console.log("点击调整关卡");
};
//获取关卡列表
const getDetail = () => {
console.log("props.id", props.id);
GetRouterDetail(props.id)
.then((res) => {
//给level赋初始值
state.chapterList = res.data.data.chapterList;
//增加两个字段
state.chapterList.forEach((item) => {
item["value"] = item.chapterId;
item["label"] = item.name;
});
console.log("路径图详情", res);
})
.catch((err) => {
message.error(err);
});
};
const changeChapter = (e, v) => {
console.log("eeeeeeeeeee", e, v);
};
onMounted(() => {
getDetail();
});
return {
...toRefs(state),
closeChangeModal,
changelevel,
changeChapter,
};
},
stage: {
type: Array,

785
src/components/student/CommonStudent.vue
View File

File diff suppressed because it is too large Load Diff

79
src/components/student/TableStudent.vue
View File

@@ -6,7 +6,7 @@
style="padding-left: 20px; margin-right: 0px"
>
<a-col>
<a-form-item title="姓名：" @click="getStuList">
<a-form-item title="姓名：" >
<a-input
class="cus-input"
v-model:value="tableParam.studentName"
@@ -15,7 +15,7 @@
</a-form-item>
</a-col>
<a-col>
<a-button class="cus-btn" style="width: 100px">
<a-button class="cus-btn" style="width: 100px" @click="getStuList">
<template #icon>
<img
style="margin-right: 10px"
@@ -63,12 +63,13 @@
批量删除
</a-button>
</a-col>
<a-col :span="1.5" v-if="type === 2">
<!--
<a-col :span="1.5" v-if="type == 2">
<a-button class="cus-btn white" @click="showChangeModal">
<template #icon></template>
批量调整关卡
</a-button>
</a-col>
</a-col>-->
</a-row>
<div style="margin-top: 20px">
<a-table
@@ -80,11 +81,44 @@
:row-selection="stuRowSelection"
>
<template #action="{ record }">
<div
@click="del(record.id)"
style="color: #4ea6ff; font-size: 14px; text-align: center"
>
删除
<div style="display: flex; justify-content: center">
<!-- <div v-if="type == 2"
@click="del(record.id)"
style="
color: #4ea6ff;
font-size: 14px;
text-align: center;
margin-left: 20px;
cursor: pointer;
"
>
查看
</div>
<div
@click="showChangeModal"
style="
color: #4ea6ff;
font-size: 14px;
text-align: center;
margin-left: 20px;
cursor: pointer;
"
>
调整
</div> -->
<div
@click="del(record.id)"
style="
color: #4ea6ff;
font-size: 14px;
text-align: center;
margin-left: 20px;
cursor: pointer;
"
>
删除
</div>
</div>
<!-- <a-row gutter="12">
<a-col>
@@ -109,7 +143,7 @@
</div>
</div>
<!-- 批量调整关卡弹窗 -->
<ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall"/>
<ChangeLevelModal v-model:visiblene="visiblene" :id="id" />
<!-- 批量调整关卡弹窗 -->
</template>
<script setup>
@@ -117,7 +151,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
import { delStudentList, getStuPage } from "@/api/index1";
import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue";
import {message} from "ant-design-vue";
import { message } from "ant-design-vue";
const props = defineProps({
type: Number,
id: String,
@@ -191,7 +225,7 @@ const tableData = ref({
});
const stuRowSelection = computed(() => ({
columnWidth: 10,
columnWidth: 20,
selectedRowKeys: stuSelectKeys.value,
onChange: onStuSelectChange,
preserveSelectedRowKeys: true,
@@ -233,9 +267,16 @@ function getStuList() {
});
}
function reset() {}
function reset() {
tableParam.value.studentName="";
}
function bathDel() {
if( stuSelectKeys.value &&
stuSelectKeys.value.length == 0){
message.destroy();
return message.warning("请先选中学员");
}
stuSelectKeys.value &&
stuSelectKeys.value.length &&
delStudentList({
@@ -259,15 +300,11 @@ function submitCall(flag) {
flag && getStuList();
}
//调整关卡
// 调整关卡;
const visiblene = ref(false);
const showChangeModal = () => {
if(!stuSelectKeys.value.length){
message.error("请选择学员")
return
}
visiblene.value = true;
};
//const showChangeModal = () => {
// visiblene.value = true;
//};
</script>
<style>
.studentopea1 {