更新组件

src/components/ChooseList/ChooseMarks/index.vue

@@ -7,11 +7,11 @@
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="handleFilter">查询</el-button>
-          <el-button type="info" @click="reset()"> 重置 </el-button>
+          <el-button type="info" @click="reset"> 重置 </el-button>
         </el-form-item>
       </el-form>
       <div class="tabBox" :class="props.Single ? 'tabBoxRadio' : ''" style="margin-top: 0px">
-        <el-table ref="multipleUserRef" :key="keyTabel" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450">
+        <el-table ref="multipleUserRef" @selection-change="handleSelectionChange" :data="tableData" v-loading="loading" border :row-key="keyid" style="width: 100%" height="450">
           <el-table-column type="selection" width="55" :reserve-selection="true"/>
           <el-table-column prop="bqMc" align="center" label="标签名称"/>
           <el-table-column prop="bqDm" align="center" label="标签代码"/>
@@ -77,6 +77,7 @@ const props = defineProps({
     default: []
   }
 });
+const loading = ref(false)
 const total = ref(0);
 const listQuery = ref({
   pageCurrent: 1,
@@ -87,7 +88,6 @@ const multipleUserRef = ref(null);
 const multipleSelectionUser = ref([]);
 const tableData = ref([]);
 const emits = defineEmits(["update:modelValue", "choosed"]);
-const keyTabel = ref(0)
 const keyid = (row) => {
   return row.id;
 };
@@ -130,12 +130,15 @@ const handleCurrentChange = (currentPage) => {
   getListData();
 };
 const getListData = () => {
-  keyTabel.value++
+  loading.value = true;
-  const params = {bqLb:'02',...listQuery.vlue}
+  const params = { ...listQuery.value, bqLb:'02',}
   qcckGet(params,'/mosty-gsxt/tbGsxtBqgl/selectPage').then(res=>{
+    loading.value = false;
     tableData.value = res.records || [];
     total.value = res.total;
     multipleUser();
+  }).catch(()=>{
+    loading.value = false;
   })
 };
 

src/components/ChooseList/ChooseQt/index.vue

@@ -13,7 +13,7 @@
       </el-form-item>
     </el-form>
     <div class="tabBox" :class="props.Single ? 'tabBoxRadio' : ''" style="margin-top: 0px">
-    <el-table ref="multipleUserRef" :key="keyTabel" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450">
+    <el-table ref="multipleUserRef" v-loading="loading" :key="keyTabel" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450">
         <el-table-column type="selection" width="55" :reserve-selection="true"/>
         <el-table-column type="expand">
           <template #default="props">
@@ -98,6 +98,7 @@ const props = defineProps({
     default: []
   },
 });
+const loading = ref(false)
 const total = ref(0);
 const listQuery = ref({
   pageCurrent: 1,
@@ -152,11 +153,15 @@ const handleCurrentChange = (currentPage) => {
 };
 const getListData = () => {
   keyTabel.value++
-  const params = {...listQuery.vlue}
+  loading.value = true;
+  const params = {...listQuery.value}
   qcckGet(params,'/mosty-gsxt/tbGsxtZdqt/selectPage').then(res=>{
+    loading.value = false;
     tableData.value = res.records || [];
     total.value = res.total;
     multipleUser();
+  }).catch(()=>{
+    loading.value = false;
   })
 };
 

src/components/ChooseList/ChooseXs/index.vue

@@ -11,7 +11,7 @@
         </el-form-item>
       </el-form>
       <div class="tabBox" :class="props.Single ? 'tabBoxRadio' : ''" style="margin-top: 0px">
-        <el-table ref="multipleUserRef" :key="keyTabel" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450">
+        <el-table ref="multipleUserRef" v-loading="loading" :key="keyTabel" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450">
           <el-table-column type="selection" width="55" :reserve-selection="true"/>
           <el-table-column prop="xsBh" align="center" label="线索编号"/>
           <el-table-column prop="xsMc" align="center" label="线索名称"/>
@@ -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;
   })
 };
 

src/components/ChooseList/ChooseZdr/index.vue

@@ -20,7 +20,7 @@
         </el-form-item>
     </el-form>
     <div class="tabBox" :class="props.Single ? 'tabBoxRadio' : ''" style="margin-top: 0px">
-    <el-table ref="multipleUserRef" :key="keyTabel" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450">
+    <el-table ref="multipleUserRef" :key="keyTabel" v-loading="loading" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450">
         <el-table-column type="selection" width="55" :reserve-selection="true"/>
         <el-table-column prop="ryXm" align="center" label="姓名"/>
         <el-table-column prop="rySfzh" align="center" label="身份证"/>
@@ -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;
   })
 };
 

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) => {

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) => {

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) => {

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) => {

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) => {

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();
 };
 

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();
 };
 

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) =>{

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) => {

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) => {

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) => {

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) => {

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) => {

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) => {

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) => {

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:

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),

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) => {

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) =>{

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) =>{

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) =>{

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) => {

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()
 }
 // 页数

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()
 }
 // 页数

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) =>{