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

Merge branch 'pre-dev' into 'develop'

Browse Source 
Pre dev

See merge request !43
This commit is contained in:
huangshengfa
2023-02-27 10:16:33 +08:00
parent 48713a1abb d3d9681a62
commit f77ae7df8d
9 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@
</div>
<span style="margin-right: 2px">直播封面：</span>
</div>
<div class="item_inp">
<div class="item_inp" style="background-color: #fff;">
<a-upload name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
:before-upload="beforeUpload">
<img class="i_upload_img" v-if="imageUrl" :src="imageUrl" alt="avatar" />
@@ -325,6 +325,7 @@ const { resetFields, validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => {
formData.value.liveCover = "";
formData.value.livePlaybackLink = "";
imageUrl.value = "";
visible.value = false;
taskIndex.value = -1;
@@ -430,6 +431,9 @@ const beforeUpload = (file) => {
};
</script>
<style lang="scss">
.ant-upload {
background-color: #fff !important;
}
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}

3
src/components/drawers/MemberList.vue
View File

@@ -358,6 +358,7 @@ export default {
};
//把数据放到state里
const getTableDataList = (tableData) => {
debugger
let data = tableData;
let array = [];
data.map((value) => {
@@ -546,7 +547,7 @@ export default {
function exportGroupMember() {
console.log("props.datasource", props);
window.open(
`${process.env.VUE_APP_BASE_API}/admin/studentGroup/exportGroupMember/${props.projectId}/${props.chooseGroupId}`
`${process.env.VUE_APP_BASE_API}/admin/studentGroup/exportGroupMember?pid=${props.projectId}&groupId=${props.chooseGroupId}&stageId=${-1}`
);
}

15
src/views/courselibrary/CoursewareManage.vue
View File

@@ -2147,6 +2147,13 @@ export default defineComponent({
examInfo: {},
tableLoading: false,
columns1: [
{
title: "课程编号",
width: 130,
dataIndex: "offcourseNumber",
key: "offcourseNumber",
align: "center",
},
{
title: "名称",
width: 400,
@@ -2158,13 +2165,7 @@ export default defineComponent({
return text ? text : "-";
},
},
{
title: "课程编号",
width: 130,
dataIndex: "offcourseNumber",
key: "offcourseNumber",
align: "center",
},
{
title: "内容分类",
width: 130,

2
src/views/learningpath/LevelAdd.vue
View File

@@ -713,7 +713,7 @@
v-if="docChecked == true"
v-model:file-list="fileList"
name="file"
action="/manageApi/file/upload"
action="/manageApi/file/uploadunlimit"
@change="handleChange"
>
<span

2
src/views/projectcenter/LibraryAdd.vue
View File

@@ -623,7 +623,7 @@
v-if="attachSwitch == true"
v-model:file-list="fileList"
name="file"
action="/manageApi/file/upload"
action="/manageApi/file/uploadunlimit"
@change="handleChange2"
>
<span

10
src/views/projectcenter/TaskPage.vue
View File

@@ -1084,9 +1084,9 @@
>
<div class="certificatelistMain">
<img
@click="previewPic"
@click="previewPic"
style="cursor: pointer; width: 140px; height: 200px"
:src="fileUrl + item.url"
:src="item.url"
alt=""
srcset=""
/>
@@ -1300,7 +1300,7 @@
v-if="docChecked == true"
v-model:file-list="fileList"
name="file"
action="/manageApi/file/upload"
action="/manageApi/file/uploadunlimit"
@change="handleChange"
>
<span
@@ -2317,8 +2317,8 @@ export default {
},
{
title: "最近学习时间",
dataIndex: "lastStudyTime",
key: "lastStudyTime",
dataIndex: "lastLearnTime",
key: "lastLearnTime",
width: 120,
align: "center",
className: "h",

6
src/views/research/ResearchAdd.vue
View File

@@ -133,7 +133,7 @@ export default {
allFormsData: [],
valueMore: "",
loading:false
loading: false,
});
// 详情
@@ -485,7 +485,7 @@ export default {
if (!checkVal(filterData)) {
return false;
}
state.loading = true
state.loading = true;
if (state.assessmentId) {
resultPost = {
@@ -499,7 +499,7 @@ export default {
"assessmentMinScore",
]);
editResearchMessage(resultPost).then((res) => {
state.loading = false
state.loading = false;
if (res.data.code === 200) {
message.success("编辑成功");
router.push({

16
src/views/research/ResearchManage.vue
View File

@@ -39,7 +39,7 @@
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
<div class="btnn btn2" @click="handleRest" style="width: 103px">
<div class="btnn btn2" @click="handleRest" style="width: 105px">
<div class="search"></div>
<div class="btnText">重置</div>
</div>
@@ -165,14 +165,14 @@
</div>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="handleCancelModal">取消</div>
<div class="del_btn btn1" @click="handleCancelModal">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" v-if="!addLoading" @click="handleSure">
确定
</div>
<div class="btnText" v-else>确定</div>
<div class="del_btn btn2" v-if="!addLoading" @click="handleSure">
<div class="btnText">确定</div>
</div>
<div class="del_btn btn2" v-else>
<div class="btnText">确定</div>
</div>
</div>
</div>

21
src/views/research/components/ResearchAddItem.vue
View File

@@ -28,7 +28,7 @@
<div class="addimg">+添加图片</div>
</a-upload>
<div v-show="curItem.imgVal" class="picture" style="position: relative">
<img class="pictureimg" :src="curItem.imgVal" />
<img class="pictureimg" :src="VUE_APP_FILE_PATH + curItem.imgVal" />
<div class="picturename" v-show="hasImgName">{{ hasImgName }}</div>
<img
style="
@@ -63,11 +63,19 @@ export default {
},
setup(props, { emit }) {
const curItem = ref(props.item);
console.log("选项信息", curItem.value, process.env.VUE_APP_FILE_PATH);
if (curItem.value.imgVal) {
curItem.value.imgVal =
process.env.VUE_APP_FILE_PATH + curItem.value.imgVal;
}
const VUE_APP_FILE_PATH = ref(process.env.VUE_APP_FILE_PATH);
// console.log(
// "选项信息",
// curItem.value,
// curItem.value.imgVal.indexOf(process.env.VUE_APP_FILE_PATH)
// );
// if (
// curItem.value.imgVal &&
// curItem.value.imgVal.indexOf(process.env.VUE_APP_FILE_PATH) == -1
// ) {
// curItem.value.imgVal =
// process.env.VUE_APP_FILE_PATH + curItem.value.imgVal;
// }
const state = reactive({
hasImgName: "",
@@ -121,6 +129,7 @@ export default {
handleDel,
handleCancel,
beforeUpload,
VUE_APP_FILE_PATH,
};
},
};