修改专辑

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/ImpressionNanan.vue

@@ -24,7 +24,8 @@
             style="cursor: default" @sort-change="sortChange">
             <el-table-column width="50" label="序号">
                 <template slot-scope="scope">
-                    {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
+                    {{(sorts.page-1)*sorts.limit+scope.$index + 1}}
+                    <!-- {{ (currentPage - 1) * pageSize + scope.$index + 1 }} -->
                 </template>
             </el-table-column>
             <el-table-column prop="pictureTitle" label="作品名称" :show-overflow-tooltip="true" width="120">
@@ -107,7 +108,7 @@
         </el-table>
         <div class="block">
             <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                :current-page="sorts.page" :page-sizes="[10, 20, 30, 40, 50]" :page-size="sorts.limit"
                 layout="prev, pager,next,jumper,total,sizes" :total="total">
             </el-pagination>
         </div>
@@ -484,7 +485,6 @@
                                         style="margin-left:20px;height: 40px;margin-right: 30px;line-height: 40px">专辑
                                     </el-checkbox>
                                 </div>
-
                                 <el-select style="width: 149px;" v-model="examdata.albumPeople"
                                     @change="handleSelectChange" v-if="examdata.isAlbum != ''" placeholder="请选择">
                                     <el-option v-for="item in albumPeople" :key="item.value" :label="item.name"
@@ -775,6 +775,18 @@ export default {
             obj: [],
             examdata: {},//审核的数据
             column: null,
+            sorts:{
+                page:1,
+                limit:10,
+                isAlbum:'',
+                examineState:'',
+                pictureType:'',
+                uploadTime:'',
+                updateTime:'',
+                uploaderPhone:'',
+                pictureTitle:'',
+                pictureAuthor:'',
+            },
         }
     },
     methods: {
@@ -789,180 +801,260 @@ export default {
         //排序
         sortChange(column) {
             this.column = { ...column }
-            console.log(column.prop)
+            // console.log(column.prop)
             if (column.prop === 'isAlbum') {
                 if (column.order === "ascending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        isAlbum: 'ASC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     isAlbum: 'ASC'
+                    // }
+                    this.sorts.isAlbum='DESC'
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='';
+                    this.sorts.page = 1
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else if (column.order === "descending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        isAlbum: 'DESC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     isAlbum: 'DESC'
+                    // }
+                    this.sorts.isAlbum='ASC'
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='';
+                    this.sorts.page = 1
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else {
                     this.column = null
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    // }
+                    this.sorts.isAlbum = '';
+                    let params=this.sorts; 
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        this.sorts.page = 1
                     })
                 }
             } else if (column.prop === 'examineState') {
                 if (column.order === "ascending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        examineState: 'ASC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     examineState: 'ASC'
+                    // }
+                    this.sorts.isAlbum=''
+                    this.sorts.examineState='ASC';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='';
+                    this.sorts.page = 1
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else if (column.order === "descending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        examineState: 'DESC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     examineState: 'DESC'
+                    // }
+                    this.sorts.isAlbum=''
+                    this.sorts.examineState='DESC';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='';
+                    this.sorts.page = 1
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else {
                     this.column = null
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    // }
+                    this.sorts.examineState = '';
+                    let params=this.sorts; 
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        this.sorts.page = 1
                     })
                 }
             } else if (column.prop === 'pictureType') {
                 if (column.order === "ascending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        pictureType: 'ASC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     pictureType: 'ASC'
+                    // }
+                    this.sorts.isAlbum=''
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='ASC';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='';
+                    this.sorts.page = 1
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else if (column.order === "descending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        pictureType: 'DESC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     pictureType: 'DESC'
+                    // }
+                    this.sorts.isAlbum=''
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='DESC';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='';
+                    this.sorts.page = 1;
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else {
                     this.column = null
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    // }
+                    this.sorts.pictureType='';
+                     let params=this.sorts; 
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        this.sorts.page = 1
                     })
                 }
             } else if (column.prop === 'uploadTime') {
                 if (column.order === "ascending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        uploadTime: 'ASC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     uploadTime: 'ASC'
+                    // }
+                    this.sorts.isAlbum=''
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='ASC';
+                    this.sorts.updateTime='';
+                    this.sorts.page = 1;
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else if (column.order === "descending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        uploadTime: 'DESC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     uploadTime: 'DESC'
+                    // }
+                    this.sorts.isAlbum=''
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='DESC';
+                    this.sorts.updateTime='';
+                    this.sorts.page = 1;
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else {
                     this.column = null
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    // }
+                    this.sorts.uploadTime='';
+                    let params=this.sorts; 
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                       this.sorts.page = 1
                     })
                 }
             } else if (column.prop === 'updateTime') {
                 if (column.order === "ascending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        updateTime: 'ASC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     updateTime: 'ASC'
+                    // }
+                    this.sorts.isAlbum=''
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='ASC';
+                    this.sorts.page = 1;
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else if (column.order === "descending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        updateTime: 'DESC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    //     updateTime: 'DESC'
+                    // }
+                    this.sorts.isAlbum=''
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='DESC';
+                    this.sorts.page = 1;
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        // this.currentPage = 1
                     })
                 } else {
                     this.column = null
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.pageSize,
+                    // }
+                    this.sorts.updateTime='';
+                    let params=this.sorts;
                     api.getYxnaList({ params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        this.sorts.page = 1;
                     })
                 }
             }
@@ -1154,18 +1246,18 @@ export default {
         openModifyWorkDialog(data) {
             let obj = { ...data }//避免数据缓存
             this.impressionNanan = obj
-            if (this.impressionNanan.isAlbum > 0) {
-                this.impressionNanan.isAlbum = true
-
-            } else {
-                this.impressionNanan.isAlbum = false
-            }
+            // if (this.impressionNanan.isAlbum > 0) {
+            //     this.impressionNanan.isAlbum = true
+            // } else {
+            //     this.impressionNanan.isAlbum = 0
+            // }
 
             this.modifyWorkDialog = true
             if (data.isAlbum == 0) {
                 api.queryAlbum().then(res => {
                     if (res.data.result) {
                         this.albumPeople = res.data.data;
+                        this.impressionNanan.albumPeople = data.isAlbum;
                     }
                 })
             } else {
@@ -1173,7 +1265,6 @@ export default {
                     if (res.data.result) {
                         this.albumPeople = res.data.data;
                         this.impressionNanan.albumPeople = data.isAlbum;
-
                     }
                 })
             }
@@ -1205,52 +1296,85 @@ export default {
 
         //选取条件
         selectRegion() {
-            console.log(this.form.region)
+            // console.log(this.form.region)
         },
 
         //根据条件查询印象南岸
         serachWork() {
             if (this.form.region !== '') {
                 if (this.form.region === 'uploaderPhone') {
-                    let params = {
-                        page: 1,
-                        limit: 10,
-                        uploaderPhone: this.form.name
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: 10,
+                    //     uploaderPhone: this.form.name
+                    // }
+                    this.sorts.uploaderPhone = this.form.name;
+                    this.sorts.pictureTitle = '';
+                    this.sorts.pictureAuthor = '';
+                    this.sorts.page = 1;
+                    let params = this.sorts;
                     api.queryWork({ params }).then(res => {
                         this.total = res.data.count
                         this.tableData = res.data.data
                     })
                 }
                 if (this.form.region === 'pictureTitle') {
-                    let params = {
-                        page: 1,
-                        limit: 10,
-                        pictureTitle: this.form.name
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: 10,
+                    //     pictureTitle: this.form.name
+                    // }
+                    this.sorts.pictureTitle = this.form.name;
+                    this.sorts.uploaderPhone = '';
+                    this.sorts.pictureAuthor = '';
+                    this.sorts.page = 1;
+                    let params = this.sorts;
                     api.queryWork({ params }).then(res => {
                         this.total = res.data.count
                         this.tableData = res.data.data
-                        console.log(this.tableData);
+                        // console.log(this.tableData);
                     })
                 }
                 if (this.form.region === 'pictureAuthor') {
-                    let params = {
-                        page: 1,
-                        limit: 10,
-                        pictureAuthor: this.form.name
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: 10,
+                    //     pictureAuthor: this.form.name
+                    // }
+                    this.sorts.pictureTitle = '';
+                    this.sorts.uploaderPhone = '';
+                    this.sorts.pictureAuthor = this.form.name;
+                    this.sorts.page = 1;
+                    let params = this.sorts;
                     api.queryWork({ params }).then(res => {
                         this.total = res.data.count
                         this.tableData = res.data.data
-                        console.log(this.tableData);
+                        // console.log(this.tableData);
                     })
                 }
             } else {
                 this.$refs.multipleTable.clearSort();
                 this.column = undefined
-                this.currentPage = 1
-                this.getData()
+                this.sorts.page = 1
+                this.sorts={
+                    page: 1,
+                    limit: 10,
+                    isAlbum:'',
+                    examineState:'',
+                    pictureType:'',
+                    uploadTime:'',
+                    updateTime:'',
+                    uploaderPhone:'',
+                    pictureTitle:'',
+                    pictureAuthor:'',
+                }
+                let params = this.sorts 
+                // this.getData()
+                api.queryWork({ params }).then(res => {
+                        this.total = res.data.count
+                        this.tableData = res.data.data
+                        // console.log(this.tableData);
+                    })
             }
 
         },
@@ -1261,7 +1385,7 @@ export default {
             let obj = { ...data }
             this.examdata = obj
             if (this.examdata.isAlbum > 0) {
-                console.log(this.examdata)
+                // console.log(this.examdata)
                 api.queryAlbum().then(res => {
                     if (res.data.result) {
                         this.albumPeople = res.data.data;
@@ -1300,198 +1424,208 @@ export default {
 
         //显示每条数据
         handleSizeChange(pageSize) {
-            this.pageSize = pageSize;
-            this.currentPage = 1;
-            this.getData();
+            this.sorts.limit = pageSize
+            let params = this.sorts;
+            this.sorts.page = 1;
+            api.getYxnaList({ params }).then(r => {
+                this.total = r.data.count
+                this.tableData = r.data.data
+            })
         },
 
         //切换页码
         handleCurrentChange(currentPage) {
             this.$refs.multipleTable.bodyWrapper.scrollTop = 0;
-            this.currentPage = currentPage
-            if (this.column == null) {
-                let params = {
-                    page: this.currentPage,
-                    limit: this.pageSize,
-                }
-                api.getYxnaList({ params }).then(r => {
-                    this.total = r.data.count
-                    this.tableData = r.data.data
-                })
-            } else {
-                if (this.column.prop === 'isAlbum') {
-                    if (this.column.order === "ascending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            isAlbum: 'ASC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else if (this.column === "descending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            isAlbum: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            isAlbum: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    }
-                } else if (this.column.prop === 'examineState') {
-                    if (this.column.order === "ascending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            examineState: 'ASC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else if (this.column.order === "descending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            examineState: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            isAlbum: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    }
-                } else if (this.column.prop === 'pictureType') {
-                    if (this.column.order === "ascending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            pictureType: 'ASC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else if (this.column.order === "descending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            pictureType: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            isAlbum: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    }
-                } else if (this.column.prop === 'uploadTime') {
-                    if (this.column.order === "ascending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            uploadTime: 'ASC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else if (this.column.order === "descending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            uploadTime: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            isAlbum: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    }
-                } else if (this.column.prop === 'updateTime') {
-                    if (this.column.order === "ascending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            updateTime: 'ASC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else if (this.column.order === "descending") {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            updateTime: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                            isAlbum: 'DESC'
-                        }
-                        api.getYxnaList({ params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    }
-                }
-                else {
-                    let params = {
-                        page: this.currentPage,
-                        limit: this.pageSize,
-                        isAlbum: 'DESC'
-                    }
-                    api.getYxnaList({ params }).then(r => {
-                        this.total = r.data.count
-                        this.tableData = r.data.data
-                    })
-                }
-            }
+            this.sorts.page = currentPage;
+            let params = this.sorts;
+            api.getYxnaList({ params }).then(r => {
+                this.total = r.data.count
+                this.tableData = r.data.data
+            })
+            // this.currentPage = currentPage
+            // if (this.column == null) {
+            //     let params = {
+            //         page: this.currentPage,
+            //         limit: this.pageSize,
+            //     }
+            //     api.getYxnaList({ params }).then(r => {
+            //         this.total = r.data.count
+            //         this.tableData = r.data.data
+            //     })
+            // } else {
+            //     if (this.column.prop === 'isAlbum') {
+            //         if (this.column.order === "ascending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 isAlbum: 'ASC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else if (this.column === "descending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 isAlbum: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 isAlbum: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         }
+            //     } else if (this.column.prop === 'examineState') {
+            //         if (this.column.order === "ascending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 examineState: 'ASC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else if (this.column.order === "descending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 examineState: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 isAlbum: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         }
+            //     } else if (this.column.prop === 'pictureType') {
+            //         if (this.column.order === "ascending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 pictureType: 'ASC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else if (this.column.order === "descending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 pictureType: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 isAlbum: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         }
+            //     } else if (this.column.prop === 'uploadTime') {
+            //         if (this.column.order === "ascending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 uploadTime: 'ASC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else if (this.column.order === "descending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 uploadTime: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 isAlbum: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         }
+            //     } else if (this.column.prop === 'updateTime') {
+            //         if (this.column.order === "ascending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 updateTime: 'ASC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else if (this.column.order === "descending") {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 updateTime: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //                 isAlbum: 'DESC'
+            //             }
+            //             api.getYxnaList({ params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         }
+            //     }
+            //     else {
+            //         let params = {
+            //             page: this.currentPage,
+            //             limit: this.pageSize,
+            //             isAlbum: 'DESC'
+            //         }
+            //         api.getYxnaList({ params }).then(r => {
+            //             this.total = r.data.count
+            //             this.tableData = r.data.data
+            //         })
+            //     }
+            // }
         },
         //删除
         handleDelete(id, index) {
@@ -1531,12 +1665,11 @@ export default {
             })
         },
         getData() {
-
             if (this.form.region !== '') {
                 if (this.form.region === 'uploaderPhone') {
                     let params = {
-                        page: this.currentPage,
-                        limit: this.pageSize,
+                        page: this.sorts.page,
+                        limit: this.sorts.limit,
                         uploaderPhone: this.form.name
                     }
                     api.getYxnaList({ params }).then(r => {
@@ -1546,8 +1679,8 @@ export default {
                 }
                 if (this.form.region === 'pictureTitle') {
                     let params = {
-                        page: this.currentPage,
-                        limit: this.pageSize,
+                        page: this.sorts.page,
+                        limit: this.sorts.limit,
                         pictureTitle: this.form.name
                     }
                     api.getYxnaList({ params }).then(r => {
@@ -1557,8 +1690,8 @@ export default {
                 }
                 if (this.form.region === 'pictureAuthor') {
                     let params = {
-                        page: this.currentPage,
-                        limit: this.pageSize,
+                        page: this.sorts.page,
+                        limit: this.sorts.limit,
                         pictureAuthor: this.form.name
                     }
                     api.getYxnaList({ params }).then(r => {
@@ -1568,8 +1701,8 @@ export default {
                 }
             } else {
                 let params = {
-                    page: this.currentPage,
-                    limit: this.pageSize,
+                    page: this.sorts.page,
+                    limit: this.sorts.limit,
                 }
                 api.getYxnaList({ params }).then(r => {
                     this.total = r.data.count
@@ -1586,7 +1719,7 @@ export default {
         reset() {
             this.form.region = ''
             this.form.name = ''
-            this.getData()
+            // this.getData()
         }
     }
     ,

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/administration.vue

@@ -62,7 +62,8 @@
                 :cell-style="tableStyle" style="cursor: default" @sort-change="sortChange">
                 <el-table-column width="50" label="序号">
                     <template slot-scope="scope">
-                        {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
+                        {{(sorts.page-1)*sorts.limit+scope.$index + 1}}
+                        <!-- {{ (currentPage - 1) * pageSize + scope.$index + 1 }} -->
                     </template>
                 </el-table-column>
                 <el-table-column prop="pictureTitle" label="作品名称" :show-overflow-tooltip="true" width="120">
@@ -368,7 +369,7 @@
                         <img :src="fileList[0].url" alt="" style="margin-top: 20px">
                     </div>
                     <div class="imgBox" v-if="fileList.length === 0" style="margin-top: 10px;">
-                        <img :src="`/` + modification.picture" alt="未捕获到地址" style="width: 100%;">
+                        <img :src="`/` + modification.picture" alt="未捕获到地址" style="width: 97%;">
                     </div>
                 </el-form>
             </div>
@@ -583,8 +584,8 @@ export default {
                 // id:id
             }
             // this.tableH = 'calc(100vh - 230px)'
-            this.currentPage = 1;
-            this.pageSize = 10;
+            this.sorts.page = 1;
+            this.sorts.limit = 10;
             api.albumParticulars(this.albumid, { params }).then(r => {
                 this.total = r.data.count
                 this.tableData = r.data.data;
@@ -850,54 +851,7 @@ export default {
             //         })
             //     }
             // }
-            // if (this.form.region != '') {
-            //     if (this.form.region === 'uploaderPhone') {
-            //         let params = {
-            //             page: 1,
-            //             limit: 10,
-            //             phone: this.form.name
-            //         }
-            //         api.albumParticulars(this.albumid, { params }).then(res => {
-            //             this.total = res.data.count
-            //             console.log(res.data)
-            //             this.tableData = res.data.data
-            //         })
-            //     }
-            //     if (this.form.region === 'pictureTitle') {
-            //         let params = {
-            //             page: 1,
-            //             limit: 10,
-            //             title: this.form.name
-            //         }
-            //         api.albumParticulars(this.albumid, { params }).then(res => {
-            //             this.total = res.data.count
-            //             this.tableData = res.data.data
-            //             console.log(this.tableData);
-            //         })
-            //     }
-            //     if (this.form.region === 'pictureAuthor') {
-            //         let params = {
-            //             page: 1,
-            //             limit: 10,
-            //             author: this.form.name
-            //         }
-            //         api.albumParticulars(this.albumid, { params }).then(res => {
-            //             this.total = res.data.count
-            //             this.tableData = res.data.data
-            //             console.log(this.tableData);
-            //         })
-            //     }
-            // } else {
-            //     let params = {
-            //         page: 1,
-            //         limit: 10,
-            //     }
-            //     api.albumParticulars(this.albumid, { params }).then(res => {
-            //         this.total = res.data.count
-            //         this.tableData = res.data.data
-            //         console.log(this.tableData);
-            //     })
-            // }
+
         },
         //查看
         openDialog(id) {
@@ -1005,8 +959,8 @@ export default {
                     this.sorts.pictureType='';
                     this.sorts.uploadTime='';
                     this.sorts.updateTime='';
-                    let params=this.sorts;
                     this.sorts.page = 1
+                    let params=this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1022,8 +976,8 @@ export default {
                     this.sorts.pictureType='';
                     this.sorts.uploadTime='';
                     this.sorts.updateTime='';
-                    let params=this.sorts;
-                     this.sorts.page = 1
+                    this.sorts.page = 1;
+                    let params=this.sorts; 
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1031,10 +985,12 @@ export default {
                     })
                 } else {
                     this.column = null
-                    let params = {
-                        page: 1,
-                        limit: this.sorts.limit,
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.sorts.limit,
+                    // }
+                    this.sorts.examineState = '';
+                    let params=this.sorts; 
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1069,8 +1025,8 @@ export default {
                     this.sorts.pictureType='DESC';
                     this.sorts.uploadTime='';
                     this.sorts.updateTime='';
+                    this.sorts.page = 1;
                     let params=this.sorts;
-                    this.sorts.page = 1
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1078,10 +1034,12 @@ export default {
                     })
                 } else {
                     this.column = null
-                    let params = {
-                        page: 1,
-                        limit: this.sorts.limit,
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.sorts.limit,
+                    // }
+                    this.sorts.pictureType='';
+                    let params=this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1099,8 +1057,9 @@ export default {
                     this.sorts.pictureType='';
                     this.sorts.uploadTime='ASC';
                     this.sorts.updateTime='';
+                    this.sorts.page = 1;
                     let params=this.sorts;
-                    this.sorts.page = 1
+                    
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1113,11 +1072,11 @@ export default {
                     //     uploadTime: 'DESC'
                     // }
                     this.sorts.uploadTime='DESC';
-                    let params=this.sorts;
+                    this.sorts.page = 1
                     this.sorts.examineState='';
                     this.sorts.pictureType='';
                     this.sorts.updateTime='';
-                    this.sorts.page = 1
+                    let params=this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1125,10 +1084,12 @@ export default {
                     })
                 } else {
                     this.column = null
-                    let params = {
-                        page: 1,
-                        limit: this.sorts.limit,
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.sorts.limit,
+                    // }
+                    this.sorts.uploadTime='';
+                    let params=this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1146,8 +1107,8 @@ export default {
                     this.sorts.pictureType='';
                     this.sorts.uploadTime='';
                     this.sorts.updateTime='ASC';
-                    let params=this.sorts;
                     this.sorts.page = 1;
+                    let params=this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1163,8 +1124,8 @@ export default {
                     this.sorts.pictureType='';
                     this.sorts.uploadTime='';
                     this.sorts.updateTime='DESC';
-                    let params=this.sorts;
                     this.sorts.page = 1;
+                    let params=this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1172,10 +1133,12 @@ export default {
                     })
                 } else {
                     this.column = null
-                    let params = {
-                        page: 1,
-                        limit: this.sorts.limit,
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.sorts.limit,
+                    // }
+                    this.sorts.updateTime='';
+                    let params=this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
@@ -1228,14 +1191,14 @@ export default {
         reset() {
             this.form.region = '';
             this.form.name = '';
-            let params = {
-                page: 1,
-                limit: 10,
-            }
-            api.albumParticulars(this.albumid, { params }).then(r => {
-                this.total = r.data.count
-                this.tableData = r.data.data;
-            })
+            // let params = {
+            //     page: 1,
+            //     limit: 10,
+            // }
+            // api.albumParticulars(this.albumid, { params }).then(r => {
+            //     this.total = r.data.count
+            //     this.tableData = r.data.data;
+            // })
         },
         //根据条件查询印象南岸专辑
         serachWork() {
@@ -1246,8 +1209,11 @@ export default {
                     //     limit: 10,
                     //     phone: this.form.name
                     // }
-                    this.sorts.phone = this.form.name
-                    let params = this.sorts
+                    this.sorts.phone = this.form.name;
+                    this.sorts.title = '';
+                    this.sorts.author = '';
+                    this.sorts.page = 1;
+                    let params = this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(res => {
                         this.total = res.data.count
                         // console.log(res.data)
@@ -1260,8 +1226,11 @@ export default {
                     //     limit: 10,
                     //     title: this.form.name
                     // }
-                    this.sorts.title = this.form.name
-                    let params = this.sorts
+                    this.sorts.title = this.form.name;
+                    this.sorts.phone = '';
+                    this.sorts.author = '';
+                    this.sorts.page = 1;
+                    let params = this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(res => {
                         this.total = res.data.count
                         this.tableData = res.data.data
@@ -1274,8 +1243,11 @@ export default {
                     //     limit: 10,
                     //     author: this.form.name
                     // }
-                    this.sorts.author = this.form.name
-                    let params = this.sorts
+                    this.sorts.author = this.form.name;
+                    this.sorts.phone = '';
+                    this.sorts.title = '';
+                    this.sorts.page = 1;
+                    let params = this.sorts;
                     api.albumParticulars(this.albumid, { params }).then(res => {
                         this.total = res.data.count
                         this.tableData = res.data.data
@@ -1285,11 +1257,18 @@ export default {
             } else {
                 this.$refs.multipleTable.clearSort();
                 this.column = undefined
-                this.sorts.page = 1
-                let params = {
+                this.sorts={
                     page: 1,
                     limit: 10,
+                    examineState:'',
+                    pictureType:'',
+                    uploadTime:'',
+                    updateTime:'',
+                    phone:'',
+                    title:'',
+                    author:'',
                 }
+                let params = this.sorts 
                 api.albumParticulars(this.albumid, { params }).then(res => {
                     this.total = res.data.count
                     this.tableData = res.data.data
@@ -1311,17 +1290,10 @@ export default {
             this.albumid = value.id
             this.upBackground = true;
             this.modification = JSON.parse(JSON.stringify(value));
-
+            this.fileList=[];
         },
         beforeUpload(file) {
-            if (file.size > 5242880) {
-                _this.$message({
-                    message: '文件过大！',
-                    offset: 150,
-                    duration: 1500
-                });
-                return;
-            }
+            
             let fd = new FormData();
             fd.append('file', file);
             fd.append('id', this.albumid);//传文件
@@ -1337,8 +1309,6 @@ export default {
                         this.albumTableData = res.data.data;
                     })
                     this.$message.success('修改成功')
-
-
                     // this.addWorkDialog = false;
                 } else {
                     this.$message.error("修改失败")
@@ -1350,6 +1320,14 @@ export default {
         },
         //覆盖上一次选择的图片
         onChange(file, fileList) {
+            if (file.size > 5242880) {
+                this.$message({
+                    message: '文件过大！',
+                    offset: 150,
+                    duration: 1500
+                });
+                return;
+            }
             if (fileList.length > 0) {
                 this.fileList = [fileList[fileList.length - 1]]
             }
@@ -1367,36 +1345,39 @@ export default {
                 this.$message.error('专辑名称不能为空')
                 return;
             }
-            if (this.fileList.length > 0) {
+            if (this.fileList.length > 0  ) {
                 this.$refs.upload.submit();
-                this.upBackground = false;
-            } else {
-                let fd = new FormData();
-                fd.append('picture', this.modification.picture);
-                fd.append('id', this.albumid);//传文件
-                fd.append('name', this.modification.name);
-                api.albumRedact(fd).then((r) => {
-                    if (r.data.result) {
-                        this.$message.success('修改成功')
-                        this.upBackground = false;
-                        let params = {
-                            page: 1,
-                            limit: 10
-                        }
-                        api.queryAlbum({ params }).then(res => {
-                            this.total = res.data.count;
-                            this.albumTableData = res.data.data;
-                        })
-                    } else {
-                        this.$message.error("修改失败");
-                        this.upBackground = false;
-                    }
-                }).catch(() => {
-                    this.$message.error("修改失败");
+                setTimeout(()=>{
                     this.upBackground = false;
-                })
-                return false  //屏蔽了action的默认上传
+                },800)
             }
+            //  else {
+            //     let fd = new FormData();
+            //     fd.append('picture', this.modification.picture);
+            //     fd.append('id', this.albumid);//传文件
+            //     fd.append('name', this.modification.name);
+            //     api.albumRedact(fd).then((r) => {
+            //         if (r.data.result) {
+            //             this.$message.success('修改成功')
+            //             this.upBackground = false;
+            //             let params = {
+            //                 page: 1,
+            //                 limit: 10
+            //             }
+            //             api.queryAlbum({ params }).then(res => {
+            //                 this.total = res.data.count;
+            //                 this.albumTableData = res.data.data;
+            //             })
+            //         } else {
+            //             this.$message.error("修改失败");
+            //             this.upBackground = false;
+            //         }
+            //     }).catch(() => {
+            //         this.$message.error("修改失败");
+            //         this.upBackground = false;
+            //     })
+            //     return false  //屏蔽了action的默认上传
+            // }
         },
 
 
@@ -1404,6 +1385,7 @@ export default {
         albumNewlyIncreased() {
             this.albumNewlyIncreaseds = true;
             this.addWorkDialogs.ablumNames = '';
+            this.fileList=[];
         },
 
         addBeforeUpload(file) {
@@ -1494,7 +1476,9 @@ export default {
     overflow-y: auto;
     height: 65vh;
 }
-
+.el-form-item__content{
+    width: 80%;
+}
 .yxnaAlbum {
     padding: 10px;
 }

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/vue.config.js

@@ -8,9 +8,9 @@ module.exports = {
         proxy: {
             '/': {
                 // target:'http://192.168.0.230:7777/',//开发
-                // target:'http://192.168.0.7:7777/',//开发
+                target:'http://192.168.0.7:7777/',//开发
                 // target:'http://192.168.1.253:7777/',//测试
-                target:'http://data.cqna.gov.cn/',//线上
+                // target:'http://data.cqna.gov.cn/',//线上
                 changeOrigin: true,
                 pathRewrite: {
                     '^ /': ''

nngkxxdp/src/main/resources/static/yxnaht/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="css/app.6ab9f119.css" rel="preload" as="style"><link href="css/chunk-vendors.058a81fe.css" rel="preload" as="style"><link href="js/app.d83540ae.js" rel="preload" as="script"><link href="js/chunk-vendors.4c187b39.js" rel="preload" as="script"><link href="css/chunk-vendors.058a81fe.css" rel="stylesheet"><link href="css/app.6ab9f119.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.4c187b39.js"></script><script src="js/app.d83540ae.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="css/app.63eb2fd2.css" rel="preload" as="style"><link href="css/chunk-vendors.058a81fe.css" rel="preload" as="style"><link href="js/app.59883f09.js" rel="preload" as="script"><link href="js/chunk-vendors.4c187b39.js" rel="preload" as="script"><link href="css/chunk-vendors.058a81fe.css" rel="stylesheet"><link href="css/app.63eb2fd2.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.4c187b39.js"></script><script src="js/app.59883f09.js"></script></body></html>