From 027c1fcde746ddfea5af9d9e35cf3ac1d12c0bca Mon Sep 17 00:00:00 2001
From: panzy <225@qq.com>
Date: 星期六, 21 五月 2022 08:39:52 +0800
Subject: [PATCH] 表格添加loding转圈
---
src/views/Issuedbysuperiors/index.vue | 21 +++-
src/views/troubleshooting/index.vue | 6 +
src/views/chartAnalysis/index.vue | 4
src/views/summaryPotentialSafetyHzards/index.vue | 53 +++++++-----
src/views/oneFromanotherN/index.vue | 7 +
src/views/hiddenDangerManagement/index.vue | 5 +
src/views/safetyHazardAccount/index.vue | 5 +
src/views/oneFromanother/index.vue | 2
src/views/hiddenDangerReview/recheckCancellationNumber.vue | 5 +
src/views/delayHiddenDangerRectification/index.vue | 5 +
src/views/hiddenDangerRectification/index.vue | 7 +
src/views/summaryPotentialSafetyHzards/summaryList.vue | 101 ++++++++++++++++++------
12 files changed, 152 insertions(+), 69 deletions(-)
diff --git a/src/views/Issuedbysuperiors/index.vue b/src/views/Issuedbysuperiors/index.vue
index e086d01..7241fdd 100644
--- a/src/views/Issuedbysuperiors/index.vue
+++ b/src/views/Issuedbysuperiors/index.vue
@@ -155,7 +155,7 @@
</el-radio-group>
</el-col>
</el-row>
- <el-table :data="tableData" style="width: 100%" @selection-change="changeBox">
+ <el-table :data="tableData" style="width: 100%" @selection-change="changeBox" v-loading="loading">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="number" label="编号" align="center" width="120">
<template slot-scope="scope">
@@ -166,7 +166,7 @@
<el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
<el-table-column label="隐患项目" align="center">
- <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center">
<template slot-scope="scope">
<label>{{ formatDate(scope.row.check_date) }}</label><br/>
<label>{{ scope.row.check_class }}</label>
@@ -211,14 +211,17 @@
</el-table-column>
<el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
<el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
- <el-table-column prop="alter_time" label="限改时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" :formatter="formatColumnDate" width="120"
+ align="center"></el-table-column>
<el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="110px" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="110px"
+ align="center"></el-table-column>
<el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
- <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120"
+ align="center"></el-table-column>
</el-table-column>
<el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
@@ -231,7 +234,7 @@
<el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
<template slot-scope="scope">
<span style="color: red"
- v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
+ v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
<span v-else>已关联</span>
</template>
</el-table-column>
@@ -296,6 +299,7 @@
YHBMList: [],
YHJBList: [],
YHZTList: [],
+ loading:false,
tableData: [],
listQuery: {
page: 1,
@@ -422,7 +426,9 @@
this.listQuery.page = 1
this.listQuery.form.step = this.YHType;
this.checkTime()
+ this.loading =true;
getPageList(this.listQuery).then(res => {
+ this.loading =false;
if (res.data.ok == 1) {
this.tableData = res.data.data.items
this.recordTotal = res.data.data.total
@@ -612,7 +618,8 @@
border: none;
border-radius: 0px;
}
-.blue-font-color:hover{
+
+.blue-font-color:hover {
cursor: pointer;
color: blue;
}
diff --git a/src/views/chartAnalysis/index.vue b/src/views/chartAnalysis/index.vue
index 816b21a..bd348ce 100644
--- a/src/views/chartAnalysis/index.vue
+++ b/src/views/chartAnalysis/index.vue
@@ -170,7 +170,7 @@
let dataList = [];
data.data[0].forEach(n=>{
xList.push(n.graph);
- let sigleData = {
+ let singleData = {
"name": n.graph,
"type": 'bar',
"label": "labelOption",
@@ -179,7 +179,7 @@
},
"data": [n.yAxes]
}
- dataList.push(sigleData);
+ dataList.push(singleData);
})
this.columnChartData.xList = xList;
this.columnChartData.dataList = dataList;
diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index e0fd2b9..838ec48 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -157,7 +157,7 @@
<el-button class="btns" type="primary" size="small" @click="sendBath()">批量发送</el-button>
</el-col>
</el-row>
- <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+ <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange" v-loading="loading">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="number" label="编号" align="center" width="120">
<template slot-scope="scope">
@@ -265,6 +265,7 @@
YHBMList: [],
YHJBList: [],
tableData: [],
+ loading:false,
listQuery: {
page: 1,
limit: 10,
@@ -349,7 +350,9 @@
getPageList() {
this.listQuery.page = 1
this.checkTime()
+ this.loading = true
getPageList(this.listQuery).then(res => {
+ this.loading = false
if (res.data.ok == 1) {
this.tableData = res.data.data.items
this.recordTotal = res.data.data.total
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index addaa9a..19f63b9 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -181,7 +181,7 @@
</el-col>
</el-row>
- <el-table :data="tableData" ref="dataTable" style="width: 100%">
+ <el-table :data="tableData" ref="dataTable" style="width: 100%" v-loading="loading">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="number" label="编号" align="center" width="120">
<template slot-scope="scope">
@@ -304,6 +304,7 @@
YHBMList: [],
YHJBList: [],
tableData: [],
+ loading:false,
listQuery: {
page: 1,
limit: 10,
@@ -396,7 +397,9 @@
getPageList() {
this.listQuery.page = 1
this.checkTime()
+ this.loading = true
getPageList(this.listQuery).then(res => {
+ this.loading = false
if (res.data.ok == 1) {
this.tableData = res.data.data.items
this.recordTotal = res.data.data.total
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index 521cf84..5bc7517 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -149,7 +149,7 @@
<el-button class="btns" type="primary" size="small" @click="applyDelay()">申请延期</el-button>
</el-col>
</el-row>
- <el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%">
+ <el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%" v-loading="loading">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="number" label="编号" align="center" width="120">
<template slot-scope="scope">
@@ -201,7 +201,7 @@
<el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
<el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
- <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
</el-table-column>
<el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
@@ -312,6 +312,7 @@
YHBMList: [],
YHJBList: [],
tableData: [],
+ loading:false,
listQuery: {
page: 1,
limit: 10,
@@ -429,7 +430,9 @@
getPageList() {
this.listQuery.page = 1
this.checkTime()
+ this.loading = true;
getPageList(this.listQuery).then(res => {
+ this.loading = false;
if (res.data.ok == 1) {
this.tableData = res.data.data.items
this.recordTotal = res.data.data.total
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
index 5126227..3249222 100644
--- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -151,7 +151,7 @@
<el-button class="btns" type="primary" size="small">批量发送</el-button>
</el-col>
</el-row>
- <el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%">
+ <el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%" v-loading="loading">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="number" label="编号" align="center" width="120">
<template slot-scope="scope">
@@ -358,6 +358,7 @@
YHBMList: [],
YHJBList: [],
tableData: [],
+ loading:false,
ruleForm: {
id: "",
step: "3",
@@ -471,7 +472,9 @@
getPageList() {
this.listQuery.page = 1
this.checkTime()
+ this.loading = true
getPageList(this.listQuery).then(res => {
+ this.loading =false
if (res.data.ok == 1) {
this.tableData = res.data.data.items
this.recordTotal = res.data.data.total
diff --git a/src/views/oneFromanother/index.vue b/src/views/oneFromanother/index.vue
index fed5586..185420c 100644
--- a/src/views/oneFromanother/index.vue
+++ b/src/views/oneFromanother/index.vue
@@ -311,7 +311,9 @@
getPageList(){
this.listQuery.page=1
this.checkTime()
+ this.listLoading = true
getPageList(this.listQuery).then(res=>{
+ this.listLoading = false
if (res.data.ok==1) {
this.tableData = res.data.data.items
this.recordTotal=res.data.data.total
diff --git a/src/views/oneFromanotherN/index.vue b/src/views/oneFromanotherN/index.vue
index 6e81886..ebb7b92 100644
--- a/src/views/oneFromanotherN/index.vue
+++ b/src/views/oneFromanotherN/index.vue
@@ -98,6 +98,7 @@
<div v-if="table1">
<el-table ref="dataTable"
v-if="listQuery.type==0"
+ v-loading="loading"
:data="tableData"
style="width: 100%"
@selection-change="handleSelectionChange">
@@ -322,9 +323,6 @@
radio1:'待发送',
table1:true,
table2:false,
-
-
-
currentPage: 1,
pageSize: 10,
recordTotal: 0,
@@ -338,6 +336,7 @@
JCLBList:[],
tableData:[],
selectedList:[],
+ loading:false,
listLoading: false,
selfInspectVisible: false,
selfInspectForm:{
@@ -460,7 +459,9 @@
getPageList(){
this.listQuery.page=1
this.checkTime()
+ this.loading=true
getPageList(this.listQuery).then(res=>{
+ this.loading=false
if (res.data.ok==1) {
this.tableData = res.data.data.items
this.recordTotal=res.data.data.total
diff --git a/src/views/safetyHazardAccount/index.vue b/src/views/safetyHazardAccount/index.vue
index ce6794d..bf7d312 100644
--- a/src/views/safetyHazardAccount/index.vue
+++ b/src/views/safetyHazardAccount/index.vue
@@ -193,7 +193,7 @@
<el-button type="primary" class="btns" size="small" @click='deleteBatch'>删除</el-button>
</el-col>
</el-row>
- <el-table :data="tableData" ref="pageTable" style="width: 100%" @selection-change="changeBox">
+ <el-table :data="tableData" ref="pageTable" style="width: 100%" @selection-change="changeBox" v-loading="loading">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="number" label="编号" align="center" width="120">
<template slot-scope="scope">
@@ -362,6 +362,7 @@
tableData: [],
requestData: {},
levelList:[{id:1,name:'低风险'},{id:2,name:'一般风险'},{id:3,name:'较大风险'},{id:4,name:'重大风险'}],
+ loading:false,
listQuery: {
page: 1,
limit: 10,
@@ -493,7 +494,9 @@
getPageList() {
this.listQuery.page = 1
this.checkTime()
+ this.loading = true;
getPageList(this.listQuery).then(res => {
+ this.loading = false;
if (res.data.ok == 1) {
this.tableData = res.data.data.items
this.recordTotal = res.data.data.total
diff --git a/src/views/summaryPotentialSafetyHzards/index.vue b/src/views/summaryPotentialSafetyHzards/index.vue
index 4f953f9..a647499 100644
--- a/src/views/summaryPotentialSafetyHzards/index.vue
+++ b/src/views/summaryPotentialSafetyHzards/index.vue
@@ -67,26 +67,30 @@
</el-select>
</el-form-item>
</div>
- <el-form-item label="统计类别">
- <el-radio-group v-model="form.x_axis" style="padding: 0px 0;">
- <el-radio label="ht_branch">按隐患部门</el-radio>
- <el-radio label="ht_typesub">按专业</el-radio>
- <el-radio label="ht_level">按级别</el-radio>
- <el-radio label="checktype">按检查类别</el-radio>
- <el-radio label="ht_community">按检查单位（上级单位）</el-radio>
- <el-radio label="check_branch">按检查单位（本部单位）</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="汇总类别">
- <el-radio-group v-model="form.y_axis">
- <el-radio label="ht_branch">按隐患部门</el-radio>
- <el-radio label="ht_typesub">按专业</el-radio>
- <el-radio label="ht_level">按级别</el-radio>
- <el-radio label="checktype">按检查类别</el-radio>
- <el-radio label="ht_community">按检查单位（上级单位）</el-radio>
- <el-radio label="check_branch">按检查单位（本部单位）</el-radio>
- </el-radio-group>
- </el-form-item>
+ <el-row>
+ <el-form-item label="统计类别">
+ <el-radio-group v-model="form.x_axis" style="padding: 0px 0;">
+ <el-radio label="ht_branch">按隐患部门</el-radio>
+ <el-radio label="ht_typesub">按专业</el-radio>
+ <el-radio label="ht_level">按级别</el-radio>
+ <el-radio label="checktype">按检查类别</el-radio>
+ <el-radio label="ht_community">按检查单位（上级单位）</el-radio>
+ <el-radio label="check_branch">按检查单位（本部单位）</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label="汇总类别">
+ <el-radio-group v-model="form.y_axis">
+ <el-radio label="ht_branch">按隐患部门</el-radio>
+ <el-radio label="ht_typesub">按专业</el-radio>
+ <el-radio label="ht_level">按级别</el-radio>
+ <el-radio label="checktype">按检查类别</el-radio>
+ <el-radio label="ht_community">按检查单位（上级单位）</el-radio>
+ <el-radio label="check_branch">按检查单位（本部单位）</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-row>
</div>
<div class="center" style="text-align: center;padding-top: 10px;">
<el-form-item label="检查时间：">
@@ -110,6 +114,7 @@
</el-form>
<el-table
:data="tableData"
+ v-loading="loading"
style="width: 100%">
<el-table-column align="center" label="众泰煤焦化-安全隐患台帐">
<el-table-column
@@ -199,6 +204,7 @@
YHBMList: [],
YHJBList: [],
YHZTList: [],
+ loading: false,
startDate: "",
endDate: "",
}
@@ -325,7 +331,9 @@
}
selectData.push(timeSearchCloumn)
requestData.query_condition = selectData;
+ this.loading = true;
danger_summary(requestData).then(res => {
+ this.loading = false;
if (res.data.ok == 1) {
this.tableData = res.data.data
} else {
@@ -369,7 +377,7 @@
return data.value
},
- showYHList(row,item){
+ showYHList(row, item) {
var searchData = {};
searchData[this.form.x_axis] = item.x_label;
searchData[this.form.y_axis] = row.y_label;
@@ -460,7 +468,8 @@
/deep/ .el-date-editor .el-range-separator {
width: auto;
}
-.clickSpan:hover{
+
+.clickSpan:hover {
cursor: pointer;
}
diff --git a/src/views/summaryPotentialSafetyHzards/summaryList.vue b/src/views/summaryPotentialSafetyHzards/summaryList.vue
index 9bab331..2bbee58 100644
--- a/src/views/summaryPotentialSafetyHzards/summaryList.vue
+++ b/src/views/summaryPotentialSafetyHzards/summaryList.vue
@@ -3,30 +3,59 @@
<el-table :data="tableData" style="width: 100%" @selection-change="changeBox">
<el-table-column type="selection" width="55" align="center"></el-table-column>
- <el-table-column prop="number" label="单位" align="center" width="120"></el-table-column>
- <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+ <el-table-column prop="ht_community" label="单位" align="center" width="120"></el-table-column>
+ <el-table-column prop="number" label="编号" align="center" width="120">
+ <template slot-scope="scope">
+ <div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
+ </template>
+ </el-table-column>
<el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
<el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
<!-- <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column> -->
<el-table-column label="隐患项目" align="center">
- <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
- <el-table-column prop="address" label="地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+ <template slot-scope="scope">
+ <label>{{ formatDate(scope.row.check_date) }}</label><br/>
+ <label>{{ scope.row.check_class }}</label>
+ </template>
+ </el-table-column>
+ <el-table-column prop="address" label="地点" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.address }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.address != null && scope.row.address.length > 10 ? scope.row.address.substring(0, 8) + "...." : scope.row.address
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column prop="ht_content" label="内容" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.ht_content }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </el-table-column>
<el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
- <el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
+ <el-table-column prop="ht_level" label="级别" width="100" align="center"></el-table-column>
</el-table-column>
<el-table-column label="整改计划" align="center">
- <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
+ <el-table-column prop="measure" label="整改措施" width="150" align="center"></el-table-column>
<el-table-column prop="ht_branch" label="责任单位" align="center"></el-table-column>
<el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
- <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
<!-- <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column> -->
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" :formatter="formatColumnDate" align="center"></el-table-column>
<el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
- <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
</el-table-column>
<el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
@@ -38,7 +67,7 @@
</el-table-column>
<el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
<template slot-scope="scope">
- <span
+ <span style="color: red"
v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
<span v-else>已关联</span>
</template>
@@ -114,13 +143,13 @@
};
},
mounted() {
- console.log(this.$route.query.searchData);
- var searchData = this.$route.query.searchData;
- for (const argumentsKey in searchData) {
- this.listQuery.form[argumentsKey] = searchData[argumentsKey];
+ if(this.$route.query.searchData.query_condition!=null){
+ var searchData = this.$route.query.searchData;
+ for (const argumentsKey in searchData) {
+ this.listQuery.form[argumentsKey] = searchData[argumentsKey];
+ }
+ this.getPageList()
}
- console.log(this.listQuery)
- this.getPageList()
this.initYHLX()
this.initYHJB()
this.initBC()
@@ -293,22 +322,36 @@
}
})
},
- updateClick(row) {
+ //方法区
+ formatDate(data) {
+ // 获取单元格数据
+ if (data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+ },
+ //方法区
+ formatColumnDate(row, column) {
+ // 获取单元格数据
+ let data = row[column.property]
+ if (data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
+ },
+ showDetails(row){
this.$router.push({
- path: "/safetyedit"
+ path: "/dangerDetails",
+ query:{"id":row.id,"route":"/summaryList"}
})
},
- jump() {
+ close(){
this.$router.push({
- path: "/hiddenDangerAdd"
+ path: "/summaryPotentialSafetyHzards"
})
- },
- // 发送隐患单跳转
- base() {
- this.$router.push({
- path: "/Dualbase"
- })
}
}
};
@@ -350,4 +393,8 @@
text-align: center;
margin-top: 20px;
}
+.blue-font-color:hover{
+ cursor: pointer;
+ color: blue;
+}
</style>
diff --git a/src/views/troubleshooting/index.vue b/src/views/troubleshooting/index.vue
index 8bd210f..7117eef 100644
--- a/src/views/troubleshooting/index.vue
+++ b/src/views/troubleshooting/index.vue
@@ -90,7 +90,7 @@
</el-radio-group>
</el-col>
</el-row>
- <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+ <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange" v-loading="listLoading">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column v-if="listQuery.type==2" prop="communityname" label="会议单位" align="center" width="120"></el-table-column>
<el-table-column prop="CONFERENCE_TIME" label="召开时间" :formatter="formatColumnDate" align="center" width="120"></el-table-column>
@@ -260,8 +260,10 @@
getPageList() {
this.listQuery.page = 1;
this.checkTime();
+ this.listLoading = true
getPageList(this.listQuery).then((res) => {
- if (res.data.ok == 1) {
+ this.listLoading = false
+ if (res.data.ok == 1) {
this.tableData = res.data.data.items;
this.recordTotal = res.data.data.total;
} else {
--
Gitblit v1.9.2