zhangzengfei
2021-04-16 8098e7f023320b5bd9482bace3bf4f19d807765e
修复集群检索无法分页的bug
4个文件已修改
53 ■■■■■ 已修改文件
src/Pool/VideoPhotoData.ts 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/subComponents/ModelCard.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/searchForCluster/index/Searching.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Pool/VideoPhotoData.ts
@@ -202,7 +202,8 @@
      picUrl: this.picUrl,
      databases: this.compareTabs,
      compareNum: this.compareNum,
      threshold: this.threshold
      threshold: this.threshold,
      isAll: this.searchFrom == "cluster" ? true : false
    }
    const rsp: any = await findPerson(param);
    if (rsp && rsp.success) {
src/components/subComponents/ModelCard.vue
@@ -75,11 +75,12 @@
              </p>
              <p class="align-right">
                <span
                  class="fontStyleForModel camera-addr"
                  class="fontStyleForModel text-overflow"
                  :title="data.cameraAddr"
                >{{ data.cameraAddr }}</span>
                <span
                  class="fontStyleForModel analyServer"
                  class="fontStyleForModel text-overflow"
                  :title="data.cameraAddr"
                  style="margin-left:20px;"
                >{{ data.analyServerName }}</span>
              </p>
@@ -520,7 +521,7 @@
          p {
            &.align-right {
              text-align: right;
              .camera-addr {
              .text-overflow {
                display: inline-block;
                vertical-align: top;
                width: 90px;
src/pages/searchForCluster/index/Searching.vue
@@ -672,8 +672,10 @@
    },
    changePages(page) {
      this.VideoPhotoData.page = page;
      this.VideoPhotoData.isAll = true;
      console.log("分页改变!", this.VideoPhotoData.page)
      if (!this.VideoPhotoData.uploadType) {
        console.log("分页改变!")
        this.VideoPhotoData.uploadDiaplay = false;
        // this.VideoPhotoData.querySearchList();
        this.setLoadSearch(this.VideoPhotoData.querySearchList());
vue.config.js
@@ -39,6 +39,10 @@
  //   enforce: true
  // }
})
const serverUrl = "http://58.118.225.79:41243" // 羊五
// const serverUrl = "http://192.168.20.10:7003"
module.exports = {
  pages,
  chainWebpack: config => {
@@ -73,54 +77,53 @@
  devServer: {
    proxy: {
      '/track': {
        target: 'http://192.168.20.10:8000',
        target: serverUrl,
        // ws: true,
        changeOrigin: true,
      },
      '/ws': {
        target: 'http://192.168.20.10:7003',
        target: serverUrl,
        // ws: true,
        changeOrigin: true,
      },
      // "/data/api-v/app/findAllApp": {
      //   // target: '/',
      //   target: 'http://localhost:8080/',
      //   changeOrigin: true,
      //   pathRewrite: {
      //     '^/data/api-v/app/findAllApp': 'apps.json'
      //   }
      // },
      "/data/api-v/app/findAllApp": {
        // target: '/',
        target: 'http://localhost:8080/',
        changeOrigin: true,
        pathRewrite: {
          '^/data/api-v/app/findAllApp': 'apps.json'
        }
      },
      "/api-c": {
        target: 'http://192.168.20.113:8004',
        target: serverUrl,
        changeOrigin: true
      },
      "/api-v": {
        target: 'http://192.168.20.10:8000',
        target: serverUrl,
        changeOrigin: true
      },
      "/api-f": {
        target: 'http://192.168.20.10:8011',
        target: serverUrl,
        // secure: false,
        changeOrigin: true
      },
      "/api-p": {
        target: 'http://192.168.5.23:8010',
        target: serverUrl,
        // secure: false,
        changeOrigin: true
      },
      "/api-u": {
        target: 'http://192.168.20.10:8000',
        target: serverUrl,
        changeOrigin: true
      },
      "/httpImage": {
        target: 'http://192.168.20.10:7003',
        target: serverUrl,
        changeOrigin: true, //开启代理
      },
      "/files": {
        target: 'http://192.168.20.10:7003',
        target: serverUrl,
        changeOrigin: true, //开启代理
      }
    }
  }
}
// http://111.205.161.131:40143/