Merge branch 'devhyq' into dwhm

src/mock/index.js

@@ -69,7 +69,7 @@ Mock.mock('http://localhost:8080/api/list', 'post', (params) => {
 
 })
 
-// app用户列表 分页获取
+// app用户列表 
 let usersList = Mock.mock({
     "data|100":[{
             "userId|+1": 1,//编号
@@ -83,13 +83,35 @@ let usersList = Mock.mock({
         }
     ]
 })
+// 分页获取
 Mock.mock('/user/list', 'post', (params) => { 
     let body = JSON.parse(params.body);
-    let { pageIndex, pageSize } = body
-    let total = usersList.data.length;
+    let { pageIndex, pageSize,queryParams,dateRange } = body;
+    let newList = usersList.data;
+    if( newList.length>0 && queryParams.userId ){
+        newList  = newList.filter( (res)=>{
+            return res.userId==queryParams.userId;
+        });
+    }
+    if(newList.length>0 && queryParams.phoneNumber){
+        newList  = newList.filter( (res)=>{
+            return res.phoneNumber==queryParams.phoneNumber;
+        });
+    }
+    if(newList.length>0 && queryParams.status){
+        newList  = newList.filter( (res)=>{
+            return res.status==queryParams.status;
+        });
+    }
+    if(newList.length>0 && dateRange.length>0){
+        newList  = newList.filter( (res)=>{
+            return res.registerTime>=dateRange[0] && res.registerTime<=dateRange[1];
+        });
+    }
+    let total = newList.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);
+    let newDataList = newList.slice((pageIndex - 1) * pageSize, pageIndex * pageSize);
     return {
         code: 200,
         message: 'success',
@@ -116,11 +138,22 @@ let noticeList = Mock.mock({
 // 分页获取
 Mock.mock('/notice/list', 'post', (params) => { 
     let body = JSON.parse(params.body);
-    let { pageIndex, pageSize } = body
-    let total = noticeList.data.length;
+    let { pageIndex, pageSize,queryParams } = body
+    let newList = noticeList.data;
+    if( newList.length>0 && queryParams.noticeTitle ){
+        newList  = newList.filter( (res)=>{
+            return res.noticeTitle==queryParams.noticeTitle;
+        });
+    }
+    if( newList.length>0 && queryParams.dateRange.length>0 ){
+        newList  = newList.filter( (res)=>{
+            return res.createTime>=queryParams.dateRange[0] && res.createTime<=queryParams.dateRange[1];
+        });
+    }
+    let total = newList.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);
+    let newDataList = newList.slice((pageIndex - 1) * pageSize, pageIndex * pageSize);
     return {
         code: 200,
         message: 'success',

src/router/index.js

@@ -162,16 +162,17 @@ export const constantRoutes = [
     meta: { title: '公告管理', icon: 'announcement' },
     children: [
       {
-        path: 'announcementAdd',
-        component: () => import('@/views/announcement/add/index'),
-        name: 'announcementAdd',
-        meta: { title: '创建公告', icon: 'user' }
-      }, {
         path: 'announcementList',
         component: () => import('@/views/announcement/list/index'),
         name: 'announcementList',
-        meta: { title: '公告列表', icon: 'user' }
+        meta: { title: '公告列表', icon: 'announcement' }
       },
+      {
+        path: 'announcementAdd',
+        component: () => import('@/views/announcement/add/index'),
+        name: 'announcementAdd',
+        meta: { title: '创建公告', icon: 'createseries' }
+      }, 
       {
         path: 'announcementDetail',
         hidden:true,

src/views/announcement/add/index.vue

@@ -1,31 +1,32 @@
 <template>
   <div>
-    <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>
-      </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-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-col>
-        <el-col :span="11">
-          <el-form-item prop="date2">
-            <el-time-picker placeholder="选择时间" v-model="ruleForm.date2" style="width: 100%;"></el-time-picker>
+          <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-col>
-      </el-form-item>
-      <el-card style="height: 610px;">
-        <quill-editor v-model="content" ref="myQuillEditor" style="height: 500px;" :options="editorOption">
-        </quill-editor>
-      </el-card>
-      <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
-        <el-button @click="resetForm('ruleForm')">重置</el-button>
-      </el-form-item>
-    </el-form>
+          <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>
   </div>
 </template>
 <script>
@@ -44,13 +45,11 @@ export default {
   data() {
     return {
       //富文本
-      content: null,
       editorOption: {},
 
       ruleForm: {
         name: '',
         date1: '',
-        date2: '',
         delivery: false,
         desc: ''
       },
@@ -88,3 +87,19 @@ export default {
   }
 }
 </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>

src/views/announcement/list/index.vue

@@ -10,7 +10,7 @@
           <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  :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
         <el-form-item class="inline" label="公告标题:  " prop="noticeTitle" >
           <el-input
             v-model="queryParams.noticeTitle"
@@ -19,14 +19,15 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item class="inline" label="发布时间:  " prop="createTime">
+        <el-form-item class="inline" label="发布时间:  " prop="dateRange">
           <el-date-picker
-            v-model="queryParams.createTime"
+            v-model="queryParams.dateRange"
             type="daterange"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             placeholder="选择时间范围"
+            value-format="yyyy-MM-dd"
             @keyup.enter.native="handleQuery"
             unlink-panels  >
           </el-date-picker>
@@ -57,7 +58,7 @@
         prop="noticeTitle"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="发布时间" align="center" prop="createTime" width="170">
+      <el-table-column label="发布时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -101,21 +102,12 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
       // 公告表格数据
       noticeList: [],
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         noticeTitle: undefined,
-        createBy: undefined,
-        status: undefined
+        dateRange:[]
       },
       // 分页参数
       pagination:{
@@ -123,14 +115,6 @@ export default {
         current:1,
         pageSize:10,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        noticeTitle: [
-          { required: true, message: "公告标题不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
@@ -142,9 +126,9 @@ export default {
       this.loading = true;
       getNoticeList({
         pageIndex: this.pagination.current,
-        pageSize: this.pagination.pageSize
+        pageSize: this.pagination.pageSize,
+        queryParams:this.queryParams
       }).then( res =>{
-        // console.log("数据",res);
         let data = res.data.data;
         this.noticeList = data.noticeList;
         this.pagination.total = data.total;
@@ -152,20 +136,9 @@ export default {
         this.loading = false;
       })
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        noticeId: undefined,
-        noticeTitle: undefined,
-        noticeType: undefined,
-        noticeContent: undefined,
-        status: "0"
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pagination.current = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -175,7 +148,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      // 路由跳转
       this.$router.push({name:"announcementAdd"});
     },
     // 查看详情

src/views/appuserlist/index.vue

@@ -7,11 +7,11 @@
               <i class="el-icon-search"></i>
               <span>  筛选搜查</span>
               <div class="search-button">
-                <el-button  @click="resetQuery">重置</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="100px" class="search-form">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" class="search-form">
               <el-form-item label="编号：" prop="userId">
                 <el-input
                   v-model="queryParams.userId"
@@ -21,9 +21,9 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="手机号码：" prop="phonenumber">
+              <el-form-item label="手机号码：" prop="phoneNumber">
                 <el-input
-                  v-model="queryParams.phonenumber"
+                  v-model="queryParams.phoneNumber"
                   placeholder="请输入手机号码"
                   clearable
                   style="width: 240px"
@@ -117,21 +117,15 @@
       return {
         // 遮罩层
         loading: true,
-        // 显示搜索条件
-        showSearch: true,
         // 用户表格数据
         userList: null,
         // 日期范围
         dateRange:[],
-        // 表单参数
-        form: {},
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          userName: undefined,
-          phonenumber: undefined,
-          status: undefined,
+          userId:undefined,
+          phoneNumber:undefined,
+          status:undefined,
         },
         // 分页参数
         pagination:{
@@ -161,7 +155,9 @@
         this.loading = true;
         getUsersList({
           pageIndex: this.pagination.current,
-          pageSize: this.pagination.pageSize
+          pageSize: this.pagination.pageSize,
+          queryParams:this.queryParams,
+          dateRange:this.dateRange
         }).then(response => {
           //console.log("数据",response);
           let data = response.data.data;
@@ -173,21 +169,18 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.queryParams.pageNum = 1;
+        this.pagination.current = 1;
+        console.log("时间",this.dateRange);
         this.getList();
       },
       /** 重置按钮操作 */
       resetQuery() {
         this.dateRange = [];
-        this.queryParams.userId=undefined;
-        this.queryParams.phonenumber=undefined;
-        this.queryParams.status=undefined;
-        this.resetForm("queryForm");
+        this.resetForm("queryForm")
         this.handleQuery();
       },
       // 页号发生变化
       onPageChange(number){
-        // console.log("页号：",number);
         this.pagination.current=number;
         this.getList();
       }