朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 02e53712d3efc5e86d21606244fdc1218c821045 1 个父辈 4c7fbcf1

运输工具测试

内嵌 并排对比
正在显示 9 个修改的文件 包含 139 行增加 和 44 行删除
@@ -39,6 +39,9 @@ export const editBill=params=>{return http.put(`${baseUrlBill}/editBill`, param @@ -39,6 +39,9 @@ export const editBill=params=>{return http.put(`${baseUrlBill}/editBill`, param
39 //航班申报 39 //航班申报
40 //新增方法 40 //新增方法
41 export const addFlight = params => { return http.post(`${baseUrlFlight}/addFlight`, params); }; 41 export const addFlight = params => { return http.post(`${baseUrlFlight}/addFlight`, params); };
  42 +//保存并发送
  43 +export const sendFlight = params => { return http.post(`${baseUrlFlight}/sendFlight`, params); };
  44 +
42 //查询列表 45 //查询列表
43 export const selectFlight=params=>{return http.get(`${baseUrlFlight}/selectFlight`, params);}; 46 export const selectFlight=params=>{return http.get(`${baseUrlFlight}/selectFlight`, params);};
44 //删除方法 47 //删除方法
@@ -47,6 +50,9 @@ export const editFlight=params=>{return http.put(`${baseUrlFlight}/editFlight`, @@ -47,6 +50,9 @@ export const editFlight=params=>{return http.put(`${baseUrlFlight}/editFlight`,
47 //航班当日计划申报 50 //航班当日计划申报
48 //新增方法 51 //新增方法
49 export const addFlightPlan = params => { return http.post(`${baseUrlFlightPlan}/addFlightPlan`, params); }; 52 export const addFlightPlan = params => { return http.post(`${baseUrlFlightPlan}/addFlightPlan`, params); };
  53 +//保存并发送
  54 +export const sendFlightPlan = params => { return http.post(`${baseUrlFlightPlan}/sendFlightPlan`, params); };
  55 +
50 //查询列表 56 //查询列表
51 export const selectFlightPlan=params=>{return http.get(`${baseUrlFlightPlan}/selectFlightPlan`, params);}; 57 export const selectFlightPlan=params=>{return http.get(`${baseUrlFlightPlan}/selectFlightPlan`, params);};
52 //删除方法 58 //删除方法
@@ -55,6 +61,8 @@ export const editFlightPlan=params=>{return http.put(`${baseUrlFlightPlan}/editF @@ -55,6 +61,8 @@ export const editFlightPlan=params=>{return http.put(`${baseUrlFlightPlan}/editF
55 //通用航空器申报 61 //通用航空器申报
56 //新增方法 62 //新增方法
57 export const addAircraft = params => { return http.post(`${baseUrlAircraft}/addAircraft`, params); }; 63 export const addAircraft = params => { return http.post(`${baseUrlAircraft}/addAircraft`, params); };
  64 +//保存并发送
  65 +export const sendAircraft = params => { return http.post(`${baseUrlAircraft}/sendAircraft`, params); };
58 //查询列表 66 //查询列表
59 export const selectAircraft=params=>{return http.get(`${baseUrlAircraft}/selectAircraft`, params);}; 67 export const selectAircraft=params=>{return http.get(`${baseUrlAircraft}/selectAircraft`, params);};
60 //删除方法 68 //删除方法
@@ -63,6 +71,9 @@ export const editAircraft=params=>{return http.put(`${baseUrlAircraft}/editAircr @@ -63,6 +71,9 @@ export const editAircraft=params=>{return http.put(`${baseUrlAircraft}/editAircr
63 //航线航空器申报 71 //航线航空器申报
64 //新增方法 72 //新增方法
65 export const addAirLineAircraft = params => { return http.post(`${baseUrlAirLineAircraft}/addAirLineAircraft`, params); }; 73 export const addAirLineAircraft = params => { return http.post(`${baseUrlAirLineAircraft}/addAirLineAircraft`, params); };
  74 +//保存并发送
  75 +export const sendAirLineAircraft = params => { return http.post(`${baseUrlAirLineAircraft}/sendAirLineAircraft`, params); };
  76 +
66 //删除方法 77 //删除方法
67 export const editAirLineAircraft=params=>{return http.put(`${baseUrlAirLineAircraft}/editAirLineAircraft`, params);}; 78 export const editAirLineAircraft=params=>{return http.put(`${baseUrlAirLineAircraft}/editAirLineAircraft`, params);};
68 //查询列表 79 //查询列表
@@ -200,21 +200,21 @@ let routes = [ @@ -200,21 +200,21 @@ let routes = [
200 // { path: '/group', component: Group, name: '集团管理'} 200 // { path: '/group', component: Group, name: '集团管理'}
201 ] 201 ]
202 }, 202 },
203 - // {  
204 - // path: '/admin',  
205 - // component: Home,  
206 - // name: '系统设置',  
207 - // iconCls: 'el-icon-setting',//图标样式class  
208 - // children: [  
209 - // { path: '/user', component: User, name: '用户管理' },  
210 - // { path: '/role', component: Role, name: '组织机构' },  
211 - // { path: '/perm', component: Perm, name: '权限管理' },  
212 - // { path: '/log', component: LOG, name: '系统日志' },  
213 - // { path: '/department', component: Department, name: '部门管理' },  
214 - // { path: '/company', component: Company, name: '公司管理'},  
215 - // { path: '/group', component: Group, name: '集团管理'}  
216 - // ]  
217 - // }, 203 + {
  204 + path: '/admin',
  205 + component: Home,
  206 + name: '系统设置',
  207 + iconCls: 'el-icon-setting',//图标样式class
  208 + children: [
  209 + { path: '/user', component: User, name: '用户管理' },
  210 + { path: '/role', component: Role, name: '组织机构' },
  211 + { path: '/perm', component: Perm, name: '权限管理' },
  212 + { path: '/log', component: LOG, name: '系统日志' },
  213 + { path: '/department', component: Department, name: '部门管理' },
  214 + { path: '/company', component: Company, name: '公司管理'},
  215 + { path: '/group', component: Group, name: '集团管理'}
  216 + ]
  217 + },
218 // { 218 // {
219 // path: '/guestService', 219 // path: '/guestService',
220 // component: Home, 220 // component: Home,
@@ -259,26 +259,26 @@ @@ -259,26 +259,26 @@
259 handleselect: function (a, b) { 259 handleselect: function (a, b) {
260 this.reload() 260 this.reload()
261 }, 261 },
262 - //退出登录  
263 - // logout: function () {  
264 - // var _this = this;  
265 - // this.$confirm('确认退出吗?', '提示', {  
266 - // //type: 'warning'  
267 - // }).then(() => {  
268 - // sessionStorage.removeItem('user');  
269 - // sessionStorage.removeItem('menu');  
270 - // //退出后初始化原来的路由  
271 - // let sysRoutes = JSON.parse(sessionStorage.getItem('sysMenu'));  
272 - // console.log(sysRoutes);  
273 - // _this.$router.options.routes = sysRoutes;  
274 - //  
275 - // _this.$router.push('/login');  
276 - // }).catch(() => {  
277 - //  
278 - // });  
279 - //  
280 - //  
281 - // }, 262 + // 退出登录
  263 + logout: function () {
  264 + var _this = this;
  265 + this.$confirm('确认退出吗?', '提示', {
  266 + //type: 'warning'
  267 + }).then(() => {
  268 + sessionStorage.removeItem('user');
  269 + sessionStorage.removeItem('menu');
  270 + //退出后初始化原来的路由
  271 + let sysRoutes = JSON.parse(sessionStorage.getItem('sysMenu'));
  272 + console.log(sysRoutes);
  273 + _this.$router.options.routes = sysRoutes;
  274 +
  275 + _this.$router.push('/login');
  276 + }).catch(() => {
  277 +
  278 + });
  279 +
  280 +
  281 + },
282 //折叠导航栏 282 //折叠导航栏
283 collapse:function(){ 283 collapse:function(){
284 this.collapsed=!this.collapsed; 284 this.collapsed=!this.collapsed;
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 </el-row> 96 </el-row>
97 <el-row style="margin-left: 130px"> 97 <el-row style="margin-left: 130px">
98 <el-col :span="24"> <el-button type="primary" @click="submitForm('aircraft')">保 存</el-button> 98 <el-col :span="24"> <el-button type="primary" @click="submitForm('aircraft')">保 存</el-button>
99 - <el-button type="success">保存并发送</el-button></el-col> 99 + <el-button type="success" @click="sendForm('aircraft')">保存并发送</el-button></el-col>
100 </el-row> 100 </el-row>
101 <!--对话提示框--> 101 <!--对话提示框-->
102 <el-row> 102 <el-row>
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 </style> 135 </style>
136 <script> 136 <script>
137 const fecha = require('fecha'); 137 const fecha = require('fecha');
138 - import {addAircraft} from "../../api/transport"; 138 + import {addAircraft, sendAircraft} from "../../api/transport";
139 export default { 139 export default {
140 data(){ 140 data(){
141 return{ 141 return{
@@ -234,6 +234,26 @@ @@ -234,6 +234,26 @@
234 } 234 }
235 }); 235 });
236 }, 236 },
  237 + //保存并发送
  238 + sendForm(formName) {
  239 + this.$refs[formName].validate((valid) => {
  240 + if (valid) {
  241 + sendAircraft(this.aircraft).then(res=>{
  242 + let response=res.data;
  243 + if(response.code=='200'){
  244 + this.centerDialogVisible=true;
  245 + this.msg=response.msg;
  246 + this.$router.push({path:'/queryAircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo}});
  247 + }else{
  248 + this.msg=response.msg;
  249 + }
  250 + });
  251 + } else {
  252 + console.log('error submit!!');
  253 + return false;
  254 + }
  255 + });
  256 + },
237 //加载默认值 257 //加载默认值
238 defaultData(){ 258 defaultData(){
239 if(this.$route.query!=null){ 259 if(this.$route.query!=null){
@@ -249,4 +269,4 @@ @@ -249,4 +269,4 @@
249 this.defaultData(); 269 this.defaultData();
250 } 270 }
251 } 271 }
252 -</script>  
  272 +</script>
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
160 </el-row> 160 </el-row>
161 <el-row style="margin-left: 120px"> 161 <el-row style="margin-left: 120px">
162 <el-col :span="24"> <el-button type="primary" @click="submitForm('flight')">保 存</el-button> 162 <el-col :span="24"> <el-button type="primary" @click="submitForm('flight')">保 存</el-button>
163 - <el-button type="success">保存并发送</el-button></el-col> 163 + <el-button type="success" @click="sendForm('flight')">保存并发送</el-button></el-col>
164 </el-row> 164 </el-row>
165 <el-row> 165 <el-row>
166 <el-dialog title="航线信息" :visible.sync="dialogTableVisible" width="90%"> 166 <el-dialog title="航线信息" :visible.sync="dialogTableVisible" width="90%">
@@ -275,7 +275,7 @@ @@ -275,7 +275,7 @@
275 .el-col{margin-right: 0px;} 275 .el-col{margin-right: 0px;}
276 </style> 276 </style>
277 <script> 277 <script>
278 - import {addFlight, selectRoute} from "../../api/transport"; 278 + import {addFlight, selectRoute, sendFlight} from "../../api/transport";
279 const fecha = require('fecha'); 279 const fecha = require('fecha');
280 import loginUserInfo from '../../api/base'; 280 import loginUserInfo from '../../api/base';
281 export default { 281 export default {
@@ -439,6 +439,28 @@ @@ -439,6 +439,28 @@
439 } 439 }
440 }); 440 });
441 }, 441 },
  442 + //新增航班方法（保存并发送按钮）
  443 + sendForm(formName) {
  444 + this.$refs[formName].validate((valid) => {
  445 + if (valid) {
  446 + sendFlight(this.flight).then(res=>{
  447 + let response=res.data;
  448 + if(response.code=='200'){
  449 + this.centerDialogVisible=true;
  450 + this.msg=response.msg;
  451 + this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate}});
  452 + this.centerDialogVisible=false;
  453 + }else{
  454 + this.centerDialogVisible=true;
  455 + this.msg=response.msg;
  456 + }
  457 + });
  458 + } else {
  459 + console.log('error submit!!');
  460 + return false;
  461 + }
  462 + });
  463 + },
442 //分页方法 464 //分页方法
443 handleSizeChange(val) { 465 handleSizeChange(val) {
444 this.pageSize=val; 466 this.pageSize=val;
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 </el-row> 90 </el-row>
91 <el-row style="margin-left: 120px"> 91 <el-row style="margin-left: 120px">
92 <el-col :span="24"> <el-button type="primary" @click="submitForm('flight')">保 存</el-button> 92 <el-col :span="24"> <el-button type="primary" @click="submitForm('flight')">保 存</el-button>
93 - <el-button type="success">保存并发送</el-button></el-col> 93 + <el-button type="success" @click="sendForm('flight')">保存并发送</el-button></el-col>
94 </el-row> 94 </el-row>
95 <!--对话提示框--> 95 <!--对话提示框-->
96 <el-row> 96 <el-row>
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 </style> 143 </style>
144 <script> 144 <script>
145 const fecha = require('fecha'); 145 const fecha = require('fecha');
146 - import {addFlightPlan} from "../../api/transport"; 146 + import {addFlightPlan, sendFlightPlan} from "../../api/transport";
147 export default { 147 export default {
148 data(){ 148 data(){
149 return{ 149 return{
@@ -219,6 +219,26 @@ @@ -219,6 +219,26 @@
219 } 219 }
220 }); 220 });
221 }, 221 },
  222 + //保存并发送
  223 + sendForm(formName) {
  224 + this.$refs[formName].validate((valid) => {
  225 + if (valid) {
  226 + sendFlightPlan(this.flight).then(res=>{
  227 + let response=res.data;
  228 + if(response.code=='200'){
  229 + this.centerDialogVisible=true;
  230 + this.msg=response.msg;
  231 + this.$router.push({path:'/queryFlightplan',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate,aircraftNo:this.flight.aircraftNo}});
  232 + }else{
  233 + this.msg=response.msg;
  234 + }
  235 + });
  236 + } else {
  237 + console.log('error submit!!');
  238 + return false;
  239 + }
  240 + });
  241 + },
222 //加载默认值 242 //加载默认值
223 defaultData(){ 243 defaultData(){
224 if(this.$route.query.uuid!=null){ 244 if(this.$route.query.uuid!=null){
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 </el-row> 96 </el-row>
97 <el-row style="margin-left: 130px"> 97 <el-row style="margin-left: 130px">
98 <el-col :span="24"> <el-button type="primary" @click="submitForm('aircraft')">保 存</el-button> 98 <el-col :span="24"> <el-button type="primary" @click="submitForm('aircraft')">保 存</el-button>
99 - <el-button type="success">保存并发送</el-button></el-col> 99 + <el-button type="success" @click="sendForm('aircraft')">保存并发送</el-button></el-col>
100 </el-row> 100 </el-row>
101 <!--对话提示框--> 101 <!--对话提示框-->
102 <el-row> 102 <el-row>
@@ -134,7 +134,7 @@ @@ -134,7 +134,7 @@
134 .el-col{margin-right: 0px;} 134 .el-col{margin-right: 0px;}
135 </style> 135 </style>
136 <script> 136 <script>
137 - import {addAirLineAircraft} from "../../api/transport"; 137 + import {addAirLineAircraft, sendAirLineAircraft} from "../../api/transport";
138 138
139 export default { 139 export default {
140 data(){ 140 data(){
@@ -234,6 +234,26 @@ @@ -234,6 +234,26 @@
234 } 234 }
235 }); 235 });
236 }, 236 },
  237 + //保存并发送
  238 + sendForm(formName) {
  239 + this.$refs[formName].validate((valid) => {
  240 + if (valid) {
  241 + sendAirLineAircraft(this.aircraft).then(res=>{
  242 + let response=res.data;
  243 + if(response.code=='200'){
  244 + this.centerDialogVisible=true;
  245 + this.msg=response.msg;
  246 + this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo},});
  247 + }else{
  248 + this.msg=response.msg;
  249 + }
  250 + });
  251 + } else {
  252 + console.log('error submit!!');
  253 + return false;
  254 + }
  255 + });
  256 + },
237 //加载默认值 257 //加载默认值
238 defaultData(){ 258 defaultData(){
239 if(this.$route.query!=null){ 259 if(this.$route.query!=null){
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 <el-table :data="tableList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" 19 <el-table :data="tableList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
20 tooltip-effect="dark" 20 tooltip-effect="dark"
21 style="border-radius: 10px 10px 0px 0px;line-height: 25px;" 21 style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  22 + height="600px"
22 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" 23 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
23 row-key="permissionId" 24 row-key="permissionId"
24 border 25 border
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 default-expand-all 20 default-expand-all
21 row-key="roleId" 21 row-key="roleId"
22 border 22 border
  23 + height="600px"
23 tooltip-effect="dark" 24 tooltip-effect="dark"
24 style="border-radius: 10px 10px 0px 0px;line-height: 25px;" 25 style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
25 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" 26 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"