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

Merge branch 'develop' into manage-release

Browse Source
This commit is contained in:
wyx
2023-03-10 17:03:51 +08:00
parent ad93a9b197 a814c0d2fe
commit f46b538950
10 changed files with 100 additions and 154 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=
#h5的基本url
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
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=
VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile-release/pages/exam/exam?id=
#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/

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

@@ -2,126 +2,76 @@
<div @click="openDrawer">
<slot></slot>
</div>
<a-drawer
:visible="visible"
class="drawerStyle addactiveDrawer"
width="800"
title="添加活动"
placement="right"
>
<a-drawer :visible="visible" class="drawerStyle addactiveDrawer" width="800" title="添加活动" placement="right">
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}活动</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" />
</div>
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">活动名称：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="formData.activityName"
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入活动名称"
maxlength="20"
/>
<a-input v-model:value="formData.activityName" style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入活动名称" maxlength="20" />
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">活动时间：</span>
</div>
<div class="btnbox">
<a-range-picker
:disabled-date="disabledDate"
: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="[' 开始时间', ' 结束时间']"
/>
<a-range-picker :disabled-date="disabledDate" :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 class="main_item">
<!-- <div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">活动时长：</span>
</div>
<div class="btnbox">
<a-input-number
:min="0"
:max="999999"
:precision="0"
style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.activityDuration"
/>
<a-input-number :min="0" :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>
</div>
</div>
</div> -->
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">活动地点：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="formData.activityAddress"
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入活动地点"
maxlength="100"
/>
<a-input v-model:value="formData.activityAddress" style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入活动地点" maxlength="100" />
</div>
</div>
<div class="main_item2">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">活动公告：</span>
</div>
<div class="textarea">
<a-textarea
v-model:value="formData.activityNotice"
placeholder="请输入活动公告"
allow-clear
:rows="6"
show-count
:maxlength="200"
/>
<a-textarea v-model:value="formData.activityNotice" placeholder="请输入活动公告" allow-clear :rows="6" show-count
:maxlength="200" />
</div>
</div>
<div class="main_item2">
@@ -129,14 +79,8 @@
<span style="margin-right: 3px">活动说明：</span>
</div>
<div class="textarea">
<a-textarea
v-model:value="formData.activityExplain"
placeholder="请输入活动说明"
allow-clear
:rows="6"
show-count
:maxlength="200"
/>
<a-textarea v-model:value="formData.activityExplain" placeholder="请输入活动说明" allow-clear :rows="6" show-count
:maxlength="200" />
</div>
</div>
<div class="main_item2">
@@ -152,39 +96,23 @@
<div class="setbox">
<div class="timerbox">
<span>活动开始前：</span>
<a-input-number
:min="0"
:max="999999"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="formData.beforeSignIn"
/>
<span style="color: #999999; margin-left: 8px"
>分钟允许签到</span
>
<a-input-number :min="0" :max="999999" :precision="0" style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
" v-model:value="formData.beforeSignIn" />
<span style="color: #999999; margin-left: 8px">分钟允许签到</span>
</div>
<div class="timerbox">
<span>活动开始后：</span>
<a-input-number
:min="0"
:max="999999"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="formData.afterSignIn"
/>
<span style="color: #999999; margin-left: 8px"
>分钟允许签到</span
>
<a-input-number :min="0" :max="999999" :precision="0" style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
" v-model:value="formData.afterSignIn" />
<span style="color: #999999; margin-left: 8px">分钟允许签到</span>
</div>
</div>
</div>
@@ -205,8 +133,8 @@
</a-drawer>
</template>
<script setup>
import {defineEmits, defineProps, ref} from "vue";
import {Form, message} from "ant-design-vue";
import { defineEmits, defineProps, ref } from "vue";
import { Form, message } from "ant-design-vue";
import dayjs from "dayjs";
const props = defineProps({
@@ -253,12 +181,12 @@ const rulesRef = ref({
message: '请输入活动结束时间',
},
],
activityDuration: [
{
required: true,
message: '请输入活动时长',
},
],
// activityDuration: [
// {
// required: true,
// message: '请输入活动时长',
// },
// ],
activityAddress: [
{
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 = () => {
visible.value = false
@@ -302,31 +230,31 @@ const disabledRangeTime = () => ({
*/
async function confirm() {
// debugger
await validate().catch(({errorFields}) => {
await validate().catch(({ errorFields }) => {
message.warning(errorFields[0].errors.join());
throw Error("数据校验不通过")
});
if (taskIndex.value === -1) {
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 {
const data = props.taskList[taskIndex.value]
data.name = formData.value.activityName
data.info = {...formData.value}
data.duration = dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime,'minutes')
data.info = { ...formData.value }
data.duration = dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime, 'minutes')
}
emit('update:taskList', [...props.taskList])
closeDrawer()
}
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")]);
(i >= 0) && (taskIndex.value = i);
visible.value = true
}
defineExpose({openDrawer})
defineExpose({ openDrawer })
</script>
<style lang="scss">
.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="[' 开始时间', ' 结束时间']" />
</div>
</div>
<div class="main_item">
<!-- <div class="main_item">
<div class="signbox">
<div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
@@ -64,7 +64,7 @@
v-model:value="formData.liveDuration"></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
</div> -->
<div class="main_item">
<div class="signbox">
<div class="sign">
@@ -159,21 +159,21 @@
<div class="timerbox">
<span>直播开始前：</span>
<a-input-number :min="0" :max="999999" :precision="0" style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
" v-model:value="formData.beforeSignIn"></a-input-number>
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
" v-model:value="formData.beforeSignIn"></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟允许签到</span>
</div>
<div class="timerbox">
<span>直播开始后：</span>
<a-input-number :min="0" :max="999999" :precision="0" style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
" v-model:value="formData.afterSignIn"></a-input-number>
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
" v-model:value="formData.afterSignIn"></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟允许签到</span>
</div>
</div>
@@ -296,12 +296,12 @@ const rulesRef = ref({
message: "请输入直播公告",
},
],
liveDuration: [
{
required: true,
message: "请输入直播时长",
},
],
// liveDuration: [
// {
// required: true,
// message: "请输入直播时长",
// },
// ],
liveTeacherId: [
{
required: true,
@@ -376,7 +376,7 @@ async function confirm() {
} else {
const data = props.taskList[taskIndex.value];
data.name = formData.value.liveName;
data.info = {...formData.value};
data.info = { ...formData.value };
data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
console.log(data)
}
@@ -408,7 +408,7 @@ const beforeUpload = (file) => {
message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
return false;
}
let isLt1M = file.size < 2000000;
console.log(file.size, isLt1M)
if (!isLt1M) {
@@ -432,9 +432,10 @@ const beforeUpload = (file) => {
};
</script>
<style lang="scss">
.ant-upload {
.ant-upload {
background-color: #fff !important;
}
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}

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

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

2
src/store/index.js
View File

@@ -62,7 +62,7 @@ export default createStore({
state.memberInitInfo = data;
},
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;
},
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")) {
return true;
}
if(per){
return (per + "").split(",").some(t => admin.some(s => s == t));
}
if (store?.state?.userInfo?.isHrbp) {
return true;
}
if (!per) {
return false;
}
return (per + "").split(",").some(t => admin.some(s => s == t));
return false
}
const adminOwner = [6, 9, 12];

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

@@ -1425,6 +1425,17 @@ export default {
};
// 获取项目列表信息
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([
{
title: "项目名称",

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

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