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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yujicun
2023-03-10 17:48:16 +08:00
parent 9ec9fb1d24 9f23973035
commit 81d0bb7d06
13 changed files with 260 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -35,3 +35,5 @@ VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=
VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id= VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
#h5的基本url #h5的基本url
VUE_APP_H5=//u-pre.boe.com/student-h5 VUE_APP_H5=//u-pre.boe.com/student-h5
#用户头像
VUE_APP_AVATAR_PATH=/upload/

4
.env.prod
View File

@@ -25,4 +25,6 @@ VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id=
#h5的基本url #h5的基本url
VUE_APP_H5=//u.boe.com/student-h5 VUE_APP_H5=//u.boe.com/student-h5
#文件基础路径调试 只在生产做了变更 #文件基础路径调试 只在生产做了变更
VUE_APP_FILE_PATH=/upload/boe/file/ VUE_APP_FILE_PATH=/upload/boe/file/
#用户头像
VUE_APP_AVATAR_PATH=/upload/

4
.env.release
View File

@@ -21,4 +21,6 @@ VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile-release/pages/study/courseStudy?id=
VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc-release/case/detail?id= VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc-release/case/detail?id=
VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile-release/pages/exam/exam?id= VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile-release/pages/exam/exam?id=
#h5的基本url #h5的基本url
VUE_APP_H5=//u.boe.com/student-h5-release VUE_APP_H5=//u.boe.com/student-h5-release
#用户头像
VUE_APP_AVATAR_PATH=/upload/

4
src/App.vue
View File

@@ -33,7 +33,9 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
console.log("版本2.1.1------------");
console.log("版本2.1.2------------");
// 监听关闭浏览器 // 监听关闭浏览器
let time1 = ref(0); let time1 = ref(0);

176
src/components/drawers/AddActive.vue
View File

@@ -2,126 +2,76 @@
<div @click="openDrawer"> <div @click="openDrawer">
<slot></slot> <slot></slot>
</div> </div>
<a-drawer <a-drawer :visible="visible" class="drawerStyle addactiveDrawer" width="800" title="添加活动" placement="right">
:visible="visible"
class="drawerStyle addactiveDrawer"
width="800"
title="添加活动"
placement="right"
>
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}活动</div> <div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}活动</div>
<img <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
style="width: 29px; height: 29px; cursor: pointer" @click="closeDrawer" />
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</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">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">活动名称：</span> <span style="margin-right: 3px">活动名称：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input v-model:value="formData.activityName" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.activityName" placeholder="请输入活动名称" maxlength="20" />
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入活动名称"
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 src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">活动时间：</span> <span style="margin-right: 3px">活动时间：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker :disabled-date="disabledDate" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
:disabled-date="disabledDate" style="width: 400px; height: 40px; border-radius: 8px" v-model:value="dateTime" @change="timeChange"
:placeholder="[' 开始时间', ' 结束时间']" />
:show-time="{ format: 'HH:mm' }"
format="YYYY-MM-DD HH:mm"
style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="dateTime"
@change="timeChange"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</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 src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">活动时长：</span> <span style="margin-right: 3px">活动时长：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input-number <a-input-number :min="0" :max="999999" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
:min="0" v-model:value="formData.activityDuration" />
:max="999999"
:precision="0"
style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.activityDuration"
/>
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</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 src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">活动地点：</span> <span style="margin-right: 3px">活动地点：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input v-model:value="formData.activityAddress" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.activityAddress" placeholder="请输入活动地点" maxlength="100" />
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入活动地点"
maxlength="100"
/>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">活动公告：</span> <span style="margin-right: 3px">活动公告：</span>
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea v-model:value="formData.activityNotice" placeholder="请输入活动公告" allow-clear :rows="6" show-count
v-model:value="formData.activityNotice" :maxlength="200" />
placeholder="请输入活动公告"
allow-clear
:rows="6"
show-count
:maxlength="200"
/>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
@@ -129,14 +79,8 @@
<span style="margin-right: 3px">活动说明：</span> <span style="margin-right: 3px">活动说明：</span>
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea v-model:value="formData.activityExplain" placeholder="请输入活动说明" allow-clear :rows="6" show-count
v-model:value="formData.activityExplain" :maxlength="200" />
placeholder="请输入活动说明"
allow-clear
:rows="6"
show-count
:maxlength="200"
/>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
@@ -152,39 +96,23 @@
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>活动开始前：</span> <span>活动开始前：</span>
<a-input-number <a-input-number :min="0" :max="999999" :precision="0" style="
:min="0" width: 88px;
:max="999999" height: 32px;
:precision="0" border-radius: 8px;
style=" overflow: hidden;
width: 88px; " v-model:value="formData.beforeSignIn" />
height: 32px; <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
border-radius: 8px;
overflow: hidden;
"
v-model:value="formData.beforeSignIn"
/>
<span style="color: #999999; margin-left: 8px"
>分钟允许签到</span
>
</div> </div>
<div class="timerbox"> <div class="timerbox">
<span>活动开始后：</span> <span>活动开始后：</span>
<a-input-number <a-input-number :min="0" :max="999999" :precision="0" style="
:min="0" width: 88px;
:max="999999" height: 32px;
:precision="0" border-radius: 8px;
style=" overflow: hidden;
width: 88px; " v-model:value="formData.afterSignIn" />
height: 32px; <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
border-radius: 8px;
overflow: hidden;
"
v-model:value="formData.afterSignIn"
/>
<span style="color: #999999; margin-left: 8px"
>分钟允许签到</span
>
</div> </div>
</div> </div>
</div> </div>
@@ -205,8 +133,8 @@
</a-drawer> </a-drawer>
</template> </template>
<script setup> <script setup>
import {defineEmits, defineProps, ref} from "vue"; import { defineEmits, defineProps, ref } from "vue";
import {Form, message} from "ant-design-vue"; import { Form, message } from "ant-design-vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
const props = defineProps({ const props = defineProps({
@@ -253,12 +181,12 @@ const rulesRef = ref({
message: '请输入活动结束时间', message: '请输入活动结束时间',
}, },
], ],
activityDuration: [ // activityDuration: [
{ // {
required: true, // required: true,
message: '请输入活动时长', // message: '请输入活动时长',
}, // },
], // ],
activityAddress: [ activityAddress: [
{ {
required: true, required: true,
@@ -267,7 +195,7 @@ const rulesRef = ref({
], ],
}); });
const {resetFields, validate} = Form.useForm(formData, rulesRef); const { resetFields, validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false
@@ -302,31 +230,31 @@ const disabledRangeTime = () => ({
*/ */
async function confirm() { async function confirm() {
// debugger // debugger
await validate().catch(({errorFields}) => { await validate().catch(({ errorFields }) => {
message.warning(errorFields[0].errors.join()); message.warning(errorFields[0].errors.join());
throw Error("数据校验不通过") throw Error("数据校验不通过")
}); });
if (taskIndex.value === -1) { if (taskIndex.value === -1) {
const list = props.taskList const list = props.taskList
list.push({name: formData.value.activityName, type: props.type,duration:dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime,'minutes'), info: {...formData.value}}) list.push({ name: formData.value.activityName, type: props.type, duration: dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime, 'minutes'), info: { ...formData.value } })
} else { } else {
const data = props.taskList[taskIndex.value] const data = props.taskList[taskIndex.value]
data.name = formData.value.activityName data.name = formData.value.activityName
data.info = {...formData.value} data.info = { ...formData.value }
data.duration = dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime,'minutes') data.duration = dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime, 'minutes')
} }
emit('update:taskList', [...props.taskList]) emit('update:taskList', [...props.taskList])
closeDrawer() closeDrawer()
} }
function openDrawer(i, row) { function openDrawer(i, row) {
row && (formData.value = {...row.info}); row && (formData.value = { ...row.info });
row && (dateTime.value = [dayjs(row.info.activityStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.activityEndTime, "YYYY-MM-DD HH:mm")]); row && (dateTime.value = [dayjs(row.info.activityStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.activityEndTime, "YYYY-MM-DD HH:mm")]);
(i >= 0) && (taskIndex.value = i); (i >= 0) && (taskIndex.value = i);
visible.value = true visible.value = true
} }
defineExpose({openDrawer}) defineExpose({ openDrawer })
</script> </script>
<style lang="scss"> <style lang="scss">
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {

43
src/components/drawers/AddLive.vue
View File

@@ -52,7 +52,7 @@
valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="[' 开始时间', ' 结束时间']" /> valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="[' 开始时间', ' 结束时间']" />
</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 src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
@@ -64,7 +64,7 @@
v-model:value="formData.liveDuration"></a-input-number> v-model:value="formData.liveDuration"></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
</div> </div> -->
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
@@ -159,21 +159,21 @@
<div class="timerbox"> <div class="timerbox">
<span>直播开始前：</span> <span>直播开始前：</span>
<a-input-number :min="0" :max="999999" :precision="0" style=" <a-input-number :min="0" :max="999999" :precision="0" style="
width: 88px; width: 88px;
height: 32px; height: 32px;
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
" v-model:value="formData.beforeSignIn"></a-input-number> " v-model:value="formData.beforeSignIn"></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟允许签到</span> <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
</div> </div>
<div class="timerbox"> <div class="timerbox">
<span>直播开始后：</span> <span>直播开始后：</span>
<a-input-number :min="0" :max="999999" :precision="0" style=" <a-input-number :min="0" :max="999999" :precision="0" style="
width: 88px; width: 88px;
height: 32px; height: 32px;
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
" v-model:value="formData.afterSignIn"></a-input-number> " v-model:value="formData.afterSignIn"></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟允许签到</span> <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
</div> </div>
</div> </div>
@@ -296,12 +296,12 @@ const rulesRef = ref({
message: "请输入直播公告", message: "请输入直播公告",
}, },
], ],
liveDuration: [ // liveDuration: [
{ // {
required: true, // required: true,
message: "请输入直播时长", // message: "请输入直播时长",
}, // },
], // ],
liveTeacherId: [ liveTeacherId: [
{ {
required: true, required: true,
@@ -376,7 +376,7 @@ async function confirm() {
} else { } else {
const data = props.taskList[taskIndex.value]; const data = props.taskList[taskIndex.value];
data.name = formData.value.liveName; data.name = formData.value.liveName;
data.info = {...formData.value}; data.info = { ...formData.value };
data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes') data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
console.log(data) console.log(data)
} }
@@ -408,7 +408,7 @@ const beforeUpload = (file) => {
message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!"); message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
return false; return false;
} }
let isLt1M = file.size < 2000000; let isLt1M = file.size < 2000000;
console.log(file.size, isLt1M) console.log(file.size, isLt1M)
if (!isLt1M) { if (!isLt1M) {
@@ -432,9 +432,10 @@ const beforeUpload = (file) => {
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.ant-upload { .ant-upload {
background-color: #fff !important; background-color: #fff !important;
} }
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important; background-color: #fafafa !important;
} }

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

@@ -8,7 +8,7 @@
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">学员获取详情1</div> <div class="headerTitle">学员获取详情</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"

2
src/store/index.js
View File

@@ -62,7 +62,7 @@ export default createStore({
state.memberInitInfo = data; state.memberInitInfo = data;
}, },
SET_USER(state, userInfo) { SET_USER(state, userInfo) {
userInfo.avatar = userInfo.avatar?.includes(process.env.VUE_APP_FILE_PATH) ? userInfo.avatar : (process.env.VUE_APP_FILE_PATH + userInfo.avatar); userInfo.avatar = userInfo.avatar?.includes(process.env.VUE_APP_AVATAR_PATH) ? userInfo.avatar : (process.env.VUE_APP_AVATAR_PATH + userInfo.avatar);
state.userInfo = userInfo; state.userInfo = userInfo;
}, },
SET_projectTemplateId(state, projectTemplateId) { SET_projectTemplateId(state, projectTemplateId) {

8
src/utils/utils.js
View File

@@ -38,13 +38,13 @@ export function checkPer(per,createId) {
if (store?.state?.userInfo?.roleList.some(t => t.code === "system-admin")) { if (store?.state?.userInfo?.roleList.some(t => t.code === "system-admin")) {
return true; return true;
} }
if(per){
return (per + "").split(",").some(t => admin.some(s => s == t));
}
if (store?.state?.userInfo?.isHrbp) { if (store?.state?.userInfo?.isHrbp) {
return true; return true;
} }
if (!per) { return false
return false;
}
return (per + "").split(",").some(t => admin.some(s => s == t));
} }
const adminOwner = [6, 9, 12]; const adminOwner = [6, 9, 12];

75
src/views/learningpath/LevelAdd.vue
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 = '操作指南'

11
src/views/projectcenter/ProjectManage.vue
View File

@@ -1425,6 +1425,17 @@ export default {
}; };
// 获取项目列表信息 // 获取项目列表信息
let tableData = ref([]); let tableData = ref([]);
watch(tableData,()=> tableData.value?.forEach(t=> dealPermission(t)))
function dealPermission(data){
if(!data){
return
}
data.permissions || (data.children?.some(s=>s.permissions || s.children?.some(j=>j.permissions)) && (data.permissions = '4'))
data.children?.forEach(t=>dealPermission(t))
}
const columns = ref([ const columns = ref([
{ {
title: "项目名称", title: "项目名称",

151
src/views/projectcenter/TaskPage.vue
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 {

2
src/views/research/components/ResearchAddPin.vue
View File

@@ -83,7 +83,7 @@
<div class="assesswhole" style="background: #ffffff"> <div class="assesswhole" style="background: #ffffff">
<a-input-number <a-input-number
v-model:value="curItem.pinQuan" v-model:value="curItem.pinQuan"
:min="1" :min="0"
:max="100" :max="100"
/> />
</div> </div>