Merge branch 'master' of http://192.168.3.53:11080/aielab/jcxt_qd

src/components/admin/addSpecialTask.vue

@@ -99,7 +99,7 @@
 	</div>
 </template>
 <script>
-	const groupname = window.sessionStorage.getItem('groupname')
+	const groupname = window.sessionStorage.getItem('rymc')
 	const token = window.sessionStorage.getItem('token')
 	export default {
 		data() {
@@ -199,7 +199,7 @@
 				this.form['token'] = token
 				this.form['groupname'] = this.groupname
 				this.form['orgs'] = this.orgs
-				this.form['releaser'] = window.sessionStorage.getItem('rybh')
+				this.form['releaser'] = window.sessionStorage.getItem('rymc')
 				this.form['task_class'] = '专项监测'
 				this.form['ispublic'] = 0
 				console.log(this.form)

src/components/admin/routineMonitor.vue

@@ -173,6 +173,7 @@
 <script>
 	const token = window.sessionStorage.getItem('token')
 	const rybh = window.sessionStorage.getItem('rybh')
+	const rymc = window.sessionStorage.getItem('rymc')
 	export default {
 		name: '',
 		data() {
@@ -389,16 +390,16 @@
 			// 删除任务
 			async delArray() {
 				// 判断任务是否为该创建者创建
-				for (let i = 0; i < this.multipleSelection.length; i++) {
-					if (rybh != this.multipleSelection[i].releaser) {
-						this.$alert('任务仅创建者可以删除！', {
-							confirmButtonText: '确定',
-							callback: action => {
+				// for (let i = 0; i < this.multipleSelection.length; i++) {
+				// 	if (rybh != this.multipleSelection[i].releaser) {
+				// 		this.$alert('任务仅创建者可以删除！', {
+				// 			confirmButtonText: '确定',
+				// 			callback: action => {
 
-							}
-						});
-					}
-				}
+				// 			}
+				// 		});
+				// 	}
+				// }
 				var that = this;
 				const length = this.multipleSelection.length;
 				// var val = this.selectedData;
@@ -429,16 +430,16 @@
 			// 发布任务
 			async ispublic() {
 				// 判断任务是否为该创建者创建
-				for (let i = 0; i < this.multipleSelection.length; i++) {
-					if (rybh != this.multipleSelection[i].releaser) {
-						this.$alert('任务仅创建者可以发布！', {
-							confirmButtonText: '确定',
-							callback: action => {
+				// for (let i = 0; i < this.multipleSelection.length; i++) {
+				// 	if (rybh != this.multipleSelection[i].releaser) {
+				// 		this.$alert('任务仅创建者可以发布！', {
+				// 			confirmButtonText: '确定',
+				// 			callback: action => {
 
-							}
-						});
-					}
-				}
+				// 			}
+				// 		});
+				// 	}
+				// }
 				var that = this;
 				let canPub = 0
 				const length = this.multipleSelection.length;

src/components/admin/specialMonitor.vue

@@ -319,16 +319,16 @@
 			// 发布任务
 			async ispublic() {
 				// 判断任务是否为该创建者创建
-				for (let i = 0; i < this.multipleSelection.length; i++) {
-					if (rymc != this.multipleSelection[i].releaser) {
-						this.$alert('任务仅创建者可以发布！', {
-							confirmButtonText: '确定',
-							callback: action => {
+				// for (let i = 0; i < this.multipleSelection.length; i++) {
+				// 	if (rymc != this.multipleSelection[i].releaser) {
+				// 		this.$alert('任务仅创建者可以发布！', {
+				// 			confirmButtonText: '确定',
+				// 			callback: action => {
 
-							}
-						});
-					}
-				}
+				// 			}
+				// 		});
+				// 	}
+				// }
 				var that = this;
 				let canPub = 0;
 				const length = this.multipleSelection.length;

src/components/jc/routineMonitor.vue

@@ -48,7 +48,7 @@
 				<el-button type="primary" size="small" plain icon="el-icon-edit-outline" >发布</el-button>
 				<el-button type="primary" size="small" plain icon="el-icon-scissors" >废止</el-button>
 				<el-button type="primary" size="small" plain icon="el-icon-delete" >删除</el-button> -->
-					<el-button type="primary" size="small" plain icon="el-icon-download">导出</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-download" @click="exportData">导出Excel</el-button>
 				</div>
 			</el-row>
 			<!--  表格数据区域-->
@@ -102,6 +102,42 @@
 </template>
 
 <script>
+const qee = require('qf-export-excel')
+const HeadersList = [{
+						title: '任务名称',
+						key: 'task_name',
+					},
+					{
+						title: '年度',
+						key: 'year',
+					}, {
+						title: '文件号',
+						key: 'filenum',
+					},
+					{
+						title: '开始时间',
+						key: 'starttime',
+					},
+					{
+						title: '结束时间',
+						key: 'endtime',
+					},
+					{
+						title: '创建者',
+						key: 'releaser',
+					},
+					{
+						title: '创建时间',
+						key: 'createtime',
+					},{
+						title: '任务状态',
+						key: 'ispublic'
+					},{
+						title: '任务优先级',
+						key: 'level'
+					}
+
+				]
 	export default {
 		name: '',
 		data() {
@@ -273,6 +309,64 @@
 					}
 				})
 			},
+			// 导出Excel
+			async exportData() {
+			
+				// for (var key in this.exportInfo) {
+				// 	if (this.exportInfo[key] == '') {
+				// 		delete this.exportInfo[key]
+				// 	}
+				// }
+			console.log(this.tableData)
+				let exportList = []
+					exportList = this.tableData
+					
+					for (let i = 0; i < exportList.length; i++) {
+						if (exportList[i].level == '0') {
+							exportList[i].level = '一般'
+						} else if (exportList[i].level == '1')  {
+							exportList[i].level = '紧急'
+						}else{
+							exportList[i].level = '特急'
+						}
+						if (exportList[i].ispublic == '1') {
+							exportList[i].ispublic = '已发布'
+						} else if(exportList[i].ispublic == '2')  {
+							exportList[i].ispublic = '废止'
+						}else if(exportList[i].ispublic == '3') {
+							exportList[i].ispublic = '已结束，未完成'
+						}else if(exportList[i].ispublic == '4') {
+							exportList[i].ispublic = '已结束，已完成'
+						}else if(exportList[i].ispublic == '5') {
+							exportList[i].ispublic = '执行中'
+						}
+					}
+				// 导出表格的表头设置
+				// let allColumns = exportList
+				var columnNames = []
+				var columnValues = []
+				// var columns = []
+				require.ensure([], () => {
+					const {
+						export_json_to_excel
+					} = require('@/vendor/Export2Excel.js')
+			
+					for (var i = 0; i < HeadersList.length; i++) {
+						columnNames[i] = HeadersList[i].title
+						columnValues[i] = HeadersList[i].key
+					}
+					const tHeader = columnNames
+					const filterVal = columnValues
+					// console.log(columns)
+					const list = exportList
+					const data = this.formatJson(filterVal, list)
+					export_json_to_excel(tHeader, data, '例行监测任务')
+				
+				})
+			},
+			formatJson(filterVal, jsonData) {
+				return jsonData.map(v => filterVal.map(j => v[j]))
+			},
 
 		},
 	}

src/components/jc/routineMonitorqt.vue

@@ -235,6 +235,9 @@
 		mounted: function() {
 			this.gettaskList()
 		},
+		created: function() {
+			this.gettaskList()
+		},
 		methods: {
 			handleSizeChange(val) {
 				this.queryInfo.pageSize = val;

src/components/jc/setTask.vue

@@ -26,7 +26,7 @@
 						<div>{{readForm.task_class}}</div>
 					</el-form-item>
 					<el-form-item label="检测模型:" prop="bindForm.test_model_id" width="70px" class="labelItem" required>
-						<el-select v-model="bindForm.test_model_id" size="mini">
+						<el-select v-model="bindForm.test_model_id" size="mini" placeholder="请选择">
 							<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
 							</el-option>
 						</el-select>
@@ -43,7 +43,7 @@
 				<!-- 	<el-form-item label="发布机构所属区域:" prop="year" class="labelItem" required>
 						<div>{{readForm.year}}</div>
 					</el-form-item> -->
-				<el-form-item label="机构级别:" prop="groupname" class="labelItem" required>
+				<el-form-item label="机构级别:" prop="releaserInfo.groupname" class="labelItem" required>
 					<div>{{readForm.releaserInfo.groupname}}</div>
 				</el-form-item>
 					<!-- <el-form-item label="批次:" prop="batch" width="200px" class="labelItem">
@@ -160,7 +160,7 @@
 				<taskdetail :task_id="task_id"></taskdetail>
 				<div class="footer">
 					<el-button type="success" size="mini" @click="release()">发布</el-button>
-					<el-button type="success" size="mini" @click="exportOverview()">导出总览</el-button>
+					<el-button type="success" size="mini" @click="exportOverview(task_id)">导出总览</el-button>
 					<el-button type="success" size="mini" @click="next">返回</el-button>
 				</div>
 			</el-tab-pane>
@@ -169,7 +169,7 @@
 					<taskdetail :task_id="task_id"></taskdetail>
 					<div class="footer">
 					<el-button @click="dialogVisible2 = false">取 消</el-button>
-					<el-button type="success" size="mini" @click="exportOverviewpdf">导出总览pdf</el-button>
+					<el-button type="success" size="mini" @click="exportOverviewpdf()">导出总览pdf</el-button>
 				</div>
 				</el-dialog>
 
@@ -273,11 +273,23 @@
 				dialogVisible2: false,
 				activeName: 'first',
 				id: 0,
-				readForm: {},
+				readForm: {
+					releaser: '',
+					task_name: '',
+					level: '',
+					task_class: '',
+					year: '',
+					releaserInfo:{
+						groupname: ''
+					},						
+					endtime: '',
+					file_url: '',
+					filenum: '',
+					log: ''
+				},
 				queryInfo: {
 					pageNum: 1,
 					pageSize: 10,
-					task_id: ''
 				},
 				queryInfos: {
 					pageNum: 1,
@@ -326,7 +338,7 @@
 				// 模型列表
 				options: [{
 					id: '',
-					name: ''
+					name: '' 
 				}],
 				bindForm: {
 					test_model_id: '',
@@ -390,7 +402,13 @@
 		components: {
 			taskdetail
 		},
-		mounted() {},
+		mounted() {
+			this.task_id = this.$route.params.id
+			console.log(this.$route.params.id)
+			this.getTaskDetail()
+			this.getmodelList()
+			this.getUnderTask()
+		},
 		created() {
 			this.task_id = this.$route.params.id
 			console.log(this.$route.params.id)
@@ -592,7 +610,8 @@
 				})
 			},
 			// 导出总览
-				exportOverview() {
+				exportOverview(id) {
+					console.log(this.id)
 				var that = this
 				that.dialogVisible2 = true
 			},
@@ -625,9 +644,14 @@
 				}
 				this.readForm = res.data
 				console.log(this.readForm)
-
 				this.bindForm.is_divide = res.data.is_divide
 				this.bindForm.test_model_id = Number(res.data.test_model_id)
+				if(res.data.test_model_id === null) {
+					this.bindForm.test_model_id = undefined
+				}else
+				{
+					this.bindForm.test_model_id = Number(res.data.test_model_id)
+				}
 				this.bindForm.endtime_cydsb = res.data.endtime_cydsb
 				console.log(this.divideOptions.id)
 			},

src/components/jc/setTaskcd.vue

@@ -79,7 +79,8 @@
 						<template slot="label">
 							检测对象
 						</template>
-						<span v-for="item in readForm.product">{{item.product_name}}、</span>
+						{{productNameText}}
+						<!-- <span v-for="item in readForm.product">{{item.product_name}}、</span> -->
 					</el-descriptions-item>
 				</el-descriptions>
 				<el-descriptions class="margin-top" :size="size" border>
@@ -87,7 +88,8 @@
 						<template slot="label">
 							检测项
 						</template>
-						<span v-for="item in readForm.pesticides">{{item.test_name}}、</span>
+						{{pesticidesNameText}}
+						<!-- <span v-for="item in readForm.pesticides">{{item.test_name}}、</span> -->
 					</el-descriptions-item>
 				</el-descriptions>
 				<el-table :data="underTask" border stripe highlight-current-row style="width: 100%"
@@ -98,52 +100,58 @@
 				<div class="footer">
 					<el-button type="success" size="mini" @click="input()">填报抽样单</el-button>
 					<!-- <el-button type="success" size="mini" @click="next">导出总览</el-button> -->
-					<el-button type="success" size="mini" @click="back">返回</el-button>
+					<!-- <el-button type="success" size="mini" @click="back">返回</el-button> -->
 				</div>
 			</el-tab-pane>
 
 			<el-tab-pane v-if="sampleShow==true" label="抽样" name="second">
 				<!-- 头部搜索栏 -->
-				<el-row style="margin-right: 0px;">
-					<el-form style="display: flex; flex-direction: row;">
-						<el-form-item label="产品编码" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
-						</el-form-item>
-						<el-form-item label="受检单位" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
-						</el-form-item>
-						<el-form-item label="抽样编码" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+				
+					<el-form style="display: flex; flex-direction: column;" ref="form2" :model="queryInfo">
+						<el-row style="width: 75%;">
+							<el-col :span="6">
+						<el-form-item label="样品名称" class="select" size="small" prop="sample_name">
+							<el-input v-model="queryInfo.sample_name"></el-input>
 						</el-form-item>
-						<el-form-item label="样品名称" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+							</el-col>
+							<el-col :span="6">
+						<el-form-item label="样品编码" class="select" size="small" prop="sample_id">
+							<el-input v-model="queryInfo.sample_id"></el-input>
 						</el-form-item>
-					</el-form>
-				</el-row>
-				<el-row style="margin-right: 0px;">
-					<el-form style="display: flex; flex-direction: row;">
-						<el-form-item label="抽样场所" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+							</el-col>
+							<el-col :span="6">
+						<el-form-item label="受检单位" class="select" size="small" prop="units_name">
+							<el-input v-model="queryInfo.units_name"></el-input>
 						</el-form-item>
-						<el-form-item label="抽样日期" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+						</el-col>
+						</el-row>
+						<el-row style="width: 75%;">
+							<el-col :span="6">
+						<el-form-item label="抽样单位" class="select" size="small" prop="sample_unit_name">
+							<el-input v-model="queryInfo.sample_unit_name"></el-input>
 						</el-form-item>
-						<el-form-item label="抽样单位" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+						    </el-col>
+							<el-col :span="6">
+						<el-form-item label="抽样日期" class="select" size="small" prop="sample_data">
+							<el-input v-model="queryInfo.sample_data"></el-input>
 						</el-form-item>
-						<el-form-item label="抽样机构" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+						</el-col>
+						<el-col :span="6">
+						<el-form-item label="抽样场所" class="select" size="small" prop="sample_ground">
+							<el-input v-model="queryInfo.sample_ground"></el-input>
 						</el-form-item>
-						<el-button style="height: 30px;margin-left: 10px;" size="mini" type="success"
+						</el-col>
+						<el-col :span="4">
+							<el-button style="height: 32px;margin-left: 10px;" size="mini" type="success"
 							@click="searchData()">查询
 						</el-button>
 						<!-- 重置 -->
-						<el-button style="height: 30px;margin-left: 5px;" size="mini" type="success" @click="reset()">
+						<el-button style="height: 32px;margin-left: 5px;" size="mini" type="success" @click="resetForm('form2')">
 							重置
 						</el-button>
+						</el-col>
+						</el-row>
 					</el-form>
-
-				</el-row>
 				<el-row style="margin-right: 0px;">
 					<el-form style="display: flex; flex-direction: row;">
 						<!-- 	<el-form-item label="产地" class="select">
@@ -416,8 +424,10 @@
 							:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
 					</el-table>
 				</div>
+				<div  style="margin-top: 10px; text-align: center">
 				<el-button @click="dialogVisible2 = false">取 消</el-button>
 				<el-button type="primary" @click="download">生成检测报告pdf</el-button>
+				</div>
 				<!-- </span> -->
 			</el-dialog>
 
@@ -450,13 +460,21 @@
 				dialogVisible2: false,
 				activeName: 'first',
 				id: 0,
+				productNameText: '',
+				pesticidesNameText: '',
 				readForm: {},
 				underTask: [],
 				underTasktotal: '0',
 				queryInfo: {
 					pageNum: 1,
 					pageSize: 10,
-					task_id: ''
+					task_id: '',
+					sample_id: '',
+					units_name: '',
+					sample_name: '',
+					sample_data: '',
+					sample_unit_name: '',
+					sample_ground: '',
 				},
 				// 填报对话框弹出
 				inputDialogShow: false,
@@ -648,6 +666,19 @@
 			// 	);
 			// 	this.options = res.data.rows
 			// },	// 获取任务详情
+
+			//查询
+			async searchData() {
+				console.log(this.queryInfo)
+				this.queryInfo.pageNum = 1
+				this.getSampleList()
+			},
+			//重置
+			resetForm(formName) {
+				// console.log(this.queryInfo)
+					this.$refs[formName].resetFields();
+			},
+			//获取任务详情
 			async getTaskDetail() {
 				var that = this
 				const {
@@ -668,6 +699,8 @@
 					}
 				}
 				that.readForm = res.data
+				that.productNameText = that.readForm.product.map(el => el.product_name).join('、 ')
+				that.pesticidesNameText = that.readForm.pesticides.map(el => el.test_name).join('、 ')
 				// 抽检不分离
 				if (that.readForm.is_divide == 0) {
 					this.sampleShow = true
@@ -687,9 +720,11 @@
 					that.formjc = result.data.data
 				}
 			},
+			//下载检测报告
 			download() {
 				htmlToPdf.downloadPDF(document.querySelector('#pdf'), '检测报告')
 			},
+			//生成检测报告pdf
 			async creatpdf(sample_id) {
 				var that = this
 				that.dialogVisible2 = true
@@ -769,6 +804,11 @@
 
 			// 获取抽样单列表
 			async getSampleList() {
+								for (var key in this.queryInfo) {
+					if (this.queryInfo[key] == '') {
+						delete this.queryInfo[key]
+					}
+				}
 				this.queryInfo['task_id'] = this.task_id
 				const {
 					data: res
@@ -815,7 +855,13 @@
 			},
 			// 返回
 			back() {
-
+				var that = this
+				this.$router.push({
+					name: 'setTaskcd',
+					params: {
+						id: that.id
+					}
+				})
 			},
 			// 上传抽样信息
 			async appear() {

src/components/jc/specialMonitorcd.vue

@@ -48,7 +48,7 @@
 				<el-button type="primary" size="small" plain icon="el-icon-edit-outline" >发布</el-button>
 				<el-button type="primary" size="small" plain icon="el-icon-scissors" >废止</el-button>
 				<el-button type="primary" size="small" plain icon="el-icon-delete" >删除</el-button> -->
-					<el-button type="primary" size="small" plain icon="el-icon-download">导出</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-download" @click="exportData">导出Excel</el-button>
 				</div>
 			</el-row>
 			<!--  表格数据区域-->
@@ -101,6 +101,41 @@
 </template>
 
 <script>
+const qee = require('qf-export-excel')
+const HeadersList = [{
+						title: '任务名称',
+						key: 'task_name',
+					},
+					{
+						title: '年度',
+						key: 'year',
+					}, {
+						title: '文件号',
+						key: 'filenum',
+					},
+					{
+						title: '开始时间',
+						key: 'starttime',
+					},
+					{
+						title: '结束时间',
+						key: 'endtime',
+					},
+					{
+						title: '创建者',
+						key: 'releaser',
+					},
+					{
+						title: '创建时间',
+						key: 'createtime',
+					},{
+						title: '任务状态',
+						key: 'ispublic'
+					},{
+						title: '任务优先级',
+						key: 'level'
+					}
+				]
 	export default {
 		name: '',
 		data() {
@@ -263,6 +298,64 @@
 					}
 				})
 			},
+			// 导出Excel
+			async exportData() {
+			
+				// for (var key in this.exportInfo) {
+				// 	if (this.exportInfo[key] == '') {
+				// 		delete this.exportInfo[key]
+				// 	}
+				// }
+			console.log(this.tableData)
+				let exportList = []
+					exportList = this.tableData
+					
+					for (let i = 0; i < exportList.length; i++) {
+						if (exportList[i].level == '0') {
+							exportList[i].level = '一般'
+						} else if (exportList[i].level == '1')  {
+							exportList[i].level = '紧急'
+						}else{
+							exportList[i].level = '特急'
+						}
+						if (exportList[i].ispublic == '1') {
+							exportList[i].ispublic = '已发布'
+						} else if(exportList[i].ispublic == '2')  {
+							exportList[i].ispublic = '废止'
+						}else if(exportList[i].ispublic == '3') {
+							exportList[i].ispublic = '已结束，未完成'
+						}else if(exportList[i].ispublic == '4') {
+							exportList[i].ispublic = '已结束，已完成'
+						}else if(exportList[i].ispublic == '5') {
+							exportList[i].ispublic = '执行中'
+						}
+					}
+				// 导出表格的表头设置
+				// let allColumns = exportList
+				var columnNames = []
+				var columnValues = []
+				// var columns = []
+				require.ensure([], () => {
+					const {
+						export_json_to_excel
+					} = require('@/vendor/Export2Excel.js')
+			
+					for (var i = 0; i < HeadersList.length; i++) {
+						columnNames[i] = HeadersList[i].title
+						columnValues[i] = HeadersList[i].key
+					}
+					const tHeader = columnNames
+					const filterVal = columnValues
+					// console.log(columns)
+					const list = exportList
+					const data = this.formatJson(filterVal, list)
+					export_json_to_excel(tHeader, data, '专项监测任务')
+				
+				})
+			},
+			formatJson(filterVal, jsonData) {
+				return jsonData.map(v => filterVal.map(j => v[j]))
+			},
 
 		},
 	}

src/components/jc/specialMonitorqt.vue

@@ -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;
 	}