Skip to content

A
assets
Commit 2f4211ed authored by 黄奎's avatar 黄奎
Browse files
Options

111

parent 9a97c946
Expand all Show whitespace changes
Inline Side-by-side
Showing with 725 additions and 884 deletions
src/components/Materialman/InventoryDetail.vue
View file @ 2f4211ed
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
this.getCheckStatus(); this.getCheckStatus();
this.getWarehouseId(); this.getWarehouseId();
//上传接口路径 //上传接口路径
this.importFileUrl2 = this.domainManager().DomainUrl + this.importFileUrl2 = this.domainManager().ZCApiUrl +
"/api/file/LocalFileUploadImportForSuppliesCheck"; "/api/file/LocalFileUploadImportForSuppliesCheck";
//添加滚动事件 //添加滚动事件
window.addEventListener('scroll', this.handleScroll) window.addEventListener('scroll', this.handleScroll)
......
src/components/approval/SignMan.vue
View file @ 2f4211ed
This diff is collapsed.
src/components/assetsman/BulkImport.vue
View file @ 2f4211ed
...@@ -111,9 +111,9 @@ ...@@ -111,9 +111,9 @@
}; };
}, },
created() { created() {
this.importFileUrl2 = this.domainManager().DomainUrl + this.importFileUrl2 = this.domainManager().ZCApiUrl +
"/api/file/LocalFileUploadImport"; "/api/file/LocalFileUploadImport";
this.downList = this.domainManager().LocalTemplateFileDownLoadUrl + "/ExportFile/资产导入模板.xls"; this.downList = this.domainManager().ZCApiUrl + "/ExportFile/资产导入模板.xls";
}, },
mounted() { mounted() {
......
src/plugins/index.js
View file @ 2f4211ed
...@@ -11,70 +11,24 @@ export default { ...@@ -11,70 +11,24 @@ export default {
}, },
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
var domainUrl = "http://reborn.oytour.com"; //主域名 var zcApiUrl = "http://192.168.5.46:5001"; //资产接口地址
let locationName = window.location.hostname; let viittoFileUrl = "http://192.168.5.214:8130"; //文件预览地址
let javaUrldo = ""; let uploadUrl = "http://192.168.5.214:8120"; //文件上传地址
javaUrldo = locationName.indexOf('zcyx') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://property.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.65:8018";
if (this.isOnline()) { if (this.isOnline()) {
domainUrl = "http://property.oytour.com" zcApiUrl = "http://property.oytour.com";
viittoFileUrl = "http://staticfile.oytour.com";
uploadUrl = "http://uploadfile.oytour.com"
} }
var obj = { var obj = {
//主地址 ZCApiUrl: zcApiUrl,
DomainUrl: domainUrl, ViittoFileUrl: viittoFileUrl,
//上传文件URL UploadUrl: uploadUrl,
UploadFileUrl: domainUrl + '/api/File/post',
LocalTemplateFileDownLoadUrl: domainUrl,
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
javaUrl: locationName.indexOf('zcyx') !== -1 ? "http://property.oytour.com" : locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://property.oytour.com" : "http://192.168.5.46:5001",
ViittoFileUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
JavaLocalFileStreamDownLoadUrl: javaUrldo,
}; };
console.log(locationName.indexOf('zcyx'))
return obj; return obj;
}, },
Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;
var timestamp = (new Date()).valueOf();
if (!localStorage.zcuserInfo && localStorage.zcuserInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({
path: '/login'
})
}
var token = "";
var key = "";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().secretKey;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = {
"msg": msg,
"cmd": cmd,
"timestamp": timestamp,
"token": token,
"sign": md5Str
}
this.$http.post(apiurl, postData, {
responseType: 'arraybuffer'
}).then((res) => {
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel"
})
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = url;
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
successCall(res);
}).catch(function (res) {});
},
Vue.prototype.JavaGetLocalFile = function (cmd, msg, fileName, successCall) { Vue.prototype.JavaGetLocalFile = function (cmd, msg, fileName, successCall) {
var apiurl = this.domainManager().JavaLocalFileStreamDownLoadUrl + cmd; var apiurl = this.domainManager().ZCApiUrl + cmd;
var timestamp = (new Date()).valueOf(); var timestamp = (new Date()).valueOf();
if (!localStorage.zcuserInfo && localStorage.zcuserInfo != "" && this.$route.path.toLowerCase() != "/login") { if (!localStorage.zcuserInfo && localStorage.zcuserInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({ this.$router.push({
...@@ -91,7 +45,7 @@ export default { ...@@ -91,7 +45,7 @@ export default {
let groupId = zcuserInfo.RB_Group_id ? zcuserInfo.RB_Group_id : 0; let groupId = zcuserInfo.RB_Group_id ? zcuserInfo.RB_Group_id : 0;
let uid = zcuserInfo.EmployeeId ? zcuserInfo.EmployeeId : 0; let uid = zcuserInfo.EmployeeId ? zcuserInfo.EmployeeId : 0;
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase(); var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
// var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`); var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = { var postData = {
"msg": msg, "msg": msg,
...@@ -101,13 +55,7 @@ export default { ...@@ -101,13 +55,7 @@ export default {
"uid": uid, "uid": uid,
"groupId": groupId "groupId": groupId
} }
// var postData = {
// "msg": msg,
// "cmd": cmd,
// "timestamp": timestamp,
// "token": token,
// "sign": md5Str
// }
this.$http.post(apiurl, postData, { this.$http.post(apiurl, postData, {
responseType: 'arraybuffer' responseType: 'arraybuffer'
}).then((res) => { }).then((res) => {
...@@ -185,80 +133,19 @@ export default { ...@@ -185,80 +133,19 @@ export default {
this.Info("已取消操作"); this.Info("已取消操作");
}); });
}, },
//压缩图片
//path : 图片路径
//type : m_filt 填充 m_w 宽度固定 高度不固定 m_h 高度固定 宽度不固定
// w : 宽
// h : 高
Vue.prototype.compressImg = function (path, type, w, h) {
let url = this.domainManager().UploadUrl;
let poise = 'width=';
w = w ? w : ''
h = h ? h : ''
if (type === 'w') {
poise = 'width'
} else if (type === 'h') {
poise = 'height'
}
return path.split('?')[0] + '?width=' + w;
}
//打开新窗口连接 //打开新窗口连接
Vue.prototype.OpenNewUrl = function (URL) { Vue.prototype.OpenNewUrl = function (URL) {
if (URL != '') { if (URL != '') {
window.open('http://' + URL, '_blank'); window.open('http://' + URL, '_blank');
} }
} }
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") {
msg = {}
}
var apiurl = this.domainManager().PostUrl;
var timestamp = (new Date()).valueOf();
this.apiurl = apiurl;
var token = "";
var key = "";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().secretKey;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = {
"msg": msg,
"cmd": cmd,
"timestamp": timestamp,
"token": token,
"sign": md5Str
}
if (localStorage.g && localStorage.g != 'undefined') {
// postData.groupId = parseInt(JSON.parse(localStorage.g).i)
postData.groupId = 2;
}
this.$http.post(apiurl, postData, {
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path
}
})
.then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({
path: '/login'
})
} else if (res.data.resultCode == 10005) {
this.$router.go(-1)
} else {
successCall(res)
}
}, faildCall)
},
Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) { Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
var apiurl = this.domainManager().javaUrl + cmd; var apiurl = this.domainManager().ZCApiUrl + cmd;
var timestamp = (new Date()).valueOf(); var timestamp = (new Date()).valueOf();
this.apiurl = apiurl; this.apiurl = apiurl;
var token = ""; var token = "";
...@@ -270,8 +157,6 @@ export default { ...@@ -270,8 +157,6 @@ export default {
} }
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase(); var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`msg=YXZCGL2020&timestamp=${timestamp}&token=${token}&key=${key}`); var md5Str = md5(`msg=YXZCGL2020&timestamp=${timestamp}&token=${token}&key=${key}`);
// var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = { var postData = {
"msg": msg, "msg": msg,
"timestamp": timestamp, "timestamp": timestamp,
...@@ -279,7 +164,6 @@ export default { ...@@ -279,7 +164,6 @@ export default {
"sign": md5Str "sign": md5Str
} }
if (localStorage.g && localStorage.g != 'undefined') { if (localStorage.g && localStorage.g != 'undefined') {
// postData.groupId = parseInt(JSON.parse(localStorage.g).i)
postData.groupId = 2; postData.groupId = 2;
} }
this.$http.post(apiurl, postData, { this.$http.post(apiurl, postData, {
...@@ -375,6 +259,5 @@ export default { ...@@ -375,6 +259,5 @@ export default {
value = value.replace(this.$commonUtils.Regex.isInteger, ""); value = value.replace(this.$commonUtils.Regex.isInteger, "");
item[filed] = value; item[filed] = value;
} }
} }
} }
src/router/config.js
View file @ 2f4211ed
import Home from '../components/Home' import Home from '../components/Home'
import Login from '../components/global/Login' import Login from '../components/global/Login'
import Autologin from '../components/global/Autologin' import Autologin from '../components/global/Autologin'
import index from '../components/global/index' import index from '../components/global/index'
export default { export default {
routes: [ routes: [{
{
path: '/login', path: '/login',
name: 'Login', name: 'Login',
component: Login component: Login
...@@ -29,8 +27,7 @@ export default { ...@@ -29,8 +27,7 @@ export default {
meta: { meta: {
title: '首页' title: '首页'
}, },
children: [ children: [{
{
path: '/Home', path: '/Home',
name: 'Home', name: 'Home',
component: Home component: Home
...@@ -86,23 +83,23 @@ export default { ...@@ -86,23 +83,23 @@ export default {
name: 'outboundOperate', name: 'outboundOperate',
component: resolve => require(['@/components/assetsman/outboundOperate'], resolve), component: resolve => require(['@/components/assetsman/outboundOperate'], resolve),
}, },
                { {
                    path: '/outboundDetails',  path: '/outboundDetails',
                    name: 'outboundDetails', name: 'outboundDetails',
                    component: resolve => require(['@/components/assetsman/outboundDetails'], resolve), component: resolve => require(['@/components/assetsman/outboundDetails'], resolve),
            }, },
// 采购列表 // 采购列表
{ {
                    path: '/procurementList',  path: '/procurementList',
                    name: 'procurementList', name: 'procurementList',
                    component: resolve => require(['@/components/assetsman/procurementList'], resolve), component: resolve => require(['@/components/assetsman/procurementList'], resolve),
            }, },
//采购详情 //采购详情
{ {
                    path: '/procurementDetails',  path: '/procurementDetails',
                    name: 'procurementDetails', name: 'procurementDetails',
                    component: resolve => require(['@/components/assetsman/procurementDetails'], resolve), component: resolve => require(['@/components/assetsman/procurementDetails'], resolve),
            }, },
// 派发&退库 // 派发&退库
{ {
path: '/PaiTui', path: '/PaiTui',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment