Browse Source

Merge branch 'msg-sever' of http://39.106.8.246:3003/web/ibms into msg-sever

LXXXY 5 years ago
parent
commit
c6c1833150

+ 1 - 1
src/api/httputils.js

@@ -7,7 +7,7 @@ var cancel
 
 // 创建axios实例
 const axiosservice = axios.create({
-    timeout: 30000, // 请求超时时间
+    timeout: 3000000, // 请求超时时间
     retry: 4, //重新请求次数
     retryDelay: 1000, //重新请求的间隔
     credentials: true, // 接口每次请求会跨域携带cookie

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

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

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

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

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

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

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

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

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

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

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

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

+ 3 - 3
src/components/ledger/handsontables/device.vue

@@ -2,9 +2,9 @@
   <div style="height: calc(100% - 44.5px);padding: 0px 10px 10px;box-sizing: border-box;">
     <div class="hanson-bar">
       <div style="float:right;overflow:hidden;">
-        <span style="width:20px;float:left;display:block;height:20px;cursor: pointer;" @click="changeAssetsFalg">
+        <!-- <span style="width:20px;float:left;display:block;height:20px;cursor: pointer;" @click="changeAssetsFalg">
           <i v-show="!onlyRead" class="el-icon-fa  el-icon-fa-compass"></i>
-        </span>
+        </span> -->
         <span>当前筛选条件下共{{page.total || '--'}}设备</span>
       </div>
       <el-select v-model="onlyRead" @change="getHeaderData(mess)" style="width:100px;margin-right:20px;vertical-align:bottom;">
@@ -208,7 +208,7 @@ export default {
       id: 0,
       onlyRead: true,
       showType: 'Visible',
-      linkNameFalg: false,
+      linkNameFalg: true,
       qrcodeUrl: "", //二维码图片地址
       loading: false,
       deviceType: {}, //族3位编码及名称

+ 1 - 1
src/fetch/fetch.js

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

+ 1 - 1
src/utils/httputils.js

@@ -7,7 +7,7 @@ var cancel
 
 // 创建axios实例
 const axiosservice = axios.create({
-    timeout: 30000, // 请求超时时间
+    timeout: 3000000, // 请求超时时间
     retry: 4, //重新请求次数
     retryDelay: 1000, //重新请求的间隔
     credentials: true, // 接口每次请求会跨域携带cookie