主体信息 个人中心 新增任务

src/components/admin.vue

@@ -13,6 +13,7 @@
 					<span>安徽省农产品质量安全监测系统</span>
 				</div>
 				<div class="right-function-container">
+					<el-button type="text" style="color:#FFFFFF" size="medium" @click="getAccount()">个人中心</el-button>
 					<el-button @click="logout">
 						退 出
 					</el-button>
@@ -24,7 +25,8 @@
 				<el-aside style="width: 210px;">
 					<!--        页面左侧菜单区域-->
 					<el-menu :default-active="$route.path" background-color="#EEF1F6" text-color="#48576a"
-						active-text-color="#31B404" :unique-opened="true" :collapse-transition="false" :router="true">
+						active-text-color="#31B404"  :collapse-transition="false" :router="true">
+						<!-- :unique-opened="true" -->
 						<!--            <el-menu-item
               index="/admin"
               @click="addTab('系统首页', '/admin')"
@@ -126,6 +128,19 @@
 				//     }]
 				//   },
 				{
+					// icon: 'el-icon-user-solid',
+					subMenuName: '主体信息管理',
+					children: [{
+							id: '4-1',
+							subMenuName: '检测机构',
+							path: '/admin/getOrganization'
+					},{
+							id: '4-2',
+							subMenuName: '监管机构',
+							path: '/admin/getMonitor'
+					}]
+				},
+				{	
 					// icon: 'el-icon-user-solid',
 					subMenuName: '监测任务',
 					children: [{
@@ -136,22 +151,30 @@
 							id: '5-2',
 							subMenuName: '专项监测',
 							path: '/admin/specialMonitor'
+						},
+						{
+						     id: '5-3',
+						     subMenuName: '监测抽查',
+						     path: '/admin/checkMonitor'
 						}
-						// ,{
-						//      id: '5-3',
-						//      subMenuName: '监测抽查',
-						//      path: '/admin/checkMonitor'
-						//    },{
 						//      id: '5-4',
 						//      subMenuName: '复检任务',
 						//      path: '/admin/'
 						//    },
-					]
+						]
 				},
+				//   },
+				
 			]
 			this.menuList = data
 		},
 		methods: {
+			// async getAccount() {
+			// 	const result = await this.$http.post('getAccount', {
+			// 		})},
+				getAccount() {
+				this.$router.push('getAccount')
+			},		
 			handleOpen(index) {
 				console.log(index)
 			},
@@ -265,16 +288,16 @@
 		padding-top: 8px !important;
 	}
 
-	.el-menu-item.is-active {
+	// .el-menu-item.is-active {
 		// background-color: #3ace04 !important;
-	}
+	// }
 
 
-	.admin-logo-container {
+	// .admin-logo-container {
 		// border-color: #5EB9DE;
 		// border-right-width: 1px;
 		// border-right-style: solid;
-	}
+	// }
 
 	.admin-logo {
 		margin-left: 5px;
@@ -328,4 +351,9 @@
 		position: absolute;
 		right: 15px;
 	}
+	.el-icon-s-custom{
+		padding: 5px;
+		float: right;
+		margin-top:10px;
+	}
 </style>

src/components/admin/addTask.vue

@@ -11,8 +11,8 @@
 		<div class="title">
 			例行监测
 		</div>
-		<el-form :model="form" label-width="100px">
 
+		<el-form :model="form" label-width="100px">
 			<el-form-item label="任务名称" required>
 				<el-input v-model="form.task_name" placeholder="最长40字符"></el-input>
 			</el-form-item>
@@ -48,12 +48,18 @@
 			<!-- <el-form-item label="发布单位" required>
 				<el-input v-model="rymc" :disabled="true"></el-input>
 			</el-form-item> -->
-			<el-form-item label="牵头单位" required>
+			<!-- <el-form-item label="牵头单位" required>
 				<el-input v-model="form.main_unit" @focus="getTestListShow = true"></el-input>
-			</el-form-item>
+			</el-form-item> -->
 			<el-form-item label="文件号">
 				<el-input v-model="form.filenum"></el-input>
 			</el-form-item>
+			<el-form-item label="抽检分离:" prop="is_divide" width="70px" class="labelItem" required>
+					<el-select  v-model="form.is_divide" size="" >
+						<el-option v-for="item in divideOptions" :key="item.id" :label="item.name" :value="item.id">
+						</el-option>
+					</el-select>
+			</el-form-item>
 			<el-form-item label="备注">
 				<el-input type="textarea" placeholder="最长300字符" v-model="form.log"></el-input>
 			</el-form-item>
@@ -66,36 +72,11 @@
 				</el-upload>
 			</el-form-item>
 			<el-form-item>
-				<el-button type="success" @click="onSubmit">保存</el-button>
-				<el-button @click="reBack">返回</el-button>
+				<el-button type="success" @click="onSubmit()">保存</el-button>
+				<el-button type="success" @click="nextStep()">下一步</el-button>
+				<el-button @click="reBack()">返回</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- 选择检测机构对话框 -->
-		<el-dialog title="机构选择" :visible.sync="getTestListShow" width="50%" :close-on-click-modal="false"
-			@open="getTestList()" class="dialogItem">
-			<el-form v-if="getTestListShow" :model="getTestListForm">
-				<!--  表格数据区域-->
-				<el-table ref="multipleTable" :data="testList" row-key="id" @selection-change="handleSelectionChange"
-					border stripe highlight-current-row style="width: 100%">
-					<el-table-column type="selection" :reserve-selection="true" width="50"></el-table-column>
-					<el-table-column label="序号" width="50px">
-						<template slot-scope="scope">
-							{{ scope.$index+1 }}
-						</template>
-					</el-table-column>
-					<el-table-column :key="table.prop" v-for="table in tableHeader" :label="table.label"
-						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
-				</el-table>
-				<div class="footer">
-					<!--    分页器区域-->
-					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-						:current-page="queryInfo.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo.pageSize"
-						layout="total, sizes, prev, pager, next, jumper" :total="total" background />
-					<el-button type="success" @click="choseTest()">提交</el-button>
-				</div>
-
-			</el-form>
-		</el-dialog>
 	</div>
 </template>
 <script>
@@ -110,7 +91,7 @@
 				},
 				// 任务表单
 				form: {
-					main_unit: [],			
+					main_unit: [],	
 				},
 				// 优先级选项
 				priority: [{
@@ -133,45 +114,22 @@
 				}, {
 					label: '四季度'
 				}],
-				// 弹出检测机构弹窗
-				getTestListShow: false,
-				// 查询检测机构请求参数
-				queryInfo: {
-					pageNum: 1,
-					pageSize: 10,
-					keyWord: ''
-				},
-				// 检测机构列表
-				testList: [],
-				// 表头
-				tableHeader: [{
-						label: '单位名称',
-						prop: 'name',
-						width: 300
-						// fixed: 'left'
+				// 抽检分离选项
+				divideOptions: [{
+						id: 0,
+						name: '否'
 					},
 					{
-						label: '机构类型',
-						prop: 'groupname',
-						// width: 40
-						// fixed: 'left'
-					}, {
-						label: '所属区域',
-						prop: 'ssqy',
-						width: 300
-						// fixed: 'left'
+						id: 1,
+						name: '是'
 					}
 				],
-				// 总共多少条数据
-				total: 0,
-				// table表格多选选项
-				multipleSelection: null,
-				getTestListForm: {},
-				// 选中的牵头单位
-				orgs: [],
 				// 上传成功文件列表
 				fileList: []
 			}
+		},
+		created() {
+			
 		},
 		mounted() {
 			let that = this
@@ -186,7 +144,6 @@
 			//           );
 			//         });
 			//       });
-
 			// this.$nextTick(() => {
 			//   this.testList.forEach(outerItem => {
 			//     this.multipleSelection[this.page.current - 1] && this.multipleSelection[this.page.current - 1].forEach(item => {
@@ -198,6 +155,7 @@
 			// })
 		},
 		methods: {
+			//保存
 			async onSubmit() {
 				this.form['token'] = token
 				this.form['groupname'] = this.groupname
@@ -205,91 +163,108 @@
 				this.form['releaser'] = window.sessionStorage.getItem('rymc')
 				this.form['task_class'] = '例行监测'
 				this.form['ispublic'] = 0
-				console.log(this.form)
-				const result = await this.$http.post('AddTask', this.form)
+				const result = await this.$http.post('postTasks', this.form)
+				
+				
 				// 判断业务逻辑
-				if (result.data.code == 0) {
-					this.$router.push('routineMonitor')
+				if (result.code == 0) {
+						this.$message({
+						type: 'success',
+						message: result.data.message
+					})
 				} else {
 					this.$message({
-						type: 'error',
+						type: 'success',
 						message: result.data.message
 					})
 				}
+					
 			},
+			//返回
 			reBack() {
 				this.$router.push('routineMonitor')
 			},
-			// 获取任务列表
-			async getTask() {
-				const result = await this.$http.post('', this.queryInfo)
-				// 判断业务逻辑
-				if (result.data.code == 0) {
-					this.testList = result.data.data.rows
-					this.total = result.data.data.total
-				}else{
-					this.$message({
-						type: 'error',
-						message: result.data.message
-					})
+			//下一步
+			nextStep(id){
+			console.log(id)
+			this.$router.push({
+				name:'addTaskJcObject',
+				params:{
+					task_id:id
 				}
-			},
+			})
+			},			
+			// 获取任务列表
+			// async postTasks() {
+			// 	const result = await this.$http.post('postTasks', this.queryInfo)
+			// 	// 判断业务逻辑
+			// 	if (result.data.code == 0) {
+			// 		this.testList = result.data.data.rows
+			// 		this.total = result.data.data.total
+			// 		this.task_id = result.data.data.task_id
+			// 	}else{
+			// 		this.$message({
+			// 			type: 'error',
+			// 			message: result.data.message
+			// 		})
+			// 	}
+			// },
 			// 获取检测机构列表
-			async getTestList() {
-				this.queryInfo['token'] = token
-				const result = await this.$http.post('getTestList', this.queryInfo)
-				console.log(result);
+			// async getTestList() {
+			// 	this.queryInfo['token'] = token
+			// 	const result = await this.$http.post('getTestList', this.queryInfo)
+			// 	console.log(result);
 				// 判断业务逻辑
-				if (result.data.code == 0) {
-					this.testList = result.data.data.rows
-					this.total = result.data.data.total
-				}
-			},
+			// 	if (result.data.code == 0) {
+			// 		this.testList = result.data.data.rows
+			// 		this.total = result.data.data.total
+			// 	}
+			// },
 			/** 修复当用户在大于1的分页进行数据搜索没有返回值的问题 */
-			setPageNum() {
-				this.queryInfo.pageNum = 1
-				this.getTestList()
-			},
-			setSelectedRow() {
-				// 设置当前页已选项
-				this.hander = true
-				this.testList.forEach(item => {
-					if (this.list.includes(item[this.uniqueKey])) {
-						this.$refs.multipleTable.toggleRowSelection(item, true)
-					}
-				})
-				this.hander = false
-			},
+			// setPageNum() {
+			// 	this.queryInfo.pageNum = 1
+			// 	this.getTestList()
+			// },
+			// setSelectedRow() {
+			// 	// 设置当前页已选项
+			// 	this.hander = true
+			// 	this.testList.forEach(item => {
+			// 		if (this.list.includes(item[this.uniqueKey])) {
+			// 			this.$refs.multipleTable.toggleRowSelection(item, true)
+			// 		}
+			// 	})
+			// 	this.hander = false
+			// },
 
 			/** 监听每页显示多少数据的改变 */
-			handleSizeChange(newSize) {
-				this.queryInfo.pageSize = newSize
-				this.getTestList()
-			},
+			// handleSizeChange(newSize) {
+			// 	this.queryInfo.pageSize = newSize
+			// 	this.getTestList()
+			// },
 
 			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.getTestList()
-			},
-			// 批量勾选
-			handleSelectionChange(val) {
-				this.multipleSelection = val
-				if (this.hander) return false
-				// this.setSelectRows() // 处理选中的方法
-			},
+			// handleCurrentChange(newPage) {
+			// 	this.queryInfo.pageNum = newPage
+			// 	this.getTestList()
+			// },
+			// // 批量勾选
+			// handleSelectionChange(val) {
+			// 	this.multipleSelection = val
+			// 	if (this.hander) return false
+			// 	// this.setSelectRows() // 处理选中的方法
+			// },
 			// 提交
-			choseTest() {
-				let that = this
-				that.orgs = that.multipleSelection
-				console.log(that.orgs)
-				that.form.main_unit = that.multipleSelection.map(el => el.name).join(', ')
-				console.log(that.form.main_unit)
+			// choseTest() {
+			// 	let that = this
+			// 	that.orgs = that.multipleSelection
+			// 	console.log(that.orgs)
+			// 	that.form.main_unit = that.multipleSelection.map(el => el.name).join(', ')
+			// 	console.log(that.form.main_unit)
 				// that.form.main_unit = that.multipleSelection
 				// for(let i=0;i<that.multipleSelection.length;i++){
 				// 	that.form.main_unit.push(that.multipleSelection[i].name)
 				// }
-				that.getTestListShow = false
+				// that.getTestListShow = false
 
 			},
 			// 上传成功
@@ -299,7 +274,7 @@
 				this.form.file_name = res.data.fileName
 			}
 		}
-	}
+	
 </script>
 <style lang="less" scoped>
 	.title {

src/components/admin/addTaskJcObject.vue

@@ -0,0 +1,466 @@
+<template>
+	<div style="width: 100%">
+		<el-breadcrumb separator-class="el-icon-arrow-right">
+
+			<el-breadcrumb-item>首页</el-breadcrumb-item>
+			<el-breadcrumb-item>监测任务</el-breadcrumb-item>
+			<el-breadcrumb-item>例行监测</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{path:'/admin/routineMonitor'}">任务列表</el-breadcrumb-item>
+			<el-breadcrumb-item>添加任务</el-breadcrumb-item>
+		</el-breadcrumb>
+		<div class="title">
+			例行监测
+		</div>
+		<el-form :model="form" label-width="100px">
+			<el-form-item prop="main_unit" label="抽样机构"  required>
+				<el-input v-model="form.main_unit" @focus="getOrganizationsShow1 = true"></el-input>
+			</el-form-item>
+			<el-form-item prop="check_unit" label="检测机构"   required>
+					<el-input v-model="form.check_unit" @focus="getOrganizationsShow2 = true"></el-input>
+			</el-form-item>
+			<el-form-item prop="sample_address" label="地区"   required>
+				<el-cascader  :options="region" v-model="sample_address"
+					@change="handleChange">
+				</el-cascader>
+			</el-form-item>
+		<!-- 底部按钮 -->
+			<el-form-item>
+				<el-button type="success" @click="onSubmit()">保存</el-button>
+				<el-button @click="reBack">返回</el-button>
+			</el-form-item>
+		</el-form>
+
+		<!-- 选择抽样机构对话框 -->
+		<el-dialog title="机构选择" :visible.sync="getOrganizationsShow1" width="50%" :close-on-click-modal="false" @open="getOrganizations1()" class="dialogItem">
+			<el-form v-if="getOrganizationsShow1" :model="getOrganizationsForm1">
+		<!-- 检索功能 -->
+		<el-row :gutter="20">
+			<el-col :span="6">
+				<!-- 组别名称 -->
+				<el-form-item label="组别名称">
+					<el-select v-model="form.groupname" clearable>
+						<el-option v-for="item in group" :key="item.value" :label="item.label" :value="item.value">
+						</el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="6">
+				<!-- 机构性质 -->
+				<el-form-item label="机构性质">
+						<el-select v-model="form.properties" clearable>
+							<el-option v-for="item in field" :key="item.value" :label="item.label" :value="item.value">
+							</el-option>
+						</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="6">
+				<!-- 输入匹配关键词 -->
+				<!-- <el-form-item label="搜索名称">
+					<el-autocomplete
+						class="inline-input"
+						v-model="state2"
+						:fetch-suggestions="querySearch"
+						placeholder="请输入内容"
+						:trigger-on-focus="false"
+						@select="handleSelect">
+					</el-autocomplete>
+				</el-form-item> -->
+			</el-col>
+			<el-col :span="6">
+			<el-button type="success" @click="querySearch()" style="margin-top:40px">搜索</el-button>
+			</el-col>
+		</el-row>
+				<!--  表格数据区域-->
+				<el-table ref="multipleTable" :data="testList" row-key="id" @selection-change="handleSelectionChange1"
+					border stripe highlight-current-row style="width: 100%">
+					<el-table-column type="selection" :reserve-selection="true" width="50"></el-table-column>
+					<el-table-column label="序号" width="50px">
+						<template slot-scope="scope">
+							{{ scope.$index+1 }}
+						</template>
+					</el-table-column>
+					<el-table-column :key="table.prop" v-for="table in tableHeader" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+				</el-table>
+				<div class="footer">
+					<!--    分页器区域-->
+					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+						:current-page="queryInfo1.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo1.pageSize"
+						layout="total, sizes, prev, pager, next, jumper" :total="total" background />
+					<el-button type="success" @click="choseTest1()">提交</el-button>
+				</div>
+				
+			</el-form>
+		</el-dialog>
+
+		<!-- 选择检测机构对话框 -->
+		<el-dialog title="机构选择" :visible.sync="getOrganizationsShow2" width="50%" :close-on-click-modal="false" @open="getOrganizations2()" class="dialogItem">
+			<el-form v-if="getOrganizationsShow2" :model="getOrganizationsForm2">
+		<!-- 检索功能 -->
+		<el-row :gutter="20">
+			<el-col :span="6">
+				<!-- 组别名称 -->
+				<el-form-item label="组别名称">
+					<el-select v-model="form.groupname" clearable>
+						<el-option v-for="item in group" :key="item.value" :label="item.label" :value="item.value">
+						</el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="6">
+				<!-- 机构性质 -->
+				<el-form-item label="机构性质">
+						<el-select v-model="form.properties" clearable>
+							<el-option v-for="item in field" :key="item.value" :label="item.label" :value="item.value">
+							</el-option>
+						</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="6">
+				<!-- 输入匹配关键词 -->
+				<!-- <el-form-item label="搜索名称">
+					<el-autocomplete
+						class="inline-input"
+						v-model="state2"
+						:fetch-suggestions="querySearch"
+						placeholder="请输入内容"
+						:trigger-on-focus="false"
+						@select="handleSelect">
+					</el-autocomplete>
+				</el-form-item> -->
+			</el-col>
+			<el-col :span="6">
+			<el-button type="success" @click="choseTest()" style="margin-top:40px">搜索</el-button>
+			</el-col>
+		</el-row>
+				<!--  表格数据区域-->
+				<el-table ref="multipleTable" :data="testList" row-key="id"  @current-change="handleSelectionChange2"
+					border stripe highlight-current-row style="width: 100%" >
+					<!-- <el-table :data="testList" border stripe highlight-current-row  @current-change="handleSelectionChange2" style="width: 100%"
+					:row-style="rowStyle" :cell-style="cellStyle"> -->
+					<el-table-column type="selection" :reserve-selection="true" width="50"></el-table-column>
+					<el-table-column label="序号" width="50px">
+						<template slot-scope="scope">
+							{{ scope.$index+1 }}
+						</template>
+					</el-table-column>
+					<el-table-column :key="table.prop" v-for="table in tableHeader" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+				</el-table>
+				<div class="footer">
+					<!--    分页器区域-->
+					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+						:current-page="queryInfo2.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo2.pageSize"
+						layout="total, sizes, prev, pager, next, jumper" :total="total" background />
+					<el-button type="success" @click="choseTest2()">提交</el-button>
+				</div>
+				
+			</el-form>
+		</el-dialog>
+			
+
+	</div>
+</template>
+<script>
+import {
+		regionData,
+		regionDataPlus,
+	} from 'element-china-area-data'
+	const rymc = window.sessionStorage.getItem('rymc')
+	const token = window.sessionStorage.getItem('token')
+	export default {
+		data() {
+			return {
+					form: {
+					bear_unit: '',
+					report_unit: '',
+					// check_unit: '',
+					sample_number: '',
+					sample_address: '',
+					uploadtime: '',
+					groupname:'',
+					properties:'',
+					main_unit:[],
+					check_unit:[]
+				},
+				currentRow: null,
+				//组别名称
+				group: [{
+					value: '1',
+					label: '检测机构'
+				}, {
+					value: '2',
+					label: '县级监管单位'
+				}, {
+					value: '3',
+					label: '市级监管单位'
+				},{
+					value: '4',
+					label: '省级监管单位'
+				}],
+				//机构性质
+				field: [{
+					value: '1',
+					label: '政府部门'
+				}, {
+					value: '2',
+					label: '事业单位'
+				}, {
+					value: '3',
+					label: '企业'
+				}],
+
+				// 抽样地区
+				region: regionData,
+				// sample_address: [],
+				// 机构地域表格数据
+				underTask: [],
+				underTasktotal: 0,
+				// 抽检分离选项
+				divideOptions: [{
+						id: 0,
+						name: '否'
+					},
+					{
+						id: 1,
+						name: '是'
+					}
+				],
+				// rymc: rymc,		//从本地缓存获取发布单位
+				myHeaders: {
+					Authorization: 'bearer'+ token			//上传文件添加token
+				},
+				// 任务表单
+				// form: {
+				// 	main_unit: [],	
+				// 	check_unit: [],				
+				// },
+				// form: {
+				// 	check_unit: [],			
+				// },
+				// 优先级选项
+				priority: [{
+					value: '0',
+					label: '一般'
+				}, {
+					value: '1',
+					label: '紧急'
+				}, {
+					value: '2',
+					label: '特急'
+				}],
+				// 批次选项
+				batch: [{
+					label: '一季度'
+				}, {
+					label: '二季度'
+				}, {
+					label: '三季度'
+				}, {
+					label: '四季度'
+				}],
+
+				// 弹出抽样机构弹窗
+				getOrganizationsShow1: false,
+				// 查询检测机构请求参数
+				queryInfo1: {
+					pageNum: 1,
+					pageSize: 10,
+					keyWord: ''
+				},
+
+				// 弹出检测机构弹窗
+				getOrganizationsShow2: false,
+				// 查询检测机构请求参数
+				queryInfo2: {
+					pageNum: 1,
+					pageSize: 10,
+					keyWord: ''
+				},
+				// 检测机构列表
+				testList: [],
+				// 表头
+				tableHeader: [{
+						label: '单位名称',
+						prop: 'name',
+						width: 300
+						// fixed: 'left'
+					},
+					{
+						label: '机构类型',
+						prop: 'properties',
+						width:150
+						// fixed: 'left'
+					}, {
+						label: '组别名称',
+						prop: 'groupname',
+						width: 300
+						// fixed: 'left'
+					}
+				],
+				// 总共多少条数据
+				total: 0,
+				// table表格多选选项
+				// multipleSelection: null,
+				getOrganizationsForm1: {},
+				getOrganizationsForm2: {},
+				// 选中的牵头单位
+				orgs: [],
+				// 上传成功文件列表
+				fileList: []
+			}
+		},
+		created:function(){
+			this.postTaskProfile()
+		},
+		
+		mounted() {
+			let that = this
+		},
+		methods: {
+			// 获取接口
+				async postTaskProfile() {
+				const result = await this.$http.post('postTaskProfile', {
+					task_id: this.task_id,
+					// pageSize:this.queryInfo.pageSize,
+					// pageNum:this.queryInfo.pageNum
+				})},
+			// 获取选择抽样地区
+			handleChange() {
+				var that = this
+				var loc = "";
+				// console.log(this.form.place)
+				for (let i = 0; i < this.sample_address.length; i++) {
+					loc += CodeToText[this.sample_address[i]];
+				}
+				// console.log(loc)
+				that.form.sample_address = loc
+			},
+			//保存
+			async onSubmit() {
+				this.form['token'] = token
+				this.form['groupname'] = this.groupname
+				this.form['orgs'] = this.orgs
+				this.form['releaser'] = window.sessionStorage.getItem('rymc')
+				this.form['task_class'] = '例行监测'
+				this.form['ispublic'] = 0
+				
+				const result = await this.$http.post('postTaskProfile', this.form)
+				// 判断业务逻辑
+				if (result.data.code == 0) {
+					this.$router.push('routineMonitor')
+				} else {
+					this.$message({
+						type: 'error',
+						message: result.data.message
+					})
+				}
+			},
+			reBack() {
+				this.$router.push('addTask')
+			},		
+			// 获取抽样机构列表
+			async getOrganizations1() {
+				this.queryInfo1['token'] = token
+				const result = await this.$http.post('getOrganizations', this.queryInfo1)
+				console.log(result.data.code);
+				// 判断业务逻辑
+				if (result.data.code == 0) {
+					this.testList = result.data.data.rows
+					this.total = result.data.data.total
+				}
+			},
+
+			// 获取检测机构列表
+			async getOrganizations2() {
+				this.queryInfo2['token'] = token
+				const result = await this.$http.post('getOrganizations', this.queryInfo2)
+				console.log(result.data.code);
+				// 判断业务逻辑
+				if (result.data.code == 0) {
+					this.testList = result.data.data.rows
+					this.total = result.data.data.total
+				}
+			},
+			/** 修复当用户在大于1的分页进行数据搜索没有返回值的问题 */
+			setPageNum() {
+				this.queryInfo.pageNum = 1
+				this.getOrganizations1()
+			},
+			setSelectedRow() {
+				// 设置当前页已选项
+				this.hander = true
+				this.testList.forEach(item => {
+					if (this.list.includes(item[this.uniqueKey])) {
+						this.$refs.multipleTable.toggleRowSelection(item, true)
+					}
+				})
+				this.hander = false
+			},
+
+			/** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.queryInfo1.pageSize = newSize
+				this.getOrganizations1()
+			},
+
+			/** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.queryInfo1.pageNum = newPage
+				this.getOrganizations1()
+			},
+			//批量勾选
+			// handleSelectionChange(val) {
+			// 	this.multipleSelection = val
+			// 	if (this.hander) return false
+			// 	this.setSelectRows() // 处理选中的方法
+			// },
+			//选中抽样（单选）
+			handleSelectionChange1(val) {
+				this.currentRow = val;
+				console.log(this.currentRow)
+				console.log(this.currentRow[0].name)
+			},
+			//选中检测（单选）
+			handleSelectionChange2(val) {
+				this.currentRow = val;
+				console.log(this.currentRow)
+				console.log(this.currentRow[0].name)
+			},
+			// 抽样单位提交
+			choseTest1() {
+				let that = this
+				that.orgs = that.currentRow[0].name
+				// console.log(that.orgs)
+				that.form.main_unit = that.currentRow[0].name
+				that.getOrganizationsShow1 = false
+			},
+			// 检测单位提交
+			choseTest2() {
+				let that = this
+				that.orgs = that.currentRow[0].name
+				// console.log(that.orgs)
+				that.form.check_unit = that.currentRow[0].name
+				that.getOrganizationsShow2 = false
+			},
+		}
+	}
+</script>
+<style lang="less" scoped>
+	.title {
+		margin-left: 50%;
+		margin-bottom: 20px;
+	}
+
+	.el-form {
+		width: 800px;
+		margin: 0 auto;
+	}
+
+	.footer {
+		margin-top: 5px;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+</style>

src/components/admin/checkMonitor.vue

@@ -1,9 +1,8 @@
+
 <template>
 	<div style="width: 100%">
-		<el-card class="box-card">
-			<div slot="header" class="clearfix">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			
+	<div slot="header" class="clearfix">
+		<el-breadcrumb separator-class="el-icon-arrow-right">		
 		  <el-breadcrumb-item >首页</el-breadcrumb-item>
 		  <el-breadcrumb-item>监测任务</el-breadcrumb-item>
 		  <el-breadcrumb-item>例行监测</el-breadcrumb-item>
@@ -11,69 +10,114 @@
 		</el-breadcrumb>
 		</div>
 		
-		<!-- 头部搜索栏 -->
-		<el-row :gutter="50" style="margin-right: 0px;">
-			<el-form style="display: flex; flex-direction: row;">
-				<el-form-item label="年度" class="select">
-					<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy" type="year"
-						clearable />
+		<!-- 头部查询栏 -->
+		<div class="headSearch">
+			<el-row :gutter="120" style="margin-right: 0px;">
+				<el-form :inline="true">
+				<!-- <el-form style="display: flex; flex-direction: row;" > -->
+				<el-form-item label="年度" class="select" size="small">
+					<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="small">
 					<el-select v-model="queryInfo.ispublic" style="width: 110px;" clearable>
-						<el-option v-for="item in taskispublic" :key="item.value" :label="item.label"
+						<el-option 
+							v-for="item in taskispublic" 
+							:key="item.value" 
+							:label="item.label"
 							:value="item.value" >
 						</el-option>
 					</el-select>
 				</el-form-item>
-				<el-form-item label="任务时间" class="select">
-					<el-date-picker v-model="queryInfo.starttime" style="width: 180px;" align="right" type="date"
+				<!-- 起止时间 -->
+				<el-form-item label="任务时间" class="select" size="small">
+					<el-date-picker v-model="queryInfo.starttime" style="width: 120px;" align="right" type="date"
 						:picker-options="pickerOptions" clearable value-format="yyyy-MM-dd" />
 				</el-form-item>
-				<el-form-item label="--" class="select" style="margin-left: 10px;">
-					<el-date-picker v-model="queryInfo.endtime" style="width: 180px;" align="right" type="date"
+				<el-form-item label="--" class="select" style="margin-left: 10px;" size="small">
+					<el-date-picker v-model="queryInfo.endtime" style="width: 120px;" align="right" type="date"
 						:picker-options="pickerOptions"  clearable />
 				</el-form-item>
-				<el-form-item label="任务名称" class="select">
-					<el-input v-model="queryInfo.task_name"></el-input>
+
+				<el-form-item label="任务名称" class="select" size="small">
+					<el-input v-model="queryInfo.task_name" style="width: 120px;"></el-input>
+				</el-form-item>
+					<!--创建者搜索 -->
+				<el-form-item label="创建者" size="small"> 
+					<el-autocomplete
+						class="inline-input"
+						v-model="state2"
+						:fetch-suggestions="querySearch"
+						placeholder="请输入内容"
+						:trigger-on-focus="false"
+						@select="handleSelect">
+					</el-autocomplete>
 				</el-form-item>
 				<!-- 查询 -->
-				<el-button style="height: 40px;margin-left: 10px;" type="success" @click="searchData()">查询</el-button>
+				<el-button  size="mini" style="height: 40px;margin-left: 10px;" type="success" @click="searchData()">查询</el-button>
 				<!-- 重置 -->
-				<el-button style="height: 40px;margin-left: 5px;" type="success" @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-plus" @click="add()">新增</el-button>
-				<el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="ispublic()">发布
-				</el-button>
-				<el-button type="primary" size="small" plain icon="el-icon-scissors" @click="repeal()">废止</el-button>
-				<el-button type="primary" size="small" plain icon="el-icon-delete" @click="delArray()">删除</el-button>
-				<el-button type="primary" size="small" plain icon="el-icon-download">导出</el-button>
-			</div>
-		</el-row>
+				<el-button  size="mini" style="height: 40px;margin-left: 5px;" type="success" @click="reset()">重置</el-button>
+				</el-form>
+			</el-row>
+		</div>
+		
+		<!--头部右侧按钮区域-->
+		<div class="rightButton">
+			<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-plus" @click="add()">新增</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="ispublic()">发布
+					</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-scissors" @click="repeal()">废止</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-delete" @click="delArray()">删除</el-button>
+					<!-- <el-button type="primary" size="small" plain icon="el-icon-download">导出</el-button> -->
+				</div>
+			</el-row>
+		</div>
+		
 		<!--  表格数据区域-->
-		<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"></el-table-column>
-			<el-table-column label="序号" width="50px">
-				<template slot-scope="scope">
-					{{ scope.$index+1 }}
-				</template>
+		<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"></el-table-column>
+		<el-table-column label="序号" width="50px">
+			<template slot-scope="scope">
+				{{ scope.$index+1 }}
+			</template>
 			</el-table-column>
-			<el-table-column :key="" v-for="table in tableHeader" :label="table.label" :prop="table.prop" align="center"
+			<el-table-column :key="table.label" v-for="table in tableHeader" :label="table.label" :prop="table.prop" align="center"
 				:width="table.width" :fixed="table.fixed" />
+				<el-table-column prop="status" label="任务状态" width="130" align="center" >
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.ispublic==0">未发布</el-tag>
+						<el-tag type="warning" v-if="scope.row.ispublic==1">已发布</el-tag>
+						<el-tag type="danger" v-if="scope.row.ispublic==2">已废止</el-tag>
+						<el-tag type="info" v-if="scope.row.ispublic==3">已结束,未完成</el-tag>
+						<el-tag type="success" v-if="scope.row.ispublic==4">已结束,已完成</el-tag>
+						<el-tag type="success"  effect="plain" v-if="scope.row.ispublic==5">执行中</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="level" label="任务优先级" width="95" align="center">
+					<template slot-scope="scope">
+						<el-tag type="success" v-if="scope.row.level==0">一般</el-tag>
+						<el-tag type="warning" v-if="scope.row.level==1">紧急</el-tag>
+						<el-tag type="danger" v-if="scope.row.level==2">特急</el-tag>
+					</template>
+				</el-table-column>
 			<el-table-column label="操作" align="center" fixed="right">
 				<!-- 操作按钮区域的作用域插槽 -->
 				<template slot-scope="scope">
 					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)">详情</el-button>
-						<el-button type="success" size="mini" plain>牵头单位报告</el-button>
+						<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)" style="margin-top:5px">详情</el-button>
+						<el-button type="success" size="mini" plain @click="takeTheLeadReportList(scope.row.id)" style="margin-top:5px">牵头单位报告</el-button>
 					</el-col>
-					<el-col>
-						<el-button type="success" size="mini" plain @click="TaskSample()">抽样单</el-button>
-						<el-button type="success" size="mini" plain>承担单位报告</el-button>
+					<el-col style="margin-bottom: 5px;">
+						<el-button type="success" size="mini" plain @click="undertakeReport(scope.row.id)">承担单位报告</el-button>
+						<el-button type="success" size="mini" plain @click="taskSample(scope.row.id)">抽样单</el-button>
 					</el-col>
 				</template>
 			</el-table-column>
@@ -83,18 +127,18 @@
 		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 			:current-page="queryInfo.pageNum" :page-sizes="[10, 15, 20]" :page-size="queryInfo.pageSize"
 			layout="total, sizes, prev, pager, next, jumper" :total="total" background />
-			</el-card>
+	
 		<!-- 任务详情对话框-->
 		<el-dialog title="查看" :visible.sync="readDialogVisible" width="30%" :close-on-click-modal="false"
 			class="dialogItem">
-			<el-form v-if="readDialogVisible" :model="taskSampleForm" label-width="100px">
+			<el-form v-if="readDialogVisible" :model="readForm" label-width="100px">
 				<el-form-item label="任务名称:" prop="task_name" class="labelItem">
 					<div>{{readForm.task_name}}</div>
 				</el-form-item>
 				<el-form-item label="任务优先级:" prop="level" class="labelItem">
 					<div v-if="readForm.level=='0'">一般</div>
-					<div v-if="readForm.level=='1'">紧急</div>
-					<div v-if="readForm.level=='2'">特急</div>
+					<div v-else-if="readForm.level=='1'">紧急</div>
+					<div v-else>特急</div>
 				</el-form-item>
 				<el-form-item label="监测类型:" prop="task_class" width="70px" class="labelItem">
 					<div>{{readForm.task_class}}</div>
@@ -116,9 +160,10 @@
 					<div>{{readForm.main_unit}}</div>
 				</el-form-item>
 				<el-form-item label="附件:" prop="file_url" class="labelItem">
-					<div>{{readForm.file_url}}</div>
+					<!-- <div>{{readForm.file_url}}</div> -->
+					<el-link :href="readForm.file_url" type="primary">{{readForm.file_name}}</el-link>
 				</el-form-item>
-				<el-form-item label="文件号:" prop="filenum" width="200px" class="labelItem">
+				<el-form-item label="文件号:" prop="filenum" width="230px" class="labelItem">
 					<div v-if="readForm.filenum==null">无</div>
 					<div v-else>{{readForm.filenum}}</div>
 				</el-form-item>
@@ -133,14 +178,13 @@
 
 		</el-dialog>
 	</div>
-
 </template>
-
 <script>
 	const token = window.sessionStorage.getItem('token')
 	const rybh = window.sessionStorage.getItem('rybh')
+	const rymc = window.sessionStorage.getItem('rymc')
 	export default {
-		name: 'checkMonitor',
+		name: '',
 		data() {
 			return {
 				queryInfo:{
@@ -150,7 +194,8 @@
 					endtime:'',
 					ispublic:'',
 					pageSize:10,
-					pageNum:1
+					pageNum:1,
+					task_class:'监督抽查'
 				},
 				total:0,
 				cellStyle: {
@@ -165,17 +210,6 @@
 						width: 150
 						// fixed: 'left'
 					},
-					{
-						label: '年度',
-						prop: 'year',
-						width: 80
-						// fixed: 'left'
-					}, {
-						label: '文件号',
-						prop: 'filenum',
-						width: 150
-						// fixed: 'left'
-					},
 					{
 						label: '开始时间',
 						prop: 'starttime',
@@ -186,25 +220,27 @@
 						prop: 'endtime',
 						width: 120
 					},
+					{
+						label: '年度',
+						prop: 'year',
+						width: 80
+						// fixed: 'left'
+					}, {
+						label: '文件号',
+						prop: 'filenum',
+						width: 180
+						// fixed: 'left'
+					},
 					{
 						label: '创建者',
-						prop: 'releaser',
-						width: 120
+						prop: 'creater.name',
+						width: 140
 					},
 					{
 						label: '创建时间',
-						prop: 'createtime',
+						prop: 'create_time',
 						width: 180
-					}, {
-						label: '任务状态',
-						prop: 'ispublic',
-						width: 120
-					},
-					{
-						label: '任务优先级',
-						prop: 'level',
-						width: 120
-					},
+					}
 				],
 				// 数据表格数据
 				tableData: [],
@@ -268,12 +304,40 @@
 			}
 		},
 		created() {
-			this.gettaskList()
+			this.getTasks()
 		},
 		methods: {
 			add() {
 				this.$router.push('addTask')
 			},
+			takeTheLeadReportList(id) {
+				console.log(id)
+				this.$router.push({
+					name:'takeTheLeadReportList',
+					params: {
+					task_id: id,
+					}
+				})
+			},
+			undertakeReport(id){
+				console.log(id)
+				this.$router.push({
+					name:'undertakeReport',
+					params: {
+					task_id: id,
+					}
+				})
+			},
+			taskSample(id){
+				console.log(id)
+				this.$router.push({
+					name:'taskSample',
+					params: {
+					task_id: id,
+					}
+				})
+		},
+			
 			// 搜索
 			async searchData() {
 				this.queryInfo.pageNum = 1
@@ -288,27 +352,24 @@
 					endtime:'',
 					ispublic:'',
 					pageSize:10,
-					pageNum:1
+					pageNum:1,
+					task_class:'监督抽查',
+					task_id
 				}
+				this.getTasks()
 			},
 			/** 监听页码的改变 */
 			handleCurrentChange(newPage) {
 				this.queryInfo.pageNum = newPage
-				this.gettaskList()
+				this.getTasks()
 			},
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange(newSize) {
 				this.queryInfo.pageSize = newSize
-				this.gettaskList()
-			},
-			
-			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.gettaskList()
+				this.getTasks()
 			},
 			// 获取任务列表
-			async gettaskList() {
+			async getTasks() {
 				for (var key in this.queryInfo) {
 					if (this.queryInfo[key] == '') {
 						delete this.queryInfo[key]
@@ -317,32 +378,8 @@
 				const {
 					data: res
 				} = await this.$http.post(
-					"getTaskList", this.queryInfo
+					"getTasks", this.queryInfo
 				);
-
-				for (let i = 0; i < res.data.rows.length; i++) {
-					if (res.data.rows[i].ispublic == '0') {
-						res.data.rows[i].ispublic = '未发布'
-					} else if (res.data.rows[i].ispublic == '1') {
-						res.data.rows[i].ispublic = '已发布'
-					} else if (res.data.rows[i].ispublic == '2') {
-						res.data.rows[i].ispublic = '废止'
-					} else if (res.data.rows[i].ispublic == '3') {
-						res.data.rows[i].ispublic = '已结束未完成'
-					}  else if (res.data.rows[i].ispublic == '5') {
-						res.data.rows[i].ispublic = '执行中'
-					} 
-					else {
-						res.data.rows[i].ispublic = '已结束已完成'
-					}
-					if (res.data.rows[i].level == '0') {
-						res.data.rows[i].level = '一般'
-					} else if (res.data.rows[i].level == '1') {
-						res.data.rows[i].level = '紧急'
-					} else if (res.data.rows[i].level == '2') {
-						res.data.rows[i].level = '特急'
-					}
-				}
 				this.tableData = res.data.rows
 				this.total = res.data.total
 			},
@@ -352,18 +389,20 @@
 				this.readForm.task_name = row.task_name
 				this.readForm.task_class = row.task_class
 				this.readForm.level = row.level
+				console.log(this.readForm.level)
 				this.readForm.year = row.year
 				this.readForm.starttime = row.starttime
 				this.readForm.endtime = row.endtime
 				this.readForm.releaser = row.releaser
 				this.readForm.main_unit = row.main_unit
 				this.readForm.file_url = row.file_url
+				this.readForm.file_name = row.file_name
 				this.readForm.filenum = row.filenum
 				this.readForm.log = row.log
 				this.readDialogVisible = true
 
 			},
-			// 批量删除学生
+			// 批量删除
 			handleSelectionChange(val) {
 				this.multipleSelection = val;
 				// console.log(this.multipleSelection)
@@ -371,16 +410,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;
@@ -388,38 +427,41 @@
 					// console.log(this.multipleSelection[i])
 					this.delarr.push(this.multipleSelection[i].id);
 				}
-				const result = await this.$http.post('delTask', {
+				const result = await this.$http.post('deleteTasks', {
 					delarr: that.delarr,
 					token: token
 				})
+				console.log(that.delarr);
 				if (result.data.code == 0) {
 					this.$message({
 						type: 'success',
 						message: '删除成功!'
 					});
-					that.gettaskList()
+					that.getTasks()
 				} else {
 					this.$message({
 						type: 'error',
 						message: '删除失败!'
 					});
 				}
-
+				// console.log(this.$refs.multipleTable);
 				this.$refs.multipleTable.clearSelection();
+				that.delarr = [];
+				// this.$refs.multipleTable.clearSelectionFun();
 			},
 			// 发布任务
 			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;
@@ -427,7 +469,7 @@
 				console.log(this.multipleSelection)
 				// this.pubarr = this.multipleSelection;
 				for (let i = 0; i < length; i++) {
-					if (this.multipleSelection[i].ispublic != '未发布') {
+					if (this.multipleSelection[i].ispublic != '0') {
 						this.$alert('任务不在可发布状态！', {
 							confirmButtonText: '确定',
 							callback: action => {
@@ -442,14 +484,19 @@
 				if(canPub==1){
 					const result = await this.$http.post('isPublicTask', {
 						pubarr: that.multipleSelection,
-						token: token
+						token: token,
 					})
+					console.log(result.data.code)
 					if (result.data.code == 0) {
 						this.$message({
 							type: 'success',
 							message: '发布成功!'
 						});
-						that.gettaskList()
+						that.getTasks()
+					}else{
+						this.$message({
+							type: 'error',
+							message: result.data.message})
 					}				
 				}
 			},
@@ -470,7 +517,7 @@
 				// var val = this.selectedData;
 				this.pubarr = this.multipleSelection;
 				for (let i = 0; i < length; i++) {
-					if (this.pubarr[i].ispublic == '已发布') {
+					if (this.pubarr[i].ispublic == 1) {
 						this.pubarr[i].ispublic = 2
 						canPub = 1
 					} else {
@@ -491,7 +538,7 @@
 								type: 'success',
 								message: '任务已废止!'
 							});
-							that.gettaskList()
+							that.getTasks()
 						}
 					}
 					
@@ -505,6 +552,9 @@
 </script>
 
 <style lang="less" scoped>
+	.el-breadcrumb {
+		margin-bottom: 20px;
+	}
 	.el-table {
 		align-items: center;
 		margin-top: 25px;
@@ -533,9 +583,10 @@
 	}
 
 	.select {
-		display: flex;
+		// display: flex;
 		flex-direction: row;
-		margin-left: 10px;
+		// margin-left: 10px;
+		
 	}
 
 	.dialogItem /deep/ .el-dialog__body {
@@ -574,4 +625,10 @@
 		border-top: 1px solid #e5e5e5;
 		text-align: center;
 	}
+	.rightButton{
+		margin-top: 20px;
+	}
+	.headSearch{
+		margin-left: 25px;
+	}
 </style>

src/components/admin/getAccount.vue

@@ -0,0 +1,114 @@
+<template>
+	<div style="width: 100%">
+		<el-breadcrumb separator-class="el-icon-arrow-right">
+			<el-breadcrumb-item>首页</el-breadcrumb-item>
+			<el-breadcrumb-item>个人中心</el-breadcrumb-item>
+		</el-breadcrumb>
+		<div class="title">
+			个人中心
+		</div>
+
+		<el-form :model="form" label-width="100px">
+			<el-form-item label="登录账号" prop="form.username" required>
+				<el-input v-model="form.username" :disabled="true"></el-input>
+			</el-form-item>
+			<el-form-item label="用户名称" prop="form.name" required>
+				<el-input v-model="form.name" :disabled="true"></el-input>
+			</el-form-item>
+            <el-form-item label="别名" prop="form.name_other" required>
+				<el-input v-model="form.name_other" :disabled="true"></el-input>
+			</el-form-item>
+            <el-form-item label="组别" prop="form.groupname" required>
+				<el-input v-model="form.groupname" :disabled="true"></el-input>
+			</el-form-item>
+            <el-form-item label="机构属性" prop="form.properties" required>
+				<el-input v-model="form.properties" :disabled="true"></el-input>
+			</el-form-item>
+            <el-form-item label="联系人姓名" prop="form.contact_name" required>
+				<el-input v-model="form.contact_name" :disabled="true"></el-input>
+			</el-form-item>
+            <el-form-item label="联系人电话" prop="form.contact_phone" required>
+				<el-input v-model="form.contact_phone" :disabled="true"></el-input>
+			</el-form-item>
+            <el-form-item label="创建时间" prop="form.create_time" required>
+				<el-input v-model="form.create_time" :disabled="true"></el-input>
+			</el-form-item>
+            <el-form-item label="修改时间" prop="form.update_time" required>
+				<el-input v-model="form.update_time" :disabled="true"></el-input>
+			</el-form-item>
+
+
+
+			<el-form-item>
+				<el-button type="success" @click="putAccount()">修改账户信息</el-button>
+				<!-- <el-button @click="reBack()">返回</el-button> -->
+			</el-form-item>
+		</el-form>
+	</div>
+</template>
+<script>
+	const rymc = window.sessionStorage.getItem('rymc')
+	const token = window.sessionStorage.getItem('token')
+	export default {
+		data() {
+			return {
+				form: {
+                    username:'',
+                    name:'', 
+                    name_other:'', 
+                    groupname: '', 
+                    properties: '', 
+                    contact_name: '', 
+                    contact_phone: '',
+                    create_time:'' ,
+                    update_time:''
+				},
+            }
+		},
+		created() {	
+            this.getAccount()
+		},
+		mounted() {
+            this.getAccount()
+		},
+		methods: {
+            async getAccount() {
+				const result = await this.$http.post('getAccount')
+				console.log(result.data.data)
+                this.form = result.data.data
+                if (this.form.properties == 1){
+                      this.form.properties ='政府部门';
+                }else if(this.form.properties == 2){
+                    this.form.properties ='事业单位';
+                }else{
+                     this.form.properties ='企业';
+                }
+              
+                    
+					
+        },
+        //修改信息
+            putAccount(){
+                 this.$router.push('putAccount')
+                },
+	}
+    }
+</script>
+<style lang="less" scoped>
+	.title {
+		margin-left: 50%;
+		margin-bottom: 20px;
+	}
+
+	.el-form {
+		width: 800px;
+		margin: 0 auto;
+	}
+
+	.footer {
+		margin-top: 5px;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+</style>

src/components/admin/getMonitor.vue

@@ -0,0 +1,173 @@
+  <template>
+	<div style="width: 100%">
+		<el-breadcrumb separator-class="el-icon-arrow-right">
+			<el-breadcrumb-item>首页</el-breadcrumb-item>
+			<el-breadcrumb-item>主体信息管理</el-breadcrumb-item>
+			<el-breadcrumb-item>检测机构</el-breadcrumb-item>
+        </el-breadcrumb>
+		<el-form ref="form" :model="form" label-width="80px">
+        
+        <div class="card">
+            <!-- 检索信息 -->
+            <el-form-item label="机构性质">
+                <el-checkbox-group v-model="form.properties" class="querybox">
+                    <el-checkbox label="不限" name="type"></el-checkbox>
+                    <el-checkbox label="政府部门" name="type"></el-checkbox>
+                    <el-checkbox label="事业单位" name="type"></el-checkbox>
+                    <el-checkbox label="企业" name="type"></el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+
+            <el-form-item label="资质证书">
+                <el-checkbox-group v-model="form.certificate" class="querybox">
+                    <el-checkbox label="不限" name="type"></el-checkbox>
+                    <el-checkbox label="CNAS" name="type"></el-checkbox>
+                    <el-checkbox label="CAL" name="type"></el-checkbox>
+                    <el-checkbox label="CMAF" name="type"></el-checkbox>
+                    <el-checkbox label="CATL" name="type"></el-checkbox>
+                    <el-checkbox label="CMA" name="type"></el-checkbox>
+                    <el-checkbox label="暂未取得资质" name="type"></el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+
+            <el-form-item label="主体状态">
+                <el-checkbox-group v-model="form.type" class="querybox">
+                    <el-checkbox label="不限" name="type"></el-checkbox>
+                    <el-checkbox label="正常" name="type"></el-checkbox>
+                    <el-checkbox label="已注销" name="type"></el-checkbox>
+                    <el-checkbox label="已撤销" name="type"></el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <!-- 地区和机构名称 -->
+            <el-row :gutter="50" style="margin-right: 0px;">
+                <el-form style="display: flex; flex-direction: row;" size="mini">
+
+                    <el-form-item prop="address" label="地区" class="select" >
+                        <el-cascader  :options="region" v-model="sample_address"
+                            @change="handleChange" size="small">
+                        </el-cascader>
+                    </el-form-item>
+
+                    <el-form-item prop="name" label="机构名称" class="select" >
+                        <el-input v-model="form.name" size="small"></el-input>
+                    </el-form-item>
+
+                    <el-form-item prop="name" label="机构负责人" class="select" >
+                        <el-input v-model="form.person" size="small"></el-input>
+                    </el-form-item>
+                    <el-button type="success" size="mini" style="height: 40px;margin-left: 10px;" @click="searchData()" >查询</el-button>
+                    <el-button type="success" size="mini" style="height: 40px;margin-left: 10px;"  @click="searchData()" >重置</el-button>
+                </el-form>
+                
+            </el-row>
+        </div>
+        
+            <!--  表格数据区域-->
+			<el-table ref="multipleTable" :data="testList" row-key="id" @selection-change="handleSelectionChange1"
+				border stripe highlight-current-row style="width: 100%;margin-top:30px">
+					<el-table-column type="selection" :reserve-selection="true" width="50"></el-table-column>
+					<el-table-column label="序号" width="50px">
+						<template slot-scope="scope">
+							{{ scope.$index+1 }}
+						</template>
+					</el-table-column>
+                    <el-table-column :key="table.prop" v-for="table in tableHeader" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+                        <!--    分页器区域-->
+                <!-- <div class="footer">
+					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+						:current-page="queryInfo1.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo1.pageSize"
+						layout="total, sizes, prev, pager, next, jumper" :total="total" background />
+					<el-button type="success" @click="choseTest1()">提交</el-button>
+				</div> -->
+
+                <!-- 操作按钮区域的作用域插槽 -->
+                <el-table-column label="操作" align="center" fixed="right">
+                    <template>
+                        <el-col style="margin-bottom: 5px;">
+                            <el-button type="text" size="mini" @click="readDetails()" style="margin-top:5px">详情</el-button>
+                            <el-button type="text" size="mini" plain @click="reVoke()" style="margin-top:5px">撤销</el-button>
+                        </el-col>
+                    </template>
+			    </el-table-column>
+			</el-table>
+					
+
+        </el-form>
+	</div>
+</template>
+<script>
+
+	export default {
+		data() {
+			return {
+				form: {
+                    properties:[],
+                    certificate:[],
+                    type:[],
+                    address:'',
+                    name:''
+                },
+                tableHeader: [{
+						label: '机构名称',
+						prop: 'name',
+						width: 240
+					},{
+						label: '机构类别',
+						prop: 'properties',
+						width: 160
+					},{
+						label: '机构级别',
+						prop: 'level',
+						width: 160
+					},{
+						label: '所属区域',
+						prop: 'address',
+						width: 240
+					},{
+						label: '机构负责人',
+						prop: 'person',
+						width: 150
+					},{
+						label: '创建时间',
+						prop: 'create_time',
+						width: 200
+					},{
+						label: '修改时间',
+						prop: 'update_time',
+						width: 200
+					},
+                ]}
+        },
+		created() {
+			this.getOrganization()
+		},
+		mounted() {
+			
+		},
+		methods: {
+			 async getOrganization() {
+				const result = await this.$http.post('getOrganization')
+				console.log(result.data.data)
+                this.form = result.data.data
+		}
+    }
+}
+	
+</script>
+
+<style>
+	/* .querybox{
+        padding: -20px;
+    } */
+    .select {
+		display: flex;
+		flex-direction: row;
+		margin-left: 38px;
+        
+	}
+    .card{
+        box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.1);
+        background: rgb(249, 255, 250);
+    }
+</style>

src/components/admin/getOrganization.vue

@@ -0,0 +1,190 @@
+  <template>
+	<div style="width: 100%">
+		<el-breadcrumb separator-class="el-icon-arrow-right">
+			<el-breadcrumb-item>首页</el-breadcrumb-item>
+			<el-breadcrumb-item>主体信息管理</el-breadcrumb-item>
+			<el-breadcrumb-item>检测机构</el-breadcrumb-item>
+        </el-breadcrumb>
+		<el-form ref="form" :model="form" label-width="80px">
+        
+        <div class="card">
+            <!-- 检索信息 -->
+            <el-form-item label="机构性质">
+                <el-checkbox-group v-model="form.properties" class="querybox">
+                    <el-checkbox label="不限" name="type"></el-checkbox>
+                    <el-checkbox label="政府部门" name="type"></el-checkbox>
+                    <el-checkbox label="事业单位" name="type"></el-checkbox>
+                    <el-checkbox label="企业" name="type"></el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+
+            <el-form-item label="资质证书">
+                <el-checkbox-group v-model="form.certificate" class="querybox">
+                    <el-checkbox label="不限" name="type"></el-checkbox>
+                    <el-checkbox label="CNAS" name="type"></el-checkbox>
+                    <el-checkbox label="CAL" name="type"></el-checkbox>
+                    <el-checkbox label="CMAF" name="type"></el-checkbox>
+                    <el-checkbox label="CATL" name="type"></el-checkbox>
+                    <el-checkbox label="CMA" name="type"></el-checkbox>
+                    <el-checkbox label="暂未取得资质" name="type"></el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+
+            <el-form-item label="主体状态">
+                <el-checkbox-group v-model="form.type" class="querybox">
+                    <el-checkbox label="不限" name="type"></el-checkbox>
+                    <el-checkbox label="正常" name="type"></el-checkbox>
+                    <el-checkbox label="已注销" name="type"></el-checkbox>
+                    <el-checkbox label="已撤销" name="type"></el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <!-- 地区和机构名称 -->
+            <el-row :gutter="50" style="margin-right: 0px;">
+                <el-form style="display: flex; flex-direction: row;" size="mini">
+
+                    <el-form-item prop="address" label="地区" class="select" >
+                        <el-cascader  :options="region" v-model="sample_address"
+                            @change="handleChange" size="small">
+                        </el-cascader>
+                    </el-form-item>
+
+                    <el-form-item prop="name" label="机构名称" class="select" >
+                        <el-input v-model="form.name" size="small"></el-input>
+                    </el-form-item>
+
+                    <el-form-item prop="name" label="机构负责人" class="select" >
+                        <el-input v-model="form.person" size="small"></el-input>
+                    </el-form-item>
+                    <el-button type="success" size="mini" style="height: 40px;margin-left: 10px;" @click="searchData()" >查询</el-button>
+                    <el-button type="success" size="mini" style="height: 40px;margin-left: 10px;"  @click="searchData()" >重置</el-button>
+                </el-form>
+                
+            </el-row>
+        </div>
+        
+            <!--  表格数据区域-->
+			<el-table ref="multipleTable" :data="tableData" row-key="id" @selection-change="handleSelectionChange1"
+				border stripe highlight-current-row style="width: 100%;margin-top:30px">
+					<el-table-column type="selection" :reserve-selection="true" width="50"></el-table-column>
+					<el-table-column label="序号" width="50px">
+						<template slot-scope="scope">
+							{{ scope.$index+1 }}
+						</template>
+					</el-table-column>
+                    <el-table-column :key="table.prop" v-for="table in tableHeader" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+                 <!--    分页器区域-->
+                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page="form.pageNum" :page-sizes="[10, 15, 20]" :page-size="form.pageSize"
+                    layout="total, sizes, prev, pager, next, jumper" :total="total" background />
+	
+
+                <!-- 操作按钮区域的作用域插槽 -->
+                <el-table-column label="操作" align="center" fixed="right">
+                    <template>
+                        <el-col style="margin-bottom: 5px;">
+                            <el-button type="text" size="mini" @click="readDetails()" style="margin-top:5px">详情</el-button>
+                            <el-button type="text" size="mini" plain @click="reVoke()" style="margin-top:5px">撤销</el-button>
+                        </el-col>
+                    </template>
+			    </el-table-column>
+			</el-table>
+					
+
+        </el-form>
+	</div>
+</template>
+<script>
+
+	export default {
+		data() {
+			return {
+				form: {
+                    properties:[],
+                    certificate:[],
+                    type:[],
+                    address:'',
+                    name:'',
+                    create_time:'',
+                    update_time:'',
+                    pageNum:'',
+                    pageSize:''
+                },
+                total:0,
+                // 数据表格数据
+				tableData: [],
+                tableHeader: [{
+						label: '机构名称',
+						prop: 'name',
+						width: 240
+					},{
+						label: '机构类别',
+						prop: 'properties',
+						width: 160
+					},{
+						label: '机构级别',
+						prop: 'level',
+						width: 160
+					},{
+						label: '所属区域',
+						prop: 'address',
+						width: 240
+					},{
+						label: '机构负责人',
+						prop: 'person',
+						width: 150
+					},{
+						label: '创建时间',
+						prop: 'create_time',
+						width: 200
+					},{
+						label: '修改时间',
+						prop: 'update_time',
+						width: 200
+					},
+                ]}
+        },
+		created() {
+			this.getOrganization()
+		},
+		mounted() {
+			this.getOrganization()
+		},
+		methods: {
+            /** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.form.pageSize = newSize
+				this.getOrganization()
+			},
+            /** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.form.pageNum = newPage
+				this.getOrganization()
+			},
+			 async getOrganization() {
+				const result = await this.$http.post('getOrganization')
+				console.log(result.data.data)
+                // this.form = result.data.data
+                this.tableData = result.data.data
+                this.total = result.data.total
+		}
+    }
+}
+	
+</script>
+
+<style>
+	/* .querybox{
+        padding: -20px;
+    } */
+    .select {
+		display: flex;
+		flex-direction: row;
+		margin-left: 38px;
+        
+	}
+    .card{
+        box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.1);
+        background: rgb(249, 255, 250);
+    }
+</style>

src/components/admin/putAccount.vue

@@ -0,0 +1,114 @@
+<template>
+	<div style="width: 100%">
+		<el-breadcrumb separator-class="el-icon-arrow-right">
+			<el-breadcrumb-item>首页</el-breadcrumb-item>
+			<el-breadcrumb-item>个人中心</el-breadcrumb-item>
+            <el-breadcrumb-item>修改信息</el-breadcrumb-item>
+		</el-breadcrumb>
+		<div class="title">
+			信息修改
+		</div>
+
+		<el-form :model="form" label-width="100px">
+			<el-form-item label="登录账号" prop="form.username" required>
+				<el-input v-model="form.username"></el-input>
+			</el-form-item>
+			<el-form-item label="用户名称" prop="form.name" required>
+				<el-input v-model="form.name" ></el-input>
+			</el-form-item>
+            <el-form-item label="别名" prop="form.name_other" required>
+				<el-input v-model="form.name_other"></el-input>
+			</el-form-item>
+            <el-form-item label="组别" prop="form.groupname" required>
+				<el-input v-model="form.groupname" ></el-input>
+			</el-form-item>
+            <el-form-item label="机构属性" prop="form.properties" required>
+				<el-input v-model="form.properties" ></el-input>
+			</el-form-item>
+            <el-form-item label="联系人姓名" prop="form.contact_name" required>
+				<el-input v-model="form.contact_name" ></el-input>
+			</el-form-item>
+            <el-form-item label="联系人电话" prop="form.contact_phone" required>
+				<el-input v-model="form.contact_phone"></el-input>
+			</el-form-item>
+            <!-- <el-form-item label="创建时间" prop="form.create_time" required>
+				<el-input v-model="form.create_time" ></el-input>
+			</el-form-item>
+            <el-form-item label="修改时间" prop="form.update_time" required>
+				<el-input v-model="form.update_time" ></el-input>
+			</el-form-item> -->
+
+
+
+			<el-form-item>
+				<el-button type="success" @click="preServe()">保存修改</el-button>
+				<el-button @click="reBack()">返回</el-button>
+			</el-form-item>
+		</el-form>
+	</div>
+</template>
+<script>
+	const rymc = window.sessionStorage.getItem('rymc')
+	const token = window.sessionStorage.getItem('token')
+	export default {
+		data() {
+			return {
+				form: {
+                    username:'',
+                    name:'', 
+                    name_other:'', 
+                    groupname: '', 
+                    properties: '', 
+                    contact_name: '', 
+                    contact_phone: '',
+                    create_time:'' ,
+                    update_time:''
+				},
+            }
+		},
+		created() {	
+            this.getAccount()
+		},
+		mounted() {
+            this.getAccount()
+		},
+		methods: {
+            //保存修改
+            async preServe(){
+				const result = await this.$http.post('putAccount',this.form)
+				// console.log(result.data.data)
+                this.getAccount()
+            },
+            //返回
+            reBack(){
+                 this.$router.push('getAccount')
+                },
+         //获取用户信息
+            async getAccount() {
+				const result = await this.$http.post('getAccount')
+				console.log(result.data.data)
+					this.form = result.data.data
+        },
+       
+        }
+	}
+
+</script>
+<style lang="less" scoped>
+	.title {
+		margin-left: 50%;
+		margin-bottom: 20px;
+	}
+
+	.el-form {
+		width: 800px;
+		margin: 0 auto;
+	}
+
+	.footer {
+		margin-top: 5px;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+</style>

src/components/admin/routineMonitor.vue

@@ -12,7 +12,7 @@
 		
 		<!-- 头部查询栏 -->
 		<div class="headSearch">
-			<el-row :gutter="50" style="margin-right: 0px;">
+			<el-row :gutter="120" style="margin-right: 0px;">
 				<el-form :inline="true">
 				<!-- <el-form style="display: flex; flex-direction: row;" > -->
 				<el-form-item label="年度" class="select" size="small">
@@ -35,7 +35,7 @@
 						:picker-options="pickerOptions" clearable value-format="yyyy-MM-dd" />
 				</el-form-item>
 
-				<el-form-item label="--" class="select" style="margin-left: 10px;" size="small">
+				<el-form-item label="--" class="select" style="margin-left: 8px;" size="small">
 					<el-date-picker v-model="queryInfo.endtime" style="width: 180px;" align="right" type="date"
 						:picker-options="pickerOptions"  clearable />
 				</el-form-item>
@@ -144,17 +144,17 @@
 				<el-form-item label="任务时间:" prop="starttime" width="200px" class="labelItem">
 					<div>{{readForm.starttime}} 至 {{readForm.endtime}}</div>
 				</el-form-item>
-				<el-form-item label="发布单位:" prop="releaser" class="labelItem">
-					<div>{{readForm.releaser}}</div>
+				<el-form-item label="发布单位:" prop="creater" class="labelItem">
+					<div>{{readForm.creater.name}}</div>
 				</el-form-item>
-				<el-form-item label="牵头单位:" prop="main_unit" class="labelItem">
+				<!-- <el-form-item label="牵头单位:" prop="main_unit" class="labelItem">
 					<div>{{readForm.main_unit}}</div>
-				</el-form-item>
+				</el-form-item> -->
 				<el-form-item label="附件:" prop="file_url" class="labelItem">
 					<!-- <div>{{readForm.file_url}}</div> -->
 					<el-link :href="readForm.file_url" type="primary">{{readForm.file_name}}</el-link>
 				</el-form-item>
-				<el-form-item label="文件号:" prop="filenum" width="200px" class="labelItem">
+				<el-form-item label="文件号:" prop="filenum" width="230px" class="labelItem">
 					<div v-if="readForm.filenum==null">无</div>
 					<div v-else>{{readForm.filenum}}</div>
 				</el-form-item>
@@ -201,17 +201,6 @@
 						width: 150
 						// fixed: 'left'
 					},
-					{
-						label: '年度',
-						prop: 'year',
-						width: 80
-						// fixed: 'left'
-					}, {
-						label: '文件号',
-						prop: 'filenum',
-						width: 150
-						// fixed: 'left'
-					},
 					{
 						label: '开始时间',
 						prop: 'starttime',
@@ -222,14 +211,25 @@
 						prop: 'endtime',
 						width: 120
 					},
+					{
+						label: '年度',
+						prop: 'year',
+						width: 80
+						// fixed: 'left'
+					}, {
+						label: '文件号',
+						prop: 'filenum',
+						width: 180
+						// fixed: 'left'
+					},
 					{
 						label: '创建者',
-						prop: 'creater',
+						prop: 'creater.name',
 						width: 140
 					},
 					{
 						label: '创建时间',
-						prop: 'createtime',
+						prop: 'create_time',
 						width: 180
 					}
 				],
@@ -295,7 +295,7 @@
 			}
 		},
 		created() {
-			this.gettaskList()
+			this.getTasks()
 		},
 		methods: {
 			add() {
@@ -347,20 +347,20 @@
 					task_class:'例行监测',
 					task_id
 				}
-				this.gettaskList()
+				this.getTasks()
 			},
 			/** 监听页码的改变 */
 			handleCurrentChange(newPage) {
 				this.queryInfo.pageNum = newPage
-				this.gettaskList()
+				this.getTasks()
 			},
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange(newSize) {
 				this.queryInfo.pageSize = newSize
-				this.gettaskList()
+				this.getTasks()
 			},
 			// 获取任务列表
-			async gettaskList() {
+			async getTasks() {
 				for (var key in this.queryInfo) {
 					if (this.queryInfo[key] == '') {
 						delete this.queryInfo[key]
@@ -369,7 +369,7 @@
 				const {
 					data: res
 				} = await this.$http.post(
-					"getTaskList", this.queryInfo
+					"getTasks", this.queryInfo
 				);
 				this.tableData = res.data.rows
 				this.total = res.data.total
@@ -380,11 +380,12 @@
 				this.readForm.task_name = row.task_name
 				this.readForm.task_class = row.task_class
 				this.readForm.level = row.level
-				console.log(this.readForm.level)
+				// console.log(this.readForm.level)
 				this.readForm.year = row.year
 				this.readForm.starttime = row.starttime
 				this.readForm.endtime = row.endtime
 				this.readForm.releaser = row.releaser
+				this.readForm.creater = row.creater
 				this.readForm.main_unit = row.main_unit
 				this.readForm.file_url = row.file_url
 				this.readForm.file_name = row.file_name
@@ -418,7 +419,7 @@
 					// console.log(this.multipleSelection[i])
 					this.delarr.push(this.multipleSelection[i].id);
 				}
-				const result = await this.$http.post('delTask', {
+				const result = await this.$http.post('deleteTasks', {
 					delarr: that.delarr,
 					token: token
 				})
@@ -428,7 +429,7 @@
 						type: 'success',
 						message: '删除成功!'
 					});
-					that.gettaskList()
+					that.getTasks()
 				} else {
 					this.$message({
 						type: 'error',
@@ -473,7 +474,7 @@
 					}
 				}
 				if(canPub==1){
-					const result = await this.$http.post('isPublicTask', {
+					const result = await this.$http.post('putTaskPublic', {
 						pubarr: that.multipleSelection,
 						token: token,
 					})
@@ -483,7 +484,7 @@
 							type: 'success',
 							message: '发布成功!'
 						});
-						that.gettaskList()
+						that.getTasks()
 					}else{
 						this.$message({
 							type: 'error',
@@ -520,7 +521,7 @@
 						});
 					}
 					if(canPub==1){
-						const result = await this.$http.post('isPublicTask', {
+						const result = await this.$http.post('putTaskPublic', {
 							pubarr: that.pubarr,
 							token: token
 						})
@@ -529,7 +530,7 @@
 								type: 'success',
 								message: '任务已废止!'
 							});
-							that.gettaskList()
+							that.getTasks()
 						}
 					}
 					

src/components/admin/specialMonitor.vue

@@ -12,7 +12,7 @@
 		</div>
 		<!-- 头部搜查询栏 -->
 		<div class="headSearch">
-			<el-row :gutter="50" style="margin-right: 0px;">
+			<el-row :gutter="120" style="margin-right: 0px;">
 			<!-- <el-form style="display: flex; flex-direction: row;"> -->
 				<el-form :inline="true">
 				<el-form-item label="年度" class="select" size="mini">

src/components/admin/subjDtList.vue

@@ -0,0 +1,626 @@
+
+<template>
+	<div style="width: 100%">
+	<div slot="header" class="clearfix">
+		<el-breadcrumb separator-class="el-icon-arrow-right">		
+		  <el-breadcrumb-item >首页</el-breadcrumb-item>
+		  <el-breadcrumb-item>监测任务</el-breadcrumb-item>
+		  <el-breadcrumb-item>例行监测</el-breadcrumb-item>
+		  <el-breadcrumb-item>任务列表</el-breadcrumb-item>
+		</el-breadcrumb>
+		</div>
+		
+		<!-- 头部查询栏 -->
+		<div class="headSearch">
+			<el-row :gutter="50" style="margin-right: 0px;">
+				<el-form :inline="true">
+				<!-- <el-form style="display: flex; flex-direction: row;" > -->
+				<el-form-item label="年度" class="select" size="small">
+					<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" size="small">
+					<el-select v-model="queryInfo.ispublic" style="width: 110px;" clearable>
+						<el-option 
+							v-for="item in taskispublic" 
+							:key="item.value" 
+							:label="item.label"
+							:value="item.value" >
+						</el-option>
+					</el-select>
+				</el-form-item>
+
+				<el-form-item label="任务时间" class="select" size="small">
+					<el-date-picker v-model="queryInfo.starttime" style="width: 180px;" align="right" type="date"
+						:picker-options="pickerOptions" clearable value-format="yyyy-MM-dd" />
+				</el-form-item>
+
+				<el-form-item label="--" class="select" style="margin-left: 10px;" size="small">
+					<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" size="small">
+					<el-input v-model="queryInfo.task_name"></el-input>
+				</el-form-item>
+
+				<!-- 查询 -->
+				<el-button  size="mini" style="height: 40px;margin-left: 10px;" type="success" @click="searchData()">查询</el-button>
+				<!-- 重置 -->
+				<el-button  size="mini" style="height: 40px;margin-left: 5px;" type="success" @click="reset()">重置</el-button>
+				</el-form>
+			</el-row>
+		</div>
+		
+		<!--头部右侧按钮区域-->
+		<div class="rightButton">
+			<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-plus" @click="add()">新增</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="ispublic()">发布
+					</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-scissors" @click="repeal()">废止</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-delete" @click="delArray()">删除</el-button>
+					<!-- <el-button type="primary" size="small" plain icon="el-icon-download">导出</el-button> -->
+				</div>
+			</el-row>
+		</div>
+		
+		<!--  表格数据区域-->
+		<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"></el-table-column>
+		<el-table-column label="序号" width="50px">
+			<template slot-scope="scope">
+				{{ scope.$index+1 }}
+			</template>
+			</el-table-column>
+			<el-table-column :key="table.label" v-for="table in tableHeader" :label="table.label" :prop="table.prop" align="center"
+				:width="table.width" :fixed="table.fixed" />
+				<el-table-column prop="status" label="任务状态" width="130" align="center" >
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.ispublic==0">未发布</el-tag>
+						<el-tag type="warning" v-if="scope.row.ispublic==1">已发布</el-tag>
+						<el-tag type="danger" v-if="scope.row.ispublic==2">已废止</el-tag>
+						<el-tag type="info" v-if="scope.row.ispublic==3">已结束,未完成</el-tag>
+						<el-tag type="success" v-if="scope.row.ispublic==4">已结束,已完成</el-tag>
+						<el-tag type="success"  effect="plain" v-if="scope.row.ispublic==5">执行中</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="level" label="任务优先级" width="95" align="center">
+					<template slot-scope="scope">
+						<el-tag type="success" v-if="scope.row.level==0">一般</el-tag>
+						<el-tag type="warning" v-if="scope.row.level==1">紧急</el-tag>
+						<el-tag type="danger" v-if="scope.row.level==2">特急</el-tag>
+					</template>
+				</el-table-column>
+			<el-table-column label="操作" align="center" fixed="right">
+				<!-- 操作按钮区域的作用域插槽 -->
+				<template slot-scope="scope">
+					<el-col style="margin-bottom: 5px;">
+						<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)" style="margin-top:5px">详情</el-button>
+						<el-button type="success" size="mini" plain @click="takeTheLeadReportList(scope.row.id)" style="margin-top:5px">牵头单位报告</el-button>
+					</el-col>
+					<el-col style="margin-bottom: 5px;">
+						<el-button type="success" size="mini" plain @click="undertakeReport(scope.row.id)">承担单位报告</el-button>
+						<el-button type="success" size="mini" plain @click="taskSample(scope.row.id)">抽样单</el-button>
+					</el-col>
+				</template>
+			</el-table-column>
+		</el-table>
+		
+		<!--    分页器区域-->
+		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+			:current-page="queryInfo.pageNum" :page-sizes="[10, 15, 20]" :page-size="queryInfo.pageSize"
+			layout="total, sizes, prev, pager, next, jumper" :total="total" background />
+	
+		<!-- 任务详情对话框-->
+		<el-dialog title="查看" :visible.sync="readDialogVisible" width="30%" :close-on-click-modal="false"
+			class="dialogItem">
+			<el-form v-if="readDialogVisible" :model="readForm" label-width="100px">
+				<el-form-item label="任务名称:" prop="task_name" class="labelItem">
+					<div>{{readForm.task_name}}</div>
+				</el-form-item>
+				<el-form-item label="任务优先级:" prop="level" class="labelItem">
+					<div v-if="readForm.level=='0'">一般</div>
+					<div v-else-if="readForm.level=='1'">紧急</div>
+					<div v-else>特急</div>
+				</el-form-item>
+				<el-form-item label="监测类型:" prop="task_class" width="70px" class="labelItem">
+					<div>{{readForm.task_class}}</div>
+				</el-form-item>
+				<el-form-item label="年度:" prop="year" class="labelItem">
+					<div>{{readForm.year}}</div>
+				</el-form-item>
+
+				<el-form-item label="批次:" prop="batch" width="200px" class="labelItem">
+					<div>{{readForm.batch}}</div>
+				</el-form-item>
+				<el-form-item label="任务时间:" prop="starttime" width="200px" class="labelItem">
+					<div>{{readForm.starttime}} 至 {{readForm.endtime}}</div>
+				</el-form-item>
+				<el-form-item label="发布单位:" prop="creater" class="labelItem">
+					<div>{{readForm.creater.name}}</div>
+				</el-form-item>
+				<!-- <el-form-item label="牵头单位:" prop="main_unit" class="labelItem">
+					<div>{{readForm.main_unit}}</div>
+				</el-form-item> -->
+				<el-form-item label="附件:" prop="file_url" class="labelItem">
+					<!-- <div>{{readForm.file_url}}</div> -->
+					<el-link :href="readForm.file_url" type="primary">{{readForm.file_name}}</el-link>
+				</el-form-item>
+				<el-form-item label="文件号:" prop="filenum" width="230px" class="labelItem">
+					<div v-if="readForm.filenum==null">无</div>
+					<div v-else>{{readForm.filenum}}</div>
+				</el-form-item>
+				<el-form-item label="备注:" prop="log" class="labelItem">
+					<div v-if="readForm.log==null">无</div>
+					<div v-else>{{readForm.log}}</div>
+				</el-form-item>
+				<div class="footer">
+					<el-button type="success" @click="readDialogVisible = false">返回</el-button>
+				</div>
+			</el-form>
+
+		</el-dialog>
+	</div>
+</template>
+<script>
+	const token = window.sessionStorage.getItem('token')
+	const rybh = window.sessionStorage.getItem('rybh')
+	const rymc = window.sessionStorage.getItem('rymc')
+	export default {
+		name: '',
+		data() {
+			return {
+				queryInfo:{
+					year:'',
+					task_name:'',
+					starttime:'',
+					endtime:'',
+					ispublic:'',
+					pageSize:10,
+					pageNum:1,
+					task_class:'例行监测'
+				},
+				total:0,
+				cellStyle: {
+					padding: 2 + 'px'
+				},
+				rowStyle: {
+					height: 35 + 'px'
+				},
+				tableHeader: [{
+						label: '任务名称',
+						prop: 'task_name',
+						width: 150
+						// fixed: 'left'
+					},
+					{
+						label: '开始时间',
+						prop: 'starttime',
+						width: 120
+					},
+					{
+						label: '结束时间',
+						prop: 'endtime',
+						width: 120
+					},
+					{
+						label: '年度',
+						prop: 'year',
+						width: 80
+						// fixed: 'left'
+					}, {
+						label: '文件号',
+						prop: 'filenum',
+						width: 180
+						// fixed: 'left'
+					},
+					{
+						label: '创建者',
+						prop: 'creater.name',
+						width: 140
+					},
+					{
+						label: '创建时间',
+						prop: 'create_time',
+						width: 180
+					}
+				],
+				// 数据表格数据
+				tableData: [],
+				// 批量删除选中数据
+				multipleSelection: [],
+				// 任务状态选项
+				taskispublic: [{
+					value: '',
+					label: '全部'
+				}, {
+					value: '0',
+					label: '未发布'
+				}, {
+					value: '1',
+					label: '已发布'
+				}, {
+					value: '2',
+					label: '废止'
+				}, {
+					value: '5',
+					label: '执行中'
+				}, {
+					value: '3',
+					label: '已结束，未完成'
+				}, {
+					value: '4',
+					label: '已结束，已完成'
+				}],
+				// 日期选择器快捷选项
+				pickerOptions: {
+					// disabledDate(time) {
+					// 	return time.getTime() > Date.now();
+					// },
+					shortcuts: [{
+						text: '今天',
+						onClick(picker) {
+							picker.$emit('pick', new Date());
+						}
+					}, {
+						text: '昨天',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24);
+							picker.$emit('pick', date);
+						}
+					}, {
+						text: '一周前',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', date);
+						}
+					}]
+				},
+				// 查看任务详情
+				readDialogVisible: false,
+				readForm: {},
+				multipleSelection: [],
+				delarr: [],
+				pubarr: []
+			}
+		},
+		created() {
+			this.getTasks()
+		},
+		methods: {
+			add() {
+				this.$router.push('addTask')
+			},
+			takeTheLeadReportList(id) {
+				console.log(id)
+				this.$router.push({
+					name:'takeTheLeadReportList',
+					params: {
+					task_id: id,
+					}
+				})
+			},
+			undertakeReport(id){
+				console.log(id)
+				this.$router.push({
+					name:'undertakeReport',
+					params: {
+					task_id: id,
+					}
+				})
+			},
+			taskSample(id){
+				console.log(id)
+				this.$router.push({
+					name:'taskSample',
+					params: {
+					task_id: id,
+					}
+				})
+		},
+			
+			// 搜索
+			async searchData() {
+				this.queryInfo.pageNum = 1
+				this.gettaskList()
+			},
+			// 重置
+			reset(){
+				this.queryInfo={
+					year:'',
+					task_name:'',
+					starttime:'',
+					endtime:'',
+					ispublic:'',
+					pageSize:10,
+					pageNum:1,
+					task_class:'例行监测',
+					task_id
+				}
+				this.getTasks()
+			},
+			/** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.queryInfo.pageNum = newPage
+				this.getTasks()
+			},
+			/** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.queryInfo.pageSize = newSize
+				this.getTasks()
+			},
+			// 获取任务列表
+			async getTasks() {
+				for (var key in this.queryInfo) {
+					if (this.queryInfo[key] == '') {
+						delete this.queryInfo[key]
+					}
+				}
+				const {
+					data: res
+				} = await this.$http.post(
+					"getTasks", this.queryInfo
+				);
+				this.tableData = res.data.rows
+				this.total = res.data.total
+			},
+			// 查看任务详情
+			async readDialogVisible1(row) {
+				this.readForm.batch = row.batch
+				this.readForm.task_name = row.task_name
+				this.readForm.task_class = row.task_class
+				this.readForm.level = row.level
+				// console.log(this.readForm.level)
+				this.readForm.year = row.year
+				this.readForm.starttime = row.starttime
+				this.readForm.endtime = row.endtime
+				this.readForm.releaser = row.releaser
+				this.readForm.creater = row.creater
+				this.readForm.main_unit = row.main_unit
+				this.readForm.file_url = row.file_url
+				this.readForm.file_name = row.file_name
+				this.readForm.filenum = row.filenum
+				this.readForm.log = row.log
+				this.readDialogVisible = true
+
+			},
+			// 批量删除
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+				// console.log(this.multipleSelection)
+			},
+			// 删除任务
+			async delArray() {
+				// 判断任务是否为该创建者创建
+				// 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;
+				for (let i = 0; i < length; i++) {
+					// console.log(this.multipleSelection[i])
+					this.delarr.push(this.multipleSelection[i].id);
+				}
+				const result = await this.$http.post('deleteTasks', {
+					delarr: that.delarr,
+					token: token
+				})
+				console.log(that.delarr);
+				if (result.data.code == 0) {
+					this.$message({
+						type: 'success',
+						message: '删除成功!'
+					});
+					that.getTasks()
+				} else {
+					this.$message({
+						type: 'error',
+						message: '删除失败!'
+					});
+				}
+				// console.log(this.$refs.multipleTable);
+				this.$refs.multipleTable.clearSelection();
+				that.delarr = [];
+				// this.$refs.multipleTable.clearSelectionFun();
+			},
+			// 发布任务
+			async ispublic() {
+				// 判断任务是否为该创建者创建
+				// 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;
+				// var val = this.selectedData;
+				console.log(this.multipleSelection)
+				// this.pubarr = this.multipleSelection;
+				for (let i = 0; i < length; i++) {
+					if (this.multipleSelection[i].ispublic != '0') {
+						this.$alert('任务不在可发布状态！', {
+							confirmButtonText: '确定',
+							callback: action => {
+
+							}
+						});
+					} else {
+						this.multipleSelection[i].ispublic = 1
+						canPub = 1
+					}
+				}
+				if(canPub==1){
+					const result = await this.$http.post('putTaskPublic', {
+						pubarr: that.multipleSelection,
+						token: token,
+					})
+					console.log(result.data.code)
+					if (result.data.code == 0) {
+						this.$message({
+							type: 'success',
+							message: '发布成功!'
+						});
+						that.getTasks()
+					}else{
+						this.$message({
+							type: 'error',
+							message: result.data.message})
+					}				
+				}
+			},
+			// 废止任务
+			async repeal() {
+				// 判断任务是否为该创建者创建
+				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;
+				// var val = this.selectedData;
+				this.pubarr = this.multipleSelection;
+				for (let i = 0; i < length; i++) {
+					if (this.pubarr[i].ispublic == 1) {
+						this.pubarr[i].ispublic = 2
+						canPub = 1
+					} else {
+						this.$alert('任务不在可废止状态！', {
+							confirmButtonText: '确定',
+							callback: action => {
+
+							}
+						});
+					}
+					if(canPub==1){
+						const result = await this.$http.post('putTaskPublic', {
+							pubarr: that.pubarr,
+							token: token
+						})
+						if (result.data.code == 0) {
+							this.$message({
+								type: 'success',
+								message: '任务已废止!'
+							});
+							that.getTasks()
+						}
+					}
+					
+				}
+
+			}
+
+
+		},
+	}
+</script>
+
+<style lang="less" scoped>
+	.el-breadcrumb {
+		margin-bottom: 20px;
+	}
+	.el-table {
+		align-items: center;
+		margin-top: 25px;
+	}
+
+	/deep/ .el-col {
+		padding-right: 0 !important;
+	}
+
+	/deep/ .el-radio-group label {
+		width: 180px;
+		margin-right: 10px;
+	}
+
+	.el-pagination {
+		margin-top: 25px;
+	}
+
+	// .el-cascader {
+	// 	width: 290px;
+	// }
+
+	.el-select {
+		width: 210px;
+		height: 100%;
+	}
+
+	.select {
+		// display: flex;
+		flex-direction: row;
+		// margin-left: 10px;
+		
+	}
+
+	.dialogItem /deep/ .el-dialog__body {
+		padding: 15px 12px 0;
+		color: #606266;
+		font-size: 14px;
+		word-break: break-all;
+	}
+
+	.el-form-item {
+		margin-bottom: 8px;
+	}
+
+	.labelItem /deep/ .el-form-item__label {
+		// width: 80px;
+		text-align: center;
+		vertical-align: middle;
+		float: left;
+		font-size: 13px;
+		color: #606266;
+		// line-height: 40px;
+		padding: 0 2px 0 0;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+
+	.el-dialog__header {
+		border-bottom: 1px solid #e5e5e5;
+	}
+
+	// .el-form-item__content{
+	// 	margin-left: 0;
+	// }
+	.footer {
+		padding: 5px 0;
+		border-top: 1px solid #e5e5e5;
+		text-align: center;
+	}
+	.rightButton{
+		margin-top: 20px;
+	}
+	.headSearch{
+		margin-left: 25px;
+	}
+</style>

src/main.js

@@ -12,9 +12,9 @@ import axios from 'axios'
 
 
 // 使用axios
-axios.defaults.baseURL = 'http://syjcapi.aielab.net/api/v1'
+//axios.defaults.baseURL = 'http://syjcapi.aielab.net/api/v1'
 //axios.defaults.baseURL = 'http://192.168.3.52/api/v1'
-// axios.defaults.baseURL = 'http://new.syjc.com/api/v1'
+ axios.defaults.baseURL = 'http://new.syjc.com/api/v1'
 Vue.prototype.$http = axios
 Vue.config.productionTip = false
 axios.interceptors.request.use(

src/router/index.js

@@ -9,6 +9,7 @@ import {
 import 'element-ui/lib/theme-chalk/index.css'
 Vue.use(VueRouter)
 
+
 /** 按需导入后台系统功能组件 */
 const routes = [{
 		path: '',
@@ -75,16 +76,38 @@ const routes = [{
 			},
 			{
 				path: '/admin/undertakeReportZx',
-					name:'taskSampleZx',
+					name:'undertakeReportZx',
 					component: () => import('../components/admin/undertakeReportZx')
 			},{
 				path: '/admin/jgsampleDetail',
 					name:'jgsampleDetail',
 					component: () => import('../components/admin/jgsampleDetail')
+			},{
+				path: '/admin/addTaskJcObject',
+					name:'addTaskJcObject',
+					component: () => import('../components/admin/addTaskJcObject')
+			},{
+				path: '/admin/subjDtList',
+					name:'subjDtList',
+					component: () => import('../components/admin/subjDtList')
+			},{
+				path: '/admin/getAccount',
+					name:'getAccount',
+					component: () => import('../components/admin/getAccount')
+			},{
+				path: '/admin/putAccount',
+					name:'putAccount',
+					component: () => import('../components/admin/putAccount')
+			},{
+				path: '/admin/getOrganization',
+					name:'getOrganization',
+					component: () => import('../components/admin/getOrganization')
+			},{
+				path: '/admin/getMonitor',
+					name:'getMonitor',
+					component: () => import('../components/admin/getMonitor')
 			},
-			// 	path: '/admin/taskSample',
-			// 	component: () => import('../components/admin/taskSample')
-			// }
+			
 
 		]
 	},