Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

导入浏览器书签

Browse Source
This commit is contained in:
WangHao
2021-02-13 20:00:25 +08:00
parent 87b4e38462
commit 38e4f2aa04
12 changed files with 294 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-ui/src/views/bookmark/bookmark/index.vue
View File

@ -751,12 +751,12 @@
getrecycleList() {
this.loading = true;
selectBydelete(this.queryParams).then(response => {
if (response.total != 0 &&response.code == 200) {
if (response.code == 200) {
this.bookmarkList = this.bookmarkList.concat(response.rows);
this.total = response.total;
this.listloading = false
this.loading = false;
console.log("请求完毕" + that.queryParams.pageNum)
console.log("请求完毕" + this.queryParams.pageNum)
} else {
//出错了加载完毕了 禁止滚动
this.noMore = true;
@ -774,7 +774,7 @@
this.total = response.total;
this.listloading = false
this.loading = false;
console.log("请求完毕" + that.queryParams.pageNum)
console.log("请求完毕" + this.queryParams.pageNum)
} else {
//出错了加载完毕了 禁止滚动
this.noMore = true;
@ -827,16 +827,19 @@
getList() {
this.loading = true;
selectBymenuIdUserID(this.queryParams).then(response => {
if (response.code == 200) {
if (response.total != 0 &&response.code == 200) {
this.bookmarkList = response.rows;
this.total = response.total;
this.loading = false;
if (this.bookmarkList==null||this.bookmarkList.length==0) {
this.showimg=true;
}
this.listloading = false
} else {
this.showbookmark = false;
this.showimg = true;
this.loading = false;
this.listloading = false
}
});
},
@ -880,7 +883,7 @@
this.total = response.total;
this.listloading = false
this.loading = false;
console.log("请求完毕" + that.queryParams.pageNum)
console.log("请求完毕" + this.queryParams.pageNum)
} else {
//出错了加载完毕了 禁止滚动
this.noMore = true;

4
ruoyi-ui/src/views/bookmark/common/ImportHtml.vue
View File

@ -29,9 +29,9 @@
<div class="el-upload__tip title" slot="tip">提示：仅允许导入".html"格式文件！</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" class=" mdui-text-center mdui-btn mdui-btn-raised mdui-text-color-blue-900 mdui-color-light-blue-100" @click="submitFileForm">确 定</el-button>
<!-- <el-button type="primary" class=" mdui-text-center mdui-btn mdui-btn-raised mdui-text-color-blue-900 mdui-color-light-blue-100" @click="submitFileForm">确 定</el-button>-->
<!-- <el-button @click="upload.open = false">取 消</el-button>-->
<button @click="submitUpload" class="isbutton mdui-btn mdui-btn-block mdui-btn-raised mdui-btn-dense mdui-color-blue-100 mdui-ripple">导 入 书 签</button>
<button @click="submitFileForm" class="isbutton mdui-btn mdui-btn-block mdui-btn-raised mdui-btn-dense mdui-color-blue-100 mdui-ripple">导 入 书 签</button>
</div>
</div>