From 5d3fe5712f60fec872870e0b1a3162c72466ab05 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 15 十月 2020 19:07:20 +0800
Subject: [PATCH] 移除应用引入的common.scss文件
---
src/pages/datapush/index/main.ts | 1
public/images/settings/cloud.png | 0
src/pages/library/index/App.vue | 3 +
src/pages/settings/components/CloudNode.vue | 99 +++++++++++++++++++++++++++++--------------------
src/pages/datapush/index/App.vue | 1
src/pages/search/index/main.ts | 1
6 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/public/images/settings/cloud.png b/public/images/settings/cloud.png
index 34fee95..2679558 100644
--- a/public/images/settings/cloud.png
+++ b/public/images/settings/cloud.png
Binary files differ
diff --git a/src/pages/datapush/index/App.vue b/src/pages/datapush/index/App.vue
index 54f835b..bdf3b73 100644
--- a/src/pages/datapush/index/App.vue
+++ b/src/pages/datapush/index/App.vue
@@ -98,6 +98,7 @@
<style lang="scss">
.flex-box {
+ display: flex;
height: 100%;
}
.ev-left-list {
diff --git a/src/pages/datapush/index/main.ts b/src/pages/datapush/index/main.ts
index 5873c3b..12949b2 100644
--- a/src/pages/datapush/index/main.ts
+++ b/src/pages/datapush/index/main.ts
@@ -5,7 +5,6 @@
import 'element-ui/lib/theme-chalk/index.css';
import "@/assets/css/element-variables.scss";
-import "../../../assets/css/common.scss"
import moment from "moment";
Vue.prototype.$moment = moment;
diff --git a/src/pages/library/index/App.vue b/src/pages/library/index/App.vue
index cc628db..2da0f8b 100644
--- a/src/pages/library/index/App.vue
+++ b/src/pages/library/index/App.vue
@@ -125,6 +125,9 @@
}
</script>
<style lang="scss" scoped>
+.flex-box{
+ display: flex;
+}
.s-base-manage {
box-sizing: border-box;
background-color: #e9ebf2;
diff --git a/src/pages/search/index/main.ts b/src/pages/search/index/main.ts
index c0c4c8f..da0d750 100644
--- a/src/pages/search/index/main.ts
+++ b/src/pages/search/index/main.ts
@@ -11,7 +11,6 @@
import Mixin from "./mixins";
import 'vue-photo-preview/dist/skin.css'
-//import "../../../assets/css/common.scss"
Vue.prototype.$moment = moment;
diff --git a/src/pages/settings/components/CloudNode.vue b/src/pages/settings/components/CloudNode.vue
index c61c160..01e0532 100644
--- a/src/pages/settings/components/CloudNode.vue
+++ b/src/pages/settings/components/CloudNode.vue
@@ -2,7 +2,12 @@
<div class="cloud">
<div class="inner">
<div class="rect">
- <div class="node" v-for="(item,index) in insideNodes" :key="item.id" :style="{top:36*(index+1)+'px',left:60*(index+1)+'px'}">
+ <div
+ class="node"
+ v-for="(item,index) in insideNodes"
+ :key="item.id"
+ :style="{top:36*(index+1)+'px',left:60*(index+1)+'px'}"
+ >
<span class="node-icon">
<!-- <img :src="nodeIcons[item.workType]" alt=""> -->
</span>
@@ -11,7 +16,12 @@
</div>
</div>
<div class="outer">
- <div class="node" v-for="(item,index) in insideNodes" :key="item.id" :style="{top:36*(index+1)+'px',left:80*(index+1)+'px'}">
+ <div
+ class="node"
+ v-for="(item,index) in insideNodes"
+ :key="item.id"
+ :style="{top:36*(index+1)+'px',left:80*(index+1)+'px'}"
+ >
<span class="node-icon">
<!-- <img :src="nodeIcons[item.workType]" alt=""> -->
</span>
@@ -22,14 +32,15 @@
</template>
<script>
export default {
- name:'cloudNode',
- props:{
+ name: 'cloudNode',
+ props: {
nodes: Array
},
- data(){
+ data () {
return {
- nodeIcons:[],
- mockData:[
+
+ nodeIcons: [],
+ mockData: [
{
cluster_id: "b6132bfe-d3af-4710-ba89-436f614c2f46",
hardwareType: "01",
@@ -46,7 +57,7 @@
node_id: "DSVAD010120190623",
node_ip: "192.168.20.10:30190",
nodeName: "寮�鍙戞祴璇�20.10-1",
- role:'master'
+ role: 'master'
},
{
cluster_id: "b6132bfe-d3af-4710-ba89-436f614c2g",
@@ -55,7 +66,7 @@
node_id: "DSVAD010120190624",
node_ip: "192.168.20.10:30190",
nodeName: "娴嬭瘯20.10-1",
- role:'pc'
+ role: 'pc'
},
{
cluster_id: "b6132bfe-d3af-4710-ba89-436f614c2h",
@@ -64,52 +75,58 @@
node_id: "DSVAD010120190625",
node_ip: "192.168.20.10:30190",
nodeName: "娴嬭瘯20.101-1",
- role:'server'
+ role: 'server'
},
]
}
},
- computed:{
-
- insideNodes(){
- //return this.nodes.filter(item=>item.hardwareType=='01'||item.hardwareType=='02');
- return this.mockData.filter(item=>item.hardwareType=='01'||item.hardwareType=='02');
+ computed: {
+ cloudPic () {
+ return '/images/settings/cloud.png'
},
- outsideNodes(){
+ insideNodes () {
+ //return this.nodes.filter(item=>item.hardwareType=='01'||item.hardwareType=='02');
+ return this.mockData.filter(item => item.hardwareType == '01' || item.hardwareType == '02');
+ },
+ outsideNodes () {
//return this.nodes.filter(item=>item.hardwareType=='03');
- return this.mockData.filter(item=>item.hardwareType=='03');
+ return this.mockData.filter(item => item.hardwareType == '03');
}
}
}
</script>
<style lang="scss">
- .cloud{
- width: 100%;
- height: 500px;
- display: flex;
- .inner{
-
- background: url('/images/settings/cloud.png') no-repeat;
- background-size: 100%;
- .rect{
- background:cornflowerblue;
- position: relative;
- .node{
- position: absolute;
- .node-icon{
- width:40px;
- height:40px;
- }
- .node-name{
- font-size:14px;
- color: #333;
- }
+.cloud {
+ width: 100%;
+ height: 500px;
+ display: flex;
+ .inner {
+ background: url('/images/settings/cloud.png') no-repeat;
+ background-size: 100%;
+ width: 50%;
+ .rect {
+ margin: 100px;
+ background: cornflowerblue;
+ position: relative;
+ .node {
+ position: absolute;
+ .node-icon {
+ width: 40px;
+ height: 40px;
+ }
+ .node-name {
+ font-size: 14px;
+ color: #333;
}
}
}
- .outer{
- width:50%;
- position: relative;
+ }
+ .outer {
+ width: 50%;
+ position: relative;
+ .node {
+ position: absolute;
}
}
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0