From 81afc2e465c68f8b14b54a7ec350f28d09583cf1 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 03 八月 2020 11:28:00 +0800
Subject: [PATCH] iframe窗口操作图标替换el-icon,删除天气json
---
src/pages/desktop/index/main.ts | 6 ++
src/pages/desktop/index/mock/userData-copy.json | 28 +++++++++++++-
src/pages/desktop/index/components/DFrame.vue | 23 ++++++-----
src/pages/desktop/index/mock/userData.json | 17 --------
src/pages/desktop/index/mock/weather.json | 5 --
5 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 3691cc9..f79110a 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -7,9 +7,9 @@
>
<div class="d-frame-title" v-drag @click="frameClick()">
<div class="d-frame-title-operation">
- <i class="fa fa-circle d-frame-operation-close" @click="closeFrame()"></i>
- <i class="fa fa-circle d-frame-operation-minus" @click="minFrame(data)"></i>
- <i class="fa fa-circle d-frame-operation-full" @click="changeFullScreen()"></i>
+ <i class="el-icon-error d-frame-operation-close" @click="closeFrame()"></i>
+ <i class="el-icon-remove d-frame-operation-minus" @click="minFrame(data)"></i>
+ <i class="el-icon-circle-plus d-frame-operation-full" @click="changeFullScreen()"></i>
</div>
<slot name="d-frame-title-content">
<div class="d-frame-title-content">
@@ -19,6 +19,7 @@
</slot>
</div>
<div class="d-frame-content">
+
<iframe :src="data.url" v-if="data.url"></iframe>
<div v-html="data.html" v-if="data.html"></div>
<!-- <span class="d-frame-operation-resize" v-resize></span> -->
@@ -28,7 +29,8 @@
</template>
<script>
-import html2canvas from 'html2canvas'
+import html2canvas from 'html2canvas';
+
export default {
name: "DFrame",
props: {
@@ -208,31 +210,32 @@
.d-frame-title-operation i {
margin: 0 3px;
+ font-size:18px;
}
.d-frame-operation-close {
color: red;
}
-.d-frame-title-operation:hover .d-frame-operation-close::before {
+/* .d-frame-title-operation:hover .d-frame-operation-close::before {
content: "\f057";
-}
+} */
.d-frame-operation-minus {
color: #fbb450;
}
-.d-frame-title-operation:hover .d-frame-operation-minus::before {
+/* .d-frame-title-operation:hover .d-frame-operation-minus::before {
content: "\f056";
-}
+} */
.d-frame-operation-full {
color: #00d800;
}
-.d-frame-title-operation:hover .d-frame-operation-full::before {
+/* .d-frame-title-operation:hover .d-frame-operation-full::before {
content: "\f055";
-}
+} */
.d-frame-title-content {
line-height: 30px;
diff --git a/src/pages/desktop/index/main.ts b/src/pages/desktop/index/main.ts
index 0021368..9763a41 100644
--- a/src/pages/desktop/index/main.ts
+++ b/src/pages/desktop/index/main.ts
@@ -1,9 +1,13 @@
/* eslint-disable */
import Vue from 'vue'
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
+import 'element-ui/lib/theme-chalk/index.css';
+import "@/assets/css/element-variables.scss";
import App from './App.vue';
import store from './store'
import "../../../assets/icons/awesome/font-awesome.css";
-
+Vue.use(ElementUI);
new Vue({
el: '#app',
store,
diff --git a/src/pages/desktop/index/mock/userData-copy.json b/src/pages/desktop/index/mock/userData-copy.json
index 0880a2d..10df66e 100644
--- a/src/pages/desktop/index/mock/userData-copy.json
+++ b/src/pages/desktop/index/mock/userData-copy.json
@@ -57,7 +57,16 @@
"type": "2",
"url": "http://www.justlive.vip/center/"
},
-
+ {
+ "code": "0000",
+ "success": true,
+ "data": {
+ "city": "骞垮窞甯�",
+ "type": "澶氫簯",
+ "icon": "http://yun.rili.cn/wnl/img/cloud.png",
+ "temperature": "17"
+ }
+ },
{
"id": "3",
"src": "../../images/app-mid/DVR-access.png",
@@ -82,7 +91,22 @@
"url": "/view/device",
"name": "璁惧绠＄悊"
},
-
+ {
+ "id": "8",
+ "src": "../../images/app-mid/poll.png",
+ "alt": "杞绠＄悊",
+ "type": "2",
+ "url": "/view/poll",
+ "name": "杞绠＄悊"
+ },
+ {
+ "id": "10",
+ "src": "../../images/app-mid/algorithm-store.png",
+ "alt": "绠楁硶鍟嗗煄",
+ "type": "2",
+ "url": "/view/algorithmStore",
+ "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 3cfec8f..528e319 100644
--- a/src/pages/desktop/index/mock/userData.json
+++ b/src/pages/desktop/index/mock/userData.json
@@ -70,22 +70,7 @@
"width": 1542,
"height": 800
},
- {
- "id": "8",
- "src": "../../images/app-mid/poll.png",
- "alt": "杞绠＄悊",
- "type": "2",
- "url": "/view/poll",
- "name": "杞绠＄悊"
- },
- {
- "id": "10",
- "src": "../../images/app-mid/algorithm-store.png",
- "alt": "绠楁硶鍟嗗煄",
- "type": "2",
- "url": "/view/algorithmStore",
- "name": "搴旂敤涓績"
- },
+
{
"id": "11",
"src": "../../images/app-mid/hashrate-manage.png",
diff --git a/src/pages/desktop/index/mock/weather.json b/src/pages/desktop/index/mock/weather.json
index 1cb8614..8e377a0 100644
--- a/src/pages/desktop/index/mock/weather.json
+++ b/src/pages/desktop/index/mock/weather.json
@@ -2,9 +2,6 @@
"code": "0000",
"success": true,
"data": {
- "city": "骞垮窞甯�",
- "type": "澶氫簯",
- "icon": "http://yun.rili.cn/wnl/img/cloud.png",
- "temperature": "17"
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0