Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
12541cc5
Commit
12541cc5
authored
Dec 12, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
906a8cc5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
2071 additions
and
1668 deletions
+2071
-1668
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+706
-662
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+0
-1
PersonnelManagement.vue
src/components/activity/PersonnelManagement.vue
+0
-2
VToolBar.vue
...wTravelmanager/TravelGroupControl/TravelTemp/VToolBar.vue
+253
-203
travelFeature3.vue
...lmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
+1029
-767
travelDaysTrip.vue
...onents/newTravelmanager/travelLineTrip/travelDaysTrip.vue
+0
-3
msgs.js
src/store/actions/msgs.js
+83
-30
No files found.
src/components/LeaderManagement/leaderReimbursement.vue
View file @
12541cc5
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
12541cc5
...
...
@@ -5007,7 +5007,6 @@
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
,
'resssssssss'
);
this
.
OrderDataList
=
res
.
data
.
data
;
this
.
IsUpdateOrderMoney
=
res
.
data
.
data
.
IsUpdateOrderMoney
}
...
...
src/components/activity/PersonnelManagement.vue
View file @
12541cc5
...
...
@@ -655,13 +655,11 @@ export default {
}
else
if
(
this
.
index1
+
1
==
3
){
period
=
this
.
yearVal
}
console
.
log
(
this
.
yearVal
,
this
.
weekVal
,
this
.
monthVal
)
let
msg
=
{
timeRange
:
this
.
index1
+
1
,
userRange
:
this
.
index2
+
1
,
period
};
console
.
log
(
msg
)
this
.
apipost
(
"user_get_usedsixSatistics"
,
msg
,
r
=>
{
if
(
r
.
data
.
data
&&
r
.
data
.
data
.
length
>
0
){
this
.
tableData
=
this
.
orderBy
(
...
...
src/components/newTravelmanager/TravelGroupControl/TravelTemp/VToolBar.vue
View file @
12541cc5
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @
12541cc5
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @
12541cc5
...
...
@@ -303,9 +303,6 @@
methods
:
{
//非直采切换
NoDirectScenicCheck
(
number
)
{
// this.dayObj.ScenicArray.forEach(x=>{
// x.ScenicJson = x.ScenicJsonStr ? JSON.parse(x.ScenicJsonStr) : { x:0, y:0 };
// })
if
(
this
.
dayObj
.
ScenicArray
==
null
)
{
this
.
dayObj
.
ScenicArray
=
[];
}
...
...
src/store/actions/msgs.js
View file @
12541cc5
...
...
@@ -2,7 +2,7 @@ import store from '../'
import
config
from
'../../configs'
import
util
from
'../../utils'
export
function
formatMsg
(
msg
)
{
export
function
formatMsg
(
msg
)
{
const
nim
=
store
.
state
.
nim
if
(
msg
.
type
===
'robot'
)
{
if
(
msg
.
content
&&
msg
.
content
.
flag
===
'bot'
)
{
...
...
@@ -25,21 +25,21 @@ export function formatMsg (msg) {
return
msg
}
export
function
onRoamingMsgs
(
obj
)
{
export
function
onRoamingMsgs
(
obj
)
{
let
msgs
=
obj
.
msgs
.
map
(
msg
=>
{
return
formatMsg
(
msg
)
})
store
.
commit
(
'updateMsgs'
,
msgs
)
}
export
function
onOfflineMsgs
(
obj
)
{
export
function
onOfflineMsgs
(
obj
)
{
let
msgs
=
obj
.
msgs
.
map
(
msg
=>
{
return
formatMsg
(
msg
)
})
store
.
commit
(
'updateMsgs'
,
msgs
)
}
export
function
onMsg
(
msg
)
{
export
function
onMsg
(
msg
)
{
msg
=
formatMsg
(
msg
)
store
.
commit
(
'putMsg'
,
msg
)
if
(
msg
.
sessionId
===
store
.
state
.
currSessionId
)
{
...
...
@@ -52,7 +52,7 @@ export function onMsg (msg) {
}
}
function
onSendMsgDone
(
error
,
msg
)
{
function
onSendMsgDone
(
error
,
msg
)
{
store
.
dispatch
(
'hideLoading'
)
if
(
error
)
{
// 被拉黑
...
...
@@ -67,7 +67,7 @@ function onSendMsgDone (error, msg) {
}
// 消息撤回
export
function
onRevocateMsg
(
error
,
msg
)
{
export
function
onRevocateMsg
(
error
,
msg
)
{
const
nim
=
store
.
state
.
nim
if
(
error
)
{
if
(
error
.
code
===
508
)
{
...
...
@@ -94,7 +94,7 @@ export function onRevocateMsg (error, msg) {
to
:
msg
.
to
,
tip
,
time
:
msg
.
time
,
done
:
function
sendTipMsgDone
(
error
,
tipMsg
)
{
done
:
function
sendTipMsgDone
(
error
,
tipMsg
)
{
let
idClient
=
msg
.
deletedIdClient
||
msg
.
idClient
store
.
commit
(
'replaceMsg'
,
{
sessionId
:
msg
.
sessionId
,
...
...
@@ -112,20 +112,28 @@ export function onRevocateMsg (error, msg) {
})
}
export
function
revocateMsg
({
state
,
commit
},
msg
)
{
export
function
revocateMsg
({
state
,
commit
},
msg
)
{
const
nim
=
state
.
nim
let
{
idClient
}
=
msg
let
{
idClient
}
=
msg
msg
=
Object
.
assign
(
msg
,
state
.
msgsMap
[
idClient
])
nim
.
deleteMsg
({
msg
,
done
:
function
deleteMsgDone
(
error
)
{
done
:
function
deleteMsgDone
(
error
)
{
onRevocateMsg
(
error
,
msg
)
}
})
}
// 发送普通消息
export
function
sendMsg
({
state
,
commit
},
obj
)
{
export
function
sendMsg
({
state
,
commit
},
obj
)
{
const
nim
=
state
.
nim
obj
=
obj
||
{}
let
type
=
obj
.
type
||
''
...
...
@@ -152,13 +160,16 @@ export function sendMsg ({state, commit}, obj) {
}
}
export
function
sendTip
({
state
,
commit
},
obj
)
{
export
function
sendTip
({
state
,
commit
},
obj
)
{
const
nim
=
store
.
state
.
nim
nim
.
sendTipMsg
({
scene
:
obj
.
scene
,
to
:
obj
.
to
,
tip
:
obj
.
tip
,
done
:
function
sendTipMsgDone
(
error
,
msg
)
{
done
:
function
sendTipMsgDone
(
error
,
msg
)
{
// 超哥 do something
onSendMsgDone
(
error
,
msg
)
}
...
...
@@ -166,9 +177,16 @@ export function sendTip ({state, commit}, obj) {
}
// 发送文件消息
export
function
sendFileMsg
({
state
,
commit
},
obj
)
{
export
function
sendFileMsg
({
state
,
commit
},
obj
)
{
const
nim
=
state
.
nim
let
{
scene
,
to
,
fileInput
}
=
obj
let
{
scene
,
to
,
fileInput
}
=
obj
let
type
=
'file'
if
(
/
\.(
png|jpg|bmp|jpeg|gif
)
$/i
.
test
(
fileInput
.
value
))
{
type
=
'image'
...
...
@@ -191,7 +209,7 @@ export function sendFileMsg ({state, commit}, obj) {
},
beforesend
:
function
(
msg
)
{
},
done
:
function
(
error
,
msg
)
{
onSendMsgDone
(
error
,
msg
)
...
...
@@ -199,16 +217,26 @@ export function sendFileMsg ({state, commit}, obj) {
})
}
export
function
sendDataUrlMsg
({
state
,
commit
},
obj
)
{
export
function
sendDataUrlMsg
({
state
,
commit
},
obj
)
{
const
nim
=
state
.
nim
let
{
scene
,
to
,
dataURL
,
name
}
=
obj
let
{
scene
,
to
,
dataURL
,
name
}
=
obj
let
type
=
'file'
if
(
/
(
png|jpg|bmp|jpeg|gif
)
$/i
.
test
(
name
))
{
type
=
'image'
}
else
if
(
/
(
mov|mp4|ogg|webm
)
$/i
.
test
(
name
))
{
type
=
'video'
}
let
otherMsg
=
{
'fileName'
:
name
}
let
otherMsg
=
{
'fileName'
:
name
}
store
.
dispatch
(
'showLoading'
)
nim
.
sendFile
({
scene
:
scene
,
...
...
@@ -217,7 +245,7 @@ export function sendDataUrlMsg ({state, commit}, obj) {
dataURL
:
dataURL
,
custom
:
JSON
.
stringify
(
otherMsg
),
uploadprogress
:
function
(
data
)
{
},
uploaderror
:
function
()
{
console
&&
console
.
log
(
'上传失败'
)
...
...
@@ -235,9 +263,21 @@ export function sendDataUrlMsg ({state, commit}, obj) {
}
// 发送机器人消息
export
function
sendRobotMsg
({
state
,
commit
},
obj
)
{
export
function
sendRobotMsg
({
state
,
commit
},
obj
)
{
const
nim
=
state
.
nim
let
{
type
,
scene
,
to
,
robotAccid
,
content
,
params
,
target
,
body
}
=
obj
let
{
type
,
scene
,
to
,
robotAccid
,
content
,
params
,
target
,
body
}
=
obj
scene
=
scene
||
'p2p'
if
(
type
===
'text'
)
{
nim
.
sendRobotMsg
({
...
...
@@ -279,7 +319,10 @@ export function sendRobotMsg ({state, commit}, obj) {
}
// 发送消息已读回执
export
function
sendMsgReceipt
({
state
,
commit
})
{
export
function
sendMsgReceipt
({
state
,
commit
})
{
// 如果有当前会话
let
currSessionId
=
store
.
state
.
currSessionId
if
(
currSessionId
)
{
...
...
@@ -290,7 +333,7 @@ export function sendMsgReceipt ({state, commit}) {
if
(
state
.
sessionMap
[
currSessionId
])
{
nim
.
sendMsgReceipt
({
msg
:
state
.
sessionMap
[
currSessionId
].
lastMsg
,
done
:
function
sendMsgReceiptDone
(
error
,
obj
)
{
done
:
function
sendMsgReceiptDone
(
error
,
obj
)
{
// do something
}
})
...
...
@@ -299,21 +342,27 @@ export function sendMsgReceipt ({state, commit}) {
}
}
function
sendMsgReceiptDone
(
error
,
obj
)
{
function
sendMsgReceiptDone
(
error
,
obj
)
{
console
.
log
(
'发送消息已读回执'
+
(
!
error
?
'成功'
:
'失败'
),
error
,
obj
)
}
export
function
getHistoryMsgs
({
state
,
commit
},
obj
)
{
export
function
getHistoryMsgs
({
state
,
commit
},
obj
)
{
const
nim
=
state
.
nim
if
(
nim
)
{
let
{
scene
,
to
}
=
obj
let
{
scene
,
to
}
=
obj
let
options
=
{
scene
,
to
,
reverse
:
false
,
asc
:
true
,
limit
:
config
.
localMsglimit
||
20
,
done
:
function
getHistoryMsgsDone
(
error
,
obj
)
{
done
:
function
getHistoryMsgsDone
(
error
,
obj
)
{
if
(
obj
.
msgs
)
{
if
(
obj
.
msgs
.
length
===
0
)
{
commit
(
'setNoMoreHistoryMsgs'
)
...
...
@@ -341,11 +390,15 @@ export function getHistoryMsgs ({state, commit}, obj) {
}
}
export
function
resetNoMoreHistoryMsgs
({
commit
})
{
export
function
resetNoMoreHistoryMsgs
({
commit
})
{
commit
(
'resetNoMoreHistoryMsgs'
)
}
// 继续与机器人会话交互
export
function
continueRobotMsg
({
commit
},
robotAccid
)
{
export
function
continueRobotMsg
({
commit
},
robotAccid
)
{
commit
(
'continueRobotMsg'
,
robotAccid
)
}
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