Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/views/Business/BusRouter.js

@@ -316,9 +316,9 @@ import Infptm from "~/views/Statics/Ptm/views/Infptm"
 import Dbiptm from "~/views/Statics/Ptm/views/Dbiptm"
 import Dbeptm from "~/views/Statics/Ptm/views/Dbeptm"
 
-import Infpts from "~/views/Statics/Pts/views/Infpts"
-import Dbipts from "~/views/Statics/Pts/views/Dbipts"
-import Dbepts from "~/views/Statics/Pts/views/Dbepts"
+// import Infpts from "~/views/Statics/Pts/views/Infpts"
+// import Dbipts from "~/views/Statics/Pts/views/Dbipts"
+// import Dbepts from "~/views/Statics/Pts/views/Dbepts"
 
 import Inflgb from "~/views/Statics/Lgb/views/Inflgb"
 import Dbilgb from "~/views/Statics/Lgb/views/Dbilgb"
@@ -718,9 +718,9 @@ const BusRouter = [
     { path: 'infptm', component:Infptm, name: 'StaticsInfptm', meta: { title: '银行密押查询' } },
     { path: 'dbeptm/:inr', component: Dbeptm, name: 'StaticsDbeptm', meta: { title: (tag) => { return '银行密押更新: ' + tag.params.inr } } },
 
-    { path: 'Infpts', component: Infpts, name: 'StaticsInfpts', meta: { title: '客户管户机构管理查询' } },
-    { path: 'dbipts/:extkey', component: Dbipts, name: 'StaticsDbipts', meta: { title: (tag) => { return '客户更新详情: ' + tag.params.extkey } } },
-    { path: 'dbepts/:extkey', component: Dbipts, name: 'StaticsDbepts', meta: { title: (tag) => { return '客户信息修改: ' + tag.params.extkey } } },
+    // { path: 'Infpts', component: Infpts, name: 'StaticsInfpts', meta: { title: '客户管户机构管理查询' } },
+    // { path: 'dbipts/:extkey', component: Dbipts, name: 'StaticsDbipts', meta: { title: (tag) => { return '客户更新详情: ' + tag.params.extkey } } },
+    // { path: 'dbepts/:extkey', component: Dbipts, name: 'StaticsDbepts', meta: { title: (tag) => { return '客户信息修改: ' + tag.params.extkey } } },
 
     { path: 'infapf', component: Infapf, name: 'StaticsInfapf', meta: { title: '报文格式信息查询' } },
     { path: 'dbaapf', component: Dbaapf, name: 'StaticsDbaapf', meta: { title: '报文格式信息新增' } },

src/views/Statics/Oit/views/Infoit/infsea.vue

@@ -195,7 +195,7 @@ export default {
         this.oitData = list
         this.model.pageNum = res.pageNumber
         this.model.pageSize = res.pageSize
-        this.model.total = res.total
+        this.model.total = parseInt(res.total)
       })
     },
     queryFunc(pageNumber, pageSize) {

src/views/Statics/Ptm/views/Infptm/Infsea.vue

@@ -170,7 +170,7 @@ export default {
         this.ptmData = list;
         this.model.pageNum = res.pageNumber;
         this.model.pageSize = res.pageSize;
-        this.model.total = res.total;
+        this.model.total = parseInt(res.total);
       });
     },
     queryFunc(pageNumber, pageSize) {

src/views/Statics/Pts/views/Infpts/Infsea.vue

@@ -146,7 +146,7 @@ export default {
         window.console.log(list);
         this.model.pageNum = res.pageNumber
         this.model.pageSize = res.pageSize
-        this.model.total = res.total
+        this.model.total = parseInt(res.total)
       }) 
 
     },

src/views/Statics/Pty/views/Infpty/Infsea.vue

@@ -313,7 +313,7 @@ export default {
         this.ptyData = list
         this.model.pageNum = res.pageNumber
         this.model.pageSize = res.pageSize
-        this.model.total = res.total
+        this.model.total = parseInt(res.total)
       }) 
 		},
     queryFunc(pageNumber, pageSize) {

src/views/Statics/Smh/views/Infsmh/Infsea.vue

@@ -183,7 +183,7 @@ export default {
         this.smhData = list;
         this.model.pageNum = res.pageNumber;
         this.model.pageSize = res.pageSize;
-        this.model.total = res.total;
+        this.model.total = parseInt(res.total);
       });
     },
     queryFunc(pageNumber, pageSize) {

src/views/Statics/StaticsRouter.js

@@ -51,9 +51,9 @@ import Infptm from "./Ptm/views/Infptm"
 import Dbiptm from "./Ptm/views/Dbiptm"
 import Dbeptm from "./Ptm/views/Dbeptm"
 
-import Infpts from "./Pts/views/Infpts"
-import Dbipts from "./Pts/views/Dbipts"
-import Dbepts from "./Pts/views/Dbepts"
+// import Infpts from "./Pts/views/Infpts"
+// import Dbipts from "./Pts/views/Dbipts"
+// import Dbepts from "./Pts/views/Dbepts"
 
 
 
@@ -270,9 +270,9 @@ const StaticsRouter = [
     { path: 'infptm', component:Infptm, name: 'StaticsInfptm', meta: { title: '银行密押查询' } },
     { path: 'dbeptm/:inr', component: Dbeptm, name: 'StaticsDbeptm', meta: { title: (tag) => { return '银行密押更新: ' + tag.params.inr } } },
 
-    { path: 'Infpts', component: Infpts, name: 'StaticsInfpts', meta: { title: '客户管户机构管理' } },
-    { path: 'dbipts/:extkey', component: Dbipts, name: 'StaticsDbipts', meta: { title: (tag) => { return '客户更新详情: ' + tag.params.extkey } } },
-    { path: 'dbepts/:extkey', component: Dbipts, name: 'StaticsDbepts', meta: { title: (tag) => { return '客户信息修改: ' + tag.params.extkey } } },
+    // { path: 'Infpts', component: Infpts, name: 'StaticsInfpts', meta: { title: '客户管户机构管理' } },
+    // { path: 'dbipts/:extkey', component: Dbipts, name: 'StaticsDbipts', meta: { title: (tag) => { return '客户更新详情: ' + tag.params.extkey } } },
+    // { path: 'dbepts/:extkey', component: Dbipts, name: 'StaticsDbepts', meta: { title: (tag) => { return '客户信息修改: ' + tag.params.extkey } } },
 
     { path: 'inffec', component: Inffec, name: 'StaticsInffec', meta: { title: '费率查询' } },
     { path: 'dbafec', component: Dbafec, name: 'StaticsDbafec', meta: { title: '费率新增' } },

src/views/Statics/btb/views/Infbtb/Infsea.vue

@@ -141,7 +141,7 @@ export default {
         this.btbData = list
         this.model.pageNum = res.pageNumber
         this.model.pageSize = res.pageSize
-        this.model.total = res.total
+        this.model.total = parseInt(res.total)
       }) 
 		},
     queryFunc(pageNumber, pageSize) {

src/views/Statics/cty/views/Infcty/Infsea.vue

@@ -39,7 +39,7 @@
       <c-paging-table 
         :data="ctyData"
         :columns="ctyColumns"
-        :pageNumber="model.pageNumber"
+        :pageNumber="model.pageNum"
         :pageSize="model.pageSize"
         :total="model.total"
         v-on:queryFunc="queryFunc"
@@ -138,7 +138,7 @@ export default {
         this.ctyData = list
         this.model.pageNum = res.pageNumber
         this.model.pageSize = res.pageSize
-        this.model.total = res.total
+        this.model.total = parseInt(res.total)
       }) 
 		},
     queryFunc(pageNumber, pageSize) {

src/views/Statics/cur/views/Infcur/Infsea.vue

@@ -110,7 +110,7 @@ export default {
         this.curData = list
         this.model.pageNum = res.pageNumber
         this.model.pageSize = res.pageSize
-        this.model.total = res.total
+        this.model.total = parseInt(res.total)
       })
     },
     // async onInfbutSearow() {

src/views/Statics/dia/views/Infdia/Infsea.vue

@@ -166,7 +166,7 @@ export default {
         this.diaData = list
         this.model.pageNum = res.pageNumber
         this.model.pageSize = res.pageSize
-        this.model.total = res.total
+        this.model.total = parseInt(res.total)
       })
     },
     queryFunc(pageNumber, pageSize) {

src/views/Statics/ety/views/Infety/Infsea.vue

@@ -157,7 +157,7 @@ export default {
         this.etyData = list
         this.model.pageNum = res.pageNumber
         this.model.pageSize = res.pageSize
-        this.model.total = res.total
+        this.model.total = parseInt(res.total)
       }) 
 		},
     queryFunc(pageNumber, pageSize) {

vue.config.js

@@ -72,13 +72,15 @@ module.exports = {
       },
       '/gjjs/service/': {
         // target: 'http://192.168.0.134:9999',//钱煜
-        target: 'http://192.168.0.8:9999',//曹志寻
+        // target: 'http://192.168.0.8:9999',//曹志寻
+        // target: 'http://192.168.0.223:9999',//曹志寻
         //target: 'http://192.168.0.146:9999',//张厚
         // target: 'http://192.168.0.28:9999',//李少勇
         //target: 'http://192.168.0.110:10025',//服务器
         // target: 'http://192.168.0.29:9999',//万平
         // target: 'http://192.168.0.42:9999',//胡希
         // target: 'http://192.168.0.136:9999',//张立鼎
+        target: 'http://127.0.0.1:9999',
         changeOrigin: true,
         pathRewrite: {
           '^/gjjs/service': '/gjjs/service'