Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
1730532197@qq.com
1b31e68c 1 parent fdcbeadc

lwj-查询航班顺位

Inline Side-by-side
Showing 11 changed files with 159 additions and 14 deletions
...@@ -8,7 +8,7 @@ export function login(username, password, rememberMe) { ...@@ -8,7 +8,7 @@ export function login(username, password, rememberMe) {
8 rememberMe 8 rememberMe
9 } 9 }
10 return request({ 10 return request({
11 - url: '/hello', 11 + url: '/auth/login',
12 method: 'post', 12 method: 'post',
13 data: data 13 data: data
14 }) 14 })
......
1 +import request from '@/utils/request'
2 +
3 +// 原航班顺位规则界面查询
4 +export function findSourceFlightRulesApi(data) {
5 + return request({
6 + url: '/sourceFlight/findSourceFlightRules',
7 + method: 'post',
8 + data: data
9 + })
10 +}
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
55 data() { 55 data() {
56 return { 56 return {
57 headers: { 57 headers: {
58 - Authorization: "Bearer " + getToken() 58 + Authorization: getToken()
59 }, 59 },
60 Quill: null, 60 Quill: null,
61 currentValue: "", 61 currentValue: "",
......
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
65 return { 65 return {
66 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 66 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
67 headers: { 67 headers: {
68 - Authorization: "Bearer " + getToken(), 68 + Authorization: getToken(),
69 }, 69 },
70 fileList: [], 70 fileList: [],
71 }; 71 };
......
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
45 dialogVisible: false, 45 dialogVisible: false,
46 uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 46 uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
47 headers: { 47 headers: {
48 - Authorization: "Bearer " + getToken(), 48 + Authorization: getToken(),
49 }, 49 },
50 }; 50 };
51 }, 51 },
......
...@@ -37,8 +37,8 @@ const user = { ...@@ -37,8 +37,8 @@ const user = {
37 37
38 return new Promise((resolve, reject) => { 38 return new Promise((resolve, reject) => {
39 login(username, password,rememberMe).then(res => { 39 login(username, password,rememberMe).then(res => {
40 - setToken(res.data.token) 40 + setToken(res.data)
41 - commit('SET_TOKEN', res.data.token) 41 + commit('SET_TOKEN', res.data)
42 resolve() 42 resolve()
43 }).catch(error => { 43 }).catch(error => {
44 reject(error) 44 reject(error)
......
...@@ -9,7 +9,9 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' ...@@ -9,7 +9,9 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
9 const service = axios.create({ 9 const service = axios.create({
10 // axios中请求配置有baseURL选项，表示请求URL公共部分 10 // axios中请求配置有baseURL选项，表示请求URL公共部分
11 //baseURL: process.env.VUE_APP_BASE_API, 11 //baseURL: process.env.VUE_APP_BASE_API,
12 - baseURL: 'http://192.168.1.45:8080', 12 + //baseURL: 'http://192.168.1.45:18080',
13 + baseURL: 'http://192.168.1.134:18080',
14 +
13 // 超时 15 // 超时
14 timeout: 10000 16 timeout: 10000
15 }) 17 })
...@@ -18,7 +20,7 @@ service.interceptors.request.use(config => { ...@@ -18,7 +20,7 @@ service.interceptors.request.use(config => {
18 // 是否需要设置 token 20 // 是否需要设置 token
19 const isToken = (config.headers || {}).isToken === false 21 const isToken = (config.headers || {}).isToken === false
20 if (getToken() && !isToken) { 22 if (getToken() && !isToken) {
21 - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 23 + config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
22 } 24 }
23 // get请求映射params参数 25 // get请求映射params参数
24 if (config.method === 'get' && config.params) { 26 if (config.method === 'get' && config.params) {
...@@ -66,6 +68,7 @@ service.interceptors.response.use(res => { ...@@ -66,6 +68,7 @@ service.interceptors.response.use(res => {
66 }) 68 })
67 }) 69 })
68 } else if (code === 403) { 70 } else if (code === 403) {
71 + //无权限页面
69 location.href = '/401'; 72 location.href = '/401';
70 }else if (code === 500) { 73 }else if (code === 500) {
71 Message({ 74 Message({
......
...@@ -13,7 +13,7 @@ export function downLoadZip(str, filename) { ...@@ -13,7 +13,7 @@ export function downLoadZip(str, filename) {
13 method: 'get', 13 method: 'get',
14 url: url, 14 url: url,
15 responseType: 'blob', 15 responseType: 'blob',
16 - headers: { 'Authorization': 'Bearer ' + getToken() } 16 + headers: { 'Authorization': getToken() }
17 }).then(res => { 17 }).then(res => {
18 resolveBlob(res, mimeMap.zip) 18 resolveBlob(res, mimeMap.zip)
19 }) 19 })
......
...@@ -52,8 +52,8 @@ export default { ...@@ -52,8 +52,8 @@ export default {
52 codeUrl: "", 52 codeUrl: "",
53 cookiePassword: "", 53 cookiePassword: "",
54 loginForm: { 54 loginForm: {
55 - username: "admin", 55 + username: "root",
56 - password: "admin123", 56 + password: "123",
57 rememberMe: false 57 rememberMe: false
58 }, 58 },
59 loginRules: { 59 loginRules: {
......
1 <template> 1 <template>
2 - <div>index role</div> 2 + <div class="app-container">
3 + <el-form :model="queryParams" ref="queryForm" :inline="true">
4 + <el-form-item label="原航班" prop="sourceFlightNo">
5 + <el-input v-model="queryParams.sourceFlightNo" placeholder="请输入原航班" clearable size="small" />
6 + </el-form-item>
7 + <el-form-item label="状态" prop="status">
8 + <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
9 + <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
10 + </el-select>
11 +
12 + </el-form-item>
13 +
14 + <el-form-item>
15 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询原航班配置</el-button>
16 + </el-form-item>
17 + <br />
18 + <el-form-item label="日期" prop="flightDate">
19 +
20 + <el-date-picker v-model="queryParams.flightDate" type="date" placeholder="选择日期">
21 + </el-date-picker>
22 + </el-form-item>
23 +
24 + <el-form-item>
25 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询实际目的航班</el-button>&#12288;
26 + <span style="color: red;">注：原航班+日期查询该日期的航班实际情况</span>
27 + </el-form-item>
28 + <br />
29 + <el-form-item>
30 + <el-col :span="1.5">
31 + <el-button type="primary" icon="el-icon-plus" size="mini">添加规则</el-button>
32 + </el-col>
33 + &#12288; <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
34 + </el-form-item>
35 + </el-form>
36 +
37 +
38 + <el-table v-loading="loading" :data="sourceFlightRulesList">
39 +
40 + <el-table-column label="原航班" align="center" prop="sourceFlightNo"/>
41 + <el-table-column label="目的航班排序" align="center" prop="flightRank" width="280"/>
42 + <el-table-column label="优先级" align="center" prop="priority" />
43 + <el-table-column label="周期" align="center" prop="dayOfWeek" />
44 + <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
45 + <el-table-column label="开始时间" align="center" prop="startDate" width="100"/>
46 + <el-table-column label="结束时间" align="center" prop="endDate" width="100"/>
47 + <el-table-column label="最后修改人" align="center" prop="updateUserName" width="100"/>
48 + <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100"/>
49 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width"width="200">
50 + <template slot-scope="scope">
51 + <el-button size="mini" type="text" icon="el-icon-edit" >修改</el-button>
52 + <el-button size="mini" type="text" icon="el-icon-delete" >删除</el-button>
53 + <el-button size="mini" type="text" icon="el-icon-delete" >启用</el-button>
54 + <el-button size="mini" type="text" icon="el-icon-delete" >停用</el-button>
55 + </template>
56 + </el-table-column>
57 + </el-table>
58 + <pagination v-show="total>0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
59 + :page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" />
60 +
61 + </div>
3 </template> 62 </template>
63 +<script>
64 + import {
65 + findSourceFlightRulesApi
66 + } from "@/api/sourceFlightRules";
67 + export default {
68 + name: "SourceFlightRules",
69 + data() {
70 + return {
71 + // 遮罩层
72 + loading: false,
73 + // 总条数
74 + total: 110,
75 + // 原航班规则数据
76 + sourceFlightRulesList: [],
77 + statusList: [{'id':1,'name':'有效'}, {'id':2,'name':'配置中'},{'id':3,'name':'停用'}],
78 + // 是否显示弹出层
79 + open: false,
80 + // 查询参数
81 + queryParams: {
82 + start: 0, //当前条数【代表第几条数据 +1开始】
83 + pageNum: 1,
84 + limit: 20, //一页显示多少条数据
85 + sourceFlightNo: undefined, //原航班号
86 + status: undefined, //状态
87 + flightDate: undefined //日期
88 + },
89 + // 表单参数
90 + form: {},
91 + // 表单校验
92 + rules: {}
93 + };
94 + },
95 + created() {
96 + this.findSourceFlightRules();
97 + },
98 + methods: {
99 + /** 查询原航班顺位规则*/
100 + findSourceFlightRules() {
101 + //this.loading = true;
102 + if (this.queryParams.pageNum > 1) {
103 + this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit + 1
104 + }
105 + findSourceFlightRulesApi(this.queryParams).then(response => {
106 + this.sourceFlightRulesList = response.list;
107 + this.total = response.totalCount;
108 + this.loading = false;
109 + });
4 110
111 + },
112 + // 状态字典翻译
113 + statusFormat(row) {
114 + if(row.status==='1'){
115 + return '有效'
116 + }else if(row.status==='2'){
117 + return '配置中'
118 + }else if(row.status==='3'){
119 + return '停用'
120 + }
121 + return row.status;
122 + },
123 + /** 重置按钮操作 */
124 + resetQuery() {
125 + this.resetForm("queryForm");
126 + this.handleQuery();
127 + },
128 + /** 搜索按钮操作 */
129 + handleQuery() {
130 + this.queryParams.pageNum = 1;
131 + this.findSourceFlightRules();
132 + }
5 133
134 + }
135 + };
136 +</script>
......
...@@ -34,8 +34,9 @@ module.exports = { ...@@ -34,8 +34,9 @@ module.exports = {
34 proxy: { 34 proxy: {
35 // detail: https://cli.vuejs.org/config/#devserver-proxy 35 // detail: https://cli.vuejs.org/config/#devserver-proxy
36 [process.env.VUE_APP_BASE_API]: { 36 [process.env.VUE_APP_BASE_API]: {
37 - // target: `http://localhost:8080`, 37 + //target: `http://localhost:8080`,
38 - target: `http://192.168.1.45:8080`, 38 + // target: `http://192.168.1.45:18080`,
39 + target: `http://192.168.1.134:18080`,
39 changeOrigin: true, 40 changeOrigin: true,
40 pathRewrite: { 41 pathRewrite: {
41 ['^' + process.env.VUE_APP_BASE_API]: '' 42 ['^' + process.env.VUE_APP_BASE_API]: ''
......