Commit a2cdae5c by xiongyuwen

no message

parent b13c5686
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
// 获取cookies拿到token // 获取cookies拿到token
var token = this.getCookie("BailunToken"); var token = this.getCookie("BailunToken");
var token = var token =
"Bearer%20eyJhbGciOiJSUzI1NiIsImtpZCI6IjQ1ZmMzZDYzYjRmNGM5YjAzMWVhNjQ0MzhhNTE1NmM3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE2MTAxNzMxNTAsImV4cCI6MTYxMDIwOTE1MCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi54aK6KOV5paHIiwiYXV0aF90aW1lIjoxNjEwMTczMTUwLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjI5MjEyNzAiLCJXeFVzZXJJZCI6Inhpb25neXV3ZW4iLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-56eR5oqA5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDE4ODQiLCJVc2VyQ29kZSI6IkJMNTU2NjkyMiIsIk9hVXNlcklkIjoiMzk4OCIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTYsXCJOYW1lXCI6XCLliIrnmbvlsI_nu4RcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.LWd_QutKJiG_zgE8kW2om5I5SB-rEA-c4LHvDZ0CzMLDGNNq-n40WodpD6W3W0nncKSObmvAycGo4Ko5bboAdP4zJykpoHEqSZ2naOZGwpvq8YnE50Ce0Nw1QgLWm0sXdNK6AfxItT04MOqjmhGrZ3KkQsS6VujXFCxBq1Mt2aVjhAgZjH5MKNMrPBuFN2h1l-fDWsjDoJw7JBNQQOJ2PlXHTCXIKLN3GzLt7VTmUa1Up8UozfoXu2k5Vzl5tCrNgGIUAmgdvME_I_eE3M-Klmqa6Tb2XfSRGqkmc7fnbF79ni4YtvxgYhQHAl-v9BNJF3OtQKXnGtGSaUC8rMTxzg"; "Bearer%20eyJhbGciOiJSUzI1NiIsImtpZCI6IjQ1ZmMzZDYzYjRmNGM5YjAzMWVhNjQ0MzhhNTE1NmM3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE2MTAxNzMxNTAsImV4cCI6MTYxMDIwOTE1MCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi54aK6KOV5paHIiwiYXV0aF90aW1lIjoxNjEwMTczMTUwLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjI5MjEyNzAiLCJXeFVzZXJJZCI6Inhpb25neXV3ZW4iLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-56eR5oqA5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDE4ODQiLCJVc2VyQ29kZSI6IkJMNTU2NjkyMiIsIk9hVXNlcklkIjoiMzk4OCIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTYsXCJOYW1lXCI6XCLliIrnmbvlsI_nu4RcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.LWd_QutKJiG_zgE8kW2om5I5SB-rEA-c4LHvDZ0CzMLDGNNq-n40WodpD6W3W0nncKSObmvAycGo4Ko5bboAdP4zJykpoHEqSZ2naOZGwpvq8YnE50Ce0Nw1QgLWm0sXdNK6AfxItT04MOqjmhGrZ3KkQsS6VujXFCxBq1Mt2aVjhAgZjH5MKNMrPBuFN2h1l-fDWsjDoJw7JBNQQOJ2PlXHTCXIKLN3GzLt7VTmUa1Up8UozfoXu2k5Vzl5tCrNgGIUAmgdvME_I_eE3M-Klmqa6Tb2XfSRGqkmc7fnbF79ni4YtvxgYhQHAl-v9BNJF3OtQKXnGtGSaUC8rMTxzg";
var token = token.replace("Bearer%20", "").replace("Bearer ", ""); var token = token.replace("Bearer%20", "").replace("Bearer ", "");
if (token) { if (token) {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
/> />
</div> </div>
<div v-if="isfile == false"> <div v-if="isfile == false">
<img :src="fileUrl" class="detail-content-right-text" /> <img :src="fileUrl" class="detail-content-right-img" />
</div> </div>
</div> </div>
<viewer <viewer
...@@ -331,6 +331,10 @@ export default { ...@@ -331,6 +331,10 @@ export default {
width: 100%; width: 100%;
height: 600px; height: 600px;
} }
.detail-content-right-img {
width: auto;
height: 100%;
}
article { article {
margin-top: 20px; margin-top: 20px;
......
...@@ -5,5 +5,6 @@ export default { ...@@ -5,5 +5,6 @@ export default {
DEV_API_URL: 'http://discuz.bailuntec.com', DEV_API_URL: 'http://discuz.bailuntec.com',
// ssr api url // ssr api url
SSR_API_URL: 'http://discuz.bailuntec.com', SSR_API_URL: 'http://discuz.bailuntec.com',
WEI_PAN_URL: 'http://localhost:5008' //WEI_PAN_URL: 'http://localhost:5008'
WEI_PAN_URL: 'http://pps.bailuntec.com/DiscuzApi'
}; };
<template> <template>
<div class="knowledge"> <div class="knowledge" v-loading="loading">
<div class="knowledge-list"> <div class="knowledge-list" >
<div <div
v-for="(item, index) in knowledgeList" v-for="(item, index) in knowledgeList"
:key="index" :key="index"
...@@ -30,13 +30,14 @@ ...@@ -30,13 +30,14 @@
</template> </template>
<script> <script>
import axios from "@/plugins/axios.js"; import axios from "@/plugins/axios.js";
import config from '@/config.js'; import config from "@/config.js";
export default { export default {
data() { data() {
return { return {
userId: this.$store.getters["session/get"]("userId"), // 获取当前登陆用户的ID userId: this.$store.getters["session/get"]("userId"), // 获取当前登陆用户的ID
userInfo: "", userInfo: "",
qywxUserid: "", qywxUserid: "",
loading:false,
knowledgeList: [], knowledgeList: [],
}; };
}, },
...@@ -45,6 +46,10 @@ export default { ...@@ -45,6 +46,10 @@ export default {
const params = { const params = {
include: "groups,wechat", include: "groups,wechat",
}; };
if (!this.userId) {
this.$message.warning(`请先登录`);
return false;
}
this.$store this.$store
.dispatch("jv/get", [`users/${this.userId}`, { params }]) .dispatch("jv/get", [`users/${this.userId}`, { params }])
.then((res) => { .then((res) => {
...@@ -54,10 +59,12 @@ export default { ...@@ -54,10 +59,12 @@ export default {
this.$message.warning(`请先登录`); this.$message.warning(`请先登录`);
return false; return false;
} }
this.loading=true;
// 调用后台获取文件列表 // 调用后台获取文件列表
axios axios
.get( .get(
config.WEI_PAN_URL+`/weipan/getfirstfilelist?userId=${this.qywxUserid}` config.WEI_PAN_URL +
`/weipan/getfirstfilelist?userId=${this.qywxUserid}`
) )
.then((res) => { .then((res) => {
if (res.data.result.file_list != null) { if (res.data.result.file_list != null) {
...@@ -75,9 +82,11 @@ export default { ...@@ -75,9 +82,11 @@ export default {
}; };
this.knowledgeList.push(knowledge); this.knowledgeList.push(knowledge);
} }
this.loading=false;
}); });
} else { } else {
this.$message.warning(`当前微盘无文件`); this.$message.warning(`当前微盘无文件`);
this.loading=false;
} }
}); });
}); });
...@@ -128,6 +137,10 @@ export default { ...@@ -128,6 +137,10 @@ export default {
margin-left: 10px; margin-left: 10px;
float: left; float: left;
&-title { &-title {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 200px;
margin-bottom: 5px; margin-bottom: 5px;
&:hover { &:hover {
cursor: pointer; cursor: pointer;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
</div> </div>
<div class="detail-content-right"> <div class="detail-content-right" v-loading="showViewloading">
<div v-if="isShowView"> <div v-if="isShowView">
<el-button size="small" style="ma" @click="openNewForm"> <el-button size="small" style="ma" @click="openNewForm">
全屏查看 全屏查看
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/> />
</div> </div>
<div v-if="isfile == false"> <div v-if="isfile == false">
<img :src="fileSrc" class="detail-content-right-text" /> <img :src="fileSrc" class="detail-content-right-img" />
</div> </div>
</div> </div>
<el-input <el-input
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
data() { data() {
return { return {
loading: false, loading: false,
showViewloading:false,
isShowView: false, isShowView: false,
isfile: true, isfile: true,
fileSrc: "", fileSrc: "",
...@@ -121,11 +122,13 @@ export default { ...@@ -121,11 +122,13 @@ export default {
}, },
handleNodeClick(data) { handleNodeClick(data) {
if (data.file) { if (data.file) {
this.showViewloading=true;
axios axios
.get( .get(
config.WEI_PAN_URL+`/weipan/getviewfile?userId=${this.qywxUserid}&fileId=${data.id}&md5=${data.md5}&fileName=${data.label}` config.WEI_PAN_URL+`/weipan/getviewfile?userId=${this.qywxUserid}&fileId=${data.id}&md5=${data.md5}&fileName=${data.label}`
) )
.then((res) => { .then((res) => {
this.showViewloading=false;
if (!!res.data) { if (!!res.data) {
let filePath = res.data.result; let filePath = res.data.result;
if (!!filePath) { if (!!filePath) {
...@@ -165,7 +168,7 @@ export default { ...@@ -165,7 +168,7 @@ export default {
</script> </script>
<style> <style>
.detail-content-left-text .el-tree-node__expand-icon { .detail-content-left-text .el-tree-node__expand-icon {
display: none; color: #c0c4cc;
} }
/* .detail-content-left-text /* .detail-content-left-text
...@@ -220,6 +223,10 @@ export default { ...@@ -220,6 +223,10 @@ export default {
width: 100%; width: 100%;
height: 700px; height: 700px;
} }
&-img{
width:auto;
height:100%;
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment