Merge branch 'mtp_v6' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB into mtp_v6

src/layout/components/top.vue

@@ -1,19 +1,25 @@
 <template>
-  <a-layout :class="['layout-top', isBottom ? 'layout-top-bottom' : 'layout-top-no-bottom']">
-    <a-layout-header class="m-layout-header">
-      <Header />
-    </a-layout-header>
-    <a-layout class="middleLayout">
-      <a-layout-sider class="m-layout-left" width="160" v-model:collapsed="collapsed" @collapse="collapse" collapsible>
-        <Menu @chooseMenu="chooseMenu" :collapsed="collapsed" />
-      </a-layout-sider>
-      <a-layout-content :style="{ background: '#0E0E0F', flex: 1 }">
-        <!-- <Drawer :title="'挂牌'" :visible="visible"></Drawer> -->
-        <!-- <Main /> -->
-        <router-view />
-      </a-layout-content>
+    <a-layout :class="['layout-top', isBottom ? 'layout-top-bottom' : 'layout-top-no-bottom']">
+        <a-layout-header class="m-layout-header">
+            <Header />
+        </a-layout-header>
+        <a-layout class="middleLayout">
+            <a-layout-sider
+                class="m-layout-left"
+                width="160"
+                v-model:collapsed="collapsed"
+                @collapse="collapse"
+                collapsible
+            >
+                <Menu @chooseMenu="chooseMenu" :collapsed="collapsed" />
+            </a-layout-sider>
+            <a-layout-content :style="{ background: '#0E0E0F', flex: 1 }">
+                <!-- <Drawer :title="'挂牌'" :visible="visible"></Drawer> -->
+                <!-- <Main /> -->
+                <router-view />
+            </a-layout-content>
+        </a-layout>
     </a-layout>
-  </a-layout>
 </template>
 <script lang="ts">
 import { defineComponent, ref, provide } from 'vue';
@@ -70,7 +76,7 @@ export default defineComponent({
                     name = value.children[0].code;
                     index.value = ['0'];
                 } else {
-                    router.push({ name: '404' });
+                    router.push({ name: 'home' });
                     return;
                 }
             } else {
@@ -317,8 +323,15 @@ export default defineComponent({
         .inlineflex;
     }
     .ant-menu-inline-collapsed > .ant-menu-item,
-    .ant-menu-inline-collapsed > .ant-menu-item-group > .ant-menu-item-group-list > .ant-menu-item,
-    .ant-menu-inline-collapsed > .ant-menu-item-group > .ant-menu-item-group-list > .ant-menu-submenu > .ant-menu-submenu-title,
+    .ant-menu-inline-collapsed
+        > .ant-menu-item-group
+        > .ant-menu-item-group-list
+        > .ant-menu-item,
+    .ant-menu-inline-collapsed
+        > .ant-menu-item-group
+        > .ant-menu-item-group-list
+        > .ant-menu-submenu
+        > .ant-menu-submenu-title,
     .ant-menu-inline-collapsed > .ant-menu-submenu > .ant-menu-submenu-title {
         padding: 0 20px !important;
     }

src/router/index.ts

@@ -4,10 +4,10 @@ import Layout from '@/layout/index.vue';
 import { globalDataRefresh } from '@/services/bus';
 import { isLogin, login } from '@/services/bus/login';
 import { localStorageUtil } from '@/utils/storage';
+import { message } from 'ant-design-vue';
 import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router';
 import eventBus from '../utils/eventBus';
 import { registerRoutes } from './dynamic';
-import { message } from 'ant-design-vue';
 
 const routes: Array<RouteRecordRaw> = [
     {
@@ -21,6 +21,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@/views/account/logon.vue'),
     },
     {
+        path: '/home',
+        name: 'home',
+        component: () => import('@/views/home.vue'),
+    },
+    {
         path: '/resetPassword',
         name: 'resetPassword',
         component: () => import('@/views/account/resetPassword.vue'),

src/services/bus/index.ts

@@ -6,6 +6,7 @@ import { isLogin } from '@/services/bus/login';
 import { checkTokenLoop, handleTokenCheck } from '@/services/bus/token';
 import { getAllEnums, GetPCMenus, getServerTime, queryErrorInfos, QueryTableDefine } from '@/services/go/commonService/index';
 import { getAppConfig, getCommonApiUrl } from '@/services/go/config';
+import { queryTjmdMarketSection } from '@/services/go/Tjmd';
 import { LoginQuery } from '@/services/go/useInfo/index';
 import { serviceURL, setServiceURL } from '@/services/request/serviceURL';
 import ProtobufCtr from '@/services/socket/protobuf/index';
@@ -15,7 +16,6 @@ import { GetErmcpGoods, QueryDeliveryGoodsDetail } from '../go/ermcp/goodsInfo';
 import { getTaAccount } from '../go/TaAccount';
 import { queryWrMarketTradeConfig } from '../go/wrtrade';
 import { getMarketByTradeMode } from './market';
-
 /**
  * 全局数据刷新
  */
@@ -41,6 +41,7 @@ export async function globalDataRefresh(): Promise<string> {
                 checkTokenLoop();
                 await LoginQuery()
                 await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), QueryDeliveryGoodsDetail(), getTaAccount(), queryMarketRun()])
+                await queryTjmdMarketSection()
                 const marketInfo = getMarketByTradeMode(TradeMode.WarehouseReceiptTrade);
                 if (marketInfo) {
                     await queryWrMarketTradeConfig({ marketid: marketInfo.marketid })

src/services/bus/login.ts

@@ -4,6 +4,7 @@ import { isAllEnum } from '@/services/bus/allEnum';
 import { checkTokenLoop } from '@/services/bus/token';
 import { getAllEnums, GetPCMenus, getServerTime, queryErrorInfos, QueryTableDefine } from '@/services/go/commonService/index';
 import { GetErmcpGoods, QueryDeliveryGoodsDetail } from '@/services/go/ermcp/goodsInfo';
+import { queryTjmdMarketSection } from '@/services/go/Tjmd';
 import { GetLoginID, LoginQuery } from '@/services/go/useInfo/index';
 import { sessionStorageUtil } from '@/utils/storage/index';
 import { queryMarketRun } from '../go/commonMarket';
@@ -29,6 +30,7 @@ export const login = async (logidCode: string, password: string, byteArr: Uint8A
         setLoginData(loginData);
         await LoginQuery()
         await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), getServerTime(), QueryDeliveryGoodsDetail(), getTaAccount(), queryMarketRun()])
+        await queryTjmdMarketSection()
         const marketInfo = getMarketByTradeMode(TradeMode.WarehouseReceiptTrade);
         if (marketInfo) {
             await queryWrMarketTradeConfig({ marketid: marketInfo.marketid })

src/services/dataCenter/index.ts

@@ -29,6 +29,7 @@ const needClearSourceData: NeedClearSourceDataType = {
     quoteDayInfo: [],
     RootUser: [],
     rules: [],
+    marketsSection: [], // 市场板块列表
 };
 
 /**

src/services/dataCenter/interface.ts

@@ -3,6 +3,7 @@ import { ErmcpDeliveryGoodsDetailEx, Goods } from '@/services/go/ermcp/goodsInfo
 import * as advert from '@/services/go/quote/interface';
 import * as useInfo from '@/services/go/useInfo/interface';
 import { Marketrun } from '../go/commonMarket/interface';
+import { TjmdMarketSection } from '../go/Tjmd/interface';
 import { WrMarketTradeConfig } from '../go/wrtrade/interface';
 import { AccountListItem } from './interafce/account';
 
@@ -44,6 +45,7 @@ export interface NeedClearSourceDataType {
     quoteDayInfo: advert.QueryQuoteDayRsp[]; // 行情盘面信息
     RootUser: useInfo.Ermcp3RootUserAccount[],
     rules: WrMarketTradeConfig[],
+    marketsSection: TjmdMarketSection[],
 }
 
 export { advert };

src/services/go/Tjmd/index.ts

@@ -1,4 +1,6 @@
+import APP from '@/services';
 import { commonSearch_go } from "@/services/go";
+import { localStorageUtil } from '@/utils/storage';
 import * as type from './interface';
 
 /**
@@ -37,11 +39,24 @@ export function queryTjmdTransferApply(req: type.QueryTjmdTransferApplyReq): Pro
     });
 }
 
+function addMarketToMenu(markets: type.TjmdMarketSection[]) {
+    const list = localStorageUtil.getItem('menus');
+    markets.forEach(market => {
+
+    })
+}
+
 /**
  * 查询市场板块  /Tjmd/QueryTjmdMarketSection
  */
-export function queryTjmdMarketSection(): Promise<type.TjmdMarketSection[]> {
-    return commonSearch_go('/Tjmd/QueryTjmdMarketSection', {}).catch((err) => {
+export function queryTjmdMarketSection(): Promise<string> {
+    return commonSearch_go('/Tjmd/QueryTjmdMarketSection', {}).then(res => {
+        console.log('查询市场板块:  ', res)
+        const list = localStorageUtil.getItem('menus');
+        console.log('菜单', list)
+        APP.set('marketsSection', res);
+        return 'ok'
+    }).catch((err) => {
         throw new Error(`查询市场板块 : ${err}`);
     });
 }

src/services/socket/login/index.ts

@@ -23,7 +23,7 @@ export const loginAction = (logidCode: string, password: string, ClientSystemInf
         DeviceID: '',
     }
     if (ClientSystemInfo.length) {  // 与qt交互消息
-        Object.assign(reqParams, { ClientSystemInfo, ClientAppID: 'muchinfo_mtpclient_5.0.1' })
+        Object.assign(reqParams, { ClientSystemInfo, ClientAppID: 'muchinfo_client_5.0.1' })
     }
     return protoMiddleware(reqParams, 'LoginReq', 'LoginRsp', 1)
 };