From 0358eb6e5308a21172e63be8fe4867deeed1b3ac Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 04 十一月 2025 10:15:58 +0800
Subject: [PATCH] fix: 完成巡查字段调整
---
src/pages/routingInspection/upload.vue | 28 +++-
src/pages/routingInspection/detail/indexJX.vue | 21 ++--
src/manifest.json | 210 +++++++++++++++++++++---------------------
src/pages/production/wire/attachment/index.vue | 1
src/pages/routingInspection/detail/indexLS.vue | 15 ++-
5 files changed, 145 insertions(+), 130 deletions(-)
diff --git a/src/manifest.json b/src/manifest.json
index 280f32b..1e17726 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,110 +1,110 @@
{
- "name" : "绾跨紗涓婃姤",
- "appid" : "__UNI__F64E0A4",
- "description" : "",
- "versionName" : "1.0.12",
- "versionCode" : "100",
- "transformPx" : false,
- /* 5+App鐗规湁鐩稿叧 */
- "app-plus" : {
- "usingComponents" : true,
- "nvueStyleCompiler" : "uni-app",
- "compilerVersion" : 3,
- "compatible" : {
- "ignoreVersion" : true // true琛ㄧず蹇界暐鐗堟湰妫�鏌ユ彁绀烘锛孒BuilderX1.9.0鍙婁互涓婄増鏈敮鎸�
+ "name": "绾跨紗涓婃姤",
+ "appid": "__UNI__F64E0A4",
+ "description": "",
+ "versionName": "1.0.15",
+ "versionCode": "100",
+ "transformPx": false,
+ /* 5+App鐗规湁鐩稿叧 */
+ "app-plus": {
+ "usingComponents": true,
+ "nvueStyleCompiler": "uni-app",
+ "compilerVersion": 3,
+ "compatible": {
+ "ignoreVersion": true // true琛ㄧず蹇界暐鐗堟湰妫�鏌ユ彁绀烘锛孒BuilderX1.9.0鍙婁互涓婄増鏈敮鎸�
+ },
+ "splashscreen": {
+ "alwaysShowBeforeRender": true,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
+ },
+ /* 妯″潡閰嶇疆 */
+ "modules": {},
+ /* 搴旂敤鍙戝竷淇℃伅 */
+ "distribute": {
+ /* android鎵撳寘閰嶇疆 */
+ "android": {
+ "permissions": [
+ "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+ "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+ "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+ "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+ "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+ "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+ "<uses-feature android:name=\"android.hardware.camera\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+ "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>"
+ ]
+ },
+ /* ios鎵撳寘閰嶇疆 */
+ "ios": {
+ "dSYMs": false
+ },
+ /* SDK閰嶇疆 */
+ "sdkConfigs": {},
+ "icons": {
+ "android": {
+ "hdpi": "unpackage/res/icons/72x72.png",
+ "xhdpi": "unpackage/res/icons/96x96.png",
+ "xxhdpi": "unpackage/res/icons/144x144.png",
+ "xxxhdpi": "unpackage/res/icons/192x192.png"
},
- "splashscreen" : {
- "alwaysShowBeforeRender" : true,
- "waiting" : true,
- "autoclose" : true,
- "delay" : 0
- },
- /* 妯″潡閰嶇疆 */
- "modules" : {},
- /* 搴旂敤鍙戝竷淇℃伅 */
- "distribute" : {
- /* android鎵撳寘閰嶇疆 */
- "android" : {
- "permissions" : [
- "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
- "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
- "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
- "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CAMERA\"/>",
- "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
- "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
- "<uses-feature android:name=\"android.hardware.camera\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
- "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>"
- ]
- },
- /* ios鎵撳寘閰嶇疆 */
- "ios" : {
- "dSYMs" : false
- },
- /* SDK閰嶇疆 */
- "sdkConfigs" : {},
- "icons" : {
- "android" : {
- "hdpi" : "unpackage/res/icons/72x72.png",
- "xhdpi" : "unpackage/res/icons/96x96.png",
- "xxhdpi" : "unpackage/res/icons/144x144.png",
- "xxxhdpi" : "unpackage/res/icons/192x192.png"
- },
- "ios" : {
- "appstore" : "unpackage/res/icons/1024x1024.png",
- "ipad" : {
- "app" : "unpackage/res/icons/76x76.png",
- "app@2x" : "unpackage/res/icons/152x152.png",
- "notification" : "unpackage/res/icons/20x20.png",
- "notification@2x" : "unpackage/res/icons/40x40.png",
- "proapp@2x" : "unpackage/res/icons/167x167.png",
- "settings" : "unpackage/res/icons/29x29.png",
- "settings@2x" : "unpackage/res/icons/58x58.png",
- "spotlight" : "unpackage/res/icons/40x40.png",
- "spotlight@2x" : "unpackage/res/icons/80x80.png"
- },
- "iphone" : {
- "app@2x" : "unpackage/res/icons/120x120.png",
- "app@3x" : "unpackage/res/icons/180x180.png",
- "notification@2x" : "unpackage/res/icons/40x40.png",
- "notification@3x" : "unpackage/res/icons/60x60.png",
- "settings@2x" : "unpackage/res/icons/58x58.png",
- "settings@3x" : "unpackage/res/icons/87x87.png",
- "spotlight@2x" : "unpackage/res/icons/80x80.png",
- "spotlight@3x" : "unpackage/res/icons/120x120.png"
- }
- }
- }
+ "ios": {
+ "appstore": "unpackage/res/icons/1024x1024.png",
+ "ipad": {
+ "app": "unpackage/res/icons/76x76.png",
+ "app@2x": "unpackage/res/icons/152x152.png",
+ "notification": "unpackage/res/icons/20x20.png",
+ "notification@2x": "unpackage/res/icons/40x40.png",
+ "proapp@2x": "unpackage/res/icons/167x167.png",
+ "settings": "unpackage/res/icons/29x29.png",
+ "settings@2x": "unpackage/res/icons/58x58.png",
+ "spotlight": "unpackage/res/icons/40x40.png",
+ "spotlight@2x": "unpackage/res/icons/80x80.png"
+ },
+ "iphone": {
+ "app@2x": "unpackage/res/icons/120x120.png",
+ "app@3x": "unpackage/res/icons/180x180.png",
+ "notification@2x": "unpackage/res/icons/40x40.png",
+ "notification@3x": "unpackage/res/icons/60x60.png",
+ "settings@2x": "unpackage/res/icons/58x58.png",
+ "settings@3x": "unpackage/res/icons/87x87.png",
+ "spotlight@2x": "unpackage/res/icons/80x80.png",
+ "spotlight@3x": "unpackage/res/icons/120x120.png"
+ }
}
+ }
+ }
+ },
+ /* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
+ "quickapp": {},
+ /* 灏忕▼搴忕壒鏈夌浉鍏� */
+ "mp-weixin": {
+ "appid": "",
+ "setting": {
+ "urlCheck": false
},
- /* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
- "quickapp" : {},
- /* 灏忕▼搴忕壒鏈夌浉鍏� */
- "mp-weixin" : {
- "appid" : "",
- "setting" : {
- "urlCheck" : false
- },
- "usingComponents" : true
- },
- "mp-alipay" : {
- "usingComponents" : true
- },
- "mp-baidu" : {
- "usingComponents" : true
- },
- "mp-toutiao" : {
- "usingComponents" : true
- },
- "uniStatistics" : {
- "enable" : false
- },
- "vueVersion" : "3"
+ "usingComponents": true
+ },
+ "mp-alipay": {
+ "usingComponents": true
+ },
+ "mp-baidu": {
+ "usingComponents": true
+ },
+ "mp-toutiao": {
+ "usingComponents": true
+ },
+ "uniStatistics": {
+ "enable": false
+ },
+ "vueVersion": "3"
}
diff --git a/src/pages/production/wire/attachment/index.vue b/src/pages/production/wire/attachment/index.vue
index 0f802e0..0ad9bf6 100644
--- a/src/pages/production/wire/attachment/index.vue
+++ b/src/pages/production/wire/attachment/index.vue
@@ -519,3 +519,4 @@
+
diff --git a/src/pages/routingInspection/detail/indexJX.vue b/src/pages/routingInspection/detail/indexJX.vue
index 27572e5..d2de1c8 100644
--- a/src/pages/routingInspection/detail/indexJX.vue
+++ b/src/pages/routingInspection/detail/indexJX.vue
@@ -276,9 +276,9 @@
<text class="title">{{ "宸℃缁撴灉" }}</text>
</view>
<wd-col :span="24">
- <wd-form-item label="鏍峰搧鏄惁榻愬叏" prop="sampleComplete" required>
+ <wd-form-item label="鏍峰搧鏄惁榻愬叏" prop="isFully" required>
<template v-if="isEdit">
- <wd-radio-group v-model="formData.sampleComplete" inline class="conclusion-radio-group">
+ <wd-radio-group v-model="formData.isFully" inline class="conclusion-radio-group">
<wd-radio
v-for="(opt, idx) in sampleCompleteOptions"
:key="idx"
@@ -290,7 +290,7 @@
</wd-radio-group>
</template>
<template v-else>
- {{ formatValue(formData.sampleComplete) }}
+ {{ formatValue(formData.isFully) }}
</template>
</wd-form-item>
</wd-col>
@@ -361,7 +361,7 @@
inspectTwist: [], // 缁炵嚎宸ヨ壓璐ㄩ噺鎺у埗
productAppearance: [] as string[], // 浜у搧澶栬锛堟敼涓烘暟缁勫瓨鍌ㄩ�変腑鍊硷級
conclusion: "", // 缁撹锛堟敼涓烘暟缁勫瓨鍌ㄩ�変腑鍊硷級
- sampleComplete: "", // 鏍峰搧鏄惁榻愬叏
+ isFully: "", // 鏍峰搧鏄惁榻愬叏
});
const twistDirectionOptions = [
@@ -392,7 +392,7 @@
formData.twistedOuterDiameter =
recordData.value.structureInfo.structureRecordResult.twistedOuterDiameter || "";
formData.structureFormula = structureResult.inspectStructure?.structureFormula || "";
- formData.sampleComplete = inspectionResult.sampleComplete || "";
+ formData.isFully = inspectionResult.isFully || "";
formData.conclusion = structureResult.conclusion || "";
// 鍒濆鍖栦骇鍝佸瑙�
@@ -469,8 +469,7 @@
if (!formData.productAppearance.length)
return uni.showToast({ title: "浜у搧澶栬涓哄繀濉」", icon: "none" });
if (!formData.conclusion) return uni.showToast({ title: "缁撹涓哄繀濉」", icon: "none" });
- if (!formData.sampleComplete)
- return uni.showToast({ title: "鏍峰搧鏄惁榻愬叏涓哄繀濉」", icon: "none" });
+ if (!formData.isFully) return uni.showToast({ title: "鏍峰搧鏄惁榻愬叏涓哄繀濉」", icon: "none" });
// 2. 缁撴瀯椤瑰惊鐜牎楠�
for (const item of formData.structureItems) {
if (!item.structureValue)
@@ -505,17 +504,17 @@
const res = await RoutingInspectionApi.strandedPatrolCheckInspection({
deviceUid: deviceUid.value,
id: paramsId.value,
- result: {
+ inspectionResult: {
twistedOuterDiameter: formData.twistedOuterDiameter,
structureFormula: formData.structureFormula,
structureItems: formData.structureItems,
inspectTwist: formData.inspectTwist,
productAppearance: formData.productAppearance,
conclusion: formData.conclusion,
- sampleComplete: formData.sampleComplete,
+ isFully: formData.isFully,
},
- inspectionResult: {
- sampleComplete: formData.sampleComplete,
+ result: {
+ isFully: formData.isFully,
},
processInspectionAttachmentList: allFileIds,
});
diff --git a/src/pages/routingInspection/detail/indexLS.vue b/src/pages/routingInspection/detail/indexLS.vue
index 31b72e3..9927996 100644
--- a/src/pages/routingInspection/detail/indexLS.vue
+++ b/src/pages/routingInspection/detail/indexLS.vue
@@ -248,12 +248,17 @@
</wd-row>
<!-- 宸℃缁撴灉 -->
- <wd-row v-if="detailData.processInspectionResult?.isFully">
+ <wd-row>
<view style="margin: 10rpx">
<text class="title">{{ "宸℃缁撴灉" }}</text>
</view>
<wd-col :span="24">
- <wd-form-item label="閾濇潌鍓嶃�佷腑銆佸熬鏍峰搧鏄惁榻愬叏" prop="isFully" required>
+ <wd-form-item
+ label="閾濇潌鍓嶃�佷腑銆佸熬鏍峰搧鏄惁榻愬叏"
+ prop="isFully"
+ required
+ label-width="420rpx"
+ >
<template v-if="isEdit">
<wd-radio-group v-model="formData.isFully" inline class="conclusion-radio-group">
<wd-radio
@@ -279,7 +284,7 @@
</wd-row>
<!-- 闄勪欢妯″潡 -->
- <wd-row class="attachment-section" v-if="detailData.files && detailData.files.length > 0">
+ <wd-row class="attachment-section">
<view style="margin: 10rpx">
<text class="title">{{ "闄勪欢" }}</text>
</view>
@@ -546,7 +551,7 @@
const res = await RoutingInspectionApi.drawPatrolCheckInspection({
deviceUid: deviceUid.value,
id: paramsId.value,
- result: {
+ inspectionResult: {
dia: formData.dia,
maxDia: formData.maxDia,
minDia: formData.minDia,
@@ -557,7 +562,7 @@
jointCondition: formData.jointCondition,
conclusion: formData.conclusion,
},
- inspectionResult: { isFully: formData.isFully },
+ result: { isFully: formData.isFully },
processInspectionAttachmentList: allFileIds,
});
if (res.code === 200) {
diff --git a/src/pages/routingInspection/upload.vue b/src/pages/routingInspection/upload.vue
index 4e18c6b..1a50117 100644
--- a/src/pages/routingInspection/upload.vue
+++ b/src/pages/routingInspection/upload.vue
@@ -16,7 +16,12 @@
<!-- 闄勪欢鍒楄〃 -->
<view class="attachment-list">
- <wd-status-tip v-if="attachmentList.length === 0" image="content" tip="鏆傛棤闄勪欢" />
+ <wd-status-tip
+ v-if="attachmentList.length === 0"
+ image="content"
+ tip="鏆傛棤闄勪欢"
+ custom-class="status-tip-full"
+ />
<view v-for="(item, index) in attachmentList" :key="item.id || index" class="attachment-card">
<view class="media-wrapper" @click="previewAttachment(item)">
@@ -198,21 +203,21 @@
const addAttachment = () => {
// 鏄剧ず閫夋嫨鏂囦欢绫诲瀷鐨勫脊绐�
uni.showActionSheet({
- itemList: ["閫夋嫨鍥剧墖", "閫夋嫨瑙嗛", "鎷嶇収", "褰曞儚"],
+ itemList: ["閫夋嫨鍥剧墖", /* "閫夋嫨瑙嗛", */ "鎷嶇収" /* , "褰曞儚" */],
success: (res) => {
switch (res.tapIndex) {
case 0: // 閫夋嫨鍥剧墖
chooseImages();
break;
- case 1: // 閫夋嫨瑙嗛
- chooseVideos();
- break;
- case 2: // 鎷嶇収
+ // case 1: // 閫夋嫨瑙嗛
+ // chooseVideos();
+ // break;
+ case 1: // 鎷嶇収
takePhoto();
break;
- case 3: // 褰曞儚
- recordVideo();
- break;
+ // case 3: // 褰曞儚
+ // recordVideo();
+ // break;
}
},
fail: (error) => {
@@ -475,6 +480,11 @@
grid-template-columns: repeat(3, 1fr);
gap: 8px;
+ :deep(.status-tip-full) {
+ grid-column: 1 / -1;
+ width: 100%;
+ }
+
.attachment-card {
width: 100%;
position: relative;
--
Gitblit v1.9.3