mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mesxc-zjl #366

Merged
juzi merged 2 commits from projects/mesxc-zjl into projects/mesxc-test 2024-04-25 11:09:31 +08:00
Conversation 0 Commits 2 Files Changed 2 +12 -11
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bf4bab2f3c - Show all commits

16
src/views/databoard/deepProcessing/EqAlarm.vue
View File

@ -32,11 +32,11 @@ export default {
return { return {
timestr: '', timestr: '',
config: { config: {
header: ['序号', '设备名称', '设备编码', '设备状态', '是否故障'], header: ['序号', '设备名称', '产线名', '设备状态'],
headerBGC: 'rgba(32, 55, 96, 0.8)', headerBGC: 'rgba(32, 55, 96, 0.8)',
oddRowBGC: 'rgba(32, 55, 96, 0.8)', oddRowBGC: 'rgba(32, 55, 96, 0.8)',
evenRowBGC: 'rgba(14, 32, 62, 0.8)', evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60, 150, 190], columnWidth: [60, 280, 120],
align: ['center'], align: ['center'],
data: [], data: [],
// data: [ // data: [
@ -64,7 +64,7 @@ export default {
let outArr = this.sjgEquipment.map((item, index) => [ let outArr = this.sjgEquipment.map((item, index) => [
index + 1, index + 1,
`<span title=${item.name || ''}>${item.name || ''}</span>`, `<span title=${item.name || ''}>${item.name || ''}</span>`,
`<span title=${item.code || ''}>${item.code || ''}</span>`, `<span title=${item.lineName || ''}>${item.lineName || ''}</span>`,
`<span><div style="${ `<span><div style="${
item.status == '运行' item.status == '运行'
? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
@ -72,11 +72,11 @@ export default {
? 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 ' ? 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 '
: 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 '
}"></div> ${item.status || ''}</span>`, }"></div> ${item.status || ''}</span>`,
`<span"><div style="${ // `<span"><div style="${
item.error == false // item.error == false
? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' // ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
: 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 ' // : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 '
}"></div> ${item.error == true ? '是' : '否' || ''}</span>`, // }"></div> ${item.error == true ? '是' : '否' || ''}</span>`,
]); ]);
this.config.data = outArr; this.config.data = outArr;
this.$refs['eqScrollBoard'].updateRows(outArr); this.$refs['eqScrollBoard'].updateRows(outArr);

7
src/views/databoard/kiln/GasHandle.vue
View File

@ -80,7 +80,7 @@
</span> </span>
</ShadowRect> </ShadowRect>
<ShadowRect> <!-- <ShadowRect>
<span <span
style=" style="
font-size: 20px; font-size: 20px;
@ -99,7 +99,7 @@
: '' : ''
}}mg/m³ }}mg/m³
</span> </span>
</ShadowRect> </ShadowRect> -->
</div> </div>
<KilnLine :horizontal="true" /> <KilnLine :horizontal="true" />
<div <div
@ -130,8 +130,9 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
"> ">
<!-- :options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']" -->
<SelectorBtnGroup <SelectorBtnGroup
:options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']" :options="['氧气含量', '二氧化硫', '氮氧化物']"
@emitFun="toggleType" @emitFun="toggleType"
:active="chartType" /> :active="chartType" />
<SelectorBtnGroup <SelectorBtnGroup