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

feat:合并

Browse Source
This commit is contained in:
lixg
2023-01-12 12:37:54 +08:00
parent 7235dac9b8 9ae7169f6c
commit c3182cfe4e
4 changed files with 14 additions and 4 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 store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本2.0.4------------"); console.log("版本2.0.5------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });

6
src/components/common/FJUpload.vue
View File

@@ -20,7 +20,11 @@
<div class="file_detail"> <div class="file_detail">
<div class="file_name"> <div class="file_name">
<span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;"> <span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">
{{ item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name }} {{
item.name.indexOf('http')!==-1?
item.name.slice(item.name.lastIndexOf('/') + 1)
:item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name
}}
</span> </span>
</div> </div>
<!-- <div class="file_size">--> <!-- <div class="file_size">-->

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

@@ -1659,7 +1659,7 @@
:footer="null" :footer="null"
:closable="false" :closable="false"
wrapClassName="modalStyle stusmanageModal" wrapClassName="modalStyle stusmanageModal"
width="80%" width="90%"
@cancel="sm_exit" @cancel="sm_exit"
> >
<div class="modalHeader"> <div class="modalHeader">
@@ -7786,7 +7786,7 @@ export default defineComponent({
.stusmanageModal { .stusmanageModal {
.ant-modal { .ant-modal {
max-width: 1700px; max-width: 1800px;
.ant-modal-content { .ant-modal-content {
// width:1358px !important; // width:1358px !important;
.ant-modal-body { .ant-modal-body {

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

@@ -599,6 +599,7 @@ export default {
const handleNext = async() => { const handleNext = async() => {
if (!state.assessmentId) { if (!state.assessmentId) {
if (!state.assessmentName) { if (!state.assessmentName) {
message.destroy();
message.error("请输入评估名称"); message.error("请输入评估名称");
return false; return false;
} }
@@ -620,6 +621,11 @@ export default {
router.push("/researchadd"); router.push("/researchadd");
handleCancel(); handleCancel();
} else { } else {
if (!state.assessmentName) {
message.destroy();
message.error("请输入评估名称");
return false;
}
editAssessmentName({ editAssessmentName({
assessmentId: state.assessmentId, assessmentId: state.assessmentId,
assessmentName: state.assessmentName, assessmentName: state.assessmentName,