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

Merge remote-tracking branch 'origin/stat' into stat

Browse Source
This commit is contained in:
86182
2022-10-21 15:26:21 +08:00
parent 5f11b71ca7 b417d678a6
commit 2701856361
13 changed files with 100 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/phase2/note.js
View File

@@ -106,8 +106,8 @@ const ids=function (data){
* }
* */
const exportExcel=function (data){
// return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
// return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
}
/**

4
src/api/phase2/userhobby.js
View File

@@ -20,8 +20,8 @@ const save=function (data){
* 同兴趣人匹配查询
* 参数：下面那个接口的返回值直接传
* */
const list=function (data){
return ajax.postJson(baseURL,'/xboe/subgroup/m/userhobby/list',data);
const list=function (aid){
return ajax.get(baseURL,'/xboe/subgroup/m/userhobby/list?aid='+aid);
}
/**

3
src/assets/styles/ellipsis.scss
View File

@@ -48,6 +48,9 @@ p{
font-size: 20px;
margin-top: 70px;
color: #ccc;
img{
text-align: center;
}
}

2
src/components/Article/editItems.vue
View File

@@ -3,7 +3,7 @@
<el-row class="article-add">
<el-form ref="form" :rules="rules" :model="addForm" label-position="right" label-width="80px">
<el-form-item prop="title" label="标题">
<el-input class="title-input" v-model.trim="addForm.title" placeholder="请输入文章标题,长度在 1 到 100 个字符" show-word-limit maxlength="100"></el-input>
<el-input class="title-input" v-model.trim="addForm.title" placeholder="请输入文章标题,长度在 1 到 50 个字符" show-word-limit maxlength="50"></el-input>
</el-form-item>
<el-form-item class="imgInstructions" label="封面">
<div class="el-form-item__content">

1
src/components/Portal/comments.vue
View File

@@ -407,7 +407,6 @@
item.orgInfo=author.orgInfo;
item.sex=author.sex;
item.sign=author.sign
console.log(list,'评论信息')
return true;
}else{
return false;

2
src/components/Portal/guideBox.vue
View File

@@ -57,7 +57,7 @@
disableOnInteraction: false ,
delay: 2000,
},
speed: 1000, //切换速度，即slider自动滑动开始到结束的时间（单位ms）
speed: 2000, //切换速度，即slider自动滑动开始到结束的时间（单位ms）
loop:true, //循环切换
observe:true,
peed: 300,//循环速度

2
src/components/Qa/addQuestion.vue
View File

@@ -10,7 +10,7 @@
<el-dialog :close-on-click-modal='false' title="提问题" label-width="80px" :visible.sync="askQuestionDialog">
<!-- <el-form ref="askForm" :model="askForm" :rules="askFormRules" label-position="right" > -->
<el-form-item label="标题:" prop="title">
<el-input class="title-input" v-model="askForm.title" show-word-limit placeholder="请输入问题标题,字符长度不能高于100" maxlength="100"></el-input>
<el-input class="title-input" v-model="askForm.title" show-word-limit placeholder="请输入问题标题,字符长度不能高于50" maxlength="50"></el-input>
</el-form-item>
<el-form-item label="封面">
<imageUpload :value="imageShowUrl" dir="qa" width="410px" height="168px" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></imageUpload>

23
src/utils/tools.js
View File

@@ -148,6 +148,29 @@ export function formatDate(date){
return newTime;
}
/**
* 把日期格式化为显示时间，yyyy-MM-dd
* @param {Object} date
*/
export function formatDateShort(date){
var year = date.getFullYear(),
month = date.getMonth() + 1,//月份是从0开始的
day = date.getDate(),
hour = date.getHours(),
min = date.getMinutes(),
sec = date.getSeconds();
if(month<10){month='0'+month}
if(day<10){day='0'+day}
if(hour<10){hour='0'+hour}
if(min<10){min='0'+min}
if(sec<10){sec='0'+sec}
var newTime = year + '-' + month + '-' + day;
return newTime;
}
export function numberToLetter(x){ //此方法和移到utils中去
let s = "";
while (x > 0) {

108
src/views/Index.vue
View File

@@ -531,41 +531,38 @@
//检查兴趣爱好是否已填报,
//先检查本地session和 local 15天, 这两个值是在组件中设置的
// let sessionHobby=sessionStorage.getItem('user-hobby-'+this.userInfo.aid);
// let localHobbyTime=localStorage.getItem('notYet'+this.userInfo.aid);
// if(!sessionHobby){ //只有session中不存在，才会验证
// //本地15天验证,localHobby,后续完善
// let flag=true;//请求检查
// if(localHobbyTime) {
// let day = (new Date() - new Date(localHobbyTime))/(1000*60*60*24);
// if(day< 15){
// flag = false;
// }
// }
// if(flag){
// apiUserhobby.has().then(res=>{
// if(res.status == 200) {
// if(!res.result){
// //设置需要显示兴趣爱好收集窗口
// this.userHobby.needShow=true;
// }
// }else{
// console.log('兴趣爱好检查失败'+res.message);
// }
// //检查引导页
// this.checkAndShowGuide();
// });
// }else{
// this.checkAndShowGuide();
// }
// }else{
// //不用检查引导页
// //this.checkAndShowGuide();
// }
//测试环境中
this.userHobby.needShow=true;
this.checkAndShowGuide();
let sessionHobby=sessionStorage.getItem('user-hobby-'+this.userInfo.aid);
let localHobbyTime=localStorage.getItem('notYet'+this.userInfo.aid);
console.log("sessionHobby:"+sessionHobby);
if(!sessionHobby){ //只有session中不存在，才会验证
//本地15天验证,localHobby,后续完善
let flag=true;//请求检查
if(localHobbyTime) {
let day = (new Date() - new Date(localHobbyTime))/(1000*60*60*24);
if(day< 15){
flag = false;
}
}
if(flag){
apiUserhobby.has().then(res=>{
if(res.status == 200) {
if(!res.result){
//设置需要显示兴趣爱好收集窗口
this.userHobby.needShow=true;
}
}else{
console.log('兴趣爱好检查失败'+res.message);
}
//检查引导页
this.checkAndShowGuide();
});
}else{
this.checkAndShowGuide();
}
}else{
//检查引导页
this.checkAndShowGuide();
}
},
computed: {
@@ -579,28 +576,29 @@
checkAndShowGuide(){
//引导页弹框是否显示
//检查本地,减少服务器请求的次数
// let localGuide=localStorage.getItem('user-guide-'+this.userInfo.aid);
// if(!localGuide){
// apiGuide.hasUser().then(res=>{
// if(res.status==200){
// if(!res.result){
// this.$refs.guide.show();
// }else{
// if(this.userHobby.needShow){ this.$refs.userCollection.show();}
// }
// localStorage.setItem('user-guide-'+this.userInfo.aid,1);
// }else{
// console.log('获取引导页检查失败'+res.message);
// //this.$message.error('')
// if(this.userHobby.needShow){this.$refs.userCollection.show();}
// }
// });
// }else {
// if(this.userHobby.needShow){ this.$refs.userCollection.show();}
// }
let localGuide=localStorage.getItem('user-guide-'+this.userInfo.aid);
console.log("=== "+localGuide);
if(!localGuide){
apiGuide.hasUser().then(res=>{
if(res.status==200){
if(!res.result){
this.$refs.guide.show();
}else{
if(this.userHobby.needShow){ this.$refs.userCollection.show();}
}
localStorage.setItem('user-guide-'+this.userInfo.aid,1);
}else{
console.log('获取引导页检查失败'+res.message);
//this.$message.error('')
if(this.userHobby.needShow){this.$refs.userCollection.show();}
}
});
}else {
if(this.userHobby.needShow){ this.$refs.userCollection.show();}
}
//测试情况下
this.$refs.guide.show();
// this.$refs.guide.show();
},
closeGuide(){ //关闭引导页
if(this.userHobby.needShow){

2
src/views/homepage/Index.vue
View File

@@ -109,7 +109,7 @@
userhobbyInfo() {
let $this=this;
$this.interestedList=[];
apiUserhobby.list({aid:this.pageId}).then(res=>{
apiUserhobby.list(this.pageId).then(res=>{
if(res.status == 200) {
let ids = res.result.map(item=>item.aid);
const noReapetIds = [...new Set(ids)];

6
src/views/share/MyList.vue
View File

@@ -48,9 +48,13 @@
<div v-else>
<div v-if="dataList.list.length == 0">
<div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
<div v-else class="zan-wu">暂无数据</div>
<div v-else class="zan-wu">
<img :src="`${webBaseUrl}/images/nocouresimg.png`" alt="">
<div>暂无数据</div>
</div>
</div>
</div>
<!-- </el-tab-pane> -->

5
src/views/share/ToList.vue
View File

@@ -42,7 +42,10 @@
<div v-else>
<div v-if="dataList.list.length == 0">
<div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
<div v-else class="zan-wu">暂无数据</div>
<div v-else class="zan-wu">
<img :src="`${webBaseUrl}/images/nocouresimg.png`" alt="">
<div>暂无数据</div>
</div>
</div>
</div>
<!-- </el-tab-pane> -->

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

@@ -68,7 +68,7 @@
<span style="margin-left:14px">{{item.openType == 9?'公开':'私密'}}</span>
<h6>{{ item.sysUpdateTime }}</h6>
</div>
<div class="all-content">
<div class="all-content" style="word-break:break-all;">
<span v-if="item.contentType != 3">{{ item.content }}</span>
<div v-else>
<template v-for="img in item.content">
@@ -138,7 +138,7 @@
</div>
<div class="export-dialog-right">
<p>累计导出{{exportPreData.length}}条</p>
<p style="margin-top:10px">导出时间：{{formatDate(new Date())}}</p>
<p style="margin-top:10px">导出时间：{{formatDateShort(new Date())}}</p>
</div>
</div>
@@ -176,7 +176,7 @@ 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,formatDateShort} from '@/utils/tools.js';
import apiUser from "@/api/system/user.js";
import htmlToPdf from '@/utils/htmlToPdf'
export default {
@@ -188,6 +188,7 @@ export default {
return{
userData:{},
formatDate,
formatDateShort,
noteFile:{
contentType:null,
type:2,