diff --git a/src/iscs/utils/parser.js b/src/iscs/utils/parser.js index 08fc4c9aa..6dacc418f 100644 --- a/src/iscs/utils/parser.js +++ b/src/iscs/utils/parser.js @@ -36,6 +36,11 @@ export function deviceFactory(type, elem) { export function parser(data) { var iscsDevice = {}; if (data) { + Object.values(data).forEach(list => { + if (list instanceof Array) { + list.sort((a, b) => parseInt(a.code.split('_')[1]) - parseInt(b.code.split('_')[1])); + } + }) zrUtil.each(data.manualAlarmButtonList || [], elem => { iscsDevice[elem.code] = deviceFactory(deviceType.ManualAlarmButton, elem); }, this); diff --git a/src/views/iscs/iscsDraw/icscComponents/line.vue b/src/views/iscs/iscsDraw/icscComponents/line.vue index a904dbc47..814b23117 100644 --- a/src/views/iscs/iscsDraw/icscComponents/line.vue +++ b/src/views/iscs/iscsDraw/icscComponents/line.vue @@ -5,7 +5,7 @@ - + diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue index ff7f5d03d..2b358bab4 100644 --- a/src/views/iscsSystem/index.vue +++ b/src/views/iscsSystem/index.vue @@ -180,7 +180,8 @@ export default { } else if (this.selected._type != 'CheckBox') { this.copyModel = this.copyModelInfo(this.selected, 10); const type1 = this.selected._type.charAt(0).toLowerCase() + this.selected._type.slice(1); - this.copyModel.code = getUID(this.selected._type, this.iscs[type1 + 'List'] || []); + const list = this.iscs[type1 + 'List'] || []; + this.copyModel.code = getUID(this.selected._type, list); } else { this.copyModel = {}; }