up

houtai/src/utils/api.js

@@ -74,4 +74,11 @@ export const remarkDetail= () => {
     method: 'get',
     url: '/cms/activity/remark/detail',
   })
+}
+// 导出-excel
+export const exportExcel= (id) => {
+  return axios({
+    method: 'get',
+    url: `/cms/activity/export/excel/${id}`,
+  })
 }

houtai/src/views/tab1/index.vue

@@ -77,7 +77,9 @@
           </el-table-column>
           <el-table-column label="操作" width="280">
             <template #default="{ row }">
-              <el-button type="text">预约名单导出</el-button>
+              <el-button type="text" @click="exportExcel(row.name, row.id)"
+                >预约名单导出</el-button
+              >
               <el-button
                 type="text"
                 v-if="row.display == 0"
@@ -122,13 +124,21 @@
 </template>
 
 <script>
-import { getList, activityRemove, activityPublish } from "@/utils/api";
+import axios from "@/utils/request";
+
+import {
+  getList,
+  activityRemove,
+  activityPublish,
+  exportExcel,
+} from "@/utils/api";
 export default {
   name: "tab1",
   components: {},
   data() {
     //这里存放数据
     return {
+      baseURL: "",
       total: 0,
       time: "",
       mainTopInd: "",
@@ -170,6 +180,15 @@ export default {
   },
   //方法集合
   methods: {
+    // 点击导出
+    async exportExcel(name, id) {
+      let res = await exportExcel(id);
+      const a = document.createElement("a");
+      const url = this.baseURL + res.data.filePath;
+      a.setAttribute("href", url);
+      a.setAttribute("download", name);
+      a.click();
+    },
     // 点击发布
     async activityPublish(id, display, txt) {
       let res = await activityPublish(id, display);
@@ -250,6 +269,9 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
+    // 获取服务器前缀地址
+    this.baseURL = axios.defaults.baseURL;
+
     const k = this.$route.query.k;
     if (k) this.formData.pageNum = Number(k);
     this.getList(this.formData);

houtai/src/views/tab3.vue

@@ -101,7 +101,7 @@ export default {
     }
   }
   .main {
-    padding: 10px 35px 24px;
+    padding: 30px 35px 24px;
     margin-top: 15px;
     background-color: #fff;
     box-shadow: 1px 1px 6px 0px;

web/src/utlis/api.js

@@ -42,4 +42,11 @@ export const applyRemove = (applyUserId) => {
     method: 'get',
     url: `/show/apply/remove/${applyUserId}`,
   })
+}
+// 特别提醒
+export const remarkDetail = () => {
+  return axios({
+    method: 'get',
+    url: '/show/remark/detail',
+  })
 }

web/src/views/Info.vue

@@ -63,7 +63,7 @@
         <div class="row">
           <div class="name">姓&emsp;&emsp;名：</div>
           <input
-            onblur="value=value.replace(/[^a-zA-Z\u4e00-\u9fa5]/g,'')"
+            @blur="nameBlur"
             maxlength="10"
             type="text"
             v-model="from.name"
@@ -171,6 +171,10 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    nameBlur(){
+      this.from.name=this.from.name.replace(/[^a-zA-Z\u4e00-\u9fa5]/g,'')
+      if(this.from.name!=='') this.fromFlag.name=false
+    },
     async save() {
       if (this.weekId === null) {
         Dialog.alert({

web/src/views/warn.vue

@@ -4,11 +4,16 @@
     <div class="topImg">
       <img src="../assets/img/warnBac.png" alt="" />
     </div>
+    <div class="main">
+      <h3>特别提醒</h3>
+    <div class="text" v-html="data"></div>
+    </div>
     <ToIndex />
   </div>
 </template>
 
 <script>
+import { remarkDetail } from "@/utlis/api";
 import Back from "../components/Back.vue";
 import ToIndex from "../components/ToIndex.vue";
 export default {
@@ -16,7 +21,9 @@ export default {
   components: { Back, ToIndex },
   data() {
     //这里存放数据
-    return {};
+    return {
+      data: "",
+    };
   },
   //监听属性 类似于data概念
   computed: {},
@@ -27,7 +34,11 @@ export default {
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {},
+  async mounted() {
+    let res = await remarkDetail();
+    this.data = res.data.content || "暂无";
+    console.log(res);
+  },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
   beforeUpdate() {}, //生命周期 - 更新之前
@@ -46,5 +57,21 @@ export default {
       width: 100%;
     }
   }
+  .main{
+    padding: 0px 20px 30px;
+    &>h3{
+      color: #6F774F;
+      font-weight: 700;
+      font-size: 24px;
+      text-align: center;
+      margin-bottom: 20px;
+    }
+    .text{
+      color: #696969;
+      /deep/p{
+        line-height: 24px;
+      }
+    }
+  }
 }
 </style>