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..1fde73f 100644 --- a/src/views/mechanism/ledger/components/details.vue +++ b/src/views/mechanism/ledger/components/details.vue @@ -0,0 +1,119 @@ + + + diff --git a/src/views/mechanism/ledger/index.vue b/src/views/mechanism/ledger/index.vue index a143fc2..e873e2f 100644 --- a/src/views/mechanism/ledger/index.vue +++ b/src/views/mechanism/ledger/index.vue @@ -23,11 +23,11 @@ 新增 - + @@ -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) => { diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue index bcce1a8..b633fa4 100644 --- a/src/views/progress/progressCategory/index.vue +++ b/src/views/progress/progressCategory/index.vue @@ -1,14 +1,12 @@ - + @@ -121,12 +129,10 @@