Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc

security-protection-platform/src/modules/access/index.vue

@@ -82,8 +82,9 @@ s<template>
          <div class="detail_item1">
            <div>抓拍图片</div>
            <div>
              <img :src="rowdata.pictureInfo.fileUrl" alt="" srcset="" style="width:100%;height:100%">
              <!-- <img :src="rowdata.pictureInfo.fileUrl" alt="" srcset="" style="width:100%;height:100%"> -->
              <!--处理图片里的方框-->
              <img :src="mainimage" alt="" srcset="" style="width:100%;height:100%">
            </div>
          </div>
          <div class="detail_item2">
@@ -185,7 +186,9 @@ export default {
      // }
      // 截取后的图片
      newimage: ''
      newimage: '',
      // 详情的主图片
      mainimage: ''
    }
  },
@@ -205,6 +208,7 @@ export default {
      // console.log('公司信息是', res)
      if (res.status === 200) {
        this.companyTypesList = res.data.data
        console.log(this.companyTypesList)
        this.search()
      } else {
        this.$Message.danger('获取数据失败')
@@ -215,6 +219,8 @@ export default {
      // this.rowdata = scope.row
      // console.log(this.rowdata)
      // console.log('id是', scope.row.aiIdenLogId)
      this.newimage = ''
      this.mainimage = ''
      var res = await accessapi.getOneInAndOutRecord({ params: { aiIdenLogId: scope.row.aiIdenLogId } })
      if (res.data.success) {
@@ -226,6 +232,7 @@ export default {
        // this.rowdata.alarmInfo.newImg = this.rowdata.pictureInfo.fileUrl
        this.getImage()
        this.getmainimage()
        // var loadTimer
        // var imgObject = new Image()
        // imgObject.setAttribute('crossOrigin', 'anonymous')
@@ -291,21 +298,23 @@ export default {
        var params = this.searchdata
        params.pageNumber = this.page
        params.pageSize = this.limit
        console.log(params)
        // console.log(params)
        var res = await accessapi.getaccesslist({ params: params })
        // console.log(res)
        if (res.status === 200) {
          // console.log(res)
          this.data = res.data.data.data
          // console.log(this.data)
          // console.log(this.companyTypesList)
          this.data = this.data.map((item) => {
            // 处理进出时间
            // item.taskExecuteTime = formatDateTime(item.taskExecuteTime)
            // 处理相似度
            // item.simi = this.percentagedata(item.simi)
            // console.log('公司的数据是', this.companyTypesList)
            // console.log('公司id', item)
            // console.log('公司id', item.companyId, typeof item.companyId)
            // console.log('公司名字是', this.companyTypesList.filter((item1) => { return item1.id === 10000 }))
            item.companyinfo = this.companyTypesList.filter((item1) => { return item1.id === item.companyId })
            item.companyinfo = this.companyTypesList.filter((item1) => { return String(item1.id) === item.companyId })
            if (item.companyinfo.length > 0) {
              item.companyname = item.companyinfo[0].name
            } else {
@@ -360,6 +369,7 @@ export default {
        return true
      }
    },
    // 处理截图图片
    async getImage () {
      var loadTimer
      var imgObject = new Image()
@@ -392,6 +402,50 @@ export default {
        // console.log(tnCanvas.toDataURL())
        return tnCanvas.toDataURL()
      }
    },
    // 处理主图片
    async getmainimage () {
      var that = this
      var x = this.rowdata.alarmInfo.face_box[0]
      var y = this.rowdata.alarmInfo.face_box[1]
      var width = this.rowdata.alarmInfo.face_box[2] - this.rowdata.alarmInfo.face_box[0]
      var height = this.rowdata.alarmInfo.face_box[3] - this.rowdata.alarmInfo.face_box[1]
      function getBase64Image (img) {
        var canvas = document.createElement('canvas')
        canvas.width = img.width
        canvas.height = img.height
        var ctx = canvas.getContext('2d')
        ctx.drawImage(img, 0, 0, img.width, img.height)
        ctx.beginPath()
        ctx.moveTo(x, y)
        ctx.lineTo(x + width, y)
        ctx.lineTo(x + width, y + height)
        ctx.lineTo(x, y + height)
        ctx.lineTo(x, y) // 绘制最后一笔使图像闭合
        ctx.lineWidth = 5
        ctx.strokeStyle = 'red'
        ctx.stroke()
        var dataURL = canvas.toDataURL('image/png') // 可选其他值 image/jpeg
        return dataURL
      }
      function main (src, cb) {
        var image = new Image()
        image.src = src + '?v=' + Math.random() // 处理缓存
        image.crossOrigin = '*' // 支持跨域图片
        image.onload = function () {
          var base64 = getBase64Image(image)
          cb && cb(base64)
        }
      }
      main(this.rowdata.pictureInfo.fileUrl, function (base64) {
        // console.log(base64, '是否成功打印base64')
        that.mainimage = base64
      })
    }
  }

security-protection-platform/src/routes.js

@@ -14,12 +14,13 @@ export const constantRoutes = [
  {
    path: '/',
    component: Layout,
    redirect: '/attendance/report',
    redirect: '/dashboard',
    hidden: true
  },
  {
    name: 'dashboard',
    path: '/dashboard',
    redirect: '/',
    component: () => import(/* webpackChunkName: "dashboard" */ './modules/dashboard'),
    meta: { title: '首页', icon: 'home' },
    children: [