Commit 96d073d2 authored by xinzhedeai's avatar xinzhedeai

bug fix

parent d27e07b0
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<el-button type="primary" size="mini">查询</el-button> <el-button type="primary" size="mini">查询</el-button>
</div> </div>
<el-table <el-table
highlight-current-row
ref="table" ref="table"
style="width: 100%" style="width: 100%"
:data="dataList" :data="dataList"
...@@ -43,6 +44,7 @@ ...@@ -43,6 +44,7 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-button <el-button
type="primary" type="primary"
size="mini"
@click="saveFolderAuth" @click="saveFolderAuth"
:loading="menuLoading" :loading="menuLoading"
>保存</el-button >保存</el-button
...@@ -60,36 +62,45 @@ ...@@ -60,36 +62,45 @@
> >
<div class="custom-tree-node" slot-scope="{ node, data }"> <div class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ node.label }}</span> <span>{{ node.label }}</span>
<div class="authButtonWrapper">
<el-button
:type="`${data.viewWhether ? 'primary' : 'default'}`"
icon="el-icon-view"
circle
size="small"
style="margin-left: 40px"
@click="data.editWhether = true"
></el-button>
<el-button <el-button
:type="`${data.editWhether ? 'primary' : 'default'}`" :type="`${data.editWhether ? 'primary' : 'default'}`"
icon="el-icon-edit" icon="el-icon-edit"
circle circle
size="mini" size="small"
style="margin-left: 40px"
@click="data.editWhether = true" @click="data.editWhether = true"
></el-button> ></el-button>
<el-button <el-button
:type="`${data.deleteWhether ? 'primary' : 'default'}`" :type="`${data.deleteWhether ? 'primary' : 'default'}`"
icon="el-icon-delete" icon="el-icon-delete"
circle circle
size="mini" size="small"
@click="data.deleteWhether = true" @click="data.deleteWhether = true"
></el-button> ></el-button>
<el-button <el-button
:type="`${data.uploadWhether ? 'primary' : 'default'}`" :type="`${data.uploadWhether ? 'primary' : 'default'}`"
icon="el-icon-upload2" icon="el-icon-upload2"
circle circle
size="mini" size="small"
@click="data.uploadWhether = true" @click="data.uploadWhether = true"
></el-button> ></el-button>
<el-button <el-button
:type="`${data.downloadWhether ? 'primary' : 'default'}`" :type="`${data.downloadWhether ? 'primary' : 'default'}`"
icon="el-icon-download" icon="el-icon-download"
circle circle
size="mini" size="small"
@click="data.downloadWhether = true" @click="data.downloadWhether = true"
></el-button> ></el-button>
</div> </div>
</div>
</el-tree> </el-tree>
</el-card> </el-card>
</el-col> </el-col>
...@@ -138,11 +149,10 @@ export default { ...@@ -138,11 +149,10 @@ export default {
text: "加载中...", text: "加载中...",
background: "transparent", background: "transparent",
}); });
this.currentUserId = val.id this.currentUserId = val.id;
// this.dataList = []; // this.dataList = [];
this.getFolderByUserId(); this.getFolderByUserId();
loading.close(); loading.close();
} }
}, },
// 当前页的条数变化 // 当前页的条数变化
...@@ -169,9 +179,11 @@ export default { ...@@ -169,9 +179,11 @@ export default {
}, },
getFolderByUserId() { getFolderByUserId() {
edocApi.getDataList({ edocApi
.getDataList({
userId: this.currentUserId, userId: this.currentUserId,
}).then((res) => { })
.then((res) => {
this.folders = res.body; this.folders = res.body;
}); });
// edocApi // edocApi
...@@ -224,7 +236,7 @@ export default { ...@@ -224,7 +236,7 @@ export default {
.catch((err) => { .catch((err) => {
this.menuLoading = false; this.menuLoading = false;
}); });
loading.close() loading.close();
}, },
}, },
}; };
...@@ -233,5 +245,14 @@ export default { ...@@ -233,5 +245,14 @@ export default {
<style rel="stylesheet/scss" lang="scss" scoped> <style rel="stylesheet/scss" lang="scss" scoped>
</style> ::v-deep .custom-tree-node {
width: 100%;
}
.authButtonWrapper {
float: right;
}
::v-deep .el-tree-node__content {
height: 36px;
}
</style>
\ No newline at end of file
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
class="filter-item" class="filter-item"
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
<date-range-picker v-model="query.createTime" class="date-item" /> <date-range-picker v-model="query.time" class="date-item" />
<el-input <el-input
v-model="query.name" v-model="query.name"
size="small" size="small"
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
prop="classification" prop="classification"
width="100" width="100"
/> />
<el-table-column width="200px" prop="createTime" label="录入时间" /> <el-table-column width="200px" prop="time" label="录入时间" />
<el-table-column label="操作" width="230px" align="center"> <el-table-column label="操作" width="230px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -216,9 +216,9 @@ export default { ...@@ -216,9 +216,9 @@ export default {
return { return {
modalBtnLoad: false, modalBtnLoad: false,
query:{ query:{
name: '', originallyName: '',
type:'', type:'',
createTime: '' time: ''
}, },
folderModal: false, folderModal: false,
folderForm: { folderForm: {
...@@ -307,10 +307,10 @@ export default { ...@@ -307,10 +307,10 @@ export default {
}, },
addFolder() { addFolder() {
if (!this.currentCheckedFolderId) { // if (!this.currentCheckedFolderId) {
this.$message.warning("请勾选文件夹"); // this.$message.warning("请勾选文件夹");
return; // return;
} // }
this.folderModal = true; this.folderModal = true;
this.folderForm = { name: "", order: "" }; this.folderForm = { name: "", order: "" };
}, },
...@@ -420,7 +420,7 @@ export default { ...@@ -420,7 +420,7 @@ export default {
page: this.page, page: this.page,
size: this.size, size: this.size,
...this.query, ...this.query,
createTime: this.query.createTime ? this.query.createTime.join(',') : '' time: this.query.time ? this.query.time.join(',') : ''
}) })
.then((res) => { .then((res) => {
this.fileDataList = res.body.results; this.fileDataList = res.body.results;
......
...@@ -288,11 +288,11 @@ ...@@ -288,11 +288,11 @@
<el-pagination <el-pagination
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:current-page.sync="searchParam.page" :current-page.sync="searchParam.page"
:page-size.sync="searchParam.count" :page-size.sync="searchParam.size"
:total="searchResult.total" :total="searchResult.total"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@size-change="searchSubmit" @size-change="handleSizeChange"
@current-change="searchSubmit" @current-change="handleCurrentChange"
/> />
</div> </div>
</template> </template>
...@@ -378,6 +378,16 @@ export default { ...@@ -378,6 +378,16 @@ export default {
}); });
}, },
methods: { methods: {
// 当前页的条数变化
handleSizeChange(val) {
this.searchParam.size = val;
this.searchSubmit();
},
// 当前第几页
handleCurrentChange(val) {
this.searchParam.page = val;
this.searchSubmit();
},
getMineTypeByMineId(mineId){ getMineTypeByMineId(mineId){
return this.mineList.find((item)=>{ return this.mineList.find((item)=>{
return item.id === mineId return item.id === mineId
......
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