hanbaoshan
2020-08-01 84f11d4ca59f9580a7e7de5471e3eb86ea14c16b
屏蔽未开放应用
8个文件已修改
80 ■■■■■ 已修改文件
src/Pool/VideoPhotoData.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/components/CameraInfo.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/desktop/index/components/DFrame.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/desktop/index/components/ToolsEntry.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/desktop/index/mock/messages.json 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/desktop/index/mock/userData-copy.json 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/desktop/index/mock/userData.json 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/index/main.ts 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Pool/VideoPhotoData.ts
@@ -86,7 +86,6 @@
    const rsp: any = await getSearchList(param);
    if (rsp && rsp.success) {
      debugger
      this.cards.length = 0 // 清两次,第一次是为了点完之后不会出现之前数据的残影,这次是为了防止因为异步问题两次请求会出现双倍数据的问题
      this.preCards.length = 0
      if (rsp.data.datalist) {
src/pages/cameraAccess/components/CameraInfo.vue
@@ -313,7 +313,6 @@
      }
    },
    selectCamera(node) {
      debugger
      this.isAdd = false;
      this.videoItem = null;
      this.$refs.addForm.resetFields();
src/pages/desktop/index/components/DFrame.vue
@@ -61,10 +61,8 @@
      this.$store.commit('desktop/refreshFrame', this.data);
    },
    minFrame: function (data) {
      debugger
      //找到当前的iframe
      let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
      debugger
      //保存当前应用快照
      html2canvas(curIframe.contentWindow.document.body,{
        dpi: window.devicePixelRatio*4,
@@ -74,7 +72,6 @@
        useCORS : true //开启跨域配置
      }).then(canvas => {
        let shotSrc = canvas.toDataURL();
        debugger;
        this.$store.commit('desktop/addMinDock', {
          id: this.data.id,
          src: this.data.icon,
src/pages/desktop/index/components/ToolsEntry.vue
@@ -49,6 +49,7 @@
      if (dock.type === '1') {
        window.open(dock.url);
      } else if (dock.type === '2') {
        debugger
        this.$store.dispatch('desktop/addFrame', {
          id: dock.id,
          icon: dock.src,
src/pages/desktop/index/mock/messages.json
@@ -2,21 +2,5 @@
  "code": "0000",
  "success": true,
  "data": [
    {
      "id": "L1",
      "icon": "images/message.png",
      "tip": "消息",
      "title": "oxygen - 轻量级Java框架",
      "body": "v1.2.0 已经发布啦<br><a href='https://maven-badges.herokuapp.com/maven-central/vip.justlive/oxygen/' target='_blank'><img src='https://maven-badges.herokuapp.com/maven-central/vip.justlive/oxygen/badge.svg' alt='Maven Central'></a><a href='https://www.apache.org/licenses/LICENSE-2.0.html' target='_blank'><img src='https://img.shields.io/badge/license-Apache%202-4EB1BA.svg' alt='License'></a><br>详情<i class='fa fa-hand-o-right'></i>:<a href='https://gitee.com/justlive1/oxygen' target='_blank'>https://gitee.com/justlive1/oxygen</a>",
      "time": "2018/12/14 17:12:03"
    },
    {
      "id": "L2",
      "icon": "images/message.png",
      "tip": "消息",
      "title": "阿里云福利",
      "body": "最高<span style='color: rgb(255, 138, 0);'>¥1888</span>云产品通用代金券<br>详情<i class='fa fa-hand-o-right'></i>:<a href='https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=fc8ydi4y' style='word-break: break-all;' target='_blank'>https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=fc8ydi4y</a>",
      "time": "2018/12/12 12:12:12"
    }
  ]
}
src/pages/desktop/index/mock/userData-copy.json
@@ -57,13 +57,32 @@
        "type": "2",
        "url": "http://www.justlive.vip/center/"
      },
      {
        "id": "9",
        "src": "../../images/gitee.png",
        "alt": "算法管理",
        "id": "3",
        "src": "../../images/app-mid/DVR-access.png",
        "alt": "DVR",
        "type": "2",
        "url": "/view/algorithmManage"
      }
        "url": "/view/DVR",
        "name": "硬盘录像机接入"
      },
      {
        "id": "14",
        "src": "../../images/app-mid/360.png",
        "alt": "全景视频",
        "type": "2",
        "url": "/view/panoramicVideo",
        "name": "全景视频"
      },
      {
        "id": "16",
        "src": "../../images/app-mid/device.png",
        "alt": "设备管理",
        "type": "2",
        "url": "/view/device",
        "name": "设备管理"
      },
    ]
  }
}
src/pages/desktop/index/mock/userData.json
@@ -51,14 +51,7 @@
        "width": 1876,
        "height": 750
      },
      {
        "id": "3",
        "src": "../../images/app-mid/DVR-access.png",
        "alt": "DVR",
        "type": "2",
        "url": "/view/DVR",
        "name": "硬盘录像机接入"
      },
      {
        "id": "4",
        "src": "../../images/app-mid/data-push.png",
@@ -113,14 +106,7 @@
        "width": 1663,
        "height": 890
      },
      {
        "id": "14",
        "src": "../../images/app-mid/360.png",
        "alt": "全景视频",
        "type": "2",
        "url": "/view/panoramicVideo",
        "name": "全景视频"
      },
      {
        "id": "15",
        "src": "../../images/app-mid/log-manage.png",
@@ -131,14 +117,7 @@
        "width": 1246,
        "height": 590
      },
      {
        "id": "16",
        "src": "../../images/app-mid/device.png",
        "alt": "设备管理",
        "type": "2",
        "url": "/view/device",
        "name": "设备管理"
      },
      {
        "id": "17",
        "src": "../../images/app-mid/settings.png",
src/pages/index/main.ts
@@ -6,7 +6,7 @@
import "../../assets/css/common.scss"
import "../../assets/css/overried.scss"
import App from './App.vue'
import App from './app.vue'
Vue.use(ElementUI)