Merge branch 'dev'

This commit is contained in:
daihh
2022-06-14 19:59:29 +08:00
16 changed files with 186 additions and 107 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@@ -31,5 +31,10 @@
.u-page{ .u-page{
padding: 10px; padding: 10px;
} }
.text-tooltip{
background: #efeff1 !important;
border: 1px solid #e7e7e7 !important;
box-shadow: 0px 1px 5px 1px rgba(92,98,111,.3);
}
</style> </style>

View File

@@ -58,7 +58,10 @@
<el-form-item label="名称" required><el-input maxlength="100" v-model="courseInfo.name" placeholder="课程名称(限100字以内)"></el-input></el-form-item> <el-form-item label="名称" required><el-input maxlength="100" v-model="courseInfo.name" placeholder="课程名称(限100字以内)"></el-input></el-form-item>
<el-form-item label="封面图片" required > <el-form-item label="封面图片" required >
<el-col :span="8"> <el-col :span="8">
<imageUpload :value="courseCoverurl" width="160px" height="90px" @success="uploadCoverImgSuccess" @remove="removeCoverImgSuccess"></imageUpload> <div @click.stop="chooseFile">
<imageUpload :disabled="true" :value="courseCoverurl" width="160px" height="90px" @success="uploadCoverImgSuccess" @subimage="acceptimage" @remove="removeCoverImgSuccess"></imageUpload>
</div>
<div>上传为16:9(:800*450)的png或jpg图片</div> <div>上传为16:9(:800*450)的png或jpg图片</div>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
@@ -212,6 +215,8 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<filecloud :show="dlgFileChoose.show" @choose="changeCourseImage" @close="choseChoose"></filecloud>
</div> </div>
</template> </template>
@@ -237,6 +242,7 @@ import apiTag from "../../api/modules/tag.js";
import videoPlayer from "@/components/VideoPlayer/index.vue"; import videoPlayer from "@/components/VideoPlayer/index.vue";
import audioPlayer from "@/components/AudioPlayer/index.vue"; import audioPlayer from "@/components/AudioPlayer/index.vue";
import apiCourseFile from '@/api/modules/courseFile.js'; import apiCourseFile from '@/api/modules/courseFile.js';
import filecloud from '@/components/FileCloud/index.vue';
import { mapGetters, mapActions } from "vuex"; import { mapGetters, mapActions } from "vuex";
// import hyperLink from '@/components/Course/hyperLink.vue'; // import hyperLink from '@/components/Course/hyperLink.vue';
export default { export default {
@@ -246,6 +252,7 @@ export default {
catalogCourseware, catalogCourseware,
imageUpload, imageUpload,
exam, exam,
filecloud,
homework, homework,
assess, assess,
WxEditor, WxEditor,
@@ -279,6 +286,9 @@ export default {
}, },
data() { data() {
return { return {
dlgFileChoose:{
show:false
},
converStatus:4, converStatus:4,
courseType: courseType, courseType: courseType,
isEdit: true, isEdit: true,
@@ -350,6 +360,26 @@ export default {
}); });
}, },
methods: { methods: {
chooseFile(){
this.dlgFileChoose.show=true;
},
choseChoose(){
this.dlgFileChoose.show=false;
},
changeCourseImage(img){
if(!img.path){
return;
}
//console.log(img);
this.dlgFileChoose.show=false;
this.courseInfo.coverImg = img.path;
this.courseCoverurl = this.fileUrl+img.path;
},
acceptimage(value){
this.courseInfo.coverImg = value.path;
this.courseCoverurl = value.path;
},
...mapActions({ ...mapActions({
getResOwnerTree: "resOwner/getResOwnerTree", getResOwnerTree: "resOwner/getResOwnerTree",
loadResOwners: "resOwner/loadResOwners", loadResOwners: "resOwner/loadResOwners",

View File

@@ -73,7 +73,10 @@
<!--不显示因为标题已经代表了 <el-form-item label="授课方式">{{courseTypeMap(params.type)}}</el-form-item>--> <!--不显示因为标题已经代表了 <el-form-item label="授课方式">{{courseTypeMap(params.type)}}</el-form-item>-->
<el-form-item label="封面图片" required > <el-form-item label="封面图片" required >
<el-col :span="8"> <el-col :span="8">
<imageUpload :value="courseCoverurl" width="160px" height="90px" @success="uploadCoverImgSuccess" @remove="removeCoverImgSuccess"></imageUpload> <div @click.stop="chooseFile">
<imageUpload :disabled="true" :value="courseCoverurl" width="160px" height="90px" @subimage="acceptimage" @success="uploadCoverImgSuccess" @remove="removeCoverImgSuccess"></imageUpload>
</div>
<div>上传为16:9(:800*450)的png或jpg图片</div> <div>上传为16:9(:800*450)的png或jpg图片</div>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
@@ -250,6 +253,8 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<filecloud :show="dlgFileChoose.show" @choose="changeCourseImage" @close="choseChoose"></filecloud>
</div> </div>
</template> </template>
@@ -277,6 +282,7 @@ import audioPlayer from '@/components/AudioPlayer/index.vue';
import { mapGetters,mapActions} from 'vuex'; import { mapGetters,mapActions} from 'vuex';
import hyperLink from '@/components/Course/hyperLink.vue'; import hyperLink from '@/components/Course/hyperLink.vue';
import apiCourseFile from '../../api/modules/courseFile.js'; import apiCourseFile from '../../api/modules/courseFile.js';
import filecloud from '@/components/FileCloud/index.vue';
export default { export default {
name:"auditCourse2", name:"auditCourse2",
components: { components: {
@@ -284,6 +290,7 @@ export default {
catalogCourseware, catalogCourseware,
imageUpload, imageUpload,
exam, exam,
filecloud,
homework, homework,
assess, assess,
WxEditor, WxEditor,
@@ -315,6 +322,9 @@ export default {
}, },
data() { data() {
return { return {
dlgFileChoose:{
show:false
},
converStatus:4, converStatus:4,
curriculumData:{ curriculumData:{
url:'', url:'',
@@ -391,6 +401,26 @@ export default {
}) })
}, },
methods: { methods: {
chooseFile(){
this.dlgFileChoose.show=true;
},
choseChoose(){
this.dlgFileChoose.show=false;
},
changeCourseImage(img){
if(!img.path){
return;
}
//console.log(img);
this.dlgFileChoose.show=false;
this.courseInfo.coverImg = img.path;
this.courseCoverurl = this.fileUrl+img.path;
},
acceptimage(value){
this.courseInfo.coverImg = value.path;
this.courseCoverurl = value.path;
},
...mapActions({ ...mapActions({
getResOwnerTree:'resOwner/getResOwnerTree', getResOwnerTree:'resOwner/getResOwnerTree',
loadResOwners:'resOwner/loadResOwners', loadResOwners:'resOwner/loadResOwners',

View File

@@ -53,7 +53,7 @@
</div> </div>
<el-form-item label="名称" required><el-input maxlength="90" v-model="courseInfo.name" show-word-limit placeholder="课程名称(限90字以内)"></el-input></el-form-item> <el-form-item label="名称" required><el-input maxlength="90" v-model="courseInfo.name" show-word-limit placeholder="课程名称(限90字以内)"></el-input></el-form-item>
<el-form-item label="封面图片" v-show="!weike.onlyRequired"> <el-form-item label="封面图片" v-show="!weike.onlyRequired">
<!-- 上传封面图 --> <!-- 上传封面图-->
<div style="display:flex"> <div style="display:flex">
<div @click.stop="chooseFile"> <div @click.stop="chooseFile">
<!-- <image :src="courseCoverurl" style="width:160px;height:90px" width="160px" height="90px"></image> --> <!-- <image :src="courseCoverurl" style="width:160px;height:90px" width="160px" height="90px"></image> -->

View File

@@ -1,6 +1,6 @@
<template> <template>
<div style="min-width: 700px;"> <div style="min-width: 700px;">
<el-dialog title="选择图片" :close-on-click-modal="false" :visible.sync="show" width="60%" @close="chose" :modal="false" custom-class="g-dialog"> <el-dialog title="选择图片" :close-on-click-modal="false" :visible.sync="show" width="60%" :show-close="false" :modal="false" custom-class="g-dialog">
<div style="margin: -10px;"> <div style="margin: -10px;">
<div style="display: flex;justify-content: space-between;padding: 5px;border-bottom: 1px solid #e0e0e0;"> <div style="display: flex;justify-content: space-between;padding: 5px;border-bottom: 1px solid #e0e0e0;">
<div style="padding-top: 10px;"> <div style="padding-top: 10px;">
@@ -36,6 +36,8 @@
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button :disabled="btnDisabled" type="primary" @click="saveChoose()">确认</el-button> <el-button :disabled="btnDisabled" type="primary" @click="saveChoose()">确认</el-button>
<el-button @click="chose()">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>

View File

@@ -149,20 +149,21 @@ export default {
let outerHeight = document.documentElement.clientHeight let outerHeight = document.documentElement.clientHeight
let scrollTop = document.documentElement.scrollTop let scrollTop = document.documentElement.scrollTop
let $this=this; let $this=this;
if(this.pdfpage >= this.totalPages){
this.isscroll = false;
this.moreState = 3;
}
if(this.showPages >= this.totalPages){
this.isscroll = false;
this.moreState = 3;
}
if(this.isscroll){ if(this.isscroll){
this.showPages++ this.showPages++
this.moreState = 2; this.moreState = 2;
// this.debounce(this.loadInitPdf($this.filePath),5000); // this.debounce(this.loadInitPdf($this.filePath),5000);
// this.debounce(,200000); // this.debounce(,200000);
} }
if(this.pdfpage >= this.totalPages){
this.isscroll = false;
this.moreState = 3;
}
if(this.showPages >= this.totalPages){
this.isscroll = false;
this.moreState = 3;
}
// if(scrollTop > 400) { // if(scrollTop > 400) {
// document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:242.5px"; // document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:242.5px";
// } else { // } else {

View File

@@ -23,9 +23,9 @@
<span>学习时长{{userInfo.studyTotalH}}小时</span> <span>学习时长{{userInfo.studyTotalH}}小时</span>
</div> </div>
<div> <div>
<span :class="{identity:true,active:curIdentity==1}" @click="setCurIdentity(1)"><router-link to="/study/index">学员</router-link></span> <router-link to="/study/index"><span :class="{identity:true,active:curIdentity==1}" @click="setCurIdentity(1)">学员</span></router-link>
<span v-if="identity == 2 || identity == 5" :class="{identity:true,active:curIdentity==2}" @click="setCurIdentity(2)"><router-link to="/teacher/index">教师</router-link></span> <router-link to="/teacher/index"><span v-if="identity == 2 || identity == 5" :class="{identity:true,active:curIdentity==2}" @click="setCurIdentity(2)">教师</span></router-link>
<span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)"><router-link to="/manager/index">管理员</router-link></span> <router-link to="/manager/index"><span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)">管理员</span></router-link>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -460,7 +460,7 @@ export default {
orderField: 'id' orderField: 'id'
}; };
if (this.caseList.orderType == 2) { if (this.caseList.orderType == 2) {
params.orderField = 'praises'; params.orderField = 'comments';
} }
apiCase.indexList(params).then(res => { apiCase.indexList(params).then(res => {
if (res.status == 200) { if (res.status == 200) {

View File

@@ -359,7 +359,6 @@ export default {
search(){ search(){
this.params.pageIndex = 1; this.params.pageIndex = 1;
this.getSearch(); this.getSearch();
}, },
reset() { reset() {
this.params.self = null; this.params.self = null;
@@ -432,6 +431,7 @@ export default {
if (status === 200) { if (status === 200) {
this.$message.success('保存成功'); this.$message.success('保存成功');
this.editCoursewareShow = false; this.editCoursewareShow = false;
this.getSearch();
} else { } else {
this.$message.error(message); this.$message.error(message);
} }

View File

@@ -6,9 +6,9 @@
<el-breadcrumb-item :to="{ path: '/article' }">文章列表</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/article' }">文章列表</el-breadcrumb-item>
<el-breadcrumb-item>文章详情</el-breadcrumb-item> <el-breadcrumb-item>文章详情</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<div class="xrow" style="display: flex;justify-content: space-between;"> <div class="xrow" style="display: flex;justify-content: space-between;">
<div style="flex: 1;" class="xcol content-div"> <div style="flex: 1;" class="xcol content-div">
<el-row > <el-row v-if="noData" >
<div> <div>
<!-- <div v-else>我四娘娘</div> --> <!-- <div v-else>我四娘娘</div> -->
<!-- <el-card :body-style="{ padding: '0px',background: '#f6f7fb' }" class="detail"> --> <!-- <el-card :body-style="{ padding: '0px',background: '#f6f7fb' }" class="detail"> -->
@@ -49,7 +49,10 @@
<div> <div>
<comments v-if="articleId!=''" @success="success" :obj-type="2" :obj-id="articleId" :toUsers="toUsers" :authorId="articleDetailData.sysCreateAid"></comments> <comments v-if="articleId!=''" @success="success" :obj-type="2" :obj-id="articleId" :toUsers="toUsers" :authorId="articleDetailData.sysCreateAid"></comments>
</div> </div>
</el-row> </el-row>
<div v-else>
<el-empty :image-size="200"></el-empty>
</div>
</div> </div>
<div style="width: 245px;margin-left: 5px;"> <div style="width: 245px;margin-left: 5px;">
@@ -84,6 +87,7 @@
</el-row> </el-row>
</div> </div>
</div> </div>
@@ -127,6 +131,7 @@ export default {
}, },
data() { data() {
return { return {
noData:true,
shareInfo:{ shareInfo:{
name:'', name:'',
load:false, load:false,
@@ -142,7 +147,6 @@ export default {
orgInfo:'', orgInfo:'',
code:'', code:'',
sex:null, sex:null,
}, },
ankingList: [], ankingList: [],
diagSync:false,//控制弹窗 diagSync:false,//控制弹窗
@@ -208,8 +212,10 @@ export default {
this.articleDetailData=res.result; this.articleDetailData=res.result;
//if(this.articleDetailData.toString()!='{}'){ //if(this.articleDetailData.toString()!='{}'){
this.getAuthorInfo(this.articleDetailData) this.getAuthorInfo(this.articleDetailData)
//} //}
}else{
this.noData = false;
this.$message.error(res.message);
} }
}).catch(err=>{ }).catch(err=>{
this.$message.error("获取数据失败") this.$message.error("获取数据失败")

View File

@@ -6,76 +6,79 @@
<el-breadcrumb-item :to="{ path: '/case' }">案例列表</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/case' }">案例列表</el-breadcrumb-item>
<el-breadcrumb-item>案例详情</el-breadcrumb-item> <el-breadcrumb-item>案例详情</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<div class="xrow" style="display: flex;justify-content: space-between;"> <div class="xrow" style="display: flex;justify-content: space-between;" >
<div style="flex: 1;" class="xcol content-div" id="content-div"> <div style="flex: 1;" class="xcol content-div" id="content-div">
<el-row :gutter="10"> <el-row :gutter="10" v-if="noData">
<el-col :span="24"> <el-col :span="24">
<el-card :body-style="{ padding: '0px' }" class="detail"> <el-card :body-style="{ padding: '0px' }" class="detail">
<div class="title">{{ caseDetail.title }}</div> <div class="title">{{ caseDetail.title }}</div>
<div class="label"> <div class="label">
<author :onlyAvatar="true" :avatar="authorInfo.avatar" :sex="authorInfo.sex" ></author> <author :onlyAvatar="true" :avatar="authorInfo.avatar" :sex="authorInfo.sex" ></author>
<span>案主{{ authorInfo.name }}</span> <span>案主{{ authorInfo.name }}</span>
<span>工号{{ authorInfo.code }}</span> <span>工号{{ authorInfo.code }}</span>
<span>组织{{ authorInfo.orgInfo }}</span> <span>组织{{ authorInfo.orgInfo }}</span>
<span style="text-align: right;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span> <span style="text-align: right;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
</div> </div>
<!-- <div class="label"> <!-- <div class="label">
<span style="margin-left:0px;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span> <span style="margin-left:0px;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
<interactBar :data="caseDetail" :type="3" :comments="false" :shares="true"></interactBar> <interactBar :data="caseDetail" :type="3" :comments="false" :shares="true"></interactBar>
</div> --> </div> -->
<!-- <div class="case-summary"><span>{{ caseDetail.summary }}</span></div> --> <!-- <div class="case-summary"><span>{{ caseDetail.summary }}</span></div> -->
<div class="btn-div clearfix" > <div class="btn-div clearfix" >
<div style="color:#666" v-if="caseDetail.orgDomain" class="item">{{ orgDomainTranslate(caseDetail.orgDomain) }}</div> <div style="color:#666" v-if="caseDetail.orgDomain" class="item">{{ orgDomainTranslate(caseDetail.orgDomain) }}</div>
<div style="color:#666" class="item" v-if="caseDetail.orgDomain == '' && caseDetail.orgDomainParent">{{ orgDomainTranslate(caseDetail.orgDomainParent) }}</div> <div style="color:#666" class="item" v-if="caseDetail.orgDomain == '' && caseDetail.orgDomainParent">{{ orgDomainTranslate(caseDetail.orgDomainParent) }}</div>
<div style="color:#666" v-if="caseDetail.majorType" class="item">{{ majorTypeTranslate(caseDetail.majorType) }}</div> <div style="color:#666" v-if="caseDetail.majorType" class="item">{{ majorTypeTranslate(caseDetail.majorType) }}</div>
<div v-if="caseDetail.keyword1" class="item">{{ caseDetail.keyword1 }}</div> <div v-if="caseDetail.keyword1" class="item">{{ caseDetail.keyword1 }}</div>
<div v-if="caseDetail.keyword2" class="item">{{ caseDetail.keyword2 }}</div> <div v-if="caseDetail.keyword2" class="item">{{ caseDetail.keyword2 }}</div>
<div v-if="caseDetail.keyword3" class="item">{{ caseDetail.keyword3 }}</div> <div v-if="caseDetail.keyword3" class="item">{{ caseDetail.keyword3 }}</div>
<div v-if="caseDetail.keyword4" class="item">{{ caseDetail.keyword4 }}</div> <div v-if="caseDetail.keyword4" class="item">{{ caseDetail.keyword4 }}</div>
<div v-if="caseDetail.keyword5" class="item">{{ caseDetail.keyword5 }}</div> <div v-if="caseDetail.keyword5" class="item">{{ caseDetail.keyword5 }}</div>
<!-- <span v-if="caseDetail.caseType" class="item">{{ caseDetail.caseType }}</span> <!-- <span v-if="caseDetail.caseType" class="item">{{ caseDetail.caseType }}</span>
<span v-if="caseDetail.caseType1" class="item">{{ caseDetail.caseType1 }}</span> <span v-if="caseDetail.caseType1" class="item">{{ caseDetail.caseType1 }}</span>
<span v-if="caseDetail.caseType2" class="item">{{ caseDetail.caseType2 }}</span> --> <span v-if="caseDetail.caseType2" class="item">{{ caseDetail.caseType2 }}</span> -->
</div> </div>
<div class="case-summary"><span>{{ caseDetail.summary }}</span></div> <div class="case-summary"><span>{{ caseDetail.summary }}</span></div>
<div class="label" style="margin-top:10px"> <div class="label" style="margin-top:10px">
<!-- <span style="margin-left:0px;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span> --> <!-- <span style="margin-left:0px;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span> -->
<interactBar :data="caseDetail" :type="3" :comments="false" :shares="true" :unicom="true"></interactBar> <interactBar :data="caseDetail" :type="3" :comments="false" :shares="true" :unicom="true"></interactBar>
</div> </div>
</el-card> </el-card>
<el-card :body-style="{ padding: '0px' }" class="jianjie" id="pdfPreview"> <el-card :body-style="{ padding: '0px' }" class="jianjie" id="pdfPreview">
<!-- <div class="content"> <!-- <div class="content">
{{ caseDetail.content }} {{ caseDetail.content }}
</div> --> </div> -->
<pdfPreview v-if="pdfPath" :filePath="pdfPath"></pdfPreview> <pdfPreview v-if="pdfPath" :filePath="pdfPath"></pdfPreview>
</el-card> </el-card>
<div class="postfixt-bot"> <div class="postfixt-bot">
<div class="postfixt-bot-box" id="pdfTopBox"> <div class="postfixt-bot-box" id="pdfTopBox">
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<div style="margin-left:20px"> <div style="margin-left:20px">
<div style="margin-top:3px"> <div style="margin-top:3px">
<i style="font-size:22px;color:#a3b1cc" v-show="zoomShow" @click="zoomBox()" class="el-icon-zoom-in"></i> <i style="font-size:22px;color:#a3b1cc" v-show="zoomShow" @click="zoomBox()" class="el-icon-zoom-in"></i>
<i style="font-size:22px;color:#a3b1cc" v-show="!zoomShow" @click="zoomBox()" class="el-icon-zoom-out"></i> <i style="font-size:22px;color:#a3b1cc" v-show="!zoomShow" @click="zoomBox()" class="el-icon-zoom-out"></i>
</div>
</div>
<div>
<div style="display:inline-block;">
<interactBar :data="caseDetail" :type="3" :comments="false" :shares="true" :unicom="true"></interactBar>
</div>
<div style="display:inline-block;margin: 0 20px;">
<el-button type="primary" @click="goTop()">返回顶部</el-button>
</div>
</div>
</div>
</div> </div>
</div> </div>
<div> <!-- :authorId="articleDetailData.sysCreateAid" -->
<div style="display:inline-block;"> <div id="comments-box">
<interactBar :data="caseDetail" :type="3" :comments="false" :shares="true" :unicom="true"></interactBar> <el-row><comments @success="success" v-if="resolveId != ''" :obj-type="3" :obj-id="resolveId" :authorId="caseDetail.authorId" :toUsers="toUsers"></comments></el-row>
</div>
<div style="display:inline-block;margin: 0 20px;">
<el-button type="primary" @click="goTop()">返回顶部</el-button>
</div>
</div> </div>
</div> </el-col>
</el-row>
<div v-else>
<el-empty :image-size="200"></el-empty>
</div> </div>
</div> </div>
<!-- :authorId="articleDetailData.sysCreateAid" -->
<div id="comments-box">
<el-row><comments @success="success" v-if="resolveId != ''" :obj-type="3" :obj-id="resolveId" :authorId="caseDetail.authorId" :toUsers="toUsers"></comments></el-row>
</div>
</el-col>
</el-row>
</div>
<div style="width: 245px;margin-left: 5px;" :class="zoomShow?'':'fixd-box-show'"> <div style="width: 245px;margin-left: 5px;" :class="zoomShow?'':'fixd-box-show'">
<div> <div>
<div id="fixd-box"> <div id="fixd-box">
@@ -95,7 +98,7 @@
<img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/> <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
<span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span> <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
</el-col> </el-col>
<el-tooltip :enterable="false" effect="light" :content="item.sysCreateUname" placement="top-start"> <el-tooltip :enterable="false" effect="light" :content="item.sysCreateUname" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
<el-col :span="15" class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col> <el-col :span="15" class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
</el-tooltip> </el-tooltip>
<!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> --> <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -119,7 +122,7 @@
<img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/> <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
<span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span> <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
</el-col> </el-col>
<el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start"> <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
<el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col> <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
</el-tooltip> </el-tooltip>
<!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> --> <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -143,7 +146,7 @@
<img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/> <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
<span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span> <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
</el-col> </el-col>
<el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start"> <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
<el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col> <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
</el-tooltip> </el-tooltip>
<!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> --> <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -184,6 +187,7 @@ export default {
}, },
data() { data() {
return { return {
noData:true,
zoomShow:true, zoomShow:true,
isTopBoxShow:true, isTopBoxShow:true,
toUsers:[], toUsers:[],
@@ -363,6 +367,7 @@ export default {
} }
}else{ }else{
this.noData=false;
this.$message.error(res.message) this.$message.error(res.message)
} }
}); });

View File

@@ -147,7 +147,7 @@
<img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/> <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
<span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span> <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
</el-col> </el-col>
<el-tooltip :enterable="false" effect="light" :content="item.sysCreateUname" placement="top-start"> <el-tooltip :enterable="false" effect="light" :content="item.sysCreateUname" :visible-arrow="false" popper-class="text-tooltip" placement="bottom">
<el-col :span="15" class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col> <el-col :span="15" class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
</el-tooltip> </el-tooltip>
<!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> --> <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -171,7 +171,7 @@
<img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/> <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
<span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span> <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
</el-col> </el-col>
<el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start"> <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
<el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col> <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
</el-tooltip> </el-tooltip>
<!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> --> <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -195,7 +195,7 @@
<img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/> <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
<span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span> <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
</el-col> </el-col>
<el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start"> <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
<el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col> <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
</el-tooltip> </el-tooltip>
<!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> --> <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -642,13 +642,6 @@ export default {
} }
}); });
}, },
getAnkingData() {
apiCase.usernameList(10).then(res => {
if (res.status == 200) {
this.ankingList = res.result;
}
});
},
getPopularity() { getPopularity() {
apiCase.queryPraises(5).then(res => { apiCase.queryPraises(5).then(res => {
if (res.status == 200) { if (res.status == 200) {

View File

@@ -217,7 +217,7 @@
<img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/> <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
<span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span> <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
</el-col> </el-col>
<el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="top-start"> <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
<el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col> <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col>
</el-tooltip> </el-tooltip>
<!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> --> <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -241,7 +241,7 @@
<img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/> <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
<span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span> <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
</el-col> </el-col>
<el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="top-start"> <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
<el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col> <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col>
</el-tooltip> </el-tooltip>
<!-- <el-col class="center" :span="5">{{ item.studys }}</el-col> --> <!-- <el-col class="center" :span="5">{{ item.studys }}</el-col> -->
@@ -266,7 +266,7 @@
<img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/> <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
<span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span> <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
</el-col> </el-col>
<el-tooltip :enterable="false" @click.native="jumpRouter2(item)" effect="light" :content="item.courseName" placement="top-start"> <el-tooltip :enterable="false" @click.native="jumpRouter2(item)" effect="light" :content="item.courseName" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
<el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.courseName }}</el-col> <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.courseName }}</el-col>
</el-tooltip> </el-tooltip>
<!-- <el-col class="center" :span="5">{{ item.counts }}</el-col> --> <!-- <el-col class="center" :span="5">{{ item.counts }}</el-col> -->

View File

@@ -8,7 +8,7 @@
</el-breadcrumb> </el-breadcrumb>
<div class="xrow" style="display: flex;justify-content: space-between;"> <div class="xrow" style="display: flex;justify-content: space-between;">
<div style="flex: 1;"> <div style="flex: 1;">
<el-row> <el-row v-if="noData">
<el-card :body-style="{ padding: '0px' }" class="detail"> <el-card :body-style="{ padding: '0px' }" class="detail">
<div class="title" > <div class="title" >
<span class="qa-basic" :class="detailData.isResolve ? 'qa-solve' : 'qa-unSolve'"> <span class="qa-basic" :class="detailData.isResolve ? 'qa-solve' : 'qa-unSolve'">
@@ -189,7 +189,10 @@
</div> </div>
</div> </div>
</div> </div>
</el-row> </el-row>
<div v-else>
<el-empty :image-size="200"></el-empty>
</div>
</div> </div>
<div style="width: 245px;margin-left: 5px;"> <div style="width: 245px;margin-left: 5px;">
<el-row> <el-row>
@@ -287,6 +290,7 @@ export default {
}, },
data() { data() {
return { return {
noData:true,
qaFormCheckedShow: false, qaFormCheckedShow: false,
checked: false, checked: false,
// sex:null, // sex:null,
@@ -424,12 +428,14 @@ export default {
res.result.avatar = ""; res.result.avatar = "";
res.result.name = ""; res.result.name = "";
res.result.orgInfo = ""; res.result.orgInfo = "";
res.result.sex = null; res.result.sex = null;
this.detailData = res.result; this.detailData = res.result;
if (JSON.stringify(this.detailData) != "{}") { if (JSON.stringify(this.detailData) != "{}") {
this.getQaUserData(this.detailData); this.getQaUserData(this.detailData);
} }
}else{
this.noData = false;
this.$message.error(res.message);
} }
}); });
}, },

View File

@@ -408,12 +408,13 @@ export default {
res.result.avatar = ""; res.result.avatar = "";
res.result.name = ""; res.result.name = "";
res.result.orgInfo = ""; res.result.orgInfo = "";
res.result.sex = null; res.result.sex = null;
this.detailData = res.result; this.detailData = res.result;
if (JSON.stringify(this.detailData) != "{}") { if (JSON.stringify(this.detailData) != "{}") {
this.getQaUserData(this.detailData); this.getQaUserData(this.detailData);
} }
}else{
this.$message.error(res.message);
} }
}); });
}, },