Skip to content

W
web-monitor
Commit 97087310 authored by dupengyu's avatar dupengyu
Browse files
Options

- 天馈线部分 

- 检测设备参数配置
parent f1258b20
Show whitespace changes
Inline Side-by-side
Showing with 474 additions and 381 deletions
src/views/dashboard/components/type1.vue
View file @ 97087310
...@@ -136,14 +136,14 @@ ...@@ -136,14 +136,14 @@
<div class="item_data">{{ form.type5 }}根</div> <div class="item_data">{{ form.type5 }}根</div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="10"> <el-col :span="10">
<div class="item_name">天馈线</div> <div class="item_name">天馈线</div>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="item_data">{{ form.type6 }}根</div> <div class="item_data">{{ form.type6 }}根</div>
</el-col> </el-col>
</el-row> --> </el-row>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
......
src/views/dashboard/components/type2.vue
View file @ 97087310
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
<div class="item_data">{{ form.type5 }}根</div> <div class="item_data">{{ form.type5 }}根</div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="10"> <el-col :span="10">
<div class="item_name">天馈线</div> <div class="item_name">天馈线</div>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="item_data">{{ form.type6 }}根</div> <div class="item_data">{{ form.type6 }}根</div>
</el-col> </el-col>
</el-row> --> </el-row>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
......
src/views/dashboard/components/type3.vue
View file @ 97087310
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
<div class="item_data">{{ form.type5 }}根</div> <div class="item_data">{{ form.type5 }}根</div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="10"> <el-col :span="10">
<div class="item_name">天馈线</div> <div class="item_name">天馈线</div>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="item_data">{{ form.count.LEAKY }}根</div> <div class="item_data">{{ form.count.LEAKY }}根</div>
</el-col> </el-col>
</el-row> --> </el-row>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
......
src/views/dashboard/components/type4.vue
View file @ 97087310
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
<div class="item_data">{{ form.type5 }}根</div> <div class="item_data">{{ form.type5 }}根</div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="10"> <el-col :span="10">
<div class="item_name">天馈线</div> <div class="item_name">天馈线</div>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="item_data">{{ form.controlLimit[0].sum }}根</div> <div class="item_data">{{ form.controlLimit[0].sum }}根</div>
</el-col> </el-col>
</el-row> --> </el-row>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
......
src/views/dashboard/components/type5.vue
View file @ 97087310
...@@ -170,14 +170,14 @@ ...@@ -170,14 +170,14 @@
<div class="item_data">{{ form.baseInfo.sendPower }}dB/m</div> <div class="item_data">{{ form.baseInfo.sendPower }}dB/m</div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="10"> <el-col :span="10">
<div class="item_name">漏缆接头数量</div> <div class="item_name">漏缆接头数量</div>
</el-col> </el-col>
<el-col :span="colspan"> <el-col :span="colspan">
<div class="item_data">{{ form.baseInfo.kmSign }}</div> <div class="item_data">{{ form.baseInfo.kmSign }}</div>
</el-col> </el-col>
</el-row> --> </el-row>
<el-row class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="10"> <el-col :span="10">
<div class="item_name">跳线长度</div> <div class="item_name">跳线长度</div>
......
src/views/setting/add/comp/autoAdd.vue
View file @ 97087310
<template> <template>
<div> <div>
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="基础配置" name="1">
<el-form <el-form
ref="monitorForm" ref="monitorForm"
:model="monitorForm" :model="monitorForm"
...@@ -8,7 +10,11 @@ ...@@ -8,7 +10,11 @@
class="form" class="form"
> >
<el-form-item label="检测设备：" prop="wayId"> <el-form-item label="检测设备：" prop="wayId">
<el-input v-model="rowData.equipName" disabled placeholder="检测设备" /> <el-input
v-model="rowData.equipName"
disabled
placeholder="检测设备"
/>
</el-form-item> </el-form-item>
<el-form-item label="测量周期" prop="measurementCycle"> <el-form-item label="测量周期" prop="measurementCycle">
<el-input <el-input
...@@ -43,16 +49,6 @@ ...@@ -43,16 +49,6 @@
placeholder="请输入漏缆紧急告警门限" placeholder="请输入漏缆紧急告警门限"
/> />
</el-form-item> </el-form-item>
<el-form-item label="选择漏缆" prop="device">
<el-select v-model="monitorForm.device" placeholder="请选择漏缆">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item <el-form-item
label="监测服务器IP地址" label="监测服务器IP地址"
prop="leakyCableImportantAlarmThreshold" prop="leakyCableImportantAlarmThreshold"
...@@ -62,24 +58,43 @@ ...@@ -62,24 +58,43 @@
placeholder="请输入监测服务器IP地址" placeholder="请输入监测服务器IP地址"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设备端口类型" prop="devicePortType"> <el-form-item label="设备输出功率" prop="deviceOutputPower">
<el-select v-model="monitorForm.devicePortType" placeholder="请选择"> <el-input
<el-option v-model="monitorForm.deviceOutputPower"
v-for="item in typeList" placeholder="请输入设备输出功率"
:key="item.value" />
:label="item.label" </el-form-item>
:value="item.value" <el-form-item label="设备的起始频率" prop="deviceStartFrequency">
></el-option> <el-input
</el-select> v-model="monitorForm.deviceStartFrequency"
placeholder="请输入设备的起始频率"
/>
</el-form-item>
<el-form-item label="设备的终止频率" prop="deviceEndFrequency">
<el-input
v-model="monitorForm.deviceEndFrequency"
placeholder="请输入设备的终止频率"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSub('monitorForm')"
>确定</el-button
>
<el-button @click="handleClose()">取消</el-button>
</el-form-item> </el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="上行漏缆1" name="2">
<el-form
ref="monitorForm"
:model="monitorForm"
:rules="rules"
label-width="200px"
class="form"
>
<el-form-item <el-form-item
label="上行漏缆1起始位置" label="上行漏缆1起始位置"
prop="uplinkLeakyCable1StartPosition" prop="uplinkLeakyCable1StartPosition"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '2') &&
(monitorForm.device == '0' || monitorForm.device === '1')
"
> >
<el-input <el-input
v-model="monitorForm.uplinkLeakyCable1StartPosition" v-model="monitorForm.uplinkLeakyCable1StartPosition"
...@@ -90,11 +105,6 @@ ...@@ -90,11 +105,6 @@
<el-form-item <el-form-item
label="上行漏缆1终止位置" label="上行漏缆1终止位置"
prop="uplinkLeakyCable1EndPosition" prop="uplinkLeakyCable1EndPosition"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '2') &&
(monitorForm.device == '0' || monitorForm.device === '1')
"
> >
<el-input <el-input
v-model="monitorForm.uplinkLeakyCable1EndPosition" v-model="monitorForm.uplinkLeakyCable1EndPosition"
...@@ -102,42 +112,42 @@ ...@@ -102,42 +112,42 @@
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="下行漏缆1起始位置" label="上行漏缆1百米损耗"
prop="downlinkLeakyCable1StartPosition" prop="uplinkLeakyCable1HundredMeterLoss"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '3') &&
(monitorForm.device == '0' || monitorForm.device === '1')
"
> >
<el-input <el-input
v-model="monitorForm.downlinkLeakyCable1StartPosition" v-model="monitorForm.uplinkLeakyCable1HundredMeterLoss"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="下行漏缆1终止位置" label="上行漏缆1相对传播速度"
prop="downlinkLeakyCable1EndPosition" prop="uplinkLeakyCable1RelativePropagationSpeed"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '3') &&
(monitorForm.device == '0' || monitorForm.device === '1')
"
> >
<el-input <el-input
v-model="monitorForm.downlinkLeakyCable1EndPosition" v-model="monitorForm.uplinkLeakyCable1RelativePropagationSpeed"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSub('monitorForm')"
>确定</el-button
>
<el-button @click="handleClose()">取消</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="上行漏缆2" name="4">
<el-form
ref="monitorForm"
:model="monitorForm"
:rules="rules"
label-width="200px"
class="form"
>
<el-form-item <el-form-item
label="上行漏缆2起始位置" label="上行漏缆2起始位置"
prop="uplinkLeakyCable2StartPosition" prop="uplinkLeakyCable2StartPosition"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '2') &&
(monitorForm.device == '0' || monitorForm.device === '2')
"
> >
<el-input <el-input
v-model="monitorForm.uplinkLeakyCable2StartPosition" v-model="monitorForm.uplinkLeakyCable2StartPosition"
...@@ -147,11 +157,6 @@ ...@@ -147,11 +157,6 @@
<el-form-item <el-form-item
label="上行漏缆2终止位置" label="上行漏缆2终止位置"
prop="uplinkLeakyCable2EndPosition" prop="uplinkLeakyCable2EndPosition"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '2') &&
(monitorForm.device == '0' || monitorForm.device === '2')
"
> >
<el-input <el-input
v-model="monitorForm.uplinkLeakyCable2EndPosition" v-model="monitorForm.uplinkLeakyCable2EndPosition"
...@@ -159,171 +164,137 @@ ...@@ -159,171 +164,137 @@
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="下行漏缆2起始位置" label="上行漏缆2百米损耗"
prop="downlinkLeakyCable2StartPosition" prop="uplinkLeakyCable2HundredMeterLoss"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '3') &&
(monitorForm.device == '0' || monitorForm.device === '2')
"
> >
<el-input <el-input
v-model="monitorForm.downlinkLeakyCable2StartPosition" v-model="monitorForm.uplinkLeakyCable2HundredMeterLoss"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="下行漏缆2终止位置" label="上行漏缆2相对传播速度"
prop="downlinkLeakyCable2EndPosition" prop="uplinkLeakyCable2RelativePropagationSpeed"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '3') &&
(monitorForm.device == '0' || monitorForm.device === '2')
"
> >
<el-input <el-input
v-model="monitorForm.downlinkLeakyCable2EndPosition" v-model="monitorForm.uplinkLeakyCable2RelativePropagationSpeed"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSub('monitorForm')"
>确定</el-button
>
<el-button @click="handleClose()">取消</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="下行漏缆1" name="3">
<el-form
ref="monitorForm"
:model="monitorForm"
:rules="rules"
label-width="200px"
class="form"
>
<el-form-item <el-form-item
label="上行漏缆1百米损耗" label="下行漏缆1起始位置"
prop="uplinkLeakyCable1HundredMeterLoss" prop="downlinkLeakyCable1StartPosition"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '2') &&
(monitorForm.device == '0' || monitorForm.device === '1')
"
> >
<el-input <el-input
v-model="monitorForm.uplinkLeakyCable1HundredMeterLoss" v-model="monitorForm.downlinkLeakyCable1StartPosition"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="下行漏缆1百米损耗" label="下行漏缆1终止位置"
prop="downlinkLeakyCable1HundredMeterLoss" prop="downlinkLeakyCable1EndPosition"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '3') &&
(monitorForm.device == '0' || monitorForm.device === '1')
"
> >
<el-input <el-input
v-model="monitorForm.downlinkLeakyCable1HundredMeterLoss" v-model="monitorForm.downlinkLeakyCable1EndPosition"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="上行漏缆2百米损耗" label="下行漏缆1百米损耗"
prop="uplinkLeakyCable2HundredMeterLoss" prop="downlinkLeakyCable1HundredMeterLoss"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '2') &&
(monitorForm.device == '0' || monitorForm.device === '2')
"
> >
<el-input <el-input
v-model="monitorForm.uplinkLeakyCable2HundredMeterLoss" v-model="monitorForm.downlinkLeakyCable1HundredMeterLoss"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="下行漏缆2百米损耗" label="下行漏缆1相对传播速度"
prop="downlinkLeakyCable2HundredMeterLoss" prop="downlinkLeakyCable1RelativePropagationSpeed"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '3') &&
(monitorForm.device == '0' || monitorForm.device === '2')
"
> >
<el-input <el-input
v-model="monitorForm.downlinkLeakyCable2HundredMeterLoss" v-model="monitorForm.downlinkLeakyCable1RelativePropagationSpeed"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSub('monitorForm')"
>确定</el-button
>
<el-button @click="handleClose()">取消</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="下行漏缆2" name="5">
<el-form
ref="monitorForm"
:model="monitorForm"
:rules="rules"
label-width="200px"
class="form"
>
<el-form-item <el-form-item
label="上行漏缆1相对传播速度" label="下行漏缆2起始位置"
prop="uplinkLeakyCable1RelativePropagationSpeed" prop="downlinkLeakyCable2StartPosition"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '2') &&
(monitorForm.device == '0' || monitorForm.device === '1')
"
> >
<el-input <el-input
v-model="monitorForm.uplinkLeakyCable1RelativePropagationSpeed" v-model="monitorForm.downlinkLeakyCable2StartPosition"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="下行漏缆1相对传播速度" label="下行漏缆2终止位置"
prop="downlinkLeakyCable1RelativePropagationSpeed" prop="downlinkLeakyCable2EndPosition"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '3') &&
(monitorForm.device == '0' || monitorForm.device === '1')
"
> >
<el-input <el-input
v-model="monitorForm.downlinkLeakyCable1RelativePropagationSpeed" v-model="monitorForm.downlinkLeakyCable2EndPosition"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="上行漏缆2相对传播速度" label="下行漏缆2百米损耗"
prop="uplinkLeakyCable2RelativePropagationSpeed" prop="downlinkLeakyCable2HundredMeterLoss"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '2') &&
(monitorForm.device == '0' || monitorForm.device === '2')
"
> >
<el-input <el-input
v-model="monitorForm.uplinkLeakyCable2RelativePropagationSpeed" v-model="monitorForm.downlinkLeakyCable2HundredMeterLoss"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="下行漏缆2相对传播速度" label="下行漏缆2相对传播速度"
prop="downlinkLeakyCable2RelativePropagationSpeed" prop="downlinkLeakyCable2RelativePropagationSpeed"
v-if="
(monitorForm.devicePortType == '1' ||
monitorForm.devicePortType == '3') &&
(monitorForm.device == '0' || monitorForm.device === '2')
"
> >
<el-input <el-input
v-model="monitorForm.downlinkLeakyCable2RelativePropagationSpeed" v-model="monitorForm.downlinkLeakyCable2RelativePropagationSpeed"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设备输出功率" prop="deviceOutputPower">
<el-input
v-model="monitorForm.deviceOutputPower"
placeholder="请输入设备输出功率"
/>
</el-form-item>
<el-form-item label="设备的起始频率" prop="deviceStartFrequency">
<el-input
v-model="monitorForm.deviceStartFrequency"
placeholder="请输入设备的起始频率"
/>
</el-form-item>
<el-form-item label="设备的终止频率" prop="deviceEndFrequency">
<el-input
v-model="monitorForm.deviceEndFrequency"
placeholder="请输入设备的终止频率"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="handleSub">确定</el-button> <el-button type="primary" @click="handleSub('monitorForm')"
>确定</el-button
>
<el-button @click="handleClose()">取消</el-button> <el-button @click="handleClose()">取消</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-tab-pane>
</el-tabs>
</div> </div>
</template> </template>
...@@ -331,21 +302,20 @@ ...@@ -331,21 +302,20 @@
export default { export default {
data() { data() {
return { return {
activeName: "1",
device: "1",
monitorForm: { monitorForm: {
device: "0",
devicePortType: "1", devicePortType: "1",
}, },
options: [ options: [
{ value: "0", label: "全部" },
{ value: "1", label: "漏缆1" }, { value: "1", label: "漏缆1" },
{ value: "2", label: "漏缆2" }, { value: "2", label: "漏缆2" },
], ],
typeList: [ rules: {
// { value: "1", label: "上下行" }, devicePortType: [
{ value: "2", label: "上行" }, { required: true, message: "请选择端口类型", trigger: "blur" },
{ value: "3", label: "下行" },
], ],
rules: {}, },
}; };
}, },
props: { props: {
...@@ -369,10 +339,90 @@ export default { ...@@ -369,10 +339,90 @@ export default {
}, },
}, },
methods: { methods: {
handleSub() { handleSub(formName) {
let JsonData = {};
switch (this.activeName) {
case "1":
JsonData = {
measurementCycle: this.monitorForm.measurementCycle,
leakyCableGeneralAlarmThreshold:
this.monitorForm.leakyCableGeneralAlarmThreshold,
leakyCableImportantAlarmThreshold:
this.monitorForm.leakyCableImportantAlarmThreshold,
leakyCableEmergencyAlarmThreshold:
this.monitorForm.leakyCableEmergencyAlarmThreshold,
serverIp: this.monitorForm.serverIp,
deviceOutputPower: this.monitorForm.deviceOutputPower,
deviceStartFrequency: this.monitorForm.deviceStartFrequency,
deviceEndFrequency: this.monitorForm.deviceEndFrequency,
};
break;
case "2":
JsonData = {
devicePortType: 1,
uplinkLeakyCable1StartPosition:
this.monitorForm.uplinkLeakyCable1StartPosition,
uplinkLeakyCable1EndPosition:
this.monitorForm.uplinkLeakyCable1EndPosition,
uplinkLeakyCable1HundredMeterLoss:
this.monitorForm.uplinkLeakyCable1HundredMeterLoss,
uplinkLeakyCable1RelativePropagationSpeed:
this.monitorForm.uplinkLeakyCable1RelativePropagationSpeed,
};
break;
case "3":
JsonData = {
devicePortType: 2,
downlinkLeakyCable1StartPosition:
this.monitorForm.downlinkLeakyCable1StartPosition,
downlinkLeakyCable1EndPosition:
this.monitorForm.downlinkLeakyCable1EndPosition,
downlinkLeakyCable1HundredMeterLoss:
this.monitorForm.downlinkLeakyCable1HundredMeterLoss,
downlinkLeakyCable1RelativePropagationSpeed:
this.monitorForm.downlinkLeakyCable1RelativePropagationSpeed,
};
break;
case "4":
JsonData = {
devicePortType: 1,
uplinkLeakyCable2StartPosition:
this.monitorForm.uplinkLeakyCable2StartPosition,
uplinkLeakyCable2EndPosition:
this.monitorForm.uplinkLeakyCable2EndPosition,
uplinkLeakyCable2HundredMeterLoss:
this.monitorForm.uplinkLeakyCable2HundredMeterLoss,
uplinkLeakyCable2RelativePropagationSpeed:
this.monitorForm.uplinkLeakyCable2RelativePropagationSpeed,
};
break;
case "5":
JsonData = {
devicePortType: 2,
downlinkLeakyCable2StartPosition:
this.monitorForm.downlinkLeakyCable2StartPosition,
downlinkLeakyCable2EndPosition:
this.monitorForm.downlinkLeakyCable2EndPosition,
downlinkLeakyCable2HundredMeterLoss:
this.monitorForm.downlinkLeakyCable2HundredMeterLoss,
downlinkLeakyCable2RelativePropagationSpeed:
this.monitorForm.downlinkLeakyCable2RelativePropagationSpeed,
};
default:
break;
}
JsonData = Object.fromEntries(
Object.entries(JsonData).filter(([_, v]) => v !== undefined)
);
this.$refs[formName].validate((valid) => {
if (valid) {
this.$emit("update", { this.$emit("update", {
equipId: this.rowData.id, equipId: this.rowData.id,
paramsJson: this.monitorForm, paramsJson: JsonData,
});
} else {
return false;
}
}); });
}, },
handleClose() { handleClose() {
......
src/views/setting/add/comp/leakyCable.vue
View file @ 97087310
...@@ -123,6 +123,20 @@ ...@@ -123,6 +123,20 @@
placeholder="请输入天馈线长度" placeholder="请输入天馈线长度"
/> />
</el-form-item> </el-form-item>
<el-form-item label="方向" prop="direction">
<el-select
v-model="leakyCableForm.direction"
placeholder="菜单状态"
clearable
>
<el-option
v-for="dict in dict.type.direction"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form> </el-form>
<div class="btn" v-if="isEdit == 1"> <div class="btn" v-if="isEdit == 1">
<el-button type="primary" @click="cancel">取 消</el-button> <el-button type="primary" @click="cancel">取 消</el-button>
...@@ -156,6 +170,7 @@ export default { ...@@ -156,6 +170,7 @@ export default {
default: () => {}, default: () => {},
}, },
}, },
dicts: ["direction"],
watch: { watch: {
curInfo: { curInfo: {
immediate: true, immediate: true,
...@@ -222,6 +237,13 @@ export default { ...@@ -222,6 +237,13 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
direction: [
{
required: true,
message: "请输入方向",
trigger: "blur",
},
],
}, },
}; };
}, },
...@@ -309,6 +331,7 @@ function formInit(data = {}) { ...@@ -309,6 +331,7 @@ function formInit(data = {}) {
parentId: 0, parentId: 0,
reductRatio: 0, reductRatio: 0,
sendPower: 0, sendPower: 0,
direction:'',
...data, ...data,
}; };
} }
......
src/views/setting/add/comp/line.vue
View file @ 97087310
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="天馈线编号：" prop="feederCode"> <el-form-item label="天馈线编号：" prop="feederCode">
<el-input <el-input
v-model="leakyCableForm.feederCode" v-model="leakyCableForm.feederCode"
...@@ -117,6 +118,20 @@ ...@@ -117,6 +118,20 @@
placeholder="请输入插入器长度" placeholder="请输入插入器长度"
/> />
</el-form-item> </el-form-item>
<el-form-item label="方向" prop="direction">
<el-select
v-model="leakyCableForm.direction"
placeholder="菜单状态"
clearable
>
<el-option
v-for="dict in dict.type.direction"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form> </el-form>
<div class="btn" v-if="isEdit == 1"> <div class="btn" v-if="isEdit == 1">
<el-button type="primary" @click="cancel">取 消</el-button> <el-button type="primary" @click="cancel">取 消</el-button>
...@@ -135,7 +150,7 @@ import { ...@@ -135,7 +150,7 @@ import {
selectForFsu, selectForFsu,
selectForEquip, selectForEquip,
railWaylist, railWaylist,
updateFeederConf updateFeederConf,
} from "../../api"; } from "../../api";
import { successAlert, warningAlert } from "@/utils/alert"; import { successAlert, warningAlert } from "@/utils/alert";
...@@ -143,20 +158,21 @@ export default { ...@@ -143,20 +158,21 @@ export default {
props: { props: {
isEdit: { isEdit: {
type: Number, type: Number,
default: 0 default: 0,
}, },
curInfo: { curInfo: {
type: Object, type: Object,
default: () => { } default: () => {},
} },
}, },
dicts: ["direction"],
watch: { watch: {
curInfo: { curInfo: {
immediate: true, immediate: true,
handler(newV) { handler(newV) {
this.leakyCableForm = formInit(newV); this.leakyCableForm = formInit(newV);
} },
} },
}, },
data() { data() {
return { return {
...@@ -192,6 +208,9 @@ export default { ...@@ -192,6 +208,9 @@ export default {
feederDescribe: [ feederDescribe: [
{ required: true, message: "请输入天馈线描述", trigger: "blur" }, { required: true, message: "请输入天馈线描述", trigger: "blur" },
], ],
feederLossMeters: [
{ required: true, message: "请输入天馈线百米损耗", trigger: "blur" },
],
feederModel: [ feederModel: [
{ {
required: true, required: true,
...@@ -213,6 +232,13 @@ export default { ...@@ -213,6 +232,13 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
direction: [
{
required: true,
message: "请输入方向",
trigger: "blur",
},
],
}, },
}; };
}, },
...@@ -223,18 +249,18 @@ export default { ...@@ -223,18 +249,18 @@ export default {
// 编辑的确认 // 编辑的确认
confirm() { confirm() {
let params = { let params = {
...this.leakyCableForm ...this.leakyCableForm,
} };
delete params.creationTime delete params.creationTime;
updateFeederConf(params).then(res => { updateFeederConf(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success('保存成功！'); this.$message.success("保存成功！");
} }
this.cancel(true); this.cancel(true);
}) });
}, },
cancel(refersh) { cancel(refersh) {
this.$emit('update', refersh); this.$emit("update", refersh);
this.reset(); this.reset();
}, },
changerailWay() { changerailWay() {
...@@ -261,12 +287,12 @@ export default { ...@@ -261,12 +287,12 @@ export default {
antennaFeederSave(this.leakyCableForm).then((res) => { antennaFeederSave(this.leakyCableForm).then((res) => {
if (res.code == 200) { if (res.code == 200) {
successAlert("添加成功"); successAlert("添加成功");
this.leakyCableForm = formInit();
} else { } else {
warningAlert("添加失败"); warningAlert("添加失败");
} }
}); });
} }
this.leakyCableForm = formInit();
}); });
}, },
getAllWay() { getAllWay() {
...@@ -297,6 +323,7 @@ function formInit(data = {}) { ...@@ -297,6 +323,7 @@ function formInit(data = {}) {
parentId: 0, parentId: 0,
reductRatio: 0, reductRatio: 0,
sendPower: 0, sendPower: 0,
direction: "",
...data, ...data,
}; };
} }
......
src/views/setting/add/index.vue
View file @ 97087310
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
<leakyCable /> <leakyCable />
</div> </div>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="天馈线" name="5"> <el-tab-pane label="天馈线" name="5">
<div v-if="activeName === '5'" class="content"> <div v-if="activeName === '5'" class="content">
<div class="content-title">添加天馈线</div> <div class="content-title">添加天馈线</div>
<antennaFeeder /> <antennaFeeder />
</div> </div>
</el-tab-pane> --> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
......
src/views/setting/statistics/comp/lineTable.vue
View file @ 97087310
...@@ -164,9 +164,6 @@ ...@@ -164,9 +164,6 @@
> >
<el-link type="primary" :underline="false" @click="toEdit(row)" <el-link type="primary" :underline="false" @click="toEdit(row)"
>编辑</el-link >编辑</el-link
>
<el-link type="primary" :underline="false" @click="handleSetting(row)"
>参数设置</el-link
> >
</template> </template>
</el-table-column> </el-table-column>
......
src/views/setting/statistics/comp/monitorTable.vue
View file @ 97087310
...@@ -132,12 +132,7 @@ ...@@ -132,12 +132,7 @@
<el-table-column prop="railWayName" label="所在铁路线" align="center" /> <el-table-column prop="railWayName" label="所在铁路线" align="center" />
<el-table-column prop="siteName" label="所在站点" align="center" /> <el-table-column prop="siteName" label="所在站点" align="center" />
<el-table-column prop="fsuName" label="所在FSU" align="center" /> <el-table-column prop="fsuName" label="所在FSU" align="center" />
<el-table-column <el-table-column prop="action" label="操作" align="center" width="300px">
prop="action"
label="操作"
align="center"
width="300px"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link type="primary" :underline="false" @click="handleView(row)" <el-link type="primary" :underline="false" @click="handleView(row)"
>查看</el-link >查看</el-link
...@@ -145,7 +140,10 @@ ...@@ -145,7 +140,10 @@
<el-link type="primary" :underline="false" @click="toEdit(row)" <el-link type="primary" :underline="false" @click="toEdit(row)"
>编辑</el-link >编辑</el-link
> >
<el-link type="primary" :underline="false" @click="handleGoParameter(row)" <el-link
type="primary"
:underline="false"
@click="handleGoParameter(row)"
>设备数据</el-link >设备数据</el-link
> >
<el-link type="primary" :underline="false" @click="handleSetting(row)" <el-link type="primary" :underline="false" @click="handleSetting(row)"
...@@ -247,7 +245,7 @@ export default { ...@@ -247,7 +245,7 @@ export default {
this.getAllWay(); this.getAllWay();
}, },
methods: { methods: {
handleGoParameter(row){ handleGoParameter(row) {
console.log(row); console.log(row);
this.$router.push({ this.$router.push({
path: "/setting/parameter", path: "/setting/parameter",
...@@ -271,6 +269,8 @@ export default { ...@@ -271,6 +269,8 @@ export default {
async handleSelectParam(row) { async handleSelectParam(row) {
let res = await selectParam({ equipId: row.id }); let res = await selectParam({ equipId: row.id });
this.paramsJson = JSON.parse(res.paramsJson); this.paramsJson = JSON.parse(res.paramsJson);
console.log("--------paramsJson------------");
console.log(this.paramsJson);
}, },
async handleSetting(row) { async handleSetting(row) {
this.rowData = row; this.rowData = row;
......
src/views/setting/statistics/index.vue
View file @ 97087310
...@@ -65,10 +65,10 @@ export default { ...@@ -65,10 +65,10 @@ export default {
label: "漏缆", label: "漏缆",
key: "4", key: "4",
}, },
// { {
// label: "天馈线", label: "天馈线",
// key: "5", key: "5",
// } }
], ],
tableData2: [], tableData2: [],
tableData: [], tableData: [],
......
vue.config.js
View file @ 97087310
...@@ -9,15 +9,12 @@ function resolve(dir) { ...@@ -9,15 +9,12 @@ function resolve(dir) {
const name = defaultSettings.title || '漏缆故障定位监测系统' // page title const name = defaultSettings.title || '漏缆故障定位监测系统' // page title
const port = process.env.port || process.env.npm_config_port || 8890 // dev port const port = process.env.port || process.env.npm_config_port || 8890 // dev port
// const href = 'http://101.126.159.207' // const href = 'http://101.126.159.207'
// const href = 'http://127.0.0.1' const href = 'http://127.0.0.1'
const href = 'http://192.168.0.113' // const href = 'http://192.168.0.113'
const rewriteDefaultConfig = { const rewriteDefaultConfig = {
changeOrigin: true, changeOrigin: true,
target: href + ':8886', target: href + ':8886',
// target: 'http://192.168.0.121:8886', // target: 'http://192.168.0.121:8886',
// ws: true, // ws: true,
headers: { headers: {
...@@ -27,7 +24,6 @@ const rewriteDefaultConfig = { ...@@ -27,7 +24,6 @@ const rewriteDefaultConfig = {
const rewriteDeviceConfig = { const rewriteDeviceConfig = {
changeOrigin: true, changeOrigin: true,
target: href + ':8087', target: href + ':8087',
// target: 'http://192.168.0.121:8087', // target: 'http://192.168.0.121:8087',
// ws: true, // ws: true,
headers: { headers: {
......
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