首页文字修改

数据查询bug修复

src/components/Currency/DataTable/MetadataListContainer.vue

@@ -69,6 +69,8 @@
           changePage: changePage,
           modelParams: params,
           type: type,
+          currentPage: currentPage,
+          pageSize: pageSize,
         }"
       ></MetadataList>
     </el-main>
@@ -256,10 +258,12 @@ export default {
       };
       obj = Object.assign(obj, this.params);
       that.tableLoading = true;
+      const loading  = this.$createLoading("数据查询中，请稍后！");
       api
         .getContentListByModelId(obj)
         .then(function (result) {
           that.tableLoading = false;
+          loading.close();
           if (result.code == 200) {
             that.dataTotal = result.total;
             that.tableData = result.content;
@@ -277,6 +281,7 @@ export default {
           }
         })
         .catch((err) => {
+          loading.close();
           that.tableData = [];
           that.dataTotal = 0;
           that.tableLoading = false;
@@ -500,6 +505,7 @@ ${element.cityName}${element.countyName}：
   },
   watch: {
     params(newVal, oldVal) {
+      this.currentPage = 0;
       this.searchData();
     },
   },

src/components/Currency/DataTable/MetadataListContainer/MetadataList.vue

@@ -290,8 +290,8 @@
           background
           @current-change="handleCurrentChange"
           @size-change="handlePagesizeChange"
-          :current-page.sync="currentPage"
-          :page-size="pageSize"
+          :current-page.sync="currentPageZ"
+          :page-size="pageSizeZ"
           layout="prev, pager, next, sizes, jumper"
           :total="dataTotal"
         ></el-pagination>
@@ -333,6 +333,18 @@ export default {
     type: {
       type: Number,
     },
+    currentPage: {
+      type: Number,
+      default: function () {
+        return 0;
+      },
+    },
+    pageSize: {
+      type: Number,
+      default: function () {
+        return 20;
+      },
+    },
   },
   data() {
     return {
@@ -342,8 +354,8 @@ export default {
       formData: {},
 
       renderData: [],
-      currentPage: 1,
-      pageSize: 20,
+      currentPageZ: this.currentPage,
+      pageSizeZ: this.pageSize,
       tableMaxHeight: 200,
 
       selectedNum: 0,
@@ -487,6 +499,7 @@ export default {
       immediate: true,
       handler: function (newVal, oldVal) {
         this.renderData = newVal;
+        this.currentPageZ = this.currentPage + 1;
       },
     },
   },

src/views/ComprehensiveDisplay.vue

@@ -197,29 +197,29 @@
         <div class="dataNumberContainer" v-if="statisticsData != null">
           <el-row>
             <el-col :span="3"> <p></p> </el-col>
-            <el-col :span="6">图层总量：</el-col>
-            <el-col :span="15"
+            <el-col :span="9">图层总量：</el-col>
+            <el-col :span="12"
               >{{ statisticsData.modelCount }} <span>条</span>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3"><p></p></el-col>
-            <el-col :span="6">数据总量：</el-col>
-            <el-col :span="15"
+            <el-col :span="9">数据总量：</el-col>
+            <el-col :span="12"
               >{{ statisticsData.modelDataCount }} <span>条</span>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3"><p></p></el-col>
-            <el-col :span="6">导入数据：</el-col>
-            <el-col :span="15"
+            <el-col :span="9">历史导入数据：</el-col>
+            <el-col :span="12"
               >{{ statisticsData.importDataNumber }} <span>条</span>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3"><p></p></el-col>
-            <el-col :span="6">接口调用：</el-col>
-            <el-col :span="15"
+            <el-col :span="9">接口调用：</el-col>
+            <el-col :span="12"
               >{{ statisticsData.callInterNumber }} <span>次</span>
             </el-col>
           </el-row>