From a851efee67b9e4e96a27bff89d79e8ba6a4c8e93 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Tue, 13 Aug 2024 18:47:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=8F=90=E4=BA=A4=E8=AF=95?= =?UTF-8?q?=E9=AA=8C=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ah_sz_gqj_app/pages.json | 17 +- ah_sz_gqj_app/pages/samples/addDevice.vue | 5 +- .../pages/samples/collectSamples.vue | 2 +- ah_sz_gqj_app/pages/test/organization.vue | 771 ++++ ah_sz_gqj_app/pages/test/testDetail.vue | 710 ++++ ah_sz_gqj_app/pages/test/testInfoFill.vue | 360 ++ ah_sz_gqj_app/pages/test/testList.vue | 126 +- ah_sz_gqj_app/service/url.js | 26 +- .../dist/dev/app-plus/app-config-service.js | 4 +- .../dist/dev/app-plus/app-service.js | 3762 ++++++++++++++--- .../unpackage/dist/dev/app-plus/app-view.js | 3244 ++++++++++++-- .../images/{送样数量.png => number2.png} | Bin .../static/images/{班组.png => team.png} | Bin 13 files changed, 7833 insertions(+), 1194 deletions(-) create mode 100644 ah_sz_gqj_app/pages/test/organization.vue create mode 100644 ah_sz_gqj_app/pages/test/testDetail.vue create mode 100644 ah_sz_gqj_app/pages/test/testInfoFill.vue rename ah_sz_gqj_app/unpackage/dist/dev/app-plus/static/images/{送样数量.png => number2.png} (100%) rename ah_sz_gqj_app/unpackage/dist/dev/app-plus/static/images/{班组.png => team.png} (100%) diff --git a/ah_sz_gqj_app/pages.json b/ah_sz_gqj_app/pages.json index 6018f4c..2dfb47c 100644 --- a/ah_sz_gqj_app/pages.json +++ b/ah_sz_gqj_app/pages.json @@ -52,7 +52,22 @@ "style": { "navigationStyle": "custom" } - } + },{ + "path" : "pages/test/testDetail",//试验管理-详情 + "style": { + "navigationStyle": "custom" + } + },{ + "path" : "pages/test/organization",//试验管理-编制 + "style": { + "navigationStyle": "custom" + } + },{ + "path" : "pages/test/testInfoFill",//试验管理-填写 + "style": { + "navigationStyle": "custom" + } + } ], "tabBar": { // "custom": true, // 启用自定义tabBar diff --git a/ah_sz_gqj_app/pages/samples/addDevice.vue b/ah_sz_gqj_app/pages/samples/addDevice.vue index 01f4788..cc16ee8 100644 --- a/ah_sz_gqj_app/pages/samples/addDevice.vue +++ b/ah_sz_gqj_app/pages/samples/addDevice.vue @@ -751,9 +751,6 @@ } } } - - - } } } @@ -784,7 +781,7 @@ width: 160rpx; height: 70rpx; margin-right: 20rpx; - line-height: 76rpx; + line-height: 70rpx; text-align: center; color: #FFF; background: #0052D9; diff --git a/ah_sz_gqj_app/pages/samples/collectSamples.vue b/ah_sz_gqj_app/pages/samples/collectSamples.vue index 7c499c9..87c86a1 100644 --- a/ah_sz_gqj_app/pages/samples/collectSamples.vue +++ b/ah_sz_gqj_app/pages/samples/collectSamples.vue @@ -878,7 +878,7 @@ width: 100%; height: auto; background-color: #fff; - border-radius: 20rpx; + border-radius: 10rpx; margin: 20rpx 0; .item-header{ diff --git a/ah_sz_gqj_app/pages/test/organization.vue b/ah_sz_gqj_app/pages/test/organization.vue new file mode 100644 index 0000000..d546cd9 --- /dev/null +++ b/ah_sz_gqj_app/pages/test/organization.vue @@ -0,0 +1,771 @@ + + + + + diff --git a/ah_sz_gqj_app/pages/test/testDetail.vue b/ah_sz_gqj_app/pages/test/testDetail.vue new file mode 100644 index 0000000..7f0ead6 --- /dev/null +++ b/ah_sz_gqj_app/pages/test/testDetail.vue @@ -0,0 +1,710 @@ + + + + + diff --git a/ah_sz_gqj_app/pages/test/testInfoFill.vue b/ah_sz_gqj_app/pages/test/testInfoFill.vue new file mode 100644 index 0000000..107c508 --- /dev/null +++ b/ah_sz_gqj_app/pages/test/testInfoFill.vue @@ -0,0 +1,360 @@ + + + + + diff --git a/ah_sz_gqj_app/pages/test/testList.vue b/ah_sz_gqj_app/pages/test/testList.vue index b8ad6f2..302d881 100644 --- a/ah_sz_gqj_app/pages/test/testList.vue +++ b/ah_sz_gqj_app/pages/test/testList.vue @@ -34,13 +34,13 @@ - + {{item.customName}} - + 派工时间: @@ -116,7 +116,7 @@