修复调机记录显示异常问题

This commit is contained in:
tao
2026-01-13 15:54:12 +08:00
parent 3befba7767
commit 7ef0b48117
2 changed files with 185 additions and 209 deletions

View File

@@ -1,31 +1,31 @@
{ {
"name": "MES", "name" : "MES",
"appid": "__UNI__66F7FE2", "appid" : "__UNI__66F7FE2",
"description": "", "description" : "",
"versionName": "3.4.6", "versionName" : "3.4.7",
"versionCode": 346, "versionCode" : 347,
"transformPx": false, "transformPx" : false,
"sassImplementationName": "node-sass", "sassImplementationName" : "node-sass",
"app-plus": { "app-plus" : {
"usingComponents": true, "usingComponents" : true,
"nvueCompiler": "uni-app", "nvueCompiler" : "uni-app",
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
// 禁用 HTML5+ RunTime 提示 // 禁用 HTML5+ RunTime 提示
"compatible": { "compatible" : {
"ignoreVersion": true "ignoreVersion" : true
}, },
"modules": { "modules" : {
"Camera": {}, "Camera" : {},
"Barcode": {} "Barcode" : {}
}, },
"distribute": { "distribute" : {
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-permission android:name=\"android.permission.INTERNET\" />", "<uses-permission android:name=\"android.permission.INTERNET\" />",
"<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />", "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />", "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
@@ -51,67 +51,67 @@
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"] "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
}, },
"ios": { "ios" : {
"dSYMs": false "dSYMs" : false
}, },
"sdkConfigs": { "sdkConfigs" : {
"ad": {} "ad" : {}
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "unpackage/res/icons/72x72.png", "hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png" "xxxhdpi" : "unpackage/res/icons/192x192.png"
}, },
"ios": { "ios" : {
"appstore": "unpackage/res/icons/1024x1024.png", "appstore" : "unpackage/res/icons/1024x1024.png",
"ipad": { "ipad" : {
"app": "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png", "notification" : "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png", "settings" : "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png", "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80x80.png"
}, },
"iphone": { "iphone" : {
"app@2x": "unpackage/res/icons/120x120.png", "app@2x" : "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png", "app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120x120.png"
} }
} }
}, },
"splashscreen": { "splashscreen" : {
"useOriginalMsgbox": false "useOriginalMsgbox" : false
} }
}, },
"nativePlugins": { "nativePlugins" : {
"Fvv-UniSerialPort": { "Fvv-UniSerialPort" : {
"__plugin_info__": { "__plugin_info__" : {
"name": "安卓串口通信 Fvv-UniSerialPort", "name" : "安卓串口通信 Fvv-UniSerialPort",
"description": "Android平台串口通信插件支持串口号、波特率、数据位、校验位、停止位、流控等参数设置", "description" : "Android平台串口通信插件支持串口号、波特率、数据位、校验位、停止位、流控等参数设置",
"platforms": "Android", "platforms" : "Android",
"url": "https://ext.dcloud.net.cn/plugin?id=1787", "url" : "https://ext.dcloud.net.cn/plugin?id=1787",
"android_package_name": "uni.UNI66F7FE2", "android_package_name" : "uni.UNI66F7FE2",
"ios_bundle_id": "uni.UNI66F7FE2", "ios_bundle_id" : "uni.UNI66F7FE2",
"isCloud": true, "isCloud" : true,
"bought": 1, "bought" : 1,
"pid": "1787", "pid" : "1787",
"parameters": {} "parameters" : {}
} }
} }
}, },
"orientation": [ "orientation" : [
//竖屏正方向 //竖屏正方向
"portrait-primary", "portrait-primary",
//竖屏反方向 //竖屏反方向
@@ -124,36 +124,36 @@
"default" "default"
] ]
}, },
"quickapp": {}, "quickapp" : {},
"mp-weixin": { "mp-weixin" : {
"appid": "wx366e867b9fb64fdf", "appid" : "wx366e867b9fb64fdf",
"setting": { "setting" : {
"urlCheck": true, "urlCheck" : true,
"es6": false, "es6" : false,
"minified": true, "minified" : true,
"postcss": true "postcss" : true
}, },
"optimization": { "optimization" : {
"subPackages": true "subPackages" : true
}, },
"usingComponents": true "usingComponents" : true
}, },
"vueVersion": "2", "vueVersion" : "2",
"h5": { "h5" : {
"template": "static/index.html", "template" : "static/index.html",
"devServer": { "devServer" : {
"port": 9090, "port" : 9090,
"https": false "https" : false
}, },
"title": "RuoYi-App", "title" : "RuoYi-App",
"router": { "router" : {
"mode": "hash", "mode" : "hash",
"base": "./" "base" : "./"
} }
}, },
"permissions": { "permissions" : {
"network": { "network" : {
"description": "用于获取网络状态和IP地址" "description" : "用于获取网络状态和IP地址"
} }
} }
} }

View File

@@ -1,49 +1,53 @@
<template> <template>
<view class="form-container"> <view class="form-container">
<uni-forms ref="form" :modelValue="formData" :rules="rules"> <uni-forms ref="form" :modelValue="formData" :rules="rules" label-width="80" label-align="right">
<uni-forms-item label="作业编码" :labelWidth='90' name="pwoJobCode"> <uni-forms-item label="作业编码" name="pwoJobCode">
<uni-easyinput @confirm="searchData" suffixIcon="scan" @iconClick="scanBar" type="text" <uni-easyinput @confirm="searchData" suffixIcon="scan" @iconClick="scanBar" type="text"
v-model="formData.pwoJobCode" /> v-model="formData.pwoJobCode" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="工单" :labelWidth='90' name="pwoCode"> <uni-forms-item label="工单编码" name="pwoCode">
<uni-easyinput type="text" v-model="formData.pwoCode" /> <uni-easyinput type="text" v-model="formData.pwoCode" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="产品编码" :labelWidth='90' name="ptNoTar"> <uni-forms-item label="产品编码" name="ptNoTar">
<uni-easyinput type="text" v-model="formData.ptNoTar" /> <uni-easyinput type="text" v-model="formData.ptNoTar" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="产品名称" :labelWidth='90' name="ptTitleTar"> <uni-forms-item label="产品名称" name="ptTitleTar">
<uni-easyinput type="text" v-model="formData.ptTitleTar" /> <uni-easyinput type="text" v-model="formData.ptTitleTar" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="制程编码" :labelWidth='90' name="opCode"> <uni-forms-item label="制程编码" name="opCode">
<uni-easyinput type="text" v-model="formData.opCode" /> <uni-easyinput type="text" v-model="formData.opCode" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="制程名称" :labelWidth='90' name="opTitle"> <uni-forms-item label="制程名称" name="opTitle">
<uni-easyinput type="text" v-model="formData.opTitle" /> <uni-easyinput type="text" v-model="formData.opTitle" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="开始时间" :labelWidth='90' name="startTime"> <uni-forms-item label="开始时间" name="startTime">
<view> <view>
<uni-datetime-picker type="datetime" v-model="formData.startTime" /> <uni-datetime-picker type="datetime" v-model="formData.startTime" />
</view> </view>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="结束时间" :labelWidth='90' name="endTime"> <uni-forms-item label="结束时间" name="endTime">
<view> <view>
<uni-datetime-picker type="datetime" v-model="formData.endTime" /> <uni-datetime-picker type="datetime" v-model="formData.endTime" />
</view> </view>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="人员:" :labelWidth='90' name="staff"> <uni-forms-item label="操作人员" name="staff">
<uni-easyinput type="text" v-model="formData.staff" @confirm="searchStaff" /> <uni-easyinput type="text" v-model="formData.staff" @confirm="searchStaff" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="调试单价" :labelWidth='90' name="programmingDebuggingUnitPrice"> <uni-forms-item label="调试单价" name="programmingDebuggingUnitPrice">
<uni-easyinput type="text" v-model="formData.programmingDebuggingUnitPrice" /> <uni-easyinput type="text" v-model="formData.programmingDebuggingUnitPrice" />
</uni-forms-item> </uni-forms-item>
<view class="form-row"> <uni-row>
<uni-forms-item label="调机时长:" :labelWidth='90' name="timeTake" class="form-col"> <uni-col :span="12">
<uni-forms-item label="调机时长" name="timeTake" class="form-col">
<uni-easyinput type="text" v-model="timeTake" /> <uni-easyinput type="text" v-model="timeTake" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="时间单位:" :labelWidth='90' name="timeUnit" class="form-col"> </uni-col>
<uni-col :span="12">
<uni-forms-item label="时间单位" name="timeUnit" class="form-col">
<uni-data-select v-model="timeUnit" :localdata="unitOptions" placeholder="选择时间单位" /> <uni-data-select v-model="timeUnit" :localdata="unitOptions" placeholder="选择时间单位" />
</uni-forms-item> </uni-forms-item>
</view> </uni-col>
</uni-row>
</uni-forms> </uni-forms>
<u-button type="primary" @click="submit">提交</u-button> <u-button type="primary" @click="submit">提交</u-button>
</view> </view>
@@ -215,40 +219,12 @@ export default {
<style scoped> <style scoped>
.form-container { .form-container {
padding: 15px; padding: 15px;
}
.form-row {
display: flex; display: flex;
align-items: center; flex-direction: column;
gap: 15px; gap: 10px;
/* 两个项之间的间距 */
width: 100%;
margin: 10px 0;
/* 与上下表单项保持默认间距 */
} }
/* 并列项平分宽度 */ .uni-forms-item {
.form-col { margin-bottom: 1rem;
flex: 1;
min-width: 0;
}
/* 可选统一并列项的label样式避免对齐错乱 */
:deep(.form-col .uni-forms-item__label) {
width: 80px !important;
/* 固定label宽度 */
text-align: left;
}
/* 其他表单项保持默认样式,无需额外修改 */
:deep(.uni-forms-item) {
margin-bottom: 80px;
/* 统一所有表单项的底部间距 */
}
.u-button {
height: 10% !important;
position: absolute;
bottom: 0;
} }
</style> </style>