浏览代码

总览样式

jiangyu 3 年之前
父节点
当前提交
590f49abf9

+ 0 - 5
src/components/jc/sampleDetail.vue

@@ -246,9 +246,4 @@
 		font-size: 1.25rem;
 		// font-weight: 31.25rem !important;
 	}
-
-	/* 	.el-form {
-	
-		
-	} */
 </style>

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

@@ -157,7 +157,7 @@
 
 
 			<el-tab-pane label="总览" name="third">
-				<taskdetail :task_id="task_id"></taskdetail>
+				<taskdetail :task_id="task_id" :test_model_id="readForm.test_model_id"></taskdetail>
 				<div class="footer">
 					<el-button type="success" size="mini" @click="release()">发布</el-button>
 					<el-button type="success" size="mini" @click="exportOverview(task_id)">导出总览</el-button>
@@ -438,6 +438,7 @@
 			this.getTaskBaseInfo()
 			this.getmodelList()
 			this.getUndertakeList()
+			// this.getModeldetail()
 		},
 		created() {
 			this.task_id = this.$route.params.id
@@ -445,8 +446,8 @@
 			this.getTaskBaseInfo()
 			this.getmodelList()
 			this.getUndertakeList()
+			// this.getModeldetail()
 		},
-
 		methods: {
 			// 跳转到检测
 			nexto() {
@@ -703,7 +704,12 @@
 				
 				// console.log(this.divideOptions.id)
 			},
+			//获取模型详情
+			// async getModeldetail(){
+			// 	console.log('11')
 
+			// 	console.log(this.readForm.test_model_id)
+			// },
 			/** 修复当用户在大于1的分页进行数据搜索没有返回值的问题 */
 			setPageNum() {
 				this.queryInfo.pageNum = 1

+ 6 - 2
src/components/jc/setTaskcd.vue

@@ -23,7 +23,7 @@
 			</el-tab-pane>
 		</el-tabs> -->
 
-
+		<div id="taskDetail">
 		<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>
@@ -476,7 +476,7 @@
 				</el-upload>
 			</el-tab-pane>
 		</el-tabs>
-
+		</div>
 	</div>
 </template>
 
@@ -1253,4 +1253,8 @@
 	.el-pagination {
 		margin-top: 25px;
 	}
+	/deep/ #taskDetail{
+		.el-descriptions-item__label.is-bordered-label{
+		width: 18.75rem;}
+	}
 </style>

+ 22 - 9
src/components/jc/taskdetail.vue

@@ -182,12 +182,27 @@
 		created() {
 			this.getTaskBaseInfo()
 			this.getUndertakeList()
+			this.getModelInfo()
 			console.log(this.task_id)
 		},
 		methods: {
 			handleClick(tab, event) {
 				console.log(tab, event);
 			},
+			//获取模型详细信息
+			async getModelInfo(){
+				var that = this
+				const {
+					data: res
+				} = await this.$http.post('getModelInfo',{task_id: that.task_id});
+				console.log(res.data);
+				that.product = res.data.product
+				that.pesticides = res.data.pesticides
+				that.productNameText = that.product.map(el => el.product_name).join('、 ')
+				console.log(that.productNameText)
+				that.pesticidesNameText = that.pesticides.map(el => el.test_name).join('、 ')
+			},
+			
 			// 获取任务详情
 			async getTaskBaseInfo() {
 				var that = this
@@ -219,12 +234,6 @@
 					this.readForm.test_model_id = Number(res.data.test_model_id)
 				}
 				console.log(this.readForm.test_model_id)
-				
-				that.productNameText = that.readForm.product.map(el => el.product_name).join('、 ')
-				console.log(that.productNameText)
-				that.pesticidesNameText = that.readForm.pesticides.map(el => el.test_name).join('、 ')
-			
-				console.log(this.divideOptions.id)
 			},
 			
 			// 获取机构地域表格
@@ -244,6 +253,10 @@
 	}
 </script>
 
-<style>
-
-</style>
+<style lang="less">
+	#pdf1{
+		.el-descriptions-item__label.is-bordered-label{
+		width: 18.75rem;
+	}
+	} 
+</style>