|
@@ -2043,10 +2043,24 @@ export default {
|
|
|
// index
|
|
|
// );
|
|
|
// });
|
|
|
- const result = [];
|
|
|
+ let result = [];
|
|
|
for (var wi = 0; wi < Object.keys(workJson).length; wi++) {
|
|
|
result.push(workJson[Object.keys(workJson)[wi]]);
|
|
|
}
|
|
|
+ var resultNewArray = result.sort(function (x, y) {
|
|
|
+ // 以stagetask字段为排序依据
|
|
|
+ var x_parts = x.stagetask.split("-");
|
|
|
+ var y_parts = y.stagetask.split("-");
|
|
|
+
|
|
|
+ // 首先比较第一个数字
|
|
|
+ if (x_parts[0] !== y_parts[0]) {
|
|
|
+ return parseInt(x_parts[0]) - parseInt(y_parts[0]);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 如果第一个数字相同,则比较第二个数字
|
|
|
+ return parseInt(x_parts[1]) - parseInt(y_parts[1]);
|
|
|
+ });
|
|
|
+ result = resultNewArray
|
|
|
for (var l = 0; l < b.length; l++) {
|
|
|
if (workEvaList.length > 0) {
|
|
|
for (var p = 0; p < workEvaList.length; p++) {
|