Skip to content

W
web-monitor
Commit 5e8319be authored by neogcg's avatar neogcg
Browse files
Options

2.23

parent bd3a2a11
Hide whitespace changes
Inline Side-by-side
Showing with 379 additions and 80 deletions
package.json
View file @ 5e8319be
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"vue-router": "3.0.6", "vue-router": "3.0.6",
"vuex": "3.1.0" "vuex": "3.1.0"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "4.4.4", "@vue/cli-plugin-babel": "4.4.4",
"@vue/cli-plugin-eslint": "4.4.4", "@vue/cli-plugin-eslint": "4.4.4",
......
src/views/setting/add/index.vue
View file @ 5e8319be
<template> <template>
<div class="add"> <div class="add">
<div class="add-tab"> <div class="add-tab">
<el-tabs v-model="activeName" :stretc="true"> <el-tabs v-model="activeName" :stretc="true" @tab-click="handleClick">
<el-tab-pane <el-tab-pane label="铁路线" name="0">
v-for="item in tabs" <div class="content" v-if="activeName === '0'">
:key="item.key" <div class="content-title">添加铁路线</div>
:label="item.label" <el-form
:name="item.key" ref="form"
/> :model="formData"
:rules="rules"
label-width="200px"
class="form"
>
<el-form-item label="铁路名：" prop="name">
<el-input v-model="formData.name" placeholder="请输入铁路名" />
</el-form-item>
<el-form-item label="铁路线起点站名：" prop="startPointName">
<el-input
v-model="formData.startPointName"
placeholder="请输入铁路线起点站名"
/>
</el-form-item>
<el-form-item label="铁路线终点站名：" prop="endPointName">
<el-input
v-model="formData.endPointName"
placeholder="请输入铁路线终点站名"
/>
</el-form-item>
<el-form-item label="铁路全长（公里）：" prop="totalLong">
<el-input
v-model="formData.totalLong"
placeholder="请输入铁路全长公里数"
/>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="站点" name="1">
<div class="content" v-if="activeName === '1'">
<div class="content-title">添加站点</div>
<el-form
ref="stationform"
:model="stationForm"
:rules="rules"
label-width="200px"
class="form"
>
<el-form-item label="站点所属铁路线：" prop="railwayName">
<el-input
v-model="stationForm.railwayName"
placeholder="请选择铁路线"
/>
</el-form-item>
<el-form-item label="站点编号：" prop="staId">
<el-input
v-model="stationForm.staId"
placeholder="请输入站点编号"
/>
</el-form-item>
<el-form-item label="站名" prop="staName">
<el-input
v-model="stationForm.staName"
placeholder="请输入站名"
/>
</el-form-item>
<el-form-item label="站点地址" prop="staAddress">
<el-input
v-model="stationForm.staAddress"
placeholder="请输入站点地址"
/>
</el-form-item>
<el-form-item label="站点所在局" prop="staOffice">
<el-input
v-model="stationForm.staOffice"
placeholder="请输入站点所在局"
/>
</el-form-item>
<el-form-item label="站点所在编号" prop="staNumber">
<el-input
v-model="stationForm.staNumber"
placeholder="请输入站点所在编号"
/>
</el-form-item>
<el-form-item label="站点所在公里标" prop="staKm">
<el-input
v-model="stationForm.staKm"
placeholder="请输入站点所在公里标"
/>
</el-form-item>
<el-form-item label="站点经度" prop="stalongitude">
<el-input
v-model="stationForm.stalongitude"
placeholder="请输入站点经度"
/>
</el-form-item>
<el-form-item label="站点维度" prop="stadimensionality">
<el-input
v-model="stationForm.stadimensionality"
placeholder="请输入站点维度"
/>
</el-form-item>
<el-form-item label="站点其他信息" prop="staOtherinfo">
<el-input
v-model="stationForm.staOtherinfo"
placeholder="请输入站点其他信息"
/>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="FSU" name="2">
<div class="content" v-if="activeName === '2'">
<div class="content-title">添加FSU</div>
<el-form
ref="FSUform"
:model="FSUForm"
:rules="rules"
label-width="200px"
class="form"
>
<el-form-item label="所在铁路线：" prop="railwayName">
<el-select
v-model="FSUForm.railwayName"
placeholder="请选择铁路线"
>
<el-option
v-for="item in FSUrailway"
:key="item.key"
:label="item.label"
:value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所在站点：" prop="station">
<el-select v-model="FSUForm.station" placeholder="请选择站点">
<el-option
v-for="item in FSUstation"
:key="item.key"
:label="item.label"
:value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="FSU身份编号" prop="FSUid">
<el-input
v-model="FSUForm.FSUid"
placeholder="请输入FSU身份编号"
/>
</el-form-item>
<el-form-item label="FSU端口数" prop="FSUport">
<el-input
v-model="FSUForm.FSUport"
placeholder="请输入FSU端口数"
/>
</el-form-item>
<el-form-item label="设备名称" prop="deviceName">
<el-input
v-model="FSUForm.deviceName"
placeholder="请输入设备名称"
/>
</el-form-item>
<el-form-item label="IP地址" prop="IP">
<el-input v-model="FSUForm.IP" placeholder="请输入IP地址" />
</el-form-item>
<el-form-item label="设备厂商" prop="deviceManufacturer">
<el-input
v-model="FSUForm.deviceManufacturer"
placeholder="请输入设备厂商"
/>
</el-form-item>
<el-form-item label="设备备用方式" prop="backup">
<el-input
v-model="FSUForm.backup"
placeholder="请选择设备备用方式"
/>
</el-form-item>
<el-form-item label="通信方式" prop="communication">
<el-input
v-model="FSUForm.communication"
placeholder="请选择通信方式"
/>
</el-form-item>
<el-form-item label="设备类型" prop="deviceType">
<el-input
v-model="FSUForm.deviceType"
placeholder="请选择设备类型"
/>
</el-form-item>
<el-form-item label="设备子类型" prop="devicechildrenType">
<el-input
v-model="FSUForm.devicechildrenType"
placeholder="请选择设备子类型"
/>
</el-form-item>
<el-form-item label="软件版本号" prop="version">
<el-input
v-model="FSUForm.version"
placeholder="请输入软件版本号"
/>
</el-form-item>
<el-form-item label="设备生产序列号" prop="seriesNumber">
<el-input
v-model="FSUForm.seriesNumber"
placeholder="请输入设备生产序列号"
/>
</el-form-item>
<el-form-item label="设备所在铁路公里标" prop="deviceKm">
<el-input
v-model="FSUForm.deviceKm"
placeholder="请输入设备所在铁路公里标"
/>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="监测设备" name="3">
<div class="content" v-if="activeName === '3'">
<div class="content-title">添加监测设备</div>
</div>
</el-tab-pane>
<el-tab-pane label="漏缆" name="4">
<div class="content" v-if="activeName === '4'">
<div class="content-title">添加漏缆</div>
</div>
</el-tab-pane>
<el-tab-pane label="天馈线" name="5">
<div class="content" v-if="activeName === '5'">
<div class="content-title">添加天馈线</div>
</div>
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<div class="content">
<div class="content-title">添加铁路信息</div>
<el-form
ref="form"
:model="formData"
:rules="rules"
label-width="200px"
class="form"
>
<el-form-item label="铁路名：" prop="name">
<el-input v-model="formData.name" placeholder="请输入铁路名" />
</el-form-item>
<el-form-item label="铁路线起点站名：" prop="start">
<el-input
v-model="formData.start"
placeholder="请输入铁路线起点站名："
/>
</el-form-item>
<el-form-item label="铁路线终点站名：" prop="end">
<el-input v-model="formData.end" placeholder="请输入铁路线终点站名" />
</el-form-item>
<el-form-item label="铁路全长（公里）：" prop="long">
<el-input
v-model="formData.long"
placeholder="请输入铁路全长公里数"
/>
</el-form-item>
</el-form>
</div>
<div class="btn"> <div class="btn">
<el-button type="primary" @click="reset">重置</el-button> <el-button type="primary" @click="reset">重置</el-button>
<el-button type="primary" @click="submit">确认提交</el-button> <el-button type="primary" @click="submit">确认提交</el-button>
...@@ -47,72 +242,131 @@ ...@@ -47,72 +242,131 @@
</template> </template>
<script> <script>
import { railWaysave } from "../api"
export default { export default {
data() { data() {
return { return {
activeName: '0', FSUrailway: [
{
key: 0,
label: "张呼客运专线",
},
{
key: 1,
label: "南昆客运专线",
},
],
FSUstation: [
{
key: 0,
label: "NiGeLong",
},
{
key: 1,
label: "STATION2",
},
],
activeName: "0",
tabs: [ tabs: [
{ {
label: '铁路线', label: "铁路线",
key: '0' key: "0",
}, },
{ {
label: '站点', label: "站点",
key: '1' key: "1",
}, },
{ {
label: 'FSU', label: "FSU",
key: '2' key: "2",
}, },
{ {
label: '监测设备', label: "监测设备",
key: '3' key: "3",
}, },
{ {
label: '漏缆', label: "漏缆",
key: '4' key: "4",
}, },
{ {
label: '天馈线', label: "天馈线",
key: '5' key: "5",
} },
], ],
formData: { formData: {
name: '', endPointName: "",
start: '', name: "",
end: '', startPointName: "",
long: '' totalLong: ""
},
stationForm: {
railwayName: "",
staId: "",
staName: "",
staAddress: "",
staOffice: "",
staNumber: "",
staKm: "",
stalongitude: "",
stadimensionality: "",
staOtherinfo: "",
},
FSUForm: {
railwayName: "",
station: "",
FSUid: "",
FSUport: "",
deviceName: "",
IP: "",
deviceManufacturer: "", //设备厂商
backup: "",
communication: "", //通信方式
deviceType: "",
devicechildrenType: "",
version: "",
seriesNumber: "",
deviceKm: "",
}, },
rules: { rules: {
name: [ name: [
{ required: true, message: '请输入铁路名', trigger: 'blur' } { required: true, message: "请输入铁路名", trigger: "blur" },
// { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
], ],
start: [ startPointName: [
{ required: true, message: '请输入铁路线起点站名', trigger: 'blur' } { required: true, message: "请输入铁路线起点站名", trigger: "blur" },
], ],
end: [ endPointName: [
{ required: true, message: '请输入铁路线终点站名', trigger: 'blur' } { required: true, message: "请输入铁路线终点站名", trigger: "blur" },
], ],
long: [ totalLong: [
{ required: true, message: '请输入铁路全长公里数', trigger: 'blur' } { required: true, message: "请输入铁路全长公里数", trigger: "blur" },
] ],
} stadimensionality: [
} { required: true, message: "请输入铁路全长公里数", trigger: "blur" },
],
},
};
}, },
methods: { methods: {
handleClick(tab, event) {
console.log(tab, event);
},
reset() { reset() {
this.$refs.form.resetFields() this.$refs.form.resetFields();
}, },
submit() { submit() {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
console.log(this.formData) console.log(this.formData);
railWaysave(this.formData).then(res=>{
console.log(res);
})
} }
}) });
} },
} },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/setting/api.js 0 → 100644
View file @ 5e8319be
import request from '@/utils/request'
const path = {
railWaylist: 'railWay/selectPage',
railWaydetail: 'railWay/detail',
railWaysave: 'railWay/save',
railWaybatchDelete: 'railWay/batchDelete',
railWayselectList: 'railWay/selectList',
}
export function railWaylist() {
return request.post(path.railWaylist, ...arguments)
}
export function railWaydetail() {
return request.post(path.railWaydetail, ...arguments)
}
export function railWaysave() {
return request.post(path.railWaysave, ...arguments)
}
export function railWaybatchDelete() {
return request.post(path.railWaybatchDelete, ...arguments)
}
export function railWayselectList() {
return request.post(path.railWayselectList, ...arguments)
}
src/views/setting/statistics/index.vue
View file @ 5e8319be
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
:limit="searchForm.pageSize" :limit="params.pageSize"
:page="searchForm.pageNum" :page="params.pageNum"
:total="total" :total="total"
class="pagination" class="pagination"
@pagination="handlePageChange" @pagination="handlePageChange"
...@@ -80,11 +80,12 @@ ...@@ -80,11 +80,12 @@
<script> <script>
import Pagination from "@/components/Pagination"; import Pagination from "@/components/Pagination";
import { railWaylist } from "../api"
export default { export default {
components: { Pagination }, components: { Pagination },
data() { data() {
return { return {
searchForm: { params: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
...@@ -198,16 +199,25 @@ export default { ...@@ -198,16 +199,25 @@ export default {
}, },
handleView() {}, handleView() {},
handlePageChange(pageData) { handlePageChange(pageData) {
this.searchForm.pageSize = pageData.size; this.params.pageSize = pageData.size;
this.searchForm.pageNum = pageData.page; this.params.pageNum = pageData.page;
this.getTableData() this.getTableData()
}, },
getTableData() { getTableData() {
this.tableData2 = this.tableData.slice(( this.searchForm.pageNum - 1) * this.searchForm.pageSize, // this.tableData2 = this.tableData.slice(( this.params.pageNum - 1) * this.params.pageSize,
this.searchForm.pageNum * this.searchForm.pageSize // this.params.pageNum * this.params.pageSize
); // );
this.total = this.tableData.length // this.total = this.tableData.length
let params = {
current: this.params.pageNum,
size: this.params.pageSize
}
railWaylist(params).then((res)=>{
console.log(res);
let list = res.records || []
this.tableData = list
this.total = res.total
})
}, },
}, },
mounted() { mounted() {
......
src/views/user/userList/api.js
View file @ 5e8319be
...@@ -5,6 +5,7 @@ const path = { ...@@ -5,6 +5,7 @@ const path = {
create: 'user/saveUser', create: 'user/saveUser',
updatePwd: 'user/updatePwd', updatePwd: 'user/updatePwd',
updateInfo: 'user/updateUserBaseInfo', updateInfo: 'user/updateUserBaseInfo',
} }
export function list() { export function list() {
...@@ -23,3 +24,4 @@ export function updateInfo() { ...@@ -23,3 +24,4 @@ export function updateInfo() {
return request.post(path.updateInfo, ...arguments) return request.post(path.updateInfo, ...arguments)
} }
src/views/user/userList/index.vue
View file @ 5e8319be
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
size: this.params.pageSize size: this.params.pageSize
} }
list(params).then(res => { list(params).then(res => {
let list = res.records || [] let list = res.records || []
this.tableData = list this.tableData = list
this.total = res.total this.total = res.total
......
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