jiangyu пре 3 година
родитељ
комит
18d5d81138

+ 5 - 5
src/components/jc/jcobj.vue

@@ -37,8 +37,8 @@
 			<!--  表格数据区域-->
 			<el-table ref="multipleModelTable" :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">
+				<el-table-column type="selection" width="50" align="center"></el-table-column>
+				<el-table-column label="序号" width="50px" align="center">
 					<template slot-scope="scope">
 						{{ scope.$index+1 }}
 					</template>
@@ -108,8 +108,8 @@
 			<!--  表格数据区域-->
 			<el-table ref="multipleTable" :data="pesticidesList" 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">
+				<el-table-column type="selection" :reserve-selection="true" width="50" align="center"></el-table-column>
+				<el-table-column label="序号" width="50px" align="center">
 					<template slot-scope="scope">
 						{{ scope.$index+1 }}
 					</template>
@@ -122,7 +122,7 @@
 						<!-- <span style="margin-left: 10px">{{ scope.row.eaname }}</span> -->
 					</template>
 				</el-table-column>
-				<el-table-column label="检测标准" width="130px">
+				<el-table-column label="检测标准" width="130px" align="center">
 					<template slot-scope="scope">
 						GB2763-2021
 					</template>

+ 4 - 4
src/components/jc/modelSet.vue

@@ -43,14 +43,14 @@
 		<!-- 选择检测包 -->
 		<el-dialog title="选择检测包" :visible.sync="choseProbePacketsShow" width="40%" :close-on-click-modal="false"
 			@open="choseProbePackets()" class="dialogItem">
-			<el-input style="width: 200px;" placeholder="输入检测包" v-model="queryInfo.keyword" @input="searchData()"
+			<el-input style="width: 200px; margin-bottom: 20px;" placeholder="输入检测包" v-model="queryInfo.keyword" @input="searchData()"
 				clearable>
 			</el-input>
 			<!--  表格数据区域-->
 			<el-table ref="multipleTable" :data="pesticidesList" 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">
+				<el-table-column type="selection" :reserve-selection="true" width="50" align="center"></el-table-column>
+				<el-table-column label="序号" width="50px" align="center">
 					<template slot-scope="scope">
 						{{ scope.$index+1 }}
 					</template>
@@ -63,7 +63,7 @@
 						<!-- <span style="margin-left: 10px">{{ scope.row.eaname }}</span> -->
 					</template>
 				</el-table-column>
-				<el-table-column label="检测标准" width="130px">
+				<el-table-column label="检测标准" width="130px" align="center">
 					<template slot-scope="scope">
 						GB2763-2021
 					</template>

+ 3 - 3
src/components/jc/routineMonitor.vue

@@ -12,7 +12,7 @@
 			</div>
 			<!-- 头部搜索栏 -->
 			<el-row :gutter="50" style="margin-right: 0px;">
-				<el-form style="display: flex; flex-direction: row;"  size="mini">
+				<el-form style="display: flex; flex-direction: row;" >
 					<el-form-item label="年度" class="select">
 						<el-date-picker v-model="queryInfo.taskyear" style="width: 110px;" value-format="yyyy"
 							type="year" clearable />
@@ -54,8 +54,8 @@
 			<!--  表格数据区域-->
 			<el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%"
 				:row-style="rowStyle" :cell-style="cellStyle">
-				<el-table-column type="selection" width="50"></el-table-column>
-				<el-table-column label="序号" width="50px">
+				<el-table-column type="selection" width="50" align="center"></el-table-column>
+				<el-table-column label="序号" width="50px" align="center">
 					<template slot-scope="scope">
 						{{ scope.$index+1 }}
 					</template>

+ 7 - 7
src/components/jc/routineMonitorqt.vue

@@ -13,26 +13,26 @@
 			<!-- 头部搜索栏 -->
 			<el-row :gutter="50" style="margin-right: 0px;">
 				<el-form style="display: flex; flex-direction: row;">
-					<el-form-item label="年度" class="select" size="mini">
+					<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" size="mini">
+					<el-form-item label="任务状态" class="select">
 						<el-select v-model="queryInfo.ispublic" style="width: 110px;">
 							<el-option v-for="item in taskstatus" :key="item.value" :label="item.label"
 								:value="item.value">
 							</el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="任务时间" class="select" size="mini">
+					<el-form-item label="任务时间" class="select">
 						<el-date-picker v-model="queryInfo.starttime" style="width: 180px;" align="right" type="date"
 							:picker-options="pickerOptions" clearable />
 					</el-form-item>
-					<el-form-item label="--" class="select" style="margin-left: 10px;" size="mini">
+					<el-form-item label="--" class="select" style="margin-left: 10px; padding-left: 0px;">
 						<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="mini">
+					<el-form-item label="任务名称" class="select">
 						<el-input v-model="queryInfo.task_name"></el-input>
 					</el-form-item>
 					<!-- 查询 -->
@@ -54,8 +54,8 @@
 			<!--  表格数据区域-->
 			<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">
+				<el-table-column type="selection" width="50" align="center"></el-table-column>
+				<el-table-column label="序号" width="50px" align="center">
 					<template slot-scope="scope">
 						{{ scope.$index+1 }}
 					</template>

+ 5 - 5
src/components/jc/setTask.vue

@@ -125,8 +125,8 @@
 				<el-table ref="multipleTable" :data="underTask" border stripe highlight-current-row
 					@selection-change="handleSelectionChange" style="width: 100%" :row-style="rowStyle"
 					:cell-style="cellStyle">
-					<el-table-column type="selection" width="50"></el-table-column>
-					<el-table-column label="序号" width="50px">
+					<el-table-column type="selection" width="50" align="center"></el-table-column>
+					<el-table-column label="序号" width="50px" align="center">
 						<template slot-scope="scope">
 							{{ scope.$index+1 }}
 						</template>
@@ -167,7 +167,7 @@
 				<!--  表格数据区域-->
 				<el-table ref="singleTable" :data="testList" row-key="id" @current-change="choseChange" border stripe
 					highlight-current-row style="width: 100%">
-					<el-table-column label="序号" width="50px">
+					<el-table-column label="序号" width="50px" align="center">
 						<template slot-scope="scope">
 							{{ scope.$index+1 }}
 						</template>
@@ -191,7 +191,7 @@
 				<!--  表格数据区域-->
 				<el-table ref="singleTable" :data="testList" row-key="id" @current-change="choseChange1" border stripe
 					highlight-current-row style="width: 100%">
-					<el-table-column label="序号" width="50px">
+					<el-table-column label="序号" width="50px" align="center">
 						<template slot-scope="scope">
 							{{ scope.$index+1 }}
 						</template>
@@ -215,7 +215,7 @@
 				<!--  表格数据区域-->
 				<el-table ref="singleTable" :data="testList" row-key="id" @current-change="choseChange2" border stripe
 					highlight-current-row style="width: 100%">
-					<el-table-column label="序号" width="50px">
+					<el-table-column label="序号" width="50px" align="center">
 						<template slot-scope="scope">
 							{{ scope.$index+1 }}
 						</template>

+ 26 - 24
src/components/jc/setTaskcd.vue

@@ -3,13 +3,14 @@
 
 		<el-breadcrumb separator-class="el-icon-arrow-right">
 			<el-breadcrumb-item>首页</el-breadcrumb-item>
+			<el-breadcrumb-item>承担单位</el-breadcrumb-item>
 			<el-breadcrumb-item :to="{ path: '/jc/routineMonitor' }">任务列表</el-breadcrumb-item>
 			<el-breadcrumb-item>基本信息</el-breadcrumb-item>
 		</el-breadcrumb>
 
 		<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
 			<el-tab-pane label="任务详情" name="first">
-				<el-descriptions class="margin-top" title="例行监测任务" :column="2" :size="size" border>
+				<el-descriptions class="margin-top" :title="readForm.task_class+'任务'" :column="2" :size="size" border>
 					<el-descriptions-item>
 						<template slot="label">
 							发布单位
@@ -183,7 +184,7 @@
 					@selection-change="handleSelectionChange" style="width: 100%" :row-style="rowStyle"
 					:cell-style="cellStyle">
 					<el-table-column type="selection" width="50"></el-table-column>
-					<el-table-column label="序号" width="50px">
+					<el-table-column label="序号" width="50px" align="center">
 						<template slot-scope="scope">
 							{{ scope.$index+1 }}
 						</template>
@@ -191,12 +192,13 @@
 
 					<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="small" plain @click="sampleDetail(scope.row.sample_id)">查看
-							</el-button>
+
+					<el-table-column label="操作" width="150px" align="center">
+						<template>
+							<el-button type="success" size="small" plain @click="sampleDetail(scope.row.sample_id)">查看</el-button>
 						</template>
 					</el-table-column>
+			
 				</el-table>
 				<!--    分页器区域-->
 				<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
@@ -210,7 +212,7 @@
 				<el-table :data="tableData" border stripe highlight-current-row style="width: 100%"
 					:row-style="rowStyle" :cell-style="cellStyle">
 					<!-- <el-table-column type="selection" width="50"></el-table-column> -->
-					<el-table-column label="序号" width="50px">
+					<el-table-column label="序号" width="50px" align="center">
 						<template slot-scope="scope">
 							{{ scope.$index+1 }}
 						</template>
@@ -218,7 +220,7 @@
 
 					<el-table-column :key="table.label" v-for="table in checkHeader" :label="table.label"
 						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
-					<el-table-column label="操作" align="center" fixed="right" width="220px">
+					<el-table-column label="操作" align="center"  width="220px">
 						<template slot-scope="scope">
 							<el-button type="success" size="mini" v-if="scope.row.jc_value_id==null" plain
 								@click="check(scope.row.sample_id,scope.row.sample_name)">检测</el-button>
@@ -476,7 +478,7 @@
 					{
 						label: '受检单位',
 						prop: 'units_name',
-						width: 180
+						width: 150
 					},
 					{
 						label: '样品产地',
@@ -489,7 +491,7 @@
 					}, {
 						label: '状态',
 						prop: 'status',
-						width: 180
+						width: 150
 					}
 				],
 				checkHeader: [{
@@ -914,22 +916,22 @@
 
 	.el-form-item {
 		margin-left: 15px;
-		// margin: 0 auto;
+		// margin-bottom: 5px;
 	}
 
-	// .labelItem /deep/ .el-form-item__label {
-	// 	// width: 80px;
-	// 	text-align: center;
-	// 	vertical-align: middle;
-	// 	float: left;
-	// 	font-size: 14px;
-	// 	color: #606266;
-	// 	font-weight: bold;
-	// 	// line-height: 40px;
-	// 	padding: 0 20px 0 0;
-	// 	-webkit-box-sizing: border-box;
-	// 	box-sizing: border-box;
-	// }
+	.labelItem /deep/ .el-form-item__label {
+		// width: 80px;
+		text-align: center;
+		vertical-align: middle;
+		float: left;
+		font-size: 14px;
+		color: #606266;
+		font-weight: bold;
+		// line-height: 40px;
+		padding: 0 20px 0 0;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+	}
 
 	.demonstration {
 		margin: 20px;

+ 7 - 7
src/components/jc/specialMonitorcd.vue

@@ -28,7 +28,7 @@
 						<el-date-picker v-model="queryInfo.starttime" style="width: 180px;" align="right" type="date"
 							:picker-options="pickerOptions" clearable />
 					</el-form-item>
-					<el-form-item label="--" class="select" style="margin-left: 10px;">
+					<el-form-item label="--" class="select" style="margin-left: 10px; padding-left: 0px;">
 						<el-date-picker v-model="queryInfo.endtime" style="width: 180px;" align="right" type="date"
 							:picker-options="pickerOptions" clearable />
 					</el-form-item>
@@ -54,8 +54,8 @@
 			<!--  表格数据区域-->
 			<el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%"
 				:row-style="rowStyle" :cell-style="cellStyle">
-				<el-table-column type="selection" width="50"></el-table-column>
-				<el-table-column label="序号" width="50px">
+				<el-table-column type="selection" width="50" align="center"></el-table-column>
+				<el-table-column label="序号" width="50px"  align="center">
 					<template slot-scope="scope">
 						{{ scope.$index+1 }}
 					</template>
@@ -63,7 +63,7 @@
 
 				<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="任务状态">
+				<el-table-column prop="status" label="任务状态"  align="center">
 					<template slot-scope="scope">
 						<el-tag type="success" v-if="scope.row.ispublic==1">已发布</el-tag>
 						<el-tag type="danger" v-if="scope.row.ispublic==2">废止</el-tag>
@@ -72,16 +72,16 @@
 						<el-tag type="warning" v-if="scope.row.ispublic==5">执行中</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="status" label="任务优先级" width="100">
+				<el-table-column prop="status" label="任务优先级" width="100"  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 prop="status" label="附件" width="80">
+				<el-table-column prop="status" label="附件" width="80" align="center">
 					<template slot-scope="scope">
-						<el-link type="primary" :href="scope.row.fileurl">附件</el-link>
+						<el-link type="primary" :href="scope.row.fileurl">下载</el-link>
 					</template>
 				</el-table-column>
 				<el-table-column label="操作" align="center" fixed="right">

+ 7 - 7
src/components/jc/specialMonitorqt.vue

@@ -13,26 +13,26 @@
 			<!-- 头部搜索栏 -->
 			<el-row :gutter="50" style="margin-right: 0px;">
 				<el-form style="display: flex; flex-direction: row;">
-					<el-form-item label="年度" class="select" size="mini">
+					<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" size="mini">
+					<el-form-item label="任务状态" class="select">
 						<el-select v-model="queryInfo.ispublic" style="width: 110px;">
 							<el-option v-for="item in taskstatus" :key="item.value" :label="item.label"
 								:value="item.value">
 							</el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="任务时间" class="select" size="mini">
+					<el-form-item label="任务时间" class="select">
 						<el-date-picker v-model="queryInfo.starttime" style="width: 180px;" align="right" type="date"
 							:picker-options="pickerOptions" clearable />
 					</el-form-item>
-					<el-form-item label="--" class="select" style="margin-left: 10px;" size="mini">
+					<el-form-item label="--" class="select" style="margin-left: 10px; padding-left: 0px;">
 						<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="mini">
+					<el-form-item label="任务名称" class="select">
 						<el-input v-model="queryInfo.task_name"></el-input>
 					</el-form-item>
 					<!-- 查询 -->
@@ -54,8 +54,8 @@
 			<!--  表格数据区域-->
 					<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">
+				<el-table-column type="selection" width="50" align="center"></el-table-column>
+				<el-table-column label="序号" width="50px" align="center">
 					<template slot-scope="scope">
 						{{ scope.$index+1 }}
 					</template>

+ 1 - 1
src/components/jc/taskdetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-descriptions class="margin-top" title="例行监测任务" :column="2" :size="size" border>
+		<el-descriptions class="margin-top" :title="readForm.task_class+'任务'" :column="2" :size="size" border>
 			<el-descriptions-item>
 				<template slot="label">
 					发布单位