diff --git a/src/components/form/index.vue b/src/components/form/index.vue index e976b0f..c2e7713 100644 --- a/src/components/form/index.vue +++ b/src/components/form/index.vue @@ -30,10 +30,37 @@ :class="toBoolean(formVal.disabled || formItem.config.readonly) ? 'cursorAuto' : ''" @[formVal.eventName]="(val) => handleChange(key,val,formVal)"> {{formVal.warningTitle}} - + - + + handleChange(key,val,formVal)"> + + {{numItem.connect}} + handleChange(key,val,formVal)"> + + {{formVal.warningTitle}} + + + diff --git a/src/router/index.js b/src/router/index.js index b5d29e9..a534449 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -431,6 +431,21 @@ export const dynamicRoutes = [ } ] }, + // frp服务器管理 + { + path: '/resource/frpServerManage/view', + component: Layout, + hidden: true, + permissions: ['rresource:frpServerManage:edit', 'resource:frpServerManage:details'], + children: [ + { + path: ':id?', + component: () => import('@/views/resource/frpServerManage/details'), + name: 'FrpServerManageDetails', + meta: { title: '修改FRP服务端配置', activeMenu: '/resource/frpServerManage' } + } + ] + }, // 监控看板 { path: '/resource/monitorBoard/view', diff --git a/src/views/resource/frpServerManage/details.vue b/src/views/resource/frpServerManage/details.vue new file mode 100644 index 0000000..cc52ca5 --- /dev/null +++ b/src/views/resource/frpServerManage/details.vue @@ -0,0 +1,99 @@ + + + + + + + + diff --git a/src/views/resource/frpServerManage/frpServerManage.vue b/src/views/resource/frpServerManage/frpServerManage.vue new file mode 100644 index 0000000..8896ae8 --- /dev/null +++ b/src/views/resource/frpServerManage/frpServerManage.vue @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + diff --git a/src/views/resource/serverRegister/index.vue b/src/views/resource/serverRegister/index.vue index 069b8d3..5f03899 100644 --- a/src/views/resource/serverRegister/index.vue +++ b/src/views/resource/serverRegister/index.vue @@ -184,6 +184,19 @@ 取消 + + + + 地址正在生成中...... + + + 地址:【FRPC_serverAddr】端口:【FRPC_remotePort】 + + + + 取消 + + @@ -287,7 +300,7 @@ {content: '选择业务IP', fnCode: 'pubilcNet', type: 'text', icon: 'el-icon-thumb', showName: 'multiPublicIpStatus', showVal: '0', hasPermi: 'resource:serverRegister:pubilcNet'}, {content: '图形监控', fnCode: 'echartView', type: 'text', icon: 'el-icon-data-analysis', hasPermi: 'rocketmq:traffic'}, {content: '详情', fnCode: 'details', type: 'text', icon: 'el-icon-view', hasPermi: 'resource:serverRegister:details'}, - {title: '更多', hasPermi: ['system:businessDeploy', 'rocketmq:policy', 'rocketmq:monitorPolicy', 'rocketmq:remote', 'resource:serverRegister:tagRemarkEdit', 'resource:serverRegister:mtrChartVew', 'resource:serverRegister:cancelFlash'], more: [ + {title: '更多', hasPermi: ['system:businessDeploy', 'rocketmq:policy', 'rocketmq:monitorPolicy', 'rocketmq:remote', 'resource:serverRegister:tagRemarkEdit', 'resource:serverRegister:mtrChartVew', 'resource:serverRegister:cancelFlash', 'resource:serverRegister:createFrpAddr', 'resource:serverRegister:showFrpAddr'], more: [ {content: '下发业务', fnCode: 'issueBusiness', type: 'text', icon: 'el-icon-circle-check', hasPermi: 'system:businessDeploy'}, {content: '下发脚本策略', fnCode: 'issueScript', type: 'text', icon: 'el-icon-circle-check', hasPermi: 'rocketmq:policy'}, {content: '下发监控策略', fnCode: 'issueMonitor', type: 'text', icon: 'el-icon-circle-check', hasPermi: 'rocketmq:monitorPolicy'}, @@ -295,6 +308,8 @@ {content: '修改标签', fnCode: 'tagRemark', type: 'text', icon: 'el-icon-edit', hasPermi: 'resource:serverRegister:tagRemarkEdit'}, {content: 'MTR探测丢包率趋势图', fnCode: 'mtrChartVew', type: 'text', icon: 'el-icon-data-analysis', hasPermi: 'resource:serverRegister:mtrChartVew'}, {content: '取消闪烁', fnCode: 'cancelFlash', type: 'text', showName: 'alarmFlag', showVal: 'true', icon: 'el-icon-magic-stick', hasPermi: 'resource:serverRegister:cancelFlash'}, + {content: '生成FRP连接地址', fnCode: 'createFrpAddr', type: 'text', icon: 'el-icon-link', hasPermi: 'resource:serverRegister:createFrpAddr'}, + {content: '显示FRP连接地址', fnCode: 'showFrpAddr', type: 'text', icon: 'el-icon-link', hasPermi: 'resource:serverRegister:showFrpAddr'}, ] } // {content: '注册', fnCode: 'enroll', showName: 'registrationStatus', showVal: '0', type: 'text', icon: 'el-icon-circle-check', hasPermi: 'resource:register:enroll'}, @@ -347,6 +362,8 @@ mtrChartOpen: false, virNetInterList: {}, alarmFlagHight: false, + frpOpen: false, + frpDialogContent: {}, } }, created() { @@ -710,13 +727,21 @@ this.issueOpen = false; this.pubilcNetOpen = false; this.tagOpen = false; + this.frpOpen = false; break; case 'cancelFlash': removeAlarmFlag({id: rowData.id}).then(res => { - console.log('res===',res); this.getHightLight(); }); break; + case 'createFrpAddr': + this.frpOpen = true; + this.frpDialogContent = {}; + break; + case 'showFrpAddr': + this.frpOpen = true; + this.frpDialogContent = {frpcServerAddr: '1234', port: '8080', collect: '123:8080'}; + break; case 'export': // let dataList = []; // Object.keys(this.columns).forEach(item => {