diff --git a/src/assets/images/role/icon/选择角色/银行市场_nor.png b/src/assets/images/role/market-bank.png similarity index 100% rename from src/assets/images/role/icon/选择角色/银行市场_nor.png rename to src/assets/images/role/market-bank.png diff --git a/src/assets/images/role/icon/选择角色/银行市场_hig.png b/src/assets/images/role/market-bank1.png similarity index 100% rename from src/assets/images/role/icon/选择角色/银行市场_hig.png rename to src/assets/images/role/market-bank1.png diff --git a/src/assets/images/role/icon/选择角色/基金市场_nor.png b/src/assets/images/role/market-fund.png similarity index 100% rename from src/assets/images/role/icon/选择角色/基金市场_nor.png rename to src/assets/images/role/market-fund.png diff --git a/src/assets/images/role/icon/选择角色/基金市场_hig.png b/src/assets/images/role/market-fund1.png similarity index 100% rename from src/assets/images/role/icon/选择角色/基金市场_hig.png rename to src/assets/images/role/market-fund1.png diff --git a/src/assets/images/role/icon/选择角色/保险市场_nor.png b/src/assets/images/role/market-insurance.png similarity index 100% rename from src/assets/images/role/icon/选择角色/保险市场_nor.png rename to src/assets/images/role/market-insurance.png diff --git a/src/assets/images/role/icon/选择角色/保险市场_hig.png b/src/assets/images/role/market-insurance1.png similarity index 100% rename from src/assets/images/role/icon/选择角色/保险市场_hig.png rename to src/assets/images/role/market-insurance1.png diff --git a/src/assets/images/role/icon/选择角色/我的商品_nor.png b/src/assets/images/role/my-product.png similarity index 100% rename from src/assets/images/role/icon/选择角色/我的商品_nor.png rename to src/assets/images/role/my-product.png diff --git a/src/assets/images/role/icon/选择角色/我的商品_hig.png b/src/assets/images/role/my-product1.png similarity index 100% rename from src/assets/images/role/icon/选择角色/我的商品_hig.png rename to src/assets/images/role/my-product1.png diff --git a/src/components/Back.vue b/src/components/Back.vue index b8bf05a..d04c8b1 100644 --- a/src/components/Back.vue +++ b/src/components/Back.vue @@ -1,7 +1,7 @@ diff --git a/src/components/Panel/index.vue b/src/components/Panel/index.vue index c3153f9..858b103 100644 --- a/src/components/Panel/index.vue +++ b/src/components/Panel/index.vue @@ -644,7 +644,7 @@ const close = () => { // 初始化socket const initSocket = () => { // 实例化socket - const socket = new WebSocket(`ws://${location.host}/nakadai/websocket/${param.userId}/${param.account}`); + const socket = new WebSocket(`wss://${location.host}/nakadai/websocket/${param.userId}/${param.account}`); // this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`) // 监听socket连接 socket.onopen = open; @@ -661,13 +661,13 @@ onMounted(() => { param.cid && getEntryTime(); if (param.assessmentId) { - initSocket(); getAssList(); + initSocket(); } else { param.cid && getList(); if (param.competitionId) { - initSocket(); getCompetitionStatus(); + initSocket(); } } }); diff --git a/src/layout/index.vue b/src/layout/index.vue index 522bc4d..c9e6fa9 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -3,7 +3,8 @@ + name="金融产品设计及数字化营销沙盘系统后台管理系统" + :isLogout="true" />
route.path.startsWith('/config')); // 是否隐藏左侧导航 const hideNav = computed(() => { - return Settings.hideNavPath.includes(route.path); + // return Settings.hideNavPath.includes(route.path); + return route.path.startsWith('/finance'); }); // 是否隐藏实验面板 const hidePanel = computed(() => { diff --git a/src/router/index.ts b/src/router/index.ts index abc5019..e0c1d87 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -49,6 +49,7 @@ export const routes: Array = [ component: Layout, meta: { title: '金融市场' }, children: [ + { path: 'bank', component: () => import('@/views/finance/Bank.vue'), meta: { title: '银行市场' } }, { path: 'publish', component: () => import('@/views/finance/Publish.vue'), meta: { title: '发布' } }, { path: 'account', component: () => import('@/views/finance/Account.vue'), meta: { title: '我的账户' } }, { path: 'order', component: () => import('@/views/finance/Order.vue'), meta: { title: '我的订单' } }, diff --git a/src/views/Role.vue b/src/views/Role.vue index 21db385..701b56d 100644 --- a/src/views/Role.vue +++ b/src/views/Role.vue @@ -79,6 +79,12 @@ @click="selecRole(275)">
+
+
+