diff --git a/src/assets/images/loginBgc.png b/src/assets/images/loginBgc.png new file mode 100644 index 0000000..b9a102a Binary files /dev/null and b/src/assets/images/loginBgc.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 91f1cb5..8d62ee4 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -341,6 +341,3 @@ aside { left: 53% !important; //transform: translate(-50%, -50%) !important; } -.el-dialog__wrapper { - z-index: 99999999!important; -} diff --git a/src/components/echartsList/line.vue b/src/components/echartsList/line.vue index fd44251..f316a64 100644 --- a/src/components/echartsList/line.vue +++ b/src/components/echartsList/line.vue @@ -145,7 +145,7 @@ trigger: 'axis', confine: true, // 将tooltip限制在图表的区域内，防止超出屏幕[1,7](@ref) enterable: true, // 关键配置：允许鼠标移入tooltip内部[1,2,7](@ref) - hideDelay: 300, // 建议设置隐藏延迟，方便鼠标有足够时间移动到tooltip上[1](@ref) + extraCssText: 'z-index: 2000;', // 设置一个较高的层级 axisPointer: { type: 'cross', label: { @@ -370,32 +370,6 @@ } return 0; }, - // updateChartOnYAxisChange(selectedValue) { - // // 根据选择的值，动态更新图表配置 - // // 例如，可以更新 Y 轴的单位名称、最大值、最小值，甚至切换整个 series 的数据[2](@ref) - // const chartDom = document.getElementById('lineChart' + this.num); - // const chartInstance = echarts.getInstanceByDom(chartDom); - // - // if (chartInstance) { - // // 示例：更新 Y 轴的名称显示（虽然它是隐藏的，但可能用于 tooltip 等） - // const option = chartInstance.getOption(); - // option.yAxis[0].name = this.getYAxisNameByValue(selectedValue); // 假设的方法，根据值返回要显示的名称文本 - // - // // 示例：可以在这里根据 selectedValue 重新设置 series 的 data[5](@ref) - // // option.series[0].data = ... 从某个数据源获取新数据 - // - // chartInstance.setOption(option); - // } - // }, - // getYAxisNameByValue(value) { - // // 一个简单映射，将下拉框的值转换为实际要显示的轴名称 - // const map = { - // 'value1': '温度 (°C)', - // 'value2': '湿度 (%)', - // 'value3': '压力 (Pa)' - // }; - // return map[value] || ''; - // }, dataChangeValue(val, timeArr, iconVal) { // 调用父级页面传过来的事件，在父级中处理该方法的逻辑-- if (timeArr) { @@ -404,8 +378,6 @@ if (iconVal) { this.chartData({iconVal: iconVal}) } - // let lineDataList = days && days.length > 0 ? days: this.lineData.lineXData; - // this.getList(this.title, {data: this.lineData.data, lineXData: lineDataList}); }, // tooltip中的按钮点击事件 detailsVal(xTime, content) { diff --git a/src/views/login.vue b/src/views/login.vue index 1d22ec0..14cc48c 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -167,7 +167,7 @@ export default { justify-content: center; align-items: center; height: 100%; - background-image: url("../assets/images/login-background.jpg"); + background-image: url("../assets/images/loginBgc.png"); background-size: cover; } .title { @@ -177,11 +177,12 @@ export default { } .login-form { - border-radius: 6px; + border-radius: 20px; background: #ffffff; width: 400px; padding: 25px 25px 5px 25px; z-index: 1; + margin: 0 0 0 430px; .el-input { height: 38px; input { diff --git a/src/views/resource/mtrAgent/lossRateChart.vue b/src/views/resource/mtrAgent/lossRateChart.vue index 97c4c15..5ccd521 100644 --- a/src/views/resource/mtrAgent/lossRateChart.vue +++ b/src/views/resource/mtrAgent/lossRateChart.vue @@ -19,16 +19,24 @@
- 返回 + 返回
- + + +
- 返回 + 关闭
@@ -102,8 +110,8 @@ tagOpen: false, columns: { hopNumber: { label: `路径`, minWidth: '50', visible: true}, - avgLatency:{ label: `平均延迟(ms)`,minWidth: '100', visible: true}, - lossPercent:{ label: `丢包率(%)`,minWidth: '80', visible: true}, + avgLatency:{ label: `平均延迟(ms)`,minWidth: '100', unit: '(ms)', slotName: 'tempUnit', visible: true}, + lossPercent:{ label: `丢包率(%)`,minWidth: '80', unit: '%', slotName: 'tempUnit', visible: true}, ipAddress: { label: `地址`, minWidth: '120', visible: true }, country:{ label: `国家`,minWidth: '80', visible: true}, isp: { label: `运营商`, minWidth: '120', visible: true}, @@ -242,7 +250,4 @@ justify-content: center; align-items: center; } - ::v-deep .el-dialog__wrapper { - z-index: 99999999!important; - } diff --git a/src/views/resource/mtrAgent/mtrAgentView.vue b/src/views/resource/mtrAgent/mtrAgentView.vue index c48bde4..96c37d9 100644 --- a/src/views/resource/mtrAgent/mtrAgentView.vue +++ b/src/views/resource/mtrAgent/mtrAgentView.vue @@ -94,6 +94,7 @@ lastUpdateTime: {label: '最后一次更新时间', span: colSpan, type: 'datetime', hidden: this.paramsData && this.paramsData.readonly ? false : true}, networkInfo: {label: '网卡信息', span: colSpan, type: 'input', hidden: this.paramsData && this.paramsData.readonly ? false : true}, description: {label: '描述', span: colSpan, type: 'input', disabled: true, hidden: this.paramsData && this.paramsData.readonly ? false : true}, + cpucores: {label: 'cpu核数', span: colSpan, type: 'input', disabled: true, hidden: this.paramsData && this.paramsData.readonly ? false : true}, } }]; }, diff --git a/src/views/resource/mtrProbe/mtrProbeView.vue b/src/views/resource/mtrProbe/mtrProbeView.vue index 169ba3f..eaf9bef 100644 --- a/src/views/resource/mtrProbe/mtrProbeView.vue +++ b/src/views/resource/mtrProbe/mtrProbeView.vue @@ -104,7 +104,7 @@ policyName: {label: '策略名称', span: 18, type: 'input', required: true}, mtrClientId: {label: 'MTRClientID', span: 18, type: 'select', required: true, options: []}, serverGroup: {label: '服务器集合', span: 15, type: 'textarea', rows:15, placeholder: '请粘贴/输入ClientID列表，如\nClientID1\nClientID2\n...', required: true}, - clientAllId: {label: '显示相关IP', span: 3, type: 'button', style: 'vertical-align: top'}, + clientAllId: {label: this.ruleForm && this.ruleForm.clientAllId ? '不显示相关IP' : '显示相关IP', span: 3, type: 'button', style: 'vertical-align: top'}, serveripGroup: {label: '', span: 5, labelWidthNull: true, type: 'textarea', rows:15, placeholder: 'IP1\nIP2\nIP3\n...', hidden: this.ruleForm && this.ruleForm.serveripGroup ? false: true}, probeFlag: {label: '是否探测', span: 18, type: 'radio', eventName: 'change',required: true, options: this.dict.type.rm_register_snmp_detect}, startTime: {label: '开始时间', span: 18, type: 'datetime', eventName: 'change', pickerOptions: {}, hidden: this.ruleForm && this.ruleForm.probeFlag === '1' ? false: true}, @@ -119,13 +119,15 @@ getMtrPolicyt(id).then(val => { if (val && val.data) { val.data['probeFlag'] = val.data['probeFlag'].toString(); - val.data['serverGroup'] = val.data['serverGroup'].replace(/;/g, '\n'); if (val.data && val.data['serveripGroup']) { - if (this.paramsData && this.paramsData.readonly) { - val.data['serveripGroup'] = val.data && val.data['serveripGroup'] ? val.data['serveripGroup'].replace(/;/g, '
') : val.data['serveripGroup']; - } else { - val.data['serveripGroup'] = val.data && val.data['serveripGroup'] ? val.data['serveripGroup'].replace(/;/g, '\n') : val.data['serveripGroup']; - } + val.data['clientAllId'] = true; + } + if (this.paramsData && this.paramsData.readonly) { + val.data['serveripGroup'] = val.data && val.data['serveripGroup'] ? val.data['serveripGroup'].replace(/;/g, '
') : val.data['serveripGroup']; + val.data['serverGroup'] = val.data && val.data['serverGroup'] ? val.data['serverGroup'].replace(/;/g, '
') : val.data['serverGroup']; + } else { + val.data['serveripGroup'] = val.data && val.data['serveripGroup'] ? val.data['serveripGroup'].replace(/;/g, '\n') : val.data['serveripGroup']; + val.data['serverGroup'] = val.data['serverGroup'].replace(/;/g, '\n'); } val.data['probeFrequency'] = val.data && val.data['probeFrequency'] ? val.data['probeFrequency'].toString() : null; this.ruleForm = val.data; diff --git a/src/views/resource/remoteManage/remoteManage.vue b/src/views/resource/remoteManage/remoteManage.vue index c3f4aa7..9703bdd 100644 --- a/src/views/resource/remoteManage/remoteManage.vue +++ b/src/views/resource/remoteManage/remoteManage.vue @@ -68,7 +68,7 @@
- + 
{{item.content}}
 diff --git a/src/views/resource/remoteManage/remoteManageView.vue b/src/views/resource/remoteManage/remoteManageView.vue index 15084f1..41e81f8 100644 --- a/src/views/resource/remoteManage/remoteManageView.vue +++ b/src/views/resource/remoteManage/remoteManageView.vue @@ -10,7 +10,7 @@

命令执行结果

- + 
{{item.content}}
 diff --git a/src/views/resource/serverRegister/index.vue b/src/views/resource/serverRegister/index.vue index 67704fe..f301081 100644 --- a/src/views/resource/serverRegister/index.vue +++ b/src/views/resource/serverRegister/index.vue @@ -116,7 +116,7 @@