notice/user-1

src/api/announce/list.js

@@ -0,0 +1,12 @@
+import axios from "axios"
+import '@/mock/index'
+
+// 获取公告列表
+export const getNoticeList = (param)=>{
+  return axios.post('/notice/list',param)
+}
+
+// 删除公告
+export const deleteNotice = (param)=>{
+  return axios.post('/notice/delete',param)
+}

src/api/user/index.js

@@ -0,0 +1,7 @@
+import axios from "axios"
+import '@/mock/index'
+
+// 获取用户列表
+export const getUsersList = (param)=>{
+  return axios.post('/user/list',param)
+}

src/components/Breadcrumb/index.vue

@@ -1,13 +1,4 @@
 <template>
-<<<<<<< HEAD
-  <div class="app-breadcrumb" >
-    <transition-group name="breadcrumb">
-      <div v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span>
-        <!-- <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> -->
-      </div>
-    </transition-group>
-=======
   <div>
     <div class="app-breadcrumb">
       <transition-group name="breadcrumb">
@@ -23,7 +14,6 @@
         </div>
       </transition-group>
     </div>
->>>>>>> 80fdac3 (藏品管理)
   </div>
 </template>
 
@@ -31,27 +21,12 @@
 export default {
   data() {
     return {
-<<<<<<< HEAD
-      levelList: null
-    }
-=======
       levelList: null,
     };
->>>>>>> 80fdac3 (藏品管理)
   },
   watch: {
     $route(route) {
       // if you go to the redirect page, do not update the breadcrumbs
-<<<<<<< HEAD
-      if (route.path.startsWith('/redirect/')) {
-        return
-      }
-      this.getBreadcrumb()
-    }
-  },
-  created() {
-    this.getBreadcrumb()
-=======
       if (route.path.startsWith("/redirect/")) {
         return;
       }
@@ -60,46 +35,19 @@ export default {
   },
   created() {
     this.getBreadcrumb();
->>>>>>> 80fdac3 (藏品管理)
   },
   methods: {
     getBreadcrumb() {
       // only show routes with meta.title
-<<<<<<< HEAD
-      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
-      const first = matched[0]
-=======
       let matched = this.$route.matched.filter(
         (item) => item.meta && item.meta.title
       );
       const first = matched[0];
->>>>>>> 80fdac3 (藏品管理)
 
       // if (!this.isDashboard(first)) {
       //   matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
       // }
 
-<<<<<<< HEAD
-      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
-    },
-    isDashboard(route) {
-      const name = route && route.name
-      if (!name) {
-        return false
-      }
-      return name.trim() === 'Index'
-    },
-    handleLink(item) {
-      const { redirect, path } = item
-      if (redirect) {
-        this.$router.push(redirect)
-        return
-      }
-      this.$router.push(path)
-    }
-  }
-}
-=======
       this.levelList = matched.filter(
         (item) => item.meta && item.meta.title && item.meta.breadcrumb !== false
       );
@@ -121,7 +69,6 @@ export default {
     },
   },
 };
->>>>>>> 80fdac3 (藏品管理)
 </script>
 
 <style lang="scss" scoped>

src/components/Goback/index.vue

@@ -1,29 +1,4 @@
 <template>
-<<<<<<< HEAD
-    <el-page-header @back="goBack" class="title-text" >
-        
-    </el-page-header>    
-</template>
-
-<script>
-  export default {
-    
-  
-    methods: {
-      goBack() {
-        this.$router.go(-1);
-      },
-      
-    }
-    
-  }
-</script>
-<style lang="scss" scoped>
-.title-text{
-    font-weight: 700;
-}
-</style>
-=======
   <el-page-header @back="goBack" class="title-text"> </el-page-header>
 </template>
 
@@ -41,4 +16,3 @@ export default {
   font-weight: 700;
 }
 </style>
->>>>>>> 80fdac3 (藏品管理)

src/layout/components/AppMain.vue

@@ -10,22 +10,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import iframeToggle from "./IframeToggle/index"
-
-export default {
-  name: 'AppMain',
-  components: { iframeToggle },
-  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews
-    },
-    key() {
-      return this.$route.path
-    }
-  }
-}
-=======
 import iframeToggle from "./IframeToggle/index";
 
 export default {
@@ -40,7 +24,6 @@ export default {
     },
   },
 };
->>>>>>> 80fdac3 (藏品管理)
 </script>
 
 <style lang="scss" scoped>

src/layout/components/Navbar.vue

@@ -1,17 +1,5 @@
 <template>
   <div class="navbar">
-<<<<<<< HEAD
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-    <Goback id="goback-container" class="goback-container" v-if="!topNav"/>
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/> 
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
-
-    <div class="right-menu">
-      
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
-=======
     <hamburger
       id="hamburger-container"
       :is-active="sidebar.opened"
@@ -33,7 +21,6 @@
       >
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar" />
->>>>>>> 80fdac3 (藏品管理)
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -53,19 +40,11 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Goback from '@/components/Goback'
-import TopNav from '@/components/TopNav'
-import Hamburger from '@/components/Hamburger'
-=======
 import { mapGetters } from "vuex";
 import Breadcrumb from "@/components/Breadcrumb";
 import Goback from "@/components/Goback";
 import TopNav from "@/components/TopNav";
 import Hamburger from "@/components/Hamburger";
->>>>>>> 80fdac3 (藏品管理)
 //import Screenfull from '@/components/Screenfull'
 //import SizeSelect from '@/components/SizeSelect'
 //import Search from '@/components/HeaderSearch'
@@ -76,56 +55,6 @@ export default {
   components: {
     Breadcrumb,
     TopNav,
-<<<<<<< HEAD
-     Goback,
-    Hamburger,
-   // Screenfull,
-    //SizeSelect,
-    //Search,
-   // RuoYiGit,
-   // RuoYiDoc
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'device'
-    ]),
-    setting: {
-      get() {
-        return this.$store.state.settings.showSettings
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
-        })
-      }
-    },
-    topNav: {
-      get() {
-        return this.$store.state.settings.topNav
-      }
-    }
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
-    },
-    async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
-        })
-      }).catch(() => {});
-    }
-  }
-}
-=======
     Goback,
     Hamburger,
     // Screenfull,
@@ -172,7 +101,6 @@ export default {
     },
   },
 };
->>>>>>> 80fdac3 (藏品管理)
 </script>
 
 <style lang="scss" scoped>
@@ -181,29 +109,13 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-<<<<<<< HEAD
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
-=======
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
->>>>>>> 80fdac3 (藏品管理)
 
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     float: left;
     cursor: pointer;
-<<<<<<< HEAD
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
-
-    &:hover {
-      background: rgba(0, 0, 0, .025)
-    }
-  }
-
-  .goback-container{
-    
-=======
     transition: background 0.3s;
     -webkit-tap-highlight-color: transparent;
 
@@ -213,15 +125,10 @@ export default {
   }
 
   .goback-container {
->>>>>>> 80fdac3 (藏品管理)
     float: left;
     line-height: 50px;
   }
   .breadcrumb-container {
-<<<<<<< HEAD
-    
-=======
->>>>>>> 80fdac3 (藏品管理)
     float: left;
     line-height: 50px;
   }
@@ -255,17 +162,10 @@ export default {
 
       &.hover-effect {
         cursor: pointer;
-<<<<<<< HEAD
-        transition: background .3s;
-
-        &:hover {
-          background: rgba(0, 0, 0, .025)
-=======
         transition: background 0.3s;
 
         &:hover {
           background: rgba(0, 0, 0, 0.025);
->>>>>>> 80fdac3 (藏品管理)
         }
       }
     }

src/main.js

@@ -5,12 +5,10 @@ import Cookies from 'js-cookie'
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
 
-<<<<<<< HEAD
-=======
 //引入mock
 import './mockjs/mock.js'
+import "./mock/index.js"
 
->>>>>>> 80fdac3 (藏品管理)
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'
@@ -43,11 +41,6 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
-<<<<<<< HEAD
-//mock
-import "./mock/index.js"
-=======
->>>>>>> 80fdac3 (藏品管理)
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts

src/mock/index.js

@@ -69,3 +69,80 @@ Mock.mock('http://localhost:8080/api/list', 'post', (params) => {
 
 })
 
+// app用户列表 分页获取
+let usersList = Mock.mock({
+    "data|100":[{
+            "userId|+1": 1,//编号
+            "number": /[A-Z]*[0-9]{10}$/,//账号
+            "name":"@cname",//真实姓名
+            "phoneNumber":/^1(5|3|7|8)[0-9]{9}$/,//手机号
+            "adress":"@csentence",//详细地址
+            "status|1":["0","1"],//状态
+            "registerTime":"@datetime('yyyy-MM-dd HH:mm:ss')",//注册时间
+            "verifiedTime":"@datetime('yyyy-MM-dd HH:mm:ss')"//实名时间
+        }
+    ]
+})
+Mock.mock('/user/list', 'post', (params) => { 
+    let body = JSON.parse(params.body);
+    let { pageIndex, pageSize } = body
+    let total = usersList.data.length;
+    let len = total / pageSize;
+    let totalPages = len - parseInt(len) > 0 ? parseInt(len) + 1 : len;
+    let newDataList = usersList.data.slice((pageIndex - 1) * pageSize, pageIndex * pageSize);
+    return {
+        code: 200,
+        message: 'success',
+        data: {
+            pageIndex,
+            pageSize,
+            userList: newDataList,
+            total,
+            totalPages: totalPages,
+        }
+    }
+})
+
+// 公告列表
+let noticeList = Mock.mock({
+    "data|100":[{
+            "noticeId|+1": 1,//编号
+            "noticeTitle":"@ctitle",//公告标题
+            "noticeContent":"@cparagraph(20)",//公告内容
+            "createTime":"@datetime('yyyy-MM-dd HH:mm:ss')",//发布时间
+        }
+    ]
+})
+// 分页获取
+Mock.mock('/notice/list', 'post', (params) => { 
+    let body = JSON.parse(params.body);
+    let { pageIndex, pageSize } = body
+    let total = noticeList.data.length;
+    let len = total / pageSize;
+    let totalPages = len - parseInt(len) > 0 ? parseInt(len) + 1 : len;
+    let newDataList = noticeList.data.slice((pageIndex - 1) * pageSize, pageIndex * pageSize);
+    return {
+        code: 200,
+        message: 'success',
+        data: {
+            pageIndex,
+            pageSize,
+            noticeList: newDataList,
+            total,
+            totalPages: totalPages,
+        }
+    }
+});
+// 删除公告
+Mock.mock('/notice/delete', 'post', (params) => { 
+    let body = JSON.parse(params.body);
+    let { id } = body
+    noticeList.data = noticeList.data.filter( (res)=>{
+        return res.noticeId!=id;
+    });
+    return {
+        code: 200,
+        message: 'success',
+    }
+})
+

src/router/index.js

@@ -162,19 +162,6 @@ export const constantRoutes = [
     meta: { title: '公告管理', icon: 'announcement' },
     children: [
       {
-<<<<<<< HEAD
-        path: 'announcementList',
-        component: () => import('@/views/announcement/list/index'),
-        name: 'announcementList',
-        meta: { title: '公告列表', icon: 'announcement' }
-      },
-      {
-        path: 'announcementAdd',
-        component: () => import('@/views/announcement/add/index'),
-        name: 'announcementAdd',
-        meta: { title: '创建公告', icon: 'createseries' }
-      },
-=======
         path: 'announcementAdd',
         component: () => import('@/views/announcement/add/index'),
         name: 'announcementAdd',
@@ -184,8 +171,14 @@ export const constantRoutes = [
         component: () => import('@/views/announcement/list/index'),
         name: 'announcementList',
         meta: { title: '公告列表', icon: 'user' }
+      },
+      {
+        path: 'announcementDetail',
+        hidden:true,
+        component: () => import('@/views/announcement/detail/index'),
+        name: 'announcementDetail',
+        meta: { title: '公告详情' }
       }
->>>>>>> 80fdac3 (藏品管理)
     ],
   },
   //消息管理

src/views/announcement/add/index.vue

@@ -1,34 +1,5 @@
 <template>
   <div>
-<<<<<<< HEAD
-    <el-card class="announcementBox" style="height: 700px;width: 700px;">
-      <div class="content">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="公告标题" prop="name">
-            <el-input v-model="ruleForm.name" placeholder="请输入公告名称"></el-input>
-          </el-form-item>
-          <el-form-item label="活动时间" required>
-            <el-col :span="11">
-              <el-form-item prop="date1">
-                <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.date1"
-                  style="width: 100%;"></el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-          <el-form-item label="公告内容" prop="desc">
-            <quill-editor v-model="ruleForm.desc" ref="myQuillEditor" style="height: 370px;" :options="editorOption">
-            </quill-editor>
-          </el-form-item>
-          <div class="button">
-            <el-form-item>
-            <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
-            <el-button @click="resetForm('ruleForm')">重置</el-button>
-          </el-form-item>
-          </div>
-        </el-form>
-      </div>
-    </el-card>
-=======
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
       <el-form-item label="公告标题" prop="name">
         <el-input v-model="ruleForm.name"></el-input>
@@ -55,7 +26,6 @@
         <el-button @click="resetForm('ruleForm')">重置</el-button>
       </el-form-item>
     </el-form>
->>>>>>> 80fdac3 (藏品管理)
   </div>
 </template>
 <script>
@@ -74,19 +44,13 @@ export default {
   data() {
     return {
       //富文本
-<<<<<<< HEAD
-=======
       content: null,
->>>>>>> 80fdac3 (藏品管理)
       editorOption: {},
 
       ruleForm: {
         name: '',
         date1: '',
-<<<<<<< HEAD
-=======
         date2: '',
->>>>>>> 80fdac3 (藏品管理)
         delivery: false,
         desc: ''
       },
@@ -123,24 +87,4 @@ export default {
     }
   }
 }
-<<<<<<< HEAD
-</script>
-
-<style>
-.announcementBox {
-  margin-top: 40px;
-  margin-left: 300px;
-}
-.content{
-  margin-top: 20px;
-  margin-right: 30px;
-  position: relative;
-}
-.button{
-  position: absolute;
-  margin-top: 70px;
-}
-</style>
-=======
 </script>
->>>>>>> 80fdac3 (藏品管理)

src/views/announcement/detail/index.vue

@@ -0,0 +1,73 @@
+<template>
+  <div class="app-container">
+    <div class="detail-box">
+      <el-row class="detail-title">公告详情</el-row>
+      <el-row class="notice-box">
+        <el-col >
+          <span class="notice-title">{{ notice.noticeTitle }}</span>
+        </el-col>
+        <el-col>
+          <span>{{ notice.createTime }}</span>
+        </el-col>
+        <el-col>
+          <div class="notice-content">
+            {{ notice.noticeContent }}
+          </div>
+        </el-col>
+      </el-row>
+      
+    </div>
+  </div>
+</template>
+<script>
+export default{
+  name:"noticeDetail",
+  data(){
+    return {
+      // 公告
+      notice:{},
+    }
+  },
+  created(){
+    this.getNotice();
+  },
+  methods:{
+    getNotice(){
+      this.notice=this.$route.params.row;
+      console.log("公告",this.notice);
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-container{
+  text-align: center;
+}
+.detail-box{
+  width: 80%;
+  border: solid 1px #DCDFE6;
+  padding: 30px;
+  display: inline-block;
+  .el-col{
+    margin-bottom: 10px;
+  }
+  .detail-title{
+    font-weight: bold;
+    font-size: 25px;
+    margin-bottom: 20px;
+  }
+}
+.notice-title{
+  font-weight: bold;
+  font-size: 20px;
+}
+
+.notice-content{
+  text-indent: 30px;
+  line-height: 23px;
+}
+.notice-box{
+  text-align: left;
+}
+</style>

src/views/announcement/list/index.vue

@@ -1,29 +1,39 @@
 <template>
-<<<<<<< HEAD
   <div class="app-container">
     <!-- 筛选 -->
     <div class="select-box">
       <div class="search-icon">
         <i class="el-icon-search"></i>
-        <span> 筛选搜查</span>
+        <span>  筛选搜查</span>
         <div class="search-button">
-          <el-button @click="resetQuery">重置</el-button>
-          <el-button type="primary" @click="handleQuery">查询搜索</el-button>
+          <el-button  @click="resetQuery">重置</el-button>
+          <el-button type="primary"  @click="handleQuery">查询搜索</el-button>
         </div>
       </div>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item class="inline" label="公告标题:  " prop="noticeTitle">
-          <el-input v-model="queryParams.noticeTitle" placeholder="筛选公告标题" clearable
-            @keyup.enter.native="handleQuery" />
+      <el-form  :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+        <el-form-item class="inline" label="公告标题:  " prop="noticeTitle" >
+          <el-input
+            v-model="queryParams.noticeTitle"
+            placeholder="筛选公告标题"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
         </el-form-item>
         <el-form-item class="inline" label="发布时间:  " prop="createTime">
-          <el-date-picker v-model="queryParams.createTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" placeholder="选择时间范围" @keyup.enter.native="handleQuery" unlink-panels>
+          <el-date-picker
+            v-model="queryParams.createTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            placeholder="选择时间范围"
+            @keyup.enter.native="handleQuery"
+            unlink-panels  >
           </el-date-picker>
         </el-form-item>
       </el-form>
     </div>
-
+    
 
     <!-- 标题 -->
     <el-row>
@@ -39,53 +49,51 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="noticeList">
+    <el-table v-loading="loading" :data="noticeList" border>
       <el-table-column label="ID" align="center" prop="noticeId" width="100" />
-      <el-table-column label="公告标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="公告标题"
+        align="center"
+        prop="noticeTitle"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="发布时间" align="center" prop="createTime" width="170">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="170">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:notice:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['system:notice:remove']">删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDetail(scope.row)"
+          >查看详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
-
-    <!-- 添加或修改公告对话框 -->
-    <el-dialog title="修改公告" :visible.sync="open" width="780px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="公告标题" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="内容">
-              <editor v-model="form.noticeContent" :min-height="192" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <el-pagination
+      background
+      :current-page="pagination.current"
+      :page-size="pagination.pageSize"
+      layout="total, prev, pager, next"
+      :total="pagination.total"
+      @pagination="getList"
+      @current-change="onPageChange"
+      class="paper"
+    >
+    </el-pagination>
   </div>
 </template>
 
 <script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
+import { getNoticeList, deleteNotice } from '@/api/announce/list';
 
 export default {
   name: "Notice",
@@ -109,6 +117,12 @@ export default {
         createBy: undefined,
         status: undefined
       },
+      // 分页参数
+      pagination:{
+        total:0,
+        current:1,
+        pageSize:10,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -126,16 +140,17 @@ export default {
     /** 查询公告列表 */
     getList() {
       this.loading = true;
-      listNotice(this.queryParams).then(response => {
-        this.noticeList = response.rows;
-        this.total = response.total;
+      getNoticeList({
+        pageIndex: this.pagination.current,
+        pageSize: this.pagination.pageSize
+      }).then( res =>{
+        // console.log("数据",res);
+        let data = res.data.data;
+        this.noticeList = data.noticeList;
+        this.pagination.total = data.total;
+        this.pagination.current = data.pageIndex;
         this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
+      })
     },
     // 表单重置
     reset() {
@@ -160,44 +175,27 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push({
-        path: '/announcement/announcementAdd'
-      })
       // 路由跳转
+      this.$router.push({name:"announcementAdd"});
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const noticeId = row.noticeId;
-      getNotice(noticeId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改公告";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function () {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.noticeId != undefined) {
-            updateNotice(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
+    // 查看详情
+    handleDetail(row) {
+      this.$router.push({name:"announcementDetail",params:{row}});
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       const noticeIds = row.noticeId;
-      this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function () {
-        return delNotice(noticeIds);
+      this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function() {
+        return deleteNotice({id:noticeIds});
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+      }).catch(() => {});
+    },
+    // 页号发生变化
+    onPageChange(number){
+      this.pagination.current=number;
+      this.getList();
     }
   }
 };
@@ -207,7 +205,6 @@ export default {
 .el-row {
   margin-bottom: 20px;
 }
-
 .list-title {
   height: 50px;
   width: 100%;
@@ -227,28 +224,22 @@ export default {
   margin: 10px;
   float: right;
 }
-
-.select-box {
-  border: 1px solid rgb(0, 0, 0, 0.1);
-  margin-bottom: 20px;
+.select-box{
+  border: 1px solid rgb(0, 0, 0,0.1);
+  margin-bottom:20px;
   padding: 20px;
 }
-
-.inline {
+.inline{
   margin-right: 30px;
 }
-
-.search-icon {
+.search-icon{
   padding-bottom: 20px
 }
-
-.search-button {
+.search-button{
+  float: right;
+}
+.paper{
   float: right;
+  margin-top: 10px;
 }
 </style>
-=======
-    <div>
-        公告列表
-    </div>
-</template>
->>>>>>> 80fdac3 (藏品管理)

src/views/appuserlist/index.vue

@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
     <div class="app-container">
       <!-- 筛选 -->
       <el-row>
@@ -72,42 +71,45 @@
   
       <el-row>
         <!--用户数据-->
-        <el-table v-loading="loading" :data="userList"  border>
+        <el-table v-loading="loading" :data="userList"  border >
           <el-table-column label="编号" align="center"  prop="userId" />
-          <el-table-column label="账号" align="center"  prop="userName"  :show-overflow-tooltip="true" />
-          <el-table-column label="真实姓名" align="center"  prop="nickName"  :show-overflow-tooltip="true" />
-          <el-table-column label="手机号" align="center"  prop="phonenumber" width="120" />
-          <el-table-column label="详细地址" align="center"  prop=""  width="160" :show-overflow-tooltip="true" />
+          <el-table-column label="账号" align="center"  prop="number"  :show-overflow-tooltip="true" />
+          <el-table-column label="真实姓名" align="center"  prop="name"  :show-overflow-tooltip="true" />
+          <el-table-column label="手机号" align="center"  prop="phoneNumber" width="120" />
+          <el-table-column label="详细地址" align="center"  prop="adress"  width="160" :show-overflow-tooltip="true" />
           <el-table-column label="状态" align="center" prop="status" >
             <template slot-scope="scope">
               <span>{{ scope.row.status == "0" ? "未认证" : "已认证"  }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="注册时间" align="center" prop="createTime"  width="160">
+          <el-table-column label="注册时间" align="center" prop="registerTime"  width="160">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.registerTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="实名时间" align="center" prop=""  width="160">
-            <!-- <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template> -->
+          <el-table-column label="实名时间" align="center" prop="verifiedTime"  width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.verifiedTime) }}</span>
+            </template>
           </el-table-column>
         </el-table>
-  
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
+        <el-pagination
+          background
+          :current-page="pagination.current"
+          :page-size="pagination.pageSize"
+          layout="total, prev, pager, next"
+          :total="pagination.total"
           @pagination="getList"
-        />
+          @current-change="onPageChange"
+          class="paper"
+        >
+        </el-pagination>
       </el-row>
     </div>
   </template>
   
   <script>
-  import { listUser} from "@/api/system/user";
+  import {getUsersList} from '@/api/user'
   
   export default {
     name: "User",
@@ -117,8 +119,6 @@
         loading: true,
         // 显示搜索条件
         showSearch: true,
-        // 总条数
-        total: 0,
         // 用户表格数据
         userList: null,
         // 日期范围
@@ -133,7 +133,13 @@
           phonenumber: undefined,
           status: undefined,
         },
-        // 下拉框参数
+        // 分页参数
+        pagination:{
+          total:0,
+          current:1,
+          pageSize:10,
+        },
+        // 搜索下拉框参数
         options:[
           {
             value:"0",
@@ -147,18 +153,23 @@
       };
     },
     created() {
-      this.getList();
+      this.getList()
     },
     methods: {
       /** 查询用户列表 */
       getList() {
         this.loading = true;
-        listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-            this.userList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          }
-        );
+        getUsersList({
+          pageIndex: this.pagination.current,
+          pageSize: this.pagination.pageSize
+        }).then(response => {
+          //console.log("数据",response);
+          let data = response.data.data;
+          this.userList = data.userList;
+          this.pagination.total = data.total;
+          this.pagination.current = data.pageIndex;
+          this.loading = false;
+        });
       },
       /** 搜索按钮操作 */
       handleQuery() {
@@ -174,6 +185,12 @@
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 页号发生变化
+      onPageChange(number){
+        // console.log("页号：",number);
+        this.pagination.current=number;
+        this.getList();
+      }
     }
   };
   </script>
@@ -212,8 +229,8 @@
       margin-left: 5px;
     }
   }
-  </style>
-=======
-    <div>app用户</div>
-</template>
->>>>>>> 80fdac3 (藏品管理)
+  .paper{
+    float: right;
+    margin-top: 10px;
+  }
+  </style>

src/views/collection/createseries/index.vue

@@ -1,10 +1,4 @@
 <template>
-<<<<<<< HEAD
-    <div>
-        创建套系
-    </div>
-</template>
-=======
   <div class="block">
     <el-form
       :model="ruleForm"
@@ -117,4 +111,3 @@ export default {
   display: block;
 }
 </style>
->>>>>>> 80fdac3 (藏品管理)

src/views/collection/serieslist/index.vue

@@ -1,10 +1,4 @@
 <template>
-<<<<<<< HEAD
-    <div>
-        套系列表
-    </div>
-</template>
-=======
   <div>
     <div class="searchbar">
       <el-form :model="formInline" class="demo-form-inline" ref="formInline">
@@ -207,4 +201,3 @@ label.el-form-item__label {
   border-radius: 0 4px 0 0;
 }
 </style>
->>>>>>> 80fdac3 (藏品管理)

src/views/message/messageCreate/index.vue

@@ -1,6 +1,5 @@
 <template>
     <div>
-<<<<<<< HEAD
       <el-card class="announcementBox" style="height: 700px;width: 700px;">
         <div class="content">
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
@@ -104,8 +103,3 @@
     margin-top: 70px;
   }
   </style>
-=======
-        创建消息
-    </div>
-</template>
->>>>>>> 80fdac3 (藏品管理)

src/views/message/messageList/index.vue

@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
   <div>
     <el-card style="height: 160px;width: 1200px; margin: 30px 0 20px 30px;">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
@@ -170,9 +169,3 @@ export default {
   float: right;
 }
 </style>
-=======
-    <div>
-        消息列表
-    </div>
-</template>
->>>>>>> 80fdac3 (藏品管理)