From f7d03c28caa3c922c1bf25f4f8ef9e62765c3f75 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 01 八月 2025 14:00:51 +0800
Subject: [PATCH] Merge branch 'dev_ywx_ztns' into dev_ztns
---
src/views/business/inspectionTask/inspection.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 834cf69..2368abb 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -2082,12 +2082,10 @@
}
});
// 鏈寰幆涓昏鏄椤甸潰鍙婂悗绔紶鍙傝繘琛屽垵濮嬪寲璧嬪��
- console.log(this.currentSample.insProduct)
this.currentSample.insProduct.forEach(async (a) => {
try {
// 璁＄畻鍊艰祴鍊�
let comValue = JSON.parse(a.insProductResult.comValue);
-
for (var i = 0; i < comValue.length; i++) {
if (
this.param[a.id].comValue.find(
@@ -2889,7 +2887,7 @@
},
};
</script>
-<styl scoped>
+<style scoped>
.custom-table .el-table__header-wrapper th {
background-color: #87ceeb;
/* 鍙甯︽湁my-custom-table绫荤殑琛ㄦ牸鐢熸晥 */
@@ -3091,7 +3089,7 @@
display: inline-flex;
align-items: center;
}
-</styl>
+</style>
<style scoped>
/* .inspection .el-form-item__label {
color: #000;
@@ -3161,13 +3159,12 @@
}
.data-collection-items {
display: flex;
- flex-wrap: wrap;
+ flex-wrap: wrap;
}
.data-collection-items .el-select,
.data-collection-items .el-checkbox {
- flex-basis: 20% ;
+ flex-basis: 20% ;
box-sizing: border-box;
padding: 5px 15px;
}
</style>
-
\ No newline at end of file
--
Gitblit v1.9.3