From 58343edc2cc8d4b8cb72da4593ca737489c90353 Mon Sep 17 00:00:00 2001 From: liupopo Date: Thu, 2 Feb 2023 00:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-crm-ui/.env.production | 3 +- .../src/layout/components/Sidebar/index.vue | 2 +- supervise-monitor-ui/src/router/index.js | 4 +- .../src/router/modules/codemenu.js | 1210 +---------------- .../src/views/monitor/videos/index.vue | 48 + yxt-portal-ui/.env.development | 2 +- .../src/main/resources/application-devv.yml | 2 +- .../src/main/resources/application-test.yml | 8 +- .../src/main/resources/application.yml | 3 +- yxt_supervise/supervise-crm/pom.xml | 12 +- .../supervise-crm/supervise-crm-api/pom.xml | 10 +- .../supervise-crm/supervise-crm-biz/pom.xml | 10 +- .../src/main/resources/application-test.yml | 3 +- .../src/main/resources/application.yml | 3 +- .../src/main/resources/application.yml | 4 +- .../src/main/resources/application-devv.yml | 2 +- .../src/main/resources/application-test.yml | 3 +- .../src/main/resources/application.yml | 2 +- 18 files changed, 109 insertions(+), 1222 deletions(-) create mode 100644 supervise-monitor-ui/src/views/monitor/videos/index.vue diff --git a/supervise-crm-ui/.env.production b/supervise-crm-ui/.env.production index 811f3444..f9657eff 100644 --- a/supervise-crm-ui/.env.production +++ b/supervise-crm-ui/.env.production @@ -2,8 +2,7 @@ ENV = 'production' # base api -VUE_APP_BASE_API = '/api/service' +VUE_APP_BASE_API = '/api' ## 配置 正式接口地址 VUE_APP_URL = "http://120.46.131.15:8111" - diff --git a/supervise-monitor-ui/src/layout/components/Sidebar/index.vue b/supervise-monitor-ui/src/layout/components/Sidebar/index.vue index 4aa5932d..7faa4b20 100644 --- a/supervise-monitor-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-monitor-ui/src/layout/components/Sidebar/index.vue @@ -35,7 +35,7 @@ YongHuid: [], routes: [], params: { - sourceSid: '04dd1f41-5989-4ac7-8698-db26996094fb', + sourceSid: '5b8b2224-7272-4c56-a8d6-1dc426e2f3df', userSid: '', } } diff --git a/supervise-monitor-ui/src/router/index.js b/supervise-monitor-ui/src/router/index.js index 35514567..1f4b3085 100644 --- a/supervise-monitor-ui/src/router/index.js +++ b/supervise-monitor-ui/src/router/index.js @@ -7,7 +7,7 @@ Vue.use(Router) import Layout from '@/layout' /* 所有角色可以访问/没有权限要求的基页 */ -// import codemenu from './modules/codemenu' +import codemenu from './modules/codemenu' export const constantRoutes = [ { @@ -46,7 +46,7 @@ export const constantRoutes = [ } }] }, - // ...codemenu, + ...codemenu, { path: '/404', component: () => diff --git a/supervise-monitor-ui/src/router/modules/codemenu.js b/supervise-monitor-ui/src/router/modules/codemenu.js index b2f77f28..f8d47722 100644 --- a/supervise-monitor-ui/src/router/modules/codemenu.js +++ b/supervise-monitor-ui/src/router/modules/codemenu.js @@ -1,1196 +1,20 @@ import Layout from '@/layout' -const codemenu = [ - { - path: '/scminbound', - component: Layout, - redirect: '/scminbound/index', - meta: { - title: '销售入库单' - }, - children: [{ - path: '/scminbound/index', - component: () => import('@/views/anruiscm/scminbound/scminbound.vue'), - name: 'ScmInboundIndex', - meta: { title: '销售入库单', noCache: true } - }] - }, - { - path: '/scmotherinbound', - component: Layout, - redirect: '/scmotherinbound/index', - meta: { - title: '其他入库单' - }, - children: [{ - path: '/scmotherinbound/index', - component: () => import('@/views/anruiscm/scmotherinbound/scmotherinbound.vue'), - name: 'ScmOtherInboundIndex', - meta: { title: '其他入库单', noCache: true } - }] - }, - { - path: '/scmotheroutbound', - component: Layout, - redirect: '/scmotheroutbound/index', - meta: { - title: '其他出库单' - }, - children: [{ - path: '/scmotheroutbound/index', - component: () => import('@/views/anruiscm/scmotheroutbound/scmotheroutbound.vue'), - name: 'ScmOtherOutboundIndex', - meta: { title: '其他出库单', noCache: true } - }] - }, - { - path: '/scmoutbound', - component: Layout, - redirect: '/scmoutbound/index', - meta: { - title: '销售出库单' - }, - children: [{ - path: '/scmoutbound/index', - component: () => import('@/views/anruiscm/scmoutbound/scmoutbound.vue'), - name: 'ScmOutboundIndex', - meta: { title: '销售出库单', noCache: true } - }] - }, - { - path: '/scmrealtimeinventory', - component: Layout, - redirect: '/scmrealtimeinventory/index', - meta: { - title: '即时库存表' - }, - children: [{ - path: '/scmrealtimeinventory/index', - component: () => import('@/views/anruiscm/scmrealtimeinventory/scmrealtimeinventory.vue'), - name: 'ScmRealTimeInventoryIndex', - meta: { title: '即时库存表', noCache: true } - }] - }, - { - path: '/scmrejected', - component: Layout, - redirect: '/scmrejected/index', - meta: { - title: '采购退料单' - }, - children: [{ - path: '/scmrejected/index', - component: () => import('@/views/anruiscm/scmrejected/scmrejected.vue'), - name: 'ScmRejectedIndex', - meta: { title: '采购退料单', noCache: true } - }] - }, - { - path: '/scmreturn', - component: Layout, - redirect: '/scmreturn/index', - meta: { - title: '销售退货单' - }, - children: [{ - path: '/scmreturn/index', - component: () => import('@/views/anruiscm/scmreturn/scmreturn.vue'), - name: 'ScmReturnIndex', - meta: { title: '销售退货单', noCache: true } - }] - }, - - { - path: '/scmmaterial', - component: Layout, - redirect: '/scmmaterial/index', - meta: { - title: '物料管理' - }, - children: [{ - path: '/scmmaterial/index', - component: () => import('@/views/anruiscm/scmmaterial/scmmaterial.vue'), - name: 'ScmMaterialIndex', - meta: { title: '物料管理', noCache: true } - }] - }, - // 存放地点 - { - path: '/scmwarehouse', - component: Layout, - redirect: '/scmwarehouse/index', - meta: { - title: '存放地点' - }, - children: [{ - path: '/scmwarehouse/index', - component: () => import('@/views/anruiscm/scmwarehouse/scmwarehouse.vue'), - name: 'ScmWarehouseIndex', - meta: { title: '存放地点', noCache: true } - }] - }, - { - path: '/shangzhuang', - component: Layout, - redirect: '/shangzhuang', - meta: { - title: '上装配置管理' - }, - children: [{ - path: '/shangzhuang/shangzhuangguanli', - component: () => import('@/views/shangzhuang/shangzhuangguanli/shangzhuangguanli.vue'), - name: 'ShangZhuangGuanLi', - meta: { title: '上装配置管理', noCache: true } - }] - }, - { - path: '/shangzhuang', - component: Layout, - redirect: '/shangzhuang', - meta: { - title: '上装台账管理' - }, - children: [{ - path: '/shangzhuang/shangzhuangtaizhangguanli', - component: () => import('@/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue'), - name: 'shangzhuangtaizhangguanli', - meta: { title: '上装台账管理', noCache: true } - }] - }, - // 合格证台账 - { - path: '/hegezhengtaizhang', - component: Layout, - redirect: '/hegezheng/hegezhengtaizhang', - meta: { - title: '合格证管理' - }, - children: [{ - path: '/hegezheng/hegezhengtaizhang', - component: () => import('@/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue'), - name: 'hegezhengtaizhang', - meta: { title: '合格证管理', noCache: true } - }] - }, - - // 采购订单管理 - { - path: '/caigoudingdan', - component: Layout, - redirect: '/caigoudingdan/index', - meta: { - title: '采购订单管理' - }, - children: [{ - path: '/caigoudingdan/index', - component: () => import('@/views/cheliang/cheliangcaigou/cheliangcaigou.vue'), - name: 'cheliangcaigou', - meta: { title: '采购订单管理', noCache: true } - }] - }, - - { - path: '/guache', - component: Layout, - redirect: '/guache', - meta: { - title: '挂车信息管理' - }, - children: [ - { - path: '/guache/guacheguanli', - component: () => import('@/views/guache/guacheguanli/guacheguanli.vue'), - name: 'GuaCheJianSuoGuanLi', - meta: { title: '挂车管理', noCache: true } - }, - { - path: '/guache/guachejiansuo', - component: () => import('@/views/guache/guachejiansuo/guachejiansuoguanli.vue'), - name: 'guachejiansuoguanli', - meta: { title: '挂车管理', noCache: true } - }, - { - path: '/guache/guachechexing', - component: () => import('@/views/guache/guachechexing/guachechexingguanli'), - name: 'guachechexingguanli', - meta: { title: '挂车车型管理', noCache: true } - }, - { - path: '/guache/guachetaizhang', - component: () => import('@/views/guache/guachetaizhang/guachetaizhangguanli'), - name: 'GuaCheTaiZhangGuanLi', - meta: { title: '挂车台账管理', noCache: true } - } - ] - }, - - // 车辆管理 - { - path: '/cheliang', - component: Layout, - redirect: '/cheliang', - meta: { - title: '车辆管理' - }, - children: [ - { - path: '/cheliang/chexing', - component: () => - import('@/views/cheliang/chexing/chexing.vue'), - name: 'chexing', - meta: { title: '车型管理', noCache: true } - }, - { - path: '/cheliang/changyongpeizhi', - component: () => - import('@/views/cheliang/chexingpeizhi/changyongpeizhi.vue'), - name: 'chexingpeizhi', - meta: { title: '常用配置管理', noCache: true } - }, - // 车辆台账 - { - path: '/cheliang/cheliangtaizhang', - component: () => - import('@/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue'), - name: 'cheliangtaizhang', - meta: { title: '车辆台账', noCache: false } - }, - // 车辆台账查询 - { - path: '/cheliang/cheliangtaizhangchaxun', - component: () => - import('@/views/cheliang/cheliangtaizhangchaxun/chaliangtaizhangselect.vue'), - name: 'chaliangtaizhangselect', - meta: { title: '车辆台账查询', noCache: true } - }, - { - path: '/cheliang/chexingbaojia', - component: () => - import('@/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojia.vue'), - name: 'daibaojia', - meta: { title: '车型报价', noCache: true } - }, - - // 车辆信息 - { - path: '/cheliang/cheliangtaizhangInfo', - component: () => - import('@/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue'), - name: 'CheliangtaizhangInfo', - meta: { title: '车辆信息', noCache: true } - }, - // 车辆销售 - { - path: '/cheliangxiaoshou/cheliangxiaoshouguanli', - component: () => - import('@/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue'), - name: 'cheliangxiaoshou', - meta: { title: '车辆销售台账', noCache: true } - } - ] - }, - // 采购退库 - { - path: '/caigoutuiku', - component: Layout, - redirect: '/caigoutuiku/index', - meta: { - title: '采购退库' - }, - children: [{ - path: '/caigoutuiku/index', - component: () => import('@/views/supplychain/caigoutuiku/caigoutuiku.vue'), - name: 'caigoutuiku', - meta: { title: '采购退库', noCache: true } - }] - }, - { - path: '/vehicle', - component: Layout, - redirect: '/vehicle/xianche', - meta: { - title: '车辆采购' - }, - children: [ - { - path: '/vehicle/cheliangpaichan', - component: () => import('@/views/supplychain/cheliangpaichan/cheliangpaichan.vue'), - name: 'cheliangpaichan', - meta: { title: '厂家采购', noCache: false } - }, - { - path: '/vehicle/paichandingjintobeconfirmed', - component: () => import('@/views/supplychain/paichandingjin/paichandingjintobeconfirmed.vue'), - name: 'paichandingjindaiqueren', - meta: { title: '排产订金申请确认', noCache: false } - } - ] - }, - { - path: '/supplychain', - component: Layout, - redirect: '/supplychain/changjiaxitong', - meta: { - title: '车辆采购' - }, - children: [ - { - path: '/supplychain/changjiaxitong', - component: () => import('@/views/supplychain/changjiaxitong/manufacturers.vue'), - name: 'changjiaxitongrenkuan', - meta: { title: '厂家系统认款', noCache: false } - } - ] - }, - { - path: '/supplychain', - component: Layout, - redirect: '/supplychain/cheliangneigou', - meta: { - title: '调车申请管理' - }, - children: [ - { - path: '/supplychain/cheliangneigou', - component: () => import('@/views/supplychain/cheliangneigou/cheliangneigouguanli.vue'), - name: 'cheliangneigouguanli', - meta: { title: '调车申请管理', noCache: true } - } - ] - }, - { - path: '/baseoutsourcingapplication', - component: Layout, - // redirect: '/baseoutsourcingapplication/index', - meta: { - title: '车辆外采' - }, - children: [ - { - path: '/baseoutsourcingapplication/index', - component: () => import('@/views/baseoutsourcingapplication/baseoutsourcingapplication.vue'), - name: 'baseoutsourcingapplication', - meta: { title: '车辆外采', noCache: true } - } - ] - }, - { - path: '/examine', - component: Layout, - redirect: '/examine/chukushenhe', - meta: { - title: '出库审核' - }, - children: [ - { - path: '/examine/chukushenhe', - component: () => import('@/views/examinePage/chukushenhe/chukushenhe.vue'), - name: 'chukushenhe', - meta: { title: '出库审核', noCache: true } - } - ] - }, - { - path: '/kucunguanli', - component: Layout, - redirect: '/kucunguanli', - meta: { - title: '库存管理' - }, - children: [ - { - path: '/kucunguanli/tiaojiaguanli', - component: () => import('@/views/kucunguanli/tiaojiaguanli/priceguanli.vue'), - name: 'priceguanli', - meta: { title: '调价申请管理', noCache: true } - }, - { - path: '/kucunguanli/changjiatuiku', - component: () => import('@/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuguanli.vue'), - name: 'changjiatuikuguanli', - meta: { title: '厂家退库办理', noCache: true } - }, - { - path: '/kucunguanli/panku', - component: () => import('@/views/kucunguanli/panku/pankuguanli.vue'), - name: 'pankuguanli', - meta: { title: '盘库管理', noCache: true } - }, - { - path: '/kucunguanli/cheliangweihu/richangxunjian', - component: () => import('@/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjian.vue'), - name: 'cheliangxunjianjiluchaxun', - meta: { title: '日常巡检', noCache: true } - }, - { - path: '/kucunguanli/yancheguanli', - component: () => import('@/views/supplychain/yancheguanli/yancheguanli.vue'), - name: 'yancheguanli', - meta: { title: '验车管理', noCache: true } - }, - { - path: '/kucunguanli/rukuguanli', - component: () => import('@/views/supplychain/rukuguanli/rukuguanliAwait.vue'), - name: 'rukuguanliawait', - meta: { title: '收车管理', noCache: true } - } - ] - }, - { - path: '/othermenu', - component: Layout, - redirect: '/othermenu', - meta: { - title: '其他菜单' - }, - children: [ - { - path: '/othermenu/affichetype', - component: () => import('@/views/othermenu/affichetype/gonggaoguanli.vue'), - name: 'gonggaoxinghaoguanli', - meta: { title: '公告型号管理', noCache: true } - }, - { - path: '/othermenu/cartags', - component: () => import('@/views/othermenu/cartags/chexingbiaoqianguanli.vue'), - name: 'chexingbiaoqianguanli', - meta: { title: '车型标签管理', noCache: true } - }, - { - path: '/othermenu/shangzhuangtiaojia', - component: () => import('@/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaguanli.vue'), - name: 'shangzhuangtiaojiaguanli', - meta: { title: '上装调价管理', noCache: true } - } - ] - }, - { - path: '/bikerebate', - component: Layout, - redirect: '/bikerebate', - meta: { - title: '单车返利' - }, - children: [ - { - path: '/bikerebate/bikerebatemanagement', - component: () => import('@/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue'), - name: 'bicyclerebatemanagement', - meta: { title: '单车返利管理', noCache: true } - }, - { - path: '/bikerebate/bicyclerebatewithholding', - component: () => import('@/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue'), - name: 'bicyclerebatewithholding', - meta: { title: '单车返利预提', noCache: true } - }, - { - path: '/bikerebate/bicyclerebatecheck', - component: () => import('@/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue'), - name: 'bicyclerebatetobechecked', - meta: { title: '单车返利核对', noCache: true } - } - ] - }, - { - path: '/specialrebate', - component: Layout, - redirect: '/specialrebate', - meta: { - title: '专项返利' - }, - children: [ - { - path: '/specialrebate/specialrebatemanagement', - component: () => import('@/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue'), - name: 'ZhuanXiangFanLiGuanLi', - meta: { title: '专项返利管理', noCache: true } - }, - { - path: '/specialrebate/specialrebatewithholding', - component: () => import('@/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue'), - name: 'ZhuanXiangFanLiYuTi', - meta: { title: '专项返利预提', noCache: true } - }, - { - path: '/specialrebate/specialrebatecheck', - component: () => import('@/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue'), - name: 'specialrebatetobechecked', - meta: { title: '专项返利核对', noCache: true } - }, - { - path: '/specialrebate/specialrebatedistribution', - component: () => import('@/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue'), - name: 'specialrebatetobeallocated', - meta: { title: '专项返利分配', noCache: true } - } - ] - }, - { - path: '/manufacturerrebates', - component: Layout, - redirect: '/manufacturerrebates', - meta: { - title: '厂家回款返利' - }, - children: [ - { - path: '/huikuanguanli/collectionrebatemanagement', - component: () => import('@/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue'), - name: 'huikuanfanliguanli', - meta: { title: '厂家回款返利管理', noCache: true } - }, - { - path: '/huikuanyuti/collectionrebatewithholding', - component: () => import('@/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue'), - name: 'huikuanfanliyutigaunli', - meta: { title: '厂家回款返利预提', noCache: true } - }, - { - path: '/huikuanhedui/collectionrebatetobechecked', - component: () => import('@/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue'), - name: 'huikuanfanlidaihedui', - meta: { title: '厂家回款返利核对', noCache: true } - }, - { - path: '/huikuanfenpei/collectionrebateallot', - component: () => import('@/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue'), - name: 'huikuanfanlidaifenpei', - meta: { title: '厂家回款返利分配', noCache: true } - } - ] - }, - // 入库管理 - { - path: '/ruzhang', - component: Layout, - redirect: '/ruzhang/ruzhangguanli', - meta: { - title: '入库管理' - }, - children: [{ - path: '/ruzhang/ruzhangguanli', - component: () => import('@/views/ruzhang/ruzhangguanli/ruzhangguanli.vue'), - name: 'ruzhangguanli', - meta: { title: '入库管理', noCache: true } - }] - }, - // 未售买断管理 - { - path: '/weishoumaiduan', - component: Layout, - redirect: '/weishoumaiduan/weishoumaiduanguanli', - meta: { - title: '未售买断管理' - }, - children: [{ - path: '/weishoumaiduan/weishoumaiduanguanli', - component: () => import('@/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue'), - name: 'unsoldguanli', - meta: { title: '未售买断申请管理', noCache: true } - }] - }, - // 出库管理 - { - path: '/chuku', - component: Layout, - redirect: '/chuku', - meta: { - title: '出库管理' - }, - children: [{ - path: '/chuku/chukuguanli', - component: () => import('@/views/chuku/chukuguanli/chukuguanli.vue'), - name: 'chukuguanli', - meta: { title: '出库管理', noCache: true } - }] - }, - // 合格证盘点记录 - { - path: '/hegezhengpandian', - component: Layout, - redirect: '/hegezhengpandian', - meta: { - title: '合格证盘点' - }, - children: [{ - path: '/hegezhengpandian/pandianjilu', - component: () => import('@/views/supplychain/hegezhengpandianjilu/hegezhengpandianjilu.vue'), - name: 'hegezhengpandianjilu', - meta: { title: '合格证盘点', noCache: true } - }] - }, - // 验车管理 - // { - // path: '/yancheguanli', - // component: Layout, - // redirect: '/yancheguanli/yanche', - // meta: { - // title: '验车管理' - // }, - // children: [{ - // path: '/yancheguanli/yanche', - // component: () => import('@/views/supplychain/yancheguanli/yancheguanli.vue'), - // name: 'yancheguanli', - // meta: { title: '验车管理' } - // }] - // }, - // 入库车辆管理 - // { - // path: '/rukuguanli', - // component: Layout, - // redirect: '/rukuguanli/rukucheliang', - // meta: { - // title: '入库车辆管理' - // }, - // children: [{ - // path: '/rukuguanli/rukucheliang', - // component: () => import('@/views/supplychain/rukuguanli/rukuguanliAwait.vue'), - // name: 'rukuguanliawait', - // meta: { title: '入库车辆管理' } - // }] - // }, - // 存放地点变更 - { - path: '/cunfangdidianbiangengguanli', - component: Layout, - redirect: '/cunfangdidianbiangengguanli/cunfangdidianbiangeng', - meta: { - title: '存放地点变更申请管理' - }, - children: [{ - path: '/cunfangdidianbiangengguanli/cunfangdidianbiangeng', - component: () => import('@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue'), - name: 'cunfangdidianbiangeng', - meta: { title: '存放地点变更申请管理', noCache: true } - }] - }, - // 调车开票申请管理 - { - path: '/diaochekaipiaoshenqingguanli', - component: Layout, - redirect: '/diaochekaipiaoshenqingguanli/diaocheshenqing', - meta: { - title: '调车开票申请管理' - }, - children: [{ - path: '/diaochekaipiaoshenqingguanli/diaocheshenqing', - component: () => import('@/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue'), - name: 'diaocheshenqing', - meta: { title: '调车开票申请管理', noCache: true } - }] - }, - // 调账申请管理 - { - path: '/tiaozhangshenqingguanli', - component: Layout, - redirect: '/tiaozhangshenqingguanli/tiaozhangshenqing', - meta: { - title: '调账申请管理' - }, - children: [{ - path: '/tiaozhangshenqingguanli/tiaozhangshenqing', - component: () => import('@/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue'), - name: 'tiaozhangshenqingguanli', - meta: { title: '调账申请管理', noCache: true } - }] - }, - // 车辆检查 - { - path: '/yanchejianchaxiangmu', - component: Layout, - redirect: '/yanchejianchaxiangmu/yanchejiancha', - meta: { - title: '验车检查项目管理' - }, - children: [{ - path: '/yanchejianchaxiangmu/yanchejiancha', - component: () => import('@/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue'), - name: 'yanchejianchaxiangmu', - meta: { title: '验车检查项目管理', noCache: true } - }] - }, - // 供应商管理 - { - path: '/gongyingshang', - component: Layout, - redirect: '/gongyingshang', - meta: { - title: '供应商管理' - }, - children: [{ - path: '/gongyingshang', - component: () => import('@/views/gongyingshang/gongyingshanggaunli.vue'), - name: 'gongyingshanggaunli', - meta: { title: '供应商管理', noCache: true } - }] - }, - // 采购渠道 - { - path: '/purchasingchannels', - component: Layout, - redirect: '/purchasingchannels', - meta: { - title: '采购渠道' - }, - children: [{ - path: '/purchasingchannels', - component: () => import('@/views/purchasingchannels/caigouqudaotobeselected.vue'), - name: 'caigouqudaotobeselected', - meta: { title: '采购渠道', noCache: true } - }] - }, - - // 流程审批 - // 入库管理编辑 - { - path: '/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit', - component: () => - import('@/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue'), - name: 'ruzhangAdd' - }, - // 入库管理（待办）详情 - { - path: '/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo', - component: () => - import('@/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue'), - name: 'ruzhangDaiBanInfo' - }, - // 入库管理（已办）详情 - { - path: '/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo', - component: () => - import('@/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue'), - name: 'ruzhangYiBanInfo' - }, - // 厂家采购管理编辑 - { - path: '/paichanguanliFlow/paichanguanli/cheliangpaichanEdit', - component: () => - import('@/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue'), - name: 'cheliangpaichanEdit' - }, - // 厂家采购管理待办详情 - { - path: '/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo', - component: () => - import('@/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue'), - name: 'cheliangpaichandetails' - }, - // 厂家采购管理已办详情 - { - path: '/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo', - component: () => - import('@/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue'), - name: 'cheliangpaichanYiBanInfo' - }, - // 调价管理编辑 - { - path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit', - component: () => - import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue'), - name: 'tiaojiaEdit' - }, - // 调价管理待办详情 - { - path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo', - component: () => - import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue'), - name: 'tiaojiaInfo' - }, - // 调价管理已办详情 - { - path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo', - component: () => - import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue'), - name: 'tiaojianYibanInfo' - }, - // 车辆内购编辑 - { - path: '/cheliangneigouFlow/neigouguanli/neigouEdit', - component: () => - import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue'), - name: 'neigouEdit' - }, - // 车辆内购待办详情 - { - path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo', - component: () => - import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue'), - name: 'neigouDaiBanInfo' - }, - // 车辆内购待办详情(申请方转应对方) - { - path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo', - component: () => - import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue'), - name: 'neigouDaiBanByShunTingTypeValueInfo' - }, - // 车辆内购待办详情(应对方转事业部) - { - path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo', - component: () => - import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue'), - name: 'neigouDaiBanByBusinessDivisionInfo' - }, - // 车辆内购待办详情 - { - path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo', - component: () => - import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue'), - name: 'neigouDaiBanByVinNoInfo' - }, - // 车辆内购已办详情 - { - path: '/cheliangneigouFlow/neigouguanli/neigouYiBanInfo', - component: () => - import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue'), - name: 'neigouYiBanInfo' - }, - // 未售买断编辑 - { - path: '/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit', - component: () => - import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue'), - name: 'maiduanEdit' - }, - // 未售买断待办详情 - { - path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo', - component: () => - import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue'), - name: 'weishoumaiduanDaiBanInfo' - }, - // 未售买断已办详情 - { - path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo', - component: () => - import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue'), - name: 'weishoumaiduanYiBanInfo' - }, - // 采购退库驳回到发起人办理编辑页面 - { - path: '/caigoutuikuFlow/caigoutuikuEdit', - component: () => - import('@/views/workFlow/caigoutuikuFlow/caigoutuikuEdit'), - name: 'caigoutuikuEdit' - }, - // 采购退库详情页面 - { - path: '/caigoutuikuFlow/caigoutuikuInfo', - component: () => - import('@/views/workFlow/caigoutuikuFlow/caigoutuikuInfo'), - name: 'caigoutuikuInfo' - }, - // 采购退库审批环节办理页面 - { - path: '/caigoutuikuFlow/caigoutuiku', - component: () => - import('@/views/workFlow/caigoutuikuFlow/caigoutuiku'), - name: 'caigoutuikuMain' - }, - // 采购退库审批环节办理页面 - { - path: '/caigoutuikuFlow/caigoutuikuDaiBanInfo', - component: () => - import('@/views/workFlow/caigoutuikuFlow/caigoutuikuDaiBanInfo'), - name: 'caigoutuikuDaiBanInfo' - }, - { - path: '/chexingchaxun/modelinquire/modellibrary', - component: () => import('@/views/chexingchaxun/modelinquire/modellibrary'), - name: 'modellibrary' - }, - // 流程审批 - // 外采申请表驳回到发起人办理编辑页面 - { - path: '/baseoutsouapplFlow/edit', - component: () => - import('@/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd'), - name: 'baseoutsouapplFlowEdit' - }, - // 外采申请表详情页面 - { - path: '/baseoutsouapplFlow/info', - component: () => - import('@/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo'), - name: 'baseoutsouapplFlowInfo' - }, - // 外采申请表审批环节办理页面 - { - path: '/baseoutsouapplFlow/handle', - component: () => - import('@/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication'), - name: 'baseoutsouapplFlowInfoHandle' - }, - // 流程审批 - // 存放地点变更申请驳回到发起人办理编辑页面 - { - path: '/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit', - component: () => - import('@/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit.vue'), - name: 'cunfangdidianbiangengEdit' - }, - // 存放地点变更申请详情页面 - { - path: '/cunfangdidianbiangengFlow/cunfangdidianbiangengInfo', - component: () => - import('@/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengInfo.vue'), - name: 'cunfangdidianbiangengInfo' - }, - // 存放地点变更申请审批环节办理页面 - { - path: '/cunfangdidianbiangengFlow/cunfangdidianbiangeng', - component: () => - import('@/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue'), - name: 'cunfangdidianbiangengHandle' - }, - // 流程审批 - // 调车开票申请驳回到发起人办理编辑页面 - { - path: '/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit', - component: () => - import('@/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue'), - name: 'tiaochekaipiaoshenqingEdit' - }, - // 调车开票申请详情页面 - { - path: '/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingInfo', - component: () => - import('@/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingInfo.vue'), - name: 'tiaochekaipiaoshenqingInfo' - }, - - // 调车开票申请审批环节办理页面 - { - path: '/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqing', - component: () => - import('@/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqing.vue'), - name: 'tiaochekaipiaoshenqingHandle' - }, - { - path: '/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingCallInToCallOut', - component: () => - import('@/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingCallInToCallOut.vue'), - name: 'tiaochekaipiaoshenqingCallInToCallOut' - }, - { - path: '/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingLast', - component: () => - import('@/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingLast.vue'), - name: 'tiaochekaipiaoshenqingLast' - }, - // 流程审批 - // 调账申请驳回到发起人办理编辑页面 - { - path: '/tiaozhangshenqingFlow/tiaozhangshenqingEdit', - component: () => - import('@/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue'), - name: 'tiaozhangshenqingEdit' - }, - // 调账申请详情页面 - { - path: '/tiaozhangshenqingFlow/tiaozhangshenqingInfo', - component: () => - import('@/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingInfo.vue'), - name: 'tiaozhangshenqingInfo' - }, - // 调账申请审批环节办理页面 - { - path: '/tiaozhangshenqingFlow/tiaozhangshenqing', - component: () => - import('@/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqing.vue'), - name: 'tiaozhangshenqingHandle' - }, - { - path: '/tiaozhangshenqingFlow/tiaozhangshenqingCallInOrCallOut', - component: () => - import('@/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingCallInOrCallOut.vue'), - name: 'tiaozhangshenqingCallInOrCallOut' - }, - // 分公司调车调账--分公司销售支持部经理修改内销价格 - { - path: '/tiaozhangshenqingFlow/tiaozhangshenqingByWiPinMoney', - component: () => - import('@/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingByWiPinMoney.vue'), - name: 'tiaozhangshenqingByWiPinMoney' - }, - // 分公司调车调账--分公司--财务中心 - { - path: '/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange', - component: () => - import('@/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue'), - name: 'tiaozhangshenqingOrgChange' - }, - // 上装调价申请详情页面 - { - path: '/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaDaiBanInfo', - component: () => - import('@/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaDaiBanInfo.vue'), - name: 'shangzhuangtiaojiaDaiBanInfo' - }, - // 上装调价审批环节办理页面 - { - path: '/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaYiBanInfo', - component: () => - import('@/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaYiBanInfo.vue'), - name: 'shangzhuangtiaojiaYiBanInfo' - }, - { - path: '/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit', - component: () => - import('@/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit.vue'), - name: 'shangzhuangtiaojiaEdit' - }, - // 单车返利预提申请详情页面 - { - path: '/danchefanliyutiFlow/danchefanliyutiDaiBanInfo', - component: () => - import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue'), - name: 'danchefanliyutiDaiBanInfo' - }, - // 单车返利预提办理页面 - { - path: '/danchefanliyutiFlow/danchefanliyutiYiBanInfo', - component: () => - import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue'), - name: 'danchefanliyutiYiBanInfo' - }, - // 单车返利预提 - { - path: '/danchefanliyutiFlow/danchefanliyutiEdit', - component: () => - import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue'), - name: 'danchefanliyutiEdit' - }, - // 单车返利核对申请详情页面 - { - path: '/danchefanliheduiFlow/danchefanliheduiDaiBanInfo', - component: () => - import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue'), - name: 'danchefanliheduiDaiBanInfo' - }, - // 单车返利核对办理页面 - { - path: '/danchefanliheduiFlow/danchefanliheduiYiBanInfo', - component: () => - import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue'), - name: 'danchefanliheduiYiBanInfo' - }, - // 单车返利核对 - { - path: '/danchefanliheduiFlow/danchefanliheduiEdit', - component: () => - import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue'), - name: 'danchefanliheduiEdit' - }, - // 专项返利预提申请详情页面 - { - path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo', - component: () => - import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue'), - name: 'zhuanxiangfanliyutiDaiBanInfo' - }, - // 专项返利预提详情 - { - path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo', - component: () => - import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue'), - name: 'zhuanxiangfanliyutiYiBanInfo' - }, - // 专项返利预提办理 - { - path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit', - component: () => - import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue'), - name: 'zhuanxiangfanliyutiEdit' - }, - // 专项返利核对申请详情页面 - { - path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo', - component: () => - import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue'), - name: 'zhuanxiangfanliheduiDaiBanInfo' - }, - // 专项返利核对详情 - { - path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo', - component: () => - import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue'), - name: 'zhuanxiangfanliheduiYiBanInfo' - }, - // 专项返利核对办理 - { - path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit', - component: () => - import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue'), - name: 'zhuanxiangfanliheduiEdit' - }, - - // 专项返利分配申请详情页面 - { - path: '/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo', - component: () => - import('@/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue'), - name: 'zhuanxiangfanlifenpeiDaiBanInfo' - }, - // 专项返利分配详情 - { - path: '/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo', - component: () => - import('@/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue'), - name: 'zhuanxiangfanlifenpeiYiBanInfo' - }, - // 专项返利分配办理 - { - path: '/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit', - component: () => - import('@/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue'), - name: 'zhuanxiangfanlifenpeiEdit' - }, - - // 回款返利预提申请待办详情页面 - { - path: '/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo', - component: () => - import('@/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue'), - name: 'huikuanfanliyutiDanBanInfo' - }, - // 回款返利预提已办详情 - { - path: '/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo', - component: () => - import('@/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue'), - name: 'huikuanfanliyutiYiBanInfo' - }, - // 回款返利预提办理 - { - path: '/huikuanfanliyutiFlow/huikuanfanliyutiEdit', - component: () => - import('@/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue'), - name: 'huikuanfanliyutiEdit' - }, - - // 回款返利核对申请待办详情页面 - { - path: '/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo', - component: () => - import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue'), - name: 'huikuanfanliheduiDanBanInfo' - }, - // 回款返利核对已办详情 - { - path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiYiBanInfo', - component: () => - import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue'), - name: 'huikuanfanliheduiYiBanInfo' - }, - // 回款返利核对办理 - { - path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiEdit', - component: () => - import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue'), - name: 'huikuanfanliheduiEdit' - } -] +const codemenu = [{ + path: '/spzx', + component: Layout, + redirect: '/monitor/videos', + meta: { + title: '视频中心' + }, + children: [{ + path: '/monitor/videos', + component: () => import('@/views/monitor/videos/index.vue'), + name: 'MonitorVideos', + meta: { + title: '视频中心', + noCache: true + } + }] +}] export default codemenu diff --git a/supervise-monitor-ui/src/views/monitor/videos/index.vue b/supervise-monitor-ui/src/views/monitor/videos/index.vue new file mode 100644 index 00000000..1815aec1 --- /dev/null +++ b/supervise-monitor-ui/src/views/monitor/videos/index.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/yxt-portal-ui/.env.development b/yxt-portal-ui/.env.development index 4dc30087..daad466f 100644 --- a/yxt-portal-ui/.env.development +++ b/yxt-portal-ui/.env.development @@ -5,4 +5,4 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://192.168.3.108:8112" +VUE_APP_URL = "http://192.168.3.9:8112" diff --git a/yxt_supervise/gateway/src/main/resources/application-devv.yml b/yxt_supervise/gateway/src/main/resources/application-devv.yml index 6287f42a..4129ae05 100644 --- a/yxt_supervise/gateway/src/main/resources/application-devv.yml +++ b/yxt_supervise/gateway/src/main/resources/application-devv.yml @@ -14,6 +14,6 @@ spring: max-idle: 8 #连接池中的最大空闲连接 max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） min-idle: 0 # 连接池中的最小空闲连接 - password: 123456 + password: port: 6379 timeout: 0 # 连接超时时间(毫秒) \ No newline at end of file diff --git a/yxt_supervise/gateway/src/main/resources/application-test.yml b/yxt_supervise/gateway/src/main/resources/application-test.yml index f069f1c7..062731af 100644 --- a/yxt_supervise/gateway/src/main/resources/application-test.yml +++ b/yxt_supervise/gateway/src/main/resources/application-test.yml @@ -1,19 +1,19 @@ spring: resources: - static-locations: file:/home/lzh/docker_data/nginx/html/supervise-system-ui + static-locations: file:D://supervise cloud: nacos: discovery: - server-addr: 172.18.0.5:8848 + server-addr: 127.0.0.1:8848 redis: database: 3 # Redis数据库索引（默认为0） - host: 172.18.0.7 + host: 127.0.0.1 jedis: pool: max-active: -1 #连接池最大连接数（使用负值表示没有限制） max-idle: 8 #连接池中的最大空闲连接 max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） min-idle: 0 # 连接池中的最小空闲连接 - password: + password: 123456 port: 6379 timeout: 0 # 连接超时时间（毫秒） \ No newline at end of file diff --git a/yxt_supervise/gateway/src/main/resources/application.yml b/yxt_supervise/gateway/src/main/resources/application.yml index 11ca3951..7701248b 100644 --- a/yxt_supervise/gateway/src/main/resources/application.yml +++ b/yxt_supervise/gateway/src/main/resources/application.yml @@ -12,7 +12,8 @@ spring: application: name: gateway-server profiles: - active: devv +# active: devv + active: test cloud: gateway: routes: diff --git a/yxt_supervise/supervise-crm/pom.xml b/yxt_supervise/supervise-crm/pom.xml index 1ab5267f..d8dea140 100644 --- a/yxt_supervise/supervise-crm/pom.xml +++ b/yxt_supervise/supervise-crm/pom.xml @@ -16,12 +16,12 @@ pom 客户管理 - - com.yxt.supervise - yxt_supervise - 0.0.1 - - + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/pom.xml b/yxt_supervise/supervise-crm/supervise-crm-api/pom.xml index 92a583cb..36a15b88 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/pom.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-api/pom.xml @@ -3,10 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + + + - com.yxt.supervise - supervise-crm + com.yxt + yxt-parent 0.0.1 + 4.0.0 diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml index b50c3947..b84f239c 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml @@ -3,10 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + + + - com.yxt.supervise - supervise-crm + com.yxt + yxt-parent 0.0.1 + 4.0.0 diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml index 8dc09cf4..10c17085 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml @@ -1,7 +1,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://122.14.222.186:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true +# url: jdbc:mysql://122.14.222.186:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root password: 1LAiGz$t1*Iw cloud: diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml index a9fc8c79..bfc510a5 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml @@ -2,7 +2,8 @@ spring: application: name: supervise-crm profiles: - active: devv +# active: devv + active: test messages: # 国际化资源文件路径 basename: i18n/messages diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml index 3a7fbf40..71a46344 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml @@ -2,8 +2,8 @@ spring: application: name: supervise-portal profiles: -# active: devv - active: test + active: devv +# active: test messages: # 国际化资源文件路径 basename: i18n/messages diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml index 5952d9fd..c566edf4 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml @@ -18,7 +18,7 @@ spring: max-idle: 8 #连接池中的最大空闲连接 max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） min-idle: 0 # 连接池中的最小空闲连接 - password: 123456 + password: port: 6379 timeout: 0 # 连接超时时间（毫秒） diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml index 1e0cb7ba..545b6659 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml @@ -2,7 +2,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://122.14.222.186:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true - url: jdbc:mysql://122.14.222.186:3306/yxt_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true +# url: jdbc:mysql://122.14.222.186:3306/yxt_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true + url: jdbc:mysql://127.0.0.1:3306/yxt_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true username: root password: 1LAiGz$t1*Iw # cloud: diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml index 6ba5701b..195e3c4e 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: application: name: supervise-system profiles: - #active: devv +# active: devv active: test messages: # 国际化资源文件路径