Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
405198e2 1 parent 09bbd86f

version:0.5.3

Expand all
Inline Side-by-side
Showing 10 changed files with 30 additions and 16 deletions
...@@ -42,6 +42,8 @@ export function updateOrAddFlight(form){ ...@@ -42,6 +42,8 @@ export function updateOrAddFlight(form){
42 form.declarationCategory = form.declarationCategory.join(';'); 42 form.declarationCategory = form.declarationCategory.join(';');
43 form.serviceCode = form.serviceCode.join(';'); 43 form.serviceCode = form.serviceCode.join(';');
44 form.subCategory = form.subCategory.join(';'); 44 form.subCategory = form.subCategory.join(';');
45 + form.handlingCode = form.handlingCode.join(';');
46 +
45 47
46 return request({ 48 return request({
47 url:'/destinationFlight/updateOrAddFlight', 49 url:'/destinationFlight/updateOrAddFlight',
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 :base-path="route.path" 35 :base-path="route.path"
36 /> 36 />
37 </el-menu> 37 </el-menu>
38 - <div class="version">version:0.5.1</div> 38 + <div class="version">{{ version }}</div>
39 <!-- </el-scrollbar> --> 39 <!-- </el-scrollbar> -->
40 </div> 40 </div>
41 </template> 41 </template>
...@@ -45,8 +45,14 @@ import { mapGetters, mapState } from "vuex"; ...@@ -45,8 +45,14 @@ import { mapGetters, mapState } from "vuex";
45 import Logo from "./Logo"; 45 import Logo from "./Logo";
46 import SidebarItem from "./SidebarItem"; 46 import SidebarItem from "./SidebarItem";
47 import variables from "@/assets/styles/variables.scss"; 47 import variables from "@/assets/styles/variables.scss";
48 +import settings from "@/settings";
48 49
49 export default { 50 export default {
51 + data() {
52 + return {
53 + version: "",
54 + };
55 + },
50 components: { SidebarItem, Logo }, 56 components: { SidebarItem, Logo },
51 computed: { 57 computed: {
52 ...mapState(["settings"]), 58 ...mapState(["settings"]),
...@@ -70,6 +76,9 @@ export default { ...@@ -70,6 +76,9 @@ export default {
70 return !this.sidebar.opened; 76 return !this.sidebar.opened;
71 }, 77 },
72 }, 78 },
79 + created() {
80 + this.version = settings.version;
81 + },
73 }; 82 };
74 </script> 83 </script>
75 84
......
...@@ -37,5 +37,10 @@ module.exports = { ...@@ -37,5 +37,10 @@ module.exports = {
37 * The default is only used in the production env 37 * The default is only used in the production env
38 * If you want to also use it in dev, you can pass ['production', 'development'] 38 * If you want to also use it in dev, you can pass ['production', 'development']
39 */ 39 */
40 - errorLog: 'production' 40 + errorLog: 'production',
41 +
42 + /**
43 + * 版本号
44 + */
45 + version:'version：0.5.3'
41 } 46 }
......
...@@ -9,10 +9,9 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' ...@@ -9,10 +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://47.103.140.98:9002`, //阿里云服务器
13 - baseURL: `http://47.103.140.98:9002`, 13 + // baseURL: 'https://imacuat.zmd.apac.fedex.com/IMAC2', //uat服务器
14 - // baseURL: 'https://imacuat.zmd.apac.fedex.com/IMAC2', 14 + // baseURL: 'http://192.168.1.134:18080', //测试服务器
15 - // baseURL: 'http://192.168.1.134:18080',
16 15
17 // 超时 16 // 超时
18 timeout: 30000 17 timeout: 30000
......
...@@ -5,9 +5,9 @@ const mimeMap = { ...@@ -5,9 +5,9 @@ const mimeMap = {
5 xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 5 xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
6 zip: 'application/zip' 6 zip: 'application/zip'
7 } 7 }
8 -// const baseUrl = 'https://imacuat.zmd.apac.fedex.com/IMAC2' 8 +// const baseUrl = 'https://imacuat.zmd.apac.fedex.com/IMAC2' // uat服务器
9 -const baseUrl = 'http://47.103.140.98:9002' 9 +const baseUrl = 'http://47.103.140.98:9002' //阿里云服务器
10 -// const baseUrl = 'http://192.168.1.134:18080' 10 +// const baseUrl = 'http://192.168.1.134:18080' //测试服务器
11 export function downLoadZip(str, filename) { 11 export function downLoadZip(str, filename) {
12 var url = baseUrl + str 12 var url = baseUrl + str
13 axios({ 13 axios({
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
65 65
66 66
67 <!-- 查看目的航班对话框 --> 67 <!-- 查看目的航班对话框 -->
68 - <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false"> 68 + <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false" :append-to-body="true">
69 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate"> 69 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
70 70
71 <el-table-column label="原航班" align="center" prop="sourceFlightNo" /> 71 <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 84
85 85
86 <!-- 添加或修改对话框 --> 86 <!-- 添加或修改对话框 -->
87 - <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false"> 87 + <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
88 <el-form ref="form" :model="form" :rules="rules" label-width="100px"> 88 <el-form ref="form" :model="form" :rules="rules" label-width="100px">
89 <el-row> 89 <el-row>
90 <el-col :span="10"> 90 <el-col :span="10">
......
1 -//version:0.5.1 1 +//version:0.5.3
2 'use strict' 2 'use strict'
3 const path = require('path') 3 const path = require('path')
4 const defaultSettings = require('./src/settings.js') 4 const defaultSettings = require('./src/settings.js')
...@@ -35,10 +35,9 @@ module.exports = { ...@@ -35,10 +35,9 @@ module.exports = {
35 proxy: { 35 proxy: {
36 // detail: https://cli.vuejs.org/config/#devserver-proxy 36 // detail: https://cli.vuejs.org/config/#devserver-proxy
37 [process.env.VUE_APP_BASE_API]: { 37 [process.env.VUE_APP_BASE_API]: {
38 - // target: `https://imacuat.zmd.apac.fedex.com/IMAC2`, 38 + // target: `https://imacuat.zmd.apac.fedex.com/IMAC2`, //uat服务器
39 - // target: `http://192.168.1.45:8080`, 39 + target: `http://47.103.140.98:9002`, //阿里云服务器
40 - target: `http://47.103.140.98:9002`, 40 + // target: `http://192.168.1.134:18080`, //测试服务器
41 - // target: `http://192.168.1.134:18080`,
42 changeOrigin: true, 41 changeOrigin: true,
43 pathRewrite: { 42 pathRewrite: {
44 ['^' + process.env.VUE_APP_BASE_API]: '' 43 ['^' + process.env.VUE_APP_BASE_API]: ''
......