Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-03-10 17:53:23 +08:00
4 changed files with 169 additions and 81 deletions

View File

@@ -181,12 +181,12 @@ const rulesRef = ref({
message: '请输入活动结束时间', message: '请输入活动结束时间',
}, },
], ],
activityDuration: [ // activityDuration: [
{ // {
required: true, // required: true,
message: '请输入活动时长', // message: '请输入活动时长',
}, // },
], // ],
activityAddress: [ activityAddress: [
{ {
required: true, required: true,

View File

@@ -296,12 +296,12 @@ const rulesRef = ref({
message: "请输入直播公告", message: "请输入直播公告",
}, },
], ],
liveDuration: [ // liveDuration: [
{ // {
required: true, // required: true,
message: "请输入直播时长", // message: "请输入直播时长",
}, // },
], // ],
liveTeacherId: [ liveTeacherId: [
{ {
required: true, required: true,

View File

@@ -19,7 +19,7 @@
<div v-if="action == 1" class="line"></div> <div v-if="action == 1" class="line"></div>
<div <div
class="pubIcon" class="pubIcon"
v-if="(action == 1 || action == 0) && checkPer(permissions,createId)" v-if="(action == 1 || action == 0) && checkPer(permissions, createId)"
@click="pubIcon(action)" @click="pubIcon(action)"
> >
<img class="img2" src="../../assets/images/leveladd/pub.png" /> <img class="img2" src="../../assets/images/leveladd/pub.png" />
@@ -53,7 +53,7 @@
<div class="onerow"> <div class="onerow">
<div class="taskmain">快速创建路径图详情</div> <div class="taskmain">快速创建路径图详情</div>
</div> </div>
<div class="second" v-if="checkPer(permissions,createId)"> <div class="second" v-if="checkPer(permissions, createId)">
<div @click="totask"> <div @click="totask">
<div <div
class="taskbox" class="taskbox"
@@ -331,7 +331,7 @@
<router-link <router-link
:to="{ path: '/leveladddetail', query: { routerId: routerId } }" :to="{ path: '/leveladddetail', query: { routerId: routerId } }"
class="editright" class="editright"
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
> >
<img <img
class="editimg" class="editimg"
@@ -578,7 +578,7 @@
<a-button <a-button
type="link" type="link"
@click="setLevels(record)" @click="setLevels(record)"
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
>调整</a-button >调整</a-button
> >
</template> </template>
@@ -601,7 +601,7 @@
class="oneedi" class="oneedi"
@click="showbtn" @click="showbtn"
v-show="twobtn" v-show="twobtn"
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
> >
编辑 编辑
</div> </div>
@@ -692,7 +692,11 @@
</div> </div>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="共享文档" v-if="checkPer(permissions,createId)"> <a-tab-pane
key="2"
tab="共享文档"
v-if="checkPer(permissions, createId)"
>
<div class="sametab"> <div class="sametab">
<div class="Gcon"> <div class="Gcon">
<div class="pad"></div> <div class="pad"></div>
@@ -907,7 +911,7 @@
<div class="btn"> <div class="btn">
<button <button
class="sameb btn2" class="sameb btn2"
style="cursor: pointer;margin-right: 32px;" style="cursor: pointer; margin-right: 32px"
@click="closeChangeModal" @click="closeChangeModal"
> >
取消 取消
@@ -952,7 +956,7 @@
<span>请确认是否批量删除学员</span> <span>请确认是否批量删除学员</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" style="margin-right:32px;"> <div class="del_btn btn2" style="margin-right: 32px">
<div class="btnText" @click="delete_exit">取消</div> <div class="btnText" @click="delete_exit">取消</div>
</div> </div>
<div class="del_btn btn2"> <div class="del_btn btn2">
@@ -1088,22 +1092,28 @@
<time-manage <time-manage
:permissions="permissions" :permissions="permissions"
:createId="createId" :createId="createId"
v-model:Tvisible="visible" :title="showTimeText" /> v-model:Tvisible="visible"
:title="showTimeText"
/>
<!-- 考试管理抽屉 --> <!-- 考试管理抽屉 -->
<test-manage <test-manage
:permissions="permissions" :permissions="permissions"
:createId="createId" :createId="createId"
v-model:TMvisible="TMvisible" :title="showTestText" /> v-model:TMvisible="TMvisible"
:title="showTestText"
/>
<!-- 面授管理抽屉 --> <!-- 面授管理抽屉 -->
<face-manage <face-manage
:permissions="permissions" :permissions="permissions"
:createId="createId" :createId="createId"
v-model:Fvisible="FaceVisivle" /> v-model:Fvisible="FaceVisivle"
/>
<!-- 作业管理抽屉 --> <!-- 作业管理抽屉 -->
<work-manage <work-manage
:permissions="permissions" :permissions="permissions"
:createId="createId" :createId="createId"
v-model:Wvisible="Wvisible" /> v-model:Wvisible="Wvisible"
/>
</div> </div>
<!-- 加载动画 --> <!-- 加载动画 -->
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }"> <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
@@ -1177,7 +1187,9 @@
> >
</div> --> </div> -->
<div class="pubtn"> <div class="pubtn">
<a-button class="pubtn2" @click="closePub" style="margin-right:32px;">取消</a-button> <a-button class="pubtn2" @click="closePub" style="margin-right: 32px"
>取消</a-button
>
<a-button class="pubtn2" @click="releaseLearnPath">发布</a-button> <a-button class="pubtn2" @click="releaseLearnPath">发布</a-button>
</div> </div>
</div> </div>
@@ -1207,7 +1219,11 @@
<div class="back">(路径撤回后学员进度保留,发布后可继续学习)</div> <div class="back">(路径撤回后学员进度保留,发布后可继续学习)</div>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeBackModal" style="margin-right:32px;"> <div
class="del_btn btn2"
@click="closeBackModal"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="recallPath"> <div class="del_btn btn2" @click="recallPath">
@@ -1237,7 +1253,11 @@
<span>您确定要复制此路径吗</span> <span>您确定要复制此路径吗</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeCopy" style="margin-right:32px;"> <div
class="del_btn btn2"
@click="closeCopy"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="sureCopy"> <div class="del_btn btn2" @click="sureCopy">
@@ -1271,7 +1291,11 @@
</div> </div>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeStopModal" style="margin-right:32px;"> <div
class="del_btn btn2"
@click="closeStopModal"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="stopLearnPath"> <div class="del_btn btn2" @click="stopLearnPath">
@@ -1456,7 +1480,7 @@ export default {
const stuRef = ref(); const stuRef = ref();
// const store = useStore(); // const store = useStore();
const state = reactive({ const state = reactive({
createId:null, createId: null,
permissions: "", permissions: "",
hasTask: false, hasTask: false,
stage: [], stage: [],
@@ -1662,10 +1686,11 @@ export default {
locationHref: locationHref:
location.href.indexOf("http://") !== -1 location.href.indexOf("http://") !== -1
? "http://43.143.139.204:12016/" ? "http://43.143.139.204:12016/"
: location.href.slice(0, location.href.indexOf("/m")) + process.env.VUE_APP_FILE_PATH, : location.href.slice(0, location.href.indexOf("/m")) +
process.env.VUE_APP_FILE_PATH,
isreload: true, isreload: true,
TaskFaceImpStuvisible: false, TaskFaceImpStuvisible: false,
uploadAction: process.env.VUE_APP_BASE_API + '/file/uploadunlimit' uploadAction: process.env.VUE_APP_BASE_API + "/file/uploadunlimit",
}); });
const levelList = reactive({ const levelList = reactive({
@@ -2746,8 +2771,8 @@ export default {
// 评估 停用 // 评估 停用
if (item.type == 11) { if (item.type == 11) {
if (item.taskStatus == 1 || item.taskStatus == 2) // if (item.taskStatus == 1 || item.taskStatus == 2)
return message.error("该任务无法学习,请联系管理员进行替换。"); // return message.error("该任务无法学习,请联系管理员进行替换。");
console.log("item", item); console.log("item", item);
codeUrl = codeUrl =
window.location.protocol + window.location.protocol +
@@ -2823,10 +2848,10 @@ export default {
const downloadFile = (url) => { const downloadFile = (url) => {
console.log(url); console.log(url);
window.open( window.open(
window.location.protocol + window.location.protocol +
process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_FILE_PATH +
url url
); );
// if(url){ // if(url){
// const filename = '操作指南' // const filename = '操作指南'

View File

@@ -23,25 +23,27 @@
<div class="line" v-if="action == 3"></div> <div class="line" v-if="action == 3"></div>
<!-- 显示发布图标 --> <!-- 显示发布图标 -->
<img <img
v-if="action == 2 && checkPer(permissions,createId)" v-if="action == 2 && checkPer(permissions, createId)"
class="img2" class="img2"
src="../../assets/images/leveladd/pub.png" src="../../assets/images/leveladd/pub.png"
/> />
<!-- 显示撤回发布图标 --> <!-- 显示撤回发布图标 -->
<img <img
v-if="action == 3 && checkPer(permissions,createId)" v-if="action == 3 && checkPer(permissions, createId)"
class="img2" class="img2"
src="../../assets/images/project/finish.png" src="../../assets/images/project/finish.png"
/> />
<!-- 显示审核图标 --> <!-- 显示审核图标 -->
<img <img
v-if="(action == 0 || action == -2) && checkPer(permissions,createId)" v-if="
(action == 0 || action == -2) && checkPer(permissions, createId)
"
class="img2" class="img2"
src="../../assets/images/project/reviewsubmit.png" src="../../assets/images/project/reviewsubmit.png"
/> />
<!-- 显示撤回审核图标 --> <!-- 显示撤回审核图标 -->
<img <img
v-if="action == 1 && checkPer(permissions,createId)" v-if="action == 1 && checkPer(permissions, createId)"
class="img2" class="img2"
src="../../assets/images/project/reviewrecall.png" src="../../assets/images/project/reviewrecall.png"
/> />
@@ -50,7 +52,9 @@
<div <div
class="pub" class="pub"
style="width: 56px; color: #a497ff" style="width: 56px; color: #a497ff"
v-if="(action == 0 || action == -2) && checkPer(permissions,createId)" v-if="
(action == 0 || action == -2) && checkPer(permissions, createId)
"
@click="submitExamine" @click="submitExamine"
> >
{{ act }} {{ act }}
@@ -59,7 +63,7 @@
<div <div
class="pub" class="pub"
style="width: 56px; color: #a497ff" style="width: 56px; color: #a497ff"
v-if="action == 1 && checkPer(permissions,createId)" v-if="action == 1 && checkPer(permissions, createId)"
@click="showRecallReviewModal" @click="showRecallReviewModal"
> >
{{ act }} {{ act }}
@@ -68,7 +72,7 @@
<div <div
class="pub" class="pub"
style="width: 28px" style="width: 28px"
v-if="action == 2 && checkPer(permissions,createId)" v-if="action == 2 && checkPer(permissions, createId)"
@click="showProjectPub" @click="showProjectPub"
> >
{{ act }} {{ act }}
@@ -77,7 +81,7 @@
<div <div
class="pub" class="pub"
style="width: 56px; color: #57c887" style="width: 56px; color: #57c887"
v-if="action == 3 && checkPer(permissions,createId)" v-if="action == 3 && checkPer(permissions, createId)"
@click="showBackModal" @click="showBackModal"
> >
{{ act }} {{ act }}
@@ -103,7 +107,11 @@
<div class="back"></div> <div class="back"></div>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeReviewModal" style="margin-right: 32px;"> <div
class="del_btn btn2"
@click="closeReviewModal"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="submitReviewProject"> <div class="del_btn btn2" @click="submitReviewProject">
@@ -185,7 +193,7 @@
<div class="onerow"> <div class="onerow">
<div class="taskmain">快速创建项目详情</div> <div class="taskmain">快速创建项目详情</div>
</div> </div>
<div v-if="checkPer(permissions,createId)" class="second"> <div v-if="checkPer(permissions, createId)" class="second">
<!-- @click="totask" --> <!-- @click="totask" -->
<div <div
class="taskbox" class="taskbox"
@@ -460,7 +468,7 @@
<button class="btn">批量面授报名</button> <button class="btn">批量面授报名</button>
</ImpoterGroupLeader> --> </ImpoterGroupLeader> -->
<router-link <router-link
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
:to="{ path: `/taskadd`, query: { projectId: projectId } }" :to="{ path: `/taskadd`, query: { projectId: projectId } }"
> >
<button class="edit"> <button class="edit">
@@ -621,7 +629,7 @@
class="operation" class="operation"
style="cursor: pointer" style="cursor: pointer"
@click="showAA(item.type, item.name, item)" @click="showAA(item.type, item.name, item)"
v-if="(item.type == 6 || item.type == 9)" v-if="item.type == 6 || item.type == 9"
> >
考勤 考勤
</div> </div>
@@ -709,7 +717,7 @@
</router-link> </router-link>
<!-- 无数据创建任务 --> <!-- 无数据创建任务 -->
</div> </div>
<div v-else-if="checkPer(permissions,createId)"> <div v-else-if="checkPer(permissions, createId)">
<div <div
class="taskbox" class="taskbox"
@click=" @click="
@@ -761,13 +769,13 @@
</a-button> </a-button>
<a-button <a-button
@click="settingTopFlag(record)" @click="settingTopFlag(record)"
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
type="link" type="link"
>{{ record.topFlag ? "取消优秀" : "优秀学员" }} >{{ record.topFlag ? "取消优秀" : "优秀学员" }}
</a-button> </a-button>
<a-button <a-button
type="link" type="link"
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
:disabled="record.isLeader === '1'" :disabled="record.isLeader === '1'"
@click="showChangeGroupModal(record)" @click="showChangeGroupModal(record)"
>换组 >换组
@@ -795,7 +803,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="second2" v-if="checkPer(permissions,createId)"> <div class="second2" v-if="checkPer(permissions, createId)">
<div class="btn1" @click="showModal2()"> <div class="btn1" @click="showModal2()">
<img src="../../assets/images/courseManage/add0.png" /> <img src="../../assets/images/courseManage/add0.png" />
<span class="btn1text">创建小组</span> <span class="btn1text">创建小组</span>
@@ -826,13 +834,18 @@
> >
<div style="width: 90%"> <div style="width: 90%">
<div class="grouptitle"> <div class="grouptitle">
<div class="goodgruop" :title="item.groupName" >{{ item.groupName }}</div> <div class="goodgruop" :title="item.groupName">
{{ item.groupName }}
</div>
<div class="more"> <div class="more">
<span <span
style="color: rgba(0, 0, 0, 0.45); cursor: pointer" style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
>. . .</span >. . .</span
> >
<div class="moreItems" v-if="checkPer(permissions,createId)"> <div
class="moreItems"
v-if="checkPer(permissions, createId)"
>
<div class="sammo" @click="showModal2(item, true)"> <div class="sammo" @click="showModal2(item, true)">
编辑 编辑
</div> </div>
@@ -1072,7 +1085,7 @@
<div <div
class="addcertificate1" class="addcertificate1"
@click="addCertificate" @click="addCertificate"
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
> >
<div class="addcertext">+添加证书</div> <div class="addcertext">+添加证书</div>
</div> </div>
@@ -1124,7 +1137,7 @@
查看 查看
</div> </div>
<div <div
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
class="certificateMore2" class="certificateMore2"
style="line-height: 22px; cursor: pointer" style="line-height: 22px; cursor: pointer"
@click="editCertificate(item)" @click="editCertificate(item)"
@@ -1132,7 +1145,7 @@
编辑 编辑
</div> </div>
<div <div
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
class="certificateMore3" class="certificateMore3"
style="line-height: 22px; cursor: pointer" style="line-height: 22px; cursor: pointer"
@click="deleteCertificate(item)" @click="deleteCertificate(item)"
@@ -1185,7 +1198,7 @@
</div> --> </div> -->
<div <div
class="edit" class="edit"
v-if="status != 3 && checkPer(permissions,createId)" v-if="status != 3 && checkPer(permissions, createId)"
@click="toEdit" @click="toEdit"
> >
<div class="img"></div> <div class="img"></div>
@@ -1289,8 +1302,16 @@
<div class="Gin"> <div class="Gin">
<div class="headone"> <div class="headone">
<div class="box"></div> <div class="box"></div>
<div class="onetitle" v-if="checkPer(permissions,createId)">上传共享文档</div> <div
<div class="oneedi" v-if="checkPer(permissions,createId)"> class="onetitle"
v-if="checkPer(permissions, createId)"
>
上传共享文档
</div>
<div
class="oneedi"
v-if="checkPer(permissions, createId)"
>
<a-switch <a-switch
size="small" size="small"
v-model:checked="docChecked" v-model:checked="docChecked"
@@ -1300,7 +1321,9 @@
</div> </div>
<div class="btnbox" style="margin: 20px"> <div class="btnbox" style="margin: 20px">
<a-upload <a-upload
v-if="docChecked == true && checkPer(permissions,createId)" v-if="
docChecked == true && checkPer(permissions, createId)
"
v-model:file-list="fileList" v-model:file-list="fileList"
name="file" name="file"
:action="uploadAction" :action="uploadAction"
@@ -1324,7 +1347,9 @@
/> />
</a-upload> </a-upload>
<div <div
v-if="docChecked == true && checkPer(permissions,createId)" v-if="
docChecked == true && checkPer(permissions, createId)
"
class="btnbox" class="btnbox"
style="margin: 20px" style="margin: 20px"
> >
@@ -1441,7 +1466,7 @@
> >
<a <a
href="javascript:void(0);" href="javascript:void(0);"
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
@click=" @click="
downloadFile( downloadFile(
item.response ? item.response.data : '' item.response ? item.response.data : ''
@@ -1451,7 +1476,7 @@
>下载</a >下载</a
> >
<span <span
v-if="checkPer(permissions,createId)" v-if="checkPer(permissions, createId)"
style="color: #4ea6ff; float: right; cursor: pointer" style="color: #4ea6ff; float: right; cursor: pointer"
@click="deFile(item.uid)" @click="deFile(item.uid)"
>删除</span >删除</span
@@ -1797,8 +1822,15 @@
</div> </div>
</div> </div>
<div class="pubtn"> <div class="pubtn">
<a-button class="pubtn2" @click="closeModal2" style="margin-right:32px;">取消</a-button> <a-button
<a-button class="pubtn2" :loading="buttonLoading" @click="createG">确定</a-button> class="pubtn2"
@click="closeModal2"
style="margin-right: 32px"
>取消</a-button
>
<a-button class="pubtn2" :loading="buttonLoading" @click="createG"
>确定</a-button
>
</div> </div>
</div> </div>
</a-modal> </a-modal>
@@ -1825,7 +1857,11 @@
<span>您是否授予此学员优秀学员称号?</span> <span>您是否授予此学员优秀学员称号?</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="cancelyou" style="margin-right: 32px;"> <div
class="del_btn btn2"
@click="cancelyou"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="closeModal1"> <div class="del_btn btn2" @click="closeModal1">
@@ -1857,7 +1893,11 @@
<span>您是否取消此学员优学员称号?</span> <span>您是否取消此学员优学员称号?</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="cancelcanyou" style="margin-right: 32px;"> <div
class="del_btn btn2"
@click="cancelcanyou"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="closeModal3"> <div class="del_btn btn2" @click="closeModal3">
@@ -1889,7 +1929,11 @@
<span>您确定要删除此学员吗</span> <span>您确定要删除此学员吗</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeDeleteOne" style="margin-right: 32px;"> <div
class="del_btn btn2"
@click="closeDeleteOne"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="closeDeleteOneConfirm"> <div class="del_btn btn2" @click="closeDeleteOneConfirm">
@@ -1923,7 +1967,7 @@
<span>您确定要删除此课程吗</span> <span>您确定要删除此课程吗</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" style="margin-right: 32px;"> <div class="del_btn btn2" style="margin-right: 32px">
<div class="btnText" @click="delete_exit">取消</div> <div class="btnText" @click="delete_exit">取消</div>
</div> </div>
<div class="del_btn btn2"> <div class="del_btn btn2">
@@ -1955,7 +1999,11 @@
<span>您确定批量删除吗?</span> <span>您确定批量删除吗?</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeCancelDelete" style="margin-right: 32px;"> <div
class="del_btn btn2"
@click="closeCancelDelete"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="closeAllDelete"> <div class="del_btn btn2" @click="closeAllDelete">
@@ -2072,7 +2120,11 @@
<div class="back">(项目撤回后学员进度保留,发布后可继续学习)</div> <div class="back">(项目撤回后学员进度保留,发布后可继续学习)</div>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeBackModal" style="margin-right: 32px;"> <div
class="del_btn btn2"
@click="closeBackModal"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="recallProject"> <div class="del_btn btn2" @click="recallProject">
@@ -2103,7 +2155,11 @@
<div class="back"></div> <div class="back"></div>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeRecallReviewModal" style="margin-right: 32px;"> <div
class="del_btn btn2"
@click="closeRecallReviewModal"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="recallReviewProject"> <div class="del_btn btn2" @click="recallReviewProject">
@@ -2136,7 +2192,11 @@
</div> </div>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeStopModal" style="margin-right: 32px;"> <div
class="del_btn btn2"
@click="closeStopModal"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="finishProject"> <div class="del_btn btn2" @click="finishProject">
@@ -2166,7 +2226,11 @@
<span>您确定要存为模版吗</span> <span>您确定要存为模版吗</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="closeStartModal" style="margin-right: 32px;"> <div
class="del_btn btn2"
@click="closeStartModal"
style="margin-right: 32px"
>
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="templateProject"> <div class="del_btn btn2" @click="templateProject">
@@ -2778,7 +2842,7 @@ export default {
ImpoterGroupLeaderV: false, //导入小组长抽屉 ImpoterGroupLeaderV: false, //导入小组长抽屉
certificatelist: [], certificatelist: [],
fileUrl: process.env.VUE_APP_FILE_PATH, fileUrl: process.env.VUE_APP_FILE_PATH,
uploadAction: process.env.VUE_APP_BASE_API + '/file/uploadunlimit' uploadAction: process.env.VUE_APP_BASE_API + "/file/uploadunlimit",
}); });
// 排行榜 - start // 排行榜 - start
// 积分排行榜 Top10 // 积分排行榜 Top10
@@ -3132,7 +3196,7 @@ export default {
}; };
const closeModal2 = () => { const closeModal2 = () => {
state.stugroup = false; state.stugroup = false;
state.buttonLoading = false state.buttonLoading = false;
state.groupInfo = {}; state.groupInfo = {};
state.groupMemberCountContrast = null; state.groupMemberCountContrast = null;
getGroup(); getGroup();
@@ -4660,8 +4724,8 @@ export default {
// 评估 停用 // 评估 停用
if (item.type == 11) { if (item.type == 11) {
if (item.taskStatus == 1 || item.taskStatus == 2) // if (item.taskStatus == 1 || item.taskStatus == 2)
return message.error("该任务无法学习,请联系管理员进行替换。"); // return message.error("该任务无法学习,请联系管理员进行替换。");
codeUrl = codeUrl =
window.location.protocol + window.location.protocol +
@@ -6835,7 +6899,6 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
cursor: pointer; cursor: pointer;
} }
.more { .more {