projects/mesxc-zhp #300

Merged
juzi merged 3 commits from projects/mesxc-zhp into projects/mesxc-test 2024-04-02 15:03:51 +08:00
Showing only changes of commit c01106e389 - Show all commits

View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 16:50:26 * @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-04-02 13:55:46 * @LastEditTime: 2024-04-02 14:55:15
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -649,13 +649,12 @@ export default {
for (let i in this.funWsData.data.annealFanInfo) { for (let i in this.funWsData.data.annealFanInfo) {
index++, index++,
arr.push([ arr.push([
` `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
<span style="color:rgba(255,255,255,0.5)" >${index || ''}
</span>`, </span>`,
`<span style="color:rgba(255,255,255,0.5)" >${i || ''} // `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
</span>`, // </span>`,
`<span style="color:rgba(255,255,255,0.5)">${i.name || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${i.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${i.run || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.annealFanInfo[i] == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${this.funWsData.data.annealFanInfo[i] || ''}</span>`,
]) ])
} }
this.annealFunConfig.data = arr this.annealFunConfig.data = arr
@ -669,10 +668,10 @@ export default {
for (let i in this.funWsData.data.fanInfo) { for (let i in this.funWsData.data.fanInfo) {
index++, index++,
arr.push([ arr.push([
`<span style="color:rgba(255,255,255,0.5)" >${index || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
`<span style="color:rgba(255,255,255,0.5)" >${i || ''}</span>`, </span>`,
`<span style="color:rgba(255,255,255,0.5)">${i.name || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${i.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${i.run || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.fanInfo[i] == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${this.funWsData.data.fanInfo[i] || ''}</span>`,
]) ])
} }
this.funConfig.data = arr this.funConfig.data = arr