修正程序

config/index.js

@@ -8,7 +8,12 @@ module.exports = {
    // Paths
    assetsSubDirectory: 'static',
    assetsPublicPath: '/',
    proxyTable: {},
    proxyTable: {
      '/api': {
        target: 'http://www.ekexiu.com',  //目标接口域名
        changeOrigin: true,  //是否跨域
      }
    },
    // Various Dev Server settings
    host: 'localhost', // can be overwritten by process.env.HOST

src/utils/CrossDomain.js

@@ -0,0 +1,62 @@
import request from './request'
import defaultProfessor from '../assets/defaultPhoto/defaultProfessor.jpg'
import defaultAgency from '../assets/defaultPhoto/defaultAgency.jpg'
import { orgType } from './index'
const baseUrl = 'http://www.ekexiu.com'
const professorUrl = baseUrl + '/ajax/professor/editBaseInfo/'
const agencyUrl = baseUrl + '/ajax/org/'
const cacheModule = {
  catchProfessor: {},
  catchAgency: {},
  getUserInfo(id, callback) {
    if (this.catchProfessor[id]) {
      if (this.catchProfessor[id].hasHeadImage) {
        this.catchProfessor[id].img = `${baseUrl}/images/head/${id}_l.jpg`
      } else {
        this.catchProfessor[id].img = defaultProfessor
      }
      callback(this.catchProfessor[id])
    } else {
      request.get(professorUrl + id, {}, response => {
        if (response.success && response.data) {
          const info = response.data
          if (info.hasHeadImage) {
            info.img = `${baseUrl}/images/head/${id}_l.jpg`
          } else {
            info.img = defaultProfessor
          }
          this.catchProfessor[id] = info
          callback(info)
        }
      })
    }
  },
  getAgencyInfo(id, callback) {
    if (this.catchAgency[id]) {
      if (this.catchAgency[id].hasOrgLogo) {
        this.catchAgency[id].img = `${baseUrl}/images/org/${id}.jpg`
      } else {
        this.catchAgency[id].img = defaultAgency
      }
      this.catchAgency[id].orgType = orgType[this.catchAgency[id].orgType]
      callback(this.catchAgency[id])
    } else {
      request.get(agencyUrl + id, {}, response => {
        if (response.success && response.data) {
          const info = response.data
          if (info.hasOrgLogo) {
            info.img = `${baseUrl}/images/org/${id}.jpg`
          } else {
            info.img = defaultAgency
          }
          info.orgType = orgType[info.orgType]
          this.catchProfessor[id] = info
          callback(info)
        }
      })
    }
  }
}
export default cacheModule

src/utils/index.js

@@ -65,3 +65,16 @@ export const type = {
  '3': '政策法规',
  '4': '通知公告'
}
export const orgType = {
  '2': '上市企业',
  '3': '外资企业',
  '4': '合资企业',
  '5': '资企业',
  '6': '个体经营',
  '7': '政府机构',
  '8': '公益组织',
  '9': '协会学会',
  '10': '新闻媒体',
  '11': '教育机构',
  'undefined': ''
}

src/views/contentPub/draftList.vue

@@ -93,20 +93,31 @@
          if (response.success && response.data) {
            const res = response.data
            const epData = res.data
            let j = 0
            for (let i = 0; i < epData.length; i++) {
              j++
              epData[i].modifyTime = parseTime(epData[i].modifyTime).substr(0, 16)
              epData[i].catalog = type[epData[i].catalog]
              cacheModule.Judge(epData[i].modifier, info => {
                j--
                epData[i].modifier = info.name
                if (j === 0) {
                  this.total = res.total
                  if (epData.length === 20) {
                    this.tableData = epData
                  } else {
                    const array = epData
                    if (epData.length !== 0) {
                      ret.gapFilling(array)
                    }
                    this.tableData = array
                  }
                }
              })
            }
            this.total = res.total
            if (epData.length === 20) {
              this.tableData = epData
            } else {
              const array = epData
              ret.gapFilling(array)
              this.tableData = array
            if (epData.length === 0) {
              this.total = 0
              this.tableData = []
            }
          } else {
            this.total = 0

src/views/contentPub/pubList.vue

@@ -121,21 +121,30 @@
          if (response.success && response.data) {
            const res = response.data
            const epData = res.data
            let j = 0
            for (let i = 0; i < epData.length; i++) {
              epData[i].createTime = parseTime(epData[i].createTime).substr(0, 16)
              epData[i].catalog = type[epData[i].catalog]
              Object.assign(epData[i], arr[i])
              j++
              cacheModule.Judge(epData[i].creator, info => {
                j--
                epData[i].creator = info.name
                if (j === 0) {
                  this.total = res.total
                  if (epData.length === 20) {
                    this.tableData = epData
                  } else {
                    const array = epData
                    ret.gapFilling(array)
                    this.tableData = array
                  }
                }
              })
            }
            this.total = res.total
            if (epData.length === 20) {
              this.tableData = epData
            } else {
              const array = epData
              ret.gapFilling(array)
              this.tableData = array
            if (epData.length === 0) {
              this.total = 0
              this.tableData = []
            }
          } else {
            this.total = 0

src/views/contentPub/recycleBin.vue

@@ -103,24 +103,44 @@
          if (response.success && response.data) {
            const res = response.data
            const epData = res.data
            let j = 0
            for (let i = 0; i < epData.length; i++) {
              epData[i].createTime = parseTime(epData[i].createTime).substr(0, 16)
              epData[i].invalidTime = parseTime(epData[i].invalidTime).substr(0, 16)
              epData[i].catalog = type[epData[i].catalog]
              j += 2
              cacheModule.Judge(epData[i].creator, info => {
                j--
                epData[i].creator = info.name
                if (j === 0) {
                  this.total = res.total
                  if (epData.length === 20) {
                    this.tableData = epData
                  } else {
                    const array = epData
                    ret.gapFilling(array)
                    this.tableData = array
                  }
                }
              })
              cacheModule.Judge(epData[i].invalidOperator, info => {
                j--
                epData[i].invalidOperator = info.name
                if (j === 0) {
                  this.total = res.total
                  if (epData.length === 20) {
                    this.tableData = epData
                  } else {
                    const array = epData
                    ret.gapFilling(array)
                    this.tableData = array
                  }
                }
              })
            }
            this.total = res.total
            if (epData.length === 20) {
              this.tableData = epData
            } else {
              const array = epData
              ret.gapFilling(array)
              this.tableData = array
            if (epData.length === 0) {
              this.total = 0
              this.tableData = []
            }
          } else {
            this.total = 0

src/views/cooperationAgency/agencySort.vue

@@ -2,17 +2,19 @@
  <el-dialog title="合作机构排序" :visible.sync="dialogFormVisible" width="600px">
    <div class="box">
      <div class="t-left">
        <div class="headPhoto"></div>
        <div class="headPhoto">
          <img :src="form.img" alt="">
        </div>
      </div>
      <el-form :model="form" class="form-el" ref="form" :rules="rules2">
        <el-form-item :label-width="formLabelWidth">
          {{form.name}}
        </el-form-item>
        <el-form-item :label-width="formLabelWidth">
          {{form.type}}
          {{form.orgType}}
        </el-form-item>
        <el-form-item :label-width="formLabelWidth">
          {{form.name}}
          {{form.city}}
        </el-form-item>
        <el-form-item :label-width="formLabelWidth" prop="level">
          <div class='labelBox'>合作机构平台序号</div></span>
@@ -88,12 +90,11 @@
    float: left
  }
  .headPhoto {
  .headPhoto img {
    width: 100px;
    height: 100px;
    border: 1px solid red;
    border: 1px solid #e5e5e5;
  }
  .form-el {
    float: left
  }

src/views/cooperationAgency/index.vue

@@ -17,6 +17,7 @@
  import { agencyListUrl } from '@/api/cooperationAgency' //  agencyUserUrl
  import { parseTime } from '@/utils/index'
  import ret from '@/utils/comTable'
  import crossDomin from '@/utils/CrossDomain'
  export default {
    data() {
      return {
@@ -44,22 +45,17 @@
            active: 'active' // 点击加颜色，加此选项
          },
          {
            prop: 'type',
            prop: 'orgType',
            tit: '机构类型',
            width: '160'
          },
          {
            prop: 'linkman',
            tit: '联系人',
            width: '160'
          },
          {
            prop: 'linkphone',
            prop: 'contactNum',
            tit: '联系电话',
            width: '160'
          },
          {
            prop: 'linkemail',
            prop: 'email',
            tit: '联系邮箱',
            width: '160'
          },
@@ -84,40 +80,33 @@
    },
    methods: {
      agencyList() {
        const arr = [
          {
            name: '北京科袖科技有限公司',
            type: '上市公司',
            linkman: '张女士',
            linkphone: '13526256369',
            linkemail: '280716069@qq.com'
          },
          {
            name: '北京佳木斯科技有限公司',
            type: '国有企业',
            linkman: '李朋涛',
            linkphone: '1352569',
            linkemail: '280716890@qq.com'
          }
        ]
        this.$http.get(agencyListUrl, '', (response) => { //  拉去专家信息列表，总数据存在dataList，tableData存每一页的信息
          if (response.success && response.data) {
            const epData = response.data
            let j = 0
            for (let i = 0; i < epData.length; i++) {
              epData[i].assTime = parseTime(epData[i].assTime).substr(0, 10)
              Object.assign(epData[i], arr[i])
              // this.$http.get(agencyUserUrl, {id: epData[i].id}, (response ) => {
              //   console.log(response)
              // })
              j++
              crossDomin.getAgencyInfo(epData[i].id, data => {
                j--
                Object.assign(epData[i], data)
                if (j === 0) {
                  this.dataList = epData
                  this.total = epData.length
                  if (this.total >= 20) {
                    this.tableData = this.dataList.slice(0, 20)
                  } else {
                    const array = this.dataList
                    ret.gapFilling(array)
                    this.tableData = array
                  }
                }
              })
            }
            this.dataList = epData
            this.total = epData.length
            if (this.total >= 20) {
              this.tableData = this.dataList.slice(0, 20)
            } else {
              const array = this.dataList
              ret.gapFilling(array)
              this.tableData = array
            if (epData.length === 0) {
              this.dataList = []
              this.tableData = []
              this.total = 0
            }
          } else {
            this.$sort.total = 0

src/views/specialExperts/expertSort.vue

@@ -2,17 +2,19 @@
  <el-dialog title="专家排序" :visible.sync="dialogFormVisible" width="600px">
    <div class="box">
      <div class="t-left">
        <div class="headPhoto"></div>
        <div class="headPhoto">
          <img :src="form.img" alt="">
        </div>
      </div>
      <el-form :model="form" class="form-el" ref="form" :rules="rules2">
        <el-form-item :label-width="formLabelWidth">
          {{form.name}}
        </el-form-item>
        <el-form-item :label-width="formLabelWidth">
          {{form.job}}
          {{form.title}}
        </el-form-item>
        <el-form-item :label-width="formLabelWidth">
          {{form.comp}}
          {{form.orgName}}
        </el-form-item>
        <el-form-item :label-width="formLabelWidth" prop="level">
          <div class='labelBox'>专家平台序号</div></span>
@@ -90,9 +92,13 @@
  }
  .headPhoto {
    
    
  }
  .headPhoto img {
    width: 100px;
    height: 100px;
    border: 1px solid red;
    border: 1px solid #E5E5E5;
    border-radius: 50%;
  }

src/views/specialExperts/index.vue

@@ -17,6 +17,7 @@
  import { expertListUrl } from '@/api/specialExpert' //  expertUserUrl
  import { parseTime } from '@/utils/index'
  import ret from '@/utils/comTable'
  import crossDomin from '@/utils/CrossDomain'
  export default {
    data() {
      return {
@@ -44,17 +45,17 @@
            active: 'active' // 点击加颜色，加此选项
          },
          {
            prop: 'job',
            prop: 'title',
            tit: '职称',
            width: '160'
          },
          {
            prop: 'comp',
            prop: 'orgName',
            tit: '所在机构',
            width: '160'
          },
          {
            prop: 'city',
            prop: 'address',
            tit: '所在城市',
            width: '160'
          },
@@ -89,42 +90,35 @@
    },
    methods: {
      expertList() {
        const arr = [
          {
            name: '张波',
            job: '教授',
            comp: '河南科技学院',
            city: '郑州',
            phone: '13526256369',
            email: '280716069@qq.com'
          },
          {
            name: '李朋涛',
            job: '讲师',
            comp: '北京大学',
            city: '北京',
            phone: '15623569685',
            email: '280715983@qq.com'
          }
        ]
        this.$http.get(expertListUrl, '', (response) => { //  拉去专家信息列表，总数据存在dataList，tableData存每一页的信息
          if (response.success && response.data) {
            const epData = response.data
            let j = 0
            for (let i = 0; i < epData.length; i++) {
              epData[i].assTime = parseTime(epData[i].assTime).substr(0, 16)
              Object.assign(epData[i], arr[i])
              // this.$http.get(expertUserUrl, {id: epData[i].id}, (response ) => {
              //   console.log(response)
              // })
              j++
              crossDomin.getUserInfo(epData[i].id, data => {
                j--
                Object.assign(epData[i], data)
                if (j === 0) {
                  this.dataList = epData
                  this.total = epData.length
                  if (this.total >= 20) {
                    this.tableData = this.dataList.slice(0, 20)
                  } else {
                    const array = this.dataList
                    if (epData.length !== 0) {
                      ret.gapFilling(array)
                    }
                    this.tableData = array
                  }
                }
              })
            }
            this.dataList = epData
            this.total = epData.length
            if (this.total >= 20) {
              this.tableData = this.dataList.slice(0, 20)
            } else {
              const array = this.dataList
              ret.gapFilling(array)
              this.tableData = array
            if (epData.length === 0) {
              this.dataList = []
              this.tableData = []
              this.total = 0
            }
          } else {
            this.$sort.total = 0