From 84f11d4ca59f9580a7e7de5471e3eb86ea14c16b Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 01 八月 2020 18:08:16 +0800
Subject: [PATCH] 屏蔽未开放应用
---
src/pages/desktop/index/components/ToolsEntry.vue | 1
src/pages/desktop/index/mock/userData-copy.json | 29 ++++++++++++--
src/pages/desktop/index/components/DFrame.vue | 3 -
src/pages/index/main.ts | 2
src/pages/cameraAccess/components/CameraInfo.vue | 1
src/pages/desktop/index/mock/userData.json | 27 +------------
src/pages/desktop/index/mock/messages.json | 16 --------
src/Pool/VideoPhotoData.ts | 1
8 files changed, 29 insertions(+), 51 deletions(-)
diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts
index a310290..54f10a5 100644
--- a/src/Pool/VideoPhotoData.ts
+++ b/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) {
diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index 0ea6d6b..35546d2 100644
--- a/src/pages/cameraAccess/components/CameraInfo.vue
+++ b/src/pages/cameraAccess/components/CameraInfo.vue
@@ -313,7 +313,6 @@
}
},
selectCamera(node) {
- debugger
this.isAdd = false;
this.videoItem = null;
this.$refs.addForm.resetFields();
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 90f8e5a..cfe46e1 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -61,10 +61,8 @@
this.$store.commit('desktop/refreshFrame', this.data);
},
minFrame: function (data) {
- debugger
//鎵惧埌褰撳墠鐨刬frame
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,
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index c98b1e5..55084be 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/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,
diff --git a/src/pages/desktop/index/mock/messages.json b/src/pages/desktop/index/mock/messages.json
index b629813..23ce0ba 100644
--- a/src/pages/desktop/index/mock/messages.json
+++ b/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 - 杞婚噺绾ava妗嗘灦",
- "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"
- }
]
}
\ No newline at end of file
diff --git a/src/pages/desktop/index/mock/userData-copy.json b/src/pages/desktop/index/mock/userData-copy.json
index c5040fd..0880a2d 100644
--- a/src/pages/desktop/index/mock/userData-copy.json
+++ b/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": "璁惧绠＄悊"
+ },
+
]
}
}
\ No newline at end of file
diff --git a/src/pages/desktop/index/mock/userData.json b/src/pages/desktop/index/mock/userData.json
index 20a2a50..3cfec8f 100644
--- a/src/pages/desktop/index/mock/userData.json
+++ b/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",
diff --git a/src/pages/index/main.ts b/src/pages/index/main.ts
index 692b57e..d910dc3 100644
--- a/src/pages/index/main.ts
+++ b/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)
--
Gitblit v1.8.0