Merge pull request 'projects/mesxc-zhp' (#297) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #297
This commit is contained in:
commit
9aca4874c1
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2021-07-19 15:18:30
|
* @Date: 2021-07-19 15:18:30
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-03-29 16:49:09
|
* @LastEditTime: 2024-04-02 09:46:46
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -417,9 +417,25 @@ export default {
|
|||||||
`<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
|
`<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
|
||||||
]);
|
]);
|
||||||
this.eqConfig.data = eqArr;
|
this.eqConfig.data = eqArr;
|
||||||
|
let arr = ['D64', 'D62', 'D61', 'D63', 'D65']
|
||||||
|
// let arr = [5, 6, 2, 4, 7, 9, 15];
|
||||||
|
// 因为7个数,所以长度减去一次为最大循环次数
|
||||||
|
for (let i = 0; i < arr.length - 1; i++) {
|
||||||
|
// 二次循环,注意:再减去外层的循环次数,向后依次两两相互比较转换;
|
||||||
|
for (let j = 0; j < arr.length - i - 1; j++) {
|
||||||
|
// 当前一个值大于后一个值
|
||||||
|
if (arr[j].substr(arr[j].length - 1, 1) > arr[j + 1].substr(arr[j + 1].length - 1, 1)) {
|
||||||
|
// 定义变量,以赋值的形式前后交换,直到换到最小的在前面,左右再无比较,则循环结束形成排序结果
|
||||||
|
let temp = arr[j];
|
||||||
|
arr[j] = arr[j + 1];
|
||||||
|
arr[j + 1] = temp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
console.log(arr);
|
||||||
this.$refs['eqScrollBoard'].updateRows(eqArr);
|
this.$refs['eqScrollBoard'].updateRows(eqArr);
|
||||||
this.$refs.productLineChart.initChart(
|
this.$refs.productLineChart.initChart(
|
||||||
['D61', 'D62', 'D63', 'D64', 'D65'],
|
arr,
|
||||||
[98, 97, 98.7, 98.5, 98.3],
|
[98, 97, 98.7, 98.5, 98.3],
|
||||||
[3134, 2323, 3232, 3233, 2321]
|
[3134, 2323, 3232, 3233, 2321]
|
||||||
);
|
);
|
||||||
@ -655,6 +671,19 @@ export default {
|
|||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
});
|
});
|
||||||
|
// let arr = ['D64', 'D62', 'D61', 'D63', 'D65']
|
||||||
|
for (let i = 0; i < nameList.length - 1; i++) {
|
||||||
|
// 二次循环,注意:再减去外层的循环次数,向后依次两两相互比较转换;
|
||||||
|
for (let j = 0; j < nameList.length - i - 1; j++) {
|
||||||
|
// 当前一个值大于后一个值
|
||||||
|
if (nameList[j].substr(nameList[j].length - 1, 1) > nameList[j + 1].substr(nameList[j + 1].length - 1, 1)) {
|
||||||
|
// 定义变量,以赋值的形式前后交换,直到换到最小的在前面,左右再无比较,则循环结束形成排序结果
|
||||||
|
let temp = nameList[j];
|
||||||
|
nameList[j] = nameList[j + 1];
|
||||||
|
nameList[j + 1] = temp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.productLineChart.initChart(
|
this.$refs.productLineChart.initChart(
|
||||||
nameList,
|
nameList,
|
||||||
|
Loading…
Reference in New Issue
Block a user