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

fix:项目不分页数据访问统一设置pageSize为-1

Browse Source
This commit is contained in:
wangwenrui
2020-04-15 19:40:09 +08:00
parent d342d7a782
commit cf083ea965
11 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/header.vue
View File

@@ -396,7 +396,7 @@
}
},
getAssetData() {
this.$get('idc', this.pageObj).then(response => {
this.$get('idc', {pageSize:-1}).then(response => {
if (response.code == 200) {
this.assetData = response.data.list
this.assetData.forEach(item => {
@@ -418,7 +418,7 @@
})
},
getProjectList() {
this.$get('project', {}).then(response => {
this.$get('project', {pageSize:-1}).then(response => {
if (response.code == 200) {
this.projectData = response.data.list;
let flag = false;

4
nezha-fronted/src/components/common/language/cn.js
View File

@@ -668,8 +668,8 @@ const cn = {
},
alert: {
alert: "告警",
message: "信息",
rule: "规则",
message: "告警信息",
rule: "告警规则",
alertList: "告警信息",
alertConfig: "告警规则",
alertName: "告警名称",

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

@@ -255,7 +255,7 @@
editParamBox: {show: false, top: 0, left: 0, type: 0}, //param编辑弹框
moduleParamShow: false, //module默认参数param悬浮窗
assetSearch: {host: '', sn: '', text: '', label: 'IP', dropdownShow: false}, //侧滑框中asset的搜索相关
assetPageObj: {pageNo: 1, pageSize: 9999},
assetPageObj: {pageNo: 1, pageSize: -1},
selectedAssets: [], //侧滑框中选中的asset
projectList: [],
moduleList: [],
@@ -402,7 +402,7 @@
/*获取project列表*/
getProjectList() {
this.$get('project', {pageSize: 999, pageNo: 1}).then(response => {
this.$get('project', {pageSize: -1, pageNo: 1}).then(response => {
if (response.code === 200) {
this.projectList = response.data.list;
if (this.moduleList.length == 0) {

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

@@ -320,7 +320,7 @@
},
getProjectList() {
this.$get('project', {pageNo: 1, pageSize: 9999}).then(response => {
this.$get('project', {pageNo: 1, pageSize: -1}).then(response => {
if (response.code == 200) {
this.linkObjList = response.data.list;
}
@@ -328,7 +328,7 @@
},
getModuleList() {
this.$get('module', {pageNo: 1, pageSize: 9999}).then(response => {
this.$get('module', {pageNo: 1, pageSize: -1}).then(response => {
if (response.code == 200) {
this.linkObjList = response.data.list;
}
@@ -336,7 +336,7 @@
},
getAssetList() {
this.$get('asset', {pageNo: 1, pageSize: 9999}).then(response => {
this.$get('asset', {pageNo: 1, pageSize: -1}).then(response => {
if (response.code == 200) {
this.linkObjList = response.data.list;
}

2
nezha-fronted/src/components/common/rightBox/assetBox.vue
View File

@@ -706,7 +706,7 @@
},
getAllModelOptionData(data) {
this.assetData.assetType = this.assetType;
this.$get('model?typeCode=' + this.assetType + '&pageNo=1&pageSize=999').then(response => {
this.$get('model?typeCode=' + this.assetType + '&pageNo=1&pageSize=-1').then(response => {
if (response.code === 200) {
this.allModelUlData = response.data.list
}

2
nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
View File

@@ -280,7 +280,7 @@
/*获取project列表*/
getProjectList() {
this.$get('project', {pageSize: 999, pageNo: 1}).then(response => {
this.$get('project', {pageSize: -1, pageNo: 1}).then(response => {
if (response.code === 200) {
this.projectList = response.data.list;
if ((!this.currentProject || !this.currentProject.id) && this.projectList.length > 0) {

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

@@ -495,21 +495,21 @@
}
},
getDcData() {
this.$get('idc', {pageNo: 1, pageSize: 999}).then(response => {
this.$get('idc', {pageNo: 1, pageSize: -1}).then(response => {
if (response.code === 200) {
this.dcSelect = response.data.list;
}
});
},
getAssetData() {
this.$get('asset', {pageNo: 1, pageSize: 999}).then(response => {
this.$get('asset', {pageNo: 1, pageSize: -1}).then(response => {
if (response.code === 200) {
this.assetSelect = response.data.list;
}
});
},
getModelData() {
this.$get('asset', {pageNo: 1, pageSize: 999}).then(response => {
this.$get('asset', {pageNo: 1, pageSize: -1}).then(response => {
if (response.code === 200) {
this.assetSelect = response.data.list;
}

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

@@ -777,7 +777,7 @@
},
getAllModelOptionData(data) {
this.assetData.assetType = this.assetType;
this.$get('model?typeCode=' + this.assetType + '&pageNo=1&pageSize=999').then(response => {
this.$get('model?typeCode=' + this.assetType + '&pageNo=1&pageSize=-1').then(response => {
if (response.code === 200) {
this.allModelUlData = response.data.list
}

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

@@ -46,7 +46,7 @@ export default {
moduleList: [],
pageObj: {
pageNo: 1,
pageSize: 999,
pageSize: -1,
name: '',
assetId: this.assetId
}

11
nezha-fronted/src/components/page/config/system.vue
View File

@@ -65,7 +65,7 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-min-width-100" @click="resetForm('basicForm')" style="top:2px">{{$t('overall.reset')}}</el-button>
<el-button class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-min-width-100" @click="resetForm('basicForm')" style="top:2px">{{$t('overall.clear')}}</el-button>
<el-button type="primary" @click="saveSetInfo('basic','basicForm')" class="nz-btn nz-btn-size-normal nz-btn-style-normal nz-btn-min-width-100">{{$t('overall.submit')}}</el-button>
</el-form-item>
</el-form>
@@ -111,8 +111,8 @@
</el-row>
</el-form-item>
<el-form-item>
<el-button class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-min-width-100" @click="resetForm('emailForm')" style="top:2px">{{$t('overall.reset')}}</el-button>
<el-button class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-min-width-100" @click="testSetInfo('email','emailForm')" style="top:2px">{{$t('config.system.email.testConnection')}}</el-button>
<el-button class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-min-width-100" @click="resetForm('emailForm')" style="top:2px">{{$t('overall.clear')}}</el-button>
<el-button class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-min-width-100" :class="{'nz-btn-disabled':email.email_enable == 'off'}" :disabled="email.email_enable == 'off'" @click="testSetInfo('email','emailForm')" style="top:2px">{{$t('config.system.email.testConnection')}}</el-button>
<el-button type="primary" @click="saveSetInfo('email','emailForm')" class="nz-btn nz-btn-size-normal nz-btn-style-normal nz-btn-min-width-100">{{$t('overall.submit')}}</el-button>
</el-form-item>
</el-form>
@@ -155,7 +155,7 @@
<el-input v-model="ldap.ldap_mapping"></el-input>
</el-form-item>
<el-form-item>
<el-button class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-min-width-100" @click="resetForm('ldapForm')" style="top:2px">{{$t('overall.reset')}}</el-button>
<el-button class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-min-width-100" @click="resetForm('ldapForm')" style="top:2px">{{$t('overall.clear')}}</el-button>
<el-button class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-min-width-100" @click="testSetInfo('ldap','ldapForm')" style="top:2px">{{$t('config.system.email.testConnection')}}</el-button>
<el-button type="primary" @click="saveSetInfo('ldap','ldapForm')" class="nz-btn nz-btn-size-normal nz-btn-style-normal nz-btn-min-width-100">{{$t('overall.submit')}}</el-button>
</el-form-item>
@@ -358,6 +358,9 @@
for(let key in sets){
this[type][key]=sets[key];
}
if(type == 'email'){
this.$refs.emailForm.clearValidate();
}
}
})
},

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

@@ -610,7 +610,7 @@
getModuleList() {
//若currentProject不存在（如页面刷新了），默认取project列表的第一个
if (this.currentProject && this.currentProject.id) {
this.$get('module', {projectId: this.currentProject.id, pageSize: 999, pageNo: 1}).then(response => {
this.$get('module', {projectId: this.currentProject.id, pageSize: -1, pageNo: 1}).then(response => {
if (response.code === 200) {
this.moduleList = response.data.list;
for (let i = 0; i < this.moduleList.length; i++) {
@@ -635,7 +635,7 @@
if (this.projectList && this.projectList.length > 0) {
this.$store.commit('setProject', this.projectList[0]);
} else {
this.$get('project', {pageSize: 999, pageNo: 1}).then(response => {
this.$get('project', {pageSize: -1, pageNo: 1}).then(response => {
if (response.code == 200) {
this.projectList = response.data.list;
if (this.projectList.length > 0) {