Commit edda0535 authored by yanzhongrong's avatar yanzhongrong

Merge branch 'dev_yzr' into dev

parents 4d4c2a60 86a710f6
...@@ -29,21 +29,23 @@ ...@@ -29,21 +29,23 @@
>刷新</el-button >刷新</el-button
> >
</el-row> </el-row>
<el-tree <el-scrollbar>
v-loading="loading" <el-tree
ref="vuetree" v-loading="loading"
:props="defaultProps" ref="vuetree"
:data="data" :props="defaultProps"
:render-content="renderContent" :data="data"
:default-expand-all="true" :render-content="renderContent"
nodeKey="id" :default-expand-all="true"
class="el-tree" nodeKey="id"
current-node-key="id" class="el-tree"
:expand-on-click-node="false" current-node-key="id"
@node-click="handleClick" :expand-on-click-node="false"
> @node-click="handleClick"
<!-- :current-node-key='id' --> >
</el-tree> <!-- :current-node-key='id' -->
</el-tree>
</el-scrollbar>
</div> </div>
</template> </template>
......
...@@ -96,4 +96,14 @@ ...@@ -96,4 +96,14 @@
.el-table__body tr.hover-row>td { .el-table__body tr.hover-row>td {
background-color:#bed5ff !important; background-color:#bed5ff !important;
}
.el-scrollbar {
height: 100%;
}
.el-scrollbar__wrap {
overflow: scroll;
width: 110%;
height: 120%;
} }
\ No newline at end of file
<template>
<div class="dashboard-container">
<!-- 首页 -->
<header class="header_title">FSU</header>
<el-row :gutter="24">
<el-col :span="11" class="mb20">
<el-card shadow="never">
<div slot="header" class="clearfix posa">
<span>管理范围</span>
</div>
<div >
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.type5 }}</div>
</el-col>
</el-row>
</div>
</el-card>
</el-col>
<el-col :span="11" class="mb20">
<el-card shadow="never">
<div slot="header" class="clearfix posa">
<span>基础信息</span>
</div>
<div >
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">设备身份编号</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.equipCode }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">设备名称</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.equipName }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">设备厂商</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.equipFactory }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">IP地址</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.ip }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">所在铁路线</div>
</el-col>
<el-col :span="10">
<div class="item_data">南昆客运专线</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">所在站点</div>
</el-col>
<el-col :span="10">
<div class="item_data">81</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">所在FSU</div>
</el-col>
<el-col :span="10">
<div class="item_data">81</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">设备类别</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.equipTypeName }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">设备型号</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.equipModeName }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">设备生产序列号</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.equipSerialNumber }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">安装日期</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.installDate }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">维护日期</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.repairDate }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">设备所铁路公里标</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.kmSign }}</div>
</el-col>
</el-row>
</div>
</el-card>
</el-col>
<el-col :span="11" class="mb20 specialCard">
<el-card shadow="never">
<div slot="header" class="clearfix posa">
<span>当前状态</span>
</div>
<div >
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">设备状态</div>
</el-col>
<el-col :span="10">
<div class="item_data">正常</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">最后更新日期</div>
</el-col>
<el-col :span="10">
<div class="item_data">142根</div>
</el-col>
</el-row>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
import { DetailMixins } from './mixins'
export default {
name: 'Dashboard',
data() {
return {
}
},
mixins: [DetailMixins],
}
</script>
<style lang="scss" scoped>
.header_title {
font-size: 23px;
font-family: Source Han Sans CN;
font-weight: 500;
line-height: 40px;
text-align: center;
color: #0058ff;
letter-spacing: 10px;
opacity: 1;
margin-bottom: 20px;
}
::v-deep.el-card {
border: 1px solid #e3e3e3;
border-radius: 8px;
// min-height: 243px;
.el-card__header {
font-size: 18px;
color: #333333;
font-weight: 500;
text-align: center;
background: rgba(226, 235, 255, 0.39);
opacity: 1;
}
.el-card__body {
padding: 0px;
}
}
.specialCard {
position: absolute;
top: 180px;
}
.posa {
position: relative;
}
.text {
padding: 10px 20px 10px 20px;
border-bottom: 1px solid #e3e3e3;
&:last-child {
border-bottom: none;
}
.item_name,
.item_data {
height: 16px;
line-height: 16px;
margin-top: 12px;
margin-bottom: 12px;
}
.item_name {
width: 262px;
height: 16px;
line-height: 16px;
color: #7e7e7e;
margin-top: 12px;
margin-bottom: 12px;
}
.el-card:last-child .text {
border-bottom: none !important;
}
}
</style>
<template>
<div class="dashboard-container">
<!-- 首页 -->
<header class="header_title">漏缆</header>
<el-row :gutter="24">
<el-col :span="11" class="mb20">
<el-card shadow="never">
<div slot="header" class="clearfix posa">
<span>当前状态u</span>
</div>
<div >
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆状态</div>
</el-col>
<el-col :span="10">
<div class="item_data">正常</div>
</el-col>
</el-row>
</div>
</el-card>
</el-col>
<el-col :span="11" class="mb20">
<el-card shadow="never">
<div slot="header" class="clearfix posa">
<span>基础信息</span>
</div>
<div >
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆编号</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.leakyCableCode }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆描述</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.leakyCableDescribe }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">所在铁路线</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.wayId }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">所在站点</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.siteId }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">所在FSU</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.fsuId }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">所在监测设备</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.equipId }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆型号</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.leakyCableMode }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆长度</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.leakyCableLength }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆百米损耗</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.hundredMetersLoss }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆速度衰减系数</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.reductRatio }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆测试信号发射功率</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.sendPower }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆接头数量</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.kmSign }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">跳线长度</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.jumperLength }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">插入器长度</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.inserterLength }}</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">天馈线长度</div>
</el-col>
<el-col :span="10">
<div class="item_data">{{ form.baseInfo.antennaFeederLength }}</div>
</el-col>
</el-row>
</div>
</el-card>
</el-col>
<el-col :span="11" class="mb20 specialCard">
<el-card shadow="never">
<div slot="header" class="clearfix posa">
<span>记录信息</span>
</div>
<div >
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">历史记录</div>
</el-col>
<el-col :span="10">
<div class="item_data">正常</div>
</el-col>
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">维修记录</div>
</el-col>
<el-col :span="10">
<div class="item_data">142根</div>
</el-col>
</el-row>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
import { DetailMixins } from './mixins'
export default {
name: 'Dashboard',
data() {
return {
}
},
mixins: [DetailMixins],
}
</script>
<style lang="scss" scoped>
.header_title {
font-size: 23px;
font-family: Source Han Sans CN;
font-weight: 500;
line-height: 40px;
text-align: center;
color: #0058ff;
letter-spacing: 10px;
opacity: 1;
margin-bottom: 20px;
}
::v-deep.el-card {
border: 1px solid #e3e3e3;
border-radius: 8px;
// min-height: 243px;
.el-card__header {
font-size: 18px;
color: #333333;
font-weight: 500;
text-align: center;
background: rgba(226, 235, 255, 0.39);
opacity: 1;
}
.el-card__body {
padding: 0px;
}
}
.specialCard {
position: absolute;
top: 180px;
}
.posa {
position: relative;
}
.text {
padding: 10px 20px 10px 20px;
border-bottom: 1px solid #e3e3e3;
&:last-child {
border-bottom: none;
}
.item_name,
.item_data {
height: 16px;
line-height: 16px;
margin-top: 12px;
margin-bottom: 12px;
}
.item_name {
width: 262px;
height: 16px;
line-height: 16px;
color: #7e7e7e;
margin-top: 12px;
margin-bottom: 12px;
}
.el-card:last-child .text {
border-bottom: none !important;
}
}
</style>
export const listData2 = [
{
title: '管理范围',
list: [
{
name: 'FSU',
value: '20台',
},
{
name: '监测设备',
value: '81台',
},
{
name: '混缆',
value: '142根',
},
]
},
{
title: '基础信息',
list: [
{
name: '站点编号',
value: '29',
},
{
name: '站名',
value: 'Red Hat EnterpiseLin...',
},
{
name: '站点地址',
value: 'K556+614',
},
{
name: '所在铁路线',
value: '南昆客运专线',
},
{
name: '站点所在局',
value: '昆明铁路局.',
},
{
name: '站点所在段号',
value: '通信段',
},
{
name: '站点所在铁路公里标',
value: '192.168.1.110',
},
{
name: '站点经度',
value: 'Red Hat EnterpiseLin...',
},
{
name: '站点维度',
value: '192.168.1.110',
},
{
name: '站点监控时间',
value: 'Red Hat EnterpiseLin...',
},
{
name: '漏缆个数',
value: '192.168.1.110',
},
{
name: '天馈线个数',
value: 'Red Hat EnterpiseLin...',
},
{
name: '站点其他信息',
value: '192.168.1.110',
},
]
},
{
title: '当前状态',
list: [
{
name: '设备状态',
value: '正常',
},
{
name: '漏缆状态',
value: '正常',
}
]
},
]
export function formInit1(data = {}) { export function formInit1(data = {}) {
return { return {
deviceStatus: null, deviceStatus: null,
...@@ -118,15 +28,17 @@ export function formInit2(data = {}) { ...@@ -118,15 +28,17 @@ export function formInit2(data = {}) {
siteCode: "", siteCode: "",
siteName: "", siteName: "",
siteAddress: "", siteAddress: "",
parentId: 0,
siteArea: "", siteArea: "",
siteSectionCode: "", siteSectionCode: "",
siteKmSign: "", siteKmSign: "",
siteLongitude: "", siteLongitude: "",
siteLatitude: "", siteLatitude: "",
siteOtherMessage: "", siteOtherMessage: "",
wayId: 4, wayId: null,
}, },
type3: 0,
type4: 0,
type5: 0,
...data ...data
} }
} }
...@@ -134,20 +46,21 @@ export function formInit3(data = {}) { ...@@ -134,20 +46,21 @@ export function formInit3(data = {}) {
return { return {
deviceStatus: null, deviceStatus: null,
baseInfo: { baseInfo: {
fsuCode: "212", fsuCode: "",
fsuPort: 10, fsuPort: null,
equipName: "FSU4测试", equipName: "",
parentId: 17, ip: "",
ip: "151511", equipFactory: "",
equipFactory: "测试",
backupModeName: null, backupModeName: null,
connectModeName: "整机备份", connectModeName: "",
equipTypeName: null, equipTypeName: null,
equipSubTypeName: "以太网", equipSubTypeName: "",
softVersion: "8451", softVersion: "",
equipSerialNumber: "4651", equipSerialNumber: "",
kmSign: "46511", kmSign: "",
}, },
type4: 0,
type5: 0,
...data ...data
} }
} }
...@@ -155,22 +68,39 @@ export function formInit4(data = {}) { ...@@ -155,22 +68,39 @@ export function formInit4(data = {}) {
return { return {
deviceStatus: null, deviceStatus: null,
baseInfo: { baseInfo: {
equipCode: "001", equipCode: "",
equipName: 监测1, equipName: '',
equipFactory: "厂商001", equipFactory: "",
equipTypeName: null, equipTypeName: null,
equipModeName: null, equipModeName: null,
equipSerialNumber: "001", equipSerialNumber: "",
kmSign: "001", kmSign: "",
installDate: "2022-02-24 12:25:24", installDate: "",
repairDate: '2022-02-24 12:25:24', repairDate: '',
},
type5: 0,
...data
}
}
export function formInit5(data = {}) {
return {
deviceStatus: null,
baseInfo: {
antennaFeederLength: null,
equipId: null,
fsuId: null,
hundredMetersLoss: null,
inserterLength: null,
jumperLength: null,
leakyCableCode: "",
leakyCableDescribe: "",
leakyCableLength: null,
leakyCableMode: "",
reductRatio: null,
sendPower: null,
siteId: null,
wayId: null,
}, },
controlLimit: [
{
"sum": 1,
"type": "5"
}
],
...data ...data
} }
} }
...@@ -180,6 +110,7 @@ let formFuncData = { ...@@ -180,6 +110,7 @@ let formFuncData = {
2: formInit2, 2: formInit2,
3: formInit3, 3: formInit3,
4: formInit4, 4: formInit4,
5: formInit5,
}; };
export function formInit(type) { export function formInit(type) {
......
...@@ -42,10 +42,12 @@ export default { ...@@ -42,10 +42,12 @@ export default {
id: data id: data
} }
treeBaseInfo(param).then(res => { treeBaseInfo(param).then(res => {
let controlLimit = res.controlLimit let controlLimit = res.controlLimit || []
controlLimit.map(item => { if(controlLimit) {
res[`type${item.type}`]= item.sum controlLimit.map(item => {
}) res[`type${item.type}`]= item.sum
})
}
this.curInfo = res this.curInfo = res
}) })
}, },
......
...@@ -3,6 +3,7 @@ import request from '@/utils/request' ...@@ -3,6 +3,7 @@ import request from '@/utils/request'
const path = { const path = {
cableTypeEnum: 'equipParam/selectItem', cableTypeEnum: 'equipParam/selectItem',
saveParam: 'equipParam/saveParam', saveParam: 'equipParam/saveParam',
selectEquipByType: 'equipParam/selectEquipByType',
} }
export function cableTypeEnum() { export function cableTypeEnum() {
...@@ -12,3 +13,7 @@ export function cableTypeEnum() { ...@@ -12,3 +13,7 @@ export function cableTypeEnum() {
export function saveParam() { export function saveParam() {
return request.post(path.saveParam, ...arguments) return request.post(path.saveParam, ...arguments)
} }
export function selectEquipByType() {
return request.post(path.selectEquipByType, ...arguments)
}
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
style="width: 100%" style="width: 100%"
filterable filterable
placeholder="请选择漏缆型号" placeholder="请选择漏缆型号"
@change="checkMode"
> >
<el-option <el-option
v-for="item in equipTypeList" v-for="item in equipTypeList"
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
<script> <script>
import { rules } from './const' import { rules } from './const'
import { cableTypeEnum, saveParam } from '../api' import { cableTypeEnum, saveParam, selectEquipByType } from '../api'
export default { export default {
data() { data() {
return { return {
...@@ -86,6 +87,11 @@ export default { ...@@ -86,6 +87,11 @@ export default {
this.equipTypeList = list this.equipTypeList = list
}) })
}, },
checkMode(data) {
selectEquipByType({equipType:data}).then(res => {
this.form = res
})
},
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment