zhangzengfei
2020-08-03 1a94e4c4d56cdb04da7bab981d9389f87daa0683
app:修改images引入方式
2 文件已复制
18个文件已删除
32 文件已重命名
17个文件已修改
2047 ■■■■■ 已修改文件
public/images/algo/green.gif 补丁 | 查看 | 原始文档 | blame | 历史
public/images/cameraAccess/audio.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/cameraAccess/files.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/cameraAccess/image.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/cameraAccess/loading.gif 补丁 | 查看 | 原始文档 | blame | 历史
public/images/cameraAccess/video-poster.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/cameraAccess/video.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/cameraVideo/video-poster.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login-logo.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login-net.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/0.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/1.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/10.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/11.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/12.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/13.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/14.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/15.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/2.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/3.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/4.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/5.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/6.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/7.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/8.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/login/9.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/player/player_poster.gif 补丁 | 查看 | 原始文档 | blame | 历史
public/images/search/duihao.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/search/nobody.png 补丁 | 查看 | 原始文档 | blame | 历史
public/images/search/searchLoading.gif 补丁 | 查看 | 原始文档 | blame | 历史
src/Pool/TreeData.ts 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/baseimg_cameara.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/bg/22.jpg 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/bg/player_poster.gif 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/gif/blue.gif 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/img/baseimg.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/img/desktop/circle.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/img/desktop/desktop.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/img/desktop/main.jpg 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/img/desktop/trash.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/img/green.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/img/login.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/img/logo.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/img/red.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/logo.png 补丁 | 查看 | 原始文档 | blame | 历史
src/components/canvas/Dialog.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/canvas/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/player/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/searching/SearchLeft.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/searching/UploadImg.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/searching/uploadDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/searching/uploadForModel.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/subComponents/CardItem.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/subComponents/ParticleNetwork.vue 351 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/algorithmManage/index/App.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/components/CameraInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/components/DataStackInfo.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/components/LinkageRule.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/components/SeparateRules.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraVideo/components/VideoItem.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/index/App.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/index/ParticleNetwork.vue 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/search/index/Searching.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/test/components/cardWindow.vue 362 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/test/components/layout.vue 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/test/index/App.vue 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/test/index/Searching.vue 908 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/test/index/main.ts 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/test/index/mixins.ts 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/images/algo/green.gif

public/images/cameraAccess/audio.png

public/images/cameraAccess/files.png

public/images/cameraAccess/image.png

public/images/cameraAccess/loading.gif

public/images/cameraAccess/video-poster.png

public/images/cameraAccess/video.png

public/images/cameraVideo/video-poster.png

public/images/login-logo.png

public/images/login-net.png

public/images/login/0.png

public/images/login/1.png

public/images/login/10.png

public/images/login/11.png

public/images/login/12.png

public/images/login/13.png

public/images/login/14.png

public/images/login/15.png

public/images/login/2.png

public/images/login/3.png

public/images/login/4.png

public/images/login/5.png

public/images/login/6.png

public/images/login/7.png

public/images/login/8.png

public/images/login/9.png

public/images/player/player_poster.gif

public/images/search/duihao.png

public/images/search/nobody.png

public/images/search/searchLoading.gif

src/Pool/TreeData.ts
@@ -377,7 +377,8 @@
          obj.iconStatus2 = '1'
        }
        if (!i.snapshot_url) {
          obj.snapshot_url = require('@/assets/nobody.png')
          // obj.snapshot_url = require('@/assets/nobody.png')
          obj.snapshot_url = ""
        } else {
          obj.snapshot_url = '/httpImage/' + obj.snapshot_url
        }
src/assets/baseimg_cameara.png
Binary files differ
src/assets/bg/22.jpg
Binary files differ
src/assets/bg/player_poster.gif
Binary files differ
src/assets/gif/blue.gif
Binary files differ
src/assets/img/baseimg.png

src/assets/img/desktop/circle.png
Binary files differ
src/assets/img/desktop/desktop.png
Binary files differ
src/assets/img/desktop/main.jpg
Binary files differ
src/assets/img/desktop/trash.png
Binary files differ
src/assets/img/green.png

src/assets/img/login.png
Binary files differ
src/assets/img/logo.png
Binary files differ
src/assets/img/red.png

src/assets/logo.png
Binary files differ
src/components/canvas/Dialog.vue
@@ -122,7 +122,7 @@
  name: "canvasDialog",
  data() {
    return {
      backImg: require("../../assets/baseimg.png"),
      backImg: require("../../assets/img/baseimg.png"),
      url: "", // canvas图片的二进制格式转为dataURL格式
      type: "0", // 绘图状态 '0'为选中删除,'1'为画线,‘2’为画矩形,‘4’为画箭头,‘5’为画多边形
      points: [], // 记录绘制多边形时的各点坐标,绘制多边形时由于不是一笔完成,以数组数据做始终闭合的图形,双击后录成快照,把数组内容转移到最终数据中,然后清空数组
src/components/canvas/index.vue
@@ -89,7 +89,7 @@
  },
  data() {
    return {
      blackImg: require("../../assets/baseimg.png"),
      blackImg: require("../../assets/img/baseimg.png"),
      canvasData: {
        line: [],
        rect: [],
src/components/player/index.vue
@@ -9,7 +9,6 @@
</template>
<script>
import Wfs from "./wfs";
import defPoster from "../../assets/player_poster.gif"
export default {
  name: "CameraPlayer",
@@ -42,7 +41,7 @@
  },
  computed: {
    poster() {
      return defPoster + "?t=" + Math.random()
      return "/images/player/player_poster.gif?t=" + Math.random()
    }
  },
  data() {
src/components/searching/SearchLeft.vue
@@ -140,8 +140,8 @@
  data() {
    return {
      tempUploadImg: "",
      tempImg: require("../../assets/nobody.png"),
      selectedIcon: require("../../assets/duihao.png"),
      tempImg: "/images/search/nobody.png",
      selectedIcon: "/images/search/duihao.png",
      bigPhoto: [],
      displayUpload: true,
      clickNum: 0,
@@ -211,7 +211,6 @@
        if (res.data.smImage.length % 3 !== 0) {
          // 用虚拟人像补全整行
          const length = res.data.smImage.length % 3
          console.log("看看length的值", length)
          this.unrealSmallPath.length = 0
          for (var i = 0; i < 3 - length; i++) {
            this.unrealSmallPath.push(this.tempImg)
src/components/searching/UploadImg.vue
@@ -144,8 +144,8 @@
  data() {
    return {
      tempUploadImg: "",
      tempImg: require("../../assets/nobody.png"),
      selectedIcon: require("../../assets/duihao.png"),
      tempImg: "/images/search/nobody.png",
      selectedIcon: "/images/search/duihao.png",
      bigPhoto: [],
      displayUpload: true,
      clickNum: 0,
src/components/searching/uploadDialog.vue
@@ -124,8 +124,8 @@
  data() {
    return {
      tempUploadImg: "",
      tempImg: require("../../assets/nobody.png"),
      selectedIcon: require("../../assets/duihao.png"),
      tempImg: "/images/search/nobody.png",
      selectedIcon: "/images/search/duihao.png",
      bigPhoto: [],
      isShowUpload: false,
      clickNum: 0,
src/components/searching/uploadForModel.vue
@@ -116,8 +116,8 @@
  data() {
    return {
      tempUploadImg: "",
      tempImg: require("../../assets/nobody.png"),
      selectedIcon: require("../../assets/duihao.png"),
      tempImg: "/images/search/nobody.png",
      selectedIcon: "/images/search/duihao.png",
      bigPhoto: [],
      displayUpload: true,
      clickNum: 0,
src/components/subComponents/CardItem.vue
@@ -547,9 +547,9 @@
    },
    getUrl(bwtype) {
      if (bwtype == 1) {
        return `url(${require("@/assets/bg/red.png")})`
        return `url(${require("@/assets/img/red.png")})`
      } else {
        return `url(${require("@/assets/bg/green.png")})`
        return `url(${require("@/assets/img/green.png")})`
      }
    },
    changeInitialIndex(index) {
src/components/subComponents/ParticleNetwork.vue
File was deleted
src/pages/algorithmManage/index/App.vue
@@ -67,7 +67,11 @@
                            <!-- <svg class="icon" aria-hidden="true" style="font-size:7rem;">
                              <use :xlink:href="`#${item.icon}`" />
                            </svg> -->
                            <img class="baseImg" :src="`data:image/png;base64,${item.iconBlob}`" alt="">
                            <img
                              class="baseImg"
                              :src="`data:image/png;base64,${item.iconBlob}`"
                              alt
                            />
                          </div>
                          <div class="alg-name">
                            <div style="padding:0px 10px 0px 10px;">
@@ -1693,8 +1697,6 @@
  cursor: pointer;
}
.installInfo{
  text-indent: 2em;
  font-size: 14px;
@@ -1722,7 +1724,7 @@
      position: absolute;
      top: 50%;
      left: 50%;
      background: url(../../../assets/gif/green.gif);
      background: url("/images/algo/green.gif");
      overflow: hidden;
      transform: translate(-50%,-50%);
      .inner-bar{
@@ -1983,7 +1985,6 @@
              left: 0;
            }
          }
        }
      }
      .store-list {
@@ -2014,7 +2015,6 @@
                top: 50%;
                left: 50%;
                transform: translate(-50%,-50%);
              }
            }
            .alg-name {
src/pages/cameraAccess/components/CameraInfo.vue
@@ -135,7 +135,7 @@
            :isRunning="false"
            v-if="videoItem !== '' && videoItem !== undefined && videoItem !== null && visibilityState"
          ></camera-player>
          <video v-else poster="../../../assets/baseimg_cameara.png" preload="none"></video>
          <video v-else poster="/images/cameraAccess/video-poster.png" preload="none"></video>
        </el-col>
        <!-- 系统运行信息 -->
src/pages/cameraAccess/components/DataStackInfo.vue
@@ -799,19 +799,19 @@
    vertical-align: middle;
  }
  .snapshot-video {
    background: url("../../../assets/img/video.png");
    background: url("/images/cameraAccess/video.png");
    background-repeat: round;
  }
  .snapshot-image {
    background: url("../../../assets/img/image.png");
    background: url("/images/cameraAccess/image.png");
    background-repeat: round;
  }
  .snapshot-audio {
    background: url("../../../assets/img/audio.png");
    background: url("/images/cameraAccess/audio.png");
    background-repeat: round;
  }
  .snapshot-files {
    background: url("../../../assets/img/files.png");
    background: url("/images/cameraAccess/files.png");
    background-repeat: round;
  }
}
src/pages/cameraAccess/components/LinkageRule.vue
@@ -4,28 +4,7 @@
      <p style="text-align:left;margin-bottom: 14px;">
        <b style="font-size: 14px;line-height: 18px;">已选算法</b>
      </p>
      <!-- <swiper :options="swiperTaskOption" class="swiper-box-container swiper-no-swiping">
        <span class="task-tip" v-show="tableRuleList.length == 0 ">暂无算法,请在独立规则中选择算法</span>
        <swiper-slide v-for="(item, index) in tableRuleList" :key="index">
          <div class="item-card">
            <p style="text-align: right; width:100%; height:25px"></p>
            <p style="color: #0066EB;padding-top: 20px;'">
              <b>{{ item.scene_name }}</b>
            </p>
          </div>
        </swiper-slide>
      </swiper>
      <div class="pre-border" v-show="tableRuleList.length > 4 ">
        <div class="icon-btn" slot="button-prev">
          <i class="iconfont iconzuo"></i>
        </div>
      </div>
      <div class="next-border" v-show="tableRuleList.length > 4 ">
        <div class="icon-btn" slot="button-next">
          <i class="iconfont iconyou1"></i>
        </div>
      </div>-->
      <div>
        <div class="slide-scene">
          <span class="task-tip" v-if="tableRuleList.length == 0 ">暂无算法,请在独立规则中选择算法</span>
@@ -583,7 +562,7 @@
</style>
<style lang="scss" scoped>
.el-loading-spinner {
  background: url("../../../assets/gif/loading.gif") no-repeat;
  background: url("/images/cameraAccess/loading.gif") no-repeat;
  top: 50%;
  margin-top: -21px;
  width: calc(100% - 260px) !important;
src/pages/cameraAccess/components/SeparateRules.vue
@@ -854,7 +854,7 @@
  }
}
.el-loading-spinner {
  background: url("../../../assets/gif/loading.gif") no-repeat;
  background: url("/images/cameraAccess/loading.gif") no-repeat;
  top: 50%;
  margin-top: -21px;
  width: calc(100% - 260px) !important;
src/pages/cameraVideo/components/VideoItem.vue
@@ -41,7 +41,7 @@
        v-if="videoItem !== '' && videoItem !== undefined && videoItem !== null && TreeDataPool.treeActiveName==='dataStack'"
        :src="videoItem.rtsp"
        autoplay="autoplay"
        poster="../../../assets/baseimg.png"
        poster="/images/cameraVideo/video-poster.png"
        controls
      >您的浏览器不支持 video 标签。</video>
    </div>
src/pages/index/App.vue
@@ -9,7 +9,7 @@
    </div>
    <div class="left-bg">
      <div class="login-logo">
        <img src="../../assets/img/login-logo.png" alt width="105px" height="105px" />
        <img src="/images/login-logo.png" alt width="105px" height="105px" />
      </div>
      <div class="login-com">
        <span>北京贝思科技术有限公司</span>
@@ -52,7 +52,7 @@
<script>
import { tologin, getLoginUserData, getServerName } from './api.ts'
import ParticleNetwork from '@/components/ParticleNetwork'
import ParticleNetwork from './ParticleNetwork'
import Licence from '@/components/licence'
export default {
@@ -189,7 +189,7 @@
  position: fixed;
  top: 0;
  left: 0;
  background-image: url("../../assets/img/login-net.png");
  background-image: url("/images/login-net.png");
  width: 100%;
  height: 100%;
src/pages/index/ParticleNetwork.vue
File was renamed from src/components/ParticleNetwork.vue
@@ -1,22 +1,22 @@
<template>
  <div class="particle-network-animation" :style="`height:${height}px;width:${width}px`">
    <div style="display:none">
      <img ref="conf0" src="../assets/img/login/0.png" />
      <img ref="conf1" src="../assets/img/login/1.png" />
      <img ref="conf2" src="../assets/img/login/2.png" />
      <img ref="conf3" src="../assets/img/login/3.png" />
      <img ref="conf4" src="../assets/img/login/4.png" />
      <img ref="conf5" src="../assets/img/login/5.png" />
      <img ref="conf6" src="../assets/img/login/6.png" />
      <img ref="conf7" src="../assets/img/login/7.png" />
      <img ref="conf8" src="../assets/img/login/8.png" />
      <img ref="conf9" src="../assets/img/login/9.png" />
      <img ref="conf10" src="../assets/img/login/10.png" />
      <img ref="conf11" src="../assets/img/login/11.png" />
      <img ref="conf12" src="../assets/img/login/12.png" />
      <img ref="conf13" src="../assets/img/login/13.png" />
      <img ref="conf14" src="../assets/img/login/14.png" />
      <img ref="conf15" src="../assets/img/login/15.png" />
      <img ref="conf0" src="/images/login/0.png" />
      <img ref="conf1" src="/images/login/1.png" />
      <img ref="conf2" src="/images/login/2.png" />
      <img ref="conf3" src="/images/login/3.png" />
      <img ref="conf4" src="/images/login/4.png" />
      <img ref="conf5" src="/images/login/5.png" />
      <img ref="conf6" src="/images/login/6.png" />
      <img ref="conf7" src="/images/login/7.png" />
      <img ref="conf8" src="/images/login/8.png" />
      <img ref="conf9" src="/images/login/9.png" />
      <img ref="conf10" src="/images/login/10.png" />
      <img ref="conf11" src="/images/login/11.png" />
      <img ref="conf12" src="/images/login/12.png" />
      <img ref="conf13" src="/images/login/13.png" />
      <img ref="conf14" src="/images/login/14.png" />
      <img ref="conf15" src="/images/login/15.png" />
    </div>
  </div>
</template>
@@ -126,7 +126,6 @@
        var prop = this.radius
        // let imgOdr = parseInt(Math.random() * 16, 10);
        var img = that.$refs['conf' + this.imgNumber]
        // img.src = "../../assets/img/login/" + imgOdr + ".png";
        this.ctx.drawImage(
          img,
          this.x - this.radius * 0.8,
@@ -276,7 +275,7 @@
}
.particle-network-animation::before {
  z-index: -3;
  content: '';
  content: "";
  position: absolute;
  top: 0;
  right: 0;
src/pages/search/index/Searching.vue
@@ -232,7 +232,6 @@
        </div>
      </hsc-window>
    </hsc-window-style-metal> -->
  </div>
</template>
@@ -894,7 +893,7 @@
      width: 100%;
      height: 100%;
      .el-loading-spinner-search {
        background: url("../../../assets/gif/searchLoading.gif") no-repeat;
        background: url("/images/search/searchLoading.gif") no-repeat;
      }
    }
  }
src/pages/test/components/cardWindow.vue
File was deleted
src/pages/test/components/layout.vue
File was deleted
src/pages/test/index/App.vue
File was deleted
src/pages/test/index/Searching.vue
File was deleted
src/pages/test/index/main.ts
File was deleted
src/pages/test/index/mixins.ts
File was deleted