Compare commits
6 Commits
c48f81b1d9
...
082988d6d7
| Author | SHA1 | Date | |
|---|---|---|---|
|
082988d6d7 | ||
|
|
7acb861919 | ||
| c41153a946 | |||
| 6d658d9212 | |||
| bf4bab2f3c | |||
| 20f0efa413 |
@ -32,11 +32,11 @@ export default {
|
||||
return {
|
||||
timestr: '',
|
||||
config: {
|
||||
header: ['序号', '设备名称', '设备编码', '设备状态', '是否故障'],
|
||||
header: ['序号', '设备名称', '产线名', '设备状态'],
|
||||
headerBGC: 'rgba(32, 55, 96, 0.8)',
|
||||
oddRowBGC: 'rgba(32, 55, 96, 0.8)',
|
||||
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
|
||||
columnWidth: [60, 150, 190],
|
||||
columnWidth: [60, 280, 120],
|
||||
align: ['center'],
|
||||
data: [],
|
||||
// data: [
|
||||
@ -64,7 +64,7 @@ export default {
|
||||
let outArr = this.sjgEquipment.map((item, index) => [
|
||||
index + 1,
|
||||
`<span title=${item.name || ''}>${item.name || ''}</span>`,
|
||||
`<span title=${item.code || ''}>${item.code || ''}</span>`,
|
||||
`<span title=${item.lineName || ''}>${item.lineName || ''}</span>`,
|
||||
`<span><div style="${
|
||||
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 '
|
||||
@ -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 #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 '
|
||||
}"></div> ${item.status || ''}</span>`,
|
||||
`<span"><div style="${
|
||||
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 red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 '
|
||||
}"></div> ${item.error == true ? '是' : '否' || ''}</span>`,
|
||||
// `<span"><div style="${
|
||||
// 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 red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 '
|
||||
// }"></div> ${item.error == true ? '是' : '否' || ''}</span>`,
|
||||
]);
|
||||
this.config.data = outArr;
|
||||
this.$refs['eqScrollBoard'].updateRows(outArr);
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
</span>
|
||||
</ShadowRect>
|
||||
|
||||
<ShadowRect>
|
||||
<!-- <ShadowRect>
|
||||
<span
|
||||
style="
|
||||
font-size: 20px;
|
||||
@ -99,7 +99,7 @@
|
||||
: ''
|
||||
}}mg/m³
|
||||
</span>
|
||||
</ShadowRect>
|
||||
</ShadowRect> -->
|
||||
</div>
|
||||
<KilnLine :horizontal="true" />
|
||||
<div
|
||||
@ -130,8 +130,9 @@
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
">
|
||||
<!-- :options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']" -->
|
||||
<SelectorBtnGroup
|
||||
:options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']"
|
||||
:options="['氧气含量', '二氧化硫', '氮氧化物']"
|
||||
@emitFun="toggleType"
|
||||
:active="chartType" />
|
||||
<SelectorBtnGroup
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-18 10:01:33
|
||||
* @LastEditTime: 2024-04-25 10:18:08
|
||||
* @LastEditTime: 2024-04-25 13:40:51
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -195,7 +195,7 @@ export default {
|
||||
startPlaceholder: '开始时间',
|
||||
endPlaceholder: '结束时间',
|
||||
param: 'checkTime',
|
||||
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
|
||||
defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000],
|
||||
width: 350
|
||||
},
|
||||
{
|
||||
@ -232,9 +232,10 @@ export default {
|
||||
},
|
||||
created() { },
|
||||
mounted() {
|
||||
// this.formConfig[1].defaultSelect[]
|
||||
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
|
||||
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
|
||||
// this.formConfig[1].defaultSelect[0] =
|
||||
// this.formConfig[1].defaultSelect[0] =
|
||||
this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
|
||||
this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
|
||||
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
|
||||
this.getDataList()
|
||||
this.getDict()
|
||||
@ -462,8 +463,8 @@ export default {
|
||||
// this.listQuery.materialId = val.materialId ? val.materialId : undefined;
|
||||
// this.listQuery.startTime = '1706144404000';
|
||||
// this.listQuery.endTime = '1706230804000';
|
||||
this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
|
||||
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
|
||||
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
|
||||
this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24*60*60*1000 : undefined;
|
||||
this.listQuery.lineId = val.lineId ? val.lineId : undefined
|
||||
this.getDataList();
|
||||
break;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-18 14:08:46
|
||||
* @LastEditTime: 2024-04-25 10:18:17
|
||||
* @LastEditTime: 2024-04-25 13:30:11
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -214,7 +214,7 @@ export default {
|
||||
startPlaceholder: '开始时间',
|
||||
endPlaceholder: '结束时间',
|
||||
param: 'checkTime',
|
||||
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
|
||||
defaultSelect: [Date.now() - 24 * 60 * 60*1000, Date.now()],
|
||||
width: 350
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-18 10:01:33
|
||||
* @LastEditTime: 2024-04-24 09:56:20
|
||||
* @LastEditTime: 2024-04-25 13:40:36
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -132,7 +132,7 @@ export default {
|
||||
startPlaceholder: '开始时间',
|
||||
endPlaceholder: '结束时间',
|
||||
param: 'checkTime',
|
||||
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
|
||||
defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000],
|
||||
width: 350
|
||||
},
|
||||
{
|
||||
@ -170,8 +170,8 @@ export default {
|
||||
created() { },
|
||||
mounted() {
|
||||
// this.formConfig[1].defaultSelect[]
|
||||
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
|
||||
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
|
||||
this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
|
||||
this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
|
||||
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
|
||||
this.getDataList()
|
||||
this.getDict()
|
||||
@ -365,8 +365,8 @@ export default {
|
||||
// this.listQuery.materialId = val.materialId ? val.materialId : undefined;
|
||||
// this.listQuery.startTime = '1706144404000';
|
||||
// this.listQuery.endTime = '1706230804000';
|
||||
this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
|
||||
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
|
||||
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
|
||||
this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 : undefined;
|
||||
this.listQuery.lineId = val.lineId ? val.lineId : undefined
|
||||
this.getDataList();
|
||||
break;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-18 15:07:53
|
||||
* @LastEditTime: 2024-04-24 09:58:07
|
||||
* @LastEditTime: 2024-04-25 13:41:27
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -129,7 +129,7 @@ export default {
|
||||
startPlaceholder: '开始时间',
|
||||
endPlaceholder: '结束时间',
|
||||
param: 'checkTime',
|
||||
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
|
||||
defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000],
|
||||
width: 350
|
||||
},
|
||||
{
|
||||
@ -167,8 +167,8 @@ export default {
|
||||
created() { },
|
||||
mounted() {
|
||||
// this.formConfig[1].defaultSelect[]
|
||||
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
|
||||
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
|
||||
this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
|
||||
this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
|
||||
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
|
||||
this.getDataList()
|
||||
this.getDict()
|
||||
@ -357,8 +357,8 @@ export default {
|
||||
// this.listQuery.materialId = val.materialId ? val.materialId : undefined;
|
||||
// this.listQuery.startTime = '1706144404000';
|
||||
// this.listQuery.endTime = '1706230804000';
|
||||
this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
|
||||
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
|
||||
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
|
||||
this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 : undefined;
|
||||
this.listQuery.lineId = val.lineId ? val.lineId : undefined
|
||||
this.getDataList();
|
||||
break;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user