diff --git a/api/base.js b/api/base.js
index 72643e7..475ef05 100644
--- a/api/base.js
+++ b/api/base.js
@@ -26,6 +26,11 @@ export const reqUnitByProjectIdUnitType = (projectId, unitType="")=>get(`Unit/ge
*/
export const reqToDoItemByProjectIdUserId = (projectId, personId)=>get(`ToDoItem/getToDoItemByProjectIdUserId?projectId=${projectId}&personId=${personId}`)
+/**
+ * 获取坡口类型列表
+ */
+export const reqGetGrooveTypeList = ()=>get(`BaseInfo/GetGrooveType`)
+
/**
* 附件上传
* @param {string} filePath - 本地文件路径
diff --git a/api/hj.js b/api/hj.js
index ca0c7e6..e3e0aea 100644
--- a/api/hj.js
+++ b/api/hj.js
@@ -163,17 +163,18 @@ export const reqCuttingCheckByWeldJointId = (weldJointId)=>get(`/PreWeldCuttingC
*/
export const reqSaveCuttingCheck = (data)=> post(`/PreWeldCuttingCheck/SaveRecord`, data)
-/**
- * 获取坡口类型列表
- * TODO: 确认接口地址
- */
-export const reqGetGrooveTypeList = ()=>get(`BaseInfo/GetGrooveType`)
/**
* 保存组对抽查记录
*
*/
-export const reqSaveFitupCheck = (data)=>post(`PreWeldInspection/SaveFitupCheck`, data)
+export const reqSaveFitupCheck = (data)=>post(`/PreWeldFitupCheck/SaveRecord`, data)
+
+/**
+ * 获取组对检查记录
+ * @param {String} weldJointId
+ */
+export const reqFitupCheckByWeldJointId = (weldJointId)=>get(`/PreWeldFitupCheck/GetRecordsByWeldJointId?weldJointId=${weldJointId}`)
/**
* 获取防腐等级
diff --git a/components/nbd-record-card.vue b/components/nbd-record-card.vue
index de2b9b8..9cbb399 100644
--- a/components/nbd-record-card.vue
+++ b/components/nbd-record-card.vue
@@ -160,13 +160,11 @@ $text-secondary: #8e99a4;
.record-card {
- &__loading,
&__empty {
padding: 40rpx 24rpx;
text-align: center;
}
- &__loading-text,
&__empty-text {
font-size: 26rpx;
color: $text-secondary;
diff --git a/scanpages/hj/do_anti_rust.vue b/scanpages/hj/do_anti_rust.vue
index 2efd0cd..4f8f805 100644
--- a/scanpages/hj/do_anti_rust.vue
+++ b/scanpages/hj/do_anti_rust.vue
@@ -477,29 +477,4 @@ $shadow-md: 0 2rpx 12rpx rgba(0, 0, 0, 0.04), 0 8rpx 24rpx rgba(0, 0, 0, 0.06);
}
}
}
-
-// ===== 动效关键帧 =====
-@keyframes fadeUp {
- from {
- opacity: 0;
- transform: translateY(24rpx);
- }
-
- to {
- opacity: 1;
- transform: translateY(0);
- }
-}
-
-@keyframes breathe {
-
- 0%,
- 100% {
- opacity: 0.6;
- }
-
- 50% {
- opacity: 1;
- }
-}
diff --git a/scanpages/hj/make_right.vue b/scanpages/hj/make_right.vue
index 9deb433..c569d82 100644
--- a/scanpages/hj/make_right.vue
+++ b/scanpages/hj/make_right.vue
@@ -23,10 +23,11 @@
-
+
坡口类型名称
-
+
{{ makeRightForm.GrooveTypeName || '请选择坡口类型' }}
@@ -36,72 +37,71 @@
坡口类型编码
-
+ {{ makeRightForm.GrooveTypeCode || '--' }}
坡口加工类型
-
+
坡口角度
-
+
组对间隙
-
+
错边量
-
+
焊缝余高
-
+
焊缝高度
-
+
焊缝宽度
-
+
表面缺陷
-
+
@@ -161,10 +161,23 @@
+
+
+
+
+
+
+
+
+ 互检上一工序
+
+ ›
+
@@ -209,15 +222,19 @@
+
+
@@ -385,7 +454,6 @@ $radius: $app-radius;
// 页面专属
$bg: #f0f2f5;
$card-bg: #ffffff;
-$shadow-sm: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
$shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
.detail-page {
@@ -482,130 +550,6 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
}
}
-// ===== 坡口参数仪表 =====
-.spec-grid {
- background: $card-bg;
- border-radius: $radius;
- padding: 8rpx 0;
- box-shadow: $shadow-md;
-
- .spec-item {
- padding: 24rpx 28rpx;
- border-bottom: 1rpx solid $border;
-
- &:last-child {
- border-bottom: none;
- }
-
- &__header {
- display: flex;
- align-items: baseline;
- justify-content: space-between;
- margin-bottom: 14rpx;
- }
-
- &__label {
- font-size: 24rpx;
- color: $text-secondary;
- font-weight: 500;
- }
-
- &__value {
- font-size: 40rpx;
- font-weight: 700;
- color: $text;
- line-height: 1;
- font-variant-numeric: tabular-nums;
- }
-
- &__unit {
- font-size: 24rpx;
- font-weight: 400;
- color: $text-secondary;
- margin-left: 6rpx;
- }
-
- &__bar-track {
- height: 8rpx;
- background: #f0f2f5;
- border-radius: 4rpx;
- overflow: hidden;
- position: relative;
- }
-
- &__bar-fill {
- height: 100%;
- border-radius: 4rpx;
- background: linear-gradient(90deg, $primary, #6ba3ff);
- transition: width 0.6s cubic-bezier(0.34, 1.56, 0.64, 1);
- position: relative;
-
- &::after {
- content: '';
- position: absolute;
- right: 0;
- top: 0;
- bottom: 0;
- width: 12rpx;
- border-radius: 4rpx;
- background: rgba(255, 255, 255, 0.35);
- }
-
- &.fill--amber {
- background: linear-gradient(90deg, #f59e0b, #fbbf24);
- }
-
- &.fill--teal {
- background: linear-gradient(90deg, #14b8a6, #2dd4bf);
- }
- }
- }
-}
-
-
-// ===== 校验卡片 =====
-.check-card {
- background: $card-bg;
- border-radius: $radius;
- overflow: hidden;
- box-shadow: $shadow-md;
-}
-
-.check-item {
- display: flex;
- align-items: center;
- padding: 22rpx 28rpx;
- border-bottom: 1rpx solid $border;
-
- &:last-child {
- border-bottom: none;
- }
-
- &__left {
- flex: 1;
- min-width: 0;
- }
-
- &__label {
- font-size: 26rpx;
- font-weight: 500;
- color: $text;
- display: block;
- margin-bottom: 4rpx;
- }
-
- &__desc {
- font-size: 22rpx;
- color: $text-secondary;
- display: block;
- }
-
- &__action {
- flex-shrink: 0;
- margin-left: 20rpx;
- }
-}
-
// ===== 提交栏(悬浮底部) =====
.submit-bar {
position: fixed;
@@ -617,38 +561,6 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
background: linear-gradient(180deg, rgba(240, 242, 245, 0) 0%, $bg 20%);
}
-// ===== 备注输入框 =====
-.remark-card {
- background: $card-bg;
- border-radius: $radius;
- padding: 24rpx 28rpx;
- box-shadow: $shadow-md;
- position: relative;
-
- .remark-input {
- width: 100%;
- min-height: 120rpx;
- font-size: 26rpx;
- color: $text;
- line-height: 1.6;
- padding: 0;
- margin: 0;
- background: transparent;
-
- &::placeholder {
- color: #b0bec5;
- }
- }
-
- .remark-count {
- position: absolute;
- bottom: 16rpx;
- right: 24rpx;
- font-size: 22rpx;
- color: $text-secondary;
- }
-}
-
// ================================================================
// 材料质检区块 —— 三合一 section
// ================================================================
@@ -735,25 +647,4 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
}
}
-// ---- 防腐记录 ----
-// 覆盖组件内部边距(已由父 .section 聚合)
-:deep(.anti-record__section) {
- margin: 0;
-}
-
-// 防腐记录卡片底部圆角收口,与 section 容器对齐
-:deep(.anti-record__card) {
- border-radius: 0 0 $radius $radius;
- border-top: 1rpx solid $border;
-}
-
-// 防腐记录 header 缩进对齐,隐藏蓝色竖条(父 section header 已承载标题层级)
-:deep(.anti-record__header) {
- padding: 20rpx 28rpx 12rpx;
- margin-bottom: 0;
-}
-
-:deep(.anti-record__bar) {
- display: none;
-}
diff --git a/scanpages/hj/material_sampling.vue b/scanpages/hj/material_sampling.vue
index f365917..0e85e2a 100644
--- a/scanpages/hj/material_sampling.vue
+++ b/scanpages/hj/material_sampling.vue
@@ -179,7 +179,7 @@