徐明浩

压力容器、压力管道、电梯、叉车、起重机械、锅炉-在用，排序

ui/src/views/sems/specCc/index.vue

@@ -111,7 +111,8 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" ref="deviceTable" :data="specCcList" @selection-change="handleSelectionChange" :height="clientHeight" border :cell-style="tableCellStyle">
+    <el-table v-loading="loading" ref="deviceTable" :data="specCcList" @selection-change="handleSelectionChange"
+              :height="clientHeight" border :cell-style="tableCellStyle" @sort-change="sortList">
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
@@ -143,7 +144,7 @@
           <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100">
+      <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -480,6 +481,7 @@
   import {addModify} from "@/api/sems/his/modify";
   import {listPostUser} from "@/api/system/user";
   import HisReform from "./specCc-hisReform";
+  import {listSpecGl} from "@/api/sems/specGl";
 
   export default {
   name: "SpecCc",
@@ -912,6 +914,30 @@
       if (columnIndex == 23 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
+    },
+    //element表格排序
+    sortList(val){
+      var sort = "asc";
+      let sortTip = val.order
+
+      if(sortTip === 'descending'){
+        sort = 'desc' // 降序
+      }
+      /*else if(sortTip === 'ascending'){
+        sort = 'asc' // 升序
+      }*/
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
+
+      this.loading = true;
+      listSpecCc(this.queryParams).then(response => {
+        this.specCcList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
     }
   }
 };

ui/src/views/sems/specDt/index.vue

@@ -111,7 +111,8 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" ref="deviceTable" :data="specDtList" @selection-change="handleSelectionChange" :height="clientHeight" border :cell-style="tableCellStyle">
+    <el-table v-loading="loading" ref="deviceTable" :data="specDtList" @selection-change="handleSelectionChange"
+              :height="clientHeight" border :cell-style="tableCellStyle"  @sort-change="sortList">
       <el-table-column type="selection" width="55" align="center"  fixed="left" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
@@ -139,7 +140,7 @@
 
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100">
+      <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100"  sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -413,6 +414,7 @@
   import {listPostUser} from "@/api/system/user";
   import {addModify} from "@/api/sems/his/modify";
   import HisReform from "./specDt-hisReform";
+  import {listSpecGl} from "@/api/sems/specGl";
 
   export default {
   name: "SpecDt",
@@ -813,6 +815,30 @@
       if (columnIndex == 17 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
+    },
+    //element表格排序
+    sortList(val){
+      var sort = "asc";
+      let sortTip = val.order
+
+      if(sortTip === 'descending'){
+        sort = 'desc' // 降序
+      }
+      /*else if(sortTip === 'ascending'){
+        sort = 'asc' // 升序
+      }*/
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
+
+      this.loading = true;
+      listSpecDt(this.queryParams).then(response => {
+        this.specDtList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
     }
   }
 };

ui/src/views/sems/specDzsb/index.vue

@@ -235,7 +235,8 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" ref="deviceTable" :data="specDzsbList" @selection-change="handleSelectionChange" :height="clientHeight" border :cell-style="tableCellStyle">
+    <el-table v-loading="loading" ref="deviceTable" :data="specDzsbList" @selection-change="handleSelectionChange"
+              :height="clientHeight" border :cell-style="tableCellStyle" @sort-change="sortList">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
@@ -266,7 +267,7 @@
           <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100">
+      <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -575,6 +576,7 @@
   import {addModify} from "@/api/sems/his/modify";
   import {listPostUser} from "@/api/system/user";
   import HisReform from "./specDzsb-hisReform";
+  import {listSpecGl} from "@/api/sems/specGl";
 
 
   export default {
@@ -996,6 +998,30 @@
       if (columnIndex == 19 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
+    },
+    //element表格排序
+    sortList(val){
+      var sort = "asc";
+      let sortTip = val.order
+
+      if(sortTip === 'descending'){
+        sort = 'desc' // 降序
+      }
+      /*else if(sortTip === 'ascending'){
+        sort = 'asc' // 升序
+      }*/
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
+
+      this.loading = true;
+      listSpecDzsb(this.queryParams).then(response => {
+        this.specDzsbList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
     }
   }
 };

ui/src/views/sems/specGl/index.vue

@@ -121,7 +121,8 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" ref="deviceTable" :data="specGlList" @selection-change="handleSelectionChange" :height="clientHeight" border :cell-style="tableCellStyle">
+    <el-table v-loading="loading" ref="deviceTable" :data="specGlList" @selection-change="handleSelectionChange"
+              :height="clientHeight" border :cell-style="tableCellStyle" @sort-change="sortList">
       <el-table-column type="selection" width="55" align="center"  fixed="left" />
       <el-table-column :label="$t('装置')" align="center" fixed="left"  prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
@@ -158,7 +159,7 @@
       </el-table-column>
       <el-table-column :label="$t('内部检查结论')" align="center" prop="checkConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('内部检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('下次内部检验日期')" align="center" prop="nextWarnDate" width="100">
+      <el-table-column :label="$t('下次内部检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -615,6 +616,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+        orderByColumn:null,
+        isAsc:null,
         plantCode: null,
         unit: null,
         devname: null,
@@ -977,6 +980,30 @@
       if (columnIndex == 26 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
+    },
+    //element表格排序
+    sortList(val){
+      var sort = "asc";
+      let sortTip = val.order
+
+      if(sortTip === 'descending'){
+        sort = 'desc' // 降序
+      }
+      /*else if(sortTip === 'ascending'){
+        sort = 'asc' // 升序
+      }*/
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
+
+      this.loading = true;
+      listSpecGl(this.queryParams).then(response => {
+        this.specGlList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
     }
   }
 };

ui/src/views/sems/specYlgd/index.vue

@@ -174,7 +174,7 @@
     </el-row>
 
     <el-table v-loading="loading" ref="deviceTable" :data="specYlgdList" @selection-change="handleSelectionChange" :height="clientHeight"
-              :cell-style="tableCellStyle" border>
+              :cell-style="tableCellStyle" border @sort-change="sortList">
       <el-table-column type="selection" width="55" align="center"  fixed="left" />
       <el-table-column :label="$t('装置名称')" align="center" fixed="left"  prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center" fixed="left"  prop="unit" :show-overflow-tooltip="true"/>
@@ -224,7 +224,7 @@
       </el-table-column>
       <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
 
-      <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
+      <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -678,6 +678,7 @@ import HisCheck from "../check/check"
 import { addModify } from "@/api/sems/his/modify";
 import { listPostUser } from "@/api/system/user";
 import HisReform from "./specYlgd-hisReform";
+import {listSpecGl} from "@/api/sems/specGl";
 
 export default {
   name: "SpecYlgd",
@@ -747,6 +748,8 @@ export default {
       queryParams: {
         dataForm: 0,
         pageNum: 1,
+        orderByColumn:null,
+        isAsc:null,
         pageSize: 20,
         plantCode: null,
         unit: null,
@@ -1132,6 +1135,30 @@ export default {
       if (columnIndex == 35 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
+    },
+    //element表格排序
+    sortList(val){
+      var sort = "asc";
+      let sortTip = val.order
+
+      if(sortTip === 'descending'){
+        sort = 'desc' // 降序
+      }
+      /*else if(sortTip === 'ascending'){
+        sort = 'asc' // 升序
+      }*/
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
+
+      this.loading = true;
+      listSpecYlgd(this.queryParams).then(response => {
+        this.specYlgdList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
     }
   }
 };

ui/src/views/sems/specYlrq/index.vue

@@ -122,7 +122,7 @@
     </el-row>
 
     <el-table v-loading="loading" ref="deviceTable" :data="specYlrqList" @selection-change="handleSelectionChange" :height="clientHeight"
-              :cell-style="tableCellStyle" border>
+              :cell-style="tableCellStyle" border @sort-change="sortList">
       <el-table-column type="selection" width="55" align="center"  fixed="left" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
@@ -164,7 +164,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
+      <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100"  sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -572,6 +572,7 @@
   import HisCheck from "../check/check"
   import {addModify} from "@/api/sems/his/modify";
   import HisReform from "./specYlrq-hisReform";
+  import {listSpecGl} from "@/api/sems/specGl";
 
 
   export default {
@@ -642,6 +643,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+        orderByColumn:null,
+        isAsc:null,
         plantCode: null,
         unit: null,
         devname: null,
@@ -1034,8 +1037,31 @@
       if (columnIndex == 28 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
-    }
+    },
+//element表格排序
+    sortList(val){
+      var sort = "asc";
+      let sortTip = val.order
+
+      if(sortTip === 'descending'){
+        sort = 'desc' // 降序
+      }
+      /*else if(sortTip === 'ascending'){
+        sort = 'asc' // 升序
+      }*/
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
 
+      this.loading = true;
+      listSpecYlrq(this.queryParams).then(response => {
+        this.specYlrqList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
+    }
   }
 };
 </script>