1.年限成新率保留两位小数

2.作价页面布局优化，展示更多信息

src/views/assets/workbench/calculate/importInfo.vue

@@ -4,12 +4,12 @@
       <span style="color:#ff6154;">测算表作价</span>
     </el-divider>
     <div id="uploadDiv" class="uploadDiv">
-      <el-descriptions title="基础信息" :column="1" border>
-        <el-descriptions-item width="45" label="评估基准日">{{ calculateBaseInfo.valuationBasisDate }}</el-descriptions-item>
-        <el-descriptions-item width="45" label="工期">{{ calculateBaseInfo.constructionPeriod }}</el-descriptions-item>
-        <el-descriptions-item width="45" label="利息">{{ calculateBaseInfo.interest }}%</el-descriptions-item>
-        <el-descriptions-item width="45" label="前期费用率">{{ calculateBaseInfo.preConstructionCostRatio }}%</el-descriptions-item>
-        <el-descriptions-item width="45" label="建设单位管理费率">{{ calculateBaseInfo.managementExpenseRatio }}%</el-descriptions-item>
+      <el-descriptions label-width="60" title="基础信息" size="small" :column="1" border>
+        <el-descriptions-item label="评估基准日">{{ calculateBaseInfo.valuationBasisDate }}</el-descriptions-item>
+        <el-descriptions-item label="工期">{{ calculateBaseInfo.constructionPeriod }}</el-descriptions-item>
+        <el-descriptions-item label="利息">{{ calculateBaseInfo.interest }}%</el-descriptions-item>
+        <el-descriptions-item label="前期费用率">{{ calculateBaseInfo.preConstructionCostRatio }}%</el-descriptions-item>
+        <el-descriptions-item label="建设单位管理费率">{{ calculateBaseInfo.managementExpenseRatio }}%</el-descriptions-item>
       </el-descriptions>
       <el-upload
         ref="importEqptExcel"
@@ -41,7 +41,7 @@
       </el-upload>
       <el-button type="primary" @click="uploadEqptExcel()" size="small">上传</el-button>
       <el-button type="primary" @click="addEqptDataDialog = true" size="small">新增</el-button>
-      <el-descriptions title="评估值合计" :column="1" border style="margin-top:20px">
+      <el-descriptions label-width="60" title="评估值合计" size="small" :column="1" border style="margin-top:20px">
         <el-descriptions-item label="账面原值(元)">{{ bookOriginalValueTotal.toFixed(2) }}</el-descriptions-item>
         <el-descriptions-item label="账面净值(元)">{{ bookNetValueTotal.toFixed(2) }}</el-descriptions-item>
         <el-descriptions-item label="评估原值(元)">{{ evaluateOriginalValueTotal.toFixed(2) }}</el-descriptions-item>
@@ -111,7 +111,7 @@
         show-header-overflow
         show-footer-overflow
         ref="allTableRef"
-        height="700"
+        height="100%"
         :loading="loading"
         :column-config="{ resizable: true }"
         :edit-config="editConfig"
@@ -385,7 +385,7 @@
           <template #default="{ row }">
             <span>
               {{ row.depreciationRateByAge =
-              ((row.economicServiceLife - row.yearsInUse) / row.economicServiceLife < 0.15) ? ((row.remainingUsefulLife * 1 / (row.yearsInUse * 1 + row.remainingUsefulLife * 1)).toFixed(2) * 100) : ((row.economicServiceLife * 1 - row.yearsInUse * 1).toFixed(2) / row.economicServiceLife) * 100 }}
+              ((row.economicServiceLife - row.yearsInUse) / row.economicServiceLife < 0.15) ? ((row.remainingUsefulLife * 1 / (row.yearsInUse * 1 + row.remainingUsefulLife * 1)) * 100).toFixed(2) : (((row.economicServiceLife * 1 - row.yearsInUse * 1) / row.economicServiceLife) * 100).toFixed(2) }}
             </span>
           </template>
         </vxe-column>
@@ -603,7 +603,7 @@
         show-header-overflow
         show-footer-overflow
         ref="importedTableRef"
-        height="700"
+        height="100%"
         :loading="loading"
         :column-config="{ resizable: true }"
         :edit-config="editConfig"
@@ -774,7 +774,7 @@
         show-header-overflow
         show-footer-overflow
         ref="nonStandardTableRef"
-        height="700"
+        height="100%"
         :loading="loading"
         :column-config="{ resizable: true }"
         :edit-config="editConfig"
@@ -2034,17 +2034,18 @@ export default {
 }
 
 .uploadDiv {
-  width: 17%;
+  margin-top: 8px;
+  width: 15%;
   display: inline-block;
   vertical-align: top;
 }
 
 .evaluateDiv {
   margin-left: 10px;
-  width: 82%;
+  width: 84%;
   display: inline-block;
   vertical-align: top;
-  min-height: 650px;
+  height: 65vh;
 }
 
 .search {

src/views/assets/workbench/calculate/index.vue

@@ -36,22 +36,22 @@ export default {
         obj.style.width = '85%';
         var evaluateDiv = document.getElementById('evaluateDiv');
         if(evaluateDiv) {
-          evaluateDiv.style.width = '82%';
+          evaluateDiv.style.width = '84%';
         }
         var uploadDiv = document.getElementById('uploadDiv');
         if(uploadDiv) {
-          uploadDiv.style.width = '17%';
+          uploadDiv.style.width = '15%';
         }
       }else {
         var obj = document.getElementById('contrl');
         obj.style.width = '98.9%';
         var evaluateDiv = document.getElementById('evaluateDiv');
         if(evaluateDiv) {
-          evaluateDiv.style.width = '84.5%';
+          evaluateDiv.style.width = '86%';
         }
         var uploadDiv = document.getElementById('uploadDiv');
         if(uploadDiv) {
-          uploadDiv.style.width = '14.5%';
+          uploadDiv.style.width = '12.85%';
         }
       }
     }