zhangzengfei
2020-09-18 eff92aec207a73c94bddafe4c8eaf3fa96f17dc2
直接访问桌面未登陆默认跳转登录页, 底库上传图片提示语
5个文件已修改
90 ■■■■ 已修改文件
src/pages/desktop/index/App.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/library/components/personList.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/library/components/upload.vue 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/search/index/Searching.vue 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/visual/index/home.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/desktop/index/App.vue
@@ -18,6 +18,7 @@
import axios from 'axios'
import { getApps } from '@/api/app'
import { findAllSdk } from '@/api/taskMange'
export default {
  name: 'app',
@@ -51,6 +52,10 @@
        time: new Date()
      }, true);
    }, 1000);
    findAllSdk().then(() => {
    });
  },
  methods: {
    showApps() {
src/pages/library/components/personList.vue
@@ -543,7 +543,7 @@
export default {
  data() {
    return {
      timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23,59,59))],
      timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23, 59, 59))],
      memberInfo: {
        personName: '',
        sex: '',
@@ -705,7 +705,7 @@
      console.log("hello");
    },
    getUploadResult(result) {
      console.log(result, "上传的返回");
      // console.log(result, "上传的返回");
      this.uploadResult = result.data;
      this.dialogVisible = true;
      this.getPersonList();
src/pages/library/components/upload.vue
@@ -295,59 +295,10 @@
          this.progressValue = 0
          this.showProgress = false
          this.$emit('successFN', result)
          // let errorArr = []
          // // 根据与后台约定data数组返回的都是存在业务意义错误的对象
          // if (result.data && result.data.length) {
          //   errorArr = result.data.map(file => {
          //     // 遍历前台抛给后台的fileList 进行比对赋值file文件及message
          //     for (var i = 0; i < this.suFileList.length; i++) {
          //       const iteam = this.suFileList[i]
          //       if (
          //         file.upload.fileName &&
          //         iteam.name === file.upload.fileName
          //       ) {
          //         return {
          //           uuId: guid(),
          //           file: iteam,
          //           photos: file.upload.path,
          //           baseList: file.baseList ? file.baseList : null,
          //           errorMsg: {
          //             type: 'error',
          //             errorType: '上传异常',
          //             message: file.reason ? file.reason : result.msg
          //           }
          //         }
          //       }
          //     }
          //   })
          // }
          /* 回调传值 */
          // 处理错误文件列表 如果为0说明全部成功,(通过校验,并在后台成功完成注册添加)
          // let erFileList =
          //   result && result.success
          //     ? this.erFileList
          //     : [...this.erFileList, ...errorArr]
          // // 全部成功无需打开业务弹窗
          // if (erFileList.length > 0) {
          //   this.$emit('addFilesBaBackFN', {
          //     suFileList: result && result.success ? this.suFileList : [],
          //     erFileList: erFileList,
          //     fileList: this.fileList,
          //     result: res
          //   })
          // }
          // if (erFileList.length === 0) {
          //   this.$emit('successFN')
          // }
        }
      } catch (error) {
        // this.$notify({
        //   type: 'error',
        //   message: '服务器错误!请联系管理员' // + error.message
        // })
        this.progressValue = 0
        this.showProgress = false
        console.log('catch---', error)
        const errorArr = this.suFileList.map(file => {
          return {
            uuId: guid(),
@@ -355,7 +306,7 @@
            errorMsg: {
              type: 'error',
              errorType: '上传服务器错误',
              message: '图片不是单人脸照片,请重新上传'
              message: '上传服务器错误'
            }
          }
        })
src/pages/search/index/Searching.vue
@@ -32,6 +32,7 @@
              size="mini"
              style="width:calc(100% - 40px);min-width: 120px;"
              placeholder="请选择"
              @change="tagChange"
            >
              <el-option
                v-for="item in VideoPhotoData.tabs"
@@ -274,9 +275,6 @@
    this.TreeDataPool.fetchTreeData();
  },
  mounted() {
    debugger
    //this.isShowUpload();
    console.log('search mounted')
    this.$nextTick(() => {
      let scrollContain = this.$refs.scrollContain
      this.VideoPhotoData.scrollContainDom = scrollContain
@@ -420,20 +418,7 @@
    "VideoPhotoData.selectWhites": function (value) {
      this.blackAngWhite()
    },
    tagValues: function (newValue, oldValue) {
      if (newValue.length > 0) {
        this.showType = "compare";
      } else {
        this.showType = "search";
      }
      if (newValue.length !== oldValue.length) {
        console.log("tagValue中的刷新方法");
        // this.VideoPhotoData.querySearchList();
        this.setLoadSearch(this.VideoPhotoData.querySearchList());
      }
    },
    "VideoPhotoData.uploadDiaplay": function (value) {
      debugger
      this.getHeight();
      console.log("upload的值是:", value)
      if (value) {
@@ -738,6 +723,18 @@
    },
    getUrlKey(name) {
      return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
    },
    tagChange(obj) {
      console.log(obj)
      if (obj.length > 0) {
        this.showType = "compare";
      } else {
        this.showType = "search";
      }
      this.VideoPhotoData.queryTabs = obj;
      this.setLoadSearch(this.VideoPhotoData.querySearchList());
    }
  }
};
src/pages/visual/index/home.vue
@@ -236,6 +236,7 @@
    document.addEventListener("visibilitychange", this.visibilitychange, false);
    window.addEventListener('resize', this.windowSizeChange)
    this.VideoPhotoData.capture();
    this.timer = setInterval(() => {
      this.VideoPhotoData.capture()
      this.CategoryData.realTimeCapture();