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-03-05 21:44:26 +08:00
parent 4fbeb88422 7deebe30ab
commit 6d6f3c14b2
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/NavLeft.vue
View File

@@ -252,12 +252,12 @@
</a-menu-item> </a-menu-item>
</a-sub-menu> </a-sub-menu>
<a-menu-item key="sub5" v-if="checkMenu('researchmanage')"> <!-- <a-menu-item key="sub5" v-if="checkMenu('researchmanage')">
<div class="imgBox"> <div class="imgBox">
<img style="width: 16px; height: 16px" src="../assets/images/navleft/system.png"/> <img style="width: 16px; height: 16px" src="../assets/images/navleft/system.png"/>
</div> </div>
<router-link to="/researchmanage">评估管理</router-link> <router-link to="/researchmanage">评估管理</router-link>
</a-menu-item> </a-menu-item> -->
<!-- 2022-12-10注释 后面放开 --> <!-- 2022-12-10注释 后面放开 -->
<!-- <a-menu-item key="sub6" @titleClick="titleClick"> <!-- <a-menu-item key="sub6" @titleClick="titleClick">
<div class="imgBox"> <div class="imgBox">

45
src/components/drawers/ProjectScore.vue
View File

@@ -107,28 +107,29 @@
<a-list :data-source="stuValue === 1 ? datascoreg : datascore" :loading="scoreRankLoading"> <a-list :data-source="stuValue === 1 ? datascoreg : datascore" :loading="scoreRankLoading">
<template #renderItem="{ item }"> <template #renderItem="{ item }">
<div class="item"> <div class="item">
<div v-if="item.index == 1" class="itemleft"> <div v-if="!isSearchRank">
<div class="itemimage"> <div v-if="item.index == 1" class="itemleft">
<img src="../../assets/images/taskpage/gold.png" /> <div class="itemimage">
<img src="../../assets/images/taskpage/gold.png" />
</div>
<div class="itemid">{{ item.index }}</div>
</div> </div>
<div class="itemid">{{ item.index }}</div> <div v-else-if="item.index == 2" class="itemleft">
</div> <div class="itemimage">
<div v-else-if="item.index == 2" class="itemleft"> <img src="../../assets/images/taskpage/siler.png" />
<div class="itemimage"> </div>
<img src="../../assets/images/taskpage/siler.png" /> <div class="itemid">{{ item.index }}</div>
</div> </div>
<div class="itemid">{{ item.index }}</div> <div v-else-if="item.index == 3" class="itemleft">
</div> <div class="itemimage">
<div v-else-if="item.index == 3" class="itemleft"> <img src="../../assets/images/taskpage/copper.png" />
<div class="itemimage"> </div>
<img src="../../assets/images/taskpage/copper.png" /> <div class="itemid">{{ item.index }}</div>
</div>
<div v-else class="itemleft">
<div class="elseid">{{ item.index }}</div>
</div> </div>
<div class="itemid">{{ item.index }}</div>
</div> </div>
<div v-else class="itemleft">
<div class="elseid">{{ item.index }}</div>
</div>
<div class="itemcenter">{{ item.name }}</div> <div class="itemcenter">{{ item.name }}</div>
<div class="itemright">{{ item.pointsCountStr }}</div> <div class="itemright">{{ item.pointsCountStr }}</div>
</div> </div>
@@ -428,7 +429,8 @@ export default {
checkStuId: null, checkStuId: null,
proId: null, proId: null,
startTime: (new Date(new Date(new Date().toLocaleDateString()).getTime())).getTime().toString(), startTime: (new Date(new Date(new Date().toLocaleDateString()).getTime())).getTime().toString(),
scoresum: 0 scoresum: 0,
isSearchRank: false
}); });
const getTableData = () => { const getTableData = () => {
let datas = state.tabledataStu; let datas = state.tabledataStu;
@@ -524,6 +526,11 @@ export default {
state.datascore = res.data.data; state.datascore = res.data.data;
state.datascoreg = res.data.data; state.datascoreg = res.data.data;
state.scoreRankLoading = false; state.scoreRankLoading = false;
if(state.searchRankName==""){
state.isSearchRank = false;
}else{
state.isSearchRank = true;
}
}else{ }else{
state.datascore = []; state.datascore = [];
state.datascoreg = []; state.datascoreg = [];

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

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

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

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

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

@@ -1299,7 +1299,7 @@
v-if="docChecked == true" v-if="docChecked == true"
v-model:file-list="fileList" v-model:file-list="fileList"
name="file" name="file"
action="/manageApi/file/uploadunlimit" :action="process.env.VUE_APP_BASE_API + '/file/uploadunlimit'"
@change="handleChange" @change="handleChange"
> >
<span <span