TwoKe945 пре 1 година
родитељ
комит
eee7c1ee62

+ 3 - 3
app/src/views/Basic/components/jcxxCont.vue

@@ -319,7 +319,7 @@ export default {
     <!--  -->
     <div v-if="showFlag === 1">
       <basic-pagination
-        layout="->,prev, pager, next, sizes,jumper"
+        layout="total,->,prev, pager, next, sizes,jumper"
         :page-sizes="[10, 20, 50, 100]"
         :page-size="params.pageSize"
         :current-page="params.PageNum"
@@ -330,7 +330,7 @@ export default {
     </div>
     <div v-if="showFlag === 2">
       <basic-pagination
-        layout="->,prev, pager, next, sizes,jumper"
+        layout="total,->,prev, pager, next, sizes,jumper"
         :page-sizes="[10, 20, 50, 100]"
         :page-size="params2.pageSize"
         :current-page="params2.PageNum"
@@ -341,7 +341,7 @@ export default {
     </div>
     <div v-if="showFlag === 3">
       <basic-pagination
-        layout="->,prev, pager, next, sizes,jumper"
+        layout="total,->,prev, pager, next, sizes,jumper"
         :page-sizes="[10, 20, 50, 100]"
         :page-size="params3.pageSize"
         :current-page="params3.PageNum"

+ 1 - 1
app/src/views/Detail/components/GldwModalContent.vue

@@ -215,7 +215,7 @@ export default {
     </basic-table>
     <br />
     <basic-pagination
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params.pageSize"
       :current-page="params.PageNum"

+ 1 - 1
app/src/views/Detail/components/MaintenanceModalContent.vue

@@ -282,7 +282,7 @@ export default {
 
     <br />
     <basic-pagination
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params.pageSize"
       :current-page="params.PageNum"

+ 1 - 1
app/src/views/Detail/components/QhyyModalContent.vue

@@ -201,7 +201,7 @@ export default {
     </basic-table>
     <br />
     <basic-pagination
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params.pageSize"
       :current-page="params.PageNum"

+ 1 - 1
app/src/views/Detail/components/YhModalContent.vue

@@ -409,7 +409,7 @@ export default {
     </basic-table>
     <br />
     <basic-pagination
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params.pageSize"
       :current-page="params.PageNum"

+ 2 - 2
app/src/views/Detail/components/ZhxfModalContent.vue

@@ -232,7 +232,7 @@ export default {
     </basic-table>
     <br />
     <basic-pagination
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params.pageSize"
       :current-page="params.PageNum"
@@ -409,4 +409,4 @@ export default {
 ::v-deep(.el-date-editor .el-range__close-icon) {
   line-height: 24px !important;
 }
-</style>
+</style>

+ 2 - 2
app/src/views/Fire/components/GldwModalContent.vue

@@ -162,7 +162,7 @@
 			</el-table-column>
 		</basic-table>
 		<br />
-		<basic-pagination layout="->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
+		<basic-pagination layout="total,->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
 			:page-size="params.pageSize" :current-page="params.PageNum" :total="total" @size-change="handleSizeChange"
 			@current-change="handleCurrentChange" />
 	</div>
@@ -319,4 +319,4 @@
 		margin-right: 40px;
 		display: flex;
 	}
-</style>
+</style>

+ 4 - 4
app/src/views/Fire/components/higthList.vue

@@ -236,17 +236,17 @@
 		</div>
 		<br />
 		<div v-if="showFlag == 3">
-			<basic-pagination layout="->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
+			<basic-pagination layout="total,->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
 				:page-size="params.pageSize" :current-page="params.PageNum" :total="total"
 				@size-change="handleSizeChange" @current-change="handleCurrentChange" />
 		</div>
 		<div v-if="showFlag == 1">
-			<basic-pagination layout="->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
+			<basic-pagination layout="total,->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
 				:page-size="params1.pageSize" :current-page="params1.PageNum" :total="total"
 				@size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
 		</div>
 		<div v-if="showFlag == 2">
-			<basic-pagination layout="->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
+			<basic-pagination layout="total,->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
 				:page-size="params2.pageSize" :current-page="params2.PageNum" :total="total"
 				@size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
 		</div>
@@ -420,4 +420,4 @@
 		margin-right: 15px;
 		margin-bottom: 15px;
 	}
-</style>
+</style>

+ 2 - 2
app/src/views/FireCondition/components/hzfbCont.vue

@@ -222,7 +222,7 @@
 			</el-table-column>
 		</basic-table>
 		<br />
-		<basic-pagination layout="->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
+		<basic-pagination layout="total,->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
 			:page-size="params.pageSize" :current-page="params.PageNum" :total="total" @size-change="handleSizeChange"
 			@current-change="handleCurrentChange" />
 	</div>
@@ -370,4 +370,4 @@
 		justify-items: center;
 		line-height: 59px;
 	}
-</style>
+</style>

+ 2 - 2
app/src/views/FireCondition/components/hzfxCont.vue

@@ -276,7 +276,7 @@
 			</basic-table>
 		</div>
 		<br />
-		<basic-pagination layout="->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
+		<basic-pagination layout="total,->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
 			:page-size="params.pageSize" :current-page="params.PageNum" :total="total" @size-change="handleSizeChange"
 			@current-change="handleCurrentChange" />
 	</div>
@@ -449,4 +449,4 @@
 		margin-right: 15px;
 		margin-bottom: 15px;
 	}
-</style>
+</style>

+ 2 - 7
app/src/views/Home/components/BasicInfoModalContent.vue

@@ -294,13 +294,9 @@ export default {
       <el-table-column prop="wlw" label="物联网"> </el-table-column>
     </basic-table>
     <!-- 分页 -->
-    <div class="custom-pagination">
-      <div class="info">
-        <span>共 {{ total }} 条记录</span>
-        <span>第 {{ params.pageNum }} / {{ params.pageSize }} 页</span>
-      </div>
+    <br />
       <basic-pagination
-        layout="->,prev, pager, next, sizes,jumper"
+        layout="total,->,prev, pager, next, sizes,jumper"
         :page-sizes="[10, 20, 50, 100]"
         :page-size="params.pageSize"
         :current-page="params.PageNum"
@@ -308,7 +304,6 @@ export default {
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
       />
-    </div>
   </div>
 </template>
 

+ 3 - 8
app/src/views/Home/components/zzglModul.vue

@@ -214,13 +214,9 @@ export default {
       <el-table-column prop="dxjjqk" label="大修基金情况" show-overflow-tooltip>
       </el-table-column>
     </basic-table>
-    <div class="custom-pagination">
-      <div class="info">
-        <span>共 {{ total }} 条记录</span>
-        <span>第 {{ params.pageNum }} / {{ params.pageSize }} 页</span>
-      </div>
-      <basic-pagination
-        layout="->,prev, pager, next, sizes,jumper"
+    <br />
+    <basic-pagination
+        layout="total,->,prev, pager, next, sizes,jumper"
         :page-sizes="[10, 20, 50, 100]"
         :page-size="params.pageSize"
         :current-page="params.PageNum"
@@ -228,7 +224,6 @@ export default {
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
       />
-    </div>
   </div>
 </template>
 

+ 2 - 2
app/src/views/Iot/components/xfwlw.vue

@@ -170,7 +170,7 @@
 			</basic-table>
 		</div>
 		<br />
-		<basic-pagination layout="->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
+		<basic-pagination layout="total,->,prev, pager, next, sizes,jumper" :page-sizes="[10, 20, 50, 100]"
 			:page-size="params.pageSize" :current-page="params.PageNum" :total="total" @size-change="handleSizeChange"
 			@current-change="handleCurrentChange" />
 	</div>
@@ -343,4 +343,4 @@
 		margin-right: 15px;
 		margin-bottom: 15px;
 	}
-</style>
+</style>

+ 1 - 1
app/src/views/Risk/components/fxfbCont.vue

@@ -237,7 +237,7 @@ export default {
     </basic-table>
     <br />
     <basic-pagination
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params.pageSize"
       :current-page="params.PageNum"

+ 5 - 5
app/src/views/Risk/components/fxyjCont.vue

@@ -618,7 +618,7 @@ export default {
     <!-- 风险等级 -->
     <basic-pagination
     v-show="showFlag === 1"
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params.pageSize"
       :current-page="params.PageNum"
@@ -629,7 +629,7 @@ export default {
     <!-- 消防设施隐患 -->
     <basic-pagination
     v-show="showFlag === 2"
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params1.pageSize"
       :current-page="params1.PageNum"
@@ -640,7 +640,7 @@ export default {
     <!--生命通道 -->
     <basic-pagination
     v-show="showFlag === 3"
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params2.pageSize"
       :current-page="params2.PageNum"
@@ -651,7 +651,7 @@ export default {
     <!--用电用气 -->
     <basic-pagination
     v-show="showFlag === 4"
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params3.pageSize"
       :current-page="params3.PageNum"
@@ -662,7 +662,7 @@ export default {
     <!--消防管理隐患 -->
     <basic-pagination
       v-show="showFlag === 5"
-      layout="->,prev, pager, next, sizes,jumper"
+      layout="total,->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params4.pageSize"
       :current-page="params4.PageNum"