Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
assets
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄媛媛
assets
Commits
2f4211ed
Commit
2f4211ed
authored
Oct 15, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
111
parent
9a97c946
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
725 additions
and
884 deletions
+725
-884
InventoryDetail.vue
src/components/Materialman/InventoryDetail.vue
+1
-1
SignMan.vue
src/components/approval/SignMan.vue
+347
-386
BulkImport.vue
src/components/assetsman/BulkImport.vue
+2
-2
index.js
src/plugins/index.js
+20
-137
config.js
src/router/config.js
+355
-358
No files found.
src/components/Materialman/InventoryDetail.vue
View file @
2f4211ed
...
...
@@ -203,7 +203,7 @@
this
.
getCheckStatus
();
this
.
getWarehouseId
();
//上传接口路径
this
.
importFileUrl2
=
this
.
domainManager
().
Domain
Url
+
this
.
importFileUrl2
=
this
.
domainManager
().
ZCApi
Url
+
"/api/file/LocalFileUploadImportForSuppliesCheck"
;
//添加滚动事件
window
.
addEventListener
(
'scroll'
,
this
.
handleScroll
)
...
...
src/components/approval/SignMan.vue
View file @
2f4211ed
This diff is collapsed.
Click to expand it.
src/components/assetsman/BulkImport.vue
View file @
2f4211ed
...
...
@@ -111,9 +111,9 @@
};
},
created
()
{
this
.
importFileUrl2
=
this
.
domainManager
().
Domain
Url
+
this
.
importFileUrl2
=
this
.
domainManager
().
ZCApi
Url
+
"/api/file/LocalFileUploadImport"
;
this
.
downList
=
this
.
domainManager
().
LocalTemplateFileDownLoad
Url
+
"/ExportFile/资产导入模板.xls"
;
this
.
downList
=
this
.
domainManager
().
ZCApi
Url
+
"/ExportFile/资产导入模板.xls"
;
},
mounted
()
{
...
...
src/plugins/index.js
View file @
2f4211ed
...
...
@@ -11,70 +11,24 @@ export default {
},
//域名管理对象
Vue
.
prototype
.
domainManager
=
function
()
{
var
domainUrl
=
"http://reborn.oytour.com"
;
//主域名
let
locationName
=
window
.
location
.
hostname
;
let
javaUrldo
=
""
;
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"
;
var
zcApiUrl
=
"http://192.168.5.46:5001"
;
//资产接口地址
let
viittoFileUrl
=
"http://192.168.5.214:8130"
;
//文件预览地址
let
uploadUrl
=
"http://192.168.5.214:8120"
;
//文件上传地址
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
=
{
//主地址
DomainUrl
:
domainUrl
,
//上传文件URL
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
,
ZCApiUrl
:
zcApiUrl
,
ViittoFileUrl
:
viittoFileUrl
,
UploadUrl
:
uploadUrl
,
};
console
.
log
(
locationName
.
indexOf
(
'zcyx'
))
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
}
×tamp=
${
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
)
{
var
apiurl
=
this
.
domainManager
().
JavaLocalFileStreamDownLoad
Url
+
cmd
;
var
apiurl
=
this
.
domainManager
().
ZCApi
Url
+
cmd
;
var
timestamp
=
(
new
Date
()).
valueOf
();
if
(
!
localStorage
.
zcuserInfo
&&
localStorage
.
zcuserInfo
!=
""
&&
this
.
$route
.
path
.
toLowerCase
()
!=
"/login"
)
{
this
.
$router
.
push
({
...
...
@@ -91,7 +45,7 @@ export default {
let
groupId
=
zcuserInfo
.
RB_Group_id
?
zcuserInfo
.
RB_Group_id
:
0
;
let
uid
=
zcuserInfo
.
EmployeeId
?
zcuserInfo
.
EmployeeId
:
0
;
var
encodeMsg
=
encodeURIComponent
(
JSON
.
stringify
(
msg
)).
toLowerCase
();
// var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}×tamp=${timestamp}&token=${token}&key=${key}`);
var
md5Str
=
md5
(
`msg=
${
encodeMsg
}
×tamp=
${
timestamp
}
&token=
${
token
}
&key=
${
key
}
`
);
var
postData
=
{
"msg"
:
msg
,
...
...
@@ -101,13 +55,7 @@ export default {
"uid"
:
uid
,
"groupId"
:
groupId
}
// var postData = {
// "msg": msg,
// "cmd": cmd,
// "timestamp": timestamp,
// "token": token,
// "sign": md5Str
// }
this
.
$http
.
post
(
apiurl
,
postData
,
{
responseType
:
'arraybuffer'
}).
then
((
res
)
=>
{
...
...
@@ -185,80 +133,19 @@ export default {
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'
//打开新窗口连接
Vue
.
prototype
.
OpenNewUrl
=
function
(
URL
)
{
if
(
URL
!=
''
)
{
window
.
open
(
'http://'
+
URL
,
'_blank'
);
}
return
path
.
split
(
'?'
)[
0
]
+
'?width='
+
w
;
}
//打开新窗口连接
Vue
.
prototype
.
OpenNewUrl
=
function
(
URL
)
{
if
(
URL
!=
''
)
{
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
}
×tamp=
${
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
==
""
)
{
msg
=
{}
}
var
apiurl
=
this
.
domainManager
().
java
Url
+
cmd
;
var
apiurl
=
this
.
domainManager
().
ZCApi
Url
+
cmd
;
var
timestamp
=
(
new
Date
()).
valueOf
();
this
.
apiurl
=
apiurl
;
var
token
=
""
;
...
...
@@ -270,8 +157,6 @@ export default {
}
var
encodeMsg
=
encodeURIComponent
(
JSON
.
stringify
(
msg
)).
toLowerCase
();
var
md5Str
=
md5
(
`msg=YXZCGL2020×tamp=
${
timestamp
}
&token=
${
token
}
&key=
${
key
}
`
);
// var md5Str = md5(`msg=${encodeMsg}×tamp=${timestamp}&token=${token}&key=${key}`);
var
postData
=
{
"msg"
:
msg
,
"timestamp"
:
timestamp
,
...
...
@@ -279,7 +164,6 @@ export default {
"sign"
:
md5Str
}
if
(
localStorage
.
g
&&
localStorage
.
g
!=
'undefined'
)
{
// postData.groupId = parseInt(JSON.parse(localStorage.g).i)
postData
.
groupId
=
2
;
}
this
.
$http
.
post
(
apiurl
,
postData
,
{
...
...
@@ -375,6 +259,5 @@ export default {
value
=
value
.
replace
(
this
.
$commonUtils
.
Regex
.
isInteger
,
""
);
item
[
filed
]
=
value
;
}
}
}
src/router/config.js
View file @
2f4211ed
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment