Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
9eeb26a8fd
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,19 +5,17 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -5,25 +5,23 @@
|
||||||
<div style="margin-right: 20px">交接班日志</div>
|
<div style="margin-right: 20px">交接班日志</div>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.start_time__gte"
|
v-model="query.start_time__gte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间起"
|
||||||
placeholder="开始时间"
|
style="width: 200px"
|
||||||
style="width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.end_time__lt"
|
v-model="query.start_time__lte"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
format="YYYY-MM-DD"
|
placeholder="班开始时间止"
|
||||||
placeholder="结束时间"
|
style="margin-left: 2px; width: 200px"
|
||||||
style="margin-left: 2px; width: 120px"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="query.shift"
|
v-model="query.shift"
|
||||||
placeholder="班次"
|
placeholder="班次"
|
||||||
clearable
|
clearable
|
||||||
style="margin-left: 2px; width: 120px"
|
style="margin-left: 2px; width: 200px"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in optionsShift"
|
v-for="item in optionsShift"
|
||||||
|
@ -49,6 +47,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
|
style="margin-left: 2px"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.last_time__gte"
|
v-model="query.last_time__gte"
|
||||||
type="datetime"
|
type="datetime"
|
||||||
placeholder="开始时间"
|
placeholder="变动时间起"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px; margin: 5px"
|
style="width: 200px; margin: 5px"
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.last_time__lte"
|
v-model="query.last_time__lte"
|
||||||
type="datetime"
|
type="datetime"
|
||||||
placeholder="截止时间"
|
placeholder="变动时间止"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px; margin:0"
|
style="width: 200px; margin:0"
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.last_time__gte"
|
v-model="query.last_time__gte"
|
||||||
type="datetime"
|
type="datetime"
|
||||||
placeholder="开始时间"
|
placeholder="变动时间起"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px; margin: 5px"
|
style="width: 200px; margin: 5px"
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="query.last_time__lte"
|
v-model="query.last_time__lte"
|
||||||
type="datetime"
|
type="datetime"
|
||||||
placeholder="截止时间"
|
placeholder="变动时间止"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px; margin:0"
|
style="width: 200px; margin:0"
|
||||||
|
|
Loading…
Reference in New Issue