From b51684b80b383b7061af2427f6875bd4b78f0546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <523037378@qq.com> Date: Thu, 27 Feb 2020 15:47:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20dc=E5=88=97=E8=A1=A8=E3=80=81=E4=BE=A7?= =?UTF-8?q?=E6=BB=91=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.列表增加assetStat 2.列表中asset、机柜放后，area放前 3.侧滑area弹框去掉复选框，去掉ok按钮 --- .../src/components/common/language/en.js | 3 +- .../components/common/popBox/selectArea.vue | 35 ++++++------ .../src/components/page/config/dc.vue | 54 ++++++++++++++++--- .../src/components/page/dashboard/panel.vue | 15 +++--- nezha-fronted/src/http.js | 11 ++-- nezha-fronted/src/main.js | 10 ++-- 6 files changed, 90 insertions(+), 38 deletions(-) diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index f9b63b119..a68e4952b 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -389,7 +389,8 @@ const en = { dc: 'Datacenter', area: "Area", selectArea: 'Select area', - cabinetNum: "Cabinet number" + cabinetNum: "Cabinet number", + assets: "Assets", } }, alert: { diff --git a/nezha-fronted/src/components/common/popBox/selectArea.vue b/nezha-fronted/src/components/common/popBox/selectArea.vue index 048e222bc..6aafaaddb 100644 --- a/nezha-fronted/src/components/common/popBox/selectArea.vue +++ b/nezha-fronted/src/components/common/popBox/selectArea.vue @@ -12,22 +12,24 @@
{{$t('config.dc.selectArea')}}
- - + + + +
-
+
@@ -63,7 +65,8 @@ this.popBox.show = false; }, //确认选择某个节点，与父组件交互 - selectArea() { + selectArea(data, checked, child) { + this.area = data; this.$emit('selectArea', this.area); this.esc(); }, @@ -84,6 +87,6 @@ diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 515248b99..496e80a7d 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -2,6 +2,31 @@ .dc { height: 100%; } + .dc-asset-states { + display: flex; + align-items: center; + height: 100%; + } + .dc-asset-state { + display: inline-block; + min-width: 25px; + height: 20px; + color: white; + text-align: center; + line-height: 20px; + margin-right: 6px; + border-radius: 3px; + } + .dc-asset-state.dc-asset-state-total { + background-color: #1166bb; + margin-right: 15px + } + .dc-asset-state-in { + background-color: #90ee90; + } + .dc-asset-state-out { + background-color: orange; + } + @@ -123,13 +161,21 @@ label: this.$t("overall.name"), prop: 'name', show: true, + }, { + label: this.$t('config.dc.area'), + prop: 'area', + show: true + }, { + label: this.$t("asset.createAssetTab.location"), + prop: 'location', + show: true, }, { label: this.$t("config.dc.cabinetNum"), prop: 'cabinetNum', show: true, }, { - label: this.$t("asset.createAssetTab.location"), - prop: 'location', + label: this.$t("config.dc.assets"), + prop: 'assetStat', show: true, }, { label: this.$t('asset.createAssetTab.tel'), @@ -139,10 +185,6 @@ label: this.$t('asset.createAssetTab.principal'), prop: 'principal', show: true - }, { - label: this.$t('config.dc.area'), - prop: 'area', - show: true }, { label: this.$t('config.account.option'), prop: 'option', diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 53c65ab81..d4802b491 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -76,13 +76,16 @@
- + +
-
- -
-
+ +
+ +
+ + diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js index 0f55bf2a5..6af342e7e 100644 --- a/nezha-fronted/src/http.js +++ b/nezha-fronted/src/http.js @@ -1,8 +1,8 @@ import axios from 'axios' import router from './router' -import qs from 'qs' -import he from "element-ui/src/locale/lang/he"; //引入数据格式化 +//import qs from 'qs' +//import he from "element-ui/src/locale/lang/he"; //引入数据格式化 //axios.defaults.baseURL = 'http://localhost:8088/nz-admin'; // axios.defaults.baseURL = 'http://192.168.41.101:8088/nz-admin'; //axios.defaults.baseURL = 'http://192.168.40.247:8080/nz-admin'; @@ -23,10 +23,11 @@ axios.interceptors.request.use(config => { axios.interceptors.response.use( response => { if(response.status === 200){ - if(response.data.code == 101007){ - router.push({ + if(response.data.code == 101007) { + window.location.href = "/"; + /*router.push({ path: "/login" - }) + });*/ } } return response diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index 4204a68cc..372209fba 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -34,7 +34,9 @@ import moduleListPop from "./components/page/asset/moduleListPop"; //面板弹 import cabinetConfigBox from "./components/common/popBox/cabinetConfig"; //面板弹框组件 import dcBox from "./components/common/rightBox/dcBox"; //dc弹框 import selectArea from "./components/common/popBox/selectArea"; //dc弹框 - +/*import 'vue-happy-scroll/docs/happy-scroll.css' +import {HappyScroll} from 'vue-happy-scroll' +Vue.component('happy-scroll', HappyScroll)*/ Vue.component("Pagination", Pagination); Vue.component("searchInput", searchInput); @@ -73,7 +75,7 @@ const clickoutside = { if (el.contains(e.target)) { return false; } else { - console.info(e) + //console.info(e) let flag = true; top: for (let i = 0; i < e.path.length; i++) { for (let j = 0; j < exceptClassName.length; j++) { @@ -125,7 +127,7 @@ window.vm = new Vue({ }) export default vm -router.beforeEach((to, from, next) => { +/*router.beforeEach((to, from, next) => { if (to.path === '/login') { next() } else { @@ -136,4 +138,4 @@ router.beforeEach((to, from, next) => { next({ path: '/dashboard' }) } } -}) +})*/