朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 7d987649a4875c96d70e87446df44bcaa9541f68 1 个父辈 91bc3ea7

20200623-trans

内嵌 并排对比
正在显示 15 个修改的文件 包含 145 行增加 和 352 行删除
import request from 'axios'
import qs from 'qs'
let baseUrl = '/wltp-nmms-custom-reciption-resolver'
export function postFFM(query) {
return request({
method: 'get',
url: `${baseUrl}/Rmsg/ffm`,
params: query,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
export function postFWB(query) {
return request({
method: 'get',
url: `${baseUrl}/Rmsg/fwb`,
params: query,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
export function postFHL(query) {
return request({
method: 'get',
url: `${baseUrl}/Rmsg/fhl`,
params: query,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
... ... @@ -15,7 +15,6 @@ import 'font-awesome/css/font-awesome.min.css'
import * as socketApi from './api/socket'
import '@/styles/index.scss'
import '@/styles/element-ui.scss'
import sys_init from '@/common/init/sys_init'
... ...
... ... @@ -47,9 +47,6 @@ import ComeCar from './views/staff/come_car.vue'
import OnDuty from './views/staff/on_duty.vue'
import WaterStationsPatrol from './views/water/water_stations_patrol.vue'
import Location from './views/empt/Location.vue'
import importFFMMsg from './views/airRadioMsg/importFFMMsg.vue'
import importFHLMsg from './views/airRadioMsg/importFHLMsg.vue'
import importFWBMsg from './views/airRadioMsg/importFWBMsg.vue'
//运输工具 通用业务申报
import Route from './views/airtransport/route.vue'
... ... @@ -175,17 +172,6 @@ let routes = [
]
},
{
path: '/radioMsgImport',
component: Home,
name: '航空报文导入',
iconCls:'el-icon-goods',
children:[
{path:'/ffmRadioMsgImport',component:importFFMMsg,name:'FFM报文导入'},
{path:'/fhlRadioMsgImport',component:importFHLMsg,name:'FHL报文导入'},
{path:'/fwbRadioMsgImport',component:importFWBMsg,name:'FWB报文导入'}
]
},
{
path: '/airtransport',
component: Home,
name: '通用业务申报',
... ...
... ... @@ -83,7 +83,3 @@
display: block
}
}
.el-col {
margin-right: 0px;
}
\ No newline at end of file
... ...
<template>
<div class="app-container">
<div class="filter-container">
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
<el-input
type="textarea"
:rows="40"
placeholder="请输入内容"
v-model="ffmtext">
</el-input>
</div>
</div>
</template>
<script>
import {postFFM} from "@/api/nmms/importMsg";
export default {
name: 'ImportMessage',
data() {
return {
ffmtext: ''
}
},
methods: {
handleAdd: function () {
let para = {
ffmmsg: this.ffmtext
}
postFFM(para).
then(res => {
let result = res.data
if (result==1){
this.$message({
message: '导入成功',
type: 'success',
duration: 5 * 1000
})
}
})
}
}
}
</script>
<style>
</style>
<template>
<div class="app-container">
<div class="filter-container">
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
<el-input
type="textarea"
:rows="40"
placeholder="请输入内容"
v-model="ffmtext">
</el-input>
</div>
</div>
</template>
<script>
import {postFHL} from "@/api/nmms/importMsg";
export default {
name: 'ImportMessage',
data() {
return {
ffmtext: ''
}
},
methods: {
handleAdd: function () {
let para = {
ffmmsg: this.ffmtext
}
postFHL(para).
then(res => {
let result = res.data
if (result==1){
this.$message({
message: '导入成功',
type: 'success',
duration: 5 * 1000
})
}
})
}
}
}
</script>
<style>
</style>
<template>
<div class="app-container">
<div class="filter-container">
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
<el-input
type="textarea"
:rows="40"
placeholder="请输入内容"
v-model="ffmtext">
</el-input>
</div>
</div>
</template>
<script>
import {postFWB} from "@/api/nmms/importMsg";
export default {
name: 'ImportMessage',
data() {
return {
ffmtext: ''
}
},
methods: {
handleAdd: function () {
let para = {
ffmmsg: this.ffmtext
}
postFWB(para).
then(res => {
let result = res.data
if (result==1){
this.$message({
message: '导入成功',
type: 'success',
duration: 5 * 1000
})
}
})
}
}
}
</script>
<style>
</style>
... ... @@ -225,6 +225,19 @@
label="备注">
</el-table-column>
</el-table>
<el-row>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</el-row>
</el-dialog>
</el-row>
<el-row>
... ... @@ -383,7 +396,9 @@
],
dialogTableVisible:false,
centerDialogVisible:false,
currentPage4:4,
currentPage: 1,
pageSize:10,
total:0,
msg:undefined,
tableData: [],
tableloading:true,
... ... @@ -392,7 +407,7 @@
methods:{
//航线信息查询
selectAirline(){
let params={currentPage:this.currentPage,pageSize:this.pageSize,createBy:this.airLine.createBy};
let params={currentPage:this.currentPage,pageSize:this.pageSize,aircraftNo:this.flight.aircraftNo};
this.dialogTableVisible=true;
this.tableloading=true;
selectRoute(params).then(res=>{
... ... @@ -411,7 +426,7 @@
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,aircraftNo:this.flight.aircraftNo}});
this.$router.push({path:'/queryFlights',query:{flightNo:JSON.stringify(this.flight.flightNo),flightDate:JSON.stringify(this.flight.flightDate)}});
this.centerDialogVisible=false;
}else{
this.centerDialogVisible=true;
... ... @@ -426,10 +441,11 @@
},
//分页方法
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize=val;
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage=val;
this.submitForm();
},
//航线信息查询选择功能
handleEdit(index,row){
... ... @@ -446,14 +462,37 @@
},
//加载默认值
defaultData(){
if(this.$route.query.uuid!=null){
let ob=Object.assign(this.flight,this.$route.query);
if(ob.std!=null && ob.std!=undefined && ob.std!=""){
this.flight.std=fecha.parse(ob.std,'HHmmss');
}
if(ob.sta!=null && ob.sta!=undefined &&ob.sta!=""){
this.flight.sta=fecha.parse(ob.sta,'HHmmss');
}
if(this.$route.query!=null){
this.flight.uuid=JSON.parse(this.$route.query.uuid);
this.flight.airwayCode=JSON.parse(this.$route.query.airwayCode);
this.flight.airwayNameEn=JSON.parse(this.$route.query.airwayNameEn);
this.flight.airwayNameCn=JSON.parse(this.$route.query.airwayNameCn);
this.flight.transportAgentCode=JSON.parse(this.$route.query.transportAgentCode);
this.flight.groundAgentCode=JSON.parse(this.$route.query.groundAgentCode);
this.flight.flightNo=JSON.parse(this.$route.query.flightNo);
this.flight.shareFlightNo=JSON.parse(this.$route.query.shareFlightNo);
this.flight.linesType=JSON.parse(this.$route.query.linesType);
this.flight.std=fecha.parse(JSON.parse(this.$route.query.std),'HHmmss');
this.flight.sta=fecha.parse(JSON.parse(this.$route.query.sta),'HHmmss');
this.flight.effStartdate=JSON.parse(this.$route.query.effStartdate);
this.flight.effEnddate=JSON.parse(this.$route.query.effEnddate);
this.flight.flightType=JSON.parse(this.$route.query.flightType);
this.flight.cancelFlag=JSON.parse(this.$route.query.cancelFlag);
this.flight.departurePort=JSON.parse(this.$route.query.departurePort);
this.flight.arrivalPort=JSON.parse(this.$route.query.arrivalPort);
this.flight.departureCustomNo=JSON.parse(this.$route.query.departureCustomNo);
this.flight.arrivalCustomNo=JSON.parse(this.$route.query.arrivalCustomNo);
this.flight.plan=JSON.parse(this.$route.query.plan);
this.flight.remark=JSON.parse(this.$route.query.remark);
this.flight.createTime=JSON.parse(this.$route.query.createTime);
this.flight.createBy=JSON.parse(this.$route.query.createBy);
this.flight.updateTime=JSON.parse(this.$route.query.updateTime);
this.flight.updateBy=JSON.parse(this.$route.query.updateBy);
this.flight.isDelete=JSON.parse(this.$route.query.isDelete);
this.flight.serialno=JSON.parse(this.$route.query.serialno);
this.flight.status=JSON.parse(this.$route.query.status);
this.flight.statusMsg=JSON.parse(this.$route.query.statusMsg);
this.flight.messageid=JSON.parse(this.$route.query.messageid);
}
},
... ...
... ... @@ -219,11 +219,12 @@
handleEdit(index,row){
this.$router.push({path:'/aircraft',query: row})
},
//渲染方法
mounted(){
this.defaultData();
this.submitForm();
}
},
//渲染方法
mounted(){
this.defaultData();
this.submitForm();
}
}
</script>
... ...
... ... @@ -6,26 +6,26 @@
<div class="grid-content content">航班查询</div>
</el-col>
</el-row>
<!--搜索区域-->
<!-- 搜索区域-->
<el-row>
<el-form :label-position="labelPosition" :model="queryFlight" :rules="rules" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="6">
<el-form-item label="航空公司代码：" prop="aircraftNo" label-width="110px">
<el-input v-model="queryFlight.aircraftNo"></el-input>
<el-col :span="8" >
<el-form-item label="航班号：" prop="aircraftNo" label-width="80px">
<el-input v-model="queryFlight.aircraftNo" style="width:190px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班号：" prop="flightNo" label-width="70px">
<el-input v-model="queryFlight.flightNo"></el-input>
<el-col :span="8">
<el-form-item label="航空公司代码：" prop="flightNo" label-width="110px">
<el-input v-model="queryFlight.flightNo" style="width:190px"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-button type="primary" @click="submitForm('queryFlight')">查询</el-button>
<el-col :span="6" >
<el-button type="primary" @click="submitForm()">查询</el-button>
</el-col>
</el-form>
</el-row>
<!--表单区域-->
<!-- 表单区域-->
<el-row>
<el-table
:data="tableData"
... ... @@ -77,18 +77,20 @@
</el-table-column>
<el-table-column
prop="statusMsg"
label="海关回执"
width="180">
label="海关回执">
</el-table-column>
<el-table-column
fixed="right"
prop=""
label="报文操作"
width="200">
width="150">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
... ... @@ -129,6 +131,7 @@
.row-bg{
background-color: white;
}
</style>
<script>
import {editFlight, selectFlight} from "../../api/transport";
... ... @@ -159,7 +162,6 @@
},
handleCurrentChange(val) {
this.currentPage=val;
this.submitForm();
},
//获取航班列表
submitForm(){
... ... @@ -174,11 +176,23 @@
},
//编辑航班查询功能
handleEdit(index,row){
this.$router.push({path:'/flights',query:row})
this.$router.push({path:'/flights',query:{uuid:JSON.stringify(row.uuid),airwayCode:JSON.stringify(row.airwayCode)
,airwayNameEn:JSON.stringify(row.airwayNameEn), airwayNameCn:JSON.stringify(row.airwayNameCn),
transportAgentCode:JSON.stringify(row.transportAgentCode),groundAgentCode:JSON.stringify(row.groundAgentCode),
flightNo:JSON.stringify(row.flightNo),shareFlightNo:JSON.stringify(row.shareFlightNo),linesType:JSON.stringify(row.linesType),
std:JSON.stringify(row.std), sta:JSON.stringify(row.sta),effStartdate:JSON.stringify(row.effStartdate),
effEnddate:JSON.stringify(row.effEnddate),plan:JSON.stringify(row.plan), remark:JSON.stringify(row.remark),
createTime:JSON.stringify(row.createTime),createBy:JSON.stringify(row.createBy),updateTime:JSON.stringify(row.updateTime),
updateBy:JSON.stringify(row.updateBy),isDelete:JSON.stringify(row.isDelete),flightType:JSON.stringify(row.flightType), cancelFlag:JSON.stringify(row.cancelFlag),
departurePort:JSON.stringify(row.departurePort),arrivalPort:JSON.stringify(row.arrivalPort),departureCustomNo:JSON.stringify(row.departureCustomNo),
arrivalCustomNo:JSON.stringify(row.arrivalCustomNo),serialno:JSON.stringify(row.serialno),status:JSON.stringify(row.status),
statusMsg:JSON.stringify(row.statusMsg),messageid:JSON.stringify(row.messageid)
}})
},
//获取默认值
defaultData(){
Object.assign(this.queryFlight, this.$route.query);
this.flightNo = JSON.parse(this.$route.query.flightNo);
this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
},
//列表删除功能
handleDel(index,row){
... ...
... ... @@ -232,13 +232,11 @@
this.queryFlightplan.flightDate = JSON.parse(this.$route.query.flightDate);
this.queryFlightplan.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
}
},
//编辑当日飞行计划
handleEdit(index,row){
this.$router.push({path:'/flightplan',query: row})
},
},
//渲染方法
mounted(){
... ...
... ... @@ -9,7 +9,7 @@
<el-row>
<el-form :model="queryRoute" ref="serialNo" label-width="130px" >
<el-col :span="6">
<el-form-item label="航线序号" prop="serialNo" label-width="80px">
<el-form-item label="航线序号" prop="serialNo" label-width="130px">
<el-input v-model="queryRoute.serialNo" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
... ... @@ -27,8 +27,7 @@
style="width:100%;margin-bottom: 10px">
<el-table-column
fixed="left"
label="操作"
width="100">
label="操作">
<template slot-scope="scope">
<el-button
size="mini"
... ... @@ -38,59 +37,53 @@
</el-table-column>
<el-table-column
prop="serialNo"
label="航线序号"
width="80">
label="航线序号">
</el-table-column>
<el-table-column
prop="departurePort"
label="出发港"
width="80">
label="出发港">
</el-table-column>
<el-table-column
prop="departureCustomNo"
label="出发港关区代码"
width="150">
width="120">
</el-table-column>
<el-table-column
prop="arrivalPort"
label="目的港"
width="80">
label="目的港">
</el-table-column>
<el-table-column
prop="arrivalCustomNo"
label="目的港关区代码"
width="150">
width="120">
</el-table-column>
<el-table-column
prop="std"
label="长期离港时间"
width="150">
label="长期离港时间">
</el-table-column>
<el-table-column
prop="sta"
label="长期抵港时间"
width="150">
label="长期抵港时间">
</el-table-column>
<el-table-column
prop="effStartdate"
label="有效期起始时间"
width="150">
width="120">
</el-table-column>
<el-table-column
prop="effEnddate"
label="有效期结束时间"
width="150">
width="120">
</el-table-column>
<el-table-column
prop="plan"
label="每周执行情况"
width="150">
label="每周执行情况">
</el-table-column>
<el-table-column
fixed="right"
prop="remark"
label="报文操作"
width="250">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
... ... @@ -185,7 +178,7 @@
},
//获取默认值
defaultData(){
Object.assign(this.queryRoute, this.$route.query);
let ob=Object.assign(this.queryRoute, this.$route.query);
},
//列表删除功能
handleDelete(index,row){
... ...
... ... @@ -220,12 +220,12 @@
handleEdit(index,row){
this.$router.push({path:'/routeaircraft',query: row})
},
//渲染方法
mounted(){
this.defaultData();
this.submitForm();
}
},
},
//渲染方法
mounted(){
this.defaultData();
this.submitForm();
}
}
</script>
... ...
... ... @@ -52,7 +52,7 @@
<!--编辑界面-->
<el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false">
<el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editForm">
<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
<el-form-item label="ID">
<span>{{editForm.permissionId}}</span>
</el-form-item>
... ... @@ -81,7 +81,8 @@
inactive-color="#ff4949"
active-text="是"
inactive-text="否"
>
active-value="1"
inactive-value="0">
</el-switch>
</el-form-item>
</el-form>
... ... @@ -93,46 +94,25 @@
<!--新增界面-->
<el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false">
<el-form :model="addForm" label-width="100px" :rules="addFormRules" ref="addForm">
<el-row>
<el-col :span="12">
<el-form-item label="权限名称" prop="name">
<el-input v-model="addForm.name" auto-complete="off" placeholder="请输入权限名称：例如:用户新增权限"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="权限描述" prop="description">
<el-input v-model="addForm.description" auto-complete="off" placeholder="请输入权限描述：例如:用户管理员"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
<el-form-item label="权限名称" prop="name">
<el-input v-model="addForm.name" auto-complete="off" placeholder="请输入权限名称：例如:用户新增权限"></el-input>
</el-form-item>
<el-form-item label="权限描述" prop="description">
<el-input v-model="addForm.description" auto-complete="off" placeholder="请输入权限描述：例如:用户管理员"></el-input>
</el-form-item>
<el-form-item label="权限总路径" prop="path">
<el-input v-model="addForm.path" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>
</el-form-item>
<el-form-item label="权限路径" prop="url">
<el-input v-model="addForm.url" auto-complete="off" placeholder="请输入权限描述：例如:/user/update"></el-input>
</el-form-item>
<el-row>
<el-col :span="8">
<el-form-item label="权限排序" prop="permissionOrder">
<el-input v-model="addForm.permissionOrder" auto-complete="off" placeholder="请输入权限排序：例如:123"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="设置权限上级" prop="parentId">
<el-input v-model="addForm.parentId" auto-complete="off" placeholder="请输入或者选择适配权限"></el-input>
<div style ="float:left">
<el-button type="text" @click="drawer = true">设置权限上级</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="权限排序" prop="permissionOrder">
<el-input v-model="addForm.permissionOrder" auto-complete="off" placeholder="请输入权限排序：例如:123"></el-input>
</el-form-item>
<el-form-item label="父目录ID" prop="parentId">
<el-input v-model="addForm.parentId" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>
</el-form-item>
<el-form-item label="ismenu" prop="ismenu">
<el-switch
v-model="addForm.ismenu"
... ... @@ -150,24 +130,6 @@
<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
</div>
</el-dialog>
<el-drawer
title="设置权限上级"
:visible.sync="drawer"
append-to-body
withHeader>
<el-button type="primary" @click.native="treeMerge(false)">合并节点</el-button>
<el-button type="primary" @click.native="treeMerge(true)">展开节点</el-button>
<span style="color:#E6A23C">不设置为顶级权限</span>
<el-tree :data="tableList" :props="treeDefaultProps"
@check="clickDeal"
:default-expand-all = "treeExpand"
show-checkbox
highlight-current
check-strictly
node-key="permissionId" ref="tree">
</el-tree>
</el-drawer>
</section>
</template>
... ... @@ -185,7 +147,7 @@
tableList: [],
total: 0,
pageNum: 1,
pageSize: 500,
pageSize: 100,
listLoading: false,
sels: [],//列表选中列
//编辑界面是否显示
... ... @@ -204,19 +166,11 @@
url: '',
path: '',
parentId: '',
ismenu: true,
permissionOrder:'',
chidren: [],
component: '',
method: ''
},
treeDefaultProps: {
children: 'children',
label: 'name',
ismenu: '',
permissionOrder:''
},
treeExpand: true,
addFormVisible: false,//新增界面是否显示
drawer: false,
addLoading: false,
addFormRules: {
name: [
... ... @@ -233,6 +187,9 @@
],
permissionOrder: [
{ required: true, message: '请输入排序字段', trigger: 'blur' }
],
parentId: [
{ required: true, message: '请输入父类ID', trigger: 'blur' }
]
},
//新增界面数据
... ... @@ -241,9 +198,9 @@
name: '',
url: '',
path: '',
parentId: 0,
parentId: '',
ismenu: '',
permissionOrder:'0'
permissionOrder:''
}
... ... @@ -326,14 +283,14 @@
handleAdd: function () {
this.addFormVisible = true;
this.addForm = {
description: '',
name: '',
url: '',
path: '',
parentId: 0,
ismenu: '',
permissionOrder:'0'
username: '',
password: '',
sex: 1,
address: '',
realname: '',
email: '',
mobilephone: '',
age: 1
};
},
//编辑
... ... @@ -409,17 +366,6 @@
}).catch(() => {
});
},
clickDeal: function (currentObj, treeStatus) {
this.addForm.parentId = currentObj.permissionId;
this.$refs.tree.setCheckedKeys([currentObj.permissionId]);
// this.drawer = false;
},
treeMerge: function (expand) {
this.treeExpand = expand;
for(var i=0;i<this.$refs.tree.store._getAllNodes().length;i++){
this.$refs.tree.store._getAllNodes()[i].expanded=this.treeExpand;
}
}
},
mounted() {
... ... @@ -429,9 +375,6 @@
</script>
<style rel="stylesheet/scss" lang="scss">
.el-drawer.rtl {
overflow: scroll
}
<style scoped>
</style>
\ No newline at end of file
... ...
... ... @@ -246,6 +246,7 @@
this.listLoading = false;
//NProgress.done();
}).catch((error) => {
this.listLoading = false;
if(null!= error.response && error.response!==undefined){
let status= error.response.status;
... ... @@ -263,7 +264,7 @@
getPermList() {
let para = {
pageNum: 1,
pageSize: 500
pageSize: 700
};
NProgress.start();
permList(para).then((res) => {
... ...