diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 93ebad0..cf0555f 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -89,6 +89,9 @@ div:focus { .p20 { padding: 20px; } +.m0Auto { + margin: 0 auto; +} .mtb10 { margin: 10px 0; } diff --git a/src/components/echartsList/line.vue b/src/components/echartsList/line.vue index cae726c..0406f7d 100644 --- a/src/components/echartsList/line.vue +++ b/src/components/echartsList/line.vue @@ -80,6 +80,7 @@ series = [{ data: dataXY.data, type: 'line', + smooth: true, // areaStyle: { // 阴影 // color: 'rgba(140, 158, 217, 1)' // } diff --git a/src/components/form/index.vue b/src/components/form/index.vue index 0694efe..16f9142 100644 --- a/src/components/form/index.vue +++ b/src/components/form/index.vue @@ -7,10 +7,11 @@ + + {{formVal.label ? formVal.label + ':' : ''}} + + {{formVal.warningTitle}} @@ -68,6 +71,15 @@ + + handleChange(key,val,formVal)" + > + + - + @@ -267,5 +279,8 @@ text-overflow: ellipsis; white-space: nowrap; } + .warningCol { + color: #ED7B2F; + } diff --git a/src/components/table/index.vue b/src/components/table/index.vue index fbbb190..08c559a 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -12,6 +12,17 @@ + + + + + + diff --git a/src/router/index.js b/src/router/index.js index 73f0024..9798fc2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -457,6 +457,51 @@ export const dynamicRoutes = [ } ] }, + // 服务器脚本策略 + { + path: '/disRevenue/resource/serverScript/details', + component: Layout, + hidden: true, + permissions: ['disRevenue:resource:serverScript:details'], + children: [ + { + path: ':id?', + component: () => import('@/views/disRevenue/resource/serverScript/serverScriptDetails'), + name: 'serverScriptDetails', + meta: { title: '服务器脚本策略信息', activeMenu: '/disRevenue/resource/serverScript' } + } + ] + }, + // 资源远程管理 + { + path: '/disRevenue/resource/remoteManage/view', + component: Layout, + hidden: true, + permissions: ['disRevenue:resource:remoteManage:view'], + children: [ + { + path: ':id?', + component: () => import('@/views/disRevenue/resource/remoteManage/remoteManageView'), + name: 'remoteManageView', + meta: { title: '文件管理信息', activeMenu: '/disRevenue/resource/remoteManage' } + } + ] + }, + // agent更新 + { + path: '/disRevenue/resource/agentUpdate/view', + component: Layout, + hidden: true, + permissions: ['disRevenue:resource:agentUpdate:view'], + children: [ + { + path: ':id?', + component: () => import('@/views/disRevenue/resource/agentUpdate/agentUpdateView'), + name: 'agentUpdateView', + meta: { title: '文件管理信息', activeMenu: '/disRevenue/resource/agentUpdate' } + } + ] + }, // agent采集数据 { path: '/agentCollect/cpuData/view', diff --git a/src/views/disRevenue/resource/agentUpdate/agentUpdate.vue b/src/views/disRevenue/resource/agentUpdate/agentUpdate.vue new file mode 100644 index 0000000..e85ac20 --- /dev/null +++ b/src/views/disRevenue/resource/agentUpdate/agentUpdate.vue @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + diff --git a/src/views/disRevenue/resource/agentUpdate/agentUpdateView.vue b/src/views/disRevenue/resource/agentUpdate/agentUpdateView.vue new file mode 100644 index 0000000..6cb0295 --- /dev/null +++ b/src/views/disRevenue/resource/agentUpdate/agentUpdateView.vue @@ -0,0 +1,108 @@ + + + + + + + + diff --git a/src/views/disRevenue/resource/group/details.vue b/src/views/disRevenue/resource/group/details.vue index a4184da..e5e9119 100644 --- a/src/views/disRevenue/resource/group/details.vue +++ b/src/views/disRevenue/resource/group/details.vue @@ -34,7 +34,7 @@ id: {label: 'ID',hidden: true}, groupName: {label: '名称', span: 24, type: 'input', rules: [{required: true, message: '请输入名称', trigger: 'blur'}]}, description: {label: '描述', span: 24, type: 'textarea'}, - includedDevices: {label: '包含设备', span: 12, type: 'transfer',options: []} + includedDevices: {label: '包含设备', span: 24, type: 'transfer',options: []} } }]; }, diff --git a/src/views/disRevenue/resource/monitorStategy/index.vue b/src/views/disRevenue/resource/monitorStategy/index.vue index 766d22c..a5c707e 100644 --- a/src/views/disRevenue/resource/monitorStategy/index.vue +++ b/src/views/disRevenue/resource/monitorStategy/index.vue @@ -62,7 +62,7 @@ id: { label: `ID`,width: '50'}, switchName: { label: `策略名称`, minWidth: '250', visible: true }, switchSn: { label: `描述`,minWidth: '200',visible: false}, - interfaceName: { label: `监关联资源组控项`,minWidth: '150', visible: true }, + interfaceName: { label: `关联资源组`,minWidth: '150', visible: true }, serverName: { label: `包含设备`,minWidth: '200'}, connectedDeviceType: { label: `关联监控模版`,minWidth: '150', visible: true }, connected: { label: `策略内容`,minWidth: '200'}, diff --git a/src/views/disRevenue/resource/register/handle.vue b/src/views/disRevenue/resource/register/handle.vue index d58513e..46f39f7 100644 --- a/src/views/disRevenue/resource/register/handle.vue +++ b/src/views/disRevenue/resource/register/handle.vue @@ -60,6 +60,7 @@ encryption: {label: '加密方式', span: 12, type: 'radio', options: this.dict.type.rm_register_encryption,hidden: objVal && objVal.id ? false : true, disabled: objVal && objVal.registrationStatus === '1' ? true : false}, teamName: {label: '团体名称', span: 12, type: 'input', hidden: objVal && objVal.snmpDetect === '1' ? false : true,disabled: objVal && objVal.registrationStatus === '1' ? true : false}, snmpCollectAddr: {label: 'SNMP采集地址', span: 12, type: 'input',required: true, hidden: objVal && objVal.snmpDetect === '1' ? false : true, disabled: objVal && objVal.registrationStatus === '1' ? true : false}, + snmpCollectPort: {label: 'SNMP采集端口', span: 12, type: 'input',required: true, hidden: objVal && objVal.snmpDetect === '1' ? false : true, disabled: objVal && objVal.registrationStatus === '1' ? true : false}, resourceUserName: {label: '用户名', span: 12, type: 'input', hidden: objVal && objVal.id ? false : true, disabled: objVal && objVal.registrationStatus === '1' ? true : false}, resourcePwd: {label: '密码', span: 12, type: 'input', hidden: objVal && objVal.id ? false : true, disabled: objVal && objVal.registrationStatus === '1' ? true : false}, description: {label: '描述', span: 12, type: 'textarea',disabled: objVal && objVal.registrationStatus === '1' ? true : false}, diff --git a/src/views/disRevenue/resource/remoteManage/remoteManage.vue b/src/views/disRevenue/resource/remoteManage/remoteManage.vue new file mode 100644 index 0000000..ab578c5 --- /dev/null +++ b/src/views/disRevenue/resource/remoteManage/remoteManage.vue @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + {{val}} + {{slotProps.row[key]}} + + + + + + + + + 更新 Github 模板 + 王小虎 提交于 2018/4/12 20:46 + + + 更新 Github 模板 + 王小虎 提交于 2018/4/3 20:46 + + + 更新 Github 模板 + 王小虎 提交于 2018/4/2 20:46 + + + + + + + + + + + + diff --git a/src/views/disRevenue/resource/remoteManage/remoteManageView.vue b/src/views/disRevenue/resource/remoteManage/remoteManageView.vue new file mode 100644 index 0000000..5d88bf0 --- /dev/null +++ b/src/views/disRevenue/resource/remoteManage/remoteManageView.vue @@ -0,0 +1,133 @@ + + + + + {{netWorkCard.title}} + + + {{val.name}} + {{val.content}} + + + + 返回 + + + + + diff --git a/src/views/disRevenue/resource/serverScript/serverScript.vue b/src/views/disRevenue/resource/serverScript/serverScript.vue new file mode 100644 index 0000000..49510f1 --- /dev/null +++ b/src/views/disRevenue/resource/serverScript/serverScript.vue @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + diff --git a/src/views/disRevenue/resource/serverScript/serverScriptDetails.vue b/src/views/disRevenue/resource/serverScript/serverScriptDetails.vue new file mode 100644 index 0000000..5661eec --- /dev/null +++ b/src/views/disRevenue/resource/serverScript/serverScriptDetails.vue @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + {{scope.field.btnName}} + + + + + + + + + + 提交 + 下一步 + 上一步 + 返回 + + + + +
王小虎 提交于 2018/4/12 20:46
王小虎 提交于 2018/4/3 20:46
王小虎 提交于 2018/4/2 20:46
{{netWorkCard.title}}
{{val.name}}
{{val.content}}