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
@@ -272,6 +272,7 @@
          show-quick-jumper
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="pageOnChange"
        />
      </div>
@@ -33,6 +33,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="onChange"
          @showSizeChange="SizeChange"
        />
@@ -28,6 +28,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -28,6 +28,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -28,6 +28,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -25,6 +25,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -23,6 +23,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />