zhangyu 5 éve
szülő
commit
20908b6d3c

+ 1 - 1
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -172,12 +172,12 @@ export default {
     },
     },
     // 改变pagesize
     // 改变pagesize
     handleSizeChange(pageSize) {
     handleSizeChange(pageSize) {
+      this.page.pageNumber = 1
       this.page.pageSize = pageSize;
       this.page.pageSize = pageSize;
       this.getTableData()
       this.getTableData()
     },
     },
     // 改变pageno
     // 改变pageno
     handleCurrentChange(pageNo) {
     handleCurrentChange(pageNo) {
-      this.page.pageNumber = 1
       this.page.pageNumber = pageNo;
       this.page.pageNumber = pageNo;
       this.getTableData()
       this.getTableData()
     }
     }

+ 1 - 1
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -200,12 +200,12 @@ export default {
     },
     },
     // 改变pagesize
     // 改变pagesize
     handleSizeChange(pageSize) {
     handleSizeChange(pageSize) {
+      this.page.pageNumber = 1
       this.page.pageSize = pageSize;
       this.page.pageSize = pageSize;
       this.getTableData()
       this.getTableData()
     },
     },
     // 改变pageno
     // 改变pageno
     handleCurrentChange(pageNo) {
     handleCurrentChange(pageNo) {
-      this.page.pageNumber = 1
       this.page.pageNumber = pageNo;
       this.page.pageNumber = pageNo;
       this.getTableData()
       this.getTableData()
     }
     }

+ 1 - 1
src/components/data_admin/buildTask/table/modelTable.vue

@@ -190,12 +190,12 @@ export default {
     },
     },
     // 改变pagesize
     // 改变pagesize
     handleSizeChange(pageSize) {
     handleSizeChange(pageSize) {
+      this.page.pageNumber = 1
       this.page.pageSize = pageSize;
       this.page.pageSize = pageSize;
       this.getTableData()
       this.getTableData()
     },
     },
     // 改变pageno
     // 改变pageno
     handleCurrentChange(pageNo) {
     handleCurrentChange(pageNo) {
-      this.page.pageNumber = 1
       this.page.pageNumber = pageNo;
       this.page.pageNumber = pageNo;
       this.getTableData()
       this.getTableData()
     }
     }

+ 1 - 1
src/components/data_admin/buildTask/table/replaceTable.vue

@@ -154,12 +154,12 @@ export default {
     },
     },
     // 改变pagesize
     // 改变pagesize
     handleSizeChange(pageSize) {
     handleSizeChange(pageSize) {
+      this.page.pageNumber = 1
       this.page.pageSize = pageSize;
       this.page.pageSize = pageSize;
       this.getTableData()
       this.getTableData()
     },
     },
     // 改变pageno
     // 改变pageno
     handleCurrentChange(pageNo) {
     handleCurrentChange(pageNo) {
-      this.page.pageNumber = 1
       this.page.pageNumber = pageNo;
       this.page.pageNumber = pageNo;
       this.getTableData()
       this.getTableData()
     }
     }

+ 1 - 1
src/components/data_admin/buildTask/table/tearTable.vue

@@ -154,12 +154,12 @@ export default {
     },
     },
     // 改变pagesize
     // 改变pagesize
     handleSizeChange(pageSize) {
     handleSizeChange(pageSize) {
+      this.page.pageNumber = 1
       this.page.pageSize = pageSize;
       this.page.pageSize = pageSize;
       this.getTableData()
       this.getTableData()
     },
     },
     // 改变pageno
     // 改变pageno
     handleCurrentChange(pageNo) {
     handleCurrentChange(pageNo) {
-      this.page.pageNumber = 1
       this.page.pageNumber = pageNo;
       this.page.pageNumber = pageNo;
       this.getTableData()
       this.getTableData()
     }
     }

+ 4 - 4
src/components/data_admin/buildTask/taskStatistics.vue

@@ -15,19 +15,19 @@
     </div>
     </div>
 		<ul class="statistics-list flex-row">
 		<ul class="statistics-list flex-row">
       <li>
       <li>
-        <p class="statistics-list-text">未找到设备:</p>
+        <p class="statistics-list-text">现场未找到(需人工确认):</p>
         <p class="statistics-list-num">{{notFoundCount}}</p>
         <p class="statistics-list-num">{{notFoundCount}}</p>
       </li>
       </li>
       <li>
       <li>
-        <p class="statistics-list-text">未完成验证任务:</p>
+        <p class="statistics-list-text">验证任务:</p>
         <p class="statistics-list-num">{{waitCount}}</p>
         <p class="statistics-list-num">{{waitCount}}</p>
       </li>
       </li>
       <li>
       <li>
-        <p class="statistics-list-text">未完成撕码任务:</p>
+        <p class="statistics-list-text">撕码任务:</p>
         <p class="statistics-list-num">{{waitTearCount}}</p>
         <p class="statistics-list-num">{{waitTearCount}}</p>
       </li>
       </li>
       <li>
       <li>
-        <p class="statistics-list-text">未完成换码任务:</p>
+        <p class="statistics-list-text">换码任务:</p>
         <p class="statistics-list-num">{{waitReplaceCount}}</p>
         <p class="statistics-list-num">{{waitReplaceCount}}</p>
       </li>
       </li>
     </ul>
     </ul>

+ 1 - 1
src/fetch/fetch.js

@@ -6,7 +6,7 @@ const instance = axios.create({
     headers: {
     headers: {
         "Content-Type": "application/json"
         "Content-Type": "application/json"
     },
     },
-    timeout: 30000,
+    timeout: 3000000,
     retry: 4, //重新请求次数
     retry: 4, //重新请求次数
     retryDelay: 1000, //重新请求的间隔
     retryDelay: 1000, //重新请求的间隔
 })
 })