朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 0ede793a6ab81c4437fd39db5c9551c67ea831d6 1 个父辈 13f91c42 kako_vue

查询列表添加失效状态 

修改密码添加 旧密码验证
添加 统一认证前端页面
内嵌 并排对比
正在显示 24 个修改的文件 包含 1515 行增加 和 80 行删除
... ... @@ -4,6 +4,7 @@
<head>
<meta charset="utf-8">
<title>机场口岸通关物流辅助管理系统</title>
<!-- <title>货运统计分析</title>-->
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
</head>
... ...
... ... @@ -11,7 +11,7 @@
},
"dependencies": {
"@xkeshi/vue-barcode": "^1.0.0",
"axios": "^0.19.0",
"axios": "^0.21.1",
"common": "^0.2.5",
"echarts": "^3.3.2",
"element-ui": "^2.13.0",
... ...
import http from '../http.js'
let baseUrl = '/analysis-agent/agent'
export const getAnalysisList = params => { return http.get(`${baseUrl}/analysis`,params) };
export const getNmmsAnalysisList = params => { return http.get(`/analysis-nmms/nmmsAnalysis/analysis`,params) };
... ...
import http from './http.js'
import axios from "axios";
let baseUrl = 'cgonms-arrival'
//进港业务数据统计分析
export const getArrivalDataAnalysis = params =>{return http.get(`${baseUrl}/cgoNms/getInfo`, params);};
export const createArrivalExcel = params => { return http.post(`${baseUrl}/arrival/excel`, params)};
export const downArrivalExcel = params => { return axios.get(`${baseUrl}/arrival/downExcel`, params ) };
... ...
import http from './http.js'
import axios from "axios";
let baseUrl = 'cgonms-provide'
export const getExitDataAnalysis = params =>{return http.get(`${baseUrl}/cgoNms/getInfo`, params);};
export const createExcel = params => { return http.post(`${baseUrl}/exit/excel`,params)};
export const downExcel = params => { return axios.get(`${baseUrl}/exit/downExcel`, { params: params }); };
... ...
... ... @@ -46,15 +46,29 @@ export default {
login: data =>{
return axios({
method: 'POST', // 请求协议
url: 'cloud-user-center/login', // 请求的地址
// url: 'cloud-kako-user-center/login', // 请求的地址
data: qs.stringify(data), // post 请求的数据
timeout: 30000, // 超时时间, 单位毫秒
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
},
ssoLogin: data =>{
return axios({
method: 'POST', // 请求协议
// url: 'cloud-user-center/login', // 请求的地址
url: 'cloud-kako-user-center/login', // 请求的地址
url: 'cloud-kako-user-center/ssoLogin', // 请求的地址
data: qs.stringify(data), // post 请求的数据
timeout: 30000, // 超时时间, 单位毫秒
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
},
}
// {
... ...
export function UrlSearch(){
let name,value,str=location.href,num=str.indexOf("?"); //取得整个地址栏
str=str.substr(num+1); //取得所有参数 stringvar.substr(start [, length ]
let arr=str.split("&"); //各个参数放到数组里
console.log(arr)
for(let i=0;i < arr.length;i++){
num=arr[i].indexOf("=");
if(num>0){
name=arr[i].substring(0,num);
value=arr[i].substr(num+1);
this[name]=value;
}
}
}
\ No newline at end of file
... ...
... ... @@ -10,7 +10,7 @@ export const removeUser = params => { return http.del(`${baseUrl}/del`,params)};
export const batchRemoveUser = params => { return http.del(`${baseUrl}/batchremove`, { params: params }); };
export const editPass = params => { return http.put(`${baseUrl}/password`,params)};
export const editPass = params => { return http.put(`/sso-kako-user-center/user/password`,params)};
export const editUser = params => { return http.put(`${baseUrl}/edit`,params)};
... ... @@ -22,3 +22,7 @@ export const resetToken = params => { return http.put(`${baseUrl}/resetToken`,pa
export const getRandCode = params => { return http.post('/cloud-kako-user-center/anonymous/randCode', params); };
// export const testLogin = params => { return http.get(`http://10.5.11.88:6633/resource/login`, params); };
export const testLogin = params => { return http.get(`/sso-kako-user-center/anonymous/ssoLogin`, params); };
// export const testLogin = params => { return http.get(`http://10.50.3.73:8880/anonymous/ssoLogin`, params); };
... ...
... ... @@ -23,9 +23,10 @@ var axois_init = {
// 直接丢sessionStorage
if (!sessionStorage.getItem("token")) {
// 若是接口访问的时候没有发现有鉴权的基础信息,直接返回登录页
router.push({
path: "/login"
});
// router.push({
// // path: "/login"
// path: "/main"
// });
}
// 下面是接口回调的satus ,因为我做了一些错误页面,所以都会指向对应的报错页面
... ... @@ -85,21 +86,21 @@ var axois_init = {
},
init_router: (router,axios) => {
router.beforeEach((to, from, next) => {
//NProgress.start();
if (to.path == '/login') {
sessionStorage.removeItem('user');
sessionStorage.removeItem('menu');
sessionStorage.removeItem('token');
}else{
let user = JSON.parse(sessionStorage.getItem('user'));
if(sessionStorage.getItem('token')){
axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
}
if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {
next({ path: '/login' })
}
}
// NProgress.start();
// if (to.path == '/login') {
// sessionStorage.removeItem('user');
// sessionStorage.removeItem('menu');
// sessionStorage.removeItem('token');
// }else{
// let user = JSON.parse(sessionStorage.getItem('user'));
// if(sessionStorage.getItem('token')){
// axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
// }
//
// if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {
// next({ path: '/login' })
// }
// }
next()
});
}
... ...
import Login from './views/Login.vue'
import ssoLogin from './views/SsoLogin.vue'
import NotFound from './views/404.vue'
import Home from './views/Home.vue'
import Main from './views/dashboard/index'
... ... @@ -17,6 +18,11 @@ import Yard from './views/station_manage/Yard.vue'
import Bayonet from './views/station_manage/Bayonet.vue'
import Warehouse from './views/station_manage/Warehouse.vue'
import Verecord from './views/road_verecord/verecord'
//统计分析
import AgentExcelExport from './views/excel/exportExcel-agent'
import NMMSExcelExport from './views/excel/exportExcel-NMMS'
import ExitAnalysis from './views/dataAnalysis/ExitAnalysis'
import ArrivalAnalysis from './views/dataAnalysis/ArrivalAnalysis'
... ... @@ -28,6 +34,12 @@ let routes = [
hidden: true
},
{
path: '/ssologin',
component: ssoLogin,
name: '登录',
hidden: true
},
{
path: '/404',
component: NotFound,
name: '错误',
... ... @@ -90,20 +102,40 @@ let routes = [
},
{
path: '/',
component: Home,
name: 'Charts',
iconCls: 'fa fa-bar-chart',
children: [
{path: '/echarts', component: echarts, name: 'echarts'}
]
},
// {
// path: '/',
// component: Home,
// name: 'Charts',
// iconCls: 'fa fa-bar-chart',
// children: [
// {path: '/echarts', component: echarts, name: 'echarts'}
// ]
// },
{
path: '*',
hidden: true,
redirect: {path: '/404'}
}
},
// {
// path: '/cgonms-provide',
// component: Home,
// name: '业务统计',
// iconCls: 'fa fa-id-card-o',
// children: [
// {path: '/exitAnalysis', component: ExitAnalysis, name: '出港业务统计'},
// {path: '/arrivalAnalysis', component: ArrivalAnalysis, name: '进港业务统计'},
// ]
// },
// {
// path: '/analysis',
// component: Home,
// name: '统计分析',
// iconCls: 'fa fa-id-card-o',
// children: [
// {path: '/agentexport', component: AgentExcelExport, name: '出港统计'},
// {path: '/nmmsexport', component: NMMSExcelExport, name: '进港统计'},
// ]
// },
];
let initRouters = routes.concat();
let setUserMenus = function (list) {
... ...
const ArrivalWebsocket = {
wsuri: '',
serverPort: '9011',
sid: '',
/**
* 前后端消息定制的协议为JSON字符窜格式
* 下面是经过json转换收到的消息,重新赋值的
* 格式样例为:msgJson:{
* message:socketMessage,
* status: socketStatus,
* data: socketDataList
* .....
* }
*/
socketMessage: '',
socketStatus: '',
socketDataList: '',
msgJson: '',
websocket: undefined,
// eslint-disable-next-line no-console
onmessage: function (event) {console.log(event.data)},
// eslint-disable-next-line no-console
onclose: function (event) {console.log("websocket链接已关闭")},
// eslint-disable-next-line no-console
onopen: function (event) {console.log("websocket链接已链接")},
// eslint-disable-next-line no-console
onerror: function (event) {console.log("websocket链接失败,请检查URL")},
// eslint-disable-next-line no-console
send: function(message){console.log("已发送消息")},
getWebIP: function () {
var curIP = window.location.hostname;
return curIP;
},
init: function () {
this.sid= sessionStorage.getItem('token');
this.wsuri = "ws://" + '192.168.1.17'+ ":" + this.serverPort + "/websocket/" + this.sid;
if(this.sid!== ''){
this.websocket = new WebSocket(this.wsuri);
this.websocket.onmessage = this.onmessage;
this.websocket.onclose = this.onclose;
this.websocket.onopen = this.onopen;
this.websocket.onerror = this.onerror;
this.websocket.send = this.send;
}
}
}
export default ArrivalWebsocket;
... ...
const VueWebsocket = {
wsuri: '',
serverPort: '9001',
sid: '',
/**
* 前后端消息定制的协议为JSON字符窜格式
* 下面是经过json转换收到的消息,重新赋值的
* 格式样例为:msgJson:{
* message:socketMessage,
* status: socketStatus,
* data: socketDataList
* .....
* }
*/
socketMessage: '',
socketStatus: '',
socketDataList: '',
msgJson: '',
websocket: undefined,
// eslint-disable-next-line no-console
onmessage: function (event) {console.log(event.data)},
// eslint-disable-next-line no-console
onclose: function (event) {console.log("websocket链接已关闭")},
// eslint-disable-next-line no-console
onopen: function (event) {console.log("websocket链接已链接")},
// eslint-disable-next-line no-console
onerror: function (event) {console.log("websocket链接失败,请检查URL")},
// eslint-disable-next-line no-console
send: function(message){console.log("已发送消息")},
getWebIP: function () {
var curIP = window.location.hostname;
return curIP;
},
init: function () {
this.sid= sessionStorage.getItem('token');
this.wsuri = "ws://" + '192.168.1.17'+ ":" + this.serverPort + "/websocket/" + this.sid;
if(this.sid!== ''){
this.websocket = new WebSocket(this.wsuri);
this.websocket.onmessage = this.onmessage;
this.websocket.onclose = this.onclose;
this.websocket.onopen = this.onopen;
this.websocket.onerror = this.onerror;
this.websocket.send = this.send;
}
}
}
export default VueWebsocket;
\ No newline at end of file
... ...
... ... @@ -3,6 +3,7 @@
<el-col :span="24" class="header">
<el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'">
机场口岸通关物流辅助管理系统
<!-- 货运统计分析-->
</el-col>
<el-col :span="10">
<div class="tools" @click.prevent="collapse">
... ... @@ -27,6 +28,9 @@
<el-form-item label="用户名" prop="name">
<span>{{sysUserName}}</span>
</el-form-item>
<el-form-item label="旧密码" prop="oldPassword">
<el-input type="password" v-model="resetForm.oldPassword" autocomplete="off" placeholder="8-20位字符在数字、小写、大写字母以及特殊字符中四选三"></el-input>
</el-form-item>
<el-form-item label="新密码" prop="newpwd">
<el-input type="password" v-model="resetForm.newpwd" autocomplete="off" placeholder="8-20位字符在数字、小写、大写字母以及特殊字符中四选三"></el-input>
</el-form-item>
... ... @@ -166,6 +170,7 @@
resetForm: {
newpwd: '',
renewpwd: '',
oldPassword: ''
},
resetFormRules: {
newpwd: [
... ... @@ -173,11 +178,16 @@
],
renewpwd: [
{ required: true, validator: validatePass2, trigger: 'blur' }
],
oldPassword: [
{ required: true, message:'旧密码不能为空', trigger: 'blur' }
]
},
editForm: {
id: '',
password: '',
oldPassword: '',
// userSyncId: JSON.parse(sessionStorage.getItem('user')).userSyncId
},
}
},
... ... @@ -217,6 +227,7 @@
if (valid) {
this.editForm.id=this.sysUserId;
this.editForm.password=this.resetForm.renewpwd;
this.editForm.oldPassword=this.resetForm.oldPassword;
editPass(this.editForm).then(res=>{
let response=res.data;
if(response.code=='200'){
... ...
... ... @@ -18,13 +18,9 @@
@click="getVerifyCode"
>
</el-form-item>
<!-- <el-form-item prop="checkPass">-->
<!-- <el-input type="password" v-model="ruleForm2.checkPass" placeholder="密码" @keyup.enter.native="handleSubmit2"></el-input>-->
<!-- </el-form-item>-->
<el-checkbox v-model="checked" checked class="remeberme">记住密码</el-checkbox>
<el-form-item style="width:100%;">
<el-button type="primary" style="width:100%;" @click.native.prevent="handleSubmit2" :loading="logining" :plain="true">登录</el-button>
<!--<el-button @click.native.prevent="handleReset2">重置</el-button>-->
</el-form-item>
</el-form>
<div class="homepage-hero-module">
... ... @@ -80,9 +76,9 @@
};
},
methods: {
canplay() {
this.vedioCanPlay = true
},
canplay() {
this.vedioCanPlay = true
},
handleReset2() {
this.$refs.ruleForm2.resetFields();
},
... ... @@ -142,11 +138,12 @@
let token = authentication.token;
let loginUserMenus = res.data.loginUserMenus;
if (status !== 200) {
let msg = "登录错误";
this.$message({
message: msg,
type: "error"
});
this.getVerifyCode();
let msg = "登录错误";
this.$message({
message: msg,
type: "error"
});
} else if (token) {
sessionStorage.setItem('user', JSON.stringify(authentication));
sessionStorage.setItem('token','Bearer '+ token);
... ... @@ -169,47 +166,49 @@
_this.$router.push({path: '/main'});
}
}).catch(error => {
this.$message({
message: error.toString(),
type: "error"
});
this.logining = false;
this.$message({
message: error.toString(),
type: "error"
});
this.logining = false;
this.getVerifyCode();
});
} else {
return false;
}
});
}
},
},
mounted:function () {
window.onresize = () => {
const windowWidth = document.body.clientWidth
const windowHeight = document.body.clientHeight
const windowAspectRatio = windowHeight / windowWidth
let videoWidth
let videoHeight
if (windowAspectRatio < 0.5625) {
videoWidth = windowWidth
videoHeight = videoWidth * 0.5625
this.fixStyle = {
height: windowWidth * 0.5625 + 'px',
width: windowWidth + 'px',
'margin-bottom': (windowHeight - videoHeight) / 2 + 'px',
'margin-left': 'initial'
}
} else {
videoHeight = windowHeight
videoWidth = videoHeight / 0.5625
this.fixStyle = {
height: windowHeight + 'px',
width: windowHeight / 0.5625 + 'px',
'margin-left': (windowWidth - videoWidth) / 2 + 'px',
'margin-bottom': 'initial'
}
}
},
window.onresize();
// this.randCode();
window.onresize = () => {
const windowWidth = document.body.clientWidth
const windowHeight = document.body.clientHeight
const windowAspectRatio = windowHeight / windowWidth
let videoWidth
let videoHeight
if (windowAspectRatio < 0.5625) {
videoWidth = windowWidth
videoHeight = videoWidth * 0.5625
this.fixStyle = {
height: windowWidth * 0.5625 + 'px',
width: windowWidth + 'px',
'margin-bottom': (windowHeight - videoHeight) / 2 + 'px',
'margin-left': 'initial'
}
} else {
videoHeight = windowHeight
videoWidth = videoHeight / 0.5625
this.fixStyle = {
height: windowHeight + 'px',
width: windowHeight / 0.5625 + 'px',
'margin-left': (windowWidth - videoWidth) / 2 + 'px',
'margin-bottom': 'initial'
}
}
},
window.onresize();
// this.ticket();
// this.randCode();
},
created(){
this.getVerifyCode()
... ...
<template>
<!-- <div>-->
<!-- <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-position="left" label-width="0px" class="demo-ruleForm login-container" id="loginForm">-->
<!-- <h3 class="title">系统登录</h3>-->
<!-- <el-form-item prop="account">-->
<!-- <el-input type="text" v-model="ruleForm2.account" autofocus placeholder="账号"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="checkPass">-->
<!-- <el-input type="password" v-model="ruleForm2.checkPass" placeholder="密码"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="verify">-->
<!-- <el-input type="text" v-model="ruleForm2.verify" placeholder="请输入下方图片显示的验证码" @keyup.enter.native="handleSubmit2"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <img-->
<!-- style="width: 125px; height: 60px"-->
<!-- :src="verifyImg"-->
<!-- @click="getVerifyCode"-->
<!-- >-->
<!-- </el-form-item>-->
<!-- <el-checkbox v-model="checked" checked class="remeberme">记住密码</el-checkbox>-->
<!-- <el-form-item style="width:100%;">-->
<!-- <el-button type="primary" style="width:100%;" @click.native.prevent="handleSubmit2" :loading="logining" :plain="true">登录</el-button>-->
<!-- &lt;!&ndash;<el-button @click.native.prevent="handleReset2">重置</el-button>&ndash;&gt;-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div class="homepage-hero-module">-->
<!-- <div class="video-container">-->
<!-- <div :style="fixStyle" class="filter"></div>-->
<!-- <video :style="fixStyle" autoplay loop class="fillWidth" v-on:canplay="canplay">-->
<!-- <source src="/static/login/New-jumbo.mp4" type="video/mp4"/>-->
<!-- 浏览器不支持 video 标签，建议升级浏览器。-->
<!-- &lt;!&ndash;<source src="/static/login/New-jumbo.webm" type="video/webm"/>&ndash;&gt;-->
<!-- &lt;!&ndash;浏览器不支持 video 标签，建议升级浏览器。&ndash;&gt;-->
<!-- </video>-->
<!-- <div class="poster hidden" v-if="!vedioCanPlay">-->
<!-- <img :style="fixStyle" src="https://s2.best-wallpaper.net/wallpaper/2560x1600/1511/Airplane-passenger-airliner-flight-sea-lights-airport-evening_2560x1600.jpg" alt="">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</template>
<script>
import axios from 'axios'
import http from '../api/http';
import {getRandCode, testLogin} from '../api/user';
export default {
data() {
return {
verifyImg: "",
vedioCanPlay: true,
fixStyle: '',
logining: false,
ruleForm2: {
account: '',
checkPass: '',
verify: '',
verifyToken: ''
},
rules2: {
account: [
{ required: true, message: '请输入账号', trigger: 'blur' },
//{ validator: validaePass }
],
checkPass: [
{ required: true, message: '请输入密码', trigger: 'blur' },
//{ validator: validaePass2 }
],
checkVerify: [
{ required: true, message: '请输入验证码', trigger: 'blur' }
]
},
checked: true,
userMenus: []
};
},
methods: {
canplay() {
this.vedioCanPlay = true
},
handleReset2() {
this.$refs.ruleForm2.resetFields();
},
handleMenuList : function (router,menu) {
var _this = this;
var routerName = "";
var routerTemp = router.concat();
routerTemp.forEach(function (v_router,v_index,v_arr) {
routerName = v_router.name;
//查找返回的目录列表是否包含路由名称,有就返回匹配到的元素,没有就移除
let result = menu.find(item => {
return item.name === routerName;
});
//匹配到继续判断是否子元素,有子元素继续递归
if (result) {
if (v_router.children && v_router.children.length>0) {
_this.handleMenuList(v_router.children, result.children);
}
}else {
//没有则可以移除
let deletRouter = router.findIndex(itm => itm.name === routerName );
router.splice(deletRouter,1);
}
});
console.log("longined router:");
console.log(routerName);
console.log(_this.$router.options.routes);
// 本地存储用户目录 ，防刷新目录丢失用
sessionStorage.setItem('menu', JSON.stringify(_this.$router.options.routes));
},
getVerifyCode: function(){
getRandCode().then((res) =>{
let status = res.status;
this.ruleForm2.verifyToken = res.data.jwtToken;
this.verifyImg = res.data.data.verifyImg;
}).catch({
});
},
// 获取地址栏参数
getUrlKey: function (name) {
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
},
// 获取票据
ticket: function () {
let ticket = this.getUrlKey("ticket");
if (ticket!=undefined){
let loginParams = {
ticket : ticket
}
testLogin(loginParams).then(res => {
//NProgress.done();
let status = res.status;
let authentication = res.data.authentication;
let token = authentication.token;
let loginUserMenus = res.data.loginUserMenus;
if (status !== 200) {
let msg = "该账户不存在本系统";
this.$message({
message: msg,
type: "error"
});
} else if (token) {
sessionStorage.setItem('user', JSON.stringify(authentication));
sessionStorage.setItem('token','Bearer '+ token);
//设置token,设置axios 基本配置,但是刷新后 这个登录保存的就没了
axios.defaults.headers.common['Authorization'] = 'Bearer '+token;
//处理用户menu
this.userMenus = loginUserMenus.list;
console.log("userMenus:");
console.log(this.userMenus);
console.log(loginUserMenus.list);
let sysMenus = this.$router.options.routes;
console.log("sysMenus:");
console.log(sysMenus);
this.handleMenuList(this.$router.options.routes,this.userMenus);
console.log("user:");
console.log(this.$router.options.routes);
this.$router.push({path: '/main'});
}
}).catch(error => {
this.$message({
message: error.toString(),
type: "error"
});
this.logining = false;
});
}else {
console.log("票据为空 请求路由")
window.location.href = 'http://10.5.14.103:27080/sso/login?service=http://10.50.7.70:9909/%23/ssologin'
// window.location.href = 'http://10.5.14.103:27080/sso/login?service=http://10.50.3.73:8880/%23/SsoLogin'
}
}
},
mounted:function () {
window.onresize = () => {
const windowWidth = document.body.clientWidth
const windowHeight = document.body.clientHeight
const windowAspectRatio = windowHeight / windowWidth
let videoWidth
let videoHeight
if (windowAspectRatio < 0.5625) {
videoWidth = windowWidth
videoHeight = videoWidth * 0.5625
this.fixStyle = {
height: windowWidth * 0.5625 + 'px',
width: windowWidth + 'px',
'margin-bottom': (windowHeight - videoHeight) / 2 + 'px',
'margin-left': 'initial'
}
} else {
videoHeight = windowHeight
videoWidth = videoHeight / 0.5625
this.fixStyle = {
height: windowHeight + 'px',
width: windowHeight / 0.5625 + 'px',
'margin-left': (windowWidth - videoWidth) / 2 + 'px',
'margin-bottom': 'initial'
}
}
},
window.onresize();
this.ticket();
},
created(){
}
}
</script>
<!--<style lang="scss" scoped>-->
<!-- #loginForm{-->
<!-- filter:alpha(Opacity=90);-->
<!-- -moz-opacity:0.9;-->
<!-- opacity: 0.9;-->
<!-- }-->
<!-- .homepage-hero-module,-->
<!-- .video-container {-->
<!-- height: 100vh;-->
<!-- /*overflow: hidden;*/-->
<!-- position: absolute;-->
<!-- top:0px;-->
<!-- left: 0;-->
<!-- z-index: -1;-->
<!-- }-->
<!-- .video-container .poster img,-->
<!-- .video-container video {-->
<!-- z-index: 0;-->
<!-- position: absolute;-->
<!-- }-->
<!-- .video-container .filter {-->
<!-- z-index: 1;-->
<!-- position: absolute;-->
<!-- background: rgba(0, 0, 0, 0.4);-->
<!-- }-->
<!-- .login-container {-->
<!-- /*box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.06), 0 1px 0px 0 rgba(0, 0, 0, 0.02);*/-->
<!-- -webkit-border-radius: 5px;-->
<!-- border-radius: 5px;-->
<!-- -moz-border-radius: 5px;-->
<!-- background-clip: padding-box;-->
<!-- margin: 180px auto;-->
<!-- width: 350px;-->
<!-- padding: 35px 35px 15px 35px;-->
<!-- background: #fff;-->
<!-- border: 1px solid #eaeaea;-->
<!-- box-shadow: 0 0 25px #cac6c6;-->
<!-- .title {-->
<!-- margin: 0px auto 40px auto;-->
<!-- text-align: center;-->
<!-- color: #505458;-->
<!-- }-->
<!-- .remember {-->
<!-- margin: 0px 0px 35px 0px;-->
<!-- }-->
<!-- }-->
<!--</style>-->
\ No newline at end of file
... ...
<template>
<el-container>
<el-main>
<el-card style="background-color: #F5F7FA">
<!-- 搜素区域 -->
<div>
<el-row :gutter="24">
<el-col :span="5">
<el-input v-model="queryInfo.flightNo" prefix-icon="el-icon-search"
placeholder="请输入航班号" clearable style="width:220px">
</el-input>
</el-col>
<el-col :span="5">
<el-date-picker v-model="queryInfo.flightDate" type="date" value-format="yyyy-MM-dd"
placeholder="请选择航班日期"
style="width: 220px">
</el-date-picker>
</el-col>
<el-col :span="10">
<el-button type="primary" @click="getExitInfoList" style="width: 160px;"
icon="el-icon-search">
数据统计查询
</el-button>
<el-button :loading="downloadLoading" type="success" icon="el-icon-s-home"
style="width: 160px;"
:disabled="socketResponse.socketStatus!=='200'"
@click="downLoadExcel">导出 Excel
</el-button>
</el-col>
</el-row>
<!-- 显示区域 -->
<el-row :gutter="24" style="margin-top: 30px">
<el-col :span="11" style="margin-top: 10px">
<!-- <el-progress :text-inside="true" :stroke-width="15" :percentage="proportion"-->
<!-- :color="customColors"-->
<!-- style="width: 455px"></el-progress>-->
<el-input v-model="message" type="textarea"
:autosize="{ minRows: 6, maxRows: 10}"
style="width: 455px;height: 400px"
placeholder="获取数据进度" readonly>
</el-input>
</el-col>
<el-col :span="4" style="margin-left: 40px;margin-top: 20px">
<el-progress type="circle" :percentage="proportion"
:stroke-width="12"
:color="customColors"
:width="proportion>6?200:126">
</el-progress>
</el-col>
</el-row>
</div>
</el-card>
</el-main>
</el-container>
</template>
<script>
import {getArrivalDataAnalysis, createArrivalExcel, downArrivalExcel} from "../../api/arrival_data_analysis";
import ArrivalWebsocket from '@/utils/arrival_web_socket';
export default {
name: "ExitAnalysis",
data() {
return {
/**
* 出港业务统计列表
*/
exitInfoList: [],
resultStatus: '0',
message: '',
/**
* 返回结果
*/
socketResponse: {
socketMessage: '',
socketStatus: '',
socketDataList: [],
socketCurrentNum: 1,
socketTotalNum: 1,
},
/**
* 查询列表
*/
queryInfo: {
//航班号
flightNo: 'CV4481',
//航班日期
flightDate: '2019-06-11',
},
/* 列表加载 */
listLoading: false,
downloadLoading: false,
/**
* 百分比例
*/
proportion: 0,
/**
* 百分比例，颜色
*/
customColors: [
{color: '#6f7ad3', percentage: 20},
{color: '#f56c6c', percentage: 40},
{color: '#e6a23c', percentage: 60},
{color: '#5cb87a', percentage: 80},
{color: '#1989fa', percentage: 100},
],
/**
* 下载路径的参数
*/
fileName: "test.xls",
ipAddress: "",
url: "",
}
},
methods: {
/**
* 获取出港信息列表
*/
getExitInfoList() {
let _this = this;
if (_this.queryInfo.flightNo === '') {
if (_this.queryInfo.flightDate === '' || _this.queryInfo.flightDate === null) {
return _this.$message.warning('航班号与航班日期，不能同时为空');
}
}
_this.$message.success('开始获取统计数据');
getArrivalDataAnalysis(_this.queryInfo).catch(error => {
// _this.$message.info("即将结束！请您稍候");
});
},
/**
* 下载excel
*/
downLoadExcel() {
downArrivalExcel().then((response) => {
this.downloadLoading = true;
let res = response.data;
if (res.code !== '200') {
return this.$message.error('下载失败');
this.downloadLoading = false;
}
// console.log(res.msg)
//获取地址
this.ipAddress = res.msg;
this.url = this.ipAddress + this.fileName;
console.log(this.url)
// console.log(this.ipAddress)
this.down();
this.downloadLoading = false;
}).catch(error => {
this.downloadLoading = false;
console.log(error.toString())
this.$message.error(error.toString());
});
},
down() {
// 创建a标签
const link = document.createElement('a');
// download属性
link.setAttribute('download', 'excel.xls');
// href链接
link.setAttribute('href', this.url);
document.body.appendChild(link);
// 自执行点击事件
link.click()
},
/**
* 生成excel
*/
generateExcel() {
createArrivalExcel(this.socketResponse.socketDataList).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('生成excel失败');
}
this.fileName = res.msg;
console.log(this.fileName)
this.$message.success("Excel准备就绪")
}).catch(error => {
this.$message.error(error.toString());
});
},
socket_onmessage: function (e) {
console.log("从websocket接收到新的消息-->>" + e.data);
//this.message = this.message + e.data + "\n";
let msgJson = JSON.parse(e.data);
this.message = this.message + this.dataFormat(new Date()) + " -> " + msgJson.message + "\n";
this.socketResponse = JSON.parse(e.data);
this.socketResponse.socketMessage = msgJson.message;
this.socketResponse.socketCurrentNum = msgJson.currentNum;
this.socketResponse.socketTotalNum = msgJson.totalNum;
console.log(this.socketMessage);
this.socketResponse.socketStatus = msgJson.status;
this.socketResponse.socketDataList = msgJson.data;
console.log(msgJson);
if (this.socketResponse.socketTotalNum !== null && this.socketResponse.socketTotalNum !== 0) {
this.proportion = this.toPercent(this.socketResponse.socketCurrentNum / this.socketResponse.socketTotalNum);
}
if (this.socketResponse.socketCurrentNum === this.socketResponse.socketTotalNum &&
this.socketResponse.socketTotalNum !== 0 && this.socketResponse.socketCurrentNum !== 0) {
this.generateExcel();
}
},
socket_onopen: function (e) {
console.log("websocket->>链接已链接");
},
/**
* 重写日期函数格式化日期
*/
dataFormat(time) {
return `${time.getFullYear()}-${time.getMonth() + 1 >= 10 ? (time.getMonth() + 1) : '0' + (time.getMonth() + 1)}-${time.getDate() >= 10 ? time.getDate() : '0' + time.getDate()} ${time.getHours() >= 10 ? time.getHours() : '0' + time.getHours()}:${time.getMinutes() >= 10 ? time.getMinutes() : '0' + time.getMinutes()}:${time.getSeconds() >= 10 ? time.getSeconds() : '0' + time.getSeconds()}`;
},
/**
* 将小数转换成百分比
* @param point
* @returns {string|number}
*/
toPercent(point) {
if (point == 0) {
return 0;
}
let str = Number(point * 100).toFixed();
// str+="%";
return parseInt(str);
}
},
created() {
ArrivalWebsocket.onopen = this.socket_onopen;
ArrivalWebsocket.onmessage = this.socket_onmessage;
ArrivalWebsocket.init();
},
destroyed() {
},
watch: {},
}
</script>
<style scoped>
</style>
... ...
<template>
<el-container>
<el-main>
<el-card style="background-color: #F5F7FA">
<!-- 搜素区域 -->
<div>
<el-row :gutter="24">
<el-col :span="5">
<el-input v-model="queryInfo.flightNo" prefix-icon="el-icon-search"
placeholder="请输入航班号" clearable style="width:220px">
</el-input>
</el-col>
<el-col :span="5">
<el-date-picker v-model="queryInfo.flightDate" type="date" value-format="yyyy-MM-dd"
placeholder="请选择航班日期"
style="width: 220px">
</el-date-picker>
</el-col>
<el-col :span="10">
<el-button type="primary" @click="getExitInfoList" style="width: 160px;"
icon="el-icon-search">
数据统计查询
</el-button>
<el-button :loading="downloadLoading" type="success" icon="el-icon-s-home"
style="width: 160px;"
:disabled="socketResponse.socketStatus!=='200'"
@click="downLoadExcel">导出 Excel
</el-button>
</el-col>
</el-row>
<!-- 显示区域 -->
<el-row :gutter="24" style="margin-top: 30px">
<el-col :span="11" style="margin-top: 10px">
<!-- <el-progress :text-inside="true" :stroke-width="15" :percentage="proportion"-->
<!-- :color="customColors"-->
<!-- style="width: 455px"></el-progress>-->
<el-input v-model="message" type="textarea"
:autosize="{ minRows: 6, maxRows: 10}"
style="width: 455px;height: 400px"
placeholder="获取数据进度" readonly>
</el-input>
</el-col>
<el-col :span="4" style="margin-left: 40px;margin-top: 20px">
<el-progress type="circle" :percentage="proportion"
:stroke-width="12"
:color="customColors"
:width="proportion>6?200:126"></el-progress>
</el-col>
</el-row>
</div>
</el-card>
</el-main>
</el-container>
</template>
<script>
import {downExcel, createExcel, getExitDataAnalysis} from "../../api/exit_data_analysis";
import VueWebsocket from '@/utils/websocket';
export default {
name: "ExitAnalysis",
data() {
return {
/**
* 出港业务统计列表
*/
exitInfoList: [],
resultStatus: '0',
message: '',
/**
* 返回结果
*/
socketResponse: {
socketMessage: '',
socketStatus: '',
socketDataList: [],
socketCurrentNum: 1,
socketTotalNum: 1,
},
/**
* 查询列表
*/
queryInfo: {
//航班号
flightNo: '',
//航班日期
flightDate: '',
},
/* 列表加载 */
listLoading: false,
downloadLoading: false,
/**
* 百分比例
*/
proportion: 0,
/**
* 百分比例，颜色
*/
customColors: [
{color: '#6f7ad3', percentage: 20},
{color: '#f56c6c', percentage: 40},
{color: '#e6a23c', percentage: 60},
{color: '#5cb87a', percentage: 80},
{color: '#1989fa', percentage: 100},
],
/**
* 下载路径的参数
*/
fileName: "test.xls",
ipAddress: "",
url: "",
}
},
methods: {
/**
* 获取出港信息列表
*/
getExitInfoList() {
let _this = this;
if (_this.queryInfo.flightNo === '') {
if (_this.queryInfo.flightDate === '' || _this.queryInfo.flightDate === null) {
return _this.$message.warning('航班号与航班日期，不能同时为空');
}
}
_this.$message.success('开始获取统计数据');
getExitDataAnalysis(_this.queryInfo).catch(error => {
// _this.$message.info("即将结束！请您稍候");
});
},
/**
* 下载excel
*/
downLoadExcel() {
downExcel().then((response) => {
this.downloadLoading = true;
let res = response.data;
if (res.code !== '200') {
return this.$message.error('下载失败');
this.downloadLoading = false;
}
// console.log(res.msg)
//获取地址
this.ipAddress = res.msg;
this.url = this.ipAddress + this.fileName;
console.log(this.url)
// console.log(this.ipAddress)
this.down();
this.downloadLoading = false;
}).catch(error => {
this.downloadLoading = false;
console.log(error.toString())
this.$message.error(error.toString());
});
},
down() {
// 创建a标签
const link = document.createElement('a');
// download属性
link.setAttribute('download', 'excel.xls');
// href链接
link.setAttribute('href', this.url);
document.body.appendChild(link);
// 自执行点击事件
link.click()
},
/**
* 生成excel
*/
generateExcel() {
createExcel(this.socketResponse.socketDataList).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('生成excel失败');
}
this.fileName = res.msg;
console.log(this.fileName)
this.$message.success("Excel准备就绪")
}).catch(error => {
this.$message.error(error.toString());
});
},
socket_onmessage: function (e) {
console.log("从websocket接收到新的消息-->>" + e.data);
//this.message = this.message + e.data + "\n";
let msgJson = JSON.parse(e.data);
this.message = this.message + this.dataFormat(new Date()) + " -> " + msgJson.message + "\n";
this.socketResponse = JSON.parse(e.data);
this.socketResponse.socketMessage = msgJson.message;
this.socketResponse.socketCurrentNum = msgJson.currentNum;
this.socketResponse.socketTotalNum = msgJson.totalNum;
console.log(this.socketMessage);
this.socketResponse.socketStatus = msgJson.status;
this.socketResponse.socketDataList = msgJson.data;
console.log(msgJson);
if (this.socketResponse.socketTotalNum !== null && this.socketResponse.socketTotalNum !== 0) {
this.proportion = this.toPercent(this.socketResponse.socketCurrentNum / this.socketResponse.socketTotalNum);
}
if (this.socketResponse.socketCurrentNum === this.socketResponse.socketTotalNum &&
this.socketResponse.socketTotalNum !== 0 && this.socketResponse.socketCurrentNum !== 0) {
this.generateExcel();
}
},
socket_onopen: function (e) {
console.log("websocket->>链接已链接");
},
/**
* 重写日期函数格式化日期
*/
dataFormat(time) {
return `${time.getFullYear()}-${time.getMonth() + 1 >= 10 ? (time.getMonth() + 1) : '0' + (time.getMonth() + 1)}-${time.getDate() >= 10 ? time.getDate() : '0' + time.getDate()} ${time.getHours() >= 10 ? time.getHours() : '0' + time.getHours()}:${time.getMinutes() >= 10 ? time.getMinutes() : '0' + time.getMinutes()}:${time.getSeconds() >= 10 ? time.getSeconds() : '0' + time.getSeconds()}`;
},
/**
* 将小数转换成百分比
* @param point
* @returns {string|number}
*/
toPercent(point) {
if (point == 0) {
return 0;
}
let str = Number(point * 100).toFixed();
// str+="%";
return parseInt(str);
}
},
created() {
VueWebsocket.onopen = this.socket_onopen;
VueWebsocket.onmessage = this.socket_onmessage;
VueWebsocket.init();
},
destroyed() {
},
watch: {},
}
</script>
<style scoped>
</style>
... ...
<template>
<div style="display:inline-block;">
<label class="radio-label">导出是否自动适配列宽: </label>
<el-radio-group v-model="autoWidth">
<el-radio :label="true" border>True</el-radio>
<el-radio :label="false" border>False</el-radio>
</el-radio-group>
</div>
</template>
<script>
export default {
props: {
value: {
type: Boolean,
default: true
}
},
computed: {
autoWidth: {
get() {
return this.value
},
set(val) {
this.$emit('input', val)
}
}
}
}
</script>
... ...
<template>
<div style="display:inline-block;">
<label class="radio-label">导出类型: </label>
<el-select v-model="bookType" style="width:120px;" >
<el-option
v-for="item in options"
:key="item"
:label="item"
:value="item"/>
</el-select>
</div>
</template>
<script>
export default {
props: {
value: {
type: String,
default: 'xlsx'
}
},
data() {
return {
options: ['xlsx', 'csv', 'txt']
}
},
computed: {
bookType: {
get() {
return this.value
},
set(val) {
this.$emit('input', val)
}
}
}
}
</script>
... ...
<template>
<div style="display:inline-block;">
<!-- $t is vue-i18n global function to translate lang -->
<label class="radio-label" style="padding-left:0;">导出文件名: </label>
<el-input placeholder="非必填,默认导出文件名为excel-list.xlsx" v-model="filename" style="width:340px;" prefix-icon="el-icon-document"/>
</div>
</template>
<script>
export default {
props: {
value: {
type: String,
default: ''
}
},
computed: {
filename: {
get() {
return this.value
},
set(val) {
this.$emit('input', val)
}
}
}
}
</script>
... ...
<template>
<!-- $t is vue-i18n global function to translate lang -->
<div class="app-container">
<!--工具条-->
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="searchText">
<el-form-item>
<el-date-picker v-model="searchText.startdate" value-format="yyyy-MM-dd" type="date"
placeholder="开始航班日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-date-picker v-model="searchText.enddate" value-format="yyyy-MM-dd" type="date"
placeholder="结束航班日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-input v-model="searchText.flightno" placeholder="航班号" ></el-input>
</el-form-item>
<el-form-item>
<el-button :loading="listLoading" style="margin:0 0 20px 20px;" type="primary" icon="document" @click="fetchData">查询</el-button>
</el-form-item>
<el-tag
:key="note.message"
:type="note.type">
{{note.message}}
</el-tag>
</el-form>
</el-col>
<div>
<FilenameOption v-model="filename" />
<AutoWidthOption v-model="autoWidth" />
<BookTypeOption v-model="bookType" />
<el-button :loading="downloadLoading" style="margin:0 0 20px 20px;" type="primary" icon="document" @click="handleDownload">导出 Excel</el-button>
</div>
<el-table v-loading="listLoading" element-loading-text="拼命加载中" border fit highlight-current-row>
<el-table-column align="center" label="Id" width="95">
<template slot-scope="scope">
{{ scope.$index }}
</template>
</el-table-column>
<el-table-column label="运单号">
<template slot-scope="scope">
{{ scope.row.waybillnomaster }}
</template>
</el-table-column>
<el-table-column label="航班号" width="115" align="center">
<template slot-scope="scope">
{{ scope.row.flightno }}
</template>
</el-table-column>
<el-table-column align="center" label="航班日期" width="220" :formatter="dateFormat">
<template slot-scope="scope">
<i class="el-icon-time"/>
<span>{{ scope.row.flightDate | parseTime('{y}-{m}-{d}')}}</span>
</template>
</el-table-column>
<el-table-column label="航段" width="110" align="center">
<template slot-scope="scope">
<el-tag>{{ scope.row.segment }}</el-tag>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
import { getNmmsAnalysisList } from '@/api/agent-excel'
import { parseTime } from '@/utils'
// options components
import FilenameOption from './components/FilenameOption'
import AutoWidthOption from './components/AutoWidthOption'
import BookTypeOption from './components/BookTypeOption'
import Export2Excel from '@/vendor/Export2Excel'
export default {
name: 'ExportExcelNMMS',
components: { FilenameOption, AutoWidthOption, BookTypeOption },
data() {
return {
list: [],
fetchList: [],
listLoading: false,
downloadLoading: false,
filename: '',
autoWidth: true,
bookType: 'xlsx',
searchText: {
startdate: undefined,
enddate: undefined,
flightno: undefined
},
note: {
type: 'info',
message: ''
}
}
},
created() {
// this.fetchData()
},
filters: {
parseTime: parseTime
},
methods: {
dateFormat:function(row,column){
var t=new Date(row.updateTime);//row 表示一行数据, updateTime 表示要格式化的字段名称
return t.getFullYear()+"-"+(t.getMonth()+1)+"-"+t.getDate();
},
fetchData() {
this.listLoading = true
getNmmsAnalysisList(this.searchText).then(response => {
this.list = response.data.data
this.listLoading = false
this.$message({
message: '数据查询成功,可以下载excel',
type: 'success'
});
this.note.message = '数据查询成功,可以下载excel;共'+this.list.length+'条数据';
this.note.type = 'success';
})
},
handleDownload() {
this.downloadLoading = true
import('@/vendor/Export2Excel').then(excel => {
const tHeader = [
'航班号',
'航班日期',
'航段',
'主运单号',
'分单号',
'运单件数',
'运单重量',
'舱单件数',
'舱单重量',
'品名',
'航班起始站',
'航班起始站中文',
'航班目的站',
'航班目的站中文',
'运单起始站',
'运单起始站中文',
'运单目的站',
'运单目的站中文',
'发货人国家',
'发货人国家中文',
'发货人区域'
]
const filterVal = [
'flightno',
'flightDate',
'segment',
'waybillnomaster',
'waybillnosecondary',
'totalpiece',
'totalweight',
'manifesttotalpiece',
'manifesttotalweight',
'productname',
'originatingstation',
'originatingstationcn',
'destinationstation',
'destinationstationcn',
'originatingstationBill',
'originatingstationbillcn',
'destinationstationBill',
'destinationstationbillcn',
'shipperCountrycode',
'countrydescchn',
'areadescchn'
]
const list = this.list
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
header: tHeader,
data,
filename: this.filename,
autoWidth: this.autoWidth,
bookType: this.bookType
})
this.downloadLoading = false
})
},
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {
if (j === 'timeamp') {
return parseTime(v[j])
} else {
return v[j]
}
}))
}
}
}
</script>
<style>
.radio-label {
font-size: 14px;
color: #606266;
line-height: 40px;
padding: 0 12px 0 30px;
}
</style>
... ...
<template>
<!-- $t is vue-i18n global function to translate lang -->
<div class="app-container">
<!--工具条-->
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="searchText">
<el-form-item>
<el-date-picker v-model="searchText.startdate" value-format="yyyy-MM-dd" type="date"
placeholder="开始航班日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-date-picker v-model="searchText.enddate" value-format="yyyy-MM-dd" type="date"
placeholder="结束航班日期"
></el-date-picker>
</el-form-item>
<FilenameOption v-model="filename" />
<el-button :loading="downloadLoading" style="margin:0 0 20px 20px;" type="primary" icon="document" @click="exportExcel">导出 Excel</el-button>
</el-form>
</el-col>
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<span>导出进度:{{downloadSize}}</span>
</el-col>
</div>
</template>
<script>
// import { getAnalysisList } from '@/api/agent-excel'
import { parseTime } from '@/utils'
// options components
import FilenameOption from './components/FilenameOption'
export default {
name: 'ExportExcel',
components: { FilenameOption },
data() {
return {
list: [],
fetchList: [],
listLoading: false,
downloadLoading: false,
filename: '',
autoWidth: true,
bookType: 'xlsx',
searchText: {
startdate: undefined,
enddate: undefined
},
note: {
type: 'info',
message: ''
},
downloadSize: 0
}
},
created() {
// this.fetchData()
},
filters: {
parseTime: parseTime
},
methods: {
dateFormat:function(row,column){
var t=new Date(row.updateTime);//row 表示一行数据, updateTime 表示要格式化的字段名称
return t.getFullYear()+"-"+(t.getMonth()+1)+"-"+t.getDate();
},
exportExcel(){
let _this = this
this.$loading({
fullscreen: true,
text: '正在导出',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.6)'
})
this.$axios({
method:"get",
url: "/analysis-agent/agent/analysis",
responseType: 'blob',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
},
params:this.searchText,
onDownloadProgress: function (progressEvent) {
_this.downloadSize = progressEvent.loaded
console.log(progressEvent.loaded)
}
}).then(
res=>{
let data = res.data;
let url = window.URL.createObjectURL(new Blob([data]));
let link = document.createElement('a');
link.style.display = 'none';
link.href = url;
this.filename = this.filename == '' ? 'export' : this.filename
link.setAttribute('download', this.filename+'.xls');
document.body.appendChild(link);
link.click()
this.$loading().close()
},err =>{
this.$loading().close()
});
}
}
}
</script>
<style>
.radio-label {
font-size: 14px;
color: #606266;
line-height: 40px;
padding: 0 12px 0 30px;
}
</style>
... ...
... ... @@ -38,6 +38,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="失效状态" style="margin-left: 10px">
<el-select v-model="filters.isValid">
<el-option
v-for="item in isValidOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item>
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" @click="getList(1)">查询</el-button>
... ... @@ -384,6 +396,18 @@
filtersForm: {
waybill: ''
},
isValidOptions:[
{
value: '0',
label: '未失效'
}, {
value: '1',
label: '失效'
}, {
value: '',
label: '全部'
}
],
disabled: true,
commonLoading: false,
editFormVisible: false,
... ... @@ -393,6 +417,7 @@
agentname: '',
endstation: '',
aisle: '',
isValid:'0'
},
businesstypeListLoading: false,
editForm: {
... ... @@ -468,6 +493,10 @@
return "2号卡口-进"
}else if (row.aisle=="4604333322"){
return "2号卡口-出"
}else if (row.aisle=="4600011001"){
return "卡口-进"
}else if (row.aisle=="4600010001"){
return "卡口-出"
}
},
... ... @@ -482,6 +511,8 @@
return "冷链货站"
}else if (row.endstation == "4604499001"){
return "三号货站"
}else if (row.endstation == "4600541001"){
return "顺丰货站"
}
},
turnoverflagFormatter: function(row, column){
... ... @@ -858,7 +889,6 @@
},
mounted() {
this.getYardList();
this.getList();
},
watch: {
'editForm.masterList':{
... ...
... ... @@ -484,7 +484,7 @@
},
mounted() {
this.getYardList();
this.addForm.cocode = '普通货物'
this.addForm.cocode = '普通货'
},
computed: {
},
... ...