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

src/components/admin.vue

@@ -14,7 +14,7 @@
 				</div>
 				<div class="right-function-container">
 					<el-button @click="logout">
-						退出
+						退 出
 					</el-button>
 				</div>
 			</el-header>

src/components/admin/routineMonitor.vue

@@ -305,7 +305,7 @@
 				this.$router.push('taskSample')
 			},
 			takeTheLeadReport() {
-				this.$router.push('takeTheLeadReporList')
+				this.$router.push('takeTheLeadReportList')
 			},
 			undertakeReport(){
 				this.$router.push('undertakeReport')

src/components/admin/takeTheLeadReporList.vue → src/components/admin/takeTheLeadReportList.vue

@@ -11,14 +11,14 @@
 
             <div>
 				<!-- 下拉菜单 -->
-                <el-select v-model="value" placeholder="请选择">
+                <!-- <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-select> -->
                 <!-- 返回按钮 -->
                 <el-button class="btns" type="info" size="small" @click="returnTask">
 					返回任务列表
@@ -57,11 +57,12 @@
 					@size-change="handleSizeChange"
 					@current-change="handleCurrentChange"
 					:current-page="currentPage4"
-					:page-sizes="[10, 25, 50, 100]"
-					:page-size="50"
+					:page-sizes="[10, 15, 20, ]"
+					:page-size="queryInfo.pageSize"
 					layout="total, sizes, prev, pager, next, jumper"
-					:total="100">
-    			</el-pagination>
+					:total="total"
+					background />
+    			
 			</div>
 		</div>
 	</div>
@@ -74,10 +75,17 @@
 		name: '',
 		data() {
 			return {
-				currentPage1: 5,
-        		currentPage2: 5,
-        		currentPage3: 5,
-        		currentPage4: 4,
+				total:0,
+				queryInfo:{
+					year:'',
+					task_name:'',
+					starttime:'',
+					endtime:'',
+					ispublic:'',
+					pageSize:10,
+					pageNum:1,
+					task_class:'专项监测'
+				},
                 cellStyle: {
 					padding: 2 + 'px'
 				},
@@ -127,6 +135,22 @@
             }
         },
 		 methods: {
+			  /** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.queryInfo.pageNum = newPage
+				this.gettaskList()
+			},
+			/** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.queryInfo.pageSize = newSize
+				this.gettaskList()
+			},
+			
+			/** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.queryInfo.pageNum = newPage
+				this.gettaskList()
+			},
         	returnTask(){
             this.$router.push('routineMonitor')
         	},

src/components/admin/taskSample.vue

@@ -10,7 +10,7 @@
 		</div>	
 		<!-- 下拉菜单 -->
 	<div>
-		牵头单位
+			牵头单位
         <el-select v-model="value" placeholder="请选择">
             <el-option
                 v-for="item in options"
@@ -20,10 +20,17 @@
             </el-option>
         </el-select>
         <!-- 返回按钮 -->
-        <el-button class="btns" type="info" size="small" @click="returnTask">
-			返回任务列表
-		</el-button>
+		<div class="btns">
+			<el-button type="info" size="small" @click="returnTask">
+				返回任务列表
+			</el-button>
+			<el-button type="info" size="small" @click="sendBack">
+				退回
+			</el-button>
+		</div>
+       
 	</div>
+		
 
 	<!-- 表格数据区域-->
 	<div class="table">
@@ -62,12 +69,12 @@
 				 <el-pagination
 					@size-change="handleSizeChange"
 					@current-change="handleCurrentChange"
-					:current-page="currentPage4"
-					:page-sizes="[10, 25, 50, 100]"
-					:page-size="100"
+					:current-page="queryInfo.pageNum"
+					:page-sizes="[10, 15, 20]"
+					:page-size="queryInfo.pageSize"
 					layout="total, sizes, prev, pager, next, jumper"
-					:total="400">
-    			</el-pagination>
+					:total="total"
+					background />
 		</div>
 	</div>
 	</div>
@@ -80,10 +87,21 @@
 		name: '',
 		data() {
 			return {
-				currentPage1: 5,
-				currentPage2: 5,
-				currentPage3: 5,
-				currentPage4: 4,
+				total:0,
+				  options: [{
+					value: '选项1',
+					label: '部级监测机构'
+					}],
+				queryInfo:{
+					year:'',
+					task_name:'',
+					starttime:'',
+					endtime:'',
+					ispublic:'',
+					pageSize:10,
+					pageNum:1,
+					task_class:'专项监测'
+				},
             cellStyle: {
 					padding: 2 + 'px'
 				},
@@ -136,6 +154,7 @@
 			
 		},
 		methods: {
+			sendBack(){},
 			// 获取牵头单位
 			getTaskById(){	
 			},
@@ -160,4 +179,7 @@
 .block{
 	padding: 10px;
 }
+btns{
+	float:right;
+}
 </style>

src/components/admin/taskSampletwo.vue

@@ -1,133 +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-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 class="btns" type="info" 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 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>
-		<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>
-			<!-- 分页器区域-->
-		<!-- <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>
-</template>
-
-<script>
-	const token = window.sessionStorage.getItem('token')
-	export default {
-		name: '',
-		data() {
-			return {
-                cellStyle: {
-					padding: 2 + 'px'
-				},
-				rowStyle: {
-					height: 35 + 'px'
-				},
-				tableHeader: [{
-						label: '样品名称',
-						prop: '',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '样品编码',
-						prop: '',
-						width: 80
-						// fixed: 'left'
-					}, {
-						label: '商标',
-						prop: '',
-						width: 150
-						// fixed: 'left'
-					},
-					{
-						label: '等级',
-						prop: '',
-						width: 120
-					},
-					{
-						label: '抽样基数',
-						prop: '',
-						width: 120
-					},
-					{
-						label: '抽样场所',
-						prop: '',
-						width: 120
-					},
-					{
-						label: '状态',
-						prop: '',
-						width: 180
-					}
-				],
-				// 数据表格数据
-				tableData: []
-			}
-		},
-		created() {
-			
-		},
-		methods: {
-			// 获取牵头单位
-			getTaskById(){
-				
-			},
-			// 获取抽样单列表
-			getZLTaskSampleListByJcInfo(){
-				
-			},
-			returnTask(){
-				this.$router.push('specialMonitor')
-			}
-			
-		},
-	}
-</script>
-
-<style>
-.btns{
-    float: right;
-}
-</style>

src/components/admin/undertakeReport.vue

@@ -43,22 +43,19 @@
 		</el-table-column>
 	    </el-table>
             </div>
-              <!-- 分页器 -->
-		<div class="foottable">
-			<label for="" class="pager">
-				显示
-				<select name="" id="">
-					<option value="10">10</option>
-					<option value="25">25</option>
-					<option value="50">50</option>
-					<option value="100">100</option>
-				</select>
-				项结果
-			</label>
-			<div class="datatable">
-			   显示第 0 至 0 项结果，共 项
+               <!--分页器区域-->
+			<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>
 			<!-- <el-table  :data="tableData"  style="width: 100%">
       			<el-table-column
         		prop="num"
@@ -105,6 +102,17 @@
 export default {
     data() {
       return {
+		   total:0,
+				queryInfo:{
+					year:'',
+					task_name:'',
+					starttime:'',
+					endtime:'',
+					ispublic:'',
+					pageSize:10,
+					pageNum:1,
+					task_class:'专项监测'
+				},
            cellStyle: {
 					padding: 2 + 'px'
 				},
@@ -156,6 +164,17 @@ export default {
       }
     },
     methods: {
+		/** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.queryInfo.pageSize = newSize
+				this.gettaskList()
+			},
+			
+			/** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.queryInfo.pageNum = newPage
+				this.gettaskList()
+			},
         returnTask()
         {
             this.$router.push('routineMonitor')

src/components/admin/undertakeReporttwo.vue

@@ -1,124 +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 class="btns" type="info" size="small" @click="returnTask">
-					返回任务列表
-				</el-button>
-            </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 class="block">
-				 <el-pagination
-					@size-change="handleSizeChange"
-					@current-change="handleCurrentChange"
-					:current-page="currentPage4"
-					:page-sizes="[10, 25, 50, 100]"
-					:page-size="100"
-					layout="total, sizes, prev, pager, next, jumper"
-					:total="400">
-    			</el-pagination>
-			</div>
-	
-	</div>
-</template>
-<script>
-export default {
-	data() {
-      return {
-		  		currentPage1: 5,
-        		currentPage2: 5,
-        		currentPage3: 5,
-        		currentPage4: 4,
-        options: [{
-          value: '选项1',
-          label: '测试1'
-        }, {
-          value: '选项2',
-          label: '测试2'
-        }, {
-          value: '选项3',
-          label: '测试3'
-        }, {
-          value: '选项4',
-          label: '测试4'
-        }],
-        value: ''
-      }
-    },
-	methods:{
-		returnTask()
-		{
-			this.$router.push('specialMonitor')
-		},
-		handleSizeChange(val) {
-        	console.log(`每页 ${val} 条`);
-      		},
-      		handleCurrentChange(val) {
-        		console.log(`当前页: ${val}`);
-      		}
-	}
-}
-</script>
-
-
-<style>
-.btns{
-	float:right;
-}
-</style>

src/router/index.js

@@ -47,8 +47,8 @@ const routes = [{
 				component: () => import('../components/admin/addSpecialTask')
 			},
 			{
-				path: '/admin/takeTheLeadReporList',
-				component: () => import('../components/admin/takeTheLeadReporList')
+				path: '/admin/takeTheLeadReportList',
+				component: () => import('../components/admin/takeTheLeadReportList')
 			},{
 				path: '/admin/taskSample',
 				component: () => import('../components/admin/taskSample')
@@ -58,12 +58,6 @@ const routes = [{
 			},{
 				path: '/admin/undertakeReport',
 				component: () => import('../components/admin/undertakeReport')
-			},{
-				path: '/admin/taskSampletwo',
-				component: () => import('../components/admin/taskSampletwo')
-			},{
-				path: '/admin/undertakeReporttwo',
-				component: () => import('../components/admin/undertakeReporttwo')
 			},
 		]
 	},