|
|
|
@ -1,15 +1,29 @@ |
|
|
|
<template> |
|
|
|
<template> |
|
|
|
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" |
|
|
|
<avue-crud |
|
|
|
@row-update="rowUpdate" @row-del="rowDel" @row-save="rowSave" @search-change="searchChange" |
|
|
|
:option="option" |
|
|
|
@search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange" |
|
|
|
:table-loading="loading" |
|
|
|
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"> |
|
|
|
:data="data" |
|
|
|
|
|
|
|
v-model="form" |
|
|
|
|
|
|
|
v-model:page="page" |
|
|
|
|
|
|
|
ref="crud" |
|
|
|
|
|
|
|
@row-update="rowUpdate" |
|
|
|
|
|
|
|
@row-del="rowDel" |
|
|
|
|
|
|
|
@row-save="rowSave" |
|
|
|
|
|
|
|
@search-change="searchChange" |
|
|
|
|
|
|
|
@search-reset="searchReset" |
|
|
|
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
|
|
|
@current-change="currentChange" |
|
|
|
|
|
|
|
@size-change="sizeChange" |
|
|
|
|
|
|
|
@refresh-change="refreshChange" |
|
|
|
|
|
|
|
@on-load="onLoad" |
|
|
|
|
|
|
|
> |
|
|
|
<template #menu-left> </template> |
|
|
|
<template #menu-left> </template> |
|
|
|
<template #menu-right> |
|
|
|
<template #menu-right> |
|
|
|
<span>备注: 1、运行状态正常时,默认运行;异常时停止。2、pH值为正常运行的平均值</span> |
|
|
|
<span>备注: 1、运行状态正常时,默认运行;异常时停止。2、pH值为正常运行的平均值</span> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
<!-- 运行 1 停止0 --> |
|
|
|
<!-- 运行 1 停止0 --> |
|
|
|
<template #fan="scope"> |
|
|
|
<template #fan="scope"> |
|
|
|
<el-tag v-if="scope.row.fan === true" type="success">运行</el-tag> |
|
|
|
<el-tag v-if="scope.row.fan === true" type="success">运行</el-tag> |
|
|
|
<el-tag v-else type="danger">停止</el-tag> |
|
|
|
<el-tag v-else type="danger">停止</el-tag> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
<template #pump="scope"> |
|
|
|
<template #pump="scope"> |
|
|
|
@ -43,15 +57,15 @@ |
|
|
|
</avue-crud> |
|
|
|
</avue-crud> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
<script> |
|
|
|
<script> |
|
|
|
import { getList ,remove, update , getdutyManList } from '@/api/safetyManagement/wasteGasRunRec.js'; |
|
|
|
import { getList, remove, update, getdutyManList } from '@/api/safetyManagement/wasteGasRunRec.js'; |
|
|
|
export default { |
|
|
|
export default { |
|
|
|
data() { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
return { |
|
|
|
selectionList: [], |
|
|
|
selectionList: [], |
|
|
|
dutyManList:[], |
|
|
|
dutyManList: [], |
|
|
|
loading:false, |
|
|
|
loading: false, |
|
|
|
option: { |
|
|
|
option: { |
|
|
|
height: "auto", |
|
|
|
height: 'auto', |
|
|
|
calcHeight: 32, |
|
|
|
calcHeight: 32, |
|
|
|
tip: false, |
|
|
|
tip: false, |
|
|
|
simplePage: true, |
|
|
|
simplePage: true, |
|
|
|
@ -67,13 +81,13 @@ export default { |
|
|
|
delBtn: true, |
|
|
|
delBtn: true, |
|
|
|
editBtn: true, |
|
|
|
editBtn: true, |
|
|
|
addBtn: false, |
|
|
|
addBtn: false, |
|
|
|
editBtnText: "修改", |
|
|
|
editBtnText: '修改', |
|
|
|
delBtnText: "删除", |
|
|
|
delBtnText: '删除', |
|
|
|
addBtnIcon: " ", |
|
|
|
addBtnIcon: ' ', |
|
|
|
viewBtnIcon: " ", |
|
|
|
viewBtnIcon: ' ', |
|
|
|
delBtnIcon: " ", |
|
|
|
delBtnIcon: ' ', |
|
|
|
editBtnIcon: " ", |
|
|
|
editBtnIcon: ' ', |
|
|
|
viewBtnText: "详情", |
|
|
|
viewBtnText: '详情', |
|
|
|
labelWidth: 120, |
|
|
|
labelWidth: 120, |
|
|
|
menuWidth: 120, |
|
|
|
menuWidth: 120, |
|
|
|
dialogWidth: 1040, |
|
|
|
dialogWidth: 1040, |
|
|
|
@ -88,18 +102,18 @@ export default { |
|
|
|
index: false, |
|
|
|
index: false, |
|
|
|
showOverflowTooltip: true, |
|
|
|
showOverflowTooltip: true, |
|
|
|
menu: true, |
|
|
|
menu: true, |
|
|
|
searchLabelPosition: "left", |
|
|
|
searchLabelPosition: 'left', |
|
|
|
searchLabelPosition: "left", |
|
|
|
searchLabelPosition: 'left', |
|
|
|
searchGutter: 24, |
|
|
|
searchGutter: 24, |
|
|
|
searchSpan: 6, |
|
|
|
searchSpan: 6, |
|
|
|
menuAlign: "left", |
|
|
|
menuAlign: 'left', |
|
|
|
gridBtn: false, |
|
|
|
gridBtn: false, |
|
|
|
searchMenuPosition: "right", |
|
|
|
searchMenuPosition: 'right', |
|
|
|
align: "center", |
|
|
|
align: 'center', |
|
|
|
column: [ |
|
|
|
column: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "设备编号", |
|
|
|
label: '设备编号', |
|
|
|
prop: "deviceNum", |
|
|
|
prop: 'deviceNum', |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
filter: true, |
|
|
|
filter: true, |
|
|
|
search: true, |
|
|
|
search: true, |
|
|
|
@ -112,7 +126,7 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
], |
|
|
|
], |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// { |
|
|
|
// { |
|
|
|
// label: "日期", |
|
|
|
// label: "日期", |
|
|
|
// prop: "startTime", |
|
|
|
// prop: "startTime", |
|
|
|
@ -145,16 +159,16 @@ export default { |
|
|
|
hide: true, |
|
|
|
hide: true, |
|
|
|
editDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
span: 12, |
|
|
|
span: 12, |
|
|
|
type: 'datetime', |
|
|
|
type: 'date', |
|
|
|
searchRange: true, |
|
|
|
searchRange: true, |
|
|
|
startPlaceholder: "开始时间", |
|
|
|
startPlaceholder: '开始时间', |
|
|
|
endPlaceholder: "结束时间", |
|
|
|
endPlaceholder: '结束时间', |
|
|
|
format: 'YYYY-MM-DD HH:mm:ss', |
|
|
|
format: 'YYYY-MM-DD', |
|
|
|
valueFormat: 'YYYY-MM-DD HH:mm:ss', |
|
|
|
valueFormat: 'YYYY-MM-DD', |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "开始时间", |
|
|
|
label: '开始时间', |
|
|
|
prop: "startTime", |
|
|
|
prop: 'startTime', |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
filter: true, |
|
|
|
filter: true, |
|
|
|
@ -180,17 +194,17 @@ export default { |
|
|
|
display: false, |
|
|
|
display: false, |
|
|
|
editDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
span: 12, |
|
|
|
span: 12, |
|
|
|
type: 'datetime', |
|
|
|
type: 'date', |
|
|
|
|
|
|
|
|
|
|
|
searchRange: true, |
|
|
|
searchRange: true, |
|
|
|
startPlaceholder: "开始时间", |
|
|
|
startPlaceholder: '开始时间', |
|
|
|
endPlaceholder: "结束时间", |
|
|
|
endPlaceholder: '结束时间', |
|
|
|
format: 'YYYY-MM-DD HH:mm:ss', |
|
|
|
format: 'YYYY-MM-DD', |
|
|
|
valueFormat: 'YYYY-MM-DD HH:mm:ss', |
|
|
|
valueFormat: 'YYYY-MM-DD', |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "结束时间", |
|
|
|
label: '结束时间', |
|
|
|
prop: "endTime", |
|
|
|
prop: 'endTime', |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
filter: true, |
|
|
|
filter: true, |
|
|
|
@ -207,146 +221,145 @@ export default { |
|
|
|
valueFormat: 'YYYY-MM-DD HH:mm:ss', |
|
|
|
valueFormat: 'YYYY-MM-DD HH:mm:ss', |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "运行时间(H)", |
|
|
|
label: '运行时间(H)', |
|
|
|
prop: "runTime", |
|
|
|
prop: 'runTime', |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
filter: true, |
|
|
|
filter: true, |
|
|
|
width: 130, |
|
|
|
width: 130, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "系统参数", |
|
|
|
label: '系统参数', |
|
|
|
align: "sysData", |
|
|
|
align: 'sysData', |
|
|
|
children: [ |
|
|
|
children: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "PH", |
|
|
|
label: 'PH', |
|
|
|
prop: "sysData", |
|
|
|
prop: 'sysData', |
|
|
|
width: 120, |
|
|
|
width: 120, |
|
|
|
}, |
|
|
|
}, |
|
|
|
], |
|
|
|
], |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "药品名称", |
|
|
|
label: '药品名称', |
|
|
|
prop: "drugName", |
|
|
|
prop: 'drugName', |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
filter: true, |
|
|
|
filter: true, |
|
|
|
width: 120, |
|
|
|
width: 120, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "药品投加量(kg)", |
|
|
|
label: '药品投加量(kg)', |
|
|
|
prop: "drugNum", |
|
|
|
prop: 'drugNum', |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
filter: true, |
|
|
|
filter: true, |
|
|
|
width: 150, |
|
|
|
width: 150, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "运行状态", |
|
|
|
label: '运行状态', |
|
|
|
align: "center", |
|
|
|
align: 'center', |
|
|
|
children: [ |
|
|
|
children: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "风机", |
|
|
|
label: '风机', |
|
|
|
prop: "fan", |
|
|
|
prop: 'fan', |
|
|
|
type: 'switch', |
|
|
|
type: 'switch', |
|
|
|
dicData: [ |
|
|
|
dicData: [ |
|
|
|
{ label: '停止', value:false}, |
|
|
|
{ label: '停止', value: false }, |
|
|
|
{ label: '运行', value: true }, //运行 true 停止false |
|
|
|
{ label: '运行', value: true }, //运行 true 停止false |
|
|
|
], |
|
|
|
], |
|
|
|
value: 1 |
|
|
|
value: 1, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "循环泵", |
|
|
|
label: '循环泵', |
|
|
|
prop: "pump", |
|
|
|
prop: 'pump', |
|
|
|
type: 'switch', |
|
|
|
type: 'switch', |
|
|
|
dicData: [ |
|
|
|
dicData: [ |
|
|
|
{ label: '停止', value: 0 }, |
|
|
|
{ label: '停止', value: 0 }, |
|
|
|
{ label: '运行', value: 1 }, //运行 1 停止0 |
|
|
|
{ label: '运行', value: 1 }, //运行 1 停止0 |
|
|
|
], |
|
|
|
], |
|
|
|
value: 1 |
|
|
|
value: 1, |
|
|
|
}, |
|
|
|
}, |
|
|
|
], |
|
|
|
], |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "结构外观", |
|
|
|
label: '结构外观', |
|
|
|
align: "center", |
|
|
|
align: 'center', |
|
|
|
children: [ |
|
|
|
children: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "结构外观", |
|
|
|
label: '结构外观', |
|
|
|
prop: "jgwg", |
|
|
|
prop: 'jgwg', |
|
|
|
width: 120, |
|
|
|
width: 120, |
|
|
|
type: 'switch', |
|
|
|
type: 'switch', |
|
|
|
dicData: [ |
|
|
|
dicData: [ |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
], |
|
|
|
], |
|
|
|
value:1 |
|
|
|
value: 1, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "管道阀门", |
|
|
|
label: '管道阀门', |
|
|
|
prop: "gdfm", |
|
|
|
prop: 'gdfm', |
|
|
|
width: 120, |
|
|
|
width: 120, |
|
|
|
type: 'switch', |
|
|
|
type: 'switch', |
|
|
|
dicData: [ |
|
|
|
dicData: [ |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
], |
|
|
|
], |
|
|
|
value: 1 |
|
|
|
value: 1, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "电器控制", |
|
|
|
label: '电器控制', |
|
|
|
prop: "dqkz", |
|
|
|
prop: 'dqkz', |
|
|
|
width: 120, |
|
|
|
width: 120, |
|
|
|
type: 'switch', |
|
|
|
type: 'switch', |
|
|
|
dicData: [ |
|
|
|
dicData: [ |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
], |
|
|
|
], |
|
|
|
value: 1 |
|
|
|
value: 1, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "仪表显示", |
|
|
|
label: '仪表显示', |
|
|
|
prop: "ybxs", |
|
|
|
prop: 'ybxs', |
|
|
|
width: 120, |
|
|
|
width: 120, |
|
|
|
type: 'switch', |
|
|
|
type: 'switch', |
|
|
|
dicData: [ |
|
|
|
dicData: [ |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
], |
|
|
|
], |
|
|
|
value: 1 |
|
|
|
value: 1, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "排口规范", |
|
|
|
label: '排口规范', |
|
|
|
prop: "pkgf", |
|
|
|
prop: 'pkgf', |
|
|
|
width: 120, |
|
|
|
width: 120, |
|
|
|
type: 'switch', |
|
|
|
type: 'switch', |
|
|
|
dicData: [ |
|
|
|
dicData: [ |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
], |
|
|
|
], |
|
|
|
value: 1 |
|
|
|
value: 1, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "循环水箱", |
|
|
|
label: '循环水箱', |
|
|
|
prop: "xhsx", |
|
|
|
prop: 'xhsx', |
|
|
|
width: 120, |
|
|
|
width: 120, |
|
|
|
type: 'switch', |
|
|
|
type: 'switch', |
|
|
|
dicData: [ |
|
|
|
dicData: [ |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '不合格', value: 0 }, |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
{ label: '合格', value: 1 }, //合格:1 不合格:0 |
|
|
|
], |
|
|
|
], |
|
|
|
value: 1 |
|
|
|
value: 1, |
|
|
|
}, |
|
|
|
}, |
|
|
|
], |
|
|
|
], |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "维保记录", |
|
|
|
label: '维保记录', |
|
|
|
prop: "record", |
|
|
|
prop: 'record', |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
filter: true, |
|
|
|
filter: true, |
|
|
|
width: 120, |
|
|
|
width: 120, |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '责任人', |
|
|
|
label: '责任人', |
|
|
|
@ -356,7 +369,7 @@ export default { |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
filter: true, |
|
|
|
filter: true, |
|
|
|
span: 12, |
|
|
|
span: 12, |
|
|
|
type: "select", |
|
|
|
type: 'select', |
|
|
|
dicData: [], |
|
|
|
dicData: [], |
|
|
|
rules: [ |
|
|
|
rules: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
@ -367,7 +380,7 @@ export default { |
|
|
|
], |
|
|
|
], |
|
|
|
props: { |
|
|
|
props: { |
|
|
|
label: 'name', |
|
|
|
label: 'name', |
|
|
|
value: 'id' |
|
|
|
value: 'id', |
|
|
|
}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
], |
|
|
|
], |
|
|
|
@ -381,7 +394,7 @@ export default { |
|
|
|
}; |
|
|
|
}; |
|
|
|
}, |
|
|
|
}, |
|
|
|
mounted() { |
|
|
|
mounted() { |
|
|
|
this.fetchdutyManList() |
|
|
|
this.fetchdutyManList(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
methods: { |
|
|
|
// 环保技术员责任人用户 |
|
|
|
// 环保技术员责任人用户 |
|
|
|
@ -390,17 +403,17 @@ export default { |
|
|
|
current: 1, |
|
|
|
current: 1, |
|
|
|
size: 10000000, |
|
|
|
size: 10000000, |
|
|
|
// deptId |
|
|
|
// deptId |
|
|
|
roleId: '2008473811712327681' |
|
|
|
roleId: '2008473811712327681', |
|
|
|
}).then(res => { |
|
|
|
}).then(res => { |
|
|
|
const result = res.data.data.records |
|
|
|
const result = res.data.data.records; |
|
|
|
this.dutyManList = result |
|
|
|
this.dutyManList = result; |
|
|
|
console.log("result", result) |
|
|
|
console.log('result', result); |
|
|
|
this.option.column.forEach(col => { |
|
|
|
this.option.column.forEach(col => { |
|
|
|
if (col.prop === 'dutyMan') { |
|
|
|
if (col.prop === 'dutyMan') { |
|
|
|
col.dicData = this.dutyManList; |
|
|
|
col.dicData = this.dutyManList; |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
}) |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 新增数据 |
|
|
|
// 新增数据 |
|
|
|
rowSave(row, done, loading) { |
|
|
|
rowSave(row, done, loading) { |
|
|
|
@ -463,25 +476,25 @@ export default { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
endTime = new Date().getTime(); |
|
|
|
endTime = new Date().getTime(); |
|
|
|
} |
|
|
|
} |
|
|
|
let str = ""; |
|
|
|
let str = ''; |
|
|
|
const time = endTime - new Date(row.startTime).getTime(); |
|
|
|
const time = endTime - new Date(row.startTime).getTime(); |
|
|
|
|
|
|
|
|
|
|
|
var date = new Date(time); |
|
|
|
var date = new Date(time); |
|
|
|
// 获取小时 |
|
|
|
// 获取小时 |
|
|
|
var hh = Math.floor(time / (60 * 60 * 1000)); |
|
|
|
var hh = Math.floor(time / (60 * 60 * 1000)); |
|
|
|
// 获取分 |
|
|
|
// 获取分 |
|
|
|
var mm = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(); |
|
|
|
var mm = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes(); |
|
|
|
// /获取秒 |
|
|
|
// /获取秒 |
|
|
|
var ss = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds(); |
|
|
|
var ss = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds(); |
|
|
|
|
|
|
|
|
|
|
|
if (time > 24 * 60 * 60 * 1000) { |
|
|
|
if (time > 24 * 60 * 60 * 1000) { |
|
|
|
str = Math.floor(time / 86400000) + "天" + hh + "小时" + mm + "分" + ss + "秒"; |
|
|
|
str = Math.floor(time / 86400000) + '天' + hh + '小时' + mm + '分' + ss + '秒'; |
|
|
|
} else if (time > 60 * 60 * 1000) { |
|
|
|
} else if (time > 60 * 60 * 1000) { |
|
|
|
str = hh + "小时" + mm + "分" + ss + "秒"; |
|
|
|
str = hh + '小时' + mm + '分' + ss + '秒'; |
|
|
|
} else if (time > 60 * 1000) { |
|
|
|
} else if (time > 60 * 1000) { |
|
|
|
str = mm + "分" + ss + "秒"; |
|
|
|
str = mm + '分' + ss + '秒'; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
str = ss + "秒"; |
|
|
|
str = ss + '秒'; |
|
|
|
} |
|
|
|
} |
|
|
|
return str; |
|
|
|
return str; |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -493,13 +506,12 @@ export default { |
|
|
|
searchChange(params, done) { |
|
|
|
searchChange(params, done) { |
|
|
|
this.query = params; |
|
|
|
this.query = params; |
|
|
|
this.page.currentPage = 1; |
|
|
|
this.page.currentPage = 1; |
|
|
|
this.onLoad(this.page, params) |
|
|
|
this.onLoad(this.page, params); |
|
|
|
done() |
|
|
|
done(); |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
searchReset(){ |
|
|
|
searchReset() { |
|
|
|
this.query = {} |
|
|
|
this.query = {}; |
|
|
|
this.onLoad(this.page) |
|
|
|
this.onLoad(this.page); |
|
|
|
}, |
|
|
|
}, |
|
|
|
// onLoad() { |
|
|
|
// onLoad() { |
|
|
|
// this.loading = true; |
|
|
|
// this.loading = true; |
|
|
|
@ -560,20 +572,24 @@ export default { |
|
|
|
this.loading = true; |
|
|
|
this.loading = true; |
|
|
|
const requestParams = Object.assign({}, params, this.query); |
|
|
|
const requestParams = Object.assign({}, params, this.query); |
|
|
|
// 后端要字符串类型 |
|
|
|
// 后端要字符串类型 |
|
|
|
|
|
|
|
// 处理开始时间 |
|
|
|
if (requestParams.queryStartTime && Array.isArray(requestParams.queryStartTime)) { |
|
|
|
if (requestParams.queryStartTime && Array.isArray(requestParams.queryStartTime)) { |
|
|
|
|
|
|
|
const start = requestParams.queryStartTime[0] + ' 00:00:00'; |
|
|
|
requestParams.queryStartTime = requestParams.queryStartTime.join(','); |
|
|
|
const end = requestParams.queryStartTime[1] + ' 23:59:59'; |
|
|
|
|
|
|
|
requestParams.queryStartTime = start + ',' + end; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 处理结束时间 |
|
|
|
if (requestParams.queryEndTime && Array.isArray(requestParams.queryEndTime)) { |
|
|
|
if (requestParams.queryEndTime && Array.isArray(requestParams.queryEndTime)) { |
|
|
|
|
|
|
|
const start = requestParams.queryEndTime[0] + ' 00:00:00'; |
|
|
|
requestParams.queryEndTime = requestParams.queryEndTime.join(','); |
|
|
|
const end = requestParams.queryEndTime[1] + ' 23:59:59'; |
|
|
|
|
|
|
|
requestParams.queryEndTime = start + ',' + end; |
|
|
|
} |
|
|
|
} |
|
|
|
getList(page.currentPage, page.pageSize, requestParams) |
|
|
|
getList(page.currentPage, page.pageSize, requestParams) |
|
|
|
.then(res => { |
|
|
|
.then(res => { |
|
|
|
const data = res.data.data; |
|
|
|
const data = res.data.data; |
|
|
|
this.page.total = data.total; |
|
|
|
this.page.total = data.total; |
|
|
|
this.data = data.records; |
|
|
|
this.data = data.records; |
|
|
|
console.log("this.data", this.data) |
|
|
|
console.log('this.data', this.data); |
|
|
|
this.loading = false; |
|
|
|
this.loading = false; |
|
|
|
}) |
|
|
|
}) |
|
|
|
.catch(() => { |
|
|
|
.catch(() => { |
|
|
|
|