Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
53a0e3f2 1 parent 4cfe11f4

无用代码删除，bug修正

Expand all
Inline Side-by-side
Showing 17 changed files with 37 additions and 77 deletions
1 -import service from "../utils/request";
2 import request from '@/utils/request' 1 import request from '@/utils/request'
3 2
4 export function downLoadTemplate(template) { 3 export function downLoadTemplate(template) {
......
1 -import service from "../utils/request";
2 import request from '@/utils/request' 1 import request from '@/utils/request'
3 2
4 // 查询航班种类 3 // 查询航班种类
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
16 </div> 16 </div>
17 <el-dropdown-menu slot="dropdown"> 17 <el-dropdown-menu slot="dropdown">
18 <router-link to="/user/profile"> 18 <router-link to="/user/profile">
19 - <!-- <el-dropdown-item>个人中心</el-dropdown-item> -->
20 </router-link> 19 </router-link>
21 <el-dropdown-item @click.native="logout"> 20 <el-dropdown-item @click.native="logout">
22 <span>退出登录</span> 21 <span>退出登录</span>
......
...@@ -12,6 +12,7 @@ const service = axios.create({ ...@@ -12,6 +12,7 @@ const service = axios.create({
12 // baseURL: `http://47.103.140.98:7001/iMAC`, 12 // baseURL: `http://47.103.140.98:7001/iMAC`,
13 baseURL: 'https://imacuat.zmd.apac.fedex.com/iMAC', 13 baseURL: 'https://imacuat.zmd.apac.fedex.com/iMAC',
14 // baseURL: 'http://192.168.1.133:7001/iMAC', 14 // baseURL: 'http://192.168.1.133:7001/iMAC',
15 + // baseURL: 'http://192.168.1.133:7001/iMAC',//生产
15 16
16 // 超时 17 // 超时
17 timeout: 30000, 18 timeout: 30000,
...@@ -82,7 +83,7 @@ service.interceptors.response.use(res => { ...@@ -82,7 +83,7 @@ service.interceptors.response.use(res => {
82 type: 'error' 83 type: 'error'
83 }) 84 })
84 return Promise.reject(new Error(msg)) 85 return Promise.reject(new Error(msg))
85 - } else if (code !== 200 && code !== 201 && code !== 202) { 86 + } else if (code !== 200 && code !== 201 && code !== 202 && code !== 603) {
86 Message({ 87 Message({
87 message: msg, 88 message: msg,
88 type: 'error' 89 type: 'error'
......
...@@ -8,6 +8,7 @@ const mimeMap = { ...@@ -8,6 +8,7 @@ const mimeMap = {
8 const baseUrl = 'https://imacuat.zmd.apac.fedex.com/iMAC' //uat服务器 8 const baseUrl = 'https://imacuat.zmd.apac.fedex.com/iMAC' //uat服务器
9 // const baseUrl = 'http://47.103.140.98:7001/iMAC' //阿里云服务器 9 // const baseUrl = 'http://47.103.140.98:7001/iMAC' //阿里云服务器
10 // const baseUrl = 'http://192.168.1.133:7001/iMAC' //测试服务器 10 // const baseUrl = 'http://192.168.1.133:7001/iMAC' //测试服务器
11 +// const baseUrl = 'http://192.168.1.133:7001/iMAC' //生产
11 12
12 export function downLoadZip(str, filename) { 13 export function downLoadZip(str, filename) {
13 var url = baseUrl + str 14 var url = baseUrl + str
......
...@@ -852,7 +852,7 @@ export default { ...@@ -852,7 +852,7 @@ export default {
852 .catch(() => {}); 852 .catch(() => {});
853 }, 853 },
854 //查询 854 //查询
855 - select() { 855 + async select() {
856 this.loading = true; 856 this.loading = true;
857 this.dataInfo(); 857 this.dataInfo();
858 findCargoAllocationData(this.formData) 858 findCargoAllocationData(this.formData)
......
...@@ -129,8 +129,6 @@ import { ...@@ -129,8 +129,6 @@ import {
129 enableOrDisable, 129 enableOrDisable,
130 } from "@/api/destinationFlight"; 130 } from "@/api/destinationFlight";
131 131
132 -import { parseTime } from "@/utils/FedEx";
133 -
134 export default { 132 export default {
135 name: "FlightAllocConfig", 133 name: "FlightAllocConfig",
136 data() { 134 data() {
......
...@@ -391,7 +391,6 @@ export default { ...@@ -391,7 +391,6 @@ export default {
391 } 391 }
392 } 392 }
393 }); 393 });
394 - console.log(errorList);
395 if (errorList.length != 0) { 394 if (errorList.length != 0) {
396 this.$message({ 395 this.$message({
397 showClose: true, 396 showClose: true,
......
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium"> 3 + <el-form
4 + class="form-header"
5 + :model="queryParams"
6 + label-position="right"
7 + label-width="auto"
8 + size="medium"
9 + >
4 <el-row> 10 <el-row>
5 <el-col :span="6"> 11 <el-col :span="6">
6 <el-form-item label="航班日期从" prop="fltDateStart"> 12 <el-form-item label="航班日期从" prop="fltDateStart">
...@@ -87,27 +93,26 @@ ...@@ -87,27 +93,26 @@
87 </el-switch> 93 </el-switch>
88 </el-col> 94 </el-col>
89 </el-row> 95 </el-row>
90 - <div style="margin-top:25px"> 96 + <div style="margin-top: 25px">
91 - <el-button 97 + <el-button
92 - type="primary" 98 + type="primary"
93 - icon="el-icon-search" 99 + icon="el-icon-search"
94 - size="mini" 100 + size="mini"
95 - @click="handleQuery" 101 + @click="handleQuery"
96 - >搜索</el-button 102 + >搜索</el-button
97 - > 103 + >
98 - <el-button 104 + <el-button
99 - type="warning" 105 + type="warning"
100 - :disabled="tableData.length == 0" 106 + :disabled="tableData.length == 0"
101 - @click="xlse()" 107 + @click="xlse()"
102 - :loading="downLoadingTip.downloading" 108 + :loading="downLoadingTip.downloading"
103 - icon="el-icon-download" 109 + icon="el-icon-download"
104 - size="mini" 110 + size="mini"
105 - >{{ 111 + >{{
106 - downLoadingTip.downloading ? downLoadingTip.tip : "导出" 112 + downLoadingTip.downloading ? downLoadingTip.tip : "导出"
107 - }}</el-button 113 + }}</el-button
108 - > 114 + >
109 </div> 115 </div>
110 -
111 </el-form> 116 </el-form>
112 117
113 <el-table 118 <el-table
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 </el-form-item> 13 </el-form-item>
14 </el-form> 14 </el-form>
15 <div style="font-size: 12px; font-weight: 700"> 15 <div style="font-size: 12px; font-weight: 700">
16 - 提示：<span style="color: #0000ff">以下为所提交的数据或出错信息</span> 16 + 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span>
17 </div> 17 </div>
18 <el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small" border> 18 <el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small" border>
19 <el-table-column label="行号" prop="line" fixed width="50" align="center"> 19 <el-table-column label="行号" prop="line" fixed width="50" align="center">
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
81 uploadExcel(option) { 81 uploadExcel(option) {
82 //上传excel 82 //上传excel
83 const file = option.file; 83 const file = option.file;
84 - console.log(option);
85 this.loading=true; 84 this.loading=true;
86 importcaPreReview(file, this.form.type).then((res) => { 85 importcaPreReview(file, this.form.type).then((res) => {
87 this.loading=false; 86 this.loading=false;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 </el-form-item> 34 </el-form-item>
35 </el-form> 35 </el-form>
36 <div style="font-size: 12px; font-weight: 700"> 36 <div style="font-size: 12px; font-weight: 700">
37 - 提示：<span style="color: #0000ff">以下为所提交的数据或出错信息</span> 37 + 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span>
38 </div> 38 </div>
39 <el-table 39 <el-table
40 ref="filterTable" 40 ref="filterTable"
...@@ -64,8 +64,7 @@ ...@@ -64,8 +64,7 @@
64 </el-table> 64 </el-table>
65 </div> 65 </div>
66 </template> 66 </template>
67 - </div> 67 +
68 -</template>
69 <script> 68 <script>
70 import { 69 import {
71 filghtKindData, 70 filghtKindData,
...@@ -73,7 +72,7 @@ import { ...@@ -73,7 +72,7 @@ import {
73 importFlight, 72 importFlight,
74 } from "@/api/flightInfoImport"; 73 } from "@/api/flightInfoImport";
75 export default { 74 export default {
76 - name:"FlightInformationImport", 75 + name: "FlightInformationImport",
77 data() { 76 data() {
78 return { 77 return {
79 flightType: [], 78 flightType: [],
...@@ -126,15 +125,14 @@ export default { ...@@ -126,15 +125,14 @@ export default {
126 uploadExcel(option) { 125 uploadExcel(option) {
127 //上传excel 126 //上传excel
128 const file = option.file; 127 const file = option.file;
129 - console.log(option);
130 importFlight(file, this.form.type).then((res) => { 128 importFlight(file, this.form.type).then((res) => {
131 if (res.code != 200) { 129 if (res.code != 200) {
132 if (res.code == 603) { 130 if (res.code == 603) {
133 - this.$alert(res.msg , "提示", { 131 + this.$alert(res.msg, "提示", {
134 confirmButtonText: "确定", 132 confirmButtonText: "确定",
135 type: "warning", 133 type: "warning",
136 }); 134 });
137 - }else { 135 + } else {
138 this.$message.error(res.msg); 136 this.$message.error(res.msg);
139 this.tableData = res.data; 137 this.tableData = res.data;
140 } 138 }
......
1 -<template>
2 - <div></div>
3 -</template>
4 -
5 -<script>
6 -export default {
7 -
8 -}
9 -</script>
10 -
11 -<style>
12 -
13 -</style>
...\ No newline at end of file ...\ No newline at end of file
1 -<template>
2 - <div></div>
3 -</template>
4 -
5 -<script>
6 -export default {
7 -
8 -}
9 -</script>
10 -
11 -<style>
12 -
13 -</style>
...\ No newline at end of file ...\ No newline at end of file
1 -<template>
2 - <div></div>
3 -</template>
4 -
5 -<script>
6 -export default {
7 -
8 -}
9 -</script>
10 -
11 -<style>
12 -
13 -</style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -37,6 +37,7 @@ module.exports = { ...@@ -37,6 +37,7 @@ module.exports = {
37 target: `https://imacuat.zmd.apac.fedex.com/iMAC`, 37 target: `https://imacuat.zmd.apac.fedex.com/iMAC`,
38 // target: `http://47.103.140.98:7001/iMAC`, 38 // target: `http://47.103.140.98:7001/iMAC`,
39 // target: `http://192.168.1.134:18080`, 39 // target: `http://192.168.1.134:18080`,
40 + // target: `http://47.103.140.98:7001/IMAC2`, //生产
40 changeOrigin: true, 41 changeOrigin: true,
41 pathRewrite: { 42 pathRewrite: {
42 ['^' + process.env.VUE_APP_BASE_API]: '' 43 ['^' + process.env.VUE_APP_BASE_API]: ''
......