@@ -80,6 +80,7 @@ const props = defineProps({
default: []
}
});
+const loading = ref(false)
const total = ref(0);
const listQuery = ref({
pageCurrent: 1,
@@ -134,11 +135,15 @@ const handleCurrentChange = (currentPage) => {
};
const getListData = () => {
keyTabel.value++
- const params = {...listQuery.vlue}
+ const params = {...listQuery.value}
+ loading.value = true;
qcckGet(params,'/mosty-gsxt/qbcj/selectPage').then(res=>{
+ loading.value = false;
tableData.value = res.records || [];
total.value = res.total;
multipleUser();
+ }).catch(()=>{
+ loading.value = false;
})
};
diff --git a/src/components/ChooseList/ChooseZdr/index.vue b/src/components/ChooseList/ChooseZdr/index.vue
index f61759d..342ff03 100644
--- a/src/components/ChooseList/ChooseZdr/index.vue
+++ b/src/components/ChooseList/ChooseZdr/index.vue
@@ -20,7 +20,7 @@
-
+
@@ -99,6 +99,7 @@ const props = defineProps({
default: []
},
});
+const loading = ref(false)
const total = ref(0);
const listQuery = ref({
pageCurrent: 1,
@@ -159,11 +160,15 @@ const handleCurrentChange = (currentPage) => {
};
const getListData = () => {
keyTabel.value++
- const params = {...listQuery.vlue}
+ const params = {...listQuery.value}
+ loading.value = true;
qcckGet(params,'/mosty-gsxt/tbGsxtZdry/selectPage').then(res=>{
+ loading.value = false;
tableData.value = res.records || [];
total.value = res.total;
multipleUser();
+ }).catch(()=>{
+ loading.value = false;
})
};
diff --git a/src/views/backOfficeSystem/BasicManagement/surveillanceControl/index.vue b/src/views/backOfficeSystem/BasicManagement/surveillanceControl/index.vue
index 6c84f4e..cb96eb4 100644
--- a/src/views/backOfficeSystem/BasicManagement/surveillanceControl/index.vue
+++ b/src/views/backOfficeSystem/BasicManagement/surveillanceControl/index.vue
@@ -134,7 +134,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
index 9312ad1..e69e4bd 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
@@ -218,7 +218,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue
index de7783e..e6902bb 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue
@@ -251,7 +251,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
index 5569e20..8001dfa 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
@@ -206,7 +206,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue
index 3085a82..3636dce 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue
@@ -245,7 +245,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/index.vue b/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/index.vue
index 64b79ba..5b47ba9 100644
--- a/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/index.vue
+++ b/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/index.vue
@@ -165,7 +165,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
diff --git a/src/views/backOfficeSystem/ExcavationResearch/WarningModel/index.vue b/src/views/backOfficeSystem/ExcavationResearch/WarningModel/index.vue
index f02da4c..75aadbc 100644
--- a/src/views/backOfficeSystem/ExcavationResearch/WarningModel/index.vue
+++ b/src/views/backOfficeSystem/ExcavationResearch/WarningModel/index.vue
@@ -95,7 +95,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
diff --git a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue
index a04c13c..e391ee9 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue
@@ -184,7 +184,7 @@ const onSearch = (val) =>{
}
const changeNo = (val) =>{
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList()
}
const changeSize = (val) =>{
diff --git a/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index.vue b/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index.vue
index cc5fdd6..a80c206 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index.vue
@@ -136,7 +136,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index.vue b/src/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index.vue
index 149309f..86a2d83 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index.vue
@@ -115,7 +115,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index.vue b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index.vue
index 89a669d..b44e438 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index.vue
@@ -201,7 +201,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue b/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue
index d7eb0a0..c9c50b2 100644
--- a/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue
@@ -177,7 +177,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/IntelligentControl/DeploymentArea/index.vue b/src/views/backOfficeSystem/IntelligentControl/DeploymentArea/index.vue
index 94f8f6d..b74fc3d 100644
--- a/src/views/backOfficeSystem/IntelligentControl/DeploymentArea/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/DeploymentArea/index.vue
@@ -148,7 +148,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index.vue b/src/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index.vue
index d1988a9..9ec94ea 100644
--- a/src/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index.vue
@@ -177,7 +177,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
index 09dc8be..d1fd587 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
@@ -153,7 +153,7 @@ const onSearch = (val) => {
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem.vue b/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem.vue
index 87f4e65..054618e 100644
--- a/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem.vue
@@ -70,9 +70,9 @@ const changetText = (type) => {
case "10":
return "处置";
case "20":
- return "提醒";
- case "30":
return "关注";
+ case "30":
+ return "提醒";
case "40":
return "不关注";
default:
diff --git a/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue
index f1391a3..a700adc 100644
--- a/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue
@@ -161,9 +161,9 @@ const init = () =>{
}]
})
// 布控区域统计
- list.YjczDate.RylxDate = true;
+ list.RylxDate.loading = true;
qcckGet({},'/mosty-gsxt/tbGsxtBkQy/getBkQytj').then(res=>{
- list.YjczDate.RylxDate = false;
+ list.RylxDate.loading = false;
list.RylxDate.xDate = res.map(item=>item.qymc);
list.RylxDate.list = [{
value: res.map(item=>item.num),
@@ -173,9 +173,9 @@ const init = () =>{
})
// 感知元统计
- list.GzyDate.RylxDate = true;
+ list.GzyDate.loading= true;
qcckGet({},'/mosty-jmxf/tbYjxx/getGzyTj').then(res=>{
- list.GzyDate.RylxDate = false;
+ list.GzyDate.loading = false;
list.GzyDate.xDate = res.map(item=>item.yj_gzymc);
list.GzyDate.list = [{
value: res.map(item=>item.num),
diff --git a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue
index 38abbbd..de4ccc5 100644
--- a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue
@@ -126,7 +126,7 @@ import * as MOSTY from "@/components/MyComponents/index";
};
const changeNo = (val) => {
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
index ef43b9c..99cac37 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
@@ -187,7 +187,7 @@ const onSearch = (val) =>{
}
const changeNo = (val) =>{
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList()
}
const changeSize = (val) =>{
diff --git a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index.vue b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index.vue
index 82d4f72..2d6ce86 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index.vue
@@ -105,7 +105,7 @@ const onSearch = (val) =>{
}
const changeNo = (val) =>{
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList()
}
const changeSize = (val) =>{
diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue
index 53a6bad..a7e39ca 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue
@@ -137,7 +137,7 @@ const onSearch = (val) =>{
}
const changeNo = (val) =>{
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList()
}
const changeSize = (val) =>{
diff --git a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue
index ab2b10c..8222fb5 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue
@@ -179,7 +179,7 @@ const addForm = (type, id) =>{
const changeNo = (val) => {
- // pageData.pageConfiger.pageNum = val;
+ // pageData.pageConfiger.pageCurrent = val;
// getListR();
};
const changeSize = (val) => {
diff --git a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue
index ca5f7fa..485ba74 100644
--- a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue
@@ -128,7 +128,7 @@ const onSearch = (val) =>{
// 分页
const changeNo = (val) =>{
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList()
}
// 页数
diff --git a/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue b/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue
index 236d901..eb1f139 100644
--- a/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue
@@ -126,7 +126,7 @@ const onSearch = (val) =>{
// 分页
const changeNo = (val) =>{
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList()
}
// 页数
diff --git a/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue b/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue
index fe0ba06..53fe613 100644
--- a/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue
@@ -115,7 +115,7 @@ const onSearch = (val) =>{
}
const changeNo = (val) =>{
- pageData.pageConfiger.pageNum = val;
+ pageData.pageConfiger.pageCurrent = val;
getList()
}
const changeSize = (val) =>{