feat:合并

This commit is contained in:
lixg
2023-02-03 18:40:20 +08:00
parent 7ce64d1a83
commit a3ca45b775
4 changed files with 321 additions and 438 deletions

View File

@@ -18,7 +18,6 @@
</div>
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="signbox">
<div class="sign">
@@ -31,15 +30,15 @@
</div>
<div class="btnbox">
<a-input
v-model:value="inputV1"
v-model:value="certificateName"
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入活动名称"
placeholder="请输入证书名称"
maxlength="20"
/>
</div>
</div>
<div class="main_item">
<!-- <div class="main_item">
<div class="signbox">
<div class="sign">
<img
@@ -50,107 +49,215 @@
<span style="margin-right: 3px">证书</span>
</div>
<div class="btnbox">
<button class="xkbtn11" @click="CreateCertificate" style="margin-top: 0px;">
创建证书
</button>
<button
class="xkbtn11"
@click="CreateCertificate"
style="margin-top: 0px"
>
创建证书
</button>
</div>
</div> -->
<div class="main_item" style="align-items: flex-start">
<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"
style="flex-direction: column; align-items: flex-start"
>
<a-upload
v-model:file-list="fileList"
name="file"
style="width: 200px"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
action="/manageApi/file/uploadFile"
@change="handleChange"
>
<img v-if="imageUrl" :src="imageUrl" alt="avatar" />
<div v-else>
<loading-outlined v-if="loading"></loading-outlined>
<plus-outlined v-else></plus-outlined>
<div class="ant-upload-text">+</div>
</div>
</a-upload>
<div style="font-size: 14px; color: #666">
建议尺寸750*348 格式支持jpggifpngjpegsvgbmp
</div>
</div>
</div>
<div class="main_item2">
<div class="signbox">
<span style="margin-right: 3px">证书说明</span>
</div>
<div class="textarea" style="width: 400px">
<a-textarea
v-model:value="certificateRemark"
placeholder="请输入证书说明"
allow-clear
:rows="8"
show-count
:maxlength="200"
/>
</div>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px;font-size: 16px;color: #333;">设置获得条件</span>
</div>
<div class="btnbox">
<span
style="
margin-right: 3px;
font-size: 16px;
color: #333;
font-size: 14px;
"
>设置获得条件</span
>
</div>
<div class="btnbox"></div>
</div>
<div class="main_item">
<div class="signbox" style="width:30px;">
<span style="margin-right: 3px;font-size: 16px;color: #333;"></span>
<div class="signbox" style="width: 30px">
<span
style="margin-right: 3px; font-size: 16px; color: #333"
></span>
</div>
<div class="btnbox">
<a-radio-group v-model:value="radioV1">
<a-radio v-model:checked="checked" :value="1" @click="cloradio1">
完成项目
<a-radio-group
v-model:value="condition"
@change="selectCondition"
>
<a-radio v-model:checked="checked" :value="1">
完成项目
</a-radio>
<br/>
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
<a-radio-group v-model:value="large" size="small">
<a-radio-button value="1">全部任务</a-radio-button>
<a-radio-button value="2">完成必修任务</a-radio-button>
</a-radio-group>
<br />
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<a-radio-group v-model:value="large" size="small">
<a-radio-button value="1">全部任务</a-radio-button>
<a-radio-button value="2">完成必修任务</a-radio-button>
</a-radio-group>
</div>
<a-radio v-model:checked="checked" :value="2" @click="cloradio1">
完成阶段
</a-radio>
<br/>
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
<a-select
ref="select"
size="small"
placeholder="请选择阶段"
v-model:value="value1"
style="width: 120px"
@focus="focus"
@change="handleChange"
>
<a-select-option value="jack">第一阶段</a-select-option>
<a-select-option value="lucy">第二阶段</a-select-option>
<a-select-option value="Yiminghe">第三阶段</a-select-option>
</a-select>
<a-radio v-model:checked="checked" :value="2">
完成阶段
</a-radio>
<br />
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<a-select
ref="select"
size="small"
placeholder="请选择阶段"
v-model:value="value1"
style="width: 120px"
@focus="focus"
@change="selectStage"
>
<a-select-option value="jack">第一阶段</a-select-option>
<a-select-option value="lucy">第二阶段</a-select-option>
<a-select-option value="Yiminghe">第三阶段</a-select-option>
</a-select>
</div>
<a-radio v-model:checked="checked" :value="3" @click="cloradio1">
完成任务
</a-radio>
<br/>
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
<a-select
ref="select"
size="small"
placeholder="请选择任务"
v-model:value="value1"
style="width: 120px"
@focus="focus"
@change="handleChange"
>
<a-select-option value="jack">任务一</a-select-option>
<a-select-option value="lucy">任务二</a-select-option>
<a-select-option value="Yiminghe">任务三</a-select-option>
</a-select>
<a-radio v-model:checked="checked" :value="3">
完成任务
</a-radio>
<br />
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<a-select
ref="select"
size="small"
placeholder="请选择任务"
v-model:value="value1"
style="width: 120px"
@focus="focus"
@change="selectTask"
>
<a-select-option value="jack">任务一</a-select-option>
<a-select-option value="lucy">任务二</a-select-option>
<a-select-option value="Yiminghe">任务三</a-select-option>
</a-select>
</div>
<a-radio v-model:checked="checked" :value="4" @click="cloradio1">
考试合格
</a-radio>
<br/>
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
<a-select
ref="select"
size="small"
placeholder="请选择考试"
v-model:value="value1"
style="width: 120px"
@focus="focus"
@change="handleChange"
>
<a-select-option value="jack">考试一</a-select-option>
<a-select-option value="lucy">考试二</a-select-option>
<a-select-option value="Yiminghe">考试三</a-select-option>
</a-select>
<a-radio v-model:checked="checked" :value="4">
考试合格
</a-radio>
<br />
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<a-select
ref="select"
size="small"
placeholder="请选择考试"
v-model:value="value1"
style="width: 120px"
@focus="focus"
@change="selectExam"
>
<a-select-option value="jack">考试一</a-select-option>
<a-select-option value="lucy">考试二</a-select-option>
<a-select-option value="Yiminghe">考试三</a-select-option>
</a-select>
</div>
<a-radio v-model:checked="checked" :value="5" @click="cloradio1">
获得积分
</a-radio>
<br/>
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
<a-button style="border:0px solid red;box-shadow: none;">高于</a-button>
<a-input-number id="inputNumber" v-model:value="value" :min="1" :max="100" style="width:70px;" />
<a-button style="border:0px solid red;box-shadow: none;">分可获得当前项目积分为 10 </a-button>
<a-radio v-model:checked="checked" :value="5">
获得积分
</a-radio>
<br />
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<a-button style="border: 0px solid red; box-shadow: none"
>高于</a-button
>
<a-input-number
id="inputNumber"
v-model:value="value"
:min="1"
:max="100"
style="width: 70px"
/>
<a-button style="border: 0px solid red; box-shadow: none"
>分可获得当前项目积分为 10 </a-button
>
</div>
<a-radio v-model:checked="checked" :value="6" @click="cloradio1">
<!-- <a-radio v-model:checked="checked" :value="6" >
完成作业
</a-radio>
<br/>
@@ -159,7 +266,7 @@
<a-input-number id="inputNumber" v-model:value="value" :min="1" :max="100" style="width:70px;" />
<a-button style="border:0px solid red;box-shadow: none;">分可获得证书</a-button>
</div>
<a-radio v-model:checked="checked" :value="7" @click="cloradio1">
<a-radio v-model:checked="checked" :value="7" >
优秀小组长
</a-radio>
<br/>
@@ -168,54 +275,43 @@
<a-input-number id="inputNumber" v-model:value="value" :min="1" :max="100" style="width:70px;" />
<a-button style="border:0px solid red;box-shadow: none;">分小组长可获得证书</a-button>
</div>
<a-radio v-model:checked="checked" :value="8" @click="cloradio1">
<a-radio v-model:checked="checked" :value="8" >
考勤按时签到可获得证书
</a-radio>
<br/>
<div style="height:40px;"></div>
</a-radio> -->
<br />
<div style="height: 40px"></div>
</a-radio-group>
</div>
</div>
<div class="main_item" style="height: 40px">
<!-- <div class="main_item" style="height: 40px">
<div class="signbox">
<span style="margin-right: 3px"></span>
</div>
<div class="btnbox"></div>
</div>
</div> -->
</div>
</div>
<div class="main_btns">
<button class="btn1" @click="closeDrawer1">取消</button>
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="updateActivityInfo">确定</button>
</div>
</div>
</a-drawer>
<!-- 创建证书抽屉 -->
<CreateCertificate
v-model:CCertificate="CCertificate"
/>
<CreateCertificate v-model:CCertificate="CCertificate" />
</template>
<script>
import { reactive, toRefs } from "vue";
import * as api from "../../../api/indexActivity";
import * as apiTask from "../../../api/indexTaskadd";
import { RouterEditTask } from "@/api/indexTask";
import CreateCertificate from "../../../components/drawers/project/CreateCertificate";
import { message } from "ant-design-vue";
import dayjs from "dayjs";
import CreateCertificate from "../../../components/drawers/project/CreateCertificate";
export default {
name: "AddActive",
name: "AddCertificate",
components: {
CreateCertificate
CreateCertificate,
},
props: {
ACertificate: {
type: Boolean,
default: false,
},
EditActiveId: {
projectId: {
type: Number,
default: null,
},
@@ -224,311 +320,68 @@ export default {
type: Boolean,
default: null,
},
projectId: {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
},
routerTaskId: {
type: Number,
default: 0,
},
isLevel: {
// 是否是关卡页面触发
type: Number,
default: null,
},
EditWorkId: {
// 要编辑的workId
type: Number,
default: null,
},
projectTaskId: {
// 要编辑的projectId
type: Number,
default: null,
},
routerId: {
type: Number,
default: null,
},
isactive: {
type: Number,
default: null,
},
projectTemplateId: {
type: Number,
default: null,
ACertificate: {
type: Boolean,
default: false,
},
},
setup(props, ctx) {
const state = reactive({
inputV1: "",
inputV2: "",
inputV3: "",
inputV4: "",
inputV5: "",
inputV6: "",
textV1: "",
textV2: "",
radioV1: "",
time: "",
isClick: false,
certificateName: "", //证书名称
imageUrl: null, //证书封面
imageName: null,
certificateRemark: "", //证书说明
condition: "", //选择条件
CCertificate: false,
});
const closeDrawer = () => {
ctx.emit("update:ACertificate", false);
ctx.emit("update:edit", false);
state.radioV1 = "";
state.inputV1 = "";
state.inputV2 = "";
state.inputV3 = "";
state.inputV4 = "";
state.inputV5 = "";
state.inputV6 = "";
state.textV1 = "";
state.textV2 = "";
state.time = "";
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
};
const closeDrawer1 = () => {
ctx.emit("update:ACertificate", false);
ctx.emit("update:edit", false);
state.radioV1 = "";
state.inputV1 = "";
state.inputV2 = "";
state.inputV3 = "";
state.inputV4 = "";
state.inputV5 = "";
state.inputV6 = "";
state.textV1 = "";
state.textV2 = "";
state.time = "";
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
};
const queryActive = () => {
api
.getActivity(props.EditActiveId)
.then((res) => {
console.log("获取活动信息", res);
//获取活动信息
state.inputV1 = res.data.data.activityName;
state.textV1 = res.data.data.activityNotice;
state.textV2 = res.data.data.activityExplain;
state.inputV2 = res.data.data.activityDuration;
state.inputV3 = res.data.data.activityAddress;
state.inputV5 = res.data.data.afterSignIn;
state.inputV6 = res.data.data.signOutTime;
state.inputV4 = res.data.data.beforeSignIn;
state.radioV1 = Number(res.data.data.standardSettings);
state.time = [
dayjs(res.data.data.activityStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.activityEndTime, "YYYY-MM-DD HH:mm"),
];
})
.catch(() => {});
state.certificateName = "";
state.certificateRemark = "";
state.imageUrl = "";
state.imageName = null;
state.condition = "";
state.CCertificate = false;
};
const afterVisibleChange = (bool) => {
if (bool && props.edit) {
queryActive();
console.log("是编辑");
}
};
const cloradio1 = (value) => {
if (value != "") {
state.radioV1 = "";
}
};
const updateTask = async (res) => {
if (props.isLevel == 1) {
if (!props.isactive) {
message.destroy();
return message.warning("请先选中关卡");
}
await RouterEditTask({
chapterId: props.isactive,
courseId: res.data.data.activityId,
duration: res.data.data.activityDuration,
name: res.data.data.activityName,
routerId: props.routerId,
routerTaskId: props.routerTaskId || 0,
type: 9,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
await apiTask
.addTask({
courseId: res.data.data.activityId,
duration: res.data.data.activityDuration,
name: res.data.data.activityName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 9,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
})
.catch(() => {
//////message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
await apiTask
.addTempTask({
courseId: res.data.data.activityId,
duration: res.data.data.activityDuration,
name: res.data.data.activityName,
projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 9,
})
.then(() => {
ctx.emit("changeData", false);
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}
};
//创建活动
const updateActivityInfo = () => {
let c = 1111;
if(c>0){
closeDrawer();
return
}
if (!state.inputV1) {
message.destroy();
return message.warning("请输入活动名称");
}
if (!state.textV1) {
message.destroy();
return message.warning("请输入活动公告");
}
if (!state.time) {
message.destroy();
return message.warning("请输入活动时间");
}
if (!state.inputV2) {
message.destroy();
return message.warning("请输入活动时长");
}
if (!state.inputV3) {
message.destroy();
return message.warning("请输入活动地址");
}
if (state.isClick) {
message.destroy();
message.error("请勿频繁点击");
return;
}
state.isClick = true;
let obj = {
activityAddress: state.inputV3, //活动地址
activityDuration: state.inputV2, //活动时长
activityExplain: state.textV2, //活动说明
activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm"), //活动结束时间
activityId: props.edit ? props.EditActiveId : 0, //活动ID
activityName: state.inputV1, //活动名称
activityNotice: state.textV1, //活动公告
activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm"), //活动开始时间
activityTag: "", //活动逻辑删除标识
afterSignIn: state.inputV5 ? state.inputV5 : 0, //活动开始后多少分钟签到
beforeSignIn: state.inputV4 ? state.inputV4 : 0, //活动开始前多少分钟签到
signOutTime: state.inputV6, //签退开始时间
standardSettings: state.radioV1, //标准设置
};
console.log("obj", obj);
if (props.edit) {
//更新编辑活动信息
api
.updateActivity(obj)
.then(async (res) => {
closeDrawer();
await updateTask(res);
ctx.emit("changeData", false);
message.destroy();
message.success("更新成功");
state.isClick = false;
})
.catch(() => {
message.destroy();
message.error("更新失败");
state.isClick = false;
});
} else {
//新建活动信息
api
.createActivity(obj)
.then(async (res) => {
message.destroy();
message.success("创建成功");
closeDrawer();
await updateTask(res);
ctx.emit("changeData", false);
state.isClick = false;
})
.catch(() => {
message.destroy();
message.error("创建失败");
state.isClick = false;
});
}
};
const range = (start, end) => {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
};
const disabledDate = (current) => {
// Can not select days before today and today
console.log("1111", dayjs().endOf("day"));
return current && current < dayjs().startOf("day");
};
const disabledDateTime = () => {
return {
disabledHours: () => range(0, 24).splice(4, 20),
disabledMinutes: () => range(30, 60),
disabledSeconds: () => [55, 56],
};
//选择的获得条件
const selectCondition = (e) => {
console.log("e.target.value;", e.target.value);
};
// 创建证书
function CreateCertificate() {
state.CCertificate = true;
state.CCertificate = true;
}
//上传封面
const handleChange = (info) => {
console.log("info", info);
if (info.file.status === "uploading") {
return;
}
if (info.file.status === "done") {
console.log("上传图片返回的信息 %o", info.file.name);
state.imageUrl = process.env.VUE_APP_FILE_PATH + info.file.name;
state.imageName = info.file.name;
}
if (info.file.status === "error") {
message.error("upload error");
}
};
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
closeDrawer1,
cloradio1,
updateActivityInfo,
disabledDateTime,
disabledDate,
CreateCertificate
selectCondition,
handleChange,
CreateCertificate,
};
},
};
@@ -584,7 +437,7 @@ export default {
}
.main_left {
margin-top: 32px;
// margin-top: 32px;
padding-right: 30px;
flex: 1;
border-right: 1px solid #e8e8e8;