diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue index d7e51a02d..4c20bc986 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue @@ -94,7 +94,7 @@ name:'', remark:'', seq:'', - uSize:0 + uSize:1 }, showTopBtn: false, //top按钮是否显示 loading: false, diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue index aaaf50716..6ebd61eff 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue @@ -436,7 +436,7 @@ ], panelData: [], //chart-box的panel下拉框数据, hideSameLabels: true, - sameLabels:['instance','module','project','asset','job','dc'], + sameLabels:['instance','module','project','asset','endpoint','datacenter'], } }, methods: { diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 59bcca703..f488f4c6e 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -266,11 +266,7 @@ const en = { fileSize:'文件过大',//File exceed max size. port:'Invalid Port', url:'Invalid URL', - config: { - account: { - - } - } + uSize:'Must be number(1 - 47)' }, search: { searchTip: 'Enter to search',//'点击或回车执行搜索' @@ -463,7 +459,7 @@ const en = { dataCenter: 'DC',//DC cabinet: 'Cabinet',//'机柜' model: 'Model',//'型号' - manufacturer: 'Manufacturer',//'厂商' + vendor: 'Vendor',//'厂商' procurementDate: 'Purchase date',//'购买日期' principal: 'Administrator',//'负责人' principalTel: 'Telephone',//'电话' diff --git a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue index 802c04df0..2c66b4469 100644 --- a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue @@ -30,8 +30,8 @@
{{idc?idc.name:''}}
-
{{cabinet.uSize}}
- + + @@ -70,14 +70,15 @@ name:'', remark:'', seq:'', - uSize:0 + uSize:1 }, rules:{ name: [ {required: true, message: this.$t('validate.required'), trigger: 'blur'} ], uSize: [ - {required: true, type: 'number', min: 1, max: 47, message: this.$t('validate.required'), trigger: 'blur'} + {required: true, message: this.$t('validate.required'), trigger: 'blur'}, + {type: 'number', min: 1, max: 47,message: this.$t('validate.uSize'),trigger: 'blur'} ], }, } @@ -93,7 +94,7 @@ name:'', remark:'', seq:'', - uSize:0 + uSize:1 }; }, show(show, isEdit) { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 073429cd4..2ad18bdd8 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -391,7 +391,7 @@ prop: 'model', show: true, }, { - label: this.$t("asset.tableTitle.manufacturer"), + label: this.$t("asset.tableTitle.vendor"), prop: 'vendor', show: true, }, { @@ -663,7 +663,7 @@ getPingData:function(){ this.pingCheckListData=[ {label:'up',value:1}, - {label:'down',value:2}, + {label:'down',value:0}, ] }, getUserData() { @@ -819,28 +819,29 @@ if(this.assetTypeCheckList && this.assetTypeCheckList.length > 0){ let assetTypeIds=this.assetTypeCheckList.join(','); this.pageObj.typeIds=assetTypeIds; - this.getAssetData(); }else{ this.pageObj.typeIds=''; } + this.getAssetData(); }, changeVendorCheckBox:function(){ if(this.vendorCheckList && this.vendorCheckList.length > 0){ let vendorIds=this.vendorCheckList.join(','); this.pageObj.vendorIds=vendorIds; - this.getAssetData(); + }else{ this.pageObj.vendorIds=''; } + this.getAssetData(); }, changePingCheckBox:function(){ if(this.pingCheckList && this.pingCheckList.length > 0){ let pingStates=this.pingCheckList.join(','); this.pageObj.pingStates=pingStates; - this.getAssetData(); }else{ this.pageObj.pingStates=''; } + this.getAssetData(); }, getSingleAsset() { let checkedCount = this.checkList.length; diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue index 0b3cc68a6..8b75a195e 100644 --- a/nezha-fronted/src/components/page/config/system.vue +++ b/nezha-fronted/src/components/page/config/system.vue @@ -24,8 +24,8 @@ -
- +
+
@@ -62,7 +62,7 @@
- + @@ -139,7 +139,7 @@ - + {{$t('overall.reset')}} @@ -152,13 +152,23 @@
- - - - - -
- + + + + + + +
+
+ +
+
{{$t('overall.reset')}} @@ -384,6 +394,21 @@ break; } }, + switchChange:function(formName){ + let $temp=this; + $temp.$refs[formName].clearValidate(); + setTimeout(()=>{ + $temp.$refs[formName].validate(); + },100) + }, + resetCheckBoxChange:function(e){ + if(e.target.checked == true ){ + this.reset.type.push(e.target.value) + }else{ + let index = this.reset.type.indexOf(e.target.value); + this.reset.type.splice(index,1); + } + }, jumpTo(data, id) { this.$router.push({ path: "/" + data, @@ -420,4 +445,15 @@ line-height: 28px; width: 512px; } + .system-tabs .el-tabs--border-card{ + webkit-box-shadow: unset !important; + box-shadow: unset !important; + } + .sys-reset-label .el-checkbox__original:checked + span{ + background-color: orange; + } + .sys-reset-label .el-checkbox__original:checked + span:after{ + -webkit-transform: rotate(45deg) scaleY(1); + transform: rotate(45deg) scaleY(1); + } diff --git a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue index dd9e5d307..2d6a484da 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue @@ -67,6 +67,7 @@ const mapOptions={ geo:{ map:'', + roam:true,//鼠标是否可以控制缩放 // center:[],//当前视角的中心点，用经纬度表示 label: { //控制显示地图名称 @@ -78,7 +79,8 @@ }, } , itemStyle:{ - areaColor:'lightgrey', //设置默认状态下地图颜色 + // areaColor:'lightgrey', //设置默认状态下地图颜色 + }, emphasis:{ itemStyle: { @@ -90,6 +92,15 @@ right:0, bottom:0, }, + dataRange:{ + x: '-1000 px', //图例横轴位置 + y: '-1000 px', //图例纵轴位置 + splitList: [ + { start: 1, end: 1, label: 'astana', color: '#cfc5de' }, + { start: 2, end: 2, label: '天津', color: '#f1ebd1' }, + { start: 3, end: 3, label: '上海', color: '#feffdb' }, + ] + }, tooltip : { trigger: 'item', type:'cross', diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.vue b/nezha-fronted/src/components/page/dashboard/overview/overview.vue index 4ee8a050d..01efe6c42 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/overview.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/overview.vue @@ -180,7 +180,7 @@ direction:'row', total:{ //左侧上方大图标及total信息 show:true, - direction:'row', + direction:'column', num:totalData.inStock, title:this.$t('dashboard.overview.asset.title'), showPopover:true, @@ -306,7 +306,7 @@ direction:'row', total:{ //左侧上方大图标及total信息 show:true, - direction:'row', + direction:'column', num:data.total, title:this.$t('dashboard.overview.project.project'), showPopover:false, @@ -378,7 +378,7 @@ direction:'row', total:{ //左侧上方大图标及total信息 show:true, - direction:'row', + direction:'column', num:data.total, title:this.$t('dashboard.overview.project.endpoint'), showPopover:false, diff --git a/nezha-fronted/src/components/page/dashboard/overview/tableBox.scss b/nezha-fronted/src/components/page/dashboard/overview/tableBox.scss index c39d27c93..f93dcdf56 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/tableBox.scss +++ b/nezha-fronted/src/components/page/dashboard/overview/tableBox.scss @@ -19,8 +19,10 @@ } .table-screen{ display: flex; - flex-direction: column; + //flex-direction: column; height: 100%; + width: 100%; + justify-content: space-around; } .table-screen .screen-top{ flex: 1; @@ -38,7 +40,7 @@ display: flex; flex-direction: column; height: 100%; - align-items:center; + align-items:flex-start; justify-content: space-around; text-align: center; } @@ -46,6 +48,21 @@ flex: 1; text-align: center; } +.screen-column .screen-col{ + width: 100%; + vertical-align: top; +} +.screen-col .col-box{ + display: flex; + width: 100%; + text-align: center; + align-items: center; + justify-content: flex-start; +} +.screen-col .col-box div{ + display: inline-block; + text-align: left; +} .super-icon{ font-size:5rem !important; } @@ -83,4 +100,6 @@ popover-container{ flex:1; content: ''; } - +.column-flex{ + flex-direction: column; +} diff --git a/nezha-fronted/src/components/page/dashboard/overview/tableBox.vue b/nezha-fronted/src/components/page/dashboard/overview/tableBox.vue index 38498290b..ad2d669a6 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/tableBox.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/tableBox.vue @@ -2,7 +2,7 @@