5.14修改各项接口

index.html

@@ -4,7 +4,7 @@
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <meta http-equiv="X-UA-Compatible" content="ie=edge">
  <title>人人快速开发平台</title>
  <title>科袖会议管理系统</title>
  <% if (process.env.NODE_ENV === 'production') { %>
    <!-- 生产环境 -->
    <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>

src/components/meetingbox/index.vue

@@ -3,7 +3,7 @@
    <el-card :body-style="{ padding: '8px' }" style="height:400px">
      <div
        class="bg"
        :style="{backgroundImage: 'url( http://121.42.53.174:9008/static' + image + ')', backgroundSize:'cover'}"
        :style="{backgroundImage: 'url( ' + image + ')', backgroundSize:'cover'}"
        @click="handClick()"
      ></div>
      <div style="padding: 14px;">
@@ -39,7 +39,8 @@ export default {
    return {
      id: "",
      httpimage: "",
      image: null
      image: null,
      imageUrl: this.imageUrl
    };
  },
  props: {
@@ -65,8 +66,10 @@ export default {
          .split(",")
          .splice(0, 1)
          .join();
        this.image = this.imageUrl + this.image;
      } else {
        this.image = this.httpimage;
        this.image = this.imageUrl + this.image;
      }
    },
    //修改状态
@@ -79,7 +82,7 @@ export default {
          status: this.list.isCheck === 0 ? 1 : 2
        }
      }).then(({ data }) => {
          window.console.log(data)
        window.console.log(data);
        if (data) {
          this.$emit("statusMeeting");

src/main.js

@@ -24,6 +24,7 @@ Vue.prototype.$http = httpRequest // ajax请求方法
Vue.prototype.isAuth = isAuth     // 权限方法
Vue.prototype.meetingMenu = false     // 会议目录
Vue.prototype.meetingMenuId = 0     // 会议目录
Vue.prototype.imageUrl = 'http://121.42.53.174:9008/static'
// 保存整站vuex本地储存初始状态
window.SITE_CONFIG['storeState'] = cloneDeep(store.state)

src/utils/index.js

@@ -5,7 +5,7 @@ import store from '@/store'
/**
 * 获取uuid
 */
export function getUUID () {
export function getUUID() {
  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
    return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16)
  })
@@ -15,7 +15,7 @@ export function getUUID () {
 * 是否有权限
 * @param {*} key
 */
export function isAuth (key) {
export function isAuth(key) {
  return JSON.parse(sessionStorage.getItem('permissions') || '[]').indexOf(key) !== -1 || false
}
@@ -25,7 +25,7 @@ export function isAuth (key) {
 * @param {*} id
 * @param {*} pid
 */
export function treeDataTranslate (data, id = 'id', pid = 'parentId') {
export function treeDataTranslate(data, id = 'id', pid = 'parentId') {
  var res = []
  var temp = {}
  for (var i = 0; i < data.length; i++) {
@@ -49,10 +49,14 @@ export function treeDataTranslate (data, id = 'id', pid = 'parentId') {
}
/**
 * 清除登录信息
 * 清除登录信息clearLoginInfo
 */
export function clearLoginInfo () {
export function clearLoginInfo() {
  Vue.cookie.delete('token')
  store.commit('resetStore')
  router.options.isAddDynamicMenuRoutes = false
}
// 数组去重
export function set(arr) {
  return [...new Set(arr)]
}

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

@@ -11,25 +11,40 @@
      @keyup.enter.native="dataFormSubmit()"
      label-width="100px"
    >
      <el-form-item label="姓名" prop="name">
        <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
      <el-form-item label="姓名" prop="state2">
        <el-autocomplete
          class="inline-input"
          v-model="dataForm.state2"
          :fetch-suggestions="querySearch"
          placeholder="请输入内容"
          :trigger-on-focus="false"
          @select="handleSelect"
          :style="!dataForm.id ? 'width:80%' :'width:100%' "
        ></el-autocomplete>
        <el-button
          @click="creatorUser"
          class="ll-button"
          type="primary"
          v-show="!dataForm.id"
        >添加新的会员</el-button>
      </el-form-item>
      <el-form-item label="所属机构" prop="organization">
        <el-input v-model="dataForm.organization" placeholder="所属机构(单位名称、公司名称)"></el-input>
      </el-form-item>
      <el-form-item label="职位" prop="position">
      <el-form-item label="职位">
        <el-input v-model="dataForm.position" placeholder="职位"></el-input>
      </el-form-item>
      <el-form-item label="职称" prop="jobTitle">
      <el-form-item label="职称">
        <el-input v-model="dataForm.jobTitle" placeholder="职称"></el-input>
      </el-form-item>
      <el-form-item label="电话" prop="phone">
        <el-input v-model="dataForm.phone" placeholder="电话"></el-input>
      <el-form-item label="手机号" prop="phone">
        <el-input v-model="dataForm.phone" placeholder="手机号"></el-input>
      </el-form-item>
      <el-form-item label="邮箱" prop="email">
      <el-form-item label="邮箱">
        <el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
      </el-form-item>
      <el-form-item label="办公电话" prop="officephone">
      <el-form-item label="办公电话">
        <el-input v-model="dataForm.officephone" placeholder="办公电话"></el-input>
      </el-form-item>
@@ -49,7 +64,6 @@
        <el-radio v-model="dataForm.transfer" :label="0">否</el-radio>
      </el-form-item>
      <el-form-item label="负责人" prop="servicer">
        <!-- <el-input v-model="dataForm.servicer" placeholder="负责人"></el-input> -->
        <el-select v-model="dataForm.servicer" filterable placeholder="请选择">
          <el-option
            v-for="item in employeeList"
@@ -60,7 +74,6 @@
        </el-select>
      </el-form-item>
      <el-form-item label="用户类型" prop="typeId">
        <!-- <el-input v-model="dataForm.servicer" placeholder="负责人"></el-input> -->
        <el-select v-model="dataForm.typeId" filterable placeholder="请选择">
          <el-option
            v-for="item in typesofattendersList"
@@ -70,36 +83,7 @@
          ></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="联系电话" prop="account">
        <el-input v-model="dataForm.account" placeholder="联系电话"></el-input>
      </el-form-item>
      <el-form-item label="联系邮箱" prop="emailLx">
        <el-input v-model="dataForm.emailLx" placeholder="联系邮箱"></el-input>
      </el-form-item>
      <!-- <el-form-item label="创建时间" prop="createTime">
        <el-date-picker
          v-model="dataForm.createTime"
          type="datetime"
          placeholder="选择日期时间"
          value-format="yyyy-MM-dd HH:mm:ss"
        ></el-date-picker>
      </el-form-item>
      <el-form-item label="修改时间" prop="modifyTime">
        <el-date-picker
          v-model="dataForm.modifyTime"
          type="datetime"
          placeholder="选择日期时间"
          value-format="yyyy-MM-dd HH:mm:ss"
        ></el-date-picker>
      </el-form-item>-->
      <!-- <el-form-item label="创建者" prop="creater">
        <el-input v-model="dataForm.creater" placeholder="创建者"></el-input>
      </el-form-item>
      <el-form-item label="修改者" prop="modifier">
        <el-input v-model="dataForm.modifier" placeholder="修改者"></el-input>
      </el-form-item>-->
      <el-form-item label="备注" prop="note">
      <el-form-item label="备注">
        <el-input
          type="textarea"
          :autosize="{ minRows: 2, maxRows: 4}"
@@ -140,19 +124,15 @@ export default {
        note: "",
        account: "",
        emailLx: "",
        regflag: ""
        // creater: "",
        // modifier: "",
        regflag: "",
        state2: ""
      },
      dataRule: {
        meetingId: [
          { required: true, message: "会议id不能为空", trigger: "blur" }
        ],
        memberId: [
          { required: true, message: "会员id不能为空", trigger: "blur" }
        ],
        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
        // state2: [{ required: true, message: "没有会员信息", trigger: "blur" }],
        organization: [
          {
            required: true,
@@ -160,20 +140,9 @@ export default {
            trigger: "blur"
          }
        ],
        position: [
          { required: true, message: "职位不能为空", trigger: "blur" }
        ],
        jobTitle: [
          { required: true, message: "职称不能为空", trigger: "blur" }
        ],
        phone: [{ required: true, message: "电话不能为空", trigger: "blur" }],
        email: [{ required: true, message: "邮箱不能为空", trigger: "blur" }],
        officephone: [
          { required: true, message: "办公电话不能为空", trigger: "blur" }
        ],
        typeId: [
          { required: true, message: "参会人员类型id不能为空", trigger: "blur" }
        ],
        intention: [
          { required: true, message: "参会意向不能为空", trigger: "blur" }
        ],
@@ -189,52 +158,22 @@ export default {
            message: "负责人（员工id）不能为空",
            trigger: "blur"
          }
        ],
        note: [{ required: true, message: "备注不能为空", trigger: "blur" }],
        account: [
          { required: true, message: "联系电话不能为空", trigger: "blur" }
        ],
        emailLx: [
          { required: true, message: "联系邮箱不能为空", trigger: "blur" }
        ],
        regflag: [
          {
            required: true,
            message: "注册情况 0, 1, 2, 现场注册不能为空",
            trigger: "blur"
          }
        ],
        createTime: [
          { required: true, message: "创建时间不能为空", trigger: "blur" }
        ],
        modifyTime: [
          { required: true, message: "修改时间不能为空", trigger: "blur" }
        ],
        creater: [
          { required: true, message: "创建者不能为空", trigger: "blur" }
        ],
        modifier: [
          { required: true, message: "修改者不能为空", trigger: "blur" }
        ],
        isDel: [
          {
            required: true,
            message: "是否被删除 状态  0：正常   1：删除不能为空",
            trigger: "blur"
          }
        ]
      },
      employeeList: [],
      typesofattendersList: []
      typesofattendersList: [],
      restaurants: []
    };
  },
  created() {
    this.getEmployee();
    this.getTypesofattenders();
    this.getMember();
  },
  methods: {
    init(id) {
      this.dataForm.id = id || 0;
      this.dataForm.memberId = 0;
      this.visible = true;
      this.$nextTick(() => {
        this.$refs["dataForm"].resetFields();
@@ -262,16 +201,26 @@ export default {
              this.dataForm.transfer = data.attenders.transfer;
              this.dataForm.servicer = data.attenders.servicer;
              this.dataForm.note = data.attenders.note;
              this.dataForm.account = data.attenders.account;
              this.dataForm.emailLx = data.attenders.emailLx;
              this.dataForm.regflag = data.attenders.regflag;
              this.dataForm.createTime = data.attenders.createTime;
              this.dataForm.modifyTime = data.attenders.modifyTime;
              this.dataForm.creater = data.attenders.creater;
              this.dataForm.modifier = data.attenders.modifier;
              this.dataForm.isDel = data.attenders.isDel;
              this.dataForm.state2 = data.attenders.name;
            }
          });
        } else {
          this.dataForm.meetingId = "";
          this.dataForm.memberId = "";
          this.dataForm.name = "";
          this.dataForm.organization = "";
          this.dataForm.position = "";
          this.dataForm.jobTitle = "";
          this.dataForm.phone = "";
          this.dataForm.email = "";
          this.dataForm.officephone = "";
          this.dataForm.typeId = "";
          this.dataForm.intention = "";
          this.dataForm.room = "";
          this.dataForm.transfer = "";
          this.dataForm.servicer = "";
          this.dataForm.note = "";
          this.dataForm.state2 = "";
        }
      });
    },
@@ -300,10 +249,7 @@ export default {
              room: this.dataForm.room,
              transfer: this.dataForm.transfer,
              servicer: this.dataForm.servicer,
              note: this.dataForm.note,
              account: this.dataForm.account,
              emailLx: this.dataForm.emailLx,
            
              note: this.dataForm.note
            })
          }).then(({ data }) => {
            if (data && data.code === 0) {
@@ -350,9 +296,69 @@ export default {
        if (data && data.code === 0) {
          this.typesofattendersList = data.list;
        }
        window.console.log(data.list);
      });
    },
    createFilter(queryString) {
      return restaurant => {
        return (
          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
          0
        );
      };
    },
    querySearch(queryString, cb) {
      var restaurants = this.restaurants;
      var results = queryString
        ? restaurants.filter(this.createFilter(queryString))
        : restaurants;
      if (results.length === 0) {
        this.$message.error("没有会员信息,请添加会员信息");
      }
      cb(results);
    },
    //获取会员信息
    getMember() {
      this.$http({
        url: this.$http.adornUrl("/admin/member/listall"),
        method: "get"
      }).then(({ data }) => {
        if (data.code === 0 && data) {
          for (let i = 0; i < data.list.length; i++) {
            data.list[i].value =
              data.list[i].truename + "," + data.list[i].organization;
          }
          this.restaurants = data.list;
        }
      });
    },
    handleSelect(item) {
      if (item) {
        this.dataForm.jiobTitle = item.jiobTitle;
        this.dataForm.organization = item.organization;
        this.dataForm.phone = item.phone;
        this.dataForm.position = item.position;
        this.dataForm.memberId = item.id;
        this.dataForm.name = item.truename;
        this.dataForm.state2 = item.truename;
      }
    },
    creatorUser() {
      this.dataForm.name = this.dataForm.state2;
      if (this.dataForm.name) {
        this.$message({
          message: "添加成功",
          type: "success",
          duration: 1000
        });
      }
    }
  }
};
</script>
<style lang="scss" scoped>
.ll-button {
  position: absolute;
  top: 0;
  right: 0;
}
</style>

src/views/modules/admin/company.vue

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

src/views/modules/admin/employee.vue

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

src/views/modules/admin/lecture.vue

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

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

@@ -333,12 +333,12 @@ export default {
              endTime: this.dataForm.endTime,
              officeWebsite: this.dataForm.officeWebsite,
              titlePicture: this.titlePictureList.join(),
              subjects: this.subjects.join(),
              industries: this.industry.join(),
              attendersType: this.typesofattender.join(),
              serviceIds: this.dataForm.serviceIds,
              contactNames: this.employeePerson.join(),
              contactIds: this.employeePersonId.join(),
              subjects: this.subjects,
              industries: this.industry,
              attendersType: this.typesofattender,
              serviceId: this.dataForm.serviceIds,
              contactNames: this.employeePerson,
              contactIds: this.employeePersonId,
              onlineRegDeadline: this.dataForm.onlineRegDeadline,
              onsiteRegDeadline: this.dataForm.onsiteRegDeadline,
              introduction: this.dataForm.introduction

src/views/modules/admin/meeting.vue

@@ -1,10 +1,10 @@
<template>
  <div class="ll-content" v-loading="loading">
    <h1>{{meetingData.nameCn}}</h1>
    <h1 >{{meetingData.nameCn}}</h1>
    <div class="box">
      <img :src="imageNull" class="bgMeeting" />
      <el-form label-width="200px">
        <el-form-item label="会议名称" class="fz_30">{{meetingData.nameCn}}</el-form-item>
      <el-form label-width="200px" style="margin-top:20px">
        <!-- <el-form-item label="会议名称" class="fz_30" style="margin-top:50px">{{meetingData.nameCn}}</el-form-item> -->
        <el-form-item label="会议时间">{{meetingData.startTime}}</el-form-item>
        <el-form-item label="举办地点">{{meetingData.address}}</el-form-item>
        <el-form-item label="涉及学科">
@@ -23,6 +23,8 @@
  </div>
</template>
<script>
import { set } from "@/utils";
export default {
  name: "",
  data() {
@@ -39,16 +41,18 @@ export default {
  computed: {
    imageNull() {
      return this.image.includes(",")
        ? "http://121.42.53.174:9008/static" +
        ? this.imageUrl +
            this.image
              .split(",")
              .splice(0, 1)
              .join()
        : "http://121.42.53.174:9008/static" + this.image;
        : this.imageUrl + this.image;
    }
  },
  beforeMount() {},
  created() {},
  created() {
    this.demo()
  },
  activated() {
    this.getMeeting();
  },
@@ -62,16 +66,22 @@ export default {
          method: "get",
          params: this.$http.adornParams()
        }).then(res => {
          window.console.log(res.data);
          if (res.data && res.data.code === 0) {
            window.console.log(res);
            this.meetingData = res.data.meeting;
            this.industries = res.data.meeting.industries.split(",");
            // this.industries = set(this.industries);
            this.image = res.data.meeting.titlePicture;
            this.subjectsList = res.data.meeting.subjects.split(",");
            // this.subjectsList = set(this.subjectsList);
            this.loading = false;
          }
        });
      }
    },
    demo(){
      let ll = set(this.subjectsList)
      window.console.log(ll)
    }
  }
};

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

@@ -15,7 +15,7 @@
        <el-input v-model="dataForm.truename" placeholder="姓名"></el-input>
      </el-form-item>
      <el-form-item label="用户名" prop="username">
        <el-input v-model="dataForm.username" placeholder="用户名"></el-input>
        <el-input v-model="dataForm.username" placeholder="手机号"></el-input>
      </el-form-item>
      <el-form-item label="密码" prop="password">
        <el-input v-model="dataForm.password" placeholder="密码"></el-input>
@@ -171,8 +171,7 @@ export default {
              this.dataForm.createTime = data.member.createTime;
              this.dataForm.modifyTime = data.member.modifyTime;
              this.dataForm.isCheck = data.member.isCheck;
              this.showimg =
                "http://121.42.53.174:9008/static" + data.member.titlePic;
              this.showimg = this.imageUrl + data.member.titlePic;
            }
          });
        }
@@ -246,9 +245,9 @@ export default {
      if (response && response.code === 0) {
        if (response.hasOwnProperty("thumb")) {
          this.dataForm.titlePic = response.thumb;
          this.showimg = "http://121.42.53.174:9008/static" + response.thumb;
          this.showimg = this.imageUrl + response.thumb;
        } else {
          this.showimg = "http://121.42.53.174:9008/static" + response.picname;
          this.showimg = this.imageUrl + response.picname;
          this.dataForm.titlePic = response.picname;
          this.dialogVisible = true;
        }

src/views/modules/admin/member.vue

@@ -28,12 +28,12 @@
      <el-table-column prop="username" header-align="center" align="center" label="账号"></el-table-column>
      <el-table-column prop="organization" header-align="center" align="center" label="所属机构"></el-table-column>
      <el-table-column prop="position" header-align="center" align="center" label="职位"></el-table-column>
      <el-table-column prop="jobTitle" header-align="center" align="center" label="职称"></el-table-column>
      <!-- <el-table-column prop="jobTitle" header-align="center" align="center" label="职称"></el-table-column> -->
      <el-table-column prop="phone" header-align="center" align="center" label="电话"></el-table-column>
      <el-table-column prop="email" header-align="center" align="center" label="邮箱"></el-table-column>
      <el-table-column prop="meetingCounts" header-align="center" align="center" label="参会场次"></el-table-column>
      <el-table-column prop="meetingName" header-align="center" align="center" label="最后参加会议"></el-table-column>
      <el-table-column prop="servicerName" header-align="center" align="center" label="负责人"></el-table-column>
      <!-- <el-table-column prop="servicerName" header-align="center" align="center" label="负责人"></el-table-column> -->
      <el-table-column
        prop="createTime"
        header-align="center"

src/views/modules/admin/paper.vue

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

src/views/modules/admin/payment.vue

@@ -83,7 +83,7 @@ export default {
        key: ""
      },
      dataList: [],
      pageIndex: 0,
      pageIndex: 1,
      pageSize: 10,
      totalPage: 0,
      dataListLoading: false,
@@ -112,6 +112,7 @@ export default {
        })
      }).then(({ data }) => {
        if (data && data.code === 0) {
          
          this.dataList = data.page.list;
          this.totalPage = data.page.totalCount;
        } else {