yyfang %!s(int64=3) %!d(string=hai) anos
pai
achega
d5148a6433

+ 2 - 1
src/components/admin/addTaskJcObject.vue

@@ -145,7 +145,8 @@ import {
 				// 	label: '企业'
 				// }],
 				// 抽样地区
-				region: regionData,
+				// region: regionData,
+				region: regionData[11].children,
 				sample_address:[],
 				// 机构地域表格数据
 				underTask: [],

+ 2 - 1
src/components/admin/addTaskObjectJd.vue

@@ -145,7 +145,8 @@ import {
 				// 	label: '企业'
 				// }],
 				// 抽样地区
-				region: regionData,
+				// region: regionData,
+				region: regionData[11].children,
 				sample_address:[],
 				// 机构地域表格数据
 				underTask: [],

+ 2 - 1
src/components/admin/addTaskObjectZx.vue

@@ -145,7 +145,8 @@ import {
 				// 	label: '企业'
 				// }],
 				// 抽样地区
-				region: regionData,
+				// region: regionData,
+				region: regionData[11].children,
 				sample_address:[],
 				// 机构地域表格数据
 				underTask: [],

+ 0 - 251
src/components/admin/jgsampleDetail.vue

@@ -1,251 +0,0 @@
-<template>
-	<div>
-		<!-- 		<el-card class="box-card" style="height: 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-item>抽样单详情</el-breadcrumb-item>
-		</el-breadcrumb>
-		<el-descriptions  title="农产品质量安全抽样单详情" :column="2" border style="margin-top:20px;" :contentStyle="{'text-align': left}">
-	<el-descriptions-item label="*样品名称" prop="form.sample_name" class="labelItem" size="mini">
-		<el-input v-model="form.sample_name" disabled></el-input>
-		<!-- </el-col> -->
-	</el-descriptions-item>
-	<el-descriptions-item label="样品编码" prop="form.sample_id" class="labelItem" style="" size="mini">
-		<el-input v-model="form.sample_id" disabled></el-input>
-	</el-descriptions-item>
-	<el-descriptions-item label="商标" prop="form.brand" class="labelItem" size="mini">
-		<el-input v-model="form.brand" disabled></el-input>
-	</el-descriptions-item>
-	<el-descriptions-item label="包装" prop="form.ispack" class="labelItem" style="" size="mini">
-		<el-radio v-model="form.ispack" label="有" disabled>有</el-radio>
-		<el-radio v-model="form.ispack" label="无" disabled>无</el-radio>
-	</el-descriptions-item>
-	<el-descriptions-item label="型号规格" prop="form.type" class="labelItem" size="mini">
-		<el-input v-model="form.type" disabled></el-input>
-	</el-descriptions-item>
-	<el-descriptions-item label="执行标准" prop="form.standard" class="labelItem" style="" size="mini">
-		<el-input v-model="form.standard" disabled></el-input>
-	</el-descriptions-item>
-	<el-descriptions-item label="*生产日期或批号" prop="form.production_date" class="labelItem" size="mini">
-		<el-input v-model="form.production_date" disabled></el-input>
-	</el-descriptions-item>
-	<el-descriptions-item label="产地" prop="form.place" class="labelItem" style="" size="mini">
-		<!-- <el-cascader  :options="options" v-model="selectedOptions" @change="handleChange" style="width:60%"></el-cascader> -->
-		<el-input v-model="form.place" disabled></el-input>
-
-	</el-descriptions-item>
-	<el-descriptions-item label="*产品认证情况" prop="form.certicfie" class="labelItem" size="mini">
-		<el-radio v-model="form.certicfie" label="无公害农产品" disabled>无公害农产品</el-radio>
-		<el-radio v-model="form.certicfie" label="绿色食品" disabled>绿色食品</el-radio>
-		<el-radio v-model="form.certicfie" label="有机食品" disabled>有机食品</el-radio>
-		<el-radio v-model="form.certicfie" label="其他" disabled>其他</el-radio>
-	</el-descriptions-item>
-	<el-descriptions-item label="证书编号" prop="form.certifie_num" class="labelItem" style="" size="mini">
-		<el-input v-model="form.certifie_num" disabled></el-input>
-	</el-descriptions-item>
-	<el-descriptions-item label="*抽样数量" prop="form.sample_num" class="labelItem" size="mini" required>
-		<el-input v-model="form.sample_num" style="width:180px" disabled></el-input>
-		<a> * 单位 </a><el-input v-model="form.sample_num_unit" clearable="true" style="width:180px" disabled></el-input>
-	</el-descriptions-item>
-	<el-descriptions-item label="抽样基数" prop="form.sample_base" class="labelItem" size="mini" required>
-		<el-input v-model="form.sample_base" style="width:180px" disabled></el-input>
-		<a> * 单位 </a><el-input v-model="form.sample_base_unit" clearable="true" style="width:180px" disabled></el-input>
-	</el-descriptions-item>
-	<el-descriptions-item label="*抽样场所" prop="form.sample_ground" class="labelItem" size="mini" required >
-							<el-radio v-model="form.sample_ground" label="生产基地/企业" disabled>生产基地/企业</el-radio>
-							<el-radio v-model="form.sample_ground" label="屠宰场" disabled>屠宰场</el-radio>
-							<el-radio v-model="form.sample_ground" label="农贸市场" disabled>农贸市场</el-radio>
-							<el-radio v-model="form.ample_ground" label="批发市场" disabled>批发市场</el-radio>
-							<el-radio v-model="form.sample_ground" label="超市" disabled>超市</el-radio>
-							<el-radio v-model="form.sample_ground" label="其他" disabled>其他</el-radio>
-	</el-descriptions-item>
-	</el-descriptions>
-	<!-- 受检单位情况 -->
-	<el-descriptions :column="1" border style="" >
-		<el-descriptions-item label="受检单位情况" >
-			<el-descriptions  :column="1" border  size="mini" style="width:100%">
-				<el-descriptions-item label="*单位名称" prop="unit_test.unit_test_name" class="labelItem" size="mini" required>
-									<el-input v-model="unit_test.unit_test_name" disabled></el-input>
-				</el-descriptions-item>
-				<el-descriptions-item label="*法定代表人" prop="unit_test.represent_name" class="labelItem" size="mini" required>
-									<el-input v-model="unit_test.represent_name" disabled></el-input>
-				</el-descriptions-item>
-				<el-descriptions-item label="*受检人" prop="unit_test.user_name" class="labelItem" size="mini" required>
-									<el-input v-model="unit_test.user_name" disabled></el-input>
-				</el-descriptions-item>
-				<el-descriptions-item label="*联系电话" prop="unit_test.phone" class="labelItem" size="mini">
-									<el-input v-model="unit_test.phone" disabled></el-input>
-				</el-descriptions-item>
-				<el-descriptions-item label="*通讯地址" prop="unit_test.address" class="labelItem" size="mini" required>
-									<el-input v-model="unit_test.address" disabled></el-input>
-				</el-descriptions-item>
-				<el-descriptions-item label="传真" prop="unit_test.fax" class="labelItem" size="mini">
-							<el-input v-model="unit_test.fax" disabled></el-input>
-				</el-descriptions-item>
-			</el-descriptions>
-		</el-descriptions-item>
-	</el-descriptions>
-		<!-- 生产单位情况 -->
-		<el-descriptions :column="1" border style="" >
-			<el-descriptions-item label="生产单位情况"  >
-				<el-descriptions  :column="1" border size="mini" style="width:100%" >
-			<el-descriptions-item label="*单位名称" prop="unit_production.unit_production_name" class="labelItem" style="" size="mini" required>
-				<el-input v-model="unit_production.unit_production_name" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="*联系人" prop="unit_production.user_name" class="labelItem" style="" size="mini" required>
-				<el-input v-model="unit_production.user_name" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="*联系电话" prop="unit_production.phone" class="labelItem" style="" size="mini">
-				<el-input v-model="unit_production.phone" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="*通讯地址" prop="unit_production.address" class="labelItem" style="" size="mini" required>
-				<el-input v-model="unit_production.address" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="邮编" prop="unit_production.postcode" class="labelItem" style="" size="mini">
-				<el-input v-model="unit_production.postcode" disabled></el-input>
-			</el-descriptions-item>
-			
-			<el-descriptions-item label="传真" prop="unit_production.fax" class="labelItem" style="" size="mini">
-				<el-input v-model="unit_production.fax" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="生产方式" prop="unit_production.production_class" class="labelItem" style=""  required>
-				<el-radio v-model="unit_production.production_class" label="自产" disabled>自产</el-radio>
-				<el-radio v-model="unit_production.production_class" label="收购" disabled>收购</el-radio>
-			</el-descriptions-item>
-			</el-descriptions>
-			</el-descriptions-item>
-		</el-descriptions>
-
-
-		<!-- 抽样单位情况 -->
-		<el-descriptions :column="1" border style="" >
-			<el-descriptions-item label="抽样单位情况" >
-				<el-descriptions  :column="1" border size="mini" style="width:100%">
-			<el-descriptions-item label="*单位名称" prop="unit_sample.unit_sample_name" class="labelItem" style="" size="mini" required>
-									<el-input v-model="unit_sample.unit_sample_name" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="*联系人" prop="unit_sample.unit_user" class="labelItem" style="" size="mini" required>
-									<el-input v-model="unit_sample.unit_user" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="*联系电话" prop="unit_sample.phone" class="labelItem" style="" size="mini">
-									<el-input v-model="unit_sample.phone" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="*通讯地址" prop="unit_sample.address" class="labelItem" style="" size="mini" required>
-									<el-input v-model="unit_sample.address" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="邮编" prop="unit_sample.postcode" class="labelItem" style="" size="mini">
-									<el-input v-model="unit_sample.postcode" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="传真" prop="unit_sample.fax" class="labelItem" style="" size="mini">
-									<el-input v-model="unit_sample.fax" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="Email" prop="unit_sample.email" class="labelItem" style="" size="mini">
-									<el-input v-model="unit_sample.email" disabled></el-input>
-			</el-descriptions-item>
-			</el-descriptions>
-			</el-descriptions-item>
-		</el-descriptions>
-
-		<el-descriptions  :column="2" border>
-			<el-descriptions-item label="检测任务依据" prop="form.base" class="labelItem" style="" size="mini" required>
-								<el-input v-model="form.base" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item  label="抽样时间" prop="form.sample_date" class="labelItem" style="" size="mini" required>
-								<el-date-picker v-model="form.sample_date" type="date" value-format="yyyy-MM-dd" disabled>
-								</el-date-picker>
-			</el-descriptions-item>
-			<el-descriptions-item  label="被抽检单位签字盖章附件" prop="form.file_name" class="labelItem" style="" size="mini">
-									<el-input v-model="form.file_name" disabled></el-input>
-
-								<!-- <el-upload class="upload-demo" :file-list="fileList" drag :headers="myHeaders"
-
-									action="http://syjcapi.aielab.net/api/v1/ossUpload" :on-success="uploadSuccess" :limit="1">
-
-									<i class="el-icon-upload"></i>
-									<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
-								</el-upload> -->
-			</el-descriptions-item>
-		</el-descriptions>
-		<el-form>
-			<el-form-item class="btn">
-				<el-button type="primary" @click="backTaskDetail()">返回任务详情</el-button>
-			</el-form-item>
-		</el-form>
-	</div>
-</template>
-
-<script>
-	const token = window.sessionStorage.getItem('token')
-
-	export default {
-		name: 'sampleDetail',
-		data() {
-			return {
-				form: {},
-				cyd_data: {},//抽样单信息上部分
-				unit_test: {},//受检单位信息
-				unit_production: {},//生产单位信息
-				unit_sample: {},//抽样单位信息
-			}
-		},
-		created() {
-			this.id = this.$route.params.id
-			console.log(this.id)
-			this.getSampleDetail()
-		},
-		methods: {
-			//返回任务详情页面
-			async backTaskDetail() {
-					var that = this
-					console.log(that.form.task_id)
-				this.$router.push({
-					name: 'taskSample',
-					params: {
-						task_id: that.form.task_id
-					}
-				})
-			},
-			// 获取样本详情
-			async getSampleDetail() {
-				// let that = this
-				const result = await this.$http.post('getSampleDetail', {
-					sample_id: this.id
-				})
-				console.log(result.data.data)
-					this.form = result.data.data
-					this.unit_test = this.form.unitTest
-					this.unit_production = this.form.unitProduction
-					this.unit_sample = this.form.unitSample
-					console.log(this.form)
-			},
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	// .form {
-	// 	display: flex;
-	// 	flex-direction: row;
-	// 	justify-content: space-between;
-	// }
-		.el-descriptions {
-		width: 80%;
-		margin: auto;
-	}
-	.btn{
-		margin-top:20px ;
-		// float: right;
-		text-align: center;
-	}
-
-	/deep/ .el-descriptions__title {
-		margin: auto;
-		font-size: 1.25rem;
-		// font-weight: 31.25rem !important;
-	}
-</style>

+ 0 - 215
src/components/admin/leadReport.vue

@@ -1,215 +0,0 @@
-<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-input v-model="queryInfo.task_name"></el-input>
-					</el-form-item>
-					<el-button type="success" size="small">查询</el-button>
-					<el-button plain class="btns" size="medium" @click="returnTask()">
-						返回
-					</el-button>
-				</el-form> 
-			</el-row>
-		</div>
-
-            
-        <!-- 表格区域 -->
-		<div class="table">
-			<!--  表格数据区域-->
-			<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 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 label="操作" align="center" fixed="right">
-				</el-table-column>
-	    	</el-table>
-				<!--分页器区域-->
-			<div class="block">
-				 <el-pagination
-					@size-change="handleSizeChange"
-					@current-change="handleCurrentChange"
-					:current-page="currentPage4"
-					:page-sizes="[10, 15, 20, ]"
-					:page-size="queryInfo.pageSize"
-					layout="total, sizes, prev, pager, next, jumper"
-					:total="total"
-					background />
-    			
-			</div>
-		</div>
-	</div>
-    
-</template>
-
-<script>
-	const token = window.sessionStorage.getItem('token')
-	export default {
-		name: '',
-		data() {
-			return {
-				total:0,
-				queryInfo:{
-					year:'',
-					task_name:'',
-					starttime:'',
-					endtime:'',
-					ispublic:'',
-					pageSize:10,
-					pageNum:1,
-					task_class:'专项监测'
-				},
-                cellStyle: {
-					padding: 2 + 'px'
-				},
-				rowStyle: {
-					height: 35 + 'px'
-				},
-				tableHeader: [{
-						label: '年份',
-						prop: '',
-						width: 50
-						// fixed: 'left'
-					},
-					{
-						label: '所属任务',
-						prop: '',
-						width:200
-						// fixed: 'left'
-					}, {
-						label: '单位',
-						prop: '',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '报告名称',
-						prop: '',
-						width: 200
-					},
-					{
-						label: '状态',
-						prop: '',
-						width: 180
-					}
-				],
-                options: [{
-					value: '选项1',
-					label: '测试1'
-					}, {
-					value: '选项2',
-					label: '测试2'
-					}, {
-					value: '选项3',
-					label: '测试3'
-					}],
-			// 数据表格数据
-				tableData: []
-            }
-        },
-		mounted: function() {
-			this.getJgQtouList()
-		},
-		created: function() {
-			console.log(this.$route.params.task_id)
-			// this.unit_id = this.$route.params.unit_id
-			this.task_id = this.$route.params.task_id
-			this.getJgQtouList()
-		},
-		 methods: {
-			  /** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.getJgQtouList()
-			},
-			/** 监听每页显示多少数据的改变 */
-			handleSizeChange(newSize) {
-				this.queryInfo.pageSize = newSize
-				this.getJgQtouList()
-			},
-			
-			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.getJgQtouList()
-			},
-			// 获取牵头单位报告列表
-				async getJgQtouList() {
-				const result = await this.$http.post('getJgQtouList', {
-					task_id: this.task_id,
-					pageSize:this.queryInfo.pageSize,
-					pageNum:this.queryInfo.pageNum
-				})
-				console.log( result.data)
-				console.log(this.queryInfo.pageSize)
-				if (result.data.code == 0) {
-				this.tableData = result.data.data
-				}
-				console.log(this.tableData)
-				},
-				
-        	returnTask(){
-            this.$router.push('specialMonitor')
-        	},
-      		handleSizeChange(val) {
-        	console.log(`每页 ${val} 条`);
-      		},
-      		handleCurrentChange(val) {
-        	console.log(`当前页: ${val}`);
-      		}
-    		},
-    }
-</script>
-
-<style>
-.btns{
-	float:right;
-	padding: 10px;
-}
-.table{
-	padding: 10px;
-}
-.foottable .pager{
-	float: left;
-	
-}
-.footer {
-		padding: 5px 0;
-		border-top: 1px solid #e5e5e5;
-		text-align: center;
-		}
-.headSearch{
-		margin-left: 25px;
-}
-</style>

+ 0 - 617
src/components/admin/reTask copy.vue

@@ -1,617 +0,0 @@
-
-<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="120" style="margin-right: 0px;">
-				<el-form :inline="true">
-				<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: 8px;" 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="editInform(scope.row.id)" style="margin-top:5px">编辑</el-button>
-						<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)" style="margin-top:5px">详情</el-button>
-						<el-button type="success" size="mini" @click="sendBack(scope.row)" style="margin-top:5px">退回</el-button>
-					</el-col>
-					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" plain @click="getJcds(scope.row.id)" style="margin-top:5px">检测单</el-button> 
-						<el-button type="success" size="mini" plain @click="sampleList(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:{
-					pageSize:10,
-					pageNum:1,
-					// task_class:'retask',
-					task_id:'33',
-				}, 
-				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')
-			// },
-			
-            //编辑
-            editInform(id){
-				this.$router.push({
-					name:'editInformation',
-					params: {
-					task_id:id,
-					},
-				})
-			},
-			//查看抽样机构
-			sampleList(id){
-				this.$router.push({
-					name:'setTaskJg',
-					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()
-			},
-			//退回
-			sendBack(){
-
-			},
-			/** 监听页码的改变 */
-			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);
-				const {data: res} = await this.$http.post('getTasks',this.queryInfo)
-				this.tableData = res.data.rows
-				//获取task_id
-				for(let i=0; i<res.data.rows.length; i++){
-					this.task_id = res.data.rows[i].id
-					console.log(this.task_id)
-				}
-				// this.total = res.data.total
-				// this.task_id = res.data.rows[i].id
-
-
-				
-			},
-			// 查看任务详情
-			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
-				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;
-				for (let i = 0; i < length; 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: 35px;
-		
-	}
-
-	.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>

+ 0 - 74
src/components/admin/readCheck copy.vue

@@ -1,74 +0,0 @@
-<template>
-<div>
-    <el-descriptions title="检测单" direction="vertical" :column="5" border align="center">
-            <!-- 检测单信息 -->
-            <el-descriptions-item label="检测单编码" prop="jcd_data.jcd_code">{{jcd_data.jcd_code}}</el-descriptions-item>
-            <el-descriptions-item label="检测结果" prop="jcd_data.jcd_result">{{jcd_data.jcd_result}}</el-descriptions-item>
-            <el-descriptions-item label="附件链接" prop="jcd_data.file_url">{{jcd_data.file_url}}</el-descriptions-item>
-            <el-descriptions-item label="附件名称" prop="jcd_data.file_name">{{jcd_data.file_name}}</el-descriptions-item>
-            <el-descriptions-item label="检测单状态" prop="jcd_data.jcd_status">{{jcd_data.jcd_status}}</el-descriptions-item>
-            <el-descriptions-item label="检测项目名称" prop="jcd_data.jcdItem.item_name">{{jcd_data.jcdItem.item_name}}</el-descriptions-item>
-            <el-descriptions-item label="检验标准" prop="jcd_data.jcdItem.item_standard">{{jcd_data.jcdItem.item_standard}}</el-descriptions-item>
-            <el-descriptions-item label="实测值" prop="jcd_data.jcdItem.item_measured_value">{{jcd_data.jcdItem.item_measured_value}}</el-descriptions-item>
-            <el-descriptions-item label="检验依据" prop="jcd_data.jcdItem.item_basis">{{jcd_data.jcdItem.item_basis}}</el-descriptions-item>
-            <el-descriptions-item label="检验备注" prop="jcd_data.jcdItem.item_log">{{jcd_data.jcdItem.item_log}}</el-descriptions-item>
-         <!-- 返回 -->
-        </el-descriptions> 
-        <el-form>
-				<el-form-item class="btn">
-				<el-button type="primary" @click="back()" style="margin-top:10px">返回</el-button>
-                </el-form-item>
-		</el-form>
-</div>
-</template>
-                    
-
-<script>
-	const token = window.sessionStorage.getItem('token')
-	export default {
-		data() {
-			return {
-				jcd_data:{},//检测单信息
-				jcd_id:''
-			}
-		},
-		created() {
-			this.jcd_id = this.$route.params.jcd_id
-			console.log(this.jcd_id)
-			this.getJcd()
-		},
-		mounted(){
-		if (window.history && window.history.pushState) {
-		history.pushState(null, null, document.URL); //这里有没有都无所谓,最好是有以防万一
-		window.addEventListener('popstate', this.goBack, false);
-		// 回退时执行goback方法
-		}
-    },
-		methods: { 
-          // 返回
-			back() {
-				var that = this
-				console.log(that.task_id)
-				this.$router.push({
-					name: 'readCheckList',
-					params: {
-						// id: this.$route.params.cyd_id
-						task_id : this.$route.params.task_id,
-       					task_profile_id : this.$route.params.task_profile_id,	
-					}
-				})
-				console.log()
-			},
-			// 获取检测单信息
-			async getJcd() {
-				const {data: res} = await this.$http.post('getJcd', {
-					jcd_id: this.jcd_id
-				})
-				this.jcd_data = res.data//检测单信息
-				console.log(this.jcd_data)
-                console.log(this.jcd_id)
-			},
-		
-		},
-	}
-</script>

+ 0 - 103
src/components/admin/readSample copy.vue

@@ -1,103 +0,0 @@
-<template>
-<div>
-    <el-descriptions title="抽样单" direction="vertical" :column="5" border align="center">
-            <!-- 抽样单信息 -->
-            <el-descriptions-item label="抽样单编码" prop="cyd_data.cyd_code">{{cyd_data.cyd_code}}</el-descriptions-item>
-            <el-descriptions-item label="抽样单状态" prop="cyd_data.cyd_status">{{cyd_data.cyd_status}}</el-descriptions-item>
-            <el-descriptions-item label="单位名称" prop="taskProfile_unit.sampleOrgId.name">{{taskProfile_unit.sampleOrgId.name}}</el-descriptions-item>
-            <el-descriptions-item label="单位别名" prop="taskProfile_unit.sampleOrgId.name_other">{{taskProfile_unit.sampleOrgId.name_other}}</el-descriptions-item>
-            <el-descriptions-item label="组别" prop="taskProfile_unit.sampleOrgId.groupname">{{taskProfile_unit.sampleOrgId.groupname}}</el-descriptions-item>
-            <el-descriptions-item label="机构性质" prop="taskProfile_unit.sampleOrgId.properties">{{taskProfile_unit.sampleOrgId.properties}}</el-descriptions-item>
-            <el-descriptions-item label="联系人" prop="taskProfile_unit.sampleOrgId.contact_name">{{taskProfile_unit.sampleOrgId.contact_name}}</el-descriptions-item>
-            <el-descriptions-item label="联系电话" prop="taskProfile_unit.sampleOrgId.contact_phone">{{taskProfile_unit.sampleOrgId.contact_phone}}</el-descriptions-item>
-            <!-- 抽样人员信息 -->
-            <el-descriptions-item label="抽样人员1" prop="cydProfile_unit.sample_person_one">{{cydProfile_unit.sample_person_one}}</el-descriptions-item>
-            <el-descriptions-item label="抽样人员2" prop="cydProfile_unit.sample_person_two">{{cydProfile_unit.sample_person_two}}</el-descriptions-item>
-            <el-descriptions-item label="抽样地区" prop="cydProfile_unit.sample_address">{{cydProfile_unit.sample_address}}</el-descriptions-item>
-            <el-descriptions-item label="抽样日期" prop="cydProfile_unit.cyd_date">{{cydProfile_unit.cyd_date}}</el-descriptions-item>
-            <el-descriptions-item label="附件名称" prop="cydProfile_unit.cyd_file_name">{{cydProfile_unit.cyd_file_name}}</el-descriptions-item>
-            <el-descriptions-item label="附件链接" prop="cydProfile_unit.cyd_file_url">{{cydProfile_unit.cyd_file_url}}</el-descriptions-item>
-            <el-descriptions-item label="抽样单备注" prop="cydProfile_unit.cyd_log">{{cydProfile_unit.cyd_log}}</el-descriptions-item>
-            <!-- 受检单位信息 -->
-            <el-descriptions-item label="受检地区" prop="inspected_unit.inspected_address">{{inspected_unit.inspected_address}}</el-descriptions-item>
-            <el-descriptions-item label="受检单位名称" prop="inspected_unit.inspected_name">{{inspected_unit.inspected_name}}</el-descriptions-item>
-            <el-descriptions-item label="联系人" prop="inspected_unit.contact_name">{{inspected_unit.contact_name}}</el-descriptions-item>
-            <el-descriptions-item label="联系人电话" prop="inspected_unit.contact_phone">{{inspected_unit.contact_phone}}</el-descriptions-item>
-            <el-descriptions-item label="联系人邮箱" prop="inspected_unit.contact_email">{{inspected_unit.contact_email}}</el-descriptions-item>
-            <!-- 样品信息 -->
-            <el-descriptions-item label="样品名称" prop="sample_unit.sample_name">{{sample_unit.sample_name}}</el-descriptions-item>
-            <el-descriptions-item label="样品商标" prop="sample_unit.sample_brand">{{sample_unit.sample_brand}}</el-descriptions-item>
-            <el-descriptions-item label="样品规格型号" prop="sample_unit.sample_type">{{sample_unit.sample_type}}</el-descriptions-item>
-            <el-descriptions-item label="样品生产日期" prop="sample_unit.sample_md_date">{{sample_unit.sample_md_date}}</el-descriptions-item>
-            <el-descriptions-item label="样品质量等级" prop="sample_unit.sample_quality_grade">{{sample_unit.sample_quality_grade}}</el-descriptions-item>
-            <el-descriptions-item label="样品生产厂家" prop="sample_unit.sample_product_name">{{sample_unit.sample_product_name}}</el-descriptions-item>
-            <el-descriptions-item label="样品生产厂家联系电话" prop="sample_unit.sample_product_phone">{{sample_unit.sample_product_phone}}</el-descriptions-item>
-            <el-descriptions-item label="样品来源" prop="sample_unit.sample_source">{{sample_unit.sample_source}}</el-descriptions-item>
-            <el-descriptions-item label="抽样日期" prop="sample_unit.sample_ing_date">{{sample_unit.sample_ing_date}}</el-descriptions-item>
-            <el-descriptions-item label="抽样数量" prop="sample_unit.sample_count">{{sample_unit.sample_count}}</el-descriptions-item>
-            <el-descriptions-item label="抽样基数" prop="sample_unit.sample_base">{{sample_unit.sample_base}}</el-descriptions-item>
-            <el-descriptions-item label="样品备注" prop="sample_unit.sample_log">{{sample_unit.sample_log}}</el-descriptions-item>
-         <!-- 返回 -->
-        </el-descriptions> 
-        <el-form>
-				<el-form-item class="btn">
-				<el-button type="primary" @click="back()">返回</el-button>
-                </el-form-item>
-		</el-form>
-</div>
-</template>
-                    
-
-<script>
-	const token = window.sessionStorage.getItem('token')
-	export default {
-		data() {
-			return {
-				cyd_data: {},//抽样单信息
-                cydProfile_unit:{},//抽样人员信息
-                taskProfile_unit:{},//抽样单位信息
-				inspected_unit: {},//受检单位信息
-				sample_unit: {},//样品信息
-			}
-		},
-		created() {
-			this.cyd_id = this.$route.params.cyd_id
-			// this.sample_id = 34
-			console.log(this.cyd_id)
-			console.log(this.sample_id)
-			this.getCyd()
-		},
-		methods: {
-          // 返回
-			back() {
-				var that = this
-				console.log(that.task_id)
-				this.$router.push({
-					name: 'readSampleList',
-					params: {
-						id: that.task_id
-					}
-				})
-			},
-			// 获取抽样单信息
-			async getCyd(id) {
-				const result = await this.$http.post('getCyd', {
-					cyd_id: this.cyd_id,
-					sample_id :34
-				})
-				console.log(result.data.data)
-				this.cyd_data = result.data.data//抽样单信息
-                this.cydProfile_unit = result.data.data.cydProfile//抽样人员信息
-                this.taskProfile_unit = result.data.data.taskProfile//抽样单位信息
-				this.inspected_unit = result.data.data.inspectedUnit//受检单位信息
-				this.sample_unit = result.data.data.sample//样品信息
-				console.log(this.cyd_data)
-                console.log(this.cydProfile_unit)
-                console.log(this.taskProfile_unit)
-				console.log(this.inspected_unit)
-				console.log(this.sample_unit)
-                console.log(this.cyd_id)
-			},
-		},
-	}
-</script>

+ 0 - 579
src/components/admin/regulatoryAuthority.vue

@@ -1,579 +0,0 @@
-<template>
-	<div style="width: 100%">
-		<el-card class="box-card">
-			<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>
-		</div>
-		
-		<!-- 头部搜索栏 -->
-		<el-row :gutter="60" 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 />
-					</el-form-item>
-					<el-form-item label="机构级别" class="select">
-						<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">
-						<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;">
-						<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-input v-model="queryInfo.task_name" placeholder="请输入机构名称"></el-input>
-					</el-form-item>
-					<el-form-item label="机构负责人" class="select">
-						<el-input v-model="queryInfo.task_name" placeholder="请输入机构负责人"></el-input>
-					</el-form-item>
-					<!-- 查询 -->
-					<el-button 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-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"
-				:width="table.width" :fixed="table.fixed" />
-			<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-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>
-				</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-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-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>
-				</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="releaser" class="labelItem">
-					<div>{{readForm.releaser}}</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-form-item>
-				<el-form-item label="文件号:" prop="filenum" width="200px" 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')
-	export default {
-		name: 'recheckMonitor',
-		data() {
-			return {
-				queryInfo:{
-					year:'',
-					task_name:'',
-					starttime:'',
-					endtime:'',
-					ispublic:'',
-					pageSize:10,
-					pageNum:1
-				},
-				total:0,
-				cellStyle: {
-					padding: 2 + 'px'
-				},
-				rowStyle: {
-					height: 35 + 'px'
-				},
-				tableHeader: [{
-						label: '任务名称',
-						prop: 'task_name',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '年度',
-						prop: 'year',
-						width: 80
-						// fixed: 'left'
-					}, {
-						label: '文件号',
-						prop: 'filenum',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '开始时间',
-						prop: 'starttime',
-						width: 120
-					},
-					{
-						label: '结束时间',
-						prop: 'endtime',
-						width: 120
-					},
-					{
-						label: '创建者',
-						prop: 'releaser',
-						width: 120
-					},
-					{
-						label: '创建时间',
-						prop: 'createtime',
-						width: 180
-					}, {
-						label: '任务状态',
-						prop: 'ispublic',
-						width: 120
-					},
-					{
-						label: '任务优先级',
-						prop: 'level',
-						width: 120
-					},
-				],
-				// 数据表格数据
-				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.gettaskList()
-		},
-		methods: {
-			add() {
-				this.$router.push('addTask')
-			},
-			// 搜索
-			async searchData() {
-				this.queryInfo.pageNum = 1
-				this.gettaskList()
-			},
-			// 重置
-			reset(){
-				this.queryInfo={
-					year:'',
-					task_name:'',
-					starttime:'',
-					endtime:'',
-					ispublic:'',
-					pageSize:10,
-					pageNum:1
-				}
-			},
-			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.gettaskList()
-			},
-			/** 监听每页显示多少数据的改变 */
-			handleSizeChange(newSize) {
-				this.queryInfo.pageSize = newSize
-				this.gettaskList()
-			},
-			
-			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.gettaskList()
-			},
-			// 获取任务列表
-			async gettaskList() {
-				for (var key in this.queryInfo) {
-					if (this.queryInfo[key] == '') {
-						delete this.queryInfo[key]
-					}
-				}
-				const {
-					data: res
-				} = await this.$http.post(
-					"getTaskList", 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
-			},
-			// 查看任务详情
-			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
-				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.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('delTask', {
-					delarr: that.delarr,
-					token: token
-				})
-				if (result.data.code == 0) {
-					this.$message({
-						type: 'success',
-						message: '删除成功!'
-					});
-					that.gettaskList()
-				} else {
-					this.$message({
-						type: 'error',
-						message: '删除失败!'
-					});
-				}
-
-				this.$refs.multipleTable.clearSelection();
-			},
-			// 发布任务
-			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 != '未发布') {
-						this.$alert('任务不在可发布状态!', {
-							confirmButtonText: '确定',
-							callback: action => {
-
-							}
-						});
-					} else {
-						this.multipleSelection[i].ispublic = 1
-						canPub = 1
-					}
-				}
-				if(canPub==1){
-					const result = await this.$http.post('isPublicTask', {
-						pubarr: that.multipleSelection,
-						token: token
-					})
-					if (result.data.code == 0) {
-						this.$message({
-							type: 'success',
-							message: '发布成功!'
-						});
-						that.gettaskList()
-					}				
-				}
-			},
-			// 废止任务
-			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 == '已发布') {
-						this.pubarr[i].ispublic = 2
-						canPub = 1
-					} else {
-						this.$alert('任务不在可废止状态!', {
-							confirmButtonText: '确定',
-							callback: action => {
-
-							}
-						});
-					}
-					if(canPub==1){
-						const result = await this.$http.post('isPublicTask', {
-							pubarr: that.pubarr,
-							token: token
-						})
-						if (result.data.code == 0) {
-							this.$message({
-								type: 'success',
-								message: '任务已废止!'
-							});
-							that.gettaskList()
-						}
-					}
-					
-				}
-
-			}
-
-
-		},
-	}
-</script>
-
-<style lang="less" scoped>
-	.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;
-	}
-</style>

+ 0 - 626
src/components/admin/subjDtList.vue

@@ -1,626 +0,0 @@
-
-<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>

+ 0 - 215
src/components/admin/takeTheLeadReportList.vue

@@ -1,215 +0,0 @@
-<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-input v-model="queryInfo.task_name"></el-input>
-					</el-form-item>
-					<el-button type="success" size="small">查询</el-button>
-					<el-button plain class="btns" size="medium" @click="returnTask()">
-						返回
-					</el-button>
-				</el-form> 
-			</el-row>
-		</div>
-
-            
-        <!-- 表格区域 -->
-		<div class="table">
-			<!--  表格数据区域-->
-			<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 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 label="操作" align="center" fixed="right">
-				</el-table-column>
-	    	</el-table>
-				<!--分页器区域-->
-			<div class="block">
-				 <el-pagination
-					@size-change="handleSizeChange"
-					@current-change="handleCurrentChange"
-					:current-page="currentPage4"
-					:page-sizes="[10, 15, 20, ]"
-					:page-size="queryInfo.pageSize"
-					layout="total, sizes, prev, pager, next, jumper"
-					:total="total"
-					background />
-    			
-			</div>
-		</div>
-	</div>
-    
-</template>
-
-<script>
-	const token = window.sessionStorage.getItem('token')
-	export default {
-		name: '',
-		data() {
-			return {
-				total:0,
-				queryInfo:{
-					year:'',
-					task_name:'',
-					starttime:'',
-					endtime:'',
-					ispublic:'',
-					pageSize:10,
-					pageNum:1,
-					task_class:'专项监测'
-				},
-                cellStyle: {
-					padding: 2 + 'px'
-				},
-				rowStyle: {
-					height: 35 + 'px'
-				},
-				tableHeader: [{
-						label: '年份',
-						prop: '',
-						width: 50
-						// fixed: 'left'
-					},
-					{
-						label: '所属任务',
-						prop: '',
-						width:200
-						// fixed: 'left'
-					}, {
-						label: '单位',
-						prop: '',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '报告名称',
-						prop: '',
-						width: 200
-					},
-					{
-						label: '状态',
-						prop: '',
-						width: 180
-					}
-				],
-                options: [{
-					value: '选项1',
-					label: '测试1'
-					}, {
-					value: '选项2',
-					label: '测试2'
-					}, {
-					value: '选项3',
-					label: '测试3'
-					}],
-			// 数据表格数据
-				tableData: []
-            }
-        },
-		mounted: function() {
-			this.getJgQtouList()
-		},
-		created: function() {
-			console.log(this.$route.params.task_id)
-			// this.unit_id = this.$route.params.unit_id
-			this.task_id = this.$route.params.task_id
-			this.getJgQtouList()
-		},
-		 methods: {
-			  /** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.getJgQtouList()
-			},
-			/** 监听每页显示多少数据的改变 */
-			handleSizeChange(newSize) {
-				this.queryInfo.pageSize = newSize
-				this.getJgQtouList()
-			},
-			
-			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.getJgQtouList()
-			},
-			// 获取牵头单位报告列表
-				async getJgQtouList() {
-				const result = await this.$http.post('getJgQtouList', {
-					task_id: this.task_id,
-					pageSize:this.queryInfo.pageSize,
-					pageNum:this.queryInfo.pageNum
-				})
-				console.log( result.data)
-				console.log(this.queryInfo.pageSize)
-				if (result.data.code == 0) {
-				this.tableData = result.data.data
-				}
-				console.log(this.tableData)
-				},
-				
-        	returnTask(){
-            this.$router.push('routineMonitor')
-        	},
-      		handleSizeChange(val) {
-        	console.log(`每页 ${val} 条`);
-      		},
-      		handleCurrentChange(val) {
-        		console.log(`当前页: ${val}`);
-      		}
-    		},
-    }
-</script>
-
-<style>
-.btns{
-	float:right;
-	padding: 10px;
-}
-.table{
-	padding: 10px;
-}
-.foottable .pager{
-	float: left;
-	
-}
-.footer {
-		padding: 5px 0;
-		border-top: 1px solid #e5e5e5;
-		text-align: center;
-		}
-.headSearch{
-		margin-left: 25px;
-}
-</style>

+ 0 - 247
src/components/admin/taskSample.vue

@@ -1,247 +0,0 @@
-<template>
-	<div>	
-		<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>
-		</div>
-		<!-- 牵头单位弹框 -->
-		<!-- <el-button icon="el-icon-search" @click="getQtouList()" size="medium">搜索牵头单位</el-button> -->
-		<!-- 下拉菜单 -->
-	<!-- <div>
-			牵头单位
-        <el-select v-model="value" placeholder="请选择" clearable>
-            <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-				@change="choseQt()">
-            </el-option>
-        </el-select> -->
-
-        <!-- 返回按钮 -->
-		<el-form-item label="牵头单位名称" class="select" size="small">
-			<el-input v-model="queryInfo.unit_name"></el-input>	
-			<el-button type="success" size="small">查询</el-button>
-		</el-form-item>
-	
-		<div class="btns">
-			<el-button plain size="small" @click="returnTask()">
-				返回
-			</el-button>
-		</div>
-	<!-- 表格数据区域-->
-	<div class="table">
-		<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 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 label="操作" align="center" fixed="right">
-			<!-- 操作按钮区域的作用域插槽 -->
-			<template slot-scope="scope">
-					<!-- <el-button type="success" size="mini" @click="readDialogVisible1(scope.row)">抽样单详情</el-button> -->
-					<el-button style="margin: 5px auto;" type="success" size="small" @click="readSampleList(scope.row.sample_id)">查看详情</el-button>
-					<el-button  size="small"  @click="sendBack()">退回</el-button>
-			</template>
-		</el-table-column>
-		</el-table>
-			<!-- 分页器区域-->
-		<div class="block">
-				 <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 />
-		</div>
-	</div>
-	</div>
-		
-</template>
-
-<script>
-	const token = window.sessionStorage.getItem('token')
-	export default {
-		name: '',
-		data() {
-			return {
-				
-				//控制弹框显隐
-				dialogVisible: false,
-				total:0,
-				task_id:'',
-				queryInfo:{
-					keyWord: '',
-					year:'',
-					task_name:'',
-					starttime:'',
-					endtime:'',
-					ispublic:'',
-					pageSize:10,
-					pageNum:1,
-					task_class:'专项监测',
-					unit_name:'',
-				},
-            cellStyle: {
-					padding: 2 + 'px'
-				},
-			rowStyle: {
-					height: 35 + 'px'
-				},
-			tableHeader: [{
-						label: '抽样单编码',
-						prop: 'cyd_code',
-						width: 260
-						// fixed: 'left'
-					},
-					{
-						label: '受检单位',
-						prop: 'inspectedUnit.inspected_name',
-						width: 200
-						// fixed: 'left'
-					}, {
-						label: '抽样日期',
-						prop: 'cydProfile.cyd_date',
-						width: 180
-						// fixed: 'left'
-					},
-					{
-						label: '状态',
-						prop: 'cyd_status',
-						width: 160
-					},
-					
-				],
-				// 总共多少条数据
-				total: 0,
-				// table表格多选选项
-				// multipleSelection: null,
-				// getQtListShow: {},
-				// 选中的牵头单位
-				orgs: [],
-				// 数据表格数据
-				tableData: [],
-			}
-		// },
-		
-			// this.getQtouList()
-		},
-		mounted: function() {
-			this.getCyds()
-			},
-		created: function() {
-			this.getCyds()
-			console.log(this.$route.params.task_id)
-			console.log(this.$route.params.task_profile_id)
-			this.task_id = this.$route.params.task_id
-			this.task_profile_id = this.$route.params.task_profile_id
-			
-			// this.getCyds()
-		},
-		
-		methods: {
-				handleSizeChange(val) {
-					console.log(`每页 ${val} 条`);
-				},
-				handleCurrentChange(val) {
-					this.queryInfo.pageNum = val;
-					console.log(`当前页: ${val}`);
-					this.getCyds()
-				},
-			//批量选中
-			// 	handleSelectionChange(val) {
-			// 		this.multipleSelection = val;
-			// 		console.log(this.multipleSelection)
-			// },
-			//获取牵头单位列表
-			// async getQtouList() {
-			// 	this.dialogVisible = 'ture'
-			// 	console.log(this.dialogVisible)
-			// 	this.queryInfo['token'] = token
-			// 	const result = await this.$http.post('getQtouList',this.queryInfo )
-			// 	console.log( result.data.data.rows);
-				// 判断业务逻辑
-			// 	if (result.data.code == 0) {
-			// 		this.QtouList = result.data.data.rows
-			// 		this.total = result.data.data.total
-			// 	}
-			// },
-			//返回
-			returnTask(){
-				this.$router.push('routineMonitor')
-			},
-
-			/** 监听每页显示多少数据的改变 */
-			handleSizeChange1(newSize) {
-				this.queryInfo.pageSize = newSize
-				this.getCyds()
-			},
-
-			/** 监听页码的改变 */
-			handleCurrentChange1(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.getCyds()
-			},
-			
-			// 获取抽样单列表
-				async getCyds() {
-				const result = await this.$http.post('getCyds', {
-					task_id:this.task_id,
-					task_profile_id:this.task_profile_id,
-					pageSize:this.queryInfo.pageSize,
-					pageNum:this.queryInfo.pageNum,
-				})
-				console.log( result.data)
-				console.log(result.data.data)
-				if (result.data.code == 0) {
-					for (let i = 0; i < result.data.data.rows.length; i++) {
-					if (result.data.data.rows[i].sample_status == '0') {
-						result.data.data.rows[i].sample_status = '未上报'
-					} else {
-						result.data.data.rows[i].sample_status = '已上报'
-					}
-				this.tableData = result.data.data
-				this.total = result.data.data.total
-				console.log( result.data.data.total)
-				}
-				console.log(this.tableData)
-				}
-				},
-			//查看详情
-			async readSampleList(id) {
-				console.log(id)
-				this.$router.push({
-					name: 'jgsampleDetail',
-					params: {
-						id: id
-					}
-				})
-			},
-		}
-	}
-	
-	
-	
-</script>
-
-<style>
-.block{
-	padding: 10px;
-}
-.btns{
-	float:left;
-	margin-bottom: 10px;
-	/* padding: 10px; */
-}
-.footer {
-		margin-top: 5px;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-}
-</style>

+ 0 - 270
src/components/admin/taskSampleZx.vue

@@ -1,270 +0,0 @@
-<template>
-	<div>	
-		<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>
-		</div>	
-		<!-- 牵头单位弹框 -->
-		<el-button icon="el-icon-search" @click="dialogVisible=true" size="medium">搜索牵头单位</el-button>
-        <!-- 返回按钮 -->
-		<div class="btns">
-			<el-button plain size="" @click="returnTask()">
-				返回
-			</el-button>
-		</div>
-	<!-- 表格数据区域-->
-	<div class="table">
-		<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 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 label="操作" align="center" fixed="right">
-			<!-- 操作按钮区域的作用域插槽 -->
-			<template >
-					<!-- <el-button type="success" size="mini" @click="readDialogVisible1(scope.row)">抽样单详情</el-button> -->
-					<el-button style="margin: 5px auto;" type="success" size="small" @click="readSampleList()">查看详情</el-button>
-					<el-button  size="small"  @click="sendBack()">退回</el-button>
-			</template>
-		</el-table-column>
-		</el-table>
-			<!-- 分页器区域-->
-		<div class="block">
-				 <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 />
-		</div>
-			<!-- 牵头单位弹框 -->
-			<el-dialog title="机构选择" :visible.sync="dialogVisible" width="50%" :close-on-click-modal="ture" :show-close="true" :center="true" @click="getTestList()" >
-			<!-- <el-form v-if="getQtListShow" :model="getTestListForm"> -->
-				<!--  表格数据区域-->
-				<el-table ref="multipleTable" :data="QtouList" 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_qt" :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="dialogVisible = false" size="small">提交</el-button>
-				</div>
-			<!-- </el-form> -->
-		</el-dialog>
-	</div>
-	</div>
-		
-</template>
-
-<script>
-	const token = window.sessionStorage.getItem('token')
-	export default {
-		name: '',
-		data() {
-			return {
-				
-				//控制弹框显隐
-				dialogVisible: false,
-				total:0,
-				queryInfo:{
-					keyWord: '',
-					year:'',
-					task_name:'',
-					starttime:'',
-					endtime:'',
-					ispublic:'',
-					pageSize:10,
-					pageNum:1,
-					task_class:'专项监测',
-					task_id:'',
-				},
-            cellStyle: {
-					padding: 2 + 'px'
-				},
-			rowStyle: {
-					height: 35 + 'px'
-				},
-			tableHeader: [{
-						label: '样品名称',
-						prop: 'sample_name',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '样品编码',
-						prop: 'sample_id',
-						width: 200
-						// fixed: 'left'
-					}, {
-						label: '商标',
-						prop: 'brand',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '等级',
-						prop: 'level',
-						width: 120
-					},
-					{
-						label: '抽样基数',
-						prop: 'sample_base',
-						width: 120
-					},
-					{
-						label: '抽样场所',
-						prop: 'sample_ground',
-						width: 120
-					},
-					{
-						label: '状态',
-						prop: 'sample_status',
-						width: 180
-					}
-				],
-				// 表头
-				tableHeader_qt: [{
-						label: '单位名称',
-						prop: 'name',
-						width: 300
-						// fixed: 'left'
-					},
-					{
-						label: '机构类型',
-						prop: 'jgxz',
-						// width: 40
-						// fixed: 'left'
-					}, {
-						label: '所属区域',
-						prop: 'ssqy',
-						width: 300
-						// fixed: 'left'
-					},{
-						label: '产品范围',
-						prop: 'cpfw',
-						width: 300
-						// fixed: 'left'
-					}
-				],
-				// 总共多少条数据
-				total: 0,
-				// table表格多选选项
-				multipleSelection: null,
-				getQtListShow: {},
-				// 选中的牵头单位
-				orgs: [],
-				// 数据表格数据
-			tableData: [],
-			QtouList:[]
-			}
-		},
-		mounted: function() {
-			this.getJgCydList()
-			this.getQtouList()
-		},
-		created: function() {
-			console.log(this.$route.params.task_id)
-			// this.unit_id = this.$route.params.unit_id
-			this.task_id = this.$route.params.task_id
-			this.getJgCydList()
-			this.getQtouList()
-		},
-		
-		methods: {
-				handleSizeChange(val) {
-					console.log(`每页 ${val} 条`);
-				},
-				handleCurrentChange(val) {
-					this.queryInfo.pageNum = val;
-					console.log(`当前页: ${val}`);
-					this.getJgCydList()
-				},
-			//批量选中
-				handleSelectionChange(val) {
-					this.multipleSelection = val;
-					console.log(this.multipleSelection)
-			},
-			
-			//获取牵头单位列表
-			async getQtouList() {
-				this.queryInfo['token'] = token
-				const result = await this.$http.post('getQtouList',this.queryInfo )
-				console.log( result.data.data.rows);
-				// 判断业务逻辑
-				if (result.data.code == 0) {
-					this.QtouList = result.data.data.rows
-					this.total = result.data.data.total
-				}
-			},
-			//返回
-			returnTask(){
-				this.$router.push('specialMonitor')
-			},
-
-			/** 监听每页显示多少数据的改变 */
-			handleSizeChange1(newSize) {
-				this.queryInfo.pageSize = newSize
-				this.getJgCydList()
-			},
-
-			/** 监听页码的改变 */
-			handleCurrentChange1(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.getJgCydList()
-			},
-			// 获取抽样单列表
-				async getJgCydList() {
-				const result = await this.$http.post('getJgCydList', {
-					task_id: this.task_id,
-					pageSize:this.queryInfo.pageSize,
-					pageNum:this.queryInfo.pageNum
-				})
-				console.log( result.data)
-				console.log(this.queryInfo.pageSize)
-				if (result.data.code == 0) {
-				this.tableData = result.data.data.rows
-				}
-				console.log(this.tableData)
-				},
-			//查看详情
-			async readSampleList(row) {
-				const result = await this.$http.post('readSampleList',{
-					task_id:this.task_id,
-				})
-			},
-		}
-		}
-	
-	
-	
-</script>
-
-<style>
-.block{
-	padding: 10px;
-}
-.btns{
-	float:right;
-	padding: 10px;
-}
-.footer {
-		margin-top: 5px;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-}
-</style>

+ 0 - 217
src/components/admin/undertakeReport.vue

@@ -1,217 +0,0 @@
-<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>
-                <!-- 下拉菜单 -->
-                <el-select v-model="value" placeholder="请选择">
-                <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                </el-option>
-                </el-select>
-                <!-- 返回按钮 -->
-                <el-button plain class="btns" size="medium" @click="returnTask">返回</el-button>
-
-            </div>
-			<!-- 表格 -->
-            <div class="table">
-                <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 label="操作" align="center" fixed="right">
-			<!-- 操作按钮区域的作用域插槽 -->
-			<!-- <template slot-scope="scope">
-					<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)">抽样单详情</el-button>
-			</template> -->
-		</el-table-column>
-	    </el-table>
-            </div>
-               <!--分页器区域-->
-			<div class="block">
-				 <el-pagination
-					@size-change="handleSizeChange"
-					@current-change="handleCurrentChange"
-					:current-page="currentPage4"
-					:page-sizes="[10, 15, 20, ]"
-					:page-size="queryInfo.pageSize"
-					layout="total, sizes, prev, pager, next, jumper"
-					:total="total"
-					background />
-    			
-			</div>
-			<!-- <el-table  :data="tableData"  style="width: 100%">
-      			<el-table-column
-        		prop="num"
-        		label="序号"
-        		width="80">
-      			</el-table-column>
-      			<el-table-column
-        		prop="year"
-        		label="年份"
-        		width="80">
-      			</el-table-column>
-      			<el-table-column
-        		prop="task"
-        		label="所属任务"
-				width="200">
-      			</el-table-column>
-				  <el-table-column
-        		prop="company"
-        		label="单位"
-				width="120">
-      			</el-table-column>
-				   <el-table-column
-        		prop="reportname"
-        		label="报告名称"
-				width="200">
-      			</el-table-column>
-				  <el-table-column
-        		prop="state"
-        		label="状态"
-				width="80">
-      			</el-table-column>
-				  <el-table-column
-        		prop="operation"
-        		label="操作"
-				width="80">
-      			</el-table-column>
-    		</el-table> -->
-	
-	
-	</div>
-</template>
-
-<script>
-export default {
-    data() {
-      return {
-		   total:0,
-				queryInfo:{
-					year:'',
-					task_name:'',
-					starttime:'',
-					endtime:'',
-					ispublic:'',
-					pageSize:10,
-					pageNum:1,
-					task_class:'专项监测'
-				},
-           cellStyle: {
-					padding: 2 + 'px'
-				},
-				rowStyle: {
-					height: 35 + 'px'
-				},
-				tableHeader: [{
-						label: '年份',
-						prop: '',
-						width: 50
-						// fixed: 'left'
-					},
-					{
-						label: '所属任务',
-						prop: '',
-						width:200
-						// fixed: 'left'
-					}, {
-						label: '单位',
-						prop: '',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '报告名称',
-						prop: '',
-						width: 200
-					},
-					{
-						label: '状态',
-						prop: '',
-						width: 180
-					}
-				],
-        options: [{
-          value: '选项1',
-          label: '测试1'
-        }, {
-          value: '选项2',
-          label: '测试2'
-        }, {
-          value: '选项3',
-          label: '测试3'
-        }, {
-          value: '选项4',
-          label: '测试4'
-        }],
-        value: ''
-      }
-    },
-		mounted: function() {
-			this.getJgCdList()
-		},
-		created: function() {
-			console.log(this.$route.params.task_id)
-			// this.unit_id = this.$route.params.unit_id
-			this.task_id = this.$route.params.task_id
-			this.getJgCdList()
-		},
-    methods: {
-		/** 监听每页显示多少数据的改变 */
-			handleSizeChange(newSize) {
-				this.queryInfo.pageSize = newSize
-				this.gettaskList()
-			},
-			
-			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.gettaskList()
-			},
-			// 获取承担单位报告列表
-				async getJgCdList(id) {
-				const result = await this.$http.post('getJgCdList', {
-					task_id: this.task_id,
-					pageSize:this.queryInfo.pageSize,
-					pageNum:this.queryInfo.pageNum
-				})
-				console.log( result.data)
-				console.log(this.queryInfo.pageSize)
-				if (result.data.code == 0) {
-				this.tableData = result.data.data.rows
-				this.total = result.data.data.total
-				}
-				console.log(this.tableData)
-				},
-        returnTask()
-        {
-            this.$router.push('routineMonitor')
-        }
-    }
-}
-</script>
-
-<style>
-.btns{
-    float:right;
-}
-.table{
-    padding: 10px;
-}
-</style>

+ 0 - 216
src/components/admin/undertakeReportZx.vue

@@ -1,216 +0,0 @@
-<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>
-                <!-- 下拉菜单 -->
-                <el-select v-model="value" placeholder="请选择">
-                <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                </el-option>
-                </el-select>
-                <!-- 返回按钮 -->
-                <el-button plain class="btns" size="medium" @click="returnTask">返回</el-button>
-
-            </div>
-			<!-- 表格 -->
-            <div class="table">
-                <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 label="操作" align="center" fixed="right">
-			<!-- 操作按钮区域的作用域插槽 -->
-			<!-- <template slot-scope="scope">
-					<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)">抽样单详情</el-button>
-			</template> -->
-		</el-table-column>
-	    </el-table>
-            </div>
-               <!--分页器区域-->
-			<div class="block">
-				 <el-pagination
-					@size-change="handleSizeChange"
-					@current-change="handleCurrentChange"
-					:current-page="currentPage4"
-					:page-sizes="[10, 15, 20, ]"
-					:page-size="queryInfo.pageSize"
-					layout="total, sizes, prev, pager, next, jumper"
-					:total="total"
-					background />
-    			
-			</div>
-			<!-- <el-table  :data="tableData"  style="width: 100%">
-      			<el-table-column
-        		prop="num"
-        		label="序号"
-        		width="80">
-      			</el-table-column>
-      			<el-table-column
-        		prop="year"
-        		label="年份"
-        		width="80">
-      			</el-table-column>
-      			<el-table-column
-        		prop="task"
-        		label="所属任务"
-				width="200">
-      			</el-table-column>
-				  <el-table-column
-        		prop="company"
-        		label="单位"
-				width="120">
-      			</el-table-column>
-				   <el-table-column
-        		prop="reportname"
-        		label="报告名称"
-				width="200">
-      			</el-table-column>
-				  <el-table-column
-        		prop="state"
-        		label="状态"
-				width="80">
-      			</el-table-column>
-				  <el-table-column
-        		prop="operation"
-        		label="操作"
-				width="80">
-      			</el-table-column>
-    		</el-table> -->
-	
-	
-	</div>
-</template>
-
-<script>
-export default {
-    data() {
-      return {
-		   total:0,
-				queryInfo:{
-					year:'',
-					task_name:'',
-					starttime:'',
-					endtime:'',
-					ispublic:'',
-					pageSize:10,
-					pageNum:1,
-					task_class:'专项监测'
-				},
-           cellStyle: {
-					padding: 2 + 'px'
-				},
-				rowStyle: {
-					height: 35 + 'px'
-				},
-				tableHeader: [{
-						label: '年份',
-						prop: '',
-						width: 50
-						// fixed: 'left'
-					},
-					{
-						label: '所属任务',
-						prop: '',
-						width:200
-						// fixed: 'left'
-					}, {
-						label: '单位',
-						prop: '',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '报告名称',
-						prop: '',
-						width: 200
-					},
-					{
-						label: '状态',
-						prop: '',
-						width: 180
-					}
-				],
-        options: [{
-          value: '选项1',
-          label: '测试1'
-        }, {
-          value: '选项2',
-          label: '测试2'
-        }, {
-          value: '选项3',
-          label: '测试3'
-        }, {
-          value: '选项4',
-          label: '测试4'
-        }],
-        value: ''
-      }
-    },
-		mounted: function() {
-			this.getJgCdList()
-		},
-		created: function() {
-			console.log(this.$route.params.task_id)
-			// this.unit_id = this.$route.params.unit_id
-			this.task_id = this.$route.params.task_id
-			this.getJgCdList()
-		},
-    methods: {
-		/** 监听每页显示多少数据的改变 */
-			handleSizeChange(newSize) {
-				this.queryInfo.pageSize = newSize
-				this.gettaskList()
-			},
-			
-			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.gettaskList()
-			},
-			// 获取承担单位报告列表
-				async getJgCdList(id) {
-				const result = await this.$http.post('getJgCdList', {
-					task_id: this.task_id,
-					pageSize:this.queryInfo.pageSize,
-					pageNum:this.queryInfo.pageNum
-				})
-				console.log( result.data)
-				console.log(this.queryInfo.pageSize)
-				if (result.data.code == 0) {
-				this.tableData = result.data.data.rows
-				}
-				console.log(this.tableData)
-				},
-        returnTask()
-        {
-            this.$router.push('specialMonitor')
-        }
-    }
-}
-</script>
-
-<style>
-.btns{
-    float:right;
-}
-.table{
-    padding: 10px;
-}
-</style>

+ 0 - 40
src/router/index.js

@@ -61,45 +61,9 @@ const routes = [{
 				component: () => import('../components/admin/addSpecialTask')
 			},
 			{
-				path: '/admin/takeTheLeadReportList',
-				name:'takeTheLeadReportList',
-				component: () => import('../components/admin/takeTheLeadReportList')
-			},{
-				path: '/admin/taskSample',
-				name:'taskSample',
-				component: () => import('../components/admin/taskSample')
-			},{
-
-				path: '/admin/leadReport',
-				name:'leadReport',
-				component: () => import('../components/admin/leadReport')
-			},{
-				path: '/admin/undertakeReport',
-				name:'undertakeReport',
-				component: () => import('../components/admin/undertakeReport')
-			},
-		// {
-		// 	path: '/admin/taskSampleZx',
-		// 		name:'taskSampleZx',
-		// 		component: () => import('../components/admin/taskSampleZx')
-		// 	},
-			{
-				path: '/admin/undertakeReportZx',
-					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',
@@ -116,10 +80,6 @@ const routes = [{
 				path: '/admin/getMonitor',
 					name:'getMonitor',
 					component: () => import('../components/admin/getMonitor')
-			},{
-				path: '/admin/regulatoryAuthority',
-				name:'regulatoryAuthority',
-				component: () => import('../components/admin/regulatoryAuthority')
 			},{
 				path: '/admin/setTaskJg',
 				name:'setTaskJg',