改为线上

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

@@ -19,7 +19,7 @@
             </div>
         </div>
         <!--        表格-->
-        <el-table :data="tableData" border  ref='multipleTable' :height="tableH" stripe
+        <el-table :data="tableData" border ref='multipleTable' :height="tableH" stripe
             :header-cell-style="{ background: '#e5e8ed', color: '#666', textAlign: 'center' }" :cell-style="tableStyle"
             style="cursor: default" @sort-change="sortChange">
             <el-table-column width="50" label="序号">
@@ -29,7 +29,8 @@
             </el-table-column>
             <el-table-column prop="pictureTitle" label="作品名称" :show-overflow-tooltip="true" width="120">
             </el-table-column>
-            <el-table-column prop="pictureAuthor" label="作品作者" :show-overflow-tooltip="true" width="100"></el-table-column>
+            <el-table-column prop="pictureAuthor" label="作品作者" :show-overflow-tooltip="true" width="100">
+            </el-table-column>
             <el-table-column prop="uploaderPhone" label="作者电话" :show-overflow-tooltip="true" width="120">
             </el-table-column>
             <el-table-column prop="pictureDescription" label="作品描述" width="200" :show-overflow-tooltip="true">
@@ -225,7 +226,8 @@
         </el-dialog>
 
         <!--        查看-->
-        <el-dialog :visible.sync="dialogTableVisible" class="detailDialog" width="80%" top="40px" :close="closed()">
+        <el-dialog :visible.sync="dialogTableVisible" :append-to-body="true" class="detailDialog" width="80%" top="40px"
+            :close="closed()">
             <div slot="title">
                 <div class="addTitle">查看作品详情</div>
             </div>
@@ -240,12 +242,19 @@
                         </el-col>
                         <el-col :span="8">
                             <div>
-                                <el-checkbox :value="tableDetail.isAlbum === 1" :true-label=1 disabled
-                                    style="margin-left:20px;height: 40px;margin-right: 30px;line-height: 40px">专辑
-                                </el-checkbox>
-                                <el-select style="width: 149px;" v-model="tableDetail.albumName"
-                                    v-if="tableDetail.isAlbum != ''" disabled>
-                                </el-select>
+                                <div v-if="tableDetail.isAlbum > 0">
+                                    <el-checkbox :value="isAlbum" :true-label=1 disabled
+                                        style="margin-left:20px;height: 40px;margin-right: 30px;line-height: 40px">专辑
+                                    </el-checkbox>
+                                    <el-select style="width: 149px;" v-model="tableDetail.albumName"
+                                        v-if="tableDetail.isAlbum != ''" disabled>
+                                    </el-select>
+                                </div>
+                                <div v-else>
+                                    <el-checkbox :value="tableDetail.isAlbum === 1" :true-label=1 disabled
+                                        style="margin-left:20px;height: 40px;margin-right: 30px;line-height: 40px">专辑
+                                    </el-checkbox>
+                                </div>
                             </div>
                         </el-col>
                     </el-row>
@@ -323,8 +332,8 @@
         </el-dialog>
 
         <!--        修改作品-->
-        <el-dialog :visible.sync="modifyWorkDialog" width="80%" class="detailDialog" :close-on-click-modal="false"
-            top="40px" :close="closed()">
+        <el-dialog :visible.sync="modifyWorkDialog" :append-to-body="true" width="80%" class="detailDialog"
+            :close-on-click-modal="false" top="40px" :close="closed()">
             <div slot="title">
                 <div class="addTitle">修改作品</div>
             </div>
@@ -450,8 +459,8 @@
         </el-dialog>
 
         <!--        审核-->
-        <el-dialog :visible.sync="isShowExamineState" class="detailDialog2" width="80%" top="40px"
-            style="height: 100%;overflow: auto" :close="closed()">
+        <el-dialog :visible.sync="isShowExamineState" :append-to-body="true" class="detailDialog2" width="80%"
+            top="40px" style="height: 100%;overflow: auto" :close="closed()">
             <div slot="title">
                 <div class="addTitle">审核作品</div>
             </div>
@@ -780,6 +789,7 @@ export default {
         //排序
         sortChange(column) {
             this.column = { ...column }
+            console.log(column.prop)
             if (column.prop === 'isAlbum') {
                 if (column.order === "ascending") {
                     let params = {
@@ -885,6 +895,76 @@ export default {
                         this.currentPage = 1
                     })
                 }
+            } else if (column.prop === 'uploadTime') {
+                if (column.order === "ascending") {
+                    let params = {
+                        page: 1,
+                        limit: this.pageSize,
+                        uploadTime: 'ASC'
+                    }
+                    api.getYxnaList({ params }).then(r => {
+                        this.total = r.data.count
+                        this.tableData = r.data.data
+                        this.currentPage = 1
+                    })
+                } else if (column.order === "descending") {
+                    let params = {
+                        page: 1,
+                        limit: this.pageSize,
+                        uploadTime: 'DESC'
+                    }
+                    api.getYxnaList({ params }).then(r => {
+                        this.total = r.data.count
+                        this.tableData = r.data.data
+                        this.currentPage = 1
+                    })
+                } else {
+                    this.column = null
+                    let params = {
+                        page: 1,
+                        limit: this.pageSize,
+                    }
+                    api.getYxnaList({ params }).then(r => {
+                        this.total = r.data.count
+                        this.tableData = r.data.data
+                        this.currentPage = 1
+                    })
+                }
+            } else if (column.prop === 'updateTime') {
+                if (column.order === "ascending") {
+                    let params = {
+                        page: 1,
+                        limit: this.pageSize,
+                        updateTime: 'ASC'
+                    }
+                    api.getYxnaList({ params }).then(r => {
+                        this.total = r.data.count
+                        this.tableData = r.data.data
+                        this.currentPage = 1
+                    })
+                } else if (column.order === "descending") {
+                    let params = {
+                        page: 1,
+                        limit: this.pageSize,
+                        updateTime: 'DESC'
+                    }
+                    api.getYxnaList({ params }).then(r => {
+                        this.total = r.data.count
+                        this.tableData = r.data.data
+                        this.currentPage = 1
+                    })
+                } else {
+                    this.column = null
+                    let params = {
+                        page: 1,
+                        limit: this.pageSize,
+                    }
+                    api.getYxnaList({ params }).then(r => {
+                        this.total = r.data.count
+                        this.tableData = r.data.data
+                        this.currentPage = 1
+                    })
+                }
             }
         },
 
@@ -1167,7 +1247,8 @@ export default {
                     })
                 }
             } else {
-                this.$refs.multipleTable.clearSort()
+                this.$refs.multipleTable.clearSort();
+                this.column = undefined
                 this.currentPage = 1
                 this.getData()
             }
@@ -1334,7 +1415,72 @@ export default {
                             this.tableData = r.data.data
                         })
                     }
-                } else {
+                } 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,
@@ -1572,7 +1718,7 @@ export default {
         left: 13rem; */
 }
 
-/deep/ .el-table--scrollable-x .el-table__body-wrapper{
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
     z-index: 2;
 }
 

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

@@ -6,7 +6,7 @@
             <el-button type="primary" class="add" style="margin-bottom:10px ;" @click="albumNewlyIncreased()">新增
             </el-button>
             <!-- :height="tableH" -->
-            <el-table :data="albumTableData" ref='multipleTable' border :height="tableH"  stripe
+            <el-table :data="albumTableData" ref='multipleTable' border :height="tableH" stripe
                 :header-cell-style="{ background: '#e5e8ed', color: '#666', textAlign: 'center' }"
                 :cell-style="tableStyle" style="cursor: default" @sort-change="sortChange">
                 <el-table-column width="100" label="序号">
@@ -14,7 +14,7 @@
                         {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="专辑名称" :show-overflow-tooltip="true" >
+                <el-table-column prop="name" label="专辑名称" :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column prop="number" label="专辑内容"></el-table-column>
                 <el-table-column prop="id" label="操作">
@@ -56,7 +56,7 @@
                     <el-button type="primary" class="search" @click="reset" style="margin-left: 5px">重置</el-button>
                 </div>
             </div>
-<!-- :height="tableH" -->
+            <!-- :height="tableH" -->
             <el-table :data="tableData" ref='multipleTable' :height="tableHs" border stripe
                 :header-cell-style="{ background: '#e5e8ed', color: '#666', textAlign: 'center' }"
                 :cell-style="tableStyle" style="cursor: default" @sort-change="sortChange">
@@ -67,7 +67,8 @@
                 </el-table-column>
                 <el-table-column prop="pictureTitle" label="作品名称" :show-overflow-tooltip="true" width="120">
                 </el-table-column>
-                <el-table-column prop="pictureAuthor" label="作品作者" :show-overflow-tooltip="true" width="100"></el-table-column>
+                <el-table-column prop="pictureAuthor" label="作品作者" :show-overflow-tooltip="true" width="100">
+                </el-table-column>
                 <el-table-column prop="uploaderPhone" label="作者电话" :show-overflow-tooltip="true" width="120">
                 </el-table-column>
                 <el-table-column prop="pictureDescription" label="作品描述" width="200" :show-overflow-tooltip="true">
@@ -135,14 +136,15 @@
             </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"
-                    layout="prev, pager,next,jumper,total,sizes" :total="total">
+                    :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>
         </div>
-        
+
         <!--        查看-->
-        <el-dialog :visible.sync="dialogTableVisible" class="detailDialog" width="80%" top="40px">
+        <el-dialog :visible.sync="dialogTableVisible" :append-to-body="true" class="detailDialog" width="80%"
+            top="40px">
             <div slot="title">
                 <div class="addTitle">查看作品详情</div>
             </div>
@@ -157,8 +159,9 @@
                         </el-col>
                         <el-col :span="8">
                             <div>
-                                <el-checkbox v-model="isAlbum" :value="tableDetail.isAlbum === true" :true-label=1 disabled
-                                    style="margin-left:20px;height: 40px;margin-right: 30px;line-height: 40px">专辑
+                                <el-checkbox v-model="isAlbum" :value="tableDetail.isAlbum === true" :true-label=1
+                                    disabled style="margin-left:20px;height: 40px;margin-right: 30px;line-height: 40px">
+                                    专辑
                                 </el-checkbox>
                                 <el-select style="width: 149px;" v-model="tableDetail.albumName" disabled>
                                 </el-select>
@@ -232,13 +235,13 @@
                         <div class="formTempBox"></div>
                     </div>
                     <div class="imgBox" style="margin-top: 20px">
-                        <img :src="`/` + tableDetail.urlAddress" alt="">
+                        <img :src="`/` + tableDetail.urlAddress" alt="" style="width: 100%;">
                     </div>
                 </el-form>
             </div>
         </el-dialog>
         <!--        修改作品-->
-        <el-dialog :visible.sync="modifyWorkDialog" class="detailDialog" width="80%" top="40px">
+        <el-dialog :visible.sync="modifyWorkDialog" :append-to-body="true" class="detailDialog" width="80%" top="40px">
             <div slot="title">
                 <div class="addTitle">修改作品</div>
             </div>
@@ -258,7 +261,7 @@
                                 </el-checkbox>
 
                                 <el-select style="width: 149px;" v-model="impressionNanan.name" disabled>
-                                
+
                                 </el-select>
                             </div>
                         </el-col>
@@ -342,31 +345,33 @@
             </div>
         </el-dialog>
         <!-- 修改专辑 -->
-        <el-dialog :visible.sync="upBackground" class="detailDialog" width="80%" top="40px">
+        <el-dialog :visible.sync="upBackground" style="overflow-y:scroll;" class="detailDialog" width="80%" top="40px">
             <div slot="title">
                 <div class="addTitle">修改专辑</div>
             </div>
-            <el-form>
-                <el-form-item label="专辑名称" style="display: flex">
-                    <el-input maxlength="10" v-model="modification.name" placeholder="请输入专辑名称" clearable>
-                    </el-input>
-                </el-form-item>
+            <div>
+                <el-form>
+                    <el-form-item label="专辑名称" style="display: flex">
+                        <el-input maxlength="10" v-model="modification.name" placeholder="请输入专辑名称" clearable>
+                        </el-input>
+                    </el-form-item>
 
-                <el-upload action="#" ref="upload" :headers="importHeaders" :before-upload="beforeUpload"
-                    :auto-upload="false" accept="image/png,image/jpg,image/jpeg" :file-list="fileList"
-                    :show-file-list="false" :on-change="onChange" :on-remove="handleRemove" list-type="picture">
-                    <el-button type="primary" size="mini" slot="trigger">上传背景图片</el-button>
-                </el-upload>
-                <div v-if="fileList.length !== 0" style="position: relative">
-                    <el-button type="danger" size="mini" @click="handleRemove"
-                        style="position: absolute;left: 0;top:20px">删除图片
-                    </el-button>
-                    <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="未捕获到地址">
-                </div>
-            </el-form>
+                    <el-upload action="#" ref="upload" :headers="importHeaders" :before-upload="beforeUpload"
+                        :auto-upload="false" accept="image/png,image/jpg,image/jpeg" :file-list="fileList"
+                        :show-file-list="false" :on-change="onChange" :on-remove="handleRemove" list-type="picture">
+                        <el-button type="primary" size="mini" slot="trigger">上传背景图片</el-button>
+                    </el-upload>
+                    <div v-if="fileList.length !== 0" style="position: relative">
+                        <el-button type="danger" size="mini" @click="handleRemove"
+                            style="position: absolute;left: 0;top:20px">删除图片
+                        </el-button>
+                        <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%;">
+                    </div>
+                </el-form>
+            </div>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" size="mini" @click="upTure">修改</el-button>
                 <el-button @click="goBackyynns" size="mini">取消</el-button>
@@ -379,24 +384,27 @@
             <div slot="title">
                 <div class="addTitle">新增专辑</div>
             </div>
-            <el-form>
-                <el-form-item label="专辑名称" style="display: flex">
-                    <el-input maxlength="10" v-model="addWorkDialogs.ablumNames" placeholder="请输入专辑名称" clearable>
-                    </el-input>
-                </el-form-item>
-                <el-upload action="#" ref="upload" :headers="importHeaders" :before-upload="addBeforeUpload"
-                    :auto-upload="false" accept="image/png,image/jpg,image/jpeg" :file-list="fileList"
-                    :show-file-list="false" :on-change="onChange" :on-remove="handleRemove" list-type="picture">
-                    <el-button type="primary" size="mini" slot="trigger">上传背景图片</el-button>
-                </el-upload>
-                <div v-if="fileList.length !== 0" style="position: relative">
-                    <el-button type="danger" size="mini" @click="handleRemove"
-                        style="position: absolute;left: 0;top:20px">
-                        删除图片
-                    </el-button>
-                    <img :src="fileList[0].url" alt="" style="margin-top: 20px">
-                </div>
-            </el-form>
+            <div>
+                <el-form>
+                    <el-form-item label="专辑名称" style="display: flex">
+                        <el-input maxlength="10" v-model="addWorkDialogs.ablumNames" placeholder="请输入专辑名称" clearable>
+                        </el-input>
+                    </el-form-item>
+                    <el-upload action="#" ref="upload" :headers="importHeaders" :before-upload="addBeforeUpload"
+                        :auto-upload="false" accept="image/png,image/jpg,image/jpeg" :file-list="fileList"
+                        :show-file-list="false" :on-change="onChange" :on-remove="handleRemove" list-type="picture">
+                        <el-button type="primary" size="mini" slot="trigger">上传背景图片</el-button>
+                    </el-upload>
+                    <div v-if="fileList.length !== 0" style="position: relative">
+                        <el-button type="danger" size="mini" @click="handleRemove"
+                            style="position: absolute;left: 0;top:20px">
+                            删除图片
+                        </el-button>
+                        <img :src="fileList[0].url" alt="" style="margin-top: 20px">
+                    </div>
+                </el-form>
+            </div>
+
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" size="mini" @click="updateTure">确定</el-button>
                 <el-button @click="goBackyynns" size="mini">取消</el-button>
@@ -426,7 +434,7 @@ export default {
             tableData: [],
             albumTableData: [],
             fileList: [],
-            isAlbum:true,
+            isAlbum: true,
             tableH: 'calc(100vh - 230px)',
             tableHs: 'calc(100vh - 230px)',
             // 当前页数
@@ -542,8 +550,18 @@ export default {
                 //     }
                 // ],//日期验证
             },//修改作品表单验证规则
-            // impressionNanan:{}
-            albumid: ''
+            albumid: '',
+            sorts:{
+                page:1,
+                limit:10,
+                examineState:'',
+                pictureType:'',
+                uploadTime:'',
+                updateTime:'',
+                phone:'',
+                title:'',
+                author:'',
+            },
         }
     },
     methods: {
@@ -565,8 +583,8 @@ export default {
                 // id:id
             }
             // this.tableH = 'calc(100vh - 230px)'
-            this.currentPage=1;
-            this.pageSize=10;
+            this.currentPage = 1;
+            this.pageSize = 10;
             api.albumParticulars(this.albumid, { params }).then(r => {
                 this.total = r.data.count
                 this.tableData = r.data.data;
@@ -581,8 +599,8 @@ export default {
                 page: 1,
                 limit: 10,
             }
-            this.currentPage=1;
-            this.pageSize=10;
+            this.currentPage = 1;
+            this.pageSize = 10;
             api.queryAlbum({ params }).then(res => {
                 this.total = res.data.count
                 this.albumTableData = res.data.data
@@ -636,138 +654,204 @@ export default {
         },
         // 详情表格
         handleSizeChange(pageSize) {
-            this.pageSize = pageSize
-            let params = {
-                page: 1,
-                limit: this.pageSize,
-            }
-            this.currentPage = 1;
+            this.sorts.limit = pageSize
+            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
             })
         },
         handleCurrentChange(currentPage) {
-            this.currentPage = currentPage;
+            this.sorts.page = currentPage;
             this.$refs.multipleTable.bodyWrapper.scrollTop = 0;
-            if (this.column == null) {
-                let params = {
-                    page: this.currentPage,
-                    limit: this.pageSize,
-                }
-                api.albumParticulars(this.albumid, { params }).then(r => {
+            let params = this.sorts;
+            api.albumParticulars(this.albumid, {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',
+            })
+            // if (this.column == null ) {
 
-                        }
-                        api.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                        }
-                        api.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                        }
-                        api.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    } else {
-                        let params = {
-                            page: this.currentPage,
-                            limit: this.pageSize,
-                        }
-                        api.albumParticulars(this.albumid, { params }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    }
-                } else {
-                    let params = {
-                        page: this.currentPage,
-                        limit: this.pageSize,
-                    }
-                    api.albumParticulars(this.albumid, { params }).then(r => {
-                        this.total = r.data.count
-                        this.tableData = r.data.data
-                    })
-                }
-            }
-            // if (this.form.region !== '') {
-            //     if (this.form.region === 'uploaderPhone') {
+            //     let params = {
+            //         page: this.currentPage,
+            //         limit: this.pageSize,
+            //     }
+                
+                
+            //     api.albumParticulars(this.albumid, {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.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //             }
+            //             api.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //             }
+            //             api.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //             }
+            //             api.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //             }
+            //             api.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { 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.albumParticulars(this.albumid, { params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         } else {
+            //             let params = {
+            //                 page: this.currentPage,
+            //                 limit: this.pageSize,
+            //             }
+            //             api.albumParticulars(this.albumid, { params }).then(r => {
+            //                 this.total = r.data.count
+            //                 this.tableData = r.data.data
+            //             })
+            //         }
+            //     } else {
+            //         let params = {
+            //             page: this.currentPage,
+            //             limit: this.pageSize,
+            //         }
+            //         api.albumParticulars(this.albumid, { params }).then(r => {
+            //             this.total = r.data.count
+            //             this.tableData = r.data.data
+            //         })
+            //     }
+            // }
+            // if (this.form.region != '') {
+            //     if (this.form.region === 'uploaderPhone') {
             //         let params = {
             //             page: 1,
             //             limit: 10,
@@ -874,6 +958,7 @@ export default {
         //排序
         sortChange(column) {
             this.column = { ...column }
+            
             if (column.prop === 'isAlbum') {
                 if (column.order === "ascending") {
                     let params = {
@@ -911,72 +996,190 @@ export default {
                 }
             } else if (column.prop === 'examineState') {
                 if (column.order === "ascending") {
-                    let params = {
-                        page: 1,
-                        limit: this.pageSize,
-                        examineState: 'ASC'
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.sorts.limit,
+                    //     examineState: 'ASC'
+                    // }
+                    this.sorts.examineState='ASC';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='';
+                    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
-                        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.examineState='DESC';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='';
+                    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
-                        this.currentPage = 1
+                       
                     })
                 } else {
                     this.column = null
                     let params = {
                         page: 1,
-                        limit: this.pageSize,
+                        limit: this.sorts.limit,
                     }
                     api.albumParticulars(this.albumid, { 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.sorts.limit,
+                    //     pictureType: 'ASC'
+                    // }
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='ASC';
+                    this.sorts.uploadTime='';
+                    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
+                        
+                    })
+                } else if (column.order === "descending") {
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.sorts.limit,
+                    //     pictureType: 'DESC'
+                    // }
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='DESC';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='';
+                    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
+                        
+                    })
+                } else {
+                    this.column = null
                     let params = {
                         page: 1,
-                        limit: this.pageSize,
-                        pictureType: 'ASC'
+                        limit: this.sorts.limit,
                     }
                     api.albumParticulars(this.albumid, { 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.sorts.limit,
+                    //     uploadTime: 'ASC'
+                    // }
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='ASC';
+                    this.sorts.updateTime='';
+                    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
+                        
                     })
                 } else if (column.order === "descending") {
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.sorts.limit,
+                    //     uploadTime: 'DESC'
+                    // }
+                    this.sorts.uploadTime='DESC';
+                    let params=this.sorts;
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.updateTime='';
+                    this.sorts.page = 1
+                    api.albumParticulars(this.albumid, { params }).then(r => {
+                        this.total = r.data.count
+                        this.tableData = r.data.data
+                        
+                    })
+                } else {
+                    this.column = null
                     let params = {
                         page: 1,
-                        limit: this.pageSize,
-                        pictureType: 'DESC'
+                        limit: this.sorts.limit,
                     }
                     api.albumParticulars(this.albumid, { 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.sorts.limit,
+                    //     updateTime: 'ASC'
+                    // }
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='ASC';
+                    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
+                        
+                    })
+                } else if (column.order === "descending") {
+                    // let params = {
+                    //     page: 1,
+                    //     limit: this.sorts.limit,
+                    //     updateTime: 'DESC'
+                    // }
+                    this.sorts.examineState='';
+                    this.sorts.pictureType='';
+                    this.sorts.uploadTime='';
+                    this.sorts.updateTime='DESC';
+                    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
+                        
                     })
                 } else {
                     this.column = null
                     let params = {
                         page: 1,
-                        limit: this.pageSize,
+                        limit: this.sorts.limit,
                     }
                     api.albumParticulars(this.albumid, { params }).then(r => {
                         this.total = r.data.count
                         this.tableData = r.data.data
-                        this.currentPage = 1
+                        this.sorts.page = 1;
                     })
                 }
             }
@@ -1038,12 +1241,13 @@ export default {
         serachWork() {
             if (this.form.region !== '') {
                 if (this.form.region === 'uploaderPhone') {
-
-                    let params = {
-                        page: 1,
-                        limit: 10,
-                        phone: this.form.name
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: 10,
+                    //     phone: this.form.name
+                    // }
+                    this.sorts.phone = this.form.name
+                    let params = this.sorts
                     api.albumParticulars(this.albumid, { params }).then(res => {
                         this.total = res.data.count
                         // console.log(res.data)
@@ -1051,11 +1255,13 @@ export default {
                     })
                 }
                 if (this.form.region === 'pictureTitle') {
-                    let params = {
-                        page: 1,
-                        limit: 10,
-                        title: this.form.name
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: 10,
+                    //     title: this.form.name
+                    // }
+                    this.sorts.title = this.form.name
+                    let params = this.sorts
                     api.albumParticulars(this.albumid, { params }).then(res => {
                         this.total = res.data.count
                         this.tableData = res.data.data
@@ -1063,11 +1269,13 @@ export default {
                     })
                 }
                 if (this.form.region === 'pictureAuthor') {
-                    let params = {
-                        page: 1,
-                        limit: 10,
-                        author: this.form.name
-                    }
+                    // let params = {
+                    //     page: 1,
+                    //     limit: 10,
+                    //     author: this.form.name
+                    // }
+                    this.sorts.author = this.form.name
+                    let params = this.sorts
                     api.albumParticulars(this.albumid, { params }).then(res => {
                         this.total = res.data.count
                         this.tableData = res.data.data
@@ -1075,8 +1283,9 @@ export default {
                     })
                 }
             } else {
-                this.$refs.multipleTable.clearSort()
-                this.currentPage = 1
+                this.$refs.multipleTable.clearSort();
+                this.column = undefined
+                this.sorts.page = 1
                 let params = {
                     page: 1,
                     limit: 10,
@@ -1124,7 +1333,7 @@ export default {
                         limit: 10
                     }
                     api.queryAlbum({ params }).then(res => {
-                        this.total=res.data.count;
+                        this.total = res.data.count;
                         this.albumTableData = res.data.data;
                     })
                     this.$message.success('修改成功')
@@ -1175,7 +1384,7 @@ export default {
                             limit: 10
                         }
                         api.queryAlbum({ params }).then(res => {
-                            this.total=res.data.count;
+                            this.total = res.data.count;
                             this.albumTableData = res.data.data;
                         })
                     } else {
@@ -1209,7 +1418,7 @@ export default {
                         limit: 10
                     }
                     api.queryAlbum({ params }).then(res => {
-                        this.total=res.data.count;
+                        this.total = res.data.count;
                         this.albumTableData = res.data.data;
                     })
                     this.$message.success('新增成功')
@@ -1228,7 +1437,7 @@ export default {
                 return;
             }
             // console.log(this.fileList)
-            if (this.fileList.length==0) {
+            if (this.fileList.length == 0) {
                 this.$message.error("文件不能为空");
                 return;
             }
@@ -1252,9 +1461,9 @@ export default {
                             page: 1,
                             limit: 10
                         }
-                        this.currentPage=1
+                        this.currentPage = 1
                         api.queryAlbum({ params }).then(res => {
-                            this.total=res.data.count;
+                            this.total = res.data.count;
                             this.albumTableData = res.data.data;
                         })
                     } else {
@@ -1281,22 +1490,21 @@ export default {
     border-color: #DCDFE6;
 }
 
+/deep/ .el-dialog__body>div {
+    overflow-y: auto;
+    height: 65vh;
+}
 
-// /deep/ .el-table__body-wrapper {
-//     height: calc(100vh - 302px) !important;
-// }
-// /deep/ .el-table__fixed-body-wrapper{
-//     top: 71px !important;
-// }
 .yxnaAlbum {
     padding: 10px;
 }
+
 /deep/ .el-col-12 {
     width: 50%;
     text-align: left;
 }
 
-/deep/ .el-table--scrollable-x .el-table__body-wrapper{
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
     z-index: 2;
 }
 

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

@@ -9,8 +9,8 @@ module.exports = {
             '/': {
                 // target:'http://192.168.0.230:7777/',//开发
                 // target:'http://192.168.0.7:7777/',//开发
-                target:'http://192.168.1.253:7777/',//测试
-                // target:'http://data.cqna.gov.cn/',//线上
+                // target:'http://192.168.1.253:7777/',//测试
+                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.9a449603.css" rel="preload" as="style"><link href="css/chunk-vendors.058a81fe.css" rel="preload" as="style"><link href="js/app.0e217c6b.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.9a449603.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.4c187b39.js"></script><script src="js/app.0e217c6b.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.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>