message

src/api/announce/list.js

@@ -1,5 +1,8 @@
+//mock
 import axios from "axios"
 import '@/mock/index'
+//后端接口
+import request from '@/utils/request'
 
 // 获取公告列表
 export const getNoticeList = (param)=>{

src/api/message/index.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function getMessageList(list){
+    return request({
+        url:'system/infos/list',
+        method:'get'
+    })
+}

src/views/announcement/add/index.vue

@@ -20,9 +20,9 @@
           </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>
+              <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+              <el-button @click="resetForm('ruleForm')">重置</el-button>
+            </el-form-item>
           </div>
         </el-form>
       </div>
@@ -36,6 +36,7 @@ import {
 import 'quill/dist/quill.core.css'
 import 'quill/dist/quill.snow.css'
 import 'quill/dist/quill.bubble.css'
+import { addAnnouncement } from '../../../api/announce/list'
 
 export default {
   name: 'FuncFormsEdit',
@@ -93,12 +94,14 @@ export default {
   margin-top: 40px;
   margin-left: 300px;
 }
-.content{
+
+.content {
   margin-top: 20px;
   margin-right: 30px;
   position: relative;
 }
-.button{
+
+.button {
   position: absolute;
   margin-top: 70px;
 }

src/views/message/messageCreate/index.vue

@@ -1,105 +1,114 @@
 <template>
-    <div>
-      <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>
+  <div>
+    <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="receivedUsers">
+            <el-input type="textarea" :rows="2" placeholder="请导入用户" autosize v-model="ruleForm.receivedUsers"></el-input>
+          </el-form-item>
+          <el-form-item label="消息内容" prop="desc">
+            <quill-editor v-model="ruleForm.desc" ref="myQuillEditor" style="height: 320px;" :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>
-  import {
+          </div>
+        </el-form>
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+import {
+  quillEditor
+} from 'vue-quill-editor'
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+export default {
+  name: 'FuncFormsEdit',
+  components: {
     quillEditor
-  } from 'vue-quill-editor'
-  import 'quill/dist/quill.core.css'
-  import 'quill/dist/quill.snow.css'
-  import 'quill/dist/quill.bubble.css'
-  
-  export default {
-    name: 'FuncFormsEdit',
-    components: {
-      quillEditor
-    },
-    data() {
-      return {
-        //富文本
-        editorOption: {},
-  
-        ruleForm: {
-          name: '',
-          date1: '',
-          delivery: false,
-          desc: ''
-        },
-        rules: {
-          name: [
-            { required: true, message: '请输入公告名称', trigger: 'blur' },
-            { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
-          date1: [
-            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
-          ],
-          date2: [
-            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
-          ],
-          desc: [
-            { required: true, message: '请填写公告内容', trigger: 'blur' }
-          ]
-        }
-      };
-    },
-    methods: {
-      submitForm(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            alert('submit!');
-          } else {
-            console.log('error submit!!');
-            return false;
-          }
-        });
+  },
+  data() {
+    return {
+      //富文本
+      editorOption: {},
+
+      ruleForm: {
+        name: '',
+        date1: '',
+        delivery: false,
+        desc: '',
+        receivedUsers: '',
       },
-      resetForm(formName) {
-        this.$refs[formName].resetFields();
+      rules: {
+        name: [
+          { required: true, message: '请输入公告名称', trigger: 'blur' },
+          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        ],
+        date1: [
+          { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        date2: [
+          { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+        ],
+        receivedUsers: [
+          { required: true, message: '请导入接受用户', trigger: 'blur' }
+        ],
+        desc: [
+          { required: true, message: '请填写公告内容', trigger: 'blur' }
+        ]
       }
+    };
+  },
+  methods: {
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert('submit!');
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
     }
   }
-  </script>
+}
+</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>
+<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/message/messageList/index.vue

@@ -25,13 +25,13 @@
     </el-card>
     <el-card style="height: 300px;width: 1200px; margin-left: 30px;">
       <el-table :data="tableData" border height="250" style="width: 100%">
-        <el-table-column fixed prop="messageID" label="ID" align="center" width="250">
+        <el-table-column fixed prop="id" label="ID" align="center" width="250">
         </el-table-column>
-        <el-table-column prop="messageTitle" label="消息标题" align="center" width="220">
+        <el-table-column prop="title" label="消息标题" align="center" width="220">
         </el-table-column>
         <el-table-column prop="messageTel" label="手机号" align="center" width="220">
         </el-table-column>
-        <el-table-column prop="messageData" label="发布时间" align="center" width="220">
+        <el-table-column prop="sendTime" label="发布时间" align="center" width="220">
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center" width="200">
           <template slot-scope="scope">
@@ -44,13 +44,13 @@
         :current-page="currentPage" :page-sizes="[5, 10, 20, 50]" :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper" prev-text="上一页" next-text="下一页" :total="this.tableData.length">
       </el-pagination>
-
     </el-card>
   </div>
 </template>
 
 <script>
-import axios from "axios"
+import { getMessageList } from "../../../api/message";
+
 export default {
   data() {
     return {
@@ -67,43 +67,32 @@ export default {
       styleArrow: true,
       setContent: '',
       setTitle: ''
-
     }
   },
   methods: {
     //搜索功能
     onSubmit() {
       // 若未输入值，则展示所有数据
-      if(null === this.formInline.messageTitle || undefined === this.formInline.messageTitle){
+      if (null === this.formInline.messageTitle || undefined === this.formInline.messageTitle) {
         this.tableDataRst = this.tableData;
       } else {
         this.tableDataRst = []; // 结果列表置空
-        let regStr =  '';
+        let regStr = '';
         // 初始化正则表达式
-        for(let i=0; i<this.formInline.messageTitle.length; i++){
+        for (let i = 0; i < this.formInline.messageTitle.length; i++) {
           regStr = regStr + '(' + this.formInline.messageTitle[i] + ')([\\s]*)'; //跨字匹配
         }
         let reg = new RegExp(regStr);
         console.log(reg);
-        for(let i=0; i<this.tableData.length; i++){
+        for (let i = 0; i < this.tableData.length; i++) {
           let name = this.tableData[i].name; //按照名字匹配
           let regMatch = name.match(reg);
-          if(null !== regMatch) {//将匹配的数据放入结果列表中
-             this.tableDataRst.push(this.tableData[i]);
+          if (null !== regMatch) {//将匹配的数据放入结果列表中
+            this.tableDataRst.push(this.tableData[i]);
           }
         }
       }
     },
-    //重置功能
-    resetForm() {
-      this.$options.data();
-      // // 重置数据
-      // this.$data = this.$options.data();
-      //  有报错Avoid replacing instance root $data. Use nested data properties instead.
-      // Object.assign(this.$data, this.$options.data())
-      this.formInline.messageTitle = "";
-      this.value = ""
-    },
     //消息删除
     messageDel(row, column) {
       console.log(column);
@@ -122,21 +111,31 @@ export default {
     handleAdd() {
       this.$router.push({
         path: 'messageCreate'
-      })
-      // 路由跳转
+      }) // 路由跳转
+    },
+    //重置功能
+    resetForm() {
+      this.$options.data();
+      // // 重置数据
+      // this.$data = this.$options.data();
+      //  有报错Avoid replacing instance root $data. Use nested data properties instead.
+      // Object.assign(this.$data, this.$options.data())
+      this.formInline.messageTitle = "";
+      this.value = ""
     },
     //获取消息列表
-    getMessageList() {
-      axios.post("http://localhost:8080/goods/goodAll").then((res) => {
-        this.tableData = res.data.data
-      }).catch(error => {
-
+    getMessage() {
+      getMessageList().then((res) => {
+        console.log(res);
+        console.log(res.rows);
+        this.tableData = res.rows
+        console.log(this.tableData);
       })
     },
   },
 
   mounted() {
-    this.getMessageList();
+    this.getMessage();
   },
 }
 

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://39.105.160.25:10991`,
+        target: `http://39.105.160.25:10995`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''