Merge remote-tracking branch 'origin/develop' into develop

src/pages/localTool/standardWarning.vue

@@ -326,8 +326,8 @@
                 :pageSize="pageConfig.oldStandPageSize"
                 :total="pageConfig.count4"
                 autoSize
-                @pageChange="page => handlePageChange('oldItems', page)"
-                @pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination>
+                @pageChange="page => handlePageChange('oldStand', page)"
+                @pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)"></pagination>
             </div>
           </div>
           <!--            </el-tab-pane>-->

src/sysConfig/index.js

@@ -6,9 +6,10 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.50'
-// const devIp = '62.234.136.153'
-const devInterfacePORT = '9999'
+// const devIp = '192.168.10.249'
+const devIp = '62.234.136.153'
+// const devInterfacePORT = '9999'
+const devInterfacePORT = '8033'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 // 配置 前端服务