1.机器设备作价表格新增根据设备名进行过滤

src/api/assetsCalculateEqptData.js

@@ -34,3 +34,8 @@ export function getNonSDataPage(params) {
 export function updateNonSData(params) {
     return request.put('/assetsCalculateEqptData/updateNonSData', params)
 }
+
+// 获取机器设备作价table的筛选条件
+export function getEqptTableFilterVO(params) {
+    return request.get('/assetsCalculateEqptData/getEqptTableFilterVO', { params: params })
+}

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

@@ -1,5 +1,5 @@
 <template>
-    <div class="contrl">
+    <div id="contrl" class="contrl">
         <el-form ref="baseInfo" :model="baseInfo" label-width="auto" style="margin-top: 10px;" :rules="baseInfoRules">
             <el-divider content-position="left"><span style="color:#ff6154;">基本信息</span></el-divider>
             <el-row :gutter="10">
@@ -94,14 +94,14 @@ export default {
 </script>
 
 <style scoped>
-.contrl {
+/* .contrl {
     font-size: 20px;
     width: 75%;
     border-right: 1.5px #dae1eb solid;
     padding: 20px 20px 20px 0px;
     float: left;
 
-}
+} */
 
 :deep(*) {
     color-scheme: light;

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

@@ -1,5 +1,5 @@
 <template>
-    <div class="contrl">
+    <div id="contrl" class="contrl">
         <el-divider content-position="left"><span style="color:#ff6154;">生成测算表</span></el-divider>
         <el-form ref="eqptBaseInfo" :model="eqptBaseInfo" label-width="auto" style="margin-top: 10px;"
             :rules="eqptBaseInfoRules">
@@ -121,14 +121,14 @@ export default {
 </script>
 
 <style scoped>
-.contrl {
+/* .contrl {
     font-size: 20px;
     width: 75%;
     border-right: 1.5px #dae1eb solid;
     padding: 0px 20px 20px 0px;
     float: left;
 
-}
+} */
 
 :deep(.el-input__wrapper.is-focus) {
     --el-input-focus-border: #ff6154;

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

@@ -1,7 +1,7 @@
 <template>
-    <div class="contrl">
+    <div id="contrl" class="contrl">
         <el-divider content-position="left"><span style="color:#ff6154;">测算表作价</span></el-divider>
-        <div class="uploadDiv">
+        <div id="uploadDiv" class="uploadDiv">
             <el-descriptions title="基础信息" :column="1" border>
                 <el-descriptions-item label="评估基准日">{{ calculateBaseInfo.valuationBasisDate }}</el-descriptions-item>
                 <el-descriptions-item label="工期">{{ calculateBaseInfo.constructionPeriod }}</el-descriptions-item>
@@ -28,7 +28,7 @@
             </el-button>
             <el-button type="danger" @click="generateEquipmentCalculate()">生成测算表</el-button>
         </div>
-        <div class="evaluateDiv">
+        <div id="evaluateDiv" class="evaluateDiv">
             <div class="search">
                 <el-input type="number" v-model="eqptDataQuery.sortId" placeholder="请输入序号" clearable
                     style="width: 200px;" />
@@ -53,7 +53,7 @@
                 </el-button>
             </div>
             <el-table :data="eqptPageData" border stripe v-show="activeName === 'all'">
-                <el-table-column prop="sortId" label="序号" width="80">
+                <el-table-column fixed prop="sortId" label="序号" width="80" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="sortId">
                             <el-form :model="row" @submit.native.prevent>
@@ -62,7 +62,28 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="equipmentName" label="设备名称" width="250">
+                <el-table-column fixed prop="equipmentName" label="设备名称" width="250" align="center">
+                    <template #header>
+                        <span>设备名称</span>
+                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                            <el-checkbox-group v-model="eqptNameFilterArr" style="overflow: auto;height: 300px">
+                                <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索" @change="getEqptTableFilter('equipmentName')" style="margin-bottom:5px"/>
+                                <el-checkbox v-for="equipmentName in equipmentNameFilters" style="display:block;"
+                                    :label="equipmentName" :value="equipmentName" size="small" />
+                            </el-checkbox-group>
+                            <div style="text-align: center; margin: 0">
+                                <el-button size="small" text @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilter = null">重置</el-button>
+                                <el-button size="small" type="primary" @click="getEqptDataPage()">筛选</el-button>
+                            </div>
+                            <template #reference>
+                                <div style="display: inline-block">
+                                    <el-button link><el-icon>
+                                            <ArrowDown />
+                                        </el-icon></el-button>
+                                </div>
+                            </template>
+                        </el-popover>
+                    </template>
                     <template #default="{ row }">
                         <el-form-item prop="equipmentName">
                             <el-form :model="row" @submit.native.prevent>
@@ -71,7 +92,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="manufacturer" label="生产厂家" width="250">
+                <el-table-column prop="manufacturer" label="生产厂家" width="250" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="manufacturer">
                             <el-form :model="row" @submit.native.prevent>
@@ -80,7 +101,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="model" label="型号规格" width="250">
+                <el-table-column prop="model" label="型号规格" width="250" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="model">
                             <el-form :model="row" @submit.native.prevent>
@@ -89,7 +110,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="purchaseDate" label="购买日期" width="150">
+                <el-table-column prop="purchaseDate" label="购买日期" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="purchaseDate">
                             <el-form :model="row" @submit.native.prevent>
@@ -98,7 +119,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="activationDate" label="启用日期" width="150">
+                <el-table-column prop="activationDate" label="启用日期" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="activationDate">
                             <el-form :model="row" @submit.native.prevent>
@@ -107,7 +128,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="storageLocation" label="存放地点" width="250">
+                <el-table-column prop="storageLocation" label="存放地点" width="250" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="storageLocation">
                             <el-form :model="row" @submit.native.prevent>
@@ -116,7 +137,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="quantity" label="数量" width="150">
+                <el-table-column prop="quantity" label="数量" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="quantity">
                             <el-form :model="row" @submit.native.prevent>
@@ -125,7 +146,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="unitOfMeasurement" label="计量单位" width="150">
+                <el-table-column prop="unitOfMeasurement" label="计量单位" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="unitOfMeasurement">
                             <el-form :model="row" @submit.native.prevent>
@@ -134,7 +155,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="bookOriginalValue" label="账面原值（元）" width="150">
+                <el-table-column prop="bookOriginalValue" label="账面原值（元）" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="bookOriginalValue">
                             <el-form :model="row" @submit.native.prevent>
@@ -143,7 +164,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="netValue" label="账面净值（元）" width="150">
+                <el-table-column prop="netValue" label="账面净值（元）" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="netValue">
                             <el-form :model="row" @submit.native.prevent>
@@ -152,7 +173,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="taxedUnitPrice" label="含税单价（元）" width="150">
+                <el-table-column prop="taxedUnitPrice" label="含税单价（元）" width="150" align="center">
                     <template #default="{ $index, row }">
                         <el-form-item prop="taxedUnitPrice">
                             <el-form :model="row" @submit.native.prevent>
@@ -162,7 +183,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="taxRate" label="税率" width="150">
+                <el-table-column prop="taxRate" label="税率" width="150" align="center">
                     <template #default="{ $index, row }">
                         <el-form-item prop="taxRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -171,14 +192,14 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="unTaxedUnitPrice" label="不含税单价（元）" width="150">
+                <el-table-column prop="unTaxedUnitPrice" label="不含税单价（元）" width="150" align="center">
                     <template #default="{ row }">
                         <!-- 计算不含税单价 -->
                         <span>{{ row.unTaxedUnitPrice = (row.taxedUnitPrice / (1 + row.taxRate / 100)).toFixed(2)
                         }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="remark" label="备注" width="250">
+                <el-table-column prop="remark" label="备注" width="250" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="remark">
                             <el-form :model="row" @submit.native.prevent>
@@ -187,18 +208,18 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column label="评估价值" width="300">
-                    <el-table-column prop="evaluateOriginalValue" label="原值（元）" width="100">
+                <el-table-column label="评估价值" width="300" align="center">
+                    <el-table-column prop="evaluateOriginalValue" label="原值（元）" width="100" align="center">
                         <template #default="{ row }">
                             <span>{{ row.evaluateOriginalValue = row.excludeTaxPrice }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="depreciationRate" label="成新率%" width="100">
+                    <el-table-column prop="depreciationRate" label="成新率%" width="100" align="center">
                         <template #default="{ row }">
                             <span>{{ row.depreciationRate = row.comprehensiveDepreciationRate }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="evaluateNetValue" label="净值（元）" width="100">
+                    <el-table-column prop="evaluateNetValue" label="净值（元）" width="100" align="center">
                         <template #default="{ row }">
                             <span>{{ row.evaluateNetValue = (row.evaluateOriginalValue * 1 *
                                 row.comprehensiveDepreciationRate /
@@ -206,7 +227,7 @@
                             }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="valueAddedRate" label="增值率" width="150">
+                    <el-table-column prop="valueAddedRate" label="增值率" width="150" align="center">
                         <template #default="{ row }">
                             <el-form-item prop="valueAddedRate">
                                 <el-form :model="row" @submit.native.prevent>
@@ -218,7 +239,7 @@
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="年限成新率" width="300">
-                    <el-table-column prop="economicServiceLife" label="经济使用年数" width="120">
+                    <el-table-column prop="economicServiceLife" label="经济使用年数" width="120" align="center">
                         <template #default="{ $index, row }">
                             <el-form-item prop="economicServiceLife">
                                 <el-form :model="row" @submit.native.prevent>
@@ -228,7 +249,7 @@
                             </el-form-item>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="yearsInUse" label="已使用年数" width="100">
+                    <el-table-column prop="yearsInUse" label="已使用年数" width="100" align="center">
                         <template #default="{ row }">
                             <!-- 计算已使用年数 -->
                             <span>{{ row.yearsInUse = (getDaysBetween(row.activationDate,
@@ -236,7 +257,7 @@
                                 365).toFixed(2) }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="年限成新率" width="100">
+                    <el-table-column label="年限成新率" width="100" align="center">
                         <template #default="{ row }">
                             <span>{{ row.depreciationRateByAge =
                             ((row.economicServiceLife - row.yearsInUse) / row.economicServiceLife < 0.15) ? 15 :
@@ -245,12 +266,12 @@
                         </template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column prop="weight01" label="权重" width="100">
+                <el-table-column prop="weight01" label="权重" width="100" align="center">
                     <template #default="{ row }">
                         <span>{{ row.weight01 * 100 }}%</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="directObservationDepreciationRate" label="直接观察成新率" width="150">
+                <el-table-column prop="directObservationDepreciationRate" label="直接观察成新率" width="150" align="center">
                     <template #default="{ $index, row }">
                         <el-form-item prop="directObservationDepreciationRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -259,19 +280,19 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="weight02" label="权重" width="100">
+                <el-table-column prop="weight02" label="权重" width="100" align="center">
                     <template #default="{ row }">
                         <span>{{ row.weight02 * 100 }}%</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="综合成新率" width="100">
+                <el-table-column label="综合成新率" width="100" align="center">
                     <template #default="{ row }">
                         <span>{{ row.comprehensiveDepreciationRate =
                         ((row.depreciationRateByAge * row.weight01 + row.directObservationDepreciationRate *
                             row.weight02)).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="equipmentType" label="设备类型" width="150">
+                <el-table-column prop="equipmentType" label="设备类型" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="equipmentType">
                             <el-form :model="row" @submit.native.prevent>
@@ -285,7 +306,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="valuationMethod" label="作价方法" width="150">
+                <el-table-column prop="valuationMethod" label="作价方法" width="150" align="center">
                     <template #default="{ $index, row }">
                         <el-form-item prop="valuationMethod">
                             <el-form :model="row" @submit.native.prevent>
@@ -299,7 +320,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="inquiryBasis" label="询价依据" width="300">
+                <el-table-column prop="inquiryBasis" label="询价依据" width="300" align="center">
                     <template #default="{ $index, row }">
                         <el-form-item prop="inquiryBasis">
                             <el-form :model="row" @submit.native.prevent>
@@ -322,12 +343,11 @@
                                         " style="width: 50px;display: inline-block;margin-left:5px">
                                     <el-button type="danger" size="small">图片</el-button>
                                 </el-upload>
-
                             </el-form>
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="inquiryLocation" label="询价地点" width="150">
+                <el-table-column prop="inquiryLocation" label="询价地点" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="inquiryLocation">
                             <el-form :model="row" @submit.native.prevent>
@@ -336,7 +356,7 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="price" label="单价（元）" width="150">
+                <el-table-column prop="price" label="单价（元）" width="150" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="price">
                             <el-form :model="row" @submit.native.prevent>
@@ -345,12 +365,12 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="quotation" label="报价（含税不含运费不含安装调试费）" width="100">
+                <el-table-column prop="quotation" label="报价（含税不含运费不含安装调试费）" width="100" align="center">
                     <template #default="{ row }">
                         <span>{{ row.quotation = row.price * row.quantity }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="freightAndMiscellaneousFeeRate" label="运杂费率" width="100">
+                <el-table-column prop="freightAndMiscellaneousFeeRate" label="运杂费率" width="100" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="freightAndMiscellaneousFeeRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -366,7 +386,7 @@
                             100).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="baseRate" label="基础费率" width="100">
+                <el-table-column prop="baseRate" label="基础费率" width="100" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="baseRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -375,12 +395,12 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column label="基础费（元）" width="100">
+                <el-table-column label="基础费（元）" width="100" align="center">
                     <template #default="{ row }">
                         <span>{{ row.baseFee = (row.quotation * row.baseRate / 100).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="installationRate" label="安装费率" width="100">
+                <el-table-column prop="installationRate" label="安装费率" width="100" align="center">
                     <template #default="{ row }">
                         <el-form-item prop="installationRate">
                             <el-form :model="row" @submit.native.prevent>
@@ -389,42 +409,42 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="installationFee" label="安装费（元）" width="100">
+                <el-table-column prop="installationFee" label="安装费（元）" width="100" align="center">
                     <template #default="{ row }">
                         <span>{{ row.installationFee = (row.quotation * row.installationRate / 100).toFixed(2)
                         }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="设备工程费（元）" width="100">
+                <el-table-column label="设备工程费（元）" width="100" align="center">
                     <template #default="{ row }">
                         <span>{{ row.equipmentEngineeringCosts = (row.quotation * 1 + row.freightAndMiscellaneousFee
                             * 1 +
                             row.baseFee * 1 + row.installationFee * 1).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="前期费（元）" width="100">
+                <el-table-column label="前期费（元）" width="100" align="center">
                     <template #default="{ row }">
                         <span>{{ row.initialFee = (row.equipmentEngineeringCosts *
                             calculateBaseInfo.preConstructionCostRatio / 100).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="资金成本（元）" width="100">
+                <el-table-column label="资金成本（元）" width="100" align="center">
                     <template #default="{ row }">
                         <span>{{ row.costOfCapital = countCostOfCapital(row) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="可抵扣增值税" width="120">
+                <el-table-column label="可抵扣增值税" width="120" align="center">
                     <template #default="{ row }">
                         <span>{{ row.deductibleVAT = countDeductibleVAT(row) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="重置全价(不含税)" width="120">
+                <el-table-column label="重置全价(不含税)" width="120" align="center">
                     <template #default="{ row }">
                         <span>{{ row.excludeTaxPrice = (row.equipmentEngineeringCosts * 1 + row.initialFee * 1 +
                             row.costOfCapital * 1 - row.deductibleVAT * 1).toFixed(0) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column fixed="right" label="操作" min-width="55">
+                <el-table-column fixed="right" label="操作" min-width="55" align="center">
                     <template #default="{ row }">
                         <el-button link type="primary" size="small" @click="save(row)">保存</el-button>
                     </template>
@@ -912,17 +932,22 @@
                 </el-table-column>
             </el-table>
         </div>
-        <el-pagination v-if="activeName === 'all'" background layout="sizes, prev, pager, next" :page-sizes="[10, 20, 100, 500]"
-            style="--el-color-primary: #ff6154;margin-top: 20px; float: right;" v-model:page-count="eqptDataQuery.pages" v-model:page-size="eqptDataQuery.size"
-            v-model:current-page="eqptDataQuery.current" @current-change="getEqptDataPage" @size-change="getEqptDataPage"/>
-        <el-pagination v-if="activeName === 'imported'" background layout="sizes, prev, pager, next" :page-sizes="[10, 20, 100, 500]"
-            style="--el-color-primary: #ff6154;margin-top: 20px; float: right;" v-model:page-count="eqptDataQuery.pages" v-model:page-size="eqptDataQuery.size"
-            v-model:current-page="eqptDataQuery.current" @current-change="getImpEqptDataPage" @size-change="getImpEqptDataPage"/>
-        <el-pagination v-if="activeName === 'nonStandard'" background layout="sizes, prev, pager, next" :page-sizes="[10, 50, 100, 500]"
-            style="--el-color-primary: #ff6154;margin-top: 20px; float: right;" v-model:page-count="eqptDataQuery.pages" v-model:page-size="eqptDataQuery.size"
-            v-model:current-page="eqptDataQuery.current" @current-change="getNonSEqptDataPage" @size-change="getNonSEqptDataPage" />
+        <el-pagination v-if="activeName === 'all'" background layout="sizes, prev, pager, next"
+            :page-sizes="[10, 15, 20, 50]" style="--el-color-primary: #ff6154;margin-top: 20px; float: right;"
+            v-model:page-count="eqptDataQuery.pages" v-model:page-size="eqptDataQuery.size"
+            v-model:current-page="eqptDataQuery.current" @current-change="getEqptDataPage" @size-change="getEqptDataPage" />
+        <el-pagination v-if="activeName === 'imported'" background layout="sizes, prev, pager, next"
+            :page-sizes="[10, 15, 20, 100]" style="--el-color-primary: #ff6154;margin-top: 20px; float: right;"
+            v-model:page-count="eqptDataQuery.pages" v-model:page-size="eqptDataQuery.size"
+            v-model:current-page="eqptDataQuery.current" @current-change="getImpEqptDataPage"
+            @size-change="getImpEqptDataPage" />
+        <el-pagination v-if="activeName === 'nonStandard'" background layout="sizes, prev, pager, next"
+            :page-sizes="[10, 15, 50, 100]" style="--el-color-primary: #ff6154;margin-top: 20px; float: right;"
+            v-model:page-count="eqptDataQuery.pages" v-model:page-size="eqptDataQuery.size"
+            v-model:current-page="eqptDataQuery.current" @current-change="getNonSEqptDataPage"
+            @size-change="getNonSEqptDataPage" />
         <el-tabs v-model="activeName" tab-position="bottom" @tab-change="tabChange()"
-            style="display:inline-block;margin-left: 19.5%">
+            style="display:inline-block;margin-left: 308px">
             <el-tab-pane label="所有设备测算" name="all">
             </el-tab-pane>
             <el-tab-pane label="进口设备测算" name="imported">
@@ -937,7 +962,7 @@
 import { mapStores } from 'pinia';
 import { assetsProjectInfo } from '@/stores/assetsProjectStore';
 import { importEqptExcelData, getCalculateBaseInfo, getValuationBasisDate, generateEquipmentCalculate } from '@/api/assetsCalculate';
-import { getDataPage, updateData, getImpDataPage, updateImpData, getNonSDataPage, updateNonSData } from '@/api/assetsCalculateEqptData';
+import { getDataPage, updateData, getImpDataPage, updateImpData, getNonSDataPage, updateNonSData, getEqptTableFilterVO } from '@/api/assetsCalculateEqptData';
 import { getDaysBetween } from '@/utils/date';
 import { eqptLifeIfrRefsList } from '@/api/eqptLifeIfrRefs';
 import { getPPIDownData, getPPIByNameType } from '@/api/eqptPPI';
@@ -957,7 +982,8 @@ export default {
                 calculateId: null,
                 sortId: null,
                 equipmentName: null,
-                equipmentType: null
+                equipmentType: null,
+                eqptNameFilter: null
             },
             eqptPageData: [],
             eqptImpPageData: [],
@@ -965,7 +991,10 @@ export default {
             calculateBaseInfo: {},
             eqptLifeIfrRefs: [],
             ppiOptions: [],
-            eqptGnEvp: []
+            eqptGnEvp: [],
+            equipmentNameFilters: [],
+            equipmentName: null,
+            eqptNameFilterArr: []
         }
     },
     computed: {
@@ -975,6 +1004,7 @@ export default {
         this.getBaseInfo();
         this.getEqptDataPage();
         this.getPPI();
+        this.getEqptTableFilter('all');
     },
     methods: {
         getDaysBetween,
@@ -1060,6 +1090,7 @@ export default {
         },
         // 分页查询导入的机器设备测算数据
         getEqptDataPage() {
+            this.eqptDataQuery.eqptNameFilter = this.eqptNameFilterArr.join();
             this.eqptDataQuery.calculateId = this.projectStore.calculateProgress.id;
             getDataPage(this.eqptDataQuery).then(res => {
                 this.eqptDataQuery.pages = res.data.pages
@@ -1323,6 +1354,20 @@ export default {
                     this.getNonSEqptDataPage();
                 }
             })
+        },
+        getEqptTableFilter(queryType) {
+            let params = {
+                calculateId: this.projectStore.calculateProgress.id,
+                equipmentName: this.equipmentName,
+                queryType: queryType
+            }
+            getEqptTableFilterVO(params).then(res => {
+                if (res.data) {
+                    this.equipmentNameFilters = res.data.equipmentNameFilters;
+                    this.eqptNameFilterArr = [];
+                    this.eqptDataQuery.eqptNameFilter = null
+                }
+            })
         }
     },
 
@@ -1330,15 +1375,6 @@ export default {
 </script>
 
 <style scoped>
-.contrl {
-    font-size: 20px;
-    width: 75%;
-    border-right: 1.5px #dae1eb solid;
-    padding: 0px 20px 20px 0px;
-    float: left;
-
-}
-
 :deep(.el-input__wrapper.is-focus) {
     --el-input-focus-border: #ff6154;
     --el-input-focus-border-color: #ff6154;
@@ -1379,7 +1415,7 @@ export default {
 }
 
 .evaluateDiv {
-    margin-left: 1%;
+    margin-left: 10px;
     width: 80.5%;
     display: inline-block;
     vertical-align: top;
@@ -1402,4 +1438,5 @@ export default {
 /* 将tap的下划线移动到顶部 */
 :deep(.el-tabs__active-bar) {
     margin-bottom: 35px !important;
-}</style>
+}
+</style>

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

@@ -1,7 +1,13 @@
 <template>
   <div>
-      <Bench></Bench>
-      <Timeline :baseInfo="true"></Timeline>
+    <Bench></Bench>
+    <div v-if="showTimeline == true" @click="changeTimelineStatus(false)"><el-icon>
+        <Right />
+      </el-icon></div>
+    <div v-if="showTimeline == false" @click="changeTimelineStatus(true)"><el-icon>
+        <Back />
+      </el-icon></div>
+    <Timeline v-if="showTimeline" :baseInfo="true"></Timeline>
   </div>
 </template>
   
@@ -16,7 +22,38 @@ export default {
   },
   data() {
     return {
-      
+      showTimeline: true
+    }
+  },
+  methods: {
+    // 显示隐藏步骤条时更改页面布局,直接操作DOM元素
+    // contrl是每个子组件都有的样式
+    // evaluateDiv,uploadDiv是作价页面的样式
+    changeTimelineStatus(status) {
+      this.showTimeline = status;
+      if (status) {
+        var obj = document.getElementById('contrl');
+        obj.style.width = '75%';
+        var evaluateDiv = document.getElementById('evaluateDiv');
+        if(evaluateDiv) {
+          evaluateDiv.style.width = '80.5%';
+        }
+        var uploadDiv = document.getElementById('uploadDiv');
+        if(uploadDiv) {
+          uploadDiv.style.width = '18.5%';
+        }
+      }else {
+        var obj = document.getElementById('contrl');
+        obj.style.width = '99%';
+        var evaluateDiv = document.getElementById('evaluateDiv');
+        if(evaluateDiv) {
+          evaluateDiv.style.width = '85%';
+        }
+        var uploadDiv = document.getElementById('uploadDiv');
+        if(uploadDiv) {
+          uploadDiv.style.width = '14%';
+        }
+      }
     }
   }
 }
@@ -35,5 +72,15 @@ export default {
 
 }
 </style>
+
+<style>
+.contrl {
+  /* font-size: 20px; */
+  width: 75%;
+  border-right: 1.5px #dae1eb solid;
+  padding: 0px 20px 20px 0px;
+  float: left;
+}
+</style>