|
@@ -58,19 +58,29 @@
|
|
|
:value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
+
|
|
|
|
|
|
</div>
|
|
|
<div class="search-box-area" id="searchBox">
|
|
|
- <div class="search-item">
|
|
|
+ <div class="search-item1">
|
|
|
<el-date-picker
|
|
|
- v-model="queryParam.time"
|
|
|
- type="daterange"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="起始日期"
|
|
|
- end-placeholder="结束日期">
|
|
|
+ v-model="queryParam.time"
|
|
|
+ type="datetimerange"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
|
+ <el-button class="filter-item search" icon="el-icon-search" @click="handleSearch" >搜索</el-button >
|
|
|
</div>
|
|
|
-
|
|
|
+ <!-- <div class="search-item">
|
|
|
+ <el-button
|
|
|
+ class="filter-item search fl"
|
|
|
+ icon="el-icon-search"
|
|
|
+ @click="handleSearch"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
<base-line
|
|
|
:options="lineOptions"
|
|
@@ -98,6 +108,34 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ //时间查询
|
|
|
+ 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]);
|
|
|
+ }
|
|
|
+ }]
|
|
|
+ },
|
|
|
//搜索
|
|
|
queryParam:{
|
|
|
work_local:'',
|
|
@@ -159,25 +197,25 @@ export default {
|
|
|
name: 'SWT-4.0-146',
|
|
|
type: 'line',
|
|
|
smooth: false,
|
|
|
- data:[20,18,20,20,20,20,20]
|
|
|
+ data:[20,18,20,20,20,20,20,21,22,20]
|
|
|
},
|
|
|
{
|
|
|
name: 'SWT-2.38-101',
|
|
|
type: 'line',
|
|
|
smooth: false,
|
|
|
- data:[12,12,12,12,11,12,12]
|
|
|
+ data:[12,12,12,12,11,12,12,11,11,12]
|
|
|
},
|
|
|
{
|
|
|
name: 'SWT-6.0-154',
|
|
|
type: 'line',
|
|
|
smooth: false,
|
|
|
- data:[10,10,10,10,10,10,11]
|
|
|
+ data:[10,10,10,10,10,10,11,13,23,12]
|
|
|
},
|
|
|
{
|
|
|
name: 'SG-8.0-167',
|
|
|
type: 'line',
|
|
|
smooth: false,
|
|
|
- data:[8,9,5,8,7,8,9]
|
|
|
+ data:[8,9,5,8,7,8,9,5,6,7]
|
|
|
},
|
|
|
|
|
|
|
|
@@ -282,6 +320,14 @@ export default {
|
|
|
height: 44px;
|
|
|
float: left;
|
|
|
}
|
|
|
+ .search-item1 {
|
|
|
+ width: 80%;
|
|
|
+ height: 44px;
|
|
|
+ float: left;
|
|
|
+ }
|
|
|
|
|
|
+.filter-item{
|
|
|
+ margin-left:10px;
|
|
|
+}
|
|
|
|
|
|
</style>
|