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

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-04 22:45:31 * @Date: 2022-11-04 22:45:31
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-02-01 11:07:17 * @LastEditTime: 2023-02-03 18:39:27
* @FilePath: /fe-manage/src/api/index1.js * @FilePath: /fe-manage/src/api/index1.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@@ -190,4 +190,14 @@ export const getImportStatus = (uuid) => http.get('/admin/student/getImportStatu
// 面授课导入学员 // 面授课导入学员
export const FaceTeachImportStudent = (obj) => http.post('/admin/student/importStudent', obj, { headers: { "Content-Type": "multipart/form-data" } }) export const FaceTeachImportStudent = (obj) => http.post('/admin/student/importStudent', obj, { headers: { "Content-Type": "multipart/form-data" } })
//成绩录入 //成绩录入
export const updateStudent = (obj) => http.post('/admin/student/homeWorkScoreEntry', obj) export const updateStudent = (obj) => http.post('/admin/student/homeWorkScoreEntry', obj)
//获取证书列表
export const certificate = (obj) => http.get('/admin/certificate/page', { params: obj })
//添加证书
export const saveupdatecertificate = (obj) => http.post('/admin/certificate/saveOrUpdate', obj)
//删除证书
export const certificatedel = (obj) => http.get('/admin/certificate/del', { params: obj })
//证书详情
export const certificatedetail = (obj) => http.post('/admin/certificate/get', obj)

View File

@@ -18,7 +18,6 @@
</div> </div>
<div class="contentMain"> <div class="contentMain">
<div class="main_left"> <div class="main_left">
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
@@ -31,15 +30,15 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input
v-model:value="inputV1" v-model:value="certificateName"
style="width: 400px; height: 40px; border-radius: 8px" style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入活动名称" placeholder="请输入证书名称"
maxlength="20" maxlength="20"
/> />
</div> </div>
</div> </div>
<div class="main_item"> <!-- <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
@@ -50,107 +49,215 @@
<span style="margin-right: 3px">证书</span> <span style="margin-right: 3px">证书</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<button class="xkbtn11" @click="CreateCertificate" style="margin-top: 0px;"> <button
创建证书 class="xkbtn11"
</button> @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> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px;font-size: 16px;color: #333;">设置获得条件</span> <span
</div> style="
<div class="btnbox"> margin-right: 3px;
font-size: 16px;
color: #333;
font-size: 14px;
"
>设置获得条件</span
>
</div> </div>
<div class="btnbox"></div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox" style="width:30px;"> <div class="signbox" style="width: 30px">
<span style="margin-right: 3px;font-size: 16px;color: #333;"></span> <span
style="margin-right: 3px; font-size: 16px; color: #333"
></span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-radio-group v-model:value="radioV1"> <a-radio-group
<a-radio v-model:checked="checked" :value="1" @click="cloradio1"> v-model:value="condition"
完成项目 @change="selectCondition"
>
<a-radio v-model:checked="checked" :value="1">
完成项目
</a-radio> </a-radio>
<br/> <br />
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;"> <div
<a-radio-group v-model:value="large" size="small"> style="
<a-radio-button value="1">全部任务</a-radio-button> height: 60px;
<a-radio-button value="2">完成必修任务</a-radio-button> margin-left: 24px;
</a-radio-group> 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> </div>
<a-radio v-model:checked="checked" :value="2" @click="cloradio1"> <a-radio v-model:checked="checked" :value="2">
完成阶段 完成阶段
</a-radio> </a-radio>
<br/> <br />
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;"> <div
<a-select style="
ref="select" height: 60px;
size="small" margin-left: 24px;
placeholder="请选择阶段" display: flex;
v-model:value="value1" align-items: center;
style="width: 120px" "
@focus="focus" >
@change="handleChange" <a-select
> ref="select"
<a-select-option value="jack">第一阶段</a-select-option> size="small"
<a-select-option value="lucy">第二阶段</a-select-option> placeholder="请选择阶段"
<a-select-option value="Yiminghe">第三阶段</a-select-option> v-model:value="value1"
</a-select> 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> </div>
<a-radio v-model:checked="checked" :value="3" @click="cloradio1"> <a-radio v-model:checked="checked" :value="3">
完成任务 完成任务
</a-radio> </a-radio>
<br/> <br />
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;"> <div
<a-select style="
ref="select" height: 60px;
size="small" margin-left: 24px;
placeholder="请选择任务" display: flex;
v-model:value="value1" align-items: center;
style="width: 120px" "
@focus="focus" >
@change="handleChange" <a-select
> ref="select"
<a-select-option value="jack">任务一</a-select-option> size="small"
<a-select-option value="lucy">任务二</a-select-option> placeholder="请选择任务"
<a-select-option value="Yiminghe">任务三</a-select-option> v-model:value="value1"
</a-select> 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> </div>
<a-radio v-model:checked="checked" :value="4" @click="cloradio1"> <a-radio v-model:checked="checked" :value="4">
考试合格 考试合格
</a-radio> </a-radio>
<br/> <br />
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;"> <div
<a-select style="
ref="select" height: 60px;
size="small" margin-left: 24px;
placeholder="请选择考试" display: flex;
v-model:value="value1" align-items: center;
style="width: 120px" "
@focus="focus" >
@change="handleChange" <a-select
> ref="select"
<a-select-option value="jack">考试一</a-select-option> size="small"
<a-select-option value="lucy">考试二</a-select-option> placeholder="请选择考试"
<a-select-option value="Yiminghe">考试三</a-select-option> v-model:value="value1"
</a-select> 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> </div>
<a-radio v-model:checked="checked" :value="5" @click="cloradio1"> <a-radio v-model:checked="checked" :value="5">
获得积分 获得积分
</a-radio> </a-radio>
<br/> <br />
<div style="height:60px;margin-left: 24px;display: flex;align-items: center;"> <div
<a-button style="border:0px solid red;box-shadow: none;">高于</a-button> style="
<a-input-number id="inputNumber" v-model:value="value" :min="1" :max="100" style="width:70px;" /> height: 60px;
<a-button style="border:0px solid red;box-shadow: none;">分可获得当前项目积分为 10 </a-button> 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> </div>
<a-radio v-model:checked="checked" :value="6" @click="cloradio1"> <!-- <a-radio v-model:checked="checked" :value="6" >
完成作业 完成作业
</a-radio> </a-radio>
<br/> <br/>
@@ -159,7 +266,7 @@
<a-input-number id="inputNumber" v-model:value="value" :min="1" :max="100" style="width:70px;" /> <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> <a-button style="border:0px solid red;box-shadow: none;">分可获得证书</a-button>
</div> </div>
<a-radio v-model:checked="checked" :value="7" @click="cloradio1"> <a-radio v-model:checked="checked" :value="7" >
优秀小组长 优秀小组长
</a-radio> </a-radio>
<br/> <br/>
@@ -168,54 +275,43 @@
<a-input-number id="inputNumber" v-model:value="value" :min="1" :max="100" style="width:70px;" /> <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> <a-button style="border:0px solid red;box-shadow: none;">分小组长可获得证书</a-button>
</div> </div>
<a-radio v-model:checked="checked" :value="8" @click="cloradio1"> <a-radio v-model:checked="checked" :value="8" >
考勤按时签到可获得证书 考勤按时签到可获得证书
</a-radio> </a-radio> -->
<br/> <br />
<div style="height:40px;"></div> <div style="height: 40px"></div>
</a-radio-group> </a-radio-group>
</div> </div>
</div> </div>
<div class="main_item" style="height: 40px"> <!-- <div class="main_item" style="height: 40px">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px"></span> <span style="margin-right: 3px"></span>
</div> </div>
<div class="btnbox"></div> <div class="btnbox"></div>
</div> </div> -->
</div> </div>
</div> </div>
<div class="main_btns"> <div class="main_btns">
<button class="btn1" @click="closeDrawer1">取消</button> <button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="updateActivityInfo">确定</button> <button class="btn2" @click="updateActivityInfo">确定</button>
</div> </div>
</div> </div>
</a-drawer> </a-drawer>
<!-- 创建证书抽屉 --> <!-- 创建证书抽屉 -->
<CreateCertificate <CreateCertificate v-model:CCertificate="CCertificate" />
v-model:CCertificate="CCertificate"
/>
</template> </template>
<script> <script>
import { reactive, toRefs } from "vue"; import { reactive, toRefs } from "vue";
import * as api from "../../../api/indexActivity"; import CreateCertificate from "../../../components/drawers/project/CreateCertificate";
import * as apiTask from "../../../api/indexTaskadd";
import { RouterEditTask } from "@/api/indexTask";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import dayjs from "dayjs";
import CreateCertificate from "../../../components/drawers/project/CreateCertificate";
export default { export default {
name: "AddActive", name: "AddCertificate",
components: { components: {
CreateCertificate CreateCertificate,
}, },
props: { props: {
ACertificate: { projectId: {
type: Boolean,
default: false,
},
EditActiveId: {
type: Number, type: Number,
default: null, default: null,
}, },
@@ -224,311 +320,68 @@ export default {
type: Boolean, type: Boolean,
default: null, default: null,
}, },
projectId: { ACertificate: {
type: Number, type: Boolean,
default: null, default: false,
},
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,
}, },
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
inputV1: "", certificateName: "", //证书名称
inputV2: "", imageUrl: null, //证书封面
inputV3: "", imageName: null,
inputV4: "", certificateRemark: "", //证书说明
inputV5: "", condition: "", //选择条件
inputV6: "",
textV1: "",
textV2: "",
radioV1: "",
time: "",
isClick: false,
CCertificate: false, CCertificate: false,
}); });
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:ACertificate", false); ctx.emit("update:ACertificate", false);
ctx.emit("update:edit", false); ctx.emit("update:edit", false);
state.radioV1 = ""; state.certificateName = "";
state.inputV1 = ""; state.certificateRemark = "";
state.inputV2 = ""; state.imageUrl = "";
state.inputV3 = ""; state.imageName = null;
state.inputV4 = ""; state.condition = "";
state.inputV5 = ""; state.CCertificate = false;
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(() => {});
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
if (bool && props.edit) { if (bool && props.edit) {
queryActive(); console.log("是编辑");
} }
}; };
const cloradio1 = (value) => { //选择的获得条件
if (value != "") { const selectCondition = (e) => {
state.radioV1 = ""; console.log("e.target.value;", e.target.value);
}
};
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],
};
}; };
// 创建证书 // 创建证书
function CreateCertificate() { 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 { return {
...toRefs(state), ...toRefs(state),
afterVisibleChange, afterVisibleChange,
closeDrawer, closeDrawer,
closeDrawer1, selectCondition,
cloradio1, handleChange,
updateActivityInfo, CreateCertificate,
disabledDateTime,
disabledDate,
CreateCertificate
}; };
}, },
}; };
@@ -584,7 +437,7 @@ export default {
} }
.main_left { .main_left {
margin-top: 32px; // margin-top: 32px;
padding-right: 30px; padding-right: 30px;
flex: 1; flex: 1;
border-right: 1px solid #e8e8e8; border-right: 1px solid #e8e8e8;

View File

@@ -2,7 +2,7 @@
<a-drawer <a-drawer
:visible="CCertificate" :visible="CCertificate"
class="drawerStyle CreateCertificate" class="drawerStyle CreateCertificate"
width="35%" width="800px"
placement="right" placement="right"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
@@ -40,14 +40,15 @@
<div class="btnbox"> <div class="btnbox">
<a-input <a-input
v-model:value="inputV1" v-model:value="inputV1"
style="width: 400px; height: 40px; border-radius: 8px;" style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入证书名称" placeholder="请输入证书名称"
show-count :maxlength="20" show-count
:maxlength="20"
/> />
</div> </div>
</div> </div>
<div class="main_item" style="align-items:flex-start;"> <div class="main_item" style="align-items: flex-start">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
@@ -57,26 +58,31 @@
</div> </div>
<span style="margin-right: 3px">证书封面</span> <span style="margin-right: 3px">证书封面</span>
</div> </div>
<div class="btnbox" style="flex-direction:column;align-items:flex-start;"> <div
class="btnbox"
style="flex-direction: column; align-items: flex-start"
>
<a-upload <a-upload
v-model:file-list="fileList" v-model:file-list="fileList"
name="avatar" name="avatar"
style="width:200px;" style="width: 200px"
list-type="picture-card" list-type="picture-card"
class="avatar-uploader" class="avatar-uploader"
:show-upload-list="false" :show-upload-list="false"
action="https://www.mocky.io/v2/5cc8019d300000980a055e76" action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
:before-upload="beforeUpload" :before-upload="beforeUpload"
@change="handleChange" @change="handleChange"
> >
<img v-if="imageUrl" :src="imageUrl" alt="avatar" /> <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
<div v-else> <div v-else>
<loading-outlined v-if="loading"></loading-outlined> <loading-outlined v-if="loading"></loading-outlined>
<plus-outlined v-else></plus-outlined> <plus-outlined v-else></plus-outlined>
<div class="ant-upload-text">+</div> <div class="ant-upload-text">+</div>
</div> </div>
</a-upload> </a-upload>
<div style="font-size:14px;color:#666;">建议尺寸750*348 格式支持jpggifpngjpegsvgbmp</div> <div style="font-size: 14px; color: #666">
建议尺寸750*348 格式支持jpggifpngjpegsvgbmp
</div>
</div> </div>
</div> </div>
@@ -84,13 +90,14 @@
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">证书说明</span> <span style="margin-right: 3px">证书说明</span>
</div> </div>
<div class="textarea" style="width:400px;"> <div class="textarea" style="width: 400px">
<a-textarea <a-textarea
v-model:value="textV1" v-model:value="textV1"
placeholder="请输入证书说明" placeholder="请输入证书说明"
allow-clear allow-clear
:rows="6" :rows="6"
show-count :maxlength="200" show-count
:maxlength="200"
/> />
</div> </div>
</div> </div>
@@ -158,7 +165,7 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
projectTemplateId:{ projectTemplateId: {
type: Number, type: Number,
default: null, default: null,
}, },
@@ -169,7 +176,7 @@ export default {
inputV2: "", inputV2: "",
textV1: "", textV1: "",
title: null, title: null,
isClick: false isClick: false,
}); });
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:CCertificate", false); ctx.emit("update:CCertificate", false);
@@ -197,7 +204,7 @@ export default {
}; };
const updateTask = async (res) => { const updateTask = async (res) => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
if(!props.isactive){ if (!props.isactive) {
message.destroy(); message.destroy();
return message.warning("请先选中关卡"); return message.warning("请先选中关卡");
} }
@@ -216,7 +223,7 @@ export default {
state.addLoading = false; state.addLoading = false;
}) })
.catch(() => { .catch(() => {
// message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); // message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
}); });
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
apiTask apiTask
@@ -229,7 +236,7 @@ export default {
type: 7, type: 7,
}) })
.then(() => { .then(() => {
// message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); // message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
@@ -237,11 +244,10 @@ export default {
//message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
addTempTask({ addTempTask({
courseId: res.data.data.linkId, courseId: res.data.data.linkId,
name: res.data.data.linkName, name: res.data.data.linkName,
projectTemplateId:props.projectTemplateId, projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 7, type: 7,
@@ -259,9 +265,9 @@ export default {
//创建外链 //创建外链
const updateRef = () => { const updateRef = () => {
let c = 1111; let c = 1111;
if(c>0){ if (c > 0) {
closeDrawer(); closeDrawer();
return return;
} }
if (!state.inputV1) return message.warning("请输入外链名称"); if (!state.inputV1) return message.warning("请输入外链名称");
if (!state.inputV2) { if (!state.inputV2) {
@@ -274,11 +280,11 @@ export default {
} }
} }
if(state.isClick){ if (state.isClick) {
message.destroy(); message.destroy();
message.error('请勿频繁点击') message.error("请勿频繁点击");
return return;
} }
state.isClick = true; state.isClick = true;
let obj = { let obj = {

View File

@@ -423,7 +423,7 @@
批量面授报名 批量面授报名
</button> --> </button> -->
<router-link <router-link
v-if="checkPer(permissions)" v-if="checkPer(permissions)"
:to="{ path: `/taskadd`, query: { projectId: projectId } }" :to="{ path: `/taskadd`, query: { projectId: projectId } }"
> >
<button class="edit"> <button class="edit">
@@ -840,7 +840,10 @@
<div class="split"></div> <div class="split"></div>
<a-tabs v-model:activeKey="activeKeyNotice"> <a-tabs v-model:activeKey="activeKeyNotice">
<a-tab-pane key="11" tab="公告"> <a-tab-pane key="11" tab="公告">
<NoticePub :permissions="permissions" v-model:projectId="projectId"></NoticePub> <NoticePub
:permissions="permissions"
v-model:projectId="projectId"
></NoticePub>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="12" tab="历史公告" force-render> <a-tab-pane key="12" tab="历史公告" force-render>
<NoticeHis <NoticeHis
@@ -851,7 +854,10 @@
</a-tabs> </a-tabs>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="5" tab="项目积分"> <a-tab-pane key="5" tab="项目积分">
<ProjectScore :permissions="permissions" :projectId="projectId"></ProjectScore> <ProjectScore
:permissions="permissions"
:projectId="projectId"
></ProjectScore>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="6" tab="排行榜"> <a-tab-pane key="6" tab="排行榜">
<div class="split"></div> <div class="split"></div>
@@ -1098,7 +1104,11 @@
<div class="img"></div> <div class="img"></div>
<div class="ed">编辑</div> <div class="ed">编辑</div>
</div> --> </div> -->
<div class="edit" v-if="status != 3 && checkPer(permissions)" @click="toEdit"> <div
class="edit"
v-if="status != 3 && checkPer(permissions)"
@click="toEdit"
>
<div class="img"></div> <div class="img"></div>
<div class="ed">编辑</div> <div class="ed">编辑</div>
</div> </div>
@@ -1431,7 +1441,10 @@
/> />
<!-- 添加证书抽屉 --> <!-- 添加证书抽屉 -->
<AddCertificate v-model:ACertificate="ACertificate" /> <AddCertificate
v-model:ACertificate="ACertificate"
v-model:projectId="projectId"
/>
<!-- 创建证书抽屉 --> <!-- 创建证书抽屉 -->
<CreateCertificate v-model:CCertificate="CCertificate" /> <CreateCertificate v-model:CCertificate="CCertificate" />
@@ -2108,7 +2121,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
import TableStudent from "@/components/student/TableStudent"; import TableStudent from "@/components/student/TableStudent";
import { getStuPage } from "@/api/index1"; import { getStuPage } from "@/api/index1";
import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue"; import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
import {checkPer} from "@/utils/utils"; import { checkPer } from "@/utils/utils";
export default { export default {
name: "taskPage", name: "taskPage",
@@ -2147,7 +2160,7 @@ export default {
const store = useStore(); const store = useStore();
const route = useRoute(); const route = useRoute();
const state = reactive({ const state = reactive({
permissions:'', permissions: "",
screenHeight: document.body.clientHeight, screenHeight: document.body.clientHeight,
screenWidth: document.body.clientWidth, screenWidth: document.body.clientWidth,
editRecord: {}, editRecord: {},
@@ -4544,6 +4557,7 @@ export default {
/* 证书 */ /* 证书 */
} }
function addCertificate() { function addCertificate() {
console.log("点击添加证书");
state.ACertificate = true; state.ACertificate = true;
} }