suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

Browse Source
dev-scheduling
zhangdi 1 month ago
parent 4ec5a693b5 2ef673d0eb
commit 8c94c27ab0
1 changed files with 90 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 150
      src/views/safetyManagement/safetyInspectionTask/index.vue

150
src/views/safetyManagement/safetyInspectionTask/index.vue
Unescape View File

@ -34,13 +34,13 @@ export default {
currentPage: 1,
total: 0,
},
loading:false,
loading: false,
data: [],
query: {
taskStatus: "2" // 初始查询条件
taskStatus: '2', // 初始查询条件
},
option: {
height: "auto",
height: 'auto',
calcHeight: 32,
tip: false,
simplePage: true,
@ -55,12 +55,12 @@ export default {
viewBtn: false,
delBtn: false,
addBtn: false,
editBtnText: "修改",
addBtnIcon: " ",
viewBtnIcon: " ",
delBtnIcon: " ",
editBtnIcon: " ",
viewBtnText: "详情",
editBtnText: '修改',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
viewBtnText: '详情',
labelWidth: 120,
menuWidth: 120,
dialogWidth: 1040,
@ -75,41 +75,41 @@ export default {
index: false,
showOverflowTooltip: true,
menu: false,
searchLabelPosition: "left",
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: "left",
menuAlign: 'left',
gridBtn: false,
searchMenuPosition: "right",
align: "center",
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: "巡检点编号",
prop: "insNum",
label: '巡检点编号',
prop: 'insNum',
sortable: true,
filter: true,
search: true,
searchLabelWidth: 90,
},
{
label: "巡检点位置",
prop: "insSite",
label: '巡检点位置',
prop: 'insSite',
sortable: true,
filter: true,
search: true,
searchLabelWidth: 90,
},
{
label: "等待周期",
prop: "waitCycle",
label: '等待周期',
prop: 'waitCycle',
sortable: true,
filter: true,
search: false,
display: false,
},
{
label: "巡检点备注",
prop: "insMemo",
label: '巡检点备注',
prop: 'insMemo',
sortable: true,
filter: true,
search: false,
@ -117,19 +117,19 @@ export default {
searchLabelWidth: 110,
},
{
label: "发起时间",
prop: "queryLaunchTime",
label: '发起时间',
prop: 'queryLaunchTime',
search: true,
display: false,
hide:true,
hide: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
searchRange: true,
},
{
label: "发起时间",
prop: "launchTime",
label: '发起时间',
prop: 'launchTime',
sortable: true,
filter: true,
type: 'datetime',
@ -138,62 +138,65 @@ export default {
searchRange: true,
},
{
label: "巡检人",
prop: "insMan",
label: '巡检人',
prop: 'insMan',
sortable: true,
filter: true,
search: true,
},
{
label: "检验时间",
prop: "queryTestTime",
label: '检验时间',
prop: 'queryTestTime',
sortable: true,
filter: true,
search: true,
hide:true,
type: "date",
hide: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
searchRange: true,
},
{
label: "检验时间",
prop: "testTime",
label: '检验时间',
prop: 'testTime',
sortable: true,
filter: true,
type: "datetime",
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
// searchRange: true,
},
{
label: "任务状态",
prop: "taskStatus",
label: '任务状态',
prop: 'taskStatus',
sortable: true,
filter: true,
search: true,
type: "select",
type: 'select',
// value: "2",
searchLabelWidth: 80,
dicData: [
{
label: "已检",
value: "1",
label: '已检',
value: '1',
},
{
label: "待检",
value: "2",
label: '待检',
value: '2',
},
{
label: "未准时完成",
value: "3",
}
label: '未准时完成',
value: '3',
},
{
label: '缺卡',
value: '4',
},
],
},
{
label: "备注",
prop: "memo",
label: '备注',
prop: 'parMemo',
sortable: true,
filter: true,
search: false,
@ -208,26 +211,44 @@ export default {
this.loading = true;
const requestParams = Object.assign({}, params, this.query);
// 后端要字符串类型
console.log('查询参数:', requestParams)
console.log('查询参数:', requestParams);
if (requestParams.queryLaunchTime && Array.isArray(requestParams.queryLaunchTime) && requestParams.queryLaunchTime.length > 0) {
requestParams.queryLaunchTime[0] = requestParams.queryLaunchTime[0].length == 10 ? requestParams.queryLaunchTime[0] + ' 00:00:00' : requestParams.queryLaunchTime[0]
requestParams.queryLaunchTime[1] = requestParams.queryLaunchTime[1].length == 10 ? requestParams.queryLaunchTime[1] + ' 23:59:59' : requestParams.queryLaunchTime[1]
if (
requestParams.queryLaunchTime &&
Array.isArray(requestParams.queryLaunchTime) &&
requestParams.queryLaunchTime.length > 0
) {
requestParams.queryLaunchTime[0] =
requestParams.queryLaunchTime[0].length == 10
? requestParams.queryLaunchTime[0] + ' 00:00:00'
: requestParams.queryLaunchTime[0];
requestParams.queryLaunchTime[1] =
requestParams.queryLaunchTime[1].length == 10
? requestParams.queryLaunchTime[1] + ' 23:59:59'
: requestParams.queryLaunchTime[1];
requestParams.queryLaunchTime = requestParams.queryLaunchTime.join(',');
}
if (requestParams.queryTestTime && Array.isArray(requestParams.queryTestTime) && requestParams.queryTestTime.length > 0) {
requestParams.queryTestTime[0] = requestParams.queryTestTime[0].length == 10 ? requestParams.queryTestTime[0] + ' 00:00:00' : requestParams.queryTestTime[0]
requestParams.queryTestTime[1] = requestParams.queryTestTime[1].length == 10 ? requestParams.queryTestTime[1] + ' 23:59:59' : requestParams.queryTestTime[1]
if (
requestParams.queryTestTime &&
Array.isArray(requestParams.queryTestTime) &&
requestParams.queryTestTime.length > 0
) {
requestParams.queryTestTime[0] =
requestParams.queryTestTime[0].length == 10
? requestParams.queryTestTime[0] + ' 00:00:00'
: requestParams.queryTestTime[0];
requestParams.queryTestTime[1] =
requestParams.queryTestTime[1].length == 10
? requestParams.queryTestTime[1] + ' 23:59:59'
: requestParams.queryTestTime[1];
requestParams.queryTestTime = requestParams.queryTestTime.join(',');
}
getList(page.currentPage, page.pageSize, requestParams).then(
(res) => {
getList(page.currentPage, page.pageSize, requestParams).then(res => {
this.data = res.data.data.records;
this.loading = false;
this.page.total = res.data.data.total;
// this.selectionClear();
}
);
});
},
//选择行
selectionChange(list) {
@ -239,8 +260,8 @@ export default {
},
// 搜索重置
searchReset() {
this.query = {taskStatus:'2'}
this.onLoad(this.page)
this.query = { taskStatus: '2' };
this.onLoad(this.page);
},
//刷新
refreshChange() {
@ -250,10 +271,9 @@ export default {
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params)
done()
}
this.onLoad(this.page, params);
done();
},
},
};
</script>

Write Preview
Loading…
Cancel
Save