hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-23 17:55:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

Browse Source
This commit is contained in:
daihh
2022-09-30 09:59:23 +08:00
parent e01bc8b0d0 6463fe1b12
commit 2de08425a1
26 changed files with 156 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/exam/MyExamTask.vue
View File

@@ -1,8 +1,9 @@
<template>
<!--我的独立考试-->
<div>
<div style="display: flex; justify-content: flex-start;padding:12px 20px 10px 22px" >
<div style="display: flex; justify-content: flex-start;padding:12px 20px 20px 22px" >
<!--查询-->
<div class="uc-center-page">我的考试</div>
<div style="padding: 0px 0px">
<el-select clearable v-model="status" placeholder="状态" style="width: 110px">
<el-option label="未开始" :value="0"></el-option>
@@ -11,17 +12,16 @@
<el-option label="完成" :value="9"></el-option>
</el-select>
</div>
<div style="padding-left: 10px">
<div style="padding-left: 16px">
<el-input v-model="testName" clearable placeholder="搜索名称"></el-input>
</div>
<div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button></div>
<div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-refresh-right" @click="reset()">重置</el-button></div>
<div class="button-class" style="padding-left: 14px"><el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button></div>
<div class="button-class" style="padding-left: 14px"><el-button type="primary" icon="el-icon-refresh-right" @click="reset()">重置</el-button></div>
</div>
<div>
<div v-for="(item,idx) in taskList" :key="idx" class="titem">
<!-- <div><a :href="webBaseUrl+'/exam/test?id='+item.objId" target="_blank"> {{item.objId}}</a></div> -->
<div class="task-info">
<div @click="jumpRouter(item)" v-html="$keywordActiveShow(item.testName,testName)" class="task-tit one-line-ellipsis">
</div>
@@ -46,10 +46,6 @@
<a v-if="item.status == 1 && 8" :href="webBaseUrl+'/exam/test?id='+item.testId" target="_blank" >
<el-button type="primary" size="small">继续考试</el-button>
</a>
<!-- <a v-if="item.status == 9" :href="webBaseUrl+'/exam/test?id='+item.testId" target="_blank" >
<el-button type="primary" size="small">回顾考试</el-button>
</a> -->
<el-button type="primary" v-if="item.status == 9" size="small" @click="jumpRouter(item)">查看</el-button>
</div>
</div>
@@ -65,11 +61,13 @@
:total="total">
</el-pagination>
</div>
<div v-else>
<div v-if="taskList.length == 0">
<div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
<div v-else class="zan-wu">暂无数据</div>
</div>
<div v-else class="home-no-list">
<img class="img" src="/images/homeWu/no-case.png" alt="" srcset="">
<p class="text">还没有案例</p>
<!-- <div v-if="taskList.length == 0"> -->
<!-- <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
<div v-else class="zan-wu">暂无数据</div> -->
<!-- </div> -->
</div>
</div>
@@ -166,7 +164,7 @@
font-size: 18px;
color: #333;
margin-top: -3px;
font-weight: 700;
font-weight: 600;
}
.task-text{
color: #444;

2
src/views/study/coursenew.vue
View File

@@ -114,7 +114,7 @@
<comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="1" :obj-id="courseInfo.id" :toUsers="toUsers"></comments>
</div>
<div v-show="!courestab" class="coures-note">
<note-comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="6" :obj-id="courseInfo.id"></note-comments>
<note-comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="6" :obj-id="courseInfo.id" :name="courseInfo.name"></note-comments>
</div>
</div>
</div>

27
src/views/user/Mynotes.vue
View File

@@ -122,7 +122,7 @@
</div>
<div class="import-info-enclosure">
<label class="label" style="width:66px"><svg-icon style="font-size:16px;margin-right:5px" icon-class="enclisure"></svg-icon>附件</label>
<file-upload dir="files" :fileType="upNoteFile.fileType" :showList="true" :value="imageShowUrl" :limit="upNoteFile.limit" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
<file-upload dir="files" ref="myUpload" :isClear="importDialogVisible" :fileType="upNoteFile.fileType" :showList="true" :value="imageShowUrl" :limit="upNoteFile.limit" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
</div>
</div>
<span slot="footer" class="dialog-footer">
@@ -138,10 +138,10 @@
<div class="Exportbox">
<div class="export-dialog-top">
<div class="export-dialog-left">
<author-img :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
<author-img :avatar="userData.avatar" :aid="userData.aid" :sex="userData.sex"></author-img>
<div class="userInfo-info">
<p><span style="font-weight: 500;font-size: 22px;">{{userInfo.name}}</span><span style="font-size: 12px;margin-left:10px">{{userInfo.departFullName}}</span></p>
<p>{{userInfo.sign}}</p>
<p><span style="font-weight: 500;font-size: 22px;">{{userData.name}}</span><span style="font-size: 12px;margin-left:10px">{{userInfo.departFullName}}</span></p>
<p>{{userData.sign}}</p>
</div>
</div>
<div class="export-dialog-right">
@@ -184,7 +184,8 @@ import interactBar from '@/components/Portal/interactBar.vue';
import FileUpload from '@/components/NoteUpload/index.vue';
import AuthorImg from '@/components/Portal/authorImg.vue';
import { mapGetters } from 'vuex';
import {formatDate} from '@/utils/tools.js'
import {formatDate} from '@/utils/tools.js';
import apiUser from "@/api/system/user.js";
export default {
components:{interactBar,FileUpload,AuthorImg},
computed: {
@@ -192,6 +193,7 @@ export default {
},
data(){
return{
userData:{},
formatDate,
noteFile:{
contentType:null,
@@ -245,6 +247,13 @@ export default {
mounted(){
this.noteData(null);
this.allcoures();
apiUser.getByIds([this.userInfo.aid]).then(res => {
if (res.status == 200) {
this.userData = res.result[0];
} else {
this.$message.error(res.message);
}
});
},
methods: {
exportCommand(e) {
@@ -258,10 +267,10 @@ export default {
}
})
let data = {
name:this.userInfo.name,
sign:'abcd',
name:this.userData.name,
sign:this.userData.sign,
ids:ids,
author:this.userInfo.avatar,//this.userInfo.avatar,
author:this.userData.avatar,//this.userInfo.avatar,
}
if(this.exportType == '1') {
apiNote.exportPdf(data).then(res=>{
@@ -410,7 +419,7 @@ export default {
publish(){
this.ordertime = !this.ordertime;
this.orderType = !this.orderType;
this.orderField = 'sysCreateTime';
this.orderField = 'sysUpdateTime';
this.noteData(this.num)
},
thumbs(){

7
src/views/user/Setting.vue
View File

@@ -443,12 +443,13 @@
.personSetting{
background-color: #fff;
box-sizing: border-box;
padding: 30px 0px 0px 247px;
// padding: 30px 0px 0px 247px;
padding: 30px 0 10% 20%;
// margin: 0 auto;
position: relative;
.avatar{
position: absolute;
left: 86px;
left: 5%;
top:56px;
}
.passWard-btn{
@@ -469,6 +470,8 @@
box-shadow: -1px 0 0 0 #387DF7;
}
.informationItem{
min-width: 600px;
padding-right: 10%;
margin-bottom: 82px;
.information-header{
// display: flex;

6
src/views/user/ranking.vue
View File

@@ -9,7 +9,7 @@
</div>
<div class="exp-hear-xiala">
<el-dropdown trigger="click" @command="experienceCommand">
<span class="el-dropdown-link">
<span class="el-dropdown-link pointer">
{{experience.name}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
@@ -97,7 +97,7 @@
</div>
<div class="exp-hear-xiala">
<el-dropdown trigger="click" @command="durationCommand">
<span class="el-dropdown-link">
<span class="el-dropdown-link pointer">
{{learningDuration.name}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
@@ -170,7 +170,7 @@
</div>
<div class="exp-hear-xiala">
<el-dropdown trigger="click" @command="daysCommand">
<span class="el-dropdown-link">
<span class="el-dropdown-link pointer">
{{learningDays.name}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">