Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
imac-vue
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
jinhui.wang
2022-02-25 12:55:46 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
53a0e3f2b9c53d158a34da2cc92b80180b81b7a7
53a0e3f2
1 parent
4cfe11f4
无用代码删除,bug修正
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
19 additions
and
59 deletions
src/api/caPreReviewImport.js
src/api/flightInfoImport.js
src/layout/components/Navbar.vue
src/utils/request.js
src/utils/zipdownload.js
src/views/allocationConfig/cargoAllocation/index.vue
src/views/allocationConfig/flightAllocConfig/index.vue
src/views/allocationConfig/flightAllocConfig/info.vue
src/views/allocationConfig/flightRandConfig/index.vue
src/views/basicInformation/caExportPreQualification/index.vue
src/views/basicInformation/caPreReviewImport/index.vue
src/views/basicInformation/flightInformationImport/index.vue
src/views/basicInformation/flightInformationMaintenance/index.vue
src/views/systemConfig/roleConfig/index.vue
src/views/systemConfig/userConfig/index.vue
src/views/systemConfig/userConfig/profile/index.vue
vue.config.js
src/api/caPreReviewImport.js
View file @
53a0e3f
import
service
from
"../utils/request"
;
import
request
from
'@/utils/request'
export
function
downLoadTemplate
(
template
)
{
...
...
src/api/flightInfoImport.js
View file @
53a0e3f
import
service
from
"../utils/request"
;
import
request
from
'@/utils/request'
// 查询航班种类
...
...
src/layout/components/Navbar.vue
View file @
53a0e3f
...
...
@@ -16,7 +16,6 @@
</div>
<el-dropdown-menu slot="dropdown">
<router-link to="/user/profile">
<!-- <el-dropdown-item>个人中心</el-dropdown-item> -->
</router-link>
<el-dropdown-item @click.native="logout">
<span>退出登录</span>
...
...
src/utils/request.js
View file @
53a0e3f
...
...
@@ -12,6 +12,7 @@ const service = axios.create({
// baseURL: `http://47.103.140.98:7001/iMAC`,
baseURL
:
'https://imacuat.zmd.apac.fedex.com/iMAC'
,
// baseURL: 'http://192.168.1.133:7001/iMAC',
// baseURL: 'http://192.168.1.133:7001/iMAC',//生产
// 超时
timeout
:
30000
,
...
...
@@ -82,7 +83,7 @@ service.interceptors.response.use(res => {
type
:
'error'
})
return
Promise
.
reject
(
new
Error
(
msg
))
}
else
if
(
code
!==
200
&&
code
!==
201
&&
code
!==
202
)
{
}
else
if
(
code
!==
200
&&
code
!==
201
&&
code
!==
202
&&
code
!==
603
)
{
Message
({
message
:
msg
,
type
:
'error'
...
...
src/utils/zipdownload.js
View file @
53a0e3f
...
...
@@ -8,6 +8,7 @@ const mimeMap = {
const
baseUrl
=
'https://imacuat.zmd.apac.fedex.com/iMAC'
//uat服务器
// const baseUrl = 'http://47.103.140.98:7001/iMAC' //阿里云服务器
// const baseUrl = 'http://192.168.1.133:7001/iMAC' //测试服务器
// const baseUrl = 'http://192.168.1.133:7001/iMAC' //生产
export
function
downLoadZip
(
str
,
filename
)
{
var
url
=
baseUrl
+
str
...
...
src/views/allocationConfig/cargoAllocation/index.vue
View file @
53a0e3f
...
...
@@ -852,7 +852,7 @@ export default {
.catch(() => {});
},
//查询
select() {
async
select() {
this.loading = true;
this.dataInfo();
findCargoAllocationData(this.formData)
...
...
src/views/allocationConfig/flightAllocConfig/index.vue
View file @
53a0e3f
...
...
@@ -129,8 +129,6 @@ import {
enableOrDisable,
} from "@/api/destinationFlight";
import { parseTime } from "@/utils/FedEx";
export default {
name: "FlightAllocConfig",
data() {
...
...
src/views/allocationConfig/flightAllocConfig/info.vue
View file @
53a0e3f
...
...
@@ -391,7 +391,6 @@ export default {
}
}
});
console.log(errorList);
if (errorList.length != 0) {
this.$message({
showClose: true,
...
...
src/views/allocationConfig/flightRandConfig/index.vue
View file @
53a0e3f
This diff is collapsed. Click to expand it.
src/views/basicInformation/caExportPreQualification/index.vue
View file @
53a0e3f
<template>
<div class="app-container">
<el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium">
<el-form
class="form-header"
:model="queryParams"
label-position="right"
label-width="auto"
size="medium"
>
<el-row>
<el-col :span="6">
<el-form-item label="航班日期从" prop="fltDateStart">
...
...
@@ -87,7 +93,7 @@
</el-switch>
</el-col>
</el-row>
<div style="margin-top:25px">
<div style="margin-top:
25px">
<el-button
type="primary"
icon="el-icon-search"
...
...
@@ -107,7 +113,6 @@
}}</el-button
>
</div>
</el-form>
<el-table
...
...
src/views/basicInformation/caPreReviewImport/index.vue
View file @
53a0e3f
...
...
@@ -13,7 +13,7 @@
</el-form-item>
</el-form>
<div style="font-size: 12px; font-weight: 700">
提示:<span style="color: #
000
0ff">以下为所提交的数据或出错信息</span>
提示:<span style="color: #
189
0ff">以下为所提交的数据或出错信息</span>
</div>
<el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small" border>
<el-table-column label="行号" prop="line" fixed width="50" align="center">
...
...
@@ -81,7 +81,6 @@
uploadExcel(option) {
//上传excel
const file = option.file;
console.log(option);
this.loading=true;
importcaPreReview(file, this.form.type).then((res) => {
this.loading=false;
...
...
src/views/basicInformation/flightInformationImport/index.vue
View file @
53a0e3f
...
...
@@ -34,7 +34,7 @@
</el-form-item>
</el-form>
<div style="font-size: 12px; font-weight: 700">
提示:<span style="color: #
000
0ff">以下为所提交的数据或出错信息</span>
提示:<span style="color: #
189
0ff">以下为所提交的数据或出错信息</span>
</div>
<el-table
ref="filterTable"
...
...
@@ -64,8 +64,7 @@
</el-table>
</div>
</template>
</div>
</template>
<script>
import {
filghtKindData,
...
...
@@ -73,7 +72,7 @@ import {
importFlight,
} from "@/api/flightInfoImport";
export default {
name:"FlightInformationImport",
name:
"FlightInformationImport",
data() {
return {
flightType: [],
...
...
@@ -126,15 +125,14 @@ export default {
uploadExcel(option) {
//上传excel
const file = option.file;
console.log(option);
importFlight(file, this.form.type).then((res) => {
if (res.code != 200) {
if (res.code == 603) {
this.$alert(res.msg
, "提示", {
this.$alert(res.msg, "提示", {
confirmButtonText: "确定",
type: "warning",
});
}else {
}
else {
this.$message.error(res.msg);
this.tableData = res.data;
}
...
...
src/views/basicInformation/flightInformationMaintenance/index.vue
View file @
53a0e3f
This diff is collapsed. Click to expand it.
src/views/systemConfig/roleConfig/index.vue
deleted
100644 → 0
View file @
4cfe11f
<template>
<div></div>
</template>
<script>
export default {
}
</script>
<style>
</style>
\ No newline at end of file
src/views/systemConfig/userConfig/index.vue
deleted
100644 → 0
View file @
4cfe11f
<template>
<div></div>
</template>
<script>
export default {
}
</script>
<style>
</style>
\ No newline at end of file
src/views/systemConfig/userConfig/profile/index.vue
deleted
100644 → 0
View file @
4cfe11f
<template>
<div></div>
</template>
<script>
export default {
}
</script>
<style>
</style>
\ No newline at end of file
vue.config.js
View file @
53a0e3f
...
...
@@ -37,6 +37,7 @@ module.exports = {
target
:
`https://imacuat.zmd.apac.fedex.com/iMAC`
,
// target: `http://47.103.140.98:7001/iMAC`,
// target: `http://192.168.1.134:18080`,
// target: `http://47.103.140.98:7001/IMAC2`, //生产
changeOrigin
:
true
,
pathRewrite
:
{
[
'^'
+
process
.
env
.
VUE_APP_BASE_API
]:
''
...
...
Please
register
or
login
to post a comment