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

src/page/Funds/FundsRouter.js

@@ -2,18 +2,18 @@ const BusRouter = [
   { path: 'inffxd', component: () => import("./Inffxd/views"), name: 'Inffxd', meta: { title: '资结售汇报表交易查询' }, module: 'Funds' },
   { path: 'infftd', component: () => import("./Infftd1/views"), name: 'Infftd1', meta: { title: '资金拆借/头寸调拨报表交易查询' }, module: 'Funds' },
   { path: 'fttatt', component: () => import("./Fttatt/views"), name: 'Fttatt', meta: { title: 'Fttatt' }, module: 'Funds' },
-  { path: 'fttfcm', component: () => import("./Fttfcm/views"), name: 'Fttfcm', meta: { title: 'Fttfcm' }, module: 'Funds' },
-  { path: 'fttfcn', component: () => import("./Fttfcn/views"), name: 'Fttfcn', meta: { title: 'Fttfcn' }, module: 'Funds' },
-  { path: 'fttfee', component: () => import("./Fttfee/views"), name: 'Fttfee', meta: { title: 'Fttfee' }, module: 'Funds' },
-  { path: 'fttfmt', component: () => import("./Fttfmt/views"), name: 'Fttfmt', meta: { title: 'Fttfmt' }, module: 'Funds' },
-  { path: 'fttfre', component: () => import("./Fttfre/views"), name: 'Fttfre', meta: { title: 'Fttfre' }, module: 'Funds' },
-  { path: 'fttpcm', component: () => import("./Fttpcm/views"), name: 'Fttpcm', meta: { title: 'Fttpcm' }, module: 'Funds' },
-  { path: 'fttpcn', component: () => import("./Fttpcn/views"), name: 'Fttpcn', meta: { title: 'Fttpcn' }, module: 'Funds' },
+  { path: 'fttfcm', component: () => import("./Fttfcm/views"), name: 'Fttfcm', meta: { title: '资金定存拆借登记及确认交易' }, module: 'Funds' },
+  { path: 'fttfcn', component: () => import("./Fttfcn/views"), name: 'Fttfcn', meta: { title: '定存拆借销账交易' }, module: 'Funds' },
+  { path: 'fttfee', component: () => import("./Fttfee/views"), name: 'Fttfee', meta: { title: '费用结算' }, module: 'Funds' },
+  { path: 'fttfmt', component: () => import("./Fttfmt/views"), name: 'Fttfmt', meta: { title: '定存拆借到期交易' }, module: 'Funds' },
+  { path: 'fttfre', component: () => import("./Fttfre/views"), name: 'Fttfre', meta: { title: '拆借函电往来' }, module: 'Funds' },
+  { path: 'fttpcm', component: () => import("./Fttpcm/views"), name: 'Fttpcm', meta: { title: '头寸调拨登记确认交易' }, module: 'Funds' },
+  { path: 'fttpcn', component: () => import("./Fttpcn/views"), name: 'Fttpcn', meta: { title: '头寸调拨销账交易' }, module: 'Funds' },
   { path: 'fxtatt', component: () => import("./Fxtatt/views"), name: 'Fxtatt', meta: { title: 'Fxtatt' }, module: 'Funds' },
   { path: 'fxteop', component: () => import("./Fxteop/views"), name: 'Fxteop', meta: { title: '代客外汇买卖录入' }, module: 'Funds' },
   { path: 'fxteqo', component: () => import("./Fxteqo/views"), name: 'Fxteqo', meta: { title: '代客外汇买卖报价' }, module: 'Funds' },
-  { path: 'fxtfcm', component: () => import("./Fxtfcm/views"), name: 'Fxtfcm', meta: { title: 'Fxtfcm' }, module: 'Funds' },
-  { path: 'fxtfcn', component: () => import("./Fxtfcn/views"), name: 'Fxtfcn', meta: { title: 'Fxtfcn' }, module: 'Funds' },
+  { path: 'fxtfcm', component: () => import("./Fxtfcm/views"), name: 'Fxtfcm', meta: { title: '外币兑换平盘登记' }, module: 'Funds' },
+  { path: 'fxtfcn', component: () => import("./Fxtfcn/views"), name: 'Fxtfcn', meta: { title: '外币兑换平盘销账' }, module: 'Funds' },
   {
     path: "fxtfop",
     component: () => import("./Fxtfop/views"),
@@ -21,8 +21,8 @@ const BusRouter = [
     meta: { title: "外币兑换平盘登记" },
     module: "Funds",
   },
-  { path: 'fxtlcm', component: () => import("./Fxtlcm/views"), name: 'Fxtlcm', meta: { title: 'Fxtlcm' }, module: 'Funds' },
-  { path: 'fxtlcn', component: () => import("./Fxtlcn/views"), name: 'Fxtlcn', meta: { title: 'Fxtlcn' }, module: 'Funds' },
+  { path: 'fxtlcm', component: () => import("./Fxtlcm/views"), name: 'Fxtlcm', meta: { title: '结售汇平盘确认交易' }, module: 'Funds' },
+  { path: 'fxtlcn', component: () => import("./Fxtlcn/views"), name: 'Fxtlcn', meta: { title: '结售汇平盘销账交易' }, module: 'Funds' },
   {
     path: "fxtlop",
     component: () => import("./Fxtlop/views"),
@@ -30,8 +30,8 @@ const BusRouter = [
     meta: { title: "结售汇平盘登记" },
     module: "Funds",
   },
-  { path: 'fxtssb', component: () => import("./Fxtssb/views"), name: 'Fxtssb', meta: { title: 'Fxtssb' }, module: 'Funds' },
-  { path: 'fxtsss', component: () => import("./Fxtsss/views"), name: 'Fxtsss', meta: { title: 'Fxtsss' }, module: 'Funds' },
+  { path: 'fxtssb', component: () => import("./Fxtssb/views"), name: 'Fxtssb', meta: { title: '即期结汇交易' }, module: 'Funds' },
+  { path: 'fxtsss', component: () => import("./Fxtsss/views"), name: 'Fxtsss', meta: { title: '即期售汇交易' }, module: 'Funds' },
   { path: 'fxtsqo', component: () => import("./Fxtsqo/views"), name: 'Fxtsqo', meta: { title: '结售汇报价' }, module: 'Funds' },
 ];
 export default BusRouter

src/page/Home/Header/header.vue

@@ -361,27 +361,29 @@ export default {
 					})
 					return
 				}
-        this.poin_initManage(
-          { id: "logout" },
-          (response, responseData, messageObj) => {
-            if (response && response.ok) {
-              // 删除session
-              sessionStorage.clear();
-              if (JSON.parse(responseData).responseText != "iam") {
-                // 非IAM登陆
-                // 跳转到登陆页
-                this.$router.replace("/login");
-              } else {
-                window.opener = "";
-                window.open("", "_self");
-                window.close();
-              }
-            }
-          },
-          messageObj => {
-            messageObj.responseType = "text/html";
-          }
-        );
+        // this.poin_initManage(
+        //   { id: "logout" },
+        //   (response, responseData, messageObj) => {
+        //     if (response && response.ok) {
+        //       // 删除session
+        //       sessionStorage.clear();
+        //       if (JSON.parse(responseData).responseText != "iam") {
+        //         // 非IAM登陆
+        //         // 跳转到登陆页
+        //         this.$router.replace("/login");
+        //       } else {
+        //         window.opener = "";
+        //         window.open("", "_self");
+        //         window.close();
+        //       }
+        //     }
+        //   },
+        //   messageObj => {
+        //     messageObj.responseType = "text/html";
+        //   }
+        // );
+        sessionStorage.clear();
+        this.$router.replace("/login");
       } else if ("setPassWord" == param) {
         //修改密码
         this.openPassWord = true;