jiangyu 3 anos atrás
pai
commit
bcff1c4aa4

+ 1 - 1
src/components/admin/routineMonitor.vue

@@ -362,7 +362,7 @@
 			// 批量删除
 			handleSelectionChange(val) {
 				this.multipleSelection = val;
-				// console.log(this.multipleSelection)
+				console.log(this.multipleSelection)
 			},
 			// 删除任务
 			async delArray() {

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

@@ -13,7 +13,7 @@
 			</div>
 			<!-- 头部搜索栏 -->
 			<el-row :gutter="50" style="margin-right: 0px;">
-				<el-form style="display: flex; flex-direction: row;">
+				<el-form style="display: flex; flex-direction: row;" size="mini">
 					<el-form-item label="行业" class="select">
 						<el-select v-model="queryInfo.type_id" clearable>
 							<el-option v-for="item in field" :key="item.value" :label="item.label" :value="item.value">
@@ -22,9 +22,9 @@
 					</el-form-item>
 
 					<!-- 查询 -->
-					<el-button style="height: 40px;margin-left: 10px;" type="success" @click="searchData()">查询</el-button>
+					<el-button style="height: 28px;margin-left: 10px;" type="success" size="mini" @click="searchData()">查询</el-button>
 					<!-- 重置 -->
-					<el-button style="height: 40px;margin-left: 5px;" type="success" @click="reset()">重置</el-button>
+					<el-button style="height: 28px;margin-left: 5px;" type="success" size="mini" @click="reset()">重置</el-button>
 				</el-form>
 			</el-row>
 			<!--  头部钮区域-->
@@ -50,7 +50,7 @@
 				<el-table-column label="操作" align="center" fixed="right">
 					<!-- 操作按钮区域的作用域插槽 -->
 					<template slot-scope="scope">
-						<el-button type="success" @click="getmodelDetail(scope.row.id)">配置模型</el-button>
+						<el-button style="margin: 5px auto;" type="success" size="small" @click="getmodelDetail(scope.row.id)">配置模型</el-button>
 					</template>
 				</el-table-column>
 			</el-table>

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

@@ -11,7 +11,7 @@
 			</div>
 			<!-- 头部搜索栏 -->
 			<el-row :gutter="50" style="margin-right: 0px;">
-				<el-form style="display: flex; flex-direction: row;">
+				<el-form style="display: flex; flex-direction: row;" size="mini">
 					<el-form-item label="年度" class="select" size="mini">
 						<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy"
 							type="year" clearable />
@@ -35,9 +35,9 @@
 						<el-input v-model="queryInfo.task_name"></el-input>
 					</el-form-item>
 					<!-- 查询 -->
-					<el-button style="height: 40px;margin-left: 10px;" type="success"  size="mini" @click="searchData()">查询</el-button>
+					<el-button style="height: 28px;margin-left: 10px;" type="success"  size="mini" @click="searchData()">查询</el-button>
 					<!-- 重置 -->
-					<el-button style="height: 40px;margin-left: 5px;" type="success"  size="mini" @click="reset()">重置</el-button>
+					<el-button style="height: 28px;margin-left: 5px;" type="success"  size="mini" @click="reset()">重置</el-button>
 				</el-form>
 			</el-row>
 			<!--  头部钮区域-->

+ 7 - 2
src/components/jc/setTask.vue

@@ -96,7 +96,7 @@
 					</el-form>
 				</el-row>
 				<el-row style="margin-right: 0px;">
-					<el-col :span="10">
+					<el-col :span="11">
 						<el-form style="display: flex; flex-direction: row; margin-left: 5px; margin-top: 10px;" size="mini">
 							<el-form-item label="抽样地区" class="select">
 								<el-cascader  :options="region" v-model="selectedOptions"
@@ -145,7 +145,7 @@
 				<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="underTasktotal" background />
-			</el-tab-pane>
+			</el-tab-pane> 
 
 
 			<el-tab-pane label="总览" name="third">
@@ -159,6 +159,7 @@
 
 
 
+
 		</el-tabs>
 		<!-- 选择抽样机构对话框 -->
 		<el-dialog title="机构选择" :visible.sync="getTestListShow" width="50%" :close-on-click-modal="false"
@@ -392,6 +393,10 @@
 					});
 					this.getUnderTask()
 				}
+			},
+			// 机构与地域---删除
+			async sampleDetail() {
+
 			},
 			// 获取机构地域表格
 			async getUnderTask() {

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

@@ -418,7 +418,7 @@
 				</div>
 				<el-button @click="dialogVisible2 = false">取 消</el-button>
 				<el-button type="primary" @click="download">生成检测报告pdf</el-button>
-				</span>
+				<!-- </span> -->
 			</el-dialog>
 
 			<el-tab-pane label="报告上传" name="five">
@@ -937,9 +937,9 @@
 		margin: 20px;
 	}
 
-	.el-form-item__content {
-		// width: 200px;
-	}
+	// .el-form-item__content {
+	// 	width: 200px;
+	// }
 
 	.footer {
 		margin-top: 20px;