gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf:project 左侧菜单调整&所有左侧菜单添加背景色&英文国际化调整

Browse Source
This commit is contained in:
wangwenrui
2020-04-17 12:48:46 +08:00
parent 12a3c3413f
commit af138f576d
6 changed files with 122 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nezha-fronted/src/assets/stylus/main.scss
View File

@@ -1181,7 +1181,7 @@ li{
height: 325px; height: 325px;
} }
.param-box-module { .param-box-module {
height: 258px; height: 140px;
} }
.param-box-row { .param-box-row {
padding: 7px 10px 0 10px; padding: 7px 10px 0 10px;
@@ -1684,4 +1684,9 @@ li{
.same-label-width .el-radio-button__inner { .same-label-width .el-radio-button__inner {
width: 90px; width: 90px;
} }
.left-menu-bg .el-collapse-item__header,.left-menu-bg .el-collapse-item__content{ //当左侧菜单含有el-collapse组件时使用
background-color: #e2e2e2;
}
.transparent-pop{ //防止popover的提示框挡住页面元素无法操作
pointer-events: none;
}

134
nezha-fronted/src/components/common/language/en.js
View File

@@ -38,17 +38,17 @@ const en = {
back: 'Back', //返回 back: 'Back', //返回
unavailable: 'Unavailable', unavailable: 'Unavailable',
available: 'Available', available: 'Available',
changePwd:'Change Password',//修改密码 changePwd:'Change password',//修改密码
createChart:'create chart', createChart:'Create chart',
createProject:'create project', createProject:'Create project',
createAsset:'create asset', createAsset:'Create asset',
createAlertRule:'create alert rule', createAlertRule:'Create alert rule',
createAccount:'create account', createAccount:'Create account',
createPrometheusServer:'create prometheus server', createPrometheusServer:'Create prometheus server',
createDatacenter:'create Data Center', createDatacenter:'Create Data Center',
createCabinet:'create cabinet', createCabinet:'Create cabinet',
createModel:'create model', createModel:'Create model',
createMib:'create MIB', createMib:'Create MIB',
exportExcel:'Export', exportExcel:'Export',
importExcel:'Import', importExcel:'Import',
importExcelLower:'import', importExcelLower:'import',
@@ -84,7 +84,7 @@ const en = {
uploadButtonTitle:'Upload', uploadButtonTitle:'Upload',
fileSelect:'select', fileSelect:'select',
downloadButtonTitle:'Download', downloadButtonTitle:'Download',
filePath:'file path', filePath:'File path',
closeTip:'All connections will be closed, are you sure you want to close the window?', closeTip:'All connections will be closed, are you sure you want to close the window?',
remember:'Remember my decision' remember:'Remember my decision'
}, },
@@ -101,20 +101,20 @@ const en = {
name:'name' name:'name'
}, },
//面板-侧滑框 //面板-侧滑框
createPanelTitle: 'New Panel', //"新增面板" createPanelTitle: 'New panel', //"新增面板"
selectPanelTitle:'Select', //"选择面板" selectPanelTitle:'Select', //"选择面板"
createPanelTitleSec:'New Panel',//"新增面板" createPanelTitleSec:'New panel',//"新增面板"
editPanelTitle: 'Panel', //"面板" editPanelTitle: 'Panel', //"面板"
panelForm:{ panelForm:{
panelName:'Panel Name', //"面板名称" panelName:'Panel name', //"面板名称"
panelId:"ID" //ID panelId:"ID" //ID
}, },
//图表-侧滑框 //图表-侧滑框
createChartTitle: 'New Chart', //"新增图表" createChartTitle: 'New chart', //"新增图表"
editChartTitle: 'Edit',//"编辑图表" editChartTitle: 'Edit',//"编辑图表"
chartForm:{ chartForm:{
chartId:"ID", chartId:"ID",
chartName:"Chart Name", chartName:"Chart n",
type:"Type", type:"Type",
unit:"Unit", unit:"Unit",
url:"URL", url:"URL",
@@ -185,11 +185,11 @@ const en = {
cancel:'Cancel'//'取消' cancel:'Cancel'//'取消'
}, },
metric:{ metric:{
name:'Metric Name', //"指标名称" name:'Metric name', //"指标名称"
normal:'Normal', //"普通" normal:'Normal', //"普通"
expert:"Expert",// Expert expert:"Expert",// Expert
label:'Label', //"指标标签" label:'Label', //"指标标签"
addMetric:'Add Metric',//"添加指标" addMetric:'Add metric',//"添加指标"
expertTip:'Add expression',//"请输入表达式" expertTip:'Add expression',//"请输入表达式"
goPanelTip:"View created panel?",//View created panel? goPanelTip:"View created panel?",//View created panel?
previewChart:'Preview',//"预览图表" previewChart:'Preview',//"预览图表"
@@ -212,17 +212,17 @@ const en = {
contentTitle:'Nezha Management System', contentTitle:'Nezha Management System',
asset:{ asset:{
title:'Asset', title:'Asset',
assetType:'Asset Type', assetType:'Asset type',
modelStat:'Model', modelStat:'Model',
dcStat:'Data Center', dcStat:'Data center',
num:'Num', num:'Num',
alert:'Alert', alert:'Alert',
alertTotal:'Total', alertTotal:'Total',
alertLow:'Low', alertLow:'Low',
alertMedium:'Medium', alertMedium:'Medium',
alertHigh:'High', alertHigh:'High',
inStock:'In Stock', inStock:'In stock',
outStock:'Out Stock', outStock:'Out stock',
pingUp:'Up', pingUp:'Up',
pingDown:'Down', pingDown:'Down',
host:'Host', host:'Host',
@@ -239,15 +239,15 @@ const en = {
endpoint:'Endpoint', endpoint:'Endpoint',
}, },
dataCenter:{ dataCenter:{
dataCenter:'Data Center', dataCenter:'Data center',
cabinet:'Cabinet', cabinet:'Cabinet',
promServer:'Prom Server', promServer:'Prom server',
}, },
alert:{ alert:{
level:'Level', level:'Level',
alertRule:'Alert Rule', alertRule:'Alert rule',
ruleNum:'Rule Num', ruleNum:'Rule num',
alertNum:'Alert Num', alertNum:'Alert num',
alertRuleTopN:'According to Alert Rule', alertRuleTopN:'According to Alert Rule',
assetTopN:'According to Asset', assetTopN:'According to Asset',
top:'Top', top:'Top',
@@ -279,14 +279,14 @@ const en = {
required: 'Required',//'必填项' required: 'Required',//'必填项'
number: 'Numberic',//'必须是数字' number: 'Numberic',//'必须是数字'
integer:'Integer', integer:'Integer',
positiveInteger:'Positive Integer', positiveInteger:'Positive integer',
email:'Invalid email',//'不合法的E-mail地址' email:'Invalid email',//'不合法的E-mail地址'
tel:'Invalid phone number',//'不合法的电话号码' tel:'Invalid phone number',//'不合法的电话号码'
host:'Invalid IP',//'不合法的IP' host:'Invalid IP',//'不合法的IP'
domain:'Invalid domain', domain:'Invalid domain',
usize:'Must be number(1 - 49)', usize:'Must be number(1 - 49)',
fileSize:'文件过大',//File exceed max size. fileSize:'文件过大',//File exceed max size.
port:'Invalid Port', port:'Invalid port',
url:'Invalid URL', url:'Invalid URL',
uSize:'Must be number(1 - 47)', uSize:'Must be number(1 - 47)',
requiredIdc:'dc is required' requiredIdc:'dc is required'
@@ -306,8 +306,8 @@ const en = {
coverSuccess: 'Override success',//'覆盖成功' coverSuccess: 'Override success',//'覆盖成功'
refreshLater:'Refresh later',//'请稍后刷新' refreshLater:'Refresh later',//'请稍后刷新'
testSuccess:'Test success', testSuccess:'Test success',
downloadSuccess : 'Download Success', downloadSuccess : 'Download success',
uploadSuccess: 'Upload Success', uploadSuccess: 'Upload success',
pressEnterToAdd: 'Press enter to add new line', pressEnterToAdd: 'Press enter to add new line',
resetSuccess:'Reset success', resetSuccess:'Reset success',
}, },
@@ -320,8 +320,8 @@ const en = {
assetStatDown:'Never', assetStatDown:'Never',
pingInactive:'inactive', pingInactive:'inactive',
left:{ left:{
dataCenter:'Data Center', dataCenter:'Data center',
assetType:'Asset Type', assetType:'Asset type',
vendor:'Vendor', vendor:'Vendor',
ping:'Ping', ping:'Ping',
}, },
@@ -518,11 +518,11 @@ const en = {
editAccount: 'Edit account',//"编辑用户" editAccount: 'Edit account',//"编辑用户"
notCurrentlySupport: 'Not available',//'暂不支持' notCurrentlySupport: 'Not available',//'暂不支持'
password: 'Password',//'密码' password: 'Password',//'密码'
oldPwd:'Old Password', oldPwd:'Old password',
inputOldPwd:'Please input old password', inputOldPwd:'Please input old password',
newPwd:'New password', newPwd:'New password',
inputNewPwd:'Please input new password', inputNewPwd:'Please input new password',
confirmPwd:'Confirm Password', confirmPwd:'Confirm password',
inputConfirmPwd:'Please input confirm password', inputConfirmPwd:'Please input confirm password',
invalidPwd:'invalide password,the length at least 6', invalidPwd:'invalide password,the length at least 6',
confirmPwdErr:'The two passwords are inconsistent', confirmPwdErr:'The two passwords are inconsistent',
@@ -538,7 +538,7 @@ const en = {
checkTime: 'Check time' checkTime: 'Check time'
}, },
dc: { dc: {
dc: 'Data Center', dc: 'Data center',
area: "Area", area: "Area",
selectArea: 'Select area', selectArea: 'Select area',
cabinetNum: "Cabinet number", cabinetNum: "Cabinet number",
@@ -547,7 +547,7 @@ const en = {
cabinets: "Cabinets" cabinets: "Cabinets"
}, },
model: { model: {
model: 'Asset Model', model: 'Asset model',
vendor: 'Vendor', vendor: 'Vendor',
assets: "Assets", assets: "Assets",
editModel: 'Edit model', editModel: 'Edit model',
@@ -556,7 +556,7 @@ const en = {
type: 'Type' type: 'Type'
}, },
terminallog: { terminallog: {
terminallog: 'Terminal Log', terminallog: 'Terminal log',
status: 'Status',//"状态" status: 'Status',//"状态"
option: 'Operation',//"操作", option: 'Operation',//"操作",
host: 'Host', host: 'Host',
@@ -566,10 +566,10 @@ const en = {
protocol: 'Protocol', protocol: 'Protocol',
user: 'User', user: 'User',
detail: 'Terminal Log Detail', detail: 'Terminal Log Detail',
resize: 'Terminal Resize', resize: 'Terminal resize',
download: 'Terminal Download', download: 'Terminal download',
upload: 'Terminal Upload', upload: 'Terminal upload',
selectFile: 'Select File', selectFile: 'Select file',
SSH: 'SSH', SSH: 'SSH',
TELNET: 'TELNET', TELNET: 'TELNET',
id: 'ID', id: 'ID',
@@ -585,7 +585,7 @@ const en = {
fail: 'Fail' fail: 'Fail'
}, },
operationlog: { operationlog: {
operationlog: 'Operation Log', operationlog: 'Operation log',
id : 'ID', id : 'ID',
username: 'User', username: 'User',
operation: 'Operation', operation: 'Operation',
@@ -597,13 +597,13 @@ const en = {
mib:'SNMP MIB', mib:'SNMP MIB',
fileName:'FileName', fileName:'FileName',
remark:'Remark', remark:'Remark',
updateUser:'Update User', updateUser:'Update user',
updateAt:'Update Time', updateAt:'Update time',
editMib:'Edit MIB', editMib:'Edit MIB',
models:'Models', models:'Models',
modelTip:'please select models', modelTip:'please select models',
createMib:'Create MIB', createMib:'Create MIB',
mibFiles:'MIB File', mibFiles:'MIB file',
uploadTip:'please upload MIB file', uploadTip:'please upload MIB file',
requiredMibFile:'MIB file is required', requiredMibFile:'MIB file is required',
vendor:'Vendor', vendor:'Vendor',
@@ -616,28 +616,28 @@ const en = {
basic:{ basic:{
basic:'Basic', basic:'Basic',
alertApi:'Alert API', alertApi:'Alert API',
assetPingSwith:'Asset Ping', assetPingSwith:'Asset ping',
assetPingInterval:'Interval', assetPingInterval:'Interval',
exporterTarget:'Exporter Path', exporterTarget:'Exporter path',
scrapeInterval:'Scrape Interval', scrapeInterval:'Scrape interval',
storageRetention:'Local Retention', storageRetention:'Local retention',
systemName:'System Name', systemName:'System name',
curUrl:'Current site URL', curUrl:'Current site URL',
timezone:'Timezone', timezone:'Timezone',
defaultCabinetUsize:'Cabinet U Size' defaultCabinetUsize:'Cabinet U Size'
}, },
email:{ email:{
email:'Email', email:'Email',
enable:'Enable Email', enable:'Enable email',
smtpHost:'SMTP Host', smtpHost:'SMTP host',
smtpPort:'SMTP Port', smtpPort:'SMTP port',
smtpAccount:'SMTP Account', smtpAccount:'SMTP account',
smtpPwd:'SMTP Password', smtpPwd:'SMTP password',
sendAccount:'Send Account', sendAccount:'Send account',
testAccount:'Test Account', testAccount:'Test account',
useSSL:'SSL', useSSL:'SSL',
useTLS:'TLS', useTLS:'TLS',
testConnection:'Test Connection', testConnection:'Test connection',
pwdTip:'Tip:Some email providers need to enter token', pwdTip:'Tip:Some email providers need to enter token',
sendAccountTip:'Tip:The SMTP account is used as the sending account by default', sendAccountTip:'Tip:The SMTP account is used as the sending account by default',
testAccountTip:'Tip:Used only as test mail recipient', testAccountTip:'Tip:Used only as test mail recipient',
@@ -650,11 +650,11 @@ const en = {
}, },
ldap:{ ldap:{
ldap:'LDAP', ldap:'LDAP',
address:'LDAP Address', address:'LDAP address',
dn:'Bind DN', dn:'Bind DN',
pwd:'Password', pwd:'Password',
ou:'User OU', ou:'User OU',
filter:'User Filter', filter:'User filter',
map:'LDAP Field Mapping', map:'LDAP Field Mapping',
active:'LDAP Authentication' active:'LDAP Authentication'
}, },
@@ -664,7 +664,7 @@ const en = {
pwd:'Password', pwd:'Password',
metric:'metric', metric:'metric',
alert:'alert', alert:'alert',
sysConfig:'system config', sysConfig:'System config',
pwdTip:'Please input your password', pwdTip:'Please input your password',
promptTitle:'Confirm', promptTitle:'Confirm',
yes:'Yes', yes:'Yes',
@@ -750,8 +750,8 @@ const en = {
} }
}, },
endpoint: { endpoint: {
createEndpoint: 'New Endpoint',//"新增Endpoint" createEndpoint: 'New endpoint',//"新增Endpoint"
editEndpoint: 'Edit Endpoint',//"编辑Endpoint" editEndpoint: 'Edit endpoint',//"编辑Endpoint"
endpoint: 'Endpoint',//"Endpoint" endpoint: 'Endpoint',//"Endpoint"
endpointId: 'Endpoint ID',//"Endpoint ID" endpointId: 'Endpoint ID',//"Endpoint ID"
host: 'Host',//"Host" host: 'Host',//"Host"
@@ -759,9 +759,9 @@ const en = {
param: 'Parameter',//"参数" param: 'Parameter',//"参数"
path: 'Path',//"路径" path: 'Path',//"路径"
asset: 'Asset',//"设备" asset: 'Asset',//"设备"
lastUpdate: 'Last Reply',//"最后更新时间" lastUpdate: 'Last reply',//"最后更新时间"
moduleParameter: 'Module',//"组件参数" moduleParameter: 'Module',//"组件参数"
addGraph: 'View Graph', //添加图标 addGraph: 'View graph', //添加图标
element: 'Element', element: 'Element',
value: 'Value', value: 'Value',
promExpr: 'Please input expression', promExpr: 'Please input expression',

9
nezha-fronted/src/components/common/leftMenu.vue
View File

@@ -4,7 +4,7 @@
<slot name="content-left"></slot> <slot name="content-left"></slot>
<div @click="toggleStat" class="bottom-icon"> <div @click="toggleStat" class="bottom-icon">
<div class="bottom-divider"></div> <div class="bottom-divider"></div>
<div style="display: inline-block;float: right"><i style="font-size: 16px;" :class="{'nz-icon nz-icon-push-pin-line':isShrink,'nz-icon nz-icon-push-pin-fill':!isShrink}" :style="{color:!isShrink?'#EE9D3F':''}"></i></div> <div style="display: inline-block;float: right"><i style="font-size: 24px;" :class="{'nz-icon nz-icon-push-pin-line':isShrink,'nz-icon nz-icon-push-pin-fill':!isShrink}" :style="{color:!isShrink?'#EE9D3F':''}"></i></div>
</div> </div>
</div> </div>
<div class="content-right right-slot" :class="{'right-slot-open':isShrink}"> <div class="content-right right-slot" :class="{'right-slot-open':isShrink}">
@@ -49,6 +49,7 @@
} }
.content .left-slot{ .content .left-slot{
position: relative; position: relative;
background-color: #e2e2e2;
/*border-bottom: 1px solid #eeeeee;*/ /*border-bottom: 1px solid #eeeeee;*/
/*transition: all 100ms;*/ /*transition: all 100ms;*/
} }
@@ -60,9 +61,6 @@
.content .left-slot-shrink{ .content .left-slot-shrink{
width: 25px; width: 25px;
padding: 0px; padding: 0px;
.bottom-icon{
margin-left: 5px;
}
.bottom-icon .bottom-divider{ .bottom-icon .bottom-divider{
width: 0px; width: 0px;
} }
@@ -81,7 +79,7 @@
.left-slot .bottom-icon i{ .left-slot .bottom-icon i{
visibility: hidden; visibility: hidden;
} }
.left-slot .bottom-icon:hover{ .left-slot:hover{
i{ i{
visibility: visible; visibility: visible;
} }
@@ -102,7 +100,6 @@
width: 200px; width: 200px;
padding: 0px 0px 0px 15px; padding: 0px 0px 0px 15px;
position: absolute; position: absolute;
background-color: #FFF;
z-index: 100; z-index: 100;
.slot-content{ .slot-content{
visibility: visible; visibility: visible;

6
nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
View File

@@ -627,7 +627,9 @@
}, },
currentProject(n, o) { currentProject(n, o) {
this.endpointForm.projectId = n.id; this.endpointForm.projectId = n.id;
this.getModuleList(n.id); if(this.rightBox.show){
this.getModuleList(n.id);
}
}, },
currentModule: { currentModule: {
immediate: true, immediate: true,
@@ -696,7 +698,7 @@
border: none; border: none;
} }
.param-box-row { .param-box-row {
padding: 7px 0 0 0; padding: 7px 10px 0 10px;
position: relative; position: relative;
} }
.param-box-row:last-of-type { .param-box-row:last-of-type {

2
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -28,7 +28,7 @@
<!-- </idc-config-box>--> <!-- </idc-config-box>-->
<!--</el-checkbox> <!--</el-checkbox>
</el-checkbox-group>--> </el-checkbox-group>-->
<el-collapse v-model="activeType"> <el-collapse v-model="activeType" class="left-menu-bg">
<el-collapse-item name="dataCenter" :title="$t('asset.left.dataCenter')"> <el-collapse-item name="dataCenter" :title="$t('asset.left.dataCenter')">
<el-checkbox-group v-model="checkList" size="small" @change="changeCheckBox"> <el-checkbox-group v-model="checkList" size="small" @change="changeCheckBox">
<el-checkbox class="sidebar-info-item" :class="{'sidebar-info-item-active': indOf(checkList, item.id)}" <el-checkbox class="sidebar-info-item" :class="{'sidebar-info-item-active': indOf(checkList, item.id)}"

68
nezha-fronted/src/components/page/project/project.vue
View File

@@ -24,7 +24,7 @@
<left-menu > <left-menu >
<div slot="content-left" class="slot-content"> <div slot="content-left" class="slot-content">
<el-scrollbar ref="leftScrollbar" style="height: 100%"> <el-scrollbar ref="leftScrollbar" style="height: 100%">
<div class="sidebar-title too-long-split">{{$t('project.project.project')}}</div> <div class="sidebar-title too-long-split" style="ma">{{$t('project.project.project')}}</div>
<!--<div class="sidebar-info"> <!--<div class="sidebar-info">
<div <div
v-for="item in moduleList" v-for="item in moduleList"
@@ -42,12 +42,13 @@
<div v-show="item.buildIn != 1" class="hid-div side-bar-menu-edit" @click.stop="toEditModule(item)" :id="'project-module-edit-'+item.id" ><i class="nz-icon nz-icon-edit"></i></div> <div v-show="item.buildIn != 1" class="hid-div side-bar-menu-edit" @click.stop="toEditModule(item)" :id="'project-module-edit-'+item.id" ><i class="nz-icon nz-icon-edit"></i></div>
</div> </div>
</div>--> </div>-->
<el-collapse v-model="currentProjectTitle" class="sidebar-info" accordion style="padding-top:0px;" @change="projectChange" ref="projectLeft"> <div class="sidebar-info">
<el-collapse v-model="currentProjectTitle" class="left-menu-bg" accordion style="padding-top:0px;" @change="projectChange" ref="projectLeft">
<el-collapse-item v-for="(item,index) in projectList" :key="item.name+item.id+index" :name="item.name+'-'+item.id"> <el-collapse-item v-for="(item,index) in projectList" :key="item.name+item.id+index" :name="item.name+'-'+item.id">
<template slot="title"> <template slot="title">
<div class="sidebar-info-item" :class="{'sidebar-info-item-active': item.name+'-'+item.id==currentProjectTitle || item.id==currentProject.id}" @click.stop="detailProjectInfo($event,item)" :id="'project-module-'+item.id"> <div class="sidebar-info-item" :class="{'sidebar-info-item-active': item.name+'-'+item.id==currentProjectTitle || item.id==currentProject.id}" @click.stop="detailProjectInfo($event,item)" :id="'project-module-'+item.id">
<div class="sidebar-info-item-txt"> <div class="sidebar-info-item-txt">
<el-popover v-if="item.name.length > 14" trigger="hover" placement="top-start" :content="item.name" > <el-popover v-if="item.name.length > 14" trigger="hover" placement="top-start" :content="item.name" popper-class="transparent-pop">
<span slot="reference" class=""> <span slot="reference" class="">
{{item.name}} {{item.name}}
</span> </span>
@@ -69,6 +70,7 @@
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div>
</el-scrollbar> </el-scrollbar>
</div> </div>
@@ -336,27 +338,29 @@
this.tablelable = data; this.tablelable = data;
}, },
getEndpointTableData() { getEndpointTableData() {
this.pageType='endpoint' if(this.currentModule&&this.currentModule.id){
this.endpointSearchLabel.moduleId = this.currentModule.id; this.pageType='endpoint'
this.$set(this.endpointSearchLabel, 'pageNo', this.endpointPageObj.pageNo); this.endpointSearchLabel.moduleId = this.currentModule.id;
this.$set(this.endpointSearchLabel, 'pageSize', this.endpointPageObj.pageSize); this.$set(this.endpointSearchLabel, 'pageNo', this.endpointPageObj.pageNo);
this.$get('endpoint', this.endpointSearchLabel).then(response => { this.$set(this.endpointSearchLabel, 'pageSize', this.endpointPageObj.pageSize);
if (response.code === 200) { this.$get('endpoint', this.endpointSearchLabel).then(response => {
for (let i = 0; i < response.data.list.length; i++) { if (response.code === 200) {
try { for (let i = 0; i < response.data.list.length; i++) {
let tempObj = JSON.parse(response.data.list[i].param); try {
response.data.list[i].paramObj = []; let tempObj = JSON.parse(response.data.list[i].param);
for (let k in tempObj) { response.data.list[i].paramObj = [];
response.data.list[i].paramObj.push({key: k, value: tempObj[k]}) for (let k in tempObj) {
response.data.list[i].paramObj.push({key: k, value: tempObj[k]})
}
} catch (err) {
//console.error(response.data.list[i], err);
} }
} catch (err) {
//console.error(response.data.list[i], err);
} }
this.endpointTableData = response.data.list;
this.endpointPageObj.total = response.data.total;
} }
this.endpointTableData = response.data.list; });
this.endpointPageObj.total = response.data.total; }
}
});
}, },
endpointPageNo(val) { endpointPageNo(val) {
this.endpointPageObj.pageNo = val; this.endpointPageObj.pageNo = val;
@@ -418,7 +422,8 @@
}) })
}, },
getProjectModule:function(projectId){ getProjectModule:function(projectId){
return this.moduleList.filter((item,index)=>{ let moduleList=Object.assign([],this.moduleList);
return moduleList.filter((item,index)=>{
return item.project.id==projectId; return item.project.id==projectId;
}) })
}, },
@@ -429,8 +434,10 @@
currentProjectId=Number.parseInt(currentProjectId); currentProjectId=Number.parseInt(currentProjectId);
let moduleList=this.getProjectModule(currentProjectId); let moduleList=this.getProjectModule(currentProjectId);
this.currentModule=moduleList[0]; this.currentModule=moduleList[0];
this.currentProject=this.projectList.find((item)=>{
return item.id == currentProjectId
})
this.getEndpointTableData(); this.getEndpointTableData();
this.currentProject=this.projectList.find((item)=>{return item.id == currentProjectId})
// this.$store.commit('setProject',null) // this.$store.commit('setProject',null)
} }
}, },
@@ -445,7 +452,7 @@
} }
}, },
getAllModuleList:function(){ getAllModuleList:function(){
this.$get('module', {projectId: this.currentProject.id, pageSize: -1, pageNo: 1}).then(response => { this.$get('module', { pageSize: -1, pageNo: 1}).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.moduleList = response.data.list; this.moduleList = response.data.list;
for (let i = 0; i < this.moduleList.length; i++) { for (let i = 0; i < this.moduleList.length; i++) {
@@ -720,7 +727,7 @@
if (pageSize) { if (pageSize) {
this.endpointPageObj.pageSize = pageSize this.endpointPageObj.pageSize = pageSize
} }
this.detailProjectInfo({});
// setTimeout(()=>{ // setTimeout(()=>{
// this.getEndpointTableData(); // this.getEndpointTableData();
// }, 200); // }, 200);
@@ -760,9 +767,11 @@
}, },
}, },
watch: { watch: {
currentProjectChange(n, o) { currentProjectChange:{
this.currentProject = Object.assign({}, n); handler(n, o) {
this.detailProjectInfo({}); this.currentProject = Object.assign({}, n);
this.detailProjectInfo({});
}
}, },
currentProject(n, o) { currentProject(n, o) {
// this.getModuleList(); // this.getModuleList();
@@ -1108,4 +1117,7 @@
top: 50%; top: 50%;
left: 48.5%; left: 48.5%;
} }
.project .sidebar-info-item{
margin:0px !important;
}
</style> </style>