|
|
@@ -1,5 +1,4 @@
|
|
|
<template>
|
|
|
-
|
|
|
<div style="width: 100%">
|
|
|
|
|
|
<div slot="header" class="clearfix">
|
|
|
@@ -13,45 +12,45 @@
|
|
|
<!-- 头部搜索栏 -->
|
|
|
<el-row :gutter="50" style="margin-right: 0px;">
|
|
|
<el-form style="display: flex; flex-direction: row;" size="mini">
|
|
|
- <el-form-item label="年度" class="select">
|
|
|
+ <el-form-item label="年度" class="select" size="mini">
|
|
|
<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy"
|
|
|
type="year" clearable />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="任务状态" class="select">
|
|
|
+ <el-form-item label="任务状态" class="select" size="mini">
|
|
|
<el-select v-model="queryInfo.ispublic" style="width: 110px;">
|
|
|
<el-option v-for="item in taskstatus" :key="item.value" :label="item.label"
|
|
|
:value="item.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="任务时间" class="select">
|
|
|
+ <el-form-item label="任务时间" class="select" size="mini">
|
|
|
<el-date-picker v-model="queryInfo.starttime" style="width: 180px;" align="right" type="date"
|
|
|
:picker-options="pickerOptions" clearable />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="--" class="select" style="margin-left: 10px; padding-left: 0px;">
|
|
|
+ <el-form-item label="--" class="select" style="margin-left: 10px;" size="mini">
|
|
|
<el-date-picker v-model="queryInfo.endtime" style="width: 180px;" align="right" type="date"
|
|
|
:picker-options="pickerOptions" clearable />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="任务名称" class="select">
|
|
|
+ <el-form-item label="任务名称" class="select" size="mini">
|
|
|
<el-input v-model="queryInfo.task_name"></el-input>
|
|
|
</el-form-item>
|
|
|
<!-- 查询 -->
|
|
|
- <el-button style="height: 28px;margin-left: 10px;" type="success" size="mini" @click="searchData()">查询</el-button>
|
|
|
+ <el-button style="height: 28px;margin-left: 10px;" type="success" size="mini" @click="searchData()">查询</el-button>
|
|
|
<!-- 重置 -->
|
|
|
<el-button style="height: 28px;margin-left: 5px;" type="success" size="mini" @click="reset()">重置</el-button>
|
|
|
</el-form>
|
|
|
</el-row>
|
|
|
- <!-- 头部按钮区域-->
|
|
|
+ <!-- 头部钮区域-->
|
|
|
<el-row :gutter="90" style="margin-right: 0px;">
|
|
|
<div style="display: flex;flex-direction: row;float: right;">
|
|
|
<el-button type="primary" size="small" plain icon="el-icon-download" @click="exportData">导出Excel</el-button>
|
|
|
</div>
|
|
|
</el-row>
|
|
|
<!-- 表格数据区域-->
|
|
|
- <el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%"
|
|
|
+ <el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%"
|
|
|
:row-style="rowStyle" :cell-style="cellStyle" @selection-change="handleSelectionChange">
|
|
|
- <el-table-column type="selection" width="50" align="center"></el-table-column>
|
|
|
- <el-table-column label="序号" width="50px" align="center">
|
|
|
+ <el-table-column type="selection" width="50"></el-table-column>
|
|
|
+ <el-table-column label="序号" width="50px">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.$index+1 }}
|
|
|
</template>
|
|
|
@@ -85,7 +84,6 @@
|
|
|
<!-- 操作按钮区域的作用域插槽 -->
|
|
|
<template slot-scope="scope">
|
|
|
<!-- <el-button type="warning" plain size="small" @click="bindDialogShow1(scope.row)">绑定模型</el-button> -->
|
|
|
- <!-- <el-button type="success" size="mini" @click="runtask(scope.row.id)" v-if="this.queryInfo.ispublic == 5">导出word</el-button> -->
|
|
|
<el-button type="success" size="mini" @click="runtask(scope.row.id)">执行任务</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -94,13 +92,13 @@
|
|
|
:current-page="queryInfo.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="queryInfo.pageSize"
|
|
|
layout="total, sizes, prev, pager, next, jumper" :total="total">
|
|
|
</el-pagination>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- const qee = require('qf-export-excel')
|
|
|
+ const qee = require('qf-export-excel')
|
|
|
const HeadersList = [{
|
|
|
title: '任务名称',
|
|
|
key: 'task_name'
|
|
|
@@ -247,12 +245,36 @@
|
|
|
console.log(`当前页: ${val}`);
|
|
|
this.gettaskList()
|
|
|
},
|
|
|
- // 批量选中
|
|
|
+
|
|
|
+ // 批量选中
|
|
|
handleSelectionChange(val) {
|
|
|
this.multipleSelection = val;
|
|
|
console.log(this.multipleSelection)
|
|
|
},
|
|
|
|
|
|
+ // 搜索
|
|
|
+ async searchData() {
|
|
|
+ console.log(this.queryInfo)
|
|
|
+ this.queryInfo.pageNum = 1
|
|
|
+ this.gettaskList()
|
|
|
+ },
|
|
|
+
|
|
|
+ // 重置
|
|
|
+ reset(){
|
|
|
+ this.queryInfo={
|
|
|
+ year:'',
|
|
|
+ task_name:'',
|
|
|
+ starttime:'',
|
|
|
+ endtime:'',
|
|
|
+ ispublic:'',
|
|
|
+ pageSize:10,
|
|
|
+ pageNum:1,
|
|
|
+ task_class:'专项监测'
|
|
|
+ }
|
|
|
+ this.gettaskList()
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
// 获取任务列表
|
|
|
async gettaskList() {
|
|
|
console.log(this.queryInfo)
|
|
|
@@ -266,6 +288,7 @@
|
|
|
} = await this.$http.post(
|
|
|
"getTaskListTest", this.queryInfo
|
|
|
);
|
|
|
+ console.log(res)
|
|
|
this.tableData = res.data.rows
|
|
|
this.total = res.data.total
|
|
|
},
|
|
|
@@ -279,37 +302,7 @@
|
|
|
this.total = result.data.data.total
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
- runtask(id) {
|
|
|
- console.log(id)
|
|
|
- this.$router.push({
|
|
|
- name: 'setTask',
|
|
|
- params: {
|
|
|
- id:id
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- // 搜索
|
|
|
- async searchData() {
|
|
|
- this.queryInfo.pageNum = 1
|
|
|
- console.log(this.queryInfo)
|
|
|
- this.gettaskList()
|
|
|
- },
|
|
|
- // 重置
|
|
|
- reset(){
|
|
|
- this.queryInfo={
|
|
|
- year:'',
|
|
|
- task_name:'',
|
|
|
- starttime:'',
|
|
|
- endtime:'',
|
|
|
- ispublic:'',
|
|
|
- pageSize:10,
|
|
|
- pageNum:1,
|
|
|
- task_class:'专项监测'
|
|
|
- }
|
|
|
- this.gettaskList()
|
|
|
- },
|
|
|
- // 导出Excel
|
|
|
+ // 导出Excel
|
|
|
async exportData() {
|
|
|
|
|
|
// for (var key in this.exportInfo) {
|
|
|
@@ -360,13 +353,23 @@
|
|
|
// console.log(columns)
|
|
|
const list = exportList
|
|
|
const data = this.formatJson(filterVal, list)
|
|
|
- export_json_to_excel(tHeader, data, '例行监测任务')
|
|
|
+ export_json_to_excel(tHeader, data, '专项监测任务')
|
|
|
|
|
|
})
|
|
|
},
|
|
|
formatJson(filterVal, jsonData) {
|
|
|
return jsonData.map(v => filterVal.map(j => v[j]))
|
|
|
},
|
|
|
+ // 执行任务
|
|
|
+ runtask(id) {
|
|
|
+ // console.log(id)
|
|
|
+ this.$router.push({
|
|
|
+ name: 'setTask',
|
|
|
+ params: {
|
|
|
+ id:id
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
},
|
|
|
}
|
|
|
@@ -417,7 +420,7 @@
|
|
|
}
|
|
|
|
|
|
.el-form-item {
|
|
|
- margin-bottom: 8px;
|
|
|
+ margin-bottom: 30px;
|
|
|
padding-left: 18px;
|
|
|
}
|
|
|
|
jiangyu