增加会议发布/删除/结束会议功能,调整缓存bug

src/components/meetingbox/index.vue

@@ -11,9 +11,22 @@
        <div class="bottom clearfix">
          <time class="time">{{this.list.address}}</time>
          <p class="time">举办时间:{{this.list.startTime}}</p>
          <el-button type="text" class="button" v-if="this.list.isCheck===0">发布</el-button>
          <el-button type="text" class="button" v-if="this.list.isCheck===1">会议结束</el-button>
          <el-button type="text" class="button" v-if="this.list.isCheck===2">会议结束</el-button>
          <el-button
            type="text"
            class="button"
            v-if="this.list.isCheck===0"
            @click="status"
            style="margin-right:50px"
          >发布</el-button>
          <el-button type="text" class="button" v-if="this.list.isCheck===1" @click="status">结束会议</el-button>
          <el-button
            type="text"
            class="button"
            v-if="this.list.isCheck===0||this.list.isCheck===2"
            style="color:red"
            @click="delMeeting"
          >删除</el-button>
          <!-- <el-button type="text" class="button" @click="handClick" style="margin-right:150px">传值</el-button> -->
        </div>
      </div>
    </el-card>
@@ -55,6 +68,40 @@ export default {
      } else {
        this.image = this.httpimage;
      }
    },
    //修改状态
    status() {
      this.$http({
        url: this.$http.adornUrl("/admin/meeting/status"),
        method: "post",
        data: {
          id: this.list.id,
          status: this.list.isCheck === 0 ? 1 : 2
        }
      }).then(({ data }) => {
        if (data) {
          this.$emit("statusMeeting");
        } else {
          window.console.log(data);
        }
      });
    },
    //删除
    delMeeting() {
      let arr = [];
      arr[0] = this.list.id;
      this.$http({
        url: this.$http.adornUrl("/admin/meeting/delete"),
        method: "post",
        data: this.$http.adornData(arr, false)
      })
        .then(res => {
          window.console.log(res);
          this.$emit("statusMeeting");
        })
        .catch(err => {
          window.console.log(err);
        });
    }
  },
  watch: {}

src/views/common/home.vue

@@ -1,6 +1,6 @@
<template>
  <div class="mod-config">
  <div class="mod-config" v-loading="dataListLoading">
    <el-row>
      <el-col :span="6">
        <div class="grid-content bg-purple-light">
@@ -18,7 +18,14 @@
          <h2>未发布中的会议</h2>
        </div>
      </el-col>
      <meeting-box v-for="item in unpublished" :key="item.id" :list="item" style="margin-top:10px;"></meeting-box>
      <meeting-box
        v-for="item in unpublished"
        :key="item.id"
        :list="item"
        style="margin-top:10px;"
        @statusMeeting="childrenStatus"
      ></meeting-box>
    </el-row>
    <el-row>
      <el-col :span="24">
@@ -28,7 +35,13 @@
      </el-col>
    </el-row>
    <el-row>
      <meeting-box v-for="item in release" :key="item.id" :list="item" style="margin-top:20px;"></meeting-box>
      <meeting-box
        v-for="item in release"
        :key="item.id"
        :list="item"
        style="margin-top:20px;"
        @statusMeeting="childrenStatus"
      ></meeting-box>
    </el-row>
    <el-row>
      <el-col :span="24">
@@ -38,10 +51,21 @@
      </el-col>
    </el-row>
    <el-row>
      <meeting-box v-for="item in delRelease" :key="item.id" :list="item" style="margin-top:20px;"></meeting-box>
      <meeting-box
        v-for="item in delRelease"
        :key="item.id"
        :list="item"
        style="margin-top:20px;"
        @statusMeeting="childrenStatus"
      ></meeting-box>
    </el-row>
    <!-- 弹窗, 新增 / 修改 -->
    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
    <add-or-update
      v-if="addOrUpdateVisible"
      ref="addOrUpdate"
      @refreshDataList="getDataList"
      :key="timer"
    ></add-or-update>
  </div>
</template>
@@ -65,7 +89,8 @@ export default {
      dataListSelections: [],
      addOrUpdateVisible: false,
      meetingId: "",
      reFresh: true
      reFresh: true,
      timer: "" //重新加载子组件
    };
  },
  components: {
@@ -92,7 +117,7 @@ export default {
        })
      }).then(({ data }) => {
        if (data && data.code === 0) {
          window.console.log(data)
          window.console.log(data);
          this.dataList = data.list;
          this.getHandleDataList(data.list);
        } else {
@@ -138,6 +163,8 @@ export default {
    },
    // 新增 / 修改
    addOrUpdateHandle(id) {
      //重新加载子组件
      this.timer = new Date().getTime();
      this.addOrUpdateVisible = true;
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(id);
@@ -183,6 +210,13 @@ export default {
    getMeetingListId(data) {
      this.meetingId = data;
      console.log(this.meetingId);
    },
    //接受组件修改状态 刷新视图
    childrenStatus(msg) {
      this.unpublished = [];
      this.release = [];
      this.delRelease = [];
      this.getDataList();
    }
  }
};

src/views/common/login.vue

@@ -3,8 +3,8 @@
    <div class="site-content__wrapper">
      <div class="site-content">
        <div class="brand-info">
          <h2 class="brand-info__text">renren-fast-vue</h2>
          <p class="brand-info__intro">renren-fast-vue基于vue、element-ui构建开发，实现renren-fast后台管理前端功能，提供一套更优的前端解决方案。</p>
          <h2 class="brand-info__text">科袖会议管理系统</h2>
          <p class="brand-info__intro">提供一套更优的会议管理解决方案。</p>
        </div>
        <div class="login-main">
          <h3 class="login-title">管理员登录</h3>

src/views/modules/admin/adminmenu.vue

@@ -6,8 +6,17 @@
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
        <el-button v-if="isAuth('admin:adminmenu:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
        <el-button v-if="isAuth('admin:adminmenu:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
        <el-button
          v-if="isAuth('admin:adminmenu:save')"
          type="primary"
          @click="addOrUpdateHandle()"
        >新增</el-button>
        <el-button
          v-if="isAuth('admin:adminmenu:delete')"
          type="danger"
          @click="deleteHandle()"
          :disabled="dataListSelections.length <= 0"
        >批量删除</el-button>
      </el-form-item>
    </el-form>
    <el-table
@@ -15,79 +24,30 @@
      border
      v-loading="dataListLoading"
      @selection-change="selectionChangeHandle"
      style="width: 100%;">
      <el-table-column
        type="selection"
        header-align="center"
        align="center"
        width="50">
      </el-table-column>
      <el-table-column
        prop="menuId"
        header-align="center"
        align="center"
        label="">
      </el-table-column>
      <el-table-column
        prop="parentId"
        header-align="center"
        align="center"
        label="父菜单ID，一级菜单为0">
      </el-table-column>
      <el-table-column
        prop="name"
        header-align="center"
        align="center"
        label="菜单名称">
      </el-table-column>
      <el-table-column
        prop="url"
        header-align="center"
        align="center"
        label="菜单URL">
      </el-table-column>
      style="width: 100%;"
    >
      <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
      <el-table-column prop="menuId" header-align="center" align="center" label></el-table-column>
      <el-table-column prop="parentId" header-align="center" align="center" label="父菜单ID，一级菜单为0"></el-table-column>
      <el-table-column prop="name" header-align="center" align="center" label="菜单名称"></el-table-column>
      <el-table-column prop="url" header-align="center" align="center" label="菜单URL"></el-table-column>
      <el-table-column
        prop="perms"
        header-align="center"
        align="center"
        label="授权(多个用逗号分隔，如：user:list,user:create)">
      </el-table-column>
        label="授权(多个用逗号分隔，如：user:list,user:create)��权(多个用逗号分隔，如：user:list,user:create)"
      ></el-table-column>
      <el-table-column
        prop="type"
        header-align="center"
        align="center"
        label="类型   0：目录   1：菜单   2：按钮">
      </el-table-column>
      <el-table-column
        prop="icon"
        header-align="center"
        align="center"
        label="菜单图标">
      </el-table-column>
      <el-table-column
        prop="orderNum"
        header-align="center"
        align="center"
        label="排序">
      </el-table-column>
      <el-table-column
        prop="me"
        header-align="center"
        align="center"
        label="会议目录">
      </el-table-column>
      <el-table-column
        prop="isTab"
        header-align="center"
        align="center"
        label="tab">
      </el-table-column>
      <el-table-column
        fixed="right"
        header-align="center"
        align="center"
        width="150"
        label="操作">
        label="类型   0：目录   1：菜单   2：按钮"
      ></el-table-column>
      <el-table-column prop="icon" header-align="center" align="center" label="菜单图标"></el-table-column>
      <el-table-column prop="orderNum" header-align="center" align="center" label="排序"></el-table-column>
      <el-table-column prop="me" header-align="center" align="center" label="会议目录"></el-table-column>
      <el-table-column prop="isTab" header-align="center" align="center" label="tab"></el-table-column>
      <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
        <template slot-scope="scope">
          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.menuId)">修改</el-button>
          <el-button type="text" size="small" @click="deleteHandle(scope.row.menuId)">删除</el-button>
@@ -101,111 +61,117 @@
      :page-sizes="[10, 20, 50, 100]"
      :page-size="pageSize"
      :total="totalPage"
      layout="total, sizes, prev, pager, next, jumper">
    </el-pagination>
      layout="total, sizes, prev, pager, next, jumper"
    ></el-pagination>
    <!-- 弹窗, 新增 / 修改 -->
    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
  </div>
</template>
<script>
  import AddOrUpdate from './adminmenu-add-or-update'
  export default {
    data () {
      return {
        dataForm: {
          key: ''
        },
        dataList: [],
        pageIndex: 1,
        pageSize: 10,
        totalPage: 0,
        dataListLoading: false,
        dataListSelections: [],
        addOrUpdateVisible: false
      }
import AddOrUpdate from "./adminmenu-add-or-update";
export default {
  data() {
    return {
      dataForm: {
        key: ""
      },
      dataList: [],
      pageIndex: 1,
      pageSize: 10,
      totalPage: 0,
      dataListLoading: false,
      dataListSelections: [],
      addOrUpdateVisible: false
    };
  },
  components: {
    AddOrUpdate
  },
  activated() {
    this.getDataList();
  },
  methods: {
    // 获取数据列表
    getDataList() {
      this.dataListLoading = true;
      this.$http({
        url: this.$http.adornUrl("/admin/adminmenu/list"),
        method: "get",
        params: this.$http.adornParams({
          page: this.pageIndex,
          limit: this.pageSize,
          key: this.dataForm.key
        })
      }).then(({ data }) => {
        if (data && data.code === 0) {
          this.dataList = data.page.list;
          this.totalPage = data.page.totalCount;
        } else {
          this.dataList = [];
          this.totalPage = 0;
        }
        this.dataListLoading = false;
      });
    },
    // 每页数
    sizeChangeHandle(val) {
      this.pageSize = val;
      this.pageIndex = 1;
      this.getDataList();
    },
    // 当前页
    currentChangeHandle(val) {
      this.pageIndex = val;
      this.getDataList();
    },
    components: {
      AddOrUpdate
    // 多选
    selectionChangeHandle(val) {
      this.dataListSelections = val;
    },
    activated () {
      this.getDataList()
    // 新增 / 修改
    addOrUpdateHandle(id) {
      this.addOrUpdateVisible = true;
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(id);
      });
    },
    methods: {
      // 获取数据列表
      getDataList () {
        this.dataListLoading = true
    // 删除
    deleteHandle(id) {
      var ids = id
        ? [id]
        : this.dataListSelections.map(item => {
            return item.menuId;
          });
      this.$confirm(
        `确定对[id=${ids.join(",")}]进行[${id ? "删除" : "批量删除"}]操作?`,
        "提示",
        {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }
      ).then(() => {
        this.$http({
          url: this.$http.adornUrl('/admin/adminmenu/list'),
          method: 'get',
          params: this.$http.adornParams({
            'page': this.pageIndex,
            'limit': this.pageSize,
            'key': this.dataForm.key
          })
        }).then(({data}) => {
          url: this.$http.adornUrl("/admin/adminmenu/delete"),
          method: "post",
          data: this.$http.adornData(ids, false)
        }).then(({ data }) => {
          if (data && data.code === 0) {
            this.dataList = data.page.list
            this.totalPage = data.page.totalCount
            this.$message({
              message: "操作成功",
              type: "success",
              duration: 1500,
              onClose: () => {
                this.getDataList();
              }
            });
          } else {
            this.dataList = []
            this.totalPage = 0
            this.$message.error(data.msg);
          }
          this.dataListLoading = false
        })
      },
      // 每页数
      sizeChangeHandle (val) {
        this.pageSize = val
        this.pageIndex = 1
        this.getDataList()
      },
      // 当前页
      currentChangeHandle (val) {
        this.pageIndex = val
        this.getDataList()
      },
      // 多选
      selectionChangeHandle (val) {
        this.dataListSelections = val
      },
      // 新增 / 修改
      addOrUpdateHandle (id) {
        this.addOrUpdateVisible = true
        this.$nextTick(() => {
          this.$refs.addOrUpdate.init(id)
        })
      },
      // 删除
      deleteHandle (id) {
        var ids = id ? [id] : this.dataListSelections.map(item => {
          return item.menuId
        })
        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          this.$http({
            url: this.$http.adornUrl('/admin/adminmenu/delete'),
            method: 'post',
            data: this.$http.adornData(ids, false)
          }).then(({data}) => {
            if (data && data.code === 0) {
              this.$message({
                message: '操作成功',
                type: 'success',
                duration: 1500,
                onClose: () => {
                  this.getDataList()
                }
              })
            } else {
              this.$message.error(data.msg)
            }
          })
        })
      }
        });
      });
    }
  }
};
</script>

src/views/modules/admin/attenders.vue

@@ -59,7 +59,7 @@
            type="success"
            @click="changeStatus(scope.row.id, 'intention', 0)"
          >是</el-button>
          <el-button v-else @click="changeStatus(scope.row.id, 'intention', 1)" >否</el-button>
          <el-button v-else @click="changeStatus(scope.row.id, 'intention', 1)">否</el-button>
        </template>
      </el-table-column>
      <el-table-column prop="room" header-align="center" align="center" label="住宿要求">
@@ -69,7 +69,7 @@
            type="success"
            @click="changeStatus(scope.row.id, 'room', 0)"
          >是</el-button>
          <el-button v-else @click="changeStatus(scope.row.id, 'room', 1)" >否</el-button>
          <el-button v-else @click="changeStatus(scope.row.id, 'room', 1)">否</el-button>
        </template>
      </el-table-column>
      <el-table-column prop="transfer" header-align="center" align="center" label="接送要求">
@@ -79,7 +79,7 @@
            type="success"
            @click="changeStatus(scope.row.id, 'transfer', 0)"
          >是</el-button>
          <el-button v-else @click="changeStatus(scope.row.id, 'transfer', 1) " >否</el-button>
          <el-button v-else @click="changeStatus(scope.row.id, 'transfer', 1) ">否</el-button>
        </template>
      </el-table-column>
      <el-table-column prop="transfer" header-align="center" align="center" label="用户类型"></el-table-column>

src/views/modules/admin/lecture-add-or-update.vue

@@ -11,19 +11,8 @@
      @keyup.enter.native="dataFormSubmit()"
      label-width="100px"
    >
      <!-- <el-form-item label="会议id" prop="meetingId">
        <el-input v-model="dataForm.meetingId" placeholder="会议id"></el-input>
      </el-form-item>-->
      <el-form-item label="参会人员" prop="attendersId">
        <!-- <el-select v-model="dataForm.attendersId" filterable placeholder="请选择">
          <el-option
            v-for="item in options"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          ></el-option>
        </el-select>-->
        <el-select
        <!-- <el-select
          v-model="dataForm.attendersId"
          filterable
          remote
@@ -38,8 +27,15 @@
            :label="item.label"
            :value="item.value"
          ></el-option>
        </el-select>-->
        <el-select v-model="dataForm.attendersId" filterable placeholder="请选择">
          <el-option
            v-for="item in meetingList"
            :key="item.id"
            :label="item.name"
            :value="item.id"
          ></el-option>
        </el-select>
        <!-- <el-input v-model="dataForm.attendersId" placeholder="演讲人id"></el-input> -->
      </el-form-item>
      <el-form-item label="题目" prop="topic">
@@ -113,9 +109,7 @@ export default {
        ]
      },
      options: [],
      loading: false,
      meetingId: 0,
      list: [],
      meetingList: []
    };
  },
@@ -146,7 +140,7 @@ export default {
              this.dataForm.summary = data.lecture.summary;
              !this.dataForm.id
                ? this.dataForm.attendersId
                : this.dataForm.attendersId = "";
                : (this.dataForm.attendersId = "");
            }
          });
        }
@@ -190,7 +184,6 @@ export default {
    },
    // 通过姓名模糊查询参会人员id
    getAttendersIdByname(name = "") {
      this.loading = true;
      this.$http({
        url: this.$http.adornUrl(`/admin/attenders/selectbyname`),
        method: "get",
@@ -200,26 +193,9 @@ export default {
        })
      }).then(({ data }) => {
        if (data && data.code === 0) {
          this.loading = false;
          this.meetingList = data.list;
          this.list = this.meetingList.map(item => {
            return { value: `${item.id}`, label: `${item.name}` };
          });
        }
      });
    },
    remoteMethod(query) {
      if (query !== "") {
        this.loading = true;
        setTimeout(() => {
          this.loading = false;
          this.options = this.list.filter(item => {
            return item.label.toLowerCase().indexOf(query.toLowerCase()) > -1;
          });
        }, 300);
      } else {
        this.options = [];
      }
    }
  }
};

src/views/modules/admin/lecture.vue

@@ -67,7 +67,7 @@ export default {
        key: ""
      },
      dataList: [],
      pageIndex: 1,
      pageIndex: 0,
      pageSize: 10,
      totalPage: 0,
      dataListLoading: false,

src/views/modules/admin/meeting-add-or-update.vue

@@ -361,10 +361,10 @@ export default {
            })
          }).then(({ data }) => {
            if (data && data.code === 0) {
              this.subjects = "";
              this.titlePictureList = "";
              this.industry = "";
              this.typesofattender = "";
              this.subjects = [];
              this.titlePictureList = [];
              this.industry = [];
              this.typesofattender = [];
              this.$message({
                message: "操作成功",
                type: "success",
@@ -388,14 +388,6 @@ export default {
    successHandle(response, file) {
      if (response && response.code === 0) {
        this.titlePictureList.push(response.picname);
        // window.console.log(this.titlePictureList.join());
        // if (response) {
        //   this.dataForm.titlePicture = response.thumb;
        //   // this.showimg = "http://121.42.53.174:9008/static" + response.thumb;
        // } else {
        //   // this.showimg = "http://121.42.53.174:9008/static" + response.picname;
        //   this.dialogVisible = true;
        // }
      } else {
        this.$message.error(response.msg);
      }

src/views/modules/admin/meeting.vue

@@ -1,5 +1,5 @@
<template>
  <div class="ll-content">
  <div class="ll-content" v-loading="loading">
    <h1>{{meetingData.nameCn}}</h1>
    <div class="box">
      <img :src="imageNull" class="bgMeeting" />
@@ -31,7 +31,8 @@ export default {
      meetingData: {},
      subjectsList: [],
      industries: [],
      image: ""
      image: "",
      loading: false
    };
  },
  components: {},
@@ -53,6 +54,7 @@ export default {
  },
  methods: {
    getMeeting() {
      this.loading = true;
      this.id = this.$route.params.id;
      if (this.id) {
        this.$http({
@@ -61,12 +63,12 @@ export default {
          params: this.$http.adornParams()
        }).then(res => {
          if (res.data && res.data.code === 0) {
            window.console.log(res.data);
            window.console.log(res.data.meeting);
            this.meetingData = res.data.meeting;
            this.industries = res.data.meeting.industries.split(",");
            this.image = res.data.meeting.titlePicture;
            this.subjectsList = res.data.meeting.subjects.split(",");
            
            this.loading = false;
          }
        });
      }

src/views/modules/admin/typesoffee.vue

@@ -1,5 +1,5 @@
<template>
  <div class="typesoffeeContent">
  <div class="typesoffeeContent" v-loading="loading">
    <el-form>
      <el-form-item label="注册费用信息"></el-form-item>
      <el-form-item>
@@ -76,7 +76,8 @@ export default {
        account: ""
      },
      moneyaccount: {}, //注册类型返回数据
      show: true
      show: true,
      loading: false
    };
  },
  components: {},
@@ -167,6 +168,7 @@ export default {
    },
    //提交对公收款账户信息
    pushMoneyaccount() {
      this.loading = true;
      this.$http({
        url: this.$http.adornUrl("/admin/moneyaccount/addorupdate"),
        method: "post",
@@ -202,6 +204,7 @@ export default {
      }).then(({ data }) => {
        if (data && data.code === 0) {
          this.moneyaccount = data.moneyAccount;
          this.loading = false;
        }
      });
    }