From fd30294f69f2b614be431ae31520398155f1c96e Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Fri, 12 Sep 2025 20:00:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .../components/rightPage.vue | 15 ++- .../mechanism/ledger/components/details.vue | 115 ++++++++++++++++++ src/views/mechanism/ledger/index.vue | 15 ++- 4 files changed, 135 insertions(+), 12 deletions(-) diff --git a/.env.development b/.env.development index 7f06b58..26d06e0 100644 --- a/.env.development +++ b/.env.development @@ -10,7 +10,7 @@ VITE_APP_ENV = 'development' # VITE_APP_BASE_API = 'http://192.168.110.149:8899' -VITE_APP_BASE_API = 'http://192.168.110.209:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.149:8899' diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue index e33a3b9..02c597b 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue @@ -328,13 +328,14 @@ onUnmounted(() => { padding: 15px 5px 5px 5px; .progress_text_title { width: 100%; - // height: 100%; + height: 100%; display: flex; - justify-content: space-between; + justify-content: center; align-items: center; & > div:first-child { // 第一个子元素的样式 - width: 50%; + // width: 50%; + height: 100%; font-size: 24px; // font-weight: bold; font-family: 'AlimamaShuHeiTi', sans-serif; @@ -343,10 +344,14 @@ onUnmounted(() => { & > div:last-child { // 最后一个子元素的样式 - width: 50%; + // width: 50%; + height: 100%; font-size: 12px; color: #999; - text-align: center; + display: flex; + justify-content: center; + align-items: center; + padding-left: 5px; } } .content_text { diff --git a/src/views/mechanism/ledger/components/details.vue b/src/views/mechanism/ledger/components/details.vue index e69de29..0b8a843 100644 --- a/src/views/mechanism/ledger/components/details.vue +++ b/src/views/mechanism/ledger/components/details.vue @@ -0,0 +1,115 @@ + + + diff --git a/src/views/mechanism/ledger/index.vue b/src/views/mechanism/ledger/index.vue index a143fc2..16226b9 100644 --- a/src/views/mechanism/ledger/index.vue +++ b/src/views/mechanism/ledger/index.vue @@ -58,7 +58,7 @@ @@ -93,6 +94,7 @@ import { } from '@/api/mechanical/mechanicalrewriting'; import { MechanicalrewritingVO, MechanicalrewritingQuery, MechanicalrewritingForm } from '@/api/mechanical/mechanicalrewriting/types'; import addComponent from './components/add.vue'; +import detailsComponent from './components/details.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; @@ -216,13 +218,14 @@ const handleAdd = () => { const handleUpdate = async (row?: MechanicalrewritingVO) => { // reset(); const _id = row?.id || ids.value[0]; - // const res = await getMechanicalrewriting(_id); - // Object.assign(form.value, res.data); - // dialog.visible = true; - // dialog.title = '修改机械台账'; addComponentRef.value?.open(_id); }; - +const detailsComponentRef = ref(); +//详情 +const handleDetails = (row) => { + const _id = row?.id || ids.value[0]; + detailsComponentRef.value?.open(_id); +}; /** 提交按钮 */ const submitForm = () => { mechanicalrewritingFormRef.value?.validate(async (valid: boolean) => { From 22440878b576a6c7ecb90976e711c219a402ffa6 Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Fri, 12 Sep 2025 20:08:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/mechanism/ledger/components/details.vue | 14 +++++++++----- src/views/mechanism/ledger/index.vue | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index a52ca75..eef15ee 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_APP_ENV = 'development' # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 罗成 -VITE_APP_BASE_API = 'http://192.168.110.188:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 朱银 # VITE_APP_BASE_API = 'http://192.168.110.149:8899' #曾涛 diff --git a/src/views/mechanism/ledger/components/details.vue b/src/views/mechanism/ledger/components/details.vue index 0b8a843..1fde73f 100644 --- a/src/views/mechanism/ledger/components/details.vue +++ b/src/views/mechanism/ledger/components/details.vue @@ -53,18 +53,22 @@ - + - + + + - + + + - + {{ formData.remark }} diff --git a/src/views/mechanism/ledger/index.vue b/src/views/mechanism/ledger/index.vue index 16226b9..e873e2f 100644 --- a/src/views/mechanism/ledger/index.vue +++ b/src/views/mechanism/ledger/index.vue @@ -23,11 +23,11 @@ 新增 - +