feat:合并

This commit is contained in:
songwc
2022-11-01 18:24:55 +08:00
20 changed files with 20957 additions and 8813 deletions

11384
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -38,34 +38,10 @@ import http from "./config";
// 接口-请求
// 创建编辑单层项目
export const createProject = (obj) => http.post('/admin/project/edit', {
"attach": obj.attach,
"beginTime": obj.beginTime,
"boeFlag": obj.boeFlag,
"category": obj.category,
"courseSyncFlag": obj.courseSyncFlag,
"endTime": obj.endTime,
"level": obj.level,
"manager": obj.manager,
"managerId": obj.managerId,
"name": obj.name,
"notice": obj.notice,
"noticeFlag": obj.noticeFlag,
"picUrl": obj.picUrl,
"remark": obj.remark,
"sourceBelongId": obj.sourceBelongId,
"status": obj.status,
"systemId": obj.systemId,
"templateId": obj.templateId,
"type": obj.type
})
export const createProject = (obj) => http.post('/admin/project/edit', obj)
// 创建多层项目
export const createStoreyProject = () => http.post('/admin/project/edit', {
})
export const createStoreyProject = (obj) => http.post('/admin/project/edit', obj)
// 获取项目列表
export const getProjectList = () => http.post('/admin/project/list', {
})
export const getProjectList = (obj) => http.post('/admin/project/list', obj)

View File

@@ -40,19 +40,11 @@ export const uploadFile = (obj) => http.post('/test/testRequest', qs.stringify({
// 接口-请求
//创建学习路径
export const createLearnPath = (obj) => http.post('/admin/router/edit', obj, {
headers: {
'token': '123'
}
});
export const createLearnPath = (obj) => http.post('/admin/router/edit', obj);
// 获取学习路径图列表
export const getLearnPath = (obj) => http.post('/admin/router/list', obj);
//删除学习路径图
export const deleteLearnPath = (obj) => http.post('/admin/router/handle', obj, {
headers: {
'token': '123'
}
});
export const deleteLearnPath = (obj) => http.post('/admin/router/handle', obj);
//获取关卡
export const getChapter = (obj) => http.post('/admin/router/detail', { params: obj });

View File

@@ -354,6 +354,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;

View File

@@ -169,6 +169,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;

View File

@@ -101,7 +101,7 @@
</div>
</a-drawer>
</template>
<script>
<script>
import { reactive, toRefs, ref } from "vue";
import { useRouter } from "vue-router";
import * as api from "../../api/indexEval";
@@ -142,7 +142,6 @@ export default {
const afterVisibleChange = (bool) => {
console.log("state", bool);
};
//上传组件
function getBase64(img, callback) {
const reader = new FileReader();
@@ -152,7 +151,7 @@ export default {
const fileList = ref([]);
const loading = ref(false);
const imageUrl = ref('');
const imageUrl = ref("");
const handleChange = (info) => {
if (info.file.status === 'uploading') {
@@ -363,7 +362,7 @@ export default {
},
};
</script>
<style lang="scss">
<style lang="scss">
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}
@@ -375,6 +374,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -502,4 +502,3 @@ export default {
}
}
</style>

View File

@@ -380,6 +380,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;

View File

@@ -16,56 +16,52 @@
@click="closeDrawer"
/>
</div>
<a-form
ref="formRef"
name="custom-validation"
:model="formState"
:rules="rules"
v-bind="layout"
@finish="handleFinish"
@validate="handleValidate"
@finishFailed="handleFinishFailed"
>
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">作业名称</span>
</div>
<div class="btnbox">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 32px"
<a-form-item has-feedback label="作业名称" name="workName">
<a-input v-model:value="formState.workName"
style="width: 424px; height: 32px;margin-left: 35px;"
placeholder="请输入作业名称"
maxlength="20"
/>
autocomplete="off" />
</a-form-item>
</div>
</div>
<div class="main_item2">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">作业要求</span>
</div>
<div class="textarea">
<a-form-item has-feedback label="作业要求" name="workRequirement">
<a-textarea
v-model:value="textV1"
placeholder="请输入作业名称"
v-model:value="formState.workRequirement"
placeholder="请输入作业要求"
autocomplete="off"
allow-clear
style="margin-left: 35px"
maxlength="150"
/>
</div>
</a-form-item>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">提交时间</span>
</div>
<div class="btnbox">
<a-form-item has-feedback label="提交时间" name="choosedTime">
<a-range-picker
style="width: 424px"
v-model:value="choosedTime"
style="width: 424px;margin-left: 35px;"
v-model:value="formState.choosedTime"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</a-form-item>
</div>
</div>
<div class="main_item">
@@ -83,7 +79,6 @@
v-model:file-list="fileList"
name="file"
action="/api/file/upload"
:headers="headers"
@change="handleChange"
>
<button class="xkbtn">上传附件</button>
@@ -100,14 +95,16 @@
</div>
</div>
<div class="main_btns">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="addHomework">确定</button>
<a-button class="btn1" @click="closeDrawer">取消</a-button>
<a-button class="btn2" html-type="submit">确定</a-button>
</div>
</a-form>
</div>
</a-drawer>
</template>
<script>
import { reactive, toRefs, ref } from "vue";
import { reactive, ref } from "vue";
import {message} from"ant-design-vue";
import {createWorkTask} from "@/api/indexWork"
import dayjs from 'dayjs';
@@ -139,11 +136,75 @@ export default {
},
},
setup(props, ctx) {
const state = reactive({
inputV1: "",
textV1:"",
choosedTime:[],
const formState = reactive({
workName: '',
workRequirement: '',
choosedTime: '',
});
const formRef = ref();
let checkWorkName = async (_rule, value) => {
if (!value) {
message.warning("请输入作业名称");
return Promise.reject('请输入作业名称');
}
};
let checkWorkRequirement = async (_rule, value) => {
if (!value) {
message.warning("请输入作业要求");
return Promise.reject('请输入作业要求');
}
};
let checkTime = async (_rule, value) => {
if (!value) {
message.warning("请选择时间");
return Promise.reject('请选择时间');
}
};
const rules = {
workName: [{
required: true,
validator: checkWorkName,
trigger: 'change',
}],
workRequirement: [{
required: true,
validator: checkWorkRequirement,
trigger: 'change',
}],
choosedTime: [{
required: true,
validator: checkTime,
trigger: 'change',
}],
};
// const layout = {
// labelCol: {
// span: 4,
// },
// wrapperCol: {
// span: 14,
// },
// };
const handleFinish = values => {
console.log(values);
addHomework()
};
const handleFinishFailed = errors => {
console.log(errors);
// message.error("handleFinishFailed");
};
const resetForm = () => {
formRef.value.resetFields();
};
const handleValidate = (...args) => {
console.log(args);
};
const handleChange = info => {
if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList);
@@ -158,49 +219,48 @@ export default {
const fileList = ref([]);
const closeDrawer = () => {
resetForm();
ctx.emit("update:addhomeworkVisible", false);
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
};
const addHomework = () => {
if(state.choosedTime.length && state.inputV1 && state.textV1){
createWorkTask({
"createTime": "",
"createUser": 0,
"submitEndTime": dayjs(state.choosedTime[1]).format("YYYY-MM-DD"),
"submitStartTime": dayjs(state.choosedTime[0]).format("YYYY-MM-DD"),
"submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
"submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
"updateTime": "",
"updateUser": 0,
"workEnclosureAddress": "",
"workFlag": "",
"workId": 0,
"workName": state.inputV1,
"workRequirement": state.textV1,
"workName": formState.workName,
"workRequirement": formState.workRequirement,
"workTag": ""
}).then((res)=>{
message.success(`添加成功${res}`)
ctx.emit("update:addhomeworkVisible", false);
closeDrawer();
}).catch((err)=>{
message.error(`添加失败${err}`)
})
}
else{
message.error(`字段不能为空`)
return 0
}
}
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
rowSelection,
addHomework,
handleChange,
fileList,
headers: {
"token":"123"
},
formState,
handleFinish,
handleFinishFailed,
resetForm,
handleValidate,
formRef,
// layout,
rules,
};
},
};
@@ -217,6 +277,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -313,6 +374,7 @@ export default {
}
}
.main_btns {
position: absolute;
height: 72px;
width: 100%;
bottom: 0;
@@ -344,3 +406,4 @@ export default {
}
}
</style>

View File

@@ -634,6 +634,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;

View File

@@ -295,6 +295,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;

View File

@@ -169,6 +169,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;

View File

@@ -16,154 +16,134 @@
@click="closeDrawer"
/>
</div>
<a-form
ref="formRef"
name="custom-validation"
:model="formState"
:rules="rules"
v-bind="layout"
@finish="handleFinish"
@validate="handleValidate"
@finishFailed="handleFinishFailed"
>
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">考试名称</span>
</div>
<div class="btnbox">
<a-form-item has-feedback label="作业名称" name="examinationName">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 32px"
v-model:value="formState.examinationName"
style="width: 424px; height: 32px;margin-left: 35px;"
autocomplete="off"
placeholder="请输入考试名称"
maxlength="20"
/>
maxlength="20"/>
</a-form-item>
</div>
</div>
<div class="main_item2">
<div class="signbox">
<span style="margin-right: 3px">考试说明</span>
</div>
<div class="textarea">
<a-form-item has-feedback label="考试说明" name="examinationExplain">
<a-textarea
v-model:value="testV1"
v-model:value="formState.examinationExplain"
placeholder="请输入考试说明"
allow-clear
style="margin-left: 35px;"
maxlength="150"
/>
</div>
</a-form-item>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">选择考试</span>
</div>
<div class="btnbox">
<a-form-item has-feedback label="选择考试" name="choosedTest">
<a-select
dropdownClassName="dropdown-style"
style="width: 424px"
style="width: 424px;margin-left: 35px;"
placeholder="请输入考试名称"
:options="options1"
v-model:value="choosedTest"
v-model:value="formState.choosedTest"
allowClear
showSearch
/>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">考试时间</span>
</div>
<div class="btnbox">
<a-form-item has-feedback label="考试时间" name="choosedTime">
<a-range-picker
v-model:value="testTime"
style="width: 424px"
v-model:value="formState.choosedTime"
style="width: 424px;margin-left: 35px;"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">考试时长</span>
</div>
<div class="btnbox">
<a-form-item has-feedback label="考试时长" name="examinationDuration">
<a-input
v-model:value="inputV2"
style="width: 388px; height: 32px"
v-model:value="formState.examinationDuration"
style="width: 388px; height: 32px;
margin-left: 35px;"
/>
<span style="margin-left: 5px">分钟</span>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">考试限制</span>
</div>
<div class="btnbox">
<span style="margin-right: 8px">允许重复考试</span>
<span style="margin-right: 43px">考试限制</span>
<a-form-item has-feedback label="允许重复考试" name="examinationLimit">
<a-input-number
:min="-1" :precision="0"
v-model:value="inputV3"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
v-model:value="formState.examinationLimit"
style="width: 88px; height: 32px;
border-radius: 8px;overflow: hidden;"
/>
<span style="margin-left: 8px"></span>
<span style="margin-left: 24px; color: #999999"
>-1表示无限制</span
>
>-1表示无限制</span>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">显示答案</span>
</div>
<div class="btnbox">
<a-radio-group v-model:value="radioV1">
<a-form-item has-feedback label="显示答案" name="showAnswers">
<a-radio-group style="margin-left: 35px;" v-model:value="formState.showAnswers">
<a-radio v-model:checked="checked" :value="1" @click="cloradio1">允许查看</a-radio>
<a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>不允许查看</a-radio
>
</a-radio-group>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">显示解析</span>
</div>
<div class="btnbox">
<a-radio-group v-model:value="radioV2">
<a-form-item has-feedback label="显示解析" name="showAnalysis">
<a-radio-group style="margin-left: 35px;" v-model:value="formState.showAnalysis">
<a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许查看</a-radio>
<a-radio v-model:checked="checked" :value="2" @click="cloradio2"
>不允许查看</a-radio
>
</a-radio-group>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">评分模式</span>
</div>
<div class="btnbox">
<div class="btnbox">
<a-radio-group v-model:value="radioV3">
<a-form-item has-feedback label="评分模式" name="scoringModel">
<a-radio-group style="margin-left: 35px;" v-model:value="formState.scoringModel">
<a-radio v-model:checked="checked" :value="1" @click="cloradio3"
>最高一次</a-radio
>
@@ -171,44 +151,47 @@
>最后一次</a-radio
>
</a-radio-group>
</div>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">及格线</span>
</div>
<div class="btnbox">
<a-form-item has-feedback label="及格线" name="passLine">
<a-input
v-model:value="inputV4"
style="width: 88px; height: 32px"
v-model:value="formState.passLine"
style="width: 88px; height: 32px;margin-left: 35px;"
/>
</a-form-item>
<span style="margin-left: 8px"></span>
</div>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">试题排列</span>
</div>
<div class="btnbox">
<a-radio-group v-model:value="radioV4">
<a-form-item has-feedback label="作业要求" name="questionArrangement">
<a-radio-group v-model:value="formState.questionArrangement">
<a-radio v-model:checked="checked" :value="1" @click="cloradio4">试题乱序</a-radio>
<a-radio v-model:checked="checked" :value="2" @click="cloradio4">试题排序</a-radio>
<a-radio v-model:checked="checked" :value="3" @click="cloradio4">全部乱序</a-radio>
</a-radio-group>
</a-form-item>
</div>
</div>
</div>
</div>
<div class="main_btns">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="addTest">确定</button>
<a-button class="btn1" @click="closeDrawer">取消</a-button>
<a-button class="btn2" html-type="submit" >确定</a-button>
</div>
</a-form>
</div>
</a-drawer>
</template>
<script>
import { reactive, toRefs, ref } from "vue";
import { reactive, ref } from "vue";
import {message} from"ant-design-vue";
import {createExamination} from "@/api/indexExam"
import dayjs from 'dayjs';
@@ -239,19 +222,138 @@ export default {
},
},
setup(props, ctx) {
const state = reactive({
inputV1: "",
inputV2: "",
inputV3: "",
inputV4: "60",
testV1: "",
radioV1: "",
radioV2: "",
radioV3: "",
radioV4: "",
choosedTest: "",
testTime:"",
const formState = reactive({
examinationName:'',
examinationDuration:"",
examinationLimit:"",
passLine:60,
examinationEndTime:"",
examinationExplain:"",
questionArrangement:1,
scoringModel:2,
showAnalysis:2,
showAnswers:2,
});
const formRef = ref();
let checkExaminationName = async (_rule, value) => {
if (!value) {
message.warning("请输入考试名称");
return Promise.reject('请输入考试名称');
}
};
let checkExaminationExplain = async (_rule, value) => {
if (!value) {
message.warning("请输入考试说明");
return Promise.reject('请输入考试说明');
}
};
let checkChoosedTest = async (_rule, value) => {
if (!value) {
message.warning("请选择考试");
return Promise.reject('请选择考试');
}
};
let checkChoosedTime = async (_rule, value) => {
if (!value) {
message.warning("请选择时间");
return Promise.reject('请选择时间');
}
};
let checkExaminationDuration = async (_rule, value) => {
if (!value) {
message.warning("请输入考试时长");
return Promise.reject('请输入考试时长');
}
};
let checkLimit = async (_rule, value) => {
if (!value) {
message.warning("请输入考试限制");
return Promise.reject('请输入考试限制');
}
};
let checkShowAnswers = async (_rule, value) => {
if (!value) {
message.warning("请输入作业名称");
return Promise.reject('请输入作业名称');
}
};
let checkShowAnalysis = async (_rule, value) => {
if (!value) {
message.warning("请输入作业名称");
return Promise.reject('请输入作业名称');
}
};
let checkScoringModel = async (_rule, value) => {
if (!value) {
message.warning("请输入作业名称");
return Promise.reject('请输入作业名称');
}
};
let checkPassLine = async (_rule, value) => {
if (!value) {
message.warning("请输入及格线");
return Promise.reject('请输入及格线');
}
};
let checkQuestionArrangement = async (_rule, value) => {
if (!value) {
message.warning("请输入作业名称");
return Promise.reject('请输入作业名称');
}
};
const rules = {
examinationName: [{
required: true,
validator: checkExaminationName,
trigger: 'change',
}],
examinationExplain: [{
validator: checkExaminationExplain,
trigger: 'change',
}],
choosedTest: [{
required: true,
validator: checkChoosedTest,
trigger: 'change',
}],
choosedTime: [{
required: true,
validator: checkChoosedTime,
trigger: 'change',
}],
examinationDuration: [{
required: true,
validator: checkExaminationDuration,
trigger: 'change',
}],
limit: [{
required: true,
validator: checkLimit,
trigger: 'change',
}],
showAnswers: [{
validator: checkShowAnswers,
trigger: 'change',
}],
showAnalysis: [{
validator: checkShowAnalysis,
trigger: 'change',
}],
scoringModel: [{
validator: checkScoringModel,
trigger: 'change',
}],
passLine: [{
required: true,
validator: checkPassLine,
trigger: 'change',
}],
questionArrangement: [{
validator: checkQuestionArrangement,
trigger: 'change',
}],
};
const options1 = ref([
{
label:'math',
@@ -262,76 +364,82 @@ export default {
value:'eng',
},
])
const handleFinish = values => {
console.log(values);
addTest()
};
const handleFinishFailed = errors => {
console.log(errors);
// message.error("handleFinishFailed");
};
const resetForm = () => {
formRef.value.resetFields();
};
const handleValidate = (...args) => {
console.log(args);
};
const closeDrawer = () => {
resetForm();
ctx.emit("update:addtestVisible", false);
state.radioV1 = "";
state.radioV2 = "";
state.radioV3 = "";
state.radioV4 = "";
};
const addTest = () => {
if(state.testTime.length
&& state.inputV1&& state.inputV2&& state.inputV3&& state.inputV4
&& state.radioV1&& state.radioV2&& state.radioV3
){
createExamination({
"createTime": "",
"createUser": 0,
"examinationDuration": state.inputV2,
"examinationEndTime": dayjs(state.testTime[1]).format("YYYY-MM-DD"),
"examinationExplain": state.testV1,
"examinationDuration": formState.examinationDuration,
"examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
"examinationExplain": formState.examinationExplain,
"examinationFlag": "",
"examinationId": 0,
"examinationLimit": state.inputV3,
"examinationName": state.inputV1,
"examinationLimit": formState.examinationLimit,
"examinationName": formState.examinationName,
"examinationPaperId": 0,
"examinationPaperName": state.choosedTest,
"examinationStartTime": dayjs(state.testTime[0]).format("YYYY-MM-DD"),
"examinationPaperName": formState.choosedTest,
"examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
"examinationTag": "",
"passLine": state.inputV4,
"questionArrangement": state.radioV4,
"scoringModel": state.radioV3,
"showAnalysis": state.radioV2,
"showAnswers": state.radioV1,
"passLine": formState.passLine,
"questionArrangement": formState.questionArrangement,
"scoringModel": formState.scoringModel,
"showAnalysis": formState.showAnalysis,
"showAnswers": formState.showAnswers,
"updateTime": "",
"updateUser": 0
}).then((res)=>{
message.success(`添加成功${res}`)
ctx.emit("update:addtestVisible", false);
closeDrawer();
}).catch((err)=>{
message.error(`添加失败${err}`)
})
}
else{
message.error(`字段不能为空`)
return 0
}
}
const afterVisibleChange = (bool) => {
console.log("state", bool);
console.log("formState", bool);
};
const cloradio1 = (value) => {
if (value != "") {
state.radioV1 = "";
formState.showAnswers = "";
}
}
const cloradio2 = (value) => {
if (value != "") {
state.radioV2 = "";
formState.showAnalysis = "";
}
}
const cloradio3 = (value) => {
if (value != "") {
state.radioV3 = "";
formState.scoringModel = "";
}
}
const cloradio4 = (value) => {
if (value != "") {
state.radioV4 = "";
formState.questionArrangement = "";
}
}
return {
...toRefs(state),
formState,
afterVisibleChange,
closeDrawer,
rowSelection,
@@ -341,6 +449,13 @@ export default {
cloradio4,
addTest,
options1,
handleFinish,
handleFinishFailed,
resetForm,
handleValidate,
formRef,
// layout,
rules,
};
},
};
@@ -357,6 +472,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;

View File

@@ -177,6 +177,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;

View File

@@ -4,25 +4,21 @@
<!-- 搜索框及按钮 -->
<div class="filter">
<div class="filterItems">
<div class="select">
<a-select
v-model:value="projectName"
style="width: 270px"
<div class="pathnameInp">
<a-input
v-model:value="pathnameSearch"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入路径名称"
:options="projectNameList"
@change="selectProjectName"
allowClear
showSearch
></a-select>
/>
</div>
<div class="select">
<a-select
v-model:value="projectName"
v-model:value="statusValue"
style="width: 270px"
placeholder="请选择状态"
:options="projectNameList"
@change="selectProjectName"
:options="statusList"
@change="selectStatusClassify"
allowClear
showSearch
></a-select>
@@ -35,19 +31,20 @@
style="width: 270px"
/> -->
<a-range-picker
v-model:value="value2"
v-model:value="searchdate"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
@change="searchTimeChange"
/>
</div>
<div style="display: flex; margin-bottom: 20px">
<div class="btn btn1">
<div class="search"></div>
<div class="btnText">搜索</div>
<div class="btnText" @click="searchLearnPath">搜索</div>
</div>
<div class="btnn btn2">
<div class="search"></div>
<div class="btnText">重置</div>
<div class="btnText" @click="resetLearnPath">重置</div>
</div>
</div>
</div>
@@ -613,28 +610,6 @@ export default {
setup() {
const router = useRouter();
const state = reactive({
projectNameList: [
{
id: 1,
value: "项目一",
label: "项目一",
},
{
id: 2,
value: "项目二",
label: "项目二",
},
{
id: 3,
value: "项目三",
label: "项目三",
},
{
id: 4,
value: "项目四",
label: "项目四",
},
],
out: false,
out1: false,
number: null,
@@ -692,6 +667,8 @@ export default {
value1: "",
value2: "",
//
//创建、编辑-------------------------
pathName: "", //创建/编辑路径图名称
organizationList: [
{
@@ -722,6 +699,33 @@ export default {
createLoading: false, //创建路径loading
deletePathId: null, //删除路径id
editPathId: null, //修改路径id
//搜索------------------------------
pathnameSearch: null, //搜索路径名称
statusList: [
{
id: 1,
value: "草稿",
label: "草稿",
classify: 0,
},
{
id: 2,
value: "已发布",
label: "已发布",
classify: 1,
},
{
id: 3,
value: "已停用",
label: "已停用",
classify: -1,
},
],
statusValue: null, //状态
statusClassify: null, //选择状态类型
searchdate: null, //选择时间
startTime: null, //开始时间
endTime: null, //结束时间
});
const selectProjectName = (value, index) => {
@@ -976,7 +980,6 @@ export default {
<a-select
style="width: 50px;margin-top:2px;margin-left:25px"
value="授权"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option value="权限名单" label="权限名单">
@@ -1022,7 +1025,6 @@ export default {
<a-select
style="width: 50px;margin-top:2px;margin-right:20px;"
value="更多"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option
@@ -1075,7 +1077,6 @@ export default {
<a-select
style="width: 50px;margin-top:2px;margin-right:20px;"
value="更多"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option
@@ -1115,7 +1116,6 @@ export default {
<a-select
style="width: 50px;margin-top:2px;margin-right:20px;"
value="更多"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option
@@ -1166,8 +1166,8 @@ export default {
};
//创建学习路径图
const createLearnPath = () => {
if (!state.pathName) return message.info("请输入路径图名称");
// if (!state.organizationSelectName) return message.info("请选择归属组织");
if (!state.pathName) return message.warning("请输入路径图名称");
// if (!state.organizationSelectName) return message.warning("请选择归属组织");
// state.createLoading = true;
let obj = {
name: state.pathName,
@@ -1197,6 +1197,10 @@ export default {
let obj = {
pageNo: state.currentPage,
pageSize: state.pageSize,
name: state.pathnameSearch,
status: state.statusClassify,
beginTime: state.startTime,
endTime: state.endTime,
};
api
.getLearnPath(obj)
@@ -1219,31 +1223,6 @@ export default {
.catch((err) => {
console.log("获取学习路径失败", err);
});
// let getChapterObj = {
// routerId: 0,
// };
// api
// .getChapter(getChapterObj)
// .then((res) => {
// console.log("获取关卡数据", res);
// })
// .catch((err) => {
// console.log("获取关卡数据失败", err);
// });
// let editChapterObj = {
// name: "测试关卡",
// remark: "这是测试关卡说明",
// routerId: 0,
// };
// api
// .editChapter(editChapterObj)
// .then((res) => {
// console.log("添加测试关卡数据", res);
// })
// .catch((err) => {
// console.log("添加测试关卡数据失败", err);
// });
};
//翻页
const changePagination = (page) => {
@@ -1271,8 +1250,8 @@ export default {
};
//编辑学习路径图
const editLearnPath = () => {
if (!state.pathName) return message.info("请输入路径图名称");
// if (!state.organizationSelectName) return message.info("请选择归属组织");
if (!state.pathName) return message.warning("请输入路径图名称");
// if (!state.organizationSelectName) return message.warning("请选择归属组织");
// state.createLoading = true;
let obj = {
routerId: state.editPathId,
@@ -1299,6 +1278,43 @@ export default {
// state.createLoading = false;
});
};
//选择状态
const selectStatusClassify = (e, v) => {
// console.log("eee", e, v);
state.statusValue = e;
state.statusClassify = v.classify;
};
//修改时间
const searchTimeChange = (e, date) => {
let startTime = date[0] + " 00:00:00";
let endTime = date[1] + " 23:59:59";
state.startTime = new Date(startTime).getTime() / 1000;
state.endTime = new Date(endTime).getTime() / 1000;
console.log("e", state.startTime, state.endTime);
};
//搜索学习路径
const searchLearnPath = () => {
state.currentPage = 1;
console.log(
"pathnameSearch",
state.pathnameSearch,
state.statusClassify,
state.startTime,
state.endTime
);
getLearnPath();
};
//重置学习路径
const resetLearnPath = () => {
state.currentPage = 1;
state.pathnameSearch = null;
state.statusValue = null;
state.statusClassify = null;
state.searchdate = null;
state.startTime = null;
state.endTime = null;
getLearnPath();
};
onMounted(() => {
// console.log("执行");
getLearnPath();
@@ -1333,6 +1349,10 @@ export default {
changePagination,
deleteLearnPath,
editLearnPath,
selectStatusClassify,
searchTimeChange,
searchLearnPath,
resetLearnPath,
};
},
};
@@ -1837,6 +1857,10 @@ export default {
.filterItems {
display: flex;
flex-wrap: wrap;
.pathnameInp {
margin-right: 20px;
margin-bottom: 20px;
}
.select {
margin-right: 20px;
margin-bottom: 20px;

View File

@@ -60,6 +60,12 @@
<div class="main">
<div class="inma">
<div class="name">
<div class="d" style="margin-top: 2px;margin-right:2px">
<img
style="width: 10px; height: 10px"
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="fir">关卡名称</div>
<div class="input">
<a-input
@@ -72,6 +78,8 @@
<div class="co">{{ value1.length }}/20</div>
</div>
<div class="name">
<div class="d" style="width: 10px;height: 10px;margin-top: 2px;margin-right:2px">
</div>
<div class="fir">关卡说明</div>
<div class="input">
<a-textarea

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -540,7 +540,10 @@ import { message } from "ant-design-vue";
import * as api from "../../api/indexTaskadd";
import * as apilive from "../../api/indexLiveBroadcast";
import * as apiExternal from "../../api/indexExternalChain";
import * as apidiscuss from "../../api/indexDiscuss";
import * as apiactivity from "../../api/indexActivity";
import * as apieval from "../../api/indexEval";
import * as apiinvist from "../../api/indexInvist";
const drawercolumns = [
{
title: "项目名称",
@@ -858,6 +861,10 @@ export default {
isActive: false,
deleteLiveID: null, //删除直播id
deleteExternalID: null, //删除外链id
deleteEvalID: null, //测评
deleteInvistID: null, //评估
deleteDiscussID: null, //删除讨论id
deleteActivityID: null, //删除活动id
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
@@ -966,7 +973,7 @@ export default {
// width: 100,
align: "center",
scopedSlots: { customRender: "action" },
customRender: (text) => {
customRender: () => {
return (
<div class="opa">
<div class="opacation">
@@ -982,13 +989,8 @@ export default {
style="color:#4EA6FF;cursor:pointer"
onClick={() => {
showDelete();
{
/* state.deleteLiveID = text.record.id; */
}
{
/* deleteEvalText(); */
}
console.log(text.record.id);
deleteEvalText();
deleteInvistText();
}}
>
删除
@@ -1051,13 +1053,12 @@ export default {
});
};
//删除评估测试
const deleteEvalText = () => {
const deleteDiscuss = () => {
let obj = {
evaluationId: state.deleteLiveID,
discussId: state.deleteDiscussID,
};
apieval
.deleteEvaluationById(obj)
apidiscuss
.deleteDiscuss(obj)
.then((res) => {
console.log("删除成功", res);
message.success("删除成功");
@@ -1069,6 +1070,98 @@ export default {
console.log("删除失败", err);
});
};
//删除活动
const deleteActivity = () => {
let obj = {
activityId: state.deleteActivityID,
};
apiactivity
.deleteActivity(obj)
.then((res) => {
console.log("删除成功", res);
message.success("删除成功");
state.deleteModal = false;
//重新获取列表
getTask();
})
.catch((err) => {
console.log("删除失败", err);
});
};
//删除测评测试
const deleteEvalText = () => {
let obj = {
evaluationId: state.deleteEvalID,
};
apieval
.deleteEvaluationById(obj)
.then((res) => {
console.log("删除成功", res);
message.success("删除成功");
//重新获取列表
getTask();
})
.catch((err) => {
console.log("删除失败", err);
});
};
//编辑测评信息
const editEvalPath = () => {
// if (!state.inputV1) return message.info("请输入测评名称");
// if (!state.organizationSelectName) return message.warning("请选择归属组织");
// state.createLoading = true;
let obj = {
createTime: "",
createUser: 0,
evaluationEndTime: "",
evaluationFlag: "",
evaluationId: "",
evaluationName: "",
evaluationPictureAddress: "",
evaluationStartTime: "",
evaluationTag: "",
evaluationTypeId: 0,
evaluationTypeName: "",
updateTime: "",
updateUser: 0,
};
apieval
.updateEvaluation(obj)
.then((res) => {
setTimeout(() => {
console.log("修改成功", res);
message.success("修改成功");
// state.createLoading = false;
// state.currentPage = 1;
// router.push("/leveladd");
// getLearnPath();
}, 1000);
})
.catch((err) => {
console.log("修改失败", err);
// state.createLoading = false;
});
};
//删除评估测试
const deleteInvistText = () => {
let obj = {
evaluationId: state.deleteInvistID,
};
apiinvist
.deleteAppraise(obj)
.then((res) => {
console.log("删除成功", res);
message.success("删除成功");
//重新获取列表
getTask();
})
.catch((err) => {
console.log("删除失败", err);
});
};
const onSelectChange = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
@@ -1196,8 +1289,12 @@ export default {
changebgc,
getTask,
deleteLiveBroadcast,
deleteDiscuss,
deleteEvalText,
deleteExternalChain,
deleteActivity,
editEvalPath,
deleteInvistText,
};
},
};

File diff suppressed because it is too large Load Diff

View File

@@ -27,10 +27,12 @@
<a-upload
v-model:file-list="fileList"
name="avatar"
action="/api/file/upload"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
:before-upload="beforeUpload"
@change="handleChange"
>
<!-- <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
<div v-else>
@@ -39,6 +41,27 @@
<div class="ant-upload-text">Upload</div>
</div> -->
</a-upload>
<div
style="
width: 130px;
height: 40px;
background: #388be1;
border-radius: 8px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #ffffff;
line-height: 20px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
"
@click="golearningpath"
>
跳转
</div>
</div>
</template>
<script>
@@ -52,6 +75,7 @@ import * as api from "../../api/index1";
// reader.addEventListener("load", () => callback(reader.result));
// reader.readAsDataURL(img);
// }
import { useRouter } from "vue-router";
export default {
name: "SystemManage",
components: {
@@ -141,13 +165,17 @@ export default {
}
// return isJpgOrPng && isLt2M;
};
const router = useRouter();
const golearningpath = () => {
router.push({ path: "/learningpath", params: { id: 1 } });
};
return {
...toRefs(state),
showDrawer,
changeRadio,
handleChange,
beforeUpload,
golearningpath,
};
},
};