From e303b98fd12ef919a71a9d568c1748d23596676d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E7=93=9C=E4=B8=80=E5=9D=97=E5=85=AB?= <2523890936@qq.com> Date: Mon, 28 Jul 2025 14:39:07 +0800 Subject: [PATCH] bugfix --- f/web-kboss/src/permission.js | 21 +- f/web-kboss/src/router/index.js | 77 +- f/web-kboss/src/store/modules/user.js | 2 +- f/web-kboss/src/views/Test/testData.js | 7 + .../homePage/components/topBox/index.vue | 1 + .../src/views/homePage/ncmatch/index.vue | 281 ++++++++ .../views/homePage/ncmatch/mainPage/index.vue | 682 ++++++++++++++++++ f/web-kboss/src/views/setting/tools.js | 28 + f/web-kboss/src/views/setting/web_config.js | 8 + 9 files changed, 1071 insertions(+), 36 deletions(-) create mode 100644 f/web-kboss/src/views/Test/testData.js create mode 100644 f/web-kboss/src/views/homePage/ncmatch/index.vue create mode 100644 f/web-kboss/src/views/homePage/ncmatch/mainPage/index.vue create mode 100644 f/web-kboss/src/views/setting/tools.js create mode 100644 f/web-kboss/src/views/setting/web_config.js diff --git a/f/web-kboss/src/permission.js b/f/web-kboss/src/permission.js index c3da247..fe87c84 100644 --- a/f/web-kboss/src/permission.js +++ b/f/web-kboss/src/permission.js @@ -7,6 +7,7 @@ import {getToken} from "@/utils/auth"; // get token from cookie import getPageTitle from "@/utils/get-page-title"; import {asyncRoutes, constantRoutes} from "@/router"; import Layout from "@/layout"; +import {getHomePath} from "@/views/setting/tools"; NProgress.configure({showSpinner: false}); // NProgress Configuration @@ -74,6 +75,15 @@ router.beforeEach(async (to, from, next) => { const userid = sessionStorage.getItem("userId"); const user = sessionStorage.getItem("user"); const auths = sessionStorage.getItem("auths"); + const homePath =getHomePath() + if (to.path === homePath) { + next(); // 如果已经是目标路径，直接放行 + NProgress.done(); + return; + } + console.log("homePath",homePath); + // const homePath ='/homePage/index'; + // const homePath ='/ncmatchHome/index'; const hasRoutes = JSON.parse(sessionStorage.getItem("routes")) && JSON.parse(sessionStorage.getItem("routes")).length @@ -86,8 +96,8 @@ router.beforeEach(async (to, from, next) => { NProgress.done(); return } - if (to.path === '/homePage') { - next('/homePage/index'); + if (to.path === '/homePage'||to.path === '/ncmatchHome') { + next(homePath); NProgress.done(); return } @@ -96,7 +106,7 @@ router.beforeEach(async (to, from, next) => { // NProgress.done(); // return // } - if (to.path.includes("/kyyForm") || to.path.includes("/screen") || to.path.includes("/beforeLogin") || to.path.includes("/wxDetailPage") || to.path.includes("/wxPage") || to.path.includes("/login") || to.path.includes("/homePage") || to.path.includes("/registrationPage") || to.path.includes("/payPage") || to.path.includes("/paySuccess") || to.path.includes("/homePageImage")) { + if (to.path.includes("/ncmatchHome")||to.path.includes("/kyyForm") || to.path.includes("/screen") || to.path.includes("/beforeLogin") || to.path.includes("/wxDetailPage") || to.path.includes("/wxPage") || to.path.includes("/login") || to.path.includes("/homePage") || to.path.includes("/registrationPage") || to.path.includes("/payPage") || to.path.includes("/paySuccess") || to.path.includes("/homePageImage")) { console.log("to", to) try { if (to.path.includes("/beforeLogin") || to.path.includes("/registrationPage")) { @@ -125,7 +135,8 @@ router.beforeEach(async (to, from, next) => { } } // next(`/login?redirect=${to.path}`); - next('/homePage/index') + console.log("路由执行了2@@@") + next(homePath) // next(`/beforeLogin`); // console.log("111行被打印了") NProgress.done(); @@ -154,7 +165,7 @@ router.beforeEach(async (to, from, next) => { // console.log(error); Message.error(error || "Has Error"); // next(`/login?redirect=${to.path}`); - next('/homePage/index') + next(homePath) // console.log("137行被打印了") NProgress.done(); } diff --git a/f/web-kboss/src/router/index.js b/f/web-kboss/src/router/index.js index afcb984..9667621 100644 --- a/f/web-kboss/src/router/index.js +++ b/f/web-kboss/src/router/index.js @@ -1,19 +1,8 @@ import Vue from "vue"; import Router from "vue-router"; import store from "@/store"; - -Vue.use(Router); - -// const originalPush = Router.prototype.push - -// Router.prototype.push = function push(location) { -// return originalPush.call(this, location).catch(err => err)} - /* Layout */ import Layout from "@/layout"; -import {loginUserAPI} from "@/api/login"; -import {Message} from "element-ui"; -import {logger} from "runjs/lib/common"; import GpuProduct from "@/views/product/productHome/capitalOnline/productItem/GpuProduct/index.vue"; import CreatePrivateNet from "@/views/product/productHome/capitalOnline/Net/privateNet/createPrivateNet/index.vue"; import ShowPrivateNet from "@/views/product/productHome/capitalOnline/Net/privateNet/showPrivateNet/index.vue"; @@ -29,6 +18,13 @@ import SecurityGroupDetail import ShowGpu from "@/views/product/productHome/capitalOnline/productItem/GpuProduct/ShowGpu/index.vue"; import ShowEip from "@/views/product/productHome/capitalOnline/Net/Eip/showEip/index.vue"; import CreateEip from "@/views/product/productHome/capitalOnline/Net/Eip/createEip/index.vue"; + +Vue.use(Router); + +// const originalPush = Router.prototype.push + +// Router.prototype.push = function push(location) { +// return originalPush.call(this, location).catch(err => err)} // import nestedRouter from '@/router/modules/nested' /** * Note: sub-menu only appear when route children.length >= 1 @@ -165,6 +161,22 @@ export const constantRoutes = [ hidden: true, meta: {title: "注册"}, }, + { + path: "/ncmatchHome", + component: () => import("@/views/homePage/ncmatch/index.vue"), + name: "ncmatchHome", + redirect: "/ncmatchHome/index", + meta: {fullPath: "/ncmatchHome/index", title: "官网首页", noCache: true, icon: 'el-icon-s-home'}, + children: [ + { + path: "index", + component: () => import("@/views/homePage/ncmatch/mainPage/index.vue"), + name: "ncmatchPageIndex", + hidden: true, + meta: {title: "首页", fullPath: "/ncmatch/mainPage/index"}, + }, + ] + }, { path: "/homePage", component: () => import("@/views/homePage/indexLast.vue"), @@ -272,6 +284,7 @@ export const asyncRoutes = [ // name: 'productHome', // meta: {title: "概览", fullPath: "/productHome", noCache: true} // }, + { path: "/homePage", component: () => import("@/views/homePage/indexLast.vue"), @@ -986,26 +999,29 @@ export const asyncRoutes = [ ), name: "supplierTransferApproval", meta: { title: "供应商销售收入转账审批", fullPath: "/operation/examinationManagement/supplierTransferApproval", }, - }, { - path: "distributorDiscountSetting", component: () => import( - "@/views/operation/examinationManagement/distributorDiscountSetting" - ), name: "DistributorDiscountSetting", meta: { - title: "分销商折扣设置审批", fullPath: "/operation/examinationManagement/distributorDiscountSetting", + }, + { + path: "distributorDiscountSetting", component: () => import( + "@/views/operation/examinationManagement/distributorDiscountSetting" + ), name: "DistributorDiscountSetting", meta: { + title: "分销商折扣设置审批", fullPath: "/operation/examinationManagement/distributorDiscountSetting", + }, }, - }, { - path: "distributorRebateSetUp", component: () => import( - "@/views/operation/examinationManagement/distributorRebateSetUp" - ), name: "DistributorRebateSetUp", meta: { - title: "分销商回佣率设置审批", fullPath: "/operation/examinationManagement/DistributorRebateSetUp", + { + path: "distributorRebateSetUp", component: () => import( + "@/views/operation/examinationManagement/distributorRebateSetUp" + ), name: "DistributorRebateSetUp", meta: { + title: "分销商回佣率设置审批", fullPath: "/operation/examinationManagement/DistributorRebateSetUp", + }, }, - }, { - path: "distributorCommissionTransferApproval", component: () => import( - "@/views/operation/examinationManagement/distributorCommissionTransferApproval" - ), name: "DistributorCommissionTransferApproval", meta: { - title: "分销商回佣转账审批", - fullPath: "/operation/examinationManagement/distributorCommissionTransferApproval", - }, - },], + { + path: "distributorCommissionTransferApproval", component: () => import( + "@/views/operation/examinationManagement/distributorCommissionTransferApproval" + ), name: "DistributorCommissionTransferApproval", meta: { + title: "分销商回佣转账审批", + fullPath: "/operation/examinationManagement/distributorCommissionTransferApproval", + }, + },], }, { path: "supplierManagement", title: "供应商管理", @@ -1371,7 +1387,8 @@ export const asyncRoutes = [ title: "Test", icon: "el-icon-shopping-cart-2", noCache: true, fullPath: "/Test/index", }, },], - }, { + }, + { path: "/operationAndMaintenance", component: Layout, redirect: "/operationAndMaintenance/index", meta: { title: "运维", icon: "el-icon-s-tools", noCache: true, fullPath: "/operationAndMaintenance", }, children: [{ diff --git a/f/web-kboss/src/store/modules/user.js b/f/web-kboss/src/store/modules/user.js index c17939d..b0f6b7f 100644 --- a/f/web-kboss/src/store/modules/user.js +++ b/f/web-kboss/src/store/modules/user.js @@ -5,6 +5,7 @@ import {Message} from "element-ui"; import router, {resetRouter} from "@/router"; import store from "@/store"; import {myBalanceAPI} from "@/api/finance/customerRechargeManagement"; +import {testData} from "@/views/homePage/components/topBox/testData"; const state = { token: getToken(), @@ -86,7 +87,6 @@ const actions = { } ) resetRouter(); - console.log("挂载前的路由是：", accessRoutes) router.addRoutes(accessRoutes); resolve(response); } diff --git a/f/web-kboss/src/views/Test/testData.js b/f/web-kboss/src/views/Test/testData.js new file mode 100644 index 0000000..1fd8d52 --- /dev/null +++ b/f/web-kboss/src/views/Test/testData.js @@ -0,0 +1,7 @@ +import Layout from "@/layout/index.vue"; + +export const testData =[{"path":"operation", component: Layout, + + + + "hidden":true,"name":"Operation","meta":{"title":"审批管理","fullPath":"/operation/examinationManagement"},"redirect":"/operation/examinationManagement/sustomerDiscountApproval","children":[{"path":"sustomerDiscountApproval","name":"MyOrganization","meta":{"title":"客户折扣审批","fullPath":"/operation/examinationManagement/sustomerDiscountApproval"}},{"path":"supplierTransferApproval","name":"supplierTransferApproval","meta":{"title":"供应商销售收入转账审批","fullPath":"/operation/examinationManagement/supplierTransferApproval"}},{"path":"distributorDiscountSetting","name":"DistributorDiscountSetting","meta":{"title":"分销商折扣设置审批","fullPath":"/operation/examinationManagement/distributorDiscountSetting"}},{"path":"distributorRebateSetUp","name":"DistributorRebateSetUp","meta":{"title":"分销商回佣率设置审批","fullPath":"/operation/examinationManagement/DistributorRebateSetUp"}},{"path":"distributorCommissionTransferApproval","name":"DistributorCommissionTransferApproval","meta":{"title":"分销商回佣转账审批","fullPath":"/operation/examinationManagement/distributorCommissionTransferApproval"}}]},{"path":"supplierManagement","title":"供应商管理","name":"supplierManagement","meta":{"title":"供应商管理","fullPath":"/operation/supplierManagement"}},{"path":"computingCenterManagement","name":"computingCenterManagement","title":"容器云","meta":{"title":"容器云","fullPath":"/operation/computingCenterManagement/mainPage","noCache":true},"redirect":"/operation/computingCenterManagement","children":[{"path":"mainPage","title":"算力中心","name":"supplierManagement","meta":{"title":"算力中心","fullPath":"/operation/computingCenterManagement/mainPage","noCache":true}},{"path":"tagMangement","title":"标签管理","name":"tagMangement","meta":{"title":"标签管理","fullPath":"/operation/computingCenterManagement/tagMangement","noCache":true}},{"path":"sellingConfiguration","title":"出售配置","name":"sellingConfiguration","meta":{"title":"出售配置","fullPath":"/operation/computingCenterManagement/sellingConfiguration","noCache":true}},{"hidden":true,"path":"pod","title":"资源实例看板","name":"pod","meta":{"title":"资源实例看板","fullPath":"/operation/computingCenterManagement/pod","noCache":true}},{"hidden":true,"path":"childPod","title":"成员节点看板","name":"childPod","meta":{"title":"成员节点看板","fullPath":"/operation/computingCenterManagement/childPod","noCache":true}},{"hidden":true,"path":"clusterResourceInstanceConfiguration","title":"资源实例配置","name":"clusterResourceInstanceConfiguration","meta":{"title":"资源实例配置","fullPath":"/operation/computingCenterManagement/clusterResourceInstanceConfiguration","noCache":true}},{"hidden":true,"path":"colony","title":"管理集群","name":"supplierManagement","meta":{"title":"管理集群","fullPath":"/operation/computingCenterManagement/colony","noCache":true}},{"hidden":true,"path":"computingPowerNode","title":"算力设备","name":"computingPowerNode","meta":{"title":"算力设备","fullPath":"/operation/computingCenterManagement/computingPowerNode","noCache":true}},{"hidden":true,"path":"part","title":"算力部件管理","name":"part","meta":{"title":"算力部件管理","fullPath":"/operation/computingCenterManagement/Part","noCache":true}}]},{"path":"importSalesRevenue","title":"导入销售额","name":"ImportSalesRevenue","meta":{"title":"导入销售额","fullPath":"/operation/ImportSalesRevenue"}},{"path":"allProductManagement","title":"公共售价管理","name":"allProductManagement","meta":{"title":"公共售价管理","fullPath":"/operation/allProductManagement"}},{"path":"publicDiscountManagement","title":"公共折扣管理","name":"publicDiscountManagement","meta":{"title":"公共折扣管理","fullPath":"/operation/publicDiscountManagement"}},{"path":"publicCostomerManagement","name":"PublicCostomerManagement","meta":{"title":"公共客户管理","fullPath":"/operation/publicCostomerManagement"}},{"path":"productManagement","name":"productManagement","hidden":true,"meta":{"title":"供应商产品管理","fullPath":"/operation/productManagement"}},{"path":"specificationTemplateManagement","name":"specificationTemplateManagement","hidden":true,"meta":{"title":"产品规格模板管理","fullPath":"/operation/specificationTemplateManagement"}},{"path":"saleActives","name":"SaleActives","meta":{"title":"促销活动","fullPath":"/operation/saleActives"}},{"path":"voucher","name":"voucher","meta":{"title":"算力券管理","fullPath":"/operation/voucher"}},{"path":"customerTransfer","name":"CustomerTransfer","meta":{"title":"客户转移","fullPath":"/operation/customerTransfer"}},{"path":"turnoverHandover","name":"TurnoverHandover","meta":{"title":"离职交接","fullPath":"/operation/turnoverHandover"}},{"path":"analyze","name":"analyze","meta":{"title":"分析","fullPath":"/operation/analyze"},"redirect":"/operation/analyze","children":[{"path":"bill","name":"bill","meta":{"title":"消费KPI分析","fullPath":"/operation/analyze/bill"}},{"path":"operationalAnalysis","name":"operationalAnalysis","meta":{"title":"运营KPI分析","fullPath":"/operation/analyze/operationalAnalysis"}},{"path":"depementAnalysis","name":"depementAnalysis","meta":{"title":"部门KPI分析","fullPath":"/operation/analyze/depementAnalysis"}},{"path":"saleAnalysis","name":"saleAnalysis","meta":{"title":"销售KPI分析","fullPath":"/operation/analyze/saleAnalysis"}},{"path":"incomeAnalysis","name":"incomeAnalysis","meta":{"title":"收入分析","fullPath":"/operation/analyze/incomeAnalysis"}},{"path":"profitAnalysis","name":"profitAnalysis","meta":{"title":"利润分析","fullPath":"/operation/analyze/profitAnalysis"}}]},{"path":"channelCustomer","title":"渠道客户","name":"channelCustomer","meta":{"title":"渠道客户","fullPath":"/operation/channelCustomer","noCache":true}},{"hidden":true,"path":"intelligentConfigOpe","title":"智算产品配置","name":"intelligentConfigOpe","meta":{"title":"智算产品配置","fullPath":"/operation/IntelligentConfigOpe"}},{"path":"deviceMangement","name":"deviceMangement","meta":{"title":"产品租赁","fullPath":"/operation/deviceMangement"},"redirect":"/operation/deviceMangement","children":[{"path":"device","name":"device","meta":{"title":"设备管理","fullPath":"/operation/deviceMangement/device"}},{"path":"machineRoom","name":"machineRoom","meta":{"title":"机房信息","fullPath":"/operation/deviceMangement/machineRoom"}},{"path":"deviceGrid","name":"deviceGrid","meta":{"title":"统计分析","fullPath":"/operation/deviceMangement/deviceGrid"},"children":[{"path":"machineRoomGrid","name":"machineRoomGrid","meta":{"title":"机房统计","fullPath":"/operation/deviceMangement/deviceGrid/machineRoomGrid"}},{"path":"deviceExpiration","name":"deviceExpiration","meta":{"title":"设备统计","fullPath":"/operation/deviceMangement/deviceGrid/deviceExpiration"}},{"path":"supplierAndProductStatistics","name":"deviceExpiration","meta":{"title":"供需指数","fullPath":"/operation/deviceMangement/deviceGrid/supplierAndProductStatistics"}}]}]},{"path":"approval","name":"approval","meta":{"title":"审批配置","fullPath":"/operation/approval"},"children":[{"path":"approvalArgumentsConfig","name":"approvalArgumentsConfig","meta":{"title":"参数配置","fullPath":"/operation/approval/approvalArgumentsConfig"}},{"path":"approvalConfig","name":"approvalConfig","meta":{"title":"审核人配置","fullPath":"/operation/approval/approvalConfig"}},{"path":"approvalList","name":"approvalList","meta":{"title":"流程列表","fullPath":"/operation/approval/approvalList"}}]},{"path":"/endDay","component":{"name":"Layout","components":{"AppMain":{"name":"AppMain","computed":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-078753dd","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/components/AppMain.vue","_Ctor":{}},"Navbar":{"components":{"PromotionalInvitationCode":{"name":"promotionalInvitationCode","methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-49d4e0c0","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/views/customer/promotionalInvitationCode/index.vue","_Ctor":{}},"Breadcrumb":{"watch":{},"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-b50ef614","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/components/Breadcrumb/index.vue","_Ctor":{}},"Hamburger":{"name":"Hamburger","props":{"isActive":{"default":false}},"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-4e6f274c","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/components/Hamburger/index.vue"},"Screenfull":{"name":"Screenfull","beforeDestroy":[null,null],"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-29234bee","beforeCreate":[null],"__file":"src/components/Screenfull/index.vue"},"SizeSelect":{"computed":{},"methods":{},"staticRenderFns":[],"_compiled":true,"beforeCreate":[null],"beforeDestroy":[null],"__file":"src/components/SizeSelect/index.vue"},"Search":{"name":"HeaderSearch","computed":{},"watch":{},"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-032bd1f0","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/components/HeaderSearch/index.vue"},"InForm":{"name":"WebKbossIndex","methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-5dcf58dc","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/components/Inform/index.vue"},"messagedrawer":{"props":{"drawer":{"required":true,"default":false},"direction":{"default":"rtl"},"tableData":{"default":false}},"methods":{},"staticRenderFns":[],"_compiled":true,"beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/components/inFram/message.vue"}},"computed":{},"methods":{},"watch":{"gridObj":{"user":true}},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-d16d6306","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/components/Navbar.vue","_Ctor":{}},"RightPanel":{"name":"RightPanel","props":{"clickNotClose":{"default":false},"buttonTop":{"default":250}},"computed":{},"watch":{},"beforeDestroy":[null,null],"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-1e488bfb","beforeCreate":[null],"__file":"src/components/RightPanel/index.vue"},"Settings":{"components":{"ThemePicker":{"computed":{},"watch":{"defaultTheme":{"immediate":true}},"methods":{},"staticRenderFns":[],"_compiled":true,"beforeCreate":[null],"beforeDestroy":[null],"__file":"src/components/ThemePicker/index.vue"}},"computed":{"fixedHeader":{},"tagsView":{},"sidebarLogo":{}},"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-126b135a","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/components/Settings/index.vue"},"Sidebar":{"components":{"SidebarItem":{"name":"SidebarItem","components":{"Item":{"name":"MenuItem","functional":true,"props":{"icon":{"default":""},"title":{"default":""}},"_scopeId":"data-v-31ea41b3","__file":"src/layout/components/Sidebar/Item.vue","_Ctor":{}},"AppLink":{"props":{"to":{"required":true}},"computed":{},"methods":{},"staticRenderFns":[],"_compiled":true,"beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/components/Sidebar/Link.vue","_Ctor":{}}},"mixins":[{"computed":{},"methods":{}}],"props":{"item":{"required":true},"isNest":{"default":false},"basePath":{"default":""}},"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-2d2bbdc2","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/components/Sidebar/SidebarItem.vue","_Ctor":{}},"Logo":{"name":"SidebarLogo","props":{"collapse":{"required":true}},"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-6494804b","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/components/Sidebar/Logo.vue","_Ctor":{}}},"computed":{},"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-33ec43fc","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/components/Sidebar/index.vue","_Ctor":{}},"TagsView":{"components":{"ScrollPane":{"name":"ScrollPane","computed":{},"beforeDestroy":[null,null],"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-be6b7bae","beforeCreate":[null],"__file":"src/layout/components/TagsView/ScrollPane.vue"}},"computed":{},"watch":{},"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-fac8ca64","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/components/TagsView/index.vue"}},"mixins":[{"watch":{},"methods":{}}],"computed":{},"watch":{"$route":{"deep":true,"immediate":true,"user":true}},"methods":{},"staticRenderFns":[],"_compiled":true,"_scopeId":"data-v-13877386","beforeCreate":[null],"beforeDestroy":[null],"__file":"src/layout/index.vue","_Ctor":{}},"redirect":"/endDay/endDay","hidden":true,"meta":{"title":"日末","icon":"el-icon-s-custom","noCache":true,"fullPath":"/endDay"},"children":[{"path":"endDay","name":"endDay","meta":{"title":"日末","fullPath":"/endDay/endDay"}}]}] diff --git a/f/web-kboss/src/views/homePage/components/topBox/index.vue b/f/web-kboss/src/views/homePage/components/topBox/index.vue index 52f75ae..8f38369 100644 --- a/f/web-kboss/src/views/homePage/components/topBox/index.vue +++ b/f/web-kboss/src/views/homePage/components/topBox/index.vue @@ -320,6 +320,7 @@ export default Vue.extend({ // url_link: 'https://www.baidu.com' } getLogoAPI(params).then((res) => { + console.log("获取接口触发了") // if (res.data.status == true && res.data.data && res.data.data.length) { // this.photosUrl = res.data.data[0]; diff --git a/f/web-kboss/src/views/homePage/ncmatch/index.vue b/f/web-kboss/src/views/homePage/ncmatch/index.vue new file mode 100644 index 0000000..d338866 --- /dev/null +++ b/f/web-kboss/src/views/homePage/ncmatch/index.vue @@ -0,0 +1,281 @@ + + + + + diff --git a/f/web-kboss/src/views/homePage/ncmatch/mainPage/index.vue b/f/web-kboss/src/views/homePage/ncmatch/mainPage/index.vue new file mode 100644 index 0000000..c4d8ffa --- /dev/null +++ b/f/web-kboss/src/views/homePage/ncmatch/mainPage/index.vue @@ -0,0 +1,682 @@ + + + + + diff --git a/f/web-kboss/src/views/setting/tools.js b/f/web-kboss/src/views/setting/tools.js new file mode 100644 index 0000000..f8523fb --- /dev/null +++ b/f/web-kboss/src/views/setting/tools.js @@ -0,0 +1,28 @@ +export function getHomePath() { + // let homePath= "/homePage/index" + let homePath= "/ncmatchHome/index" + + // 业主机构信息 + let url_link = window.location.href || ''; + let domain_url = ''; + if (url_link.includes('?domain_name=')) { + domain_url = url_link.split('?domain_name=')[1]; + } + + // 如果是业主机构 + if ((domain_url.includes('ncmatch') || + domain_url.includes('9527') || + domain_url.includes('8889') || + domain_url.includes('8891') || + ['xterm.kaiyuancloud.cn', 'www.kaiyuancloud.cn', 'dev.kaiyuancloud.cn', 'dev.opencomputing.cn', 'test.kaiyuancloud.cn', 'localhost'].includes(domain_url)) && + !url_link.includes('/domain/')) { + + if (domain_url.includes('ncmatch') || domain_url.includes('9527')) { + homePath = '/homePath/index' + } else if (domain_url.includes('kaiyuancloud') || domain_url.includes('opencomputing') || domain_url.includes('localhost')) { + homePath = '/ncmatchHome/index' + } + } + console.log("res是",homePath) + return homePath +} diff --git a/f/web-kboss/src/views/setting/web_config.js b/f/web-kboss/src/views/setting/web_config.js new file mode 100644 index 0000000..e645634 --- /dev/null +++ b/f/web-kboss/src/views/setting/web_config.js @@ -0,0 +1,8 @@ +const webConfig={ + KYY:{ + homePath:"", + }, + NCMATCH:{ + homePath:"", + } +}