Skip to content

王刘锁 / jianlin-tms-view

Go to a project
Commit b6798b33 by 王刘锁
Options

点位管理设备类型

parent dfd94a40
Inline Side-by-side
Showing with 119 additions and 9 deletions
src/views/modules/equipmentAdmin/equipmentAccount/TopicList.vue
......@@ -28,7 +28,9 @@
</template>
</vxe-column>
<vxe-column title="主题名称" field="topicName"></vxe-column>
<vxe-column title="消息值" field="messageValue"></vxe-column>
<!-- messageValue（请求中的字段为mesageValue） -->
<!-- <vxe-column title="消息值" field="messageValue"></vxe-column> -->
<vxe-column title="消息值" field="mesageValue"></vxe-column>
<vxe-column title="排序" field="sort"></vxe-column>
<vxe-column title="操作" width="100px" fixed="right" align="center">
<template slot-scope="scope">
......
src/views/modules/taskPlan/taskChainList/index.vue
<template>
<div class="page">
<el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm">
<el-form-item prop="createDates" label="创建任务时间：">
<el-date-picker
v-model="searchForm.createDates"
type="datetimerange"
size="small"
align="right"
value-format="yyyy-MM-dd HH:mm:ss"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item prop="agvLineTimes" label="下发任务时间：">
<el-date-picker
v-model="searchForm.agvLineTimes"
type="datetimerange"
size="small"
align="right"
value-format="yyyy-MM-dd HH:mm:ss"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item prop="agvTimes" label="执行开始时间：">
<el-date-picker
v-model="searchForm.agvTimes"
type="datetimerange"
size="small"
align="right"
value-format="yyyy-MM-dd HH:mm:ss"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item prop="finishAts" label="执行结束时间：">
<el-date-picker
v-model="searchForm.finishAts"
type="datetimerange"
size="small"
align="right"
value-format="yyyy-MM-dd HH:mm:ss"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item prop="taskStatus" label="任务状态：">
<el-select v-model="searchForm.taskStatus" placeholder="请选择任务状态" clearable>
<el-option v-for="item in $dictUtils.getDictList('tms_task_status')" :key="item.value" :label="item.label"
......@@ -14,7 +70,7 @@
<el-form-item prop="task_name" label="任务名称：">
<el-input size="small" v-model="searchForm.task_name" clearable placeholder="请选输入任务名称"></el-input>
</el-form-item>
<el-form-item prop="beginAt" label="执行开始时间：">
<!-- <el-form-item prop="beginAt" label="执行开始时间：">
<el-date-picker v-model="searchForm.beginAt" type="datetime" placeholder="选择执行开始时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
......@@ -23,7 +79,7 @@
<el-date-picker v-model="searchForm.finishAt" type="datetime" placeholder="选择执行结束时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" @click="getTaskListPage()" size="small" icon="el-icon-search">搜索</el-button>
<el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
......@@ -88,7 +144,8 @@
</vxe-column>
<vxe-column field="createDate" title="创建时间" align="center"></vxe-column>
<vxe-column field="beginAt" title="执行开始时间" align="center"></vxe-column>
<vxe-column field="agvLineTime" title="下发任务时间" align="center"></vxe-column>
<vxe-column field="agvTime" title="执行开始时间" align="center"></vxe-column>
<vxe-column field="finishAt" title="执行结束时间" align="center"></vxe-column>
<vxe-column field="consumingAt" title="耗时" align="center"></vxe-column>
<vxe-column title="操作" width="180px" align="center" fixed="right">
......@@ -169,7 +226,11 @@ export default {
taskId: '',
task_name: '',
beginAt: '',
finishAt: ''
finishAt: '',
createDates: [],
agvLineTimes: [],
agvTimes: [],
finishAts:[]
},
tableData: [],
tablePage: {
......@@ -186,6 +247,35 @@ export default {
],
tabsActive: '-1',
subtaskData: [],
// 事件日期选择器快捷键
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
}
},
watch: {},
......@@ -207,7 +297,25 @@ export default {
current: this.tablePage.currentPage,
size: this.tablePage.pageSize
}
if(this.searchForm.createDates){
can.createDateMinimumTime = this.searchForm.createDates[0];
can.createDateMaximumTime = this.searchForm.createDates[1];
}
if(this.searchForm.agvLineTimes){
can.agvLineTimeMinimumTime = this.searchForm.agvLineTimes[0];
can.agvLineTimeMaximumTime = this.searchForm.agvLineTimes[1];
}
if(this.searchForm.agvTimes){
can.agvTimeMinimumTime = this.searchForm.agvTimes[0];
can.agvTimeMaximumTime = this.searchForm.agvTimes[1];
}
if(this.searchForm.finishAts){
can.finishAtMinimumTime = this.searchForm.finishAts[0];
can.finishAtMaximumTime = this.searchForm.finishAts[1];
}
console.log(can);
this.TaskChainList.getTaskListPage(can).then(({ data }) => {
console.log(data);
this.tableData = data.records
this.tablePage.total = data.total
this.loading = false
......
src/views/modules/taskPlan/taskPlanTemplate/index.vue
......@@ -20,7 +20,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="beginAt" label="执行开始时间：">
<!-- <el-form-item prop="beginAt" label="执行开始时间：">
<el-date-picker v-model="searchForm.beginAt" type="datetime" placeholder="选择执行开始时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
......@@ -29,7 +29,7 @@
<el-date-picker v-model="searchForm.finishAt" type="datetime" placeholder="选择执行结束时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" @click="getTaskTemplatedPage()" size="small" icon="el-icon-search">搜索</el-button>
<el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
......@@ -113,8 +113,8 @@ export default {
taskId: '',
takeName: '',
variate: '',
beginAt: '',
finishAt: ''
// beginAt: '',
// finishAt: ''
},
loading: false,
tableData: [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment