zc

src/api/index.js

@@ -192,6 +192,7 @@ export function reportReportBsCageRateList (query) {
     params: query
   })
 }
+
 //资源设备统计-设备使用寿命统计
 export function reportReportBsEquipLifeList (query) {
   return request({
@@ -200,6 +201,16 @@ export function reportReportBsEquipLifeList (query) {
     params: query
   })
 }
+
+//设备使用寿命统计-列表
+export function reportReportBsEquipLifeGetReportBsEquipLifeList (data) {
+  return request({
+    url: '/report/reportBsEquipLife/getReportBsEquipLifeList',
+    method: 'post',
+    data: data
+  })
+}
+
 //资源设备统计-超期服役设备统计
 export function reportReportBsEquipOverdueList (query) {
   return request({
@@ -306,6 +317,7 @@ export function reportReportBsResourceRateRresourceList (query) {
   })
 }
 
+
 /*
 * 获取楼栋楼层实验室打卡在线记录
 * buildId-楼栋

src/views/resourceDevice/pageList/equipmentLifeComponentTable.vue

@@ -13,8 +13,8 @@
       <p class="table-title-p">数据筛选</p>
       <el-form :model="queryParams" class="form-box" ref="queryForm"
                :inline="true" style="width:100%;">
-        <el-form-item label="学院：" prop="state">
-          <el-select v-model="queryParams.state"
+        <el-form-item label="学院：" prop="deptId">
+          <el-select v-model="queryParams.deptId"
                      placeholder="请选择学院"
                      style="width: 260px">
             <el-option
@@ -25,14 +25,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="类型：" prop="timeType" style="margin-left:30px!important;">
-          <el-select v-model="queryParams.timeType"
-                     placeholder="请选择设备类型"
-                     style="width: 260px;">
-            <el-option key="1" label="特种设备" value="1"/>
-            <el-option key="2" label="冷热设备" value="2"/>
-          </el-select>
-        </el-form-item>
         <p class="form-inquire-common-style-button" @click="handleQuery">查询</p>
         <p class="form-reset-common-style-button" @click="resetQuery">重置</p>
       </el-form>
@@ -43,21 +35,16 @@
         <el-table class="table-box" :row-class-name="tableRowClassName"
                   :data="dataList" @sort-change="sortChange">
           <el-table-column align="center" label="序号"  width="150"  type="index"/>
-          <el-table-column align="center" label="学院" prop="data1"  show-overflow-tooltip/>
-          <el-table-column align="center" sortable="custom" label="设备总数" prop="data2" width="260" show-overflow-tooltip/>
-          <el-table-column align="center" sortable="custom" label="5年内" prop="data3" width="260" show-overflow-tooltip/>
-          <el-table-column align="center" sortable="custom" label="10年内" prop="data4" width="260" show-overflow-tooltip/>
-          <el-table-column align="center" sortable="custom" label="12年内" prop="data5" width="260" show-overflow-tooltip/>
-          <el-table-column align="center" sortable="custom" label="20年内" prop="data6" width="260" show-overflow-tooltip/>
-          <el-table-column align="center" sortable="custom" label="超期服役" prop="data7" width="260" show-overflow-tooltip/>
-          <el-table-column align="center" sortable="custom" label="超期占比" prop="data8" width="260" show-overflow-tooltip>
-            <template slot-scope="scope">{{scope.row.data8}}%</template>
+          <el-table-column align="center" label="学院" prop="deptName"  show-overflow-tooltip/>
+          <el-table-column align="center" sortable="custom" label="设备总数" prop="deviceNum" width="260" show-overflow-tooltip/>
+          <el-table-column align="center" sortable="custom" label="5年内" prop="fiveYears" width="260" show-overflow-tooltip/>
+          <el-table-column align="center" sortable="custom" label="10年内" prop="tenYears" width="260" show-overflow-tooltip/>
+          <el-table-column align="center" sortable="custom" label="12年内" prop="twelveYears" width="260" show-overflow-tooltip/>
+          <el-table-column align="center" sortable="custom" label="20年内" prop="twentyYears" width="260" show-overflow-tooltip/>
+          <el-table-column align="center" sortable="custom" label="超期服役" prop="extendedService" width="260" show-overflow-tooltip/>
+          <el-table-column align="center" label="超期占比" prop="extendedRate" width="260" show-overflow-tooltip>
+            <template slot-scope="scope">{{scope.row.extendedRate?scope.row.extendedRate+'%':''}}</template>
           </el-table-column>
-          <!--<el-table-column align="center" label="创建时间" prop="createTime" width="200" show-overflow-tooltip>-->
-          <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>-->
-          <!--</template>-->
-          <!--</el-table-column>-->
         </el-table>
         <pagination :page-sizes="[20, 30, 40, 50]"
                     v-show="total>0"
@@ -72,7 +59,7 @@
   </div>
 </template>
 <script>
-  import { getDeptDropList,} from "@/api/index";
+  import { getDeptDropList,reportReportBsEquipLifeGetReportBsEquipLifeList } from "@/api/index";
   export default {
     name: 'equipmentLifeComponentTable',
     data () {
@@ -83,9 +70,9 @@
         queryParams:{
           page:1,
           pageSize:20,
-          searchValue:"",
-          state :null,
-          timeType:null,
+          deptId:"",
+          ascOrDesc:"",
+          type:"",
         },
         //列表数据
         dataList:[],
@@ -106,66 +93,63 @@
       },
       //排序方法
       sortChange(val){
-
+        if(val.prop == 'deviceNum'){
+          //设备总数
+          this.$set(this.queryParams,'ascOrDesc',val.order=='ascending'?true:(val.order=='descending'?false:''));
+          this.$set(this.queryParams,'type',1);
+          this.handleQuery();
+        }else if(val.prop == 'fiveYears'){
+          //5年内
+          this.$set(this.queryParams,'ascOrDesc',val.order=='ascending'?true:(val.order=='descending'?false:''));
+          this.$set(this.queryParams,'type',2);
+          this.handleQuery();
+        }else if(val.prop == 'tenYears'){
+          //10年内
+          this.$set(this.queryParams,'ascOrDesc',val.order=='ascending'?true:(val.order=='descending'?false:''));
+          this.$set(this.queryParams,'type',3);
+          this.handleQuery();
+        }else if(val.prop == 'twelveYears'){
+          //12年内
+          this.$set(this.queryParams,'ascOrDesc',val.order=='ascending'?true:(val.order=='descending'?false:''));
+          this.$set(this.queryParams,'type',4);
+          this.handleQuery();
+        }else if(val.prop == 'twentyYears'){
+          //20年内
+          this.$set(this.queryParams,'ascOrDesc',val.order=='ascending'?true:(val.order=='descending'?false:''));
+          this.$set(this.queryParams,'type',5);
+          this.handleQuery();
+        }else if(val.prop == 'extendedService'){
+          //超期服役
+          this.$set(this.queryParams,'ascOrDesc',val.order=='ascending'?true:(val.order=='descending'?false:''));
+          this.$set(this.queryParams,'type',6);
+          this.handleQuery();
+        }else{
+          this.$set(this.queryParams,'ascOrDesc','');
+          this.$set(this.queryParams,'type','');
+        }
       },
       //列表查询
       getList(){
-        let list = [];
-        let dataNameA = ['农学院','理学院','化学与药物','生命科学','园林艺术','植物保护','资源环境','国重楼'];
-        let dataNameB = [];
-        let dataNameC = [];
-        let maxNum = 20;
-        let num = 9;
-        function getRandomInt(min, max) {
-          min = Math.ceil(min); // 确保min是整数
-          max = Math.floor(max); // 确保max是整数
-          return Math.floor(Math.random() * (max - min + 1)) + min; // 返回介于min和max之间的整数
-        }
-        for(let i=0;i<maxNum;i++){
-          let obj = {};
-          for(let o=0;o<num;o++){
-            if(o == 0){
-              if(dataNameA[0]){
-                obj['data'+(o+1)] = dataNameA[getRandomInt(0,(dataNameA.length-1))]
-              }else{
-                obj['data'+(o+1)] = getRandomInt(1,500)
-              }
-            }else if(o == 1){
-              if(dataNameB[0]){
-                obj['data'+(o+1)] = dataNameB[getRandomInt(0,(dataNameB.length-1))]
-              }else{
-                obj['data'+(o+1)] = getRandomInt(1,500)
-              }
-            }else if(o == 2){
-              if(dataNameC[0]){
-                obj['data'+(o+1)] = dataNameC[getRandomInt(0,(dataNameC.length-1))]
-              }else{
-                obj['data'+(o+1)] = getRandomInt(1,500)
-              }
-            }else if(o == 7){
-              obj['data'+(o+1)] = getRandomInt(1,100)
-            }else{
-              obj['data'+(o+1)] = getRandomInt(1,500)
-            }
-          }
-          list.push(obj)
-        }
-        this.$set(this,'dataList',list);
+        reportReportBsEquipLifeGetReportBsEquipLifeList(this.queryParams).then(response => {
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
       },
       //查询按钮
       handleQuery(){
         this.$set(this.queryParams,'page',1);
-        // this.getList();
+        this.getList();
       },
       //重置按钮
       resetQuery(){
         this.$set(this,'queryParams',{
           page:1,
           pageSize:20,
-          searchValue:"",
-          state :null,
+          deptId:"",
+          ascOrDesc:"",
+          type:"",
         });
-        // this.getList();
+        this.getList();
       },
       tableRowClassName({row, rowIndex}) {
         if (rowIndex  % 2 == 0) {