Merge branch 'master' of http://121.42.53.174:3000/luyanan/plat-admin

config/index.js

@@ -30,7 +30,7 @@ module.exports = {
     */
    // https://webpack.js.org/configuration/devtool/#development
    devtool: 'cheap-module-eval-source-map',
    devtool: 'source-map',
    // If you have problems debugging vue-files in devtools,
    // set this to false - it *may* help

config/prod.env.js

@@ -4,8 +4,8 @@ module.exports = {
  ENV_CONFIG:'"prod"',
  PLAT_ID: '"F5DEA8EDB12E421A9FC4B701BB6176A6"',
  BASE_API: '""',
  XT_API: '"http://www.xttjpt.cn"',
  KX_API: '"http://www.ekexiu.com"'
  // XT_API: '"http://192.168.3.233:84"',
  // KX_API: '"http://192.168.3.233:81"'
  // XT_API: '"http://www.xttjpt.cn"',
  // KX_API: '"http://www.ekexiu.com"'
  XT_API: '"http://192.168.3.233:84"',
  KX_API: '"http://192.168.3.233:81"'
}

src/components/complexTable/index.vue

@@ -7,7 +7,7 @@
        :width="item.width ? item.width : ''" align="center" :className="item.active">
        <template slot-scope="scope">
          <el-button v-if="item.chart && typeof scope.row === 'object'" type="text" style="color:#606266" @click="$emit('showChart', scope.row.id)"><svg-icon icon-class="chart" /></el-button>
          <div v-if="scope.row[item.prop]">
          <div>
            <el-button type="text" v-if="item.active"><a :href="parentChangedLink(scope.row.id)" target="_blank">{{scope.row[item.prop]}}</a></el-button>
            <div v-else> {{scope.row[item.prop]}}</div>
          </div>

src/utils/CrossDomain.js

@@ -43,7 +43,9 @@ const cacheModule = {
      } else {
        this.catchAgency[id].img = defaultSet.img.org
      }
      this.catchAgency[id].orgType = orgType[this.catchAgency[id].orgType]
      if (this.catchAgency[id].orgType) {
        this.catchAgency[id].orgType = orgType[this.catchAgency[id].orgType]
      }
      callback(this.catchAgency[id])
    } else {
      request.get(agencyUrl + id, {}, response => {
@@ -54,7 +56,9 @@ const cacheModule = {
          } else {
            info.img = defaultSet.img.org
          }
          info.orgType = orgType[info.orgType]
          if (info.orgType) {
            info.orgType = orgType[info.orgType]
          }
          this.catchProfessor[id] = info
          callback(info)
        }

src/views/statistics/expertCount.vue

@@ -65,10 +65,10 @@
</template>
<script>
import request from '@/utils/request'
import { pqExpertFilterList, queryTotalView, queryOneView } from '@/api/statistics'
import { parseTime } from '@/utils/index'
import { parseTime, kexiuUrl } from '@/utils/index'
import complexTable from '@/components/complexTable'
import crossDomin from '@/utils/CrossDomain'
import LineChart from './lineChart/LineChart'
import { dayListFn, chartModel } from './lineChart/chart'
import { doneFilter } from './ObjFilters'
@@ -216,40 +216,47 @@ export default {
      return val
    },
    queryInfoList() {
      var that = this
      this.$http.get(pqExpertFilterList, {}, (response) => {
        if (response.success && response.data) {
          const epData = response.data
          let j = 0
          var hData = { num: 0, data: epData }
          for (let i = 0; i < epData.length; i++) {
            epData[i].assTime = parseTime(epData[i].assTime).substr(0, 16)
            j++
            crossDomin.getUserInfo(epData[i].id, data => {
              j--
              Object.assign(epData[i], data)
              if (j === 0) {
                this.tableData = epData
                this.total = epData.length
                if (this.total > this.pageSize) {
                  for (let i = 0; i < this.pageSize; i++) {
                    this.tableDataEnd.push(epData[i])
            hData.num++
            (function(item, m) {
              request.get(kexiuUrl + '/ajax/professor/editBaseInfo/' + item.id, {}, response => {
                if (response.success && response.data) {
                  const info = response.data
                  m.num--
                  Object.assign(item, info)
                  if (m.num === 0) {
                    that.tableDataEnd = []
                    that.total = epData.length
                    that.tableData = epData
                    that.sortTableOperate(that.tableData)
                    if (that.total > that.pageSize) {
                      for (let j = 0; j < that.pageSize; j++) {
                        that.tableDataEnd.push(that.tableData[j])
                      }
                    } else {
                      that.tableDataEnd = that.tableData
                    }
                    that.tableLoding = false
                  }
                } else {
                  this.tableDataEnd = epData
                }
                this.tableLoding = false
                this.tableDataEnd = this.sortTableOperate(this.tableDataEnd)
              }
            })
              })
            })(epData[i], hData)
          }
        } else {
          this.tableLoding = false
          that.tableLoding = false
        }
      })
    },
    current(val) {
      this.pageNo = val
      if (!this.flag) {
        this.currentChangePage(this.tableDataEnd)
        this.currentChangePage(this.tableData)
      } else {
        this.currentChangePage(this.filterTableDataEnd)
      }
@@ -258,12 +265,12 @@ export default {
      let from = (this.pageNo - 1) * this.pageSize
      const to = this.pageNo * this.pageSize
      this.tableDataEnd = []
      this.sortTableOperate(list)
      for (; from < to; from++) {
        if (list[from]) {
          this.tableDataEnd.push(list[from])
        }
      }
      this.tableDataEnd = this.sortTableOperate(this.tableDataEnd)
    },
    changeRangerDate(val) {
      this.formFilter.dateRange = val

src/views/statistics/objFilters.js

@@ -12,7 +12,7 @@ const ObjFilters = {
        objArr = objArr.filter(item => {
          if (item[str.type]) {
            return item[str.type].match(str.val) !== null
          } else {
          } else if (str.val === '') {
            return item
          }
        })

src/views/statistics/orgCount.vue

@@ -60,10 +60,11 @@
</template>
<script>
import request from '@/utils/request'
import { pqOrgFilterList, queryTotalView, queryOneView } from '@/api/statistics'
import { parseTime } from '@/utils/index'
import { parseTime, kexiuUrl } from '@/utils/index'
import queryDict from '@/utils/queryDict'
import complexTable from '@/components/complexTable'
import crossDomin from '@/utils/CrossDomain'
import LineChart from './lineChart/LineChart'
import { dayListFn, chartModel } from './lineChart/chart'
import { doneFilter } from './ObjFilters'
@@ -71,6 +72,7 @@ import { doneFilter } from './ObjFilters'
export default {
  data() {
    return {
      orgType: {},
      ChartItemDialogVisible: false,
      formFilter: {
        name: '',
@@ -85,7 +87,7 @@ export default {
      tableDataEnd: [],
      filterTableDataEnd: [],
      flag: false,
      tableLoding: true,
      tableLoding: false,
      tableItem: [
        {
          tit: '图表',
@@ -131,6 +133,12 @@ export default {
    LineChart
  },
  created() {
    var that = this
    queryDict.applyDict('QYLX', function(dictData) {
      dictData.map(item => {
        that.orgType[item.code] = item.caption
      })
    })
    this.queryInfoList()
    this.getInfoTotal()
  },
@@ -198,46 +206,50 @@ export default {
      return val
    },
    queryInfoList() {
      var that = this
      this.$http.get(pqOrgFilterList, {}, (response) => {
        if (response.success && response.data) {
          const epData = response.data
          let j = 0
          var hData = { num: 0, data: epData }
          for (let i = 0; i < epData.length; i++) {
            epData[i].assTime = parseTime(epData[i].assTime).substr(0, 10)
            j++
            crossDomin.getAgencyInfo(epData[i].id, data => {
              j--
              Object.assign(epData[i], data)
              if (j === 0) {
                this.tableData = epData
                this.total = epData.length
                if (this.total > this.pageSize) {
                  for (let i = 0; i < this.pageSize; i++) {
                    this.tableDataEnd.push(epData[i])
            epData[i].assTime = parseTime(epData[i].assTime).substr(0, 16)
            hData.num++
            (function(item, m) {
              request.get(kexiuUrl + '/ajax/org/' + item.id, {}, response => {
                if (response.success && response.data) {
                  const info = response.data
                  if (info.orgType) {
                    info.orgType = that.orgType[info.orgType]
                  }
                  m.num--
                  Object.assign(item, info)
                  if (m.num === 0) {
                    that.tableDataEnd = []
                    that.total = epData.length
                    that.tableData = epData
                    that.sortTableOperate(that.tableData)
                    if (that.total > that.pageSize) {
                      for (let j = 0; j < that.pageSize; j++) {
                        that.tableDataEnd.push(that.tableData[j])
                      }
                    } else {
                      that.tableDataEnd = that.tableData
                    }
                    that.tableLoding = false
                  }
                } else {
                  this.tableDataEnd = epData
                }
                this.tableLoding = false
                this.tableDataEnd = this.sortTableOperate(this.tableDataEnd)
              }
            })
          }
          if (epData.length === 0) {
            this.dataList = []
            this.tableData = []
            this.total = 0
              })
            })(epData[i], hData)
          }
        } else {
          this.$sort.total = 0
          this.tableData = []
          that.tableLoding = false
        }
      })
    },
    current(val) {
      this.pageNo = val
      if (!this.flag) {
        this.currentChangePage(this.tableDataEnd)
        this.currentChangePage(this.tableData)
      } else {
        this.currentChangePage(this.filterTableDataEnd)
      }
@@ -246,12 +258,12 @@ export default {
      let from = (this.pageNo - 1) * this.pageSize
      const to = this.pageNo * this.pageSize
      this.tableDataEnd = []
      this.sortTableOperate(list)
      for (; from < to; from++) {
        if (list[from]) {
          this.tableDataEnd.push(list[from])
        }
      }
      this.tableDataEnd = this.sortTableOperate(this.tableDataEnd)
    },
    changeRangerDate(val) {
      this.formFilter.dateRange = val

src/views/statistics/resources.vue

@@ -91,7 +91,7 @@
          },
          {
            prop: 'resourceName',
            tit: '服务名称',
            tit: '资源名称',
            active: 'active'
          },
          {

src/views/statistics/results.vue

@@ -95,7 +95,7 @@
          },
          {
            prop: 'authors',
            tit: '发布者',
            tit: '发明人',
            width: '160'
          },
          {