diff --git a/.env.development b/.env.development index dd2742e..6f45dfa 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_APP_ENV = 'development' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 -VITE_APP_BASE_API = 'http://192.168.110.210:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 diff --git a/src/views/dhr_demo/baoxiuguanli.vue b/src/views/dhr_demo/baoxiuguanli.vue index f2c0165..f093912 100644 --- a/src/views/dhr_demo/baoxiuguanli.vue +++ b/src/views/dhr_demo/baoxiuguanli.vue @@ -95,8 +95,8 @@
- 详情 - + 详情 + {{ task.actionText }}
@@ -853,7 +853,18 @@ const handleInspection7 = () => { align-items: center; padding-top: 12px; border-top: 1px solid #f0f2f5; - margin-top: 12px; + position: absolute; + bottom: 16px; + right: 16px; + left: 16px; + background-color: #fff; + padding: 12px 0 0 0; + z-index: 10; +} + +.task-actions .el-button { + border-radius: 16px; + padding: 6px 16px; } .task-card::before { diff --git a/src/views/dhr_demo/qiangxiuguanli.vue b/src/views/dhr_demo/qiangxiuguanli.vue index e4c06f4..c0ee4c8 100644 --- a/src/views/dhr_demo/qiangxiuguanli.vue +++ b/src/views/dhr_demo/qiangxiuguanli.vue @@ -112,8 +112,8 @@
- 详情 - + 详情 + {{ task.actionText }}
@@ -701,10 +701,20 @@ const handleInspection7 = () => { display: flex; justify-content: flex-end; align-items: center; - padding-top: 16px; + padding-top: 12px; border-top: 1px solid #f0f2f5; - margin-top: auto; /* 自动推到最底部 */ - gap: 8px; + position: absolute; + bottom: 16px; + right: 16px; + left: 16px; + background-color: #fff; + padding: 12px 0 0 0; + z-index: 10; +} + +.task-actions .el-button { + border-radius: 16px; + padding: 6px 16px; } .action-btn { diff --git a/src/views/dhr_demo/shiyanrenwu.vue b/src/views/dhr_demo/shiyanrenwu.vue index b4787c0..1dbbd7a 100644 --- a/src/views/dhr_demo/shiyanrenwu.vue +++ b/src/views/dhr_demo/shiyanrenwu.vue @@ -106,8 +106,8 @@
- 详情 - + 详情 + {{ task.actionText }}
@@ -564,7 +564,7 @@ const handleInspection7 = () => { .task-card { background-color: #fff; - border-radius: 8px; + border-radius: 16px; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05); padding: 16px 16px 60px 16px; /* 底部留出更多空间给按钮 */ transition: box-shadow 0.2s ease; @@ -588,6 +588,11 @@ const handleInspection7 = () => { z-index: 10; } +.task-actions .el-button { + border-radius: 16px; + padding: 6px 16px; +} + .task-card::before { content: ''; position: absolute; @@ -635,8 +640,8 @@ const handleInspection7 = () => { } .task-status { - padding: 4px 10px; - border-radius: 6px; + padding: 4px 12px; + border-radius: 16px; font-size: 12px; font-weight: 500; border: 1px solid transparent; diff --git a/src/views/dhr_demo/xunjianrenwu.vue b/src/views/dhr_demo/xunjianrenwu.vue index f804f2b..c4952c4 100644 --- a/src/views/dhr_demo/xunjianrenwu.vue +++ b/src/views/dhr_demo/xunjianrenwu.vue @@ -106,8 +106,8 @@
- 详情 - + 详情 + {{ task.actionText }}
@@ -588,6 +588,10 @@ const handleInspection7 = () => { z-index: 10; } +.task-actions .el-button { + border-radius: 16px; + padding: 6px 16px; +} .task-card::before { content: ''; position: absolute; diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue index a68a458..a5552f2 100644 --- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue +++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue @@ -22,7 +22,13 @@
租金 - {{ proxy.formatPrice(detailInfo.rentSum) / 10000 }} 万元 + {{ + detailInfo.rentSum && !isNaN(detailInfo.rentSum) + ? detailInfo.rentSum >= 10000 + ? proxy.formatPrice((detailInfo.rentSum / 10000).toFixed(2)) + ' 万元' + : proxy.formatPrice(detailInfo.rentSum) + ' 元' + : '0.00 元' + }}