Skip to content

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

- 天馈线部分 

- 检测设备参数配置
parent f1258b20
Expand all 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 @@
<div class="item_data">{{ form.type5 }}根</div>
</el-col>
</el-row>
<!-- <el-row class="text" :gutter="24">
<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.type6 }}根</div>
</el-col>
</el-row> -->
</el-row>
</div>
</el-card>
</el-col>
......
src/views/dashboard/components/type2.vue
View file @ 97087310
......@@ -33,14 +33,14 @@
<div class="item_data">{{ form.type5 }}根</div>
</el-col>
</el-row>
<!-- <el-row class="text" :gutter="24">
<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.type6 }}根</div>
</el-col>
</el-row> -->
</el-row>
</div>
</el-card>
</el-col>
......
src/views/dashboard/components/type3.vue
View file @ 97087310
......@@ -25,14 +25,14 @@
<div class="item_data">{{ form.type5 }}根</div>
</el-col>
</el-row>
<!-- <el-row class="text" :gutter="24">
<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.count.LEAKY }}根</div>
</el-col>
</el-row> -->
</el-row>
</div>
</el-card>
</el-col>
......
src/views/dashboard/components/type4.vue
View file @ 97087310
......@@ -19,14 +19,14 @@
<div class="item_data">{{ form.type5 }}根</div>
</el-col>
</el-row>
<!-- <el-row class="text" :gutter="24">
<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.controlLimit[0].sum }}根</div>
</el-col>
</el-row> -->
</el-row>
</div>
</el-card>
</el-col>
......
src/views/dashboard/components/type5.vue
View file @ 97087310
......@@ -170,14 +170,14 @@
<div class="item_data">{{ form.baseInfo.sendPower }}dB/m</div>
</el-col>
</el-row>
<!-- <el-row class="text" :gutter="24">
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">漏缆接头数量</div>
</el-col>
<el-col :span="colspan">
<div class="item_data">{{ form.baseInfo.kmSign }}</div>
</el-col>
</el-row> -->
</el-row>
<el-row class="text" :gutter="24">
<el-col :span="10">
<div class="item_name">跳线长度</div>
......
src/views/setting/add/comp/autoAdd.vue
View file @ 97087310
This diff is collapsed.
src/views/setting/add/comp/leakyCable.vue
View file @ 97087310
......@@ -123,6 +123,20 @@
placeholder="请输入天馈线长度"
/>
</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>
<div class="btn" v-if="isEdit == 1">
<el-button type="primary" @click="cancel">取 消</el-button>
......@@ -156,6 +170,7 @@ export default {
default: () => {},
},
},
dicts: ["direction"],
watch: {
curInfo: {
immediate: true,
......@@ -222,6 +237,13 @@ export default {
trigger: "blur",
},
],
direction: [
{
required: true,
message: "请输入方向",
trigger: "blur",
},
],
},
};
},
......@@ -309,6 +331,7 @@ function formInit(data = {}) {
parentId: 0,
reductRatio: 0,
sendPower: 0,
direction:'',
...data,
};
}
......
src/views/setting/add/comp/line.vue
View file @ 97087310
......@@ -62,6 +62,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="天馈线编号：" prop="feederCode">
<el-input
v-model="leakyCableForm.feederCode"
......@@ -117,6 +118,20 @@
placeholder="请输入插入器长度"
/>
</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>
<div class="btn" v-if="isEdit == 1">
<el-button type="primary" @click="cancel">取 消</el-button>
......@@ -135,7 +150,7 @@ import {
selectForFsu,
selectForEquip,
railWaylist,
updateFeederConf
updateFeederConf,
} from "../../api";
import { successAlert, warningAlert } from "@/utils/alert";
......@@ -143,20 +158,21 @@ export default {
props: {
isEdit: {
type: Number,
default: 0
default: 0,
},
curInfo: {
type: Object,
default: () => { }
}
default: () => {},
},
},
dicts: ["direction"],
watch: {
curInfo: {
immediate: true,
handler(newV) {
this.leakyCableForm = formInit(newV);
}
}
},
},
},
data() {
return {
......@@ -192,6 +208,9 @@ export default {
feederDescribe: [
{ required: true, message: "请输入天馈线描述", trigger: "blur" },
],
feederLossMeters: [
{ required: true, message: "请输入天馈线百米损耗", trigger: "blur" },
],
feederModel: [
{
required: true,
......@@ -213,6 +232,13 @@ export default {
trigger: "blur",
},
],
direction: [
{
required: true,
message: "请输入方向",
trigger: "blur",
},
],
},
};
},
......@@ -223,18 +249,18 @@ export default {
// 编辑的确认
confirm() {
let params = {
...this.leakyCableForm
}
delete params.creationTime
updateFeederConf(params).then(res => {
...this.leakyCableForm,
};
delete params.creationTime;
updateFeederConf(params).then((res) => {
if (res.code == 200) {
this.$message.success('保存成功！');
this.$message.success("保存成功！");
}
this.cancel(true);
})
});
},
cancel(refersh) {
this.$emit('update', refersh);
this.$emit("update", refersh);
this.reset();
},
changerailWay() {
......@@ -261,12 +287,12 @@ export default {
antennaFeederSave(this.leakyCableForm).then((res) => {
if (res.code == 200) {
successAlert("添加成功");
this.leakyCableForm = formInit();
} else {
warningAlert("添加失败");
}
});
}
this.leakyCableForm = formInit();
});
},
getAllWay() {
......@@ -297,6 +323,7 @@ function formInit(data = {}) {
parentId: 0,
reductRatio: 0,
sendPower: 0,
direction: "",
...data,
};
}
......
src/views/setting/add/index.vue
View file @ 97087310
......@@ -32,12 +32,12 @@
<leakyCable />
</div>
</el-tab-pane>
<!-- <el-tab-pane label="天馈线" name="5">
<el-tab-pane label="天馈线" name="5">
<div v-if="activeName === '5'" class="content">
<div class="content-title">添加天馈线</div>
<antennaFeeder />
</div>
</el-tab-pane> -->
</el-tab-pane>
</el-tabs>
</div>
</div>
......
src/views/setting/statistics/comp/lineTable.vue
View file @ 97087310
......@@ -164,9 +164,6 @@
>
<el-link type="primary" :underline="false" @click="toEdit(row)"
>编辑</el-link
>
<el-link type="primary" :underline="false" @click="handleSetting(row)"
>参数设置</el-link
>
</template>
</el-table-column>
......
src/views/setting/statistics/comp/monitorTable.vue
View file @ 97087310
......@@ -132,12 +132,7 @@
<el-table-column prop="railWayName" label="所在铁路线" align="center" />
<el-table-column prop="siteName" label="所在站点" align="center" />
<el-table-column prop="fsuName" label="所在FSU" align="center" />
<el-table-column
prop="action"
label="操作"
align="center"
width="300px"
>
<el-table-column prop="action" label="操作" align="center" width="300px">
<template slot-scope="{ row }">
<el-link type="primary" :underline="false" @click="handleView(row)"
>查看</el-link
......@@ -145,7 +140,10 @@
<el-link type="primary" :underline="false" @click="toEdit(row)"
>编辑</el-link
>
<el-link type="primary" :underline="false" @click="handleGoParameter(row)"
<el-link
type="primary"
:underline="false"
@click="handleGoParameter(row)"
>设备数据</el-link
>
<el-link type="primary" :underline="false" @click="handleSetting(row)"
......@@ -247,7 +245,7 @@ export default {
this.getAllWay();
},
methods: {
handleGoParameter(row){
handleGoParameter(row) {
console.log(row);
this.$router.push({
path: "/setting/parameter",
......@@ -271,6 +269,8 @@ export default {
async handleSelectParam(row) {
let res = await selectParam({ equipId: row.id });
this.paramsJson = JSON.parse(res.paramsJson);
console.log("--------paramsJson------------");
console.log(this.paramsJson);
},
async handleSetting(row) {
this.rowData = row;
......
src/views/setting/statistics/index.vue
View file @ 97087310
......@@ -65,10 +65,10 @@ export default {
label: "漏缆",
key: "4",
},
// {
// label: "天馈线",
// key: "5",
// }
{
label: "天馈线",
key: "5",
}
],
tableData2: [],
tableData: [],
......
vue.config.js
View file @ 97087310
......@@ -9,15 +9,12 @@ function resolve(dir) {
const name = defaultSettings.title || '漏缆故障定位监测系统' // page title
const port = process.env.port || process.env.npm_config_port || 8890 // dev port
// const href = 'http://101.126.159.207'
// const href = 'http://127.0.0.1'
const href = 'http://192.168.0.113'
const href = 'http://127.0.0.1'
// const href = 'http://192.168.0.113'
const rewriteDefaultConfig = {
changeOrigin: true,
target: href + ':8886',
// target: 'http://192.168.0.121:8886',
// ws: true,
headers: {
......@@ -27,7 +24,6 @@ const rewriteDefaultConfig = {
const rewriteDeviceConfig = {
changeOrigin: true,
target: href + ':8087',
// target: 'http://192.168.0.121:8087',
// ws: true,
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