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 remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2023-01-17 18:46:40 +08:00
parent 106209e649 9235e07a5d
commit a7bdb5f469
9 changed files with 90 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本2.1.2------------");
console.log("版本2.1.3------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});

8
src/components/drawers/NoticeHis.vue
View File

@@ -9,15 +9,15 @@
<div class="noticeContent">
<div v-for="item in notice" :key="item.id" class="item">
<!-- <div class="itemcontent">{{ item.content }}</div> -->
<!-- <a-textarea
<a-textarea
class="itemcontent"
disabled="true"
v-model:value="item.content"
:maxlength="150"
placeholder="公告信息最多输入150个字"
style="margin-top: -10px; height: 120px;background-color: #fff;"
/> -->
<pre style="text-align: left;padding-left: 20px">{{item.content}}</pre>
style="margin-top: -10px; height: 220px;background-color: #fff;border:1px solid #fff;"
/>
<!-- <pre style="text-align: left;padding-left: 20px">{{item.content}}</pre> -->
<div class="itemtime">{{ item.pubtime }}</div>
</div>
</div>

19
src/components/drawers/NoticePub.vue
View File

@@ -17,14 +17,14 @@
<!-- <div class="txt-content">
{{ noticeContent1 ? noticeContent1 : "暂无公告" }}
</div> -->
<!-- <a-textarea
<a-textarea
disabled="true"
v-model:value="noticeContent1"
:maxlength="150"
placeholder="公告信息最多输入150个字"
style="margin-top: -10px; height: 160px; resize: none;background-color: #fff;color:#666;"
/> -->
<pre>{{noticeContent1}}</pre>
style="margin-top: -10px; height: 220px;border:1px solid #fff; resize: none;background-color: #fff;color:#666;"
/>
<!-- <pre>{{noticeContent1}}</pre> -->
<div class="btn-content">
<a-button type="primary" @click="handleEdit">编辑</a-button>
</div>
@@ -34,13 +34,20 @@
<!-- <div class="txt-content">
{{ noticeContent1 ? noticeContent1 : "暂无公告" }}
</div> -->
<pre>{{noticeContent1}}</pre>
<!-- <pre>{{noticeContent1}}</pre> -->
<a-textarea
disabled="true"
v-model:value="noticeContent1"
:maxlength="150"
placeholder="公告信息最多输入150个字"
style="margin-top: -10px; height: 220px;border:1px solid #fff; resize: none;background-color: #fff;color:#666;"
/>
<p>编辑新公告：</p>
<a-textarea
v-model:value="noticeContent"
:maxlength="150"
placeholder="公告信息最多输入150个字"
style="margin-top: -10px; height: 160px; width:340px;"
style="margin-top: -10px; height: 160px;"
/>
<div class="btn-content">
<a-button class="cancel" @click="handleCancel">取消</a-button>

101
src/components/drawers/SelFacet.vue
View File

@@ -120,6 +120,8 @@ import { reactive, toRefs, computed } from "vue";
// import { planList } from "../../api/indexTaskadd";
//import {detail} from "../../api/indexCourse";
import { list } from "../../api/indexTaskadd";
import {useStore} from "vuex";
const columns1 = [
@@ -147,14 +149,14 @@ const columns1 = [
align: "center",
ellipsis: true,
},
{
title: "授课教师",
width: "15%",
dataIndex: "teacher",
key: "teacher",
align: "center",
ellipsis: true,
},
// {
// title: "授课教师",
// width: "15%",
// dataIndex: "teacher",
// key: "teacher",
// align: "center",
// ellipsis: true,
// },
{
title: "创建人",
width: "15%",
@@ -194,6 +196,7 @@ export default {
},
},
setup(props, ctx) {
const store = useStore();
const state = reactive({
classTableData: [
// {
@@ -417,6 +420,17 @@ export default {
});
};
const sysTypeOptions = computed(() => store.state.sysType);
function findClassFullName(list,classify, name = '') {
console.log(list,classify)
return list && list.length && list
.map(e => classify == e.dictCode ? name ? name + '-' + e.dictName : e.dictName : findClassFullName(e.children, classify,name ? name + '-' + e.dictName : e.dictName))
.filter(name => name)
.join('') || ''
}
const getClassData = (tabledata) => {
let data = tabledata;
let array = [];
@@ -429,8 +443,8 @@ export default {
teacher: value.teacher || "-",
creator: value.createName || "-",
time: value.publishTime,
categoryId: value.categoryId,
category: changeTreeSelectValue(String(value.categoryId)),
categoryId: value.sysTypeId,
category: value.sysTypeId,
//需要判断content
};
console.log("obj", obj);
@@ -455,43 +469,48 @@ export default {
// break;
// }
// }
if (!obj.category) {
obj.category = "-";
}
console.log("obj. obj.category22 ", obj.category);
// if (!obj.category) {
// obj.category = "-";
// }
// console.log("obj. obj.category22 ", obj.category);
array.push(obj);
});
array.forEach((itm) => {
itm.category = findClassFullName(sysTypeOptions.value,itm.categoryId) || '-'
});
console.log(array)
state.classTableData = array;
};
// 格式化树型结构选择数据
const changeTreeSelectValue = (values) => {
let data = state.options2222;
console.log(values, data)
let str = ''
for (let i = 0; i < data.length; i++) {
if (data[i].value == values) {
str = data[i].title
} else {
for (let j = 0; j < data[i].children.length; j++) {
if (data[i].children[j].value == values) {
str = data[i].title + '/' + data[i].children[j].title
} else {
if (data[i].children[j].children) {
for (let k = 0; k < data[i].children[j].children.length; k++) {
if (data[i].children[j].children[k].value == values) {
str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
}
}
}
}
}
}
}
console.log('str-str-str-str', str)
state.fen_lei1 = str;
return str;
}
// const changeTreeSelectValue = (values) => {
// let data = state.options2222;
// console.log(values, data)
// let str = ''
// for (let i = 0; i < data.length; i++) {
// if (data[i].value == values) {
// str = data[i].title
// } else {
// for (let j = 0; j < data[i].children.length; j++) {
// if (data[i].children[j].value == values) {
// str = data[i].title + '/' + data[i].children[j].title
// } else {
// if (data[i].children[j].children) {
// for (let k = 0; k < data[i].children[j].children.length; k++) {
// if (data[i].children[j].children[k].value == values) {
// str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
// }
// }
// }
// }
// }
// }
// }
// console.log('str-str-str-str', str)
// state.fen_lei1 = str;
// return str;
// }

5
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -388,13 +388,12 @@ export default {
"thirdId": props.datasource.targetId,
"type": 1
});
{/* "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, */}
api.QueryOnlineManagementDetail({
"chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId,
"status": state.projectName,
"studentName": state.name,
"targetId":props.datasource.projectId,
"taskId": props.datasource.projectTaskId,
"taskId": props.datasource.courseId,
"thirdId": props.datasource.targetId,
"type": 1
}).then(res=>{

2
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -397,7 +397,7 @@ export default {
"status": state.projectName,
"studentName": state.name,
"targetId":props.datasource.routerId,
"taskId": props.datasource.routerTaskId,
"taskId": props.datasource.courseId,
"thirdId": props.datasource.targetId,
"type": 1
}).then(res=>{

8
src/components/student/TableStudent.vue
View File

@@ -196,7 +196,7 @@
:scroll="{ x: 1500 }"
row-key="id"
:row-selection="stuRowSelection"
>
>
<template #action="{ record }">
<!-- <div style="display:flex;justify-content: center;align-items: center;">-->
<!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
@@ -232,8 +232,8 @@
换组
</div>
</a-col>
-->
<a-col v-if="type === 3">
-->
<a-col v-if="type === 3 && record.status!==0">
<div
style=" color: #4ea6ff; font-size: 14px;text-align: center; margin-left: 10px; cursor: pointer; "
@click="updateStatus(0, record.id)"
@@ -241,7 +241,7 @@
通过
</div>
</a-col>
<a-col v-if="type === 3">
<a-col v-if="type === 3 && record.status!==0">
<div
style=" color: #4ea6ff;font-size: 14px;text-align: center; margin-left: 10px;cursor: pointer; "
@click="updateStatus(2, record.id)"

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

@@ -1430,10 +1430,10 @@
<div class="cstm_items">
<div class="signbox">
<div class="sign">
<img
<!-- <img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
/> -->
</div>
<span style="margin-right: 3px">地点</span>
</div>
@@ -4521,7 +4521,7 @@ export default defineComponent({
console.log(postData);
const checkList = [
postData.name,
postData.address,
// postData.address,
postData.beginTime,
postData.endTime,
postData.teacherId,

4
src/views/courselibrary/components/seeModal.vue
View File

@@ -96,7 +96,7 @@
</div>
</div>
<div class="mb_right">
<div class="mbl_items">
<!-- <div class="mbl_items">
<div class="item_nam">
<div class="asterisk_icon">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk"/>
@@ -108,7 +108,7 @@
{{ filterTxt(detail.teacher) }}
</div>
</div>
</div>
</div> -->
<div class="mbl_items2" v-if="detail.intro">
<div class="item_nam">
<div class="asterisk_icon">