Merge branch 'dev_third_stage'

# Conflicts: # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js
2022-07-05 15:34:57 +08:00
parent c3c3baefe5 89424f793f
commit 7ddac7eb75
100 changed files with 2523 additions and 352 deletions
@@ -200,6 +200,7 @@
              show-size-changer
              :page-size.sync="pageSize"
              :total="total"
+              :current="pageNo"
              @change="pageOnChange"
              @showSizeChange="SizeChange"
            />
@@ -80,6 +80,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -73,6 +73,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="onChange"
          @showSizeChange="SizeChange"
        />
@@ -96,6 +96,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />