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
116f0064
Commit
116f0064
authored
Oct 17, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
1b634083
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
1700 additions
and
1715 deletions
+1700
-1715
downloadExcelEasy.js
src/assets/utils/downloadExcelEasy.js
+0
-17
lunarCalendar.js
src/assets/utils/lunarCalendar.js
+1
-2
WireControl.vue
src/components/FinancialModule/WireControl.vue
+1
-3
ChangeHotel.vue
src/components/Hotel/ChangeHotel.vue
+0
-1
advert.vue
src/components/SalesModule/advert.vue
+1308
-1212
myDocuments.vue
src/components/administrative/myDocuments.vue
+0
-95
outWorkApproval.vue
src/components/administrative/outWorkApproval.vue
+1
-3
positionManagement.vue
src/components/administrative/positionManagement.vue
+0
-7
processDesign.vue
src/components/administrative/processDesign.vue
+0
-28
updateProcessDesign.vue
src/components/administrative/updateProcessDesign.vue
+1
-32
googleMap.vue
src/components/commonPage/googleMap.vue
+0
-1
workCount.vue
src/components/dmc/manager/workCount.vue
+0
-2
index.vue
src/components/index.vue
+0
-20
versionspermissionList.vue
src/components/platformModule/versionspermissionList.vue
+381
-271
chatroomMsgs.js
src/store/actions/chatroomMsgs.js
+1
-4
initChatroomSDK.js
src/store/actions/initChatroomSDK.js
+0
-1
msgs.js
src/store/actions/msgs.js
+6
-10
session.js
src/store/actions/session.js
+0
-3
team.js
src/store/actions/team.js
+0
-2
index.js
src/store/mutations/index.js
+0
-1
No files found.
src/assets/utils/downloadExcelEasy.js
View file @
116f0064
...
@@ -19,7 +19,6 @@ let downloadExcelEasy = {
...
@@ -19,7 +19,6 @@ let downloadExcelEasy = {
let
data
=
[
tableH
];
let
data
=
[
tableH
];
// 组装表格内容
// 组装表格内容
dataSource
.
forEach
((
x
,
index
)
=>
{
dataSource
.
forEach
((
x
,
index
)
=>
{
console
.
log
(
index
);
let
obj
=
[];
let
obj
=
[];
obj
.
push
(
x
.
LineName
+
" "
);
obj
.
push
(
x
.
LineName
+
" "
);
obj
.
push
(
x
.
TCNUM
);
obj
.
push
(
x
.
TCNUM
);
...
@@ -42,21 +41,9 @@ let downloadExcelEasy = {
...
@@ -42,21 +41,9 @@ let downloadExcelEasy = {
const
ws
=
XLSX
.
utils
.
aoa_to_sheet
(
data
);
const
ws
=
XLSX
.
utils
.
aoa_to_sheet
(
data
);
ws
[
'!cols'
]
=
wscols
;
ws
[
'!cols'
]
=
wscols
;
ws
[
'!rows'
]
=
[];
ws
[
'!rows'
]
=
[];
// colName.forEach((x,index)=>{
// wscols.push({wpx: 100})
// });
// dataSource.forEach((x,index)=>{
// if(index===dataSource.length)
// ws['!rows'].push({ hpx:30 });
// else
// ws['!rows'].push({});
// });
const
wb
=
XLSX
.
utils
.
book_new
();
const
wb
=
XLSX
.
utils
.
book_new
();
XLSX
.
utils
.
book_append_sheet
(
wb
,
ws
,
xlsxName
);
XLSX
.
utils
.
book_append_sheet
(
wb
,
ws
,
xlsxName
);
var
dataInfo
=
wb
.
Sheets
[
wb
.
SheetNames
[
0
]];
var
dataInfo
=
wb
.
Sheets
[
wb
.
SheetNames
[
0
]];
console
.
log
(
data
[
0
].
length
);
console
.
log
(
colName
.
length
);
// return
data
[
0
].
forEach
((
x
,
i
)
=>
{
data
[
0
].
forEach
((
x
,
i
)
=>
{
dataInfo
[
colName
[
i
]
+
'1'
].
s
=
{
dataInfo
[
colName
[
i
]
+
'1'
].
s
=
{
fill
:
{
fgColor
:
{
rgb
:
"#ffff00"
}},
fill
:
{
fgColor
:
{
rgb
:
"#ffff00"
}},
...
@@ -74,12 +61,9 @@ let downloadExcelEasy = {
...
@@ -74,12 +61,9 @@ let downloadExcelEasy = {
}
}
}
}
});
});
console
.
log
(
dataInfo
);
// return
XLSX
.
writeFile
(
wb
,
xlsxName
+
".xlsx"
)
XLSX
.
writeFile
(
wb
,
xlsxName
+
".xlsx"
)
},
},
countColumn
:
function
(
data
)
{
countColumn
:
function
(
data
)
{
console
.
log
(
data
.
length
)
let
list
=
[];
let
list
=
[];
let
col
=
[
'A'
,
'B'
,
'C'
,
'D'
,
'E'
,
'F'
,
'G'
,
'H'
,
'I'
,
'J'
,
'K'
,
'L'
,
'M'
,
'N'
,
'O'
,
'P'
,
'Q'
,
'R'
,
'S'
,
'T'
,
'U'
,
'V'
,
'W'
,
'X'
,
'Y'
,
'Z'
];
let
col
=
[
'A'
,
'B'
,
'C'
,
'D'
,
'E'
,
'F'
,
'G'
,
'H'
,
'I'
,
'J'
,
'K'
,
'L'
,
'M'
,
'N'
,
'O'
,
'P'
,
'Q'
,
'R'
,
'S'
,
'T'
,
'U'
,
'V'
,
'W'
,
'X'
,
'Y'
,
'Z'
];
data
.
forEach
((
item
,
index
)
=>
{
data
.
forEach
((
item
,
index
)
=>
{
...
@@ -88,7 +72,6 @@ let downloadExcelEasy = {
...
@@ -88,7 +72,6 @@ let downloadExcelEasy = {
}
else
if
(
index
>
25
&&
index
<
52
)
{
}
else
if
(
index
>
25
&&
index
<
52
)
{
list
.
push
(
'A'
+
col
[
index
-
col
.
length
])
list
.
push
(
'A'
+
col
[
index
-
col
.
length
])
}
else
if
(
index
>
51
&&
index
<
78
)
{
}
else
if
(
index
>
51
&&
index
<
78
)
{
console
.
log
(
index
-
(
col
.
length
*
2
));
list
.
push
(
'B'
+
col
[
index
-
(
col
.
length
*
2
)])
list
.
push
(
'B'
+
col
[
index
-
(
col
.
length
*
2
)])
}
}
});
});
...
...
src/assets/utils/lunarCalendar.js
View file @
116f0064
...
@@ -191,11 +191,10 @@ var lunarCalendar = {
...
@@ -191,11 +191,10 @@ var lunarCalendar = {
return
{
isLeap
,
year
,
lunarmonth
,
lunarDay
};
return
{
isLeap
,
year
,
lunarmonth
,
lunarDay
};
},
},
/**
/**
* 传入阳历年月日获得详细的公历、农历object信息 <=>Array
* 传入阳历年月日获得详细的公历、农历object信息
lunarCalendar.initLunar(1987,11)
<=>Array
* @param y solar year
* @param y solar year
* @param m solar month
* @param m solar month
* @return Array
* @return Array
* @eg:console.log(lunarCalendar.initLunar(1987,11));
*/
*/
initLunar
:
function
(
yearStr
,
monthStr
,
dayNum
)
{
initLunar
:
function
(
yearStr
,
monthStr
,
dayNum
)
{
//年份限定、上限
//年份限定、上限
...
...
src/components/FinancialModule/WireControl.vue
View file @
116f0064
...
@@ -365,11 +365,9 @@ export default {
...
@@ -365,11 +365,9 @@ export default {
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apipost
(
"line_post_GetLineEmployeeList"
,
this
.
msg
,
res
=>
{
this
.
apipost
(
"line_post_GetLineEmployeeList"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
loading
=
false
;
this
.
loading
=
false
;
this
.
DataList
=
res
.
data
.
data
.
pageData
;
this
.
DataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
total
=
res
.
data
.
data
.
count
;
console
.
log
(
"this.DataList"
,
this
.
DataList
)
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
)
this
.
Error
(
res
.
data
.
message
)
}
}
...
...
src/components/Hotel/ChangeHotel.vue
View file @
116f0064
...
@@ -151,7 +151,6 @@
...
@@ -151,7 +151,6 @@
this
.
Loading
=
false
;
this
.
Loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
DataList
=
res
.
data
.
data
.
HotelOrderListReport
;
this
.
DataList
=
res
.
data
.
data
.
HotelOrderListReport
;
console
.
log
(
"this.DataList"
,
this
.
DataList
)
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
...
src/components/SalesModule/advert.vue
View file @
116f0064
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/components/administrative/myDocuments.vue
View file @
116f0064
...
@@ -449,84 +449,12 @@
...
@@ -449,84 +449,12 @@
handleExceed
(
file
,
fileList
)
{
handleExceed
(
file
,
fileList
)
{
this
.
$message
.
warning
(
'一次最多选择5个文件!'
)
this
.
$message
.
warning
(
'一次最多选择5个文件!'
)
return
return
//console.log(files[0])
// let Md5Arr=[]
// let fileArr=[]
// let that=this
// let path="/Upload/Temporary/"
// for(let i=0;i
<
files
.
length
;
i
++
){
//
// if(files[i].size>1024*1024*100){
// this.$message.warning('文件大小不能超过100M!')
// return
// }
//
// browserMD5File(files[i], function (err, md5) {
// Md5Arr.push(md5);
// if(Md5Arr.length==files.length){
// that.apipost('user_cloud_ValidataMD5Sign',{md5Sign:Md5Arr},res=>{
// if(res.data.resultCode == 1) {
// res.data.data.forEach((item,index)=>{
// files[index].md5Sign=item.md5Sign
// files[index].Status=item.Status
// })
// //console.log(files)
// for (let i=0;i
<
files
.
length
;
i
++
)
{
// console.log(files[i])
// that.uploadFile(path,files[i],x=>{
// console.log(x.res)
// })
// }
//
// }else{}
// },err=>{})
// }
//
// });
// }
// this.apipost('user_cloud_ValidataMD5Sign',{md5Sign:Md5Arr},res=>{
// if(res.data.resultCode == 1) {
// console.log(res.data)
// }else{}
// },err=>{})
// },
// getFileMd5(files){
// let Md5Arr=[]
// let _string=''
// console.log(typeof Md5Arr)
// for(let i=0;i
<
files
.
length
;
i
++
){
// let lsOk = false
// browserMD5File(files[i], function (err, md5) {
// _string+='md5'+','
// lsOk =true;
// console.log(1)
// });
//
// }
// console.log(Md5Arr)
// return Md5Arr
// },
//
// validataMd5Sign(Md5Arr){
// let jsonMsg={md5Sign:[_arr]}
// this.apipost('user_cloud_ValidataMD5Sign',jsonMsg,res=>{
// if(res.data.resultCode == 1) {
// console.log(res.data)
// }else{}
// },err=>{})
},
},
uploadFileBtn
(
file
)
{
//上传
uploadFileBtn
(
file
)
{
//上传
//console.log(fileList)
if
(
file
.
file
.
size
>
1024
*
1024
*
100
)
{
if
(
file
.
file
.
size
>
1024
*
1024
*
100
)
{
this
.
$message
.
warning
(
'文件大小不能超过100M!'
)
this
.
$message
.
warning
(
'文件大小不能超过100M!'
)
return
return
}
}
// browserMD5File(file.file, function (err, md5) {
// console.log(md5);
// });
let
that
=
this
let
that
=
this
let
newArr
=
[];
let
newArr
=
[];
newArr
.
push
(
file
.
file
)
newArr
.
push
(
file
.
file
)
...
@@ -542,7 +470,6 @@
...
@@ -542,7 +470,6 @@
FileSize
:
fileSize
,
FileSize
:
fileSize
,
FolderId
:
this
.
msg
.
ParentId
FolderId
:
this
.
msg
.
ParentId
})
})
//console.log(this.saveMsg);
that
.
apipost
(
'user_cloud_SaveFile'
,
this
.
saveMsg
,
res
=>
{
that
.
apipost
(
'user_cloud_SaveFile'
,
this
.
saveMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
$message
.
success
(
res
.
data
.
message
);
...
@@ -556,25 +483,17 @@
...
@@ -556,25 +483,17 @@
});
});
},
},
dowloadSingle
()
{
dowloadSingle
()
{
//console.log(this.notFileList)
let
objKey
=
[];
let
objKey
=
[];
this
.
list
.
forEach
(
item
=>
{
this
.
list
.
forEach
(
item
=>
{
if
(
item
.
DataType
==
2
)
{
if
(
item
.
DataType
==
2
)
{
for
(
let
i
=
0
;
i
<
this
.
notFileList
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
notFileList
.
length
;
i
++
)
{
if
(
this
.
notFileList
[
i
]
==
item
.
Id
)
{
if
(
this
.
notFileList
[
i
]
==
item
.
Id
)
{
//objKey.push(item.FilePath);
let
reg
=
/^http
(
s
)?
:
\/\/(
.*
?)\/
/
let
reg
=
/^http
(
s
)?
:
\/\/(
.*
?)\/
/
this
.
downloadFileRename
(
item
.
FilePath
.
replace
(
reg
,
''
),
item
.
FolderName
);
this
.
downloadFileRename
(
item
.
FilePath
.
replace
(
reg
,
''
),
item
.
FolderName
);
}
}
}
}
}
}
})
})
// console.log(objKey)
// return
// objKey.forEach(item => {
// this.downloadFile(item)
// })
// return
},
},
downloadOne
(
obj
){
downloadOne
(
obj
){
if
(
obj
.
DataType
==
0
){
if
(
obj
.
DataType
==
0
){
...
@@ -685,7 +604,6 @@
...
@@ -685,7 +604,6 @@
let
fileList
=
[]
let
fileList
=
[]
let
notFileList
=
[]
let
notFileList
=
[]
let
confirmMsg
=
''
let
confirmMsg
=
''
console
.
log
(
obj
)
if
(
obj
.
DataType
==
0
)
{
//文件夹
if
(
obj
.
DataType
==
0
)
{
//文件夹
fileList
.
push
(
obj
.
Id
)
fileList
.
push
(
obj
.
Id
)
confirmMsg
=
'删除文件夹后,分享和子文件将被删除,是否删除?'
confirmMsg
=
'删除文件夹后,分享和子文件将被删除,是否删除?'
...
@@ -750,7 +668,6 @@
...
@@ -750,7 +668,6 @@
},
err
=>
{})
},
err
=>
{})
},
},
openShareOneDialog
(
obj
)
{
openShareOneDialog
(
obj
)
{
console
.
log
(
obj
)
if
(
obj
.
DataType
==
0
){
if
(
obj
.
DataType
==
0
){
this
.
fileList
=
[]
this
.
fileList
=
[]
this
.
notFileList
=
[]
this
.
notFileList
=
[]
...
@@ -803,12 +720,10 @@
...
@@ -803,12 +720,10 @@
},
},
getDepartment
()
{
//部门
getDepartment
()
{
//部门
this
.
apipost
(
'app_get_GetCompanyDepartmentListTree'
,
{},
res
=>
{
this
.
apipost
(
'app_get_GetCompanyDepartmentListTree'
,
{},
res
=>
{
console
.
log
(
res
.
data
.
data
)
this
.
departmentList
=
res
.
data
.
data
this
.
departmentList
=
res
.
data
.
data
},
err
=>
{})
},
err
=>
{})
},
},
DepartmentListNodeChange
(
data
,
checked
){
DepartmentListNodeChange
(
data
,
checked
){
//console.log(data)
if
(
checked
){
if
(
checked
){
this
.
ckdDepartmentList
.
push
({
name
:
data
.
DepartmentName
,
id
:
data
.
DepartmentId
})
this
.
ckdDepartmentList
.
push
({
name
:
data
.
DepartmentName
,
id
:
data
.
DepartmentId
})
this
.
ckdDepartmentListId
.
push
(
data
.
DepartmentId
)
this
.
ckdDepartmentListId
.
push
(
data
.
DepartmentId
)
...
@@ -831,7 +746,6 @@
...
@@ -831,7 +746,6 @@
getRole
()
{
//岗位
getRole
()
{
//岗位
this
.
apipost
(
'WorkFlow_get_GetCompanyDepartMentPost'
,
{},
res
=>
{
this
.
apipost
(
'WorkFlow_get_GetCompanyDepartMentPost'
,
{},
res
=>
{
this
.
roleList
=
res
.
data
.
data
this
.
roleList
=
res
.
data
.
data
//console.log(this.roleList)
},
err
=>
{})
},
err
=>
{})
},
},
roleListNodeChange
(
data
,
checked
){
roleListNodeChange
(
data
,
checked
){
...
@@ -852,18 +766,15 @@
...
@@ -852,18 +766,15 @@
this
.
ckdRoleList
.
splice
(
this
.
ckdRoleList
.
findIndex
(
item
=>
item
.
id
===
id
),
1
)
this
.
ckdRoleList
.
splice
(
this
.
ckdRoleList
.
findIndex
(
item
=>
item
.
id
===
id
),
1
)
this
.
ckdRoleListId
.
splice
(
this
.
ckdRoleListId
.
findIndex
(
item
=>
item
===
id
),
1
)
this
.
ckdRoleListId
.
splice
(
this
.
ckdRoleListId
.
findIndex
(
item
=>
item
===
id
),
1
)
//删除相同id
//删除相同id
console
.
log
(
this
.
ckdRoleListId
)
this
.
$refs
.
treeRole
.
setCheckedKeys
(
this
.
ckdRoleListId
);
this
.
$refs
.
treeRole
.
setCheckedKeys
(
this
.
ckdRoleListId
);
},
},
getMenber
()
{
//员工
getMenber
()
{
//员工
this
.
apipost
(
'WorkFlow_get_GetCompanyDepartMentEmployee'
,
{},
res
=>
{
this
.
apipost
(
'WorkFlow_get_GetCompanyDepartMentEmployee'
,
{},
res
=>
{
this
.
menberList
=
res
.
data
.
data
this
.
menberList
=
res
.
data
.
data
console
.
log
(
this
.
menberList
)
},
err
=>
{})
},
err
=>
{})
},
},
MenberListNodeChange
(
data
,
checked
){
MenberListNodeChange
(
data
,
checked
){
console
.
log
(
data
)
if
(
data
.
Type
==
2
&&
checked
){
if
(
data
.
Type
==
2
&&
checked
){
this
.
ckdMenberList
.
push
({
name
:
data
.
DepartmentName
,
id
:
data
.
DepartmentId
})
this
.
ckdMenberList
.
push
({
name
:
data
.
DepartmentName
,
id
:
data
.
DepartmentId
})
this
.
ckdMenberListId
.
push
(
data
.
DepartmentId
)
this
.
ckdMenberListId
.
push
(
data
.
DepartmentId
)
...
@@ -936,7 +847,6 @@
...
@@ -936,7 +847,6 @@
this
.
msg
.
FolderName
=
this
.
srearchKey
;
this
.
msg
.
FolderName
=
this
.
srearchKey
;
this
.
apipost
(
'user_cloud_GetFolderList'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'user_cloud_GetFolderList'
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
.
data
.
data
.
data
)
this
.
list
=
res
.
data
.
data
.
data
this
.
list
=
res
.
data
.
data
.
data
this
.
NavigationList
=
res
.
data
.
data
.
Navigation
this
.
NavigationList
=
res
.
data
.
data
.
Navigation
this
.
isCkedAll
=
false
this
.
isCkedAll
=
false
...
@@ -952,10 +862,6 @@
...
@@ -952,10 +862,6 @@
}
}
if
(
item
.
DataType
==
2
)
{
if
(
item
.
DataType
==
2
)
{
this
.
WjId
.
push
(
item
.
Id
)
this
.
WjId
.
push
(
item
.
Id
)
// let fileType=item.FolderName.substring(item.FolderName.lastIndexOf('.')+1,item.FolderName.length).toUpperCase()
// if('GIF|JPG|JPEG|PNG|BMP'.indexOf(fileType)!=-1){
// this.picObj.push(item.FilePath)
// }
let
fileType
=
item
.
FolderName
.
substring
(
item
.
FolderName
.
lastIndexOf
(
'.'
)
+
1
,
item
.
FolderName
.
length
).
toLowerCase
()
let
fileType
=
item
.
FolderName
.
substring
(
item
.
FolderName
.
lastIndexOf
(
'.'
)
+
1
,
item
.
FolderName
.
length
).
toLowerCase
()
item
.
icons
=
this
.
loadFileICON
(
fileType
)
item
.
icons
=
this
.
loadFileICON
(
fileType
)
}
}
...
@@ -973,7 +879,6 @@
...
@@ -973,7 +879,6 @@
this
.
apipost
(
'user_cloud_GetFolderTreeList'
,
{},
res
=>
{
this
.
apipost
(
'user_cloud_GetFolderTreeList'
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
fileTreeList
=
res
.
data
.
data
this
.
fileTreeList
=
res
.
data
.
data
console
.
log
(
res
.
data
.
data
)
}
else
{}
}
else
{}
},
err
=>
{})
},
err
=>
{})
},
},
...
...
src/components/administrative/outWorkApproval.vue
View file @
116f0064
...
@@ -196,9 +196,7 @@
...
@@ -196,9 +196,7 @@
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
this
.
list
=
res
.
data
.
data
.
pageData
;
this
.
list
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
total
=
res
.
data
.
data
.
count
;
//console.log(this.list)
this
.
loading
=
false
this
.
loading
=
false
}
else
{}
}
else
{}
},
err
=>
{})
},
err
=>
{})
},
},
...
...
src/components/administrative/positionManagement.vue
View file @
116f0064
...
@@ -149,13 +149,11 @@
...
@@ -149,13 +149,11 @@
getCompany
()
{
getCompany
()
{
this
.
apipost
(
'admin_get_BranchGetList'
,
this
.
getCompanyMsg
,
res
=>
{
this
.
apipost
(
'admin_get_BranchGetList'
,
this
.
getCompanyMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
//console.log(res.data.data)
if
(
this
.
outerVisible
)
{
if
(
this
.
outerVisible
)
{
this
.
layerCompanyList
=
res
.
data
.
data
;
this
.
layerCompanyList
=
res
.
data
.
data
;
}
else
{
}
else
{
this
.
companyList
=
res
.
data
.
data
;
this
.
companyList
=
res
.
data
.
data
;
}
}
//console.log(this.layerCompanyList)
}
else
{
}
else
{
}
}
},
err
=>
{
},
err
=>
{
...
@@ -169,7 +167,6 @@
...
@@ -169,7 +167,6 @@
}
else
{
}
else
{
this
.
departMentList
=
res
.
data
.
data
;
this
.
departMentList
=
res
.
data
.
data
;
}
}
//console.log(this.departMentList)
}
else
{
}
else
{
}
}
},
err
=>
{
},
err
=>
{
...
@@ -182,7 +179,6 @@
...
@@ -182,7 +179,6 @@
this
.
DataList
=
res
.
data
.
data
.
pageData
this
.
DataList
=
res
.
data
.
data
.
pageData
this
.
total
=
res
.
data
.
data
.
count
this
.
total
=
res
.
data
.
data
.
count
this
.
loading
=
false
this
.
loading
=
false
// console.log(this.DataList)
}
else
{
}
else
{
}
}
},
err
=>
{
},
err
=>
{
...
@@ -198,11 +194,8 @@
...
@@ -198,11 +194,8 @@
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
)
}
}
},
err
=>
{
},
err
=>
{
console
.
log
(
err
)
})
})
},
},
updateData
(
index
,
id
)
{
updateData
(
index
,
id
)
{
this
.
addMsg
.
PostId
=
id
this
.
addMsg
.
PostId
=
id
...
...
src/components/administrative/processDesign.vue
View file @
116f0064
...
@@ -340,7 +340,6 @@
...
@@ -340,7 +340,6 @@
},
res
=>
{
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
loading
=
false
;
this
.
loading
=
false
;
console
.
log
(
res
.
data
.
data
.
askList
)
this
.
askListType
=
res
.
data
.
data
.
TemplateType
this
.
askListType
=
res
.
data
.
data
.
TemplateType
this
.
TemplateTypeName
=
res
.
data
.
data
.
TemplateTypeName
this
.
TemplateTypeName
=
res
.
data
.
data
.
TemplateTypeName
this
.
askList
=
res
.
data
.
data
.
askList
this
.
askList
=
res
.
data
.
data
.
askList
...
@@ -373,7 +372,6 @@
...
@@ -373,7 +372,6 @@
this
.
apipost
(
'WorkFlow_get_GetDepartMentEmployee'
,
{},
res
=>
{
this
.
apipost
(
'WorkFlow_get_GetDepartMentEmployee'
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
userList
=
res
.
data
.
data
this
.
userList
=
res
.
data
.
data
//console.log(_this.$refs.treeUser.setCheckedKeys)
_this
.
$refs
.
treeUser
.
setCheckedKeys
(
_arr
);
_this
.
$refs
.
treeUser
.
setCheckedKeys
(
_arr
);
}
}
},
err
=>
{})
},
err
=>
{})
...
@@ -414,12 +412,9 @@
...
@@ -414,12 +412,9 @@
this
.
dialogTitle
=
'选择岗位'
;
this
.
dialogTitle
=
'选择岗位'
;
this
.
apipost
(
'WorkFlow_get_GetDepartMentPost'
,
{},
res
=>
{
this
.
apipost
(
'WorkFlow_get_GetDepartMentPost'
,
{},
res
=>
{
this
.
roleList
=
res
.
data
.
data
this
.
roleList
=
res
.
data
.
data
//console.log(this.roleList)
},
err
=>
{})
},
err
=>
{})
},
},
handleNodeChange1
(
data
,
checked
)
{
handleNodeChange1
(
data
,
checked
)
{
//myAuditUserList
//console.log(data)
data
.
IsCheck
=
checked
;
data
.
IsCheck
=
checked
;
if
(
data
.
Type
==
2
&&
data
.
IsCheck
)
{
//是员工且选中
if
(
data
.
Type
==
2
&&
data
.
IsCheck
)
{
//是员工且选中
let
isExsit
=
false
let
isExsit
=
false
...
@@ -458,10 +453,8 @@
...
@@ -458,10 +453,8 @@
}
}
}
}
}
}
// console.log(this.myAuditUserList1)
},
},
handleNodeChange
(
data
,
checked
)
{
handleNodeChange
(
data
,
checked
)
{
// console.log(data)
data
.
IsCheck
=
checked
;
data
.
IsCheck
=
checked
;
if
(
data
.
Type
==
2
&&
data
.
IsCheck
)
{
//是员工且选中
if
(
data
.
Type
==
2
&&
data
.
IsCheck
)
{
//是员工且选中
let
isExsit
=
false
let
isExsit
=
false
...
@@ -499,10 +492,8 @@
...
@@ -499,10 +492,8 @@
}
}
}
}
}
}
//console.log(this.memberSetCheckedKeys)
},
},
mySetCheckedKeys
(
id
)
{
mySetCheckedKeys
(
id
)
{
//console.log(this.memberSetCheckedKeys)
if
(
this
.
memberSetCheckedKeys
.
length
==
0
)
if
(
this
.
memberSetCheckedKeys
.
length
==
0
)
return
return
if
(
id
==
-
1
)
{
if
(
id
==
-
1
)
{
...
@@ -518,29 +509,22 @@
...
@@ -518,29 +509,22 @@
},
},
checkedRole
(
data
,
checked
)
{
checkedRole
(
data
,
checked
)
{
data
.
IsCheck
=
checked
;
data
.
IsCheck
=
checked
;
//console.log(data.Disabled,checked)
//this.$refs.treeRole.setCheckedKeys([]);
if
(
data
.
Disabled
==
false
&&
data
.
IsCheck
)
{
if
(
data
.
Disabled
==
false
&&
data
.
IsCheck
)
{
this
.
showRole
=
[];
this
.
showRole
=
[];
//this.$refs.treeRole.setCheckedKeys([data.DepartmentId]);
this
.
showRole
.
push
({
this
.
showRole
.
push
({
DepartmentName
:
data
.
DepartmentName
,
DepartmentName
:
data
.
DepartmentName
,
Id
:
data
.
DepartmentId
Id
:
data
.
DepartmentId
})
})
console
.
log
(
this
.
showRole
)
}
}
},
},
deleteItem
(
sort
)
{
deleteItem
(
sort
)
{
//console.log(sort)
this
.
myAuditList
.
splice
(
this
.
myAuditList
.
findIndex
(
item
=>
item
.
Sort
===
sort
),
1
)
this
.
myAuditList
.
splice
(
this
.
myAuditList
.
findIndex
(
item
=>
item
.
Sort
===
sort
),
1
)
//console.log(this.myAuditList)
},
},
getItemValue
(
obj
,
index
)
{
getItemValue
(
obj
,
index
)
{
this
.
addBtn
=
false
;
this
.
addBtn
=
false
;
this
.
updateItemIndex
=
index
;
this
.
updateItemIndex
=
index
;
this
.
updateItem
=
obj
;
this
.
updateItem
=
obj
;
console
.
log
(
obj
)
this
.
showLayer
();
this
.
showLayer
();
this
.
approvalType
=
obj
.
AuditType
;
this
.
approvalType
=
obj
.
AuditType
;
if
(
obj
.
AuditType
==
1
)
{
if
(
obj
.
AuditType
==
1
)
{
...
@@ -557,12 +541,9 @@
...
@@ -557,12 +541,9 @@
})
})
this
.
memberSetCheckedKeys
.
push
(
item
.
EmployeeId
)
this
.
memberSetCheckedKeys
.
push
(
item
.
EmployeeId
)
})
})
//this.$refs.tree.setCheckedKeys(this.memberSetCheckedKeys);
}
}
if
(
obj
.
AuditType
==
3
)
{
if
(
obj
.
AuditType
==
3
)
{
this
.
zgObj
.
AuditWay
=
obj
.
AuditWay
;
this
.
zgObj
.
AuditWay
=
obj
.
AuditWay
;
//console.log(this.showRole)
this
.
showRole
=
[];
this
.
showRole
=
[];
this
.
showRole
.
push
({
this
.
showRole
.
push
({
DepartmentName
:
obj
.
AuditDescription
DepartmentName
:
obj
.
AuditDescription
...
@@ -571,8 +552,6 @@
...
@@ -571,8 +552,6 @@
},
},
saveUpdateNode
()
{
saveUpdateNode
()
{
// this.myAuditList.splice(this.updateItemIndex,1)
//console.log(this.updateItem)
let
zg
=
{}
let
zg
=
{}
if
(
this
.
approvalType
==
1
)
{
if
(
this
.
approvalType
==
1
)
{
zg
.
AuditType
=
1
;
zg
.
AuditType
=
1
;
...
@@ -590,7 +569,6 @@
...
@@ -590,7 +569,6 @@
zg
.
AuditDescription
=
'直接主管'
zg
.
AuditDescription
=
'直接主管'
}
}
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
//this.myAuditList.push(zg);
}
}
if
(
this
.
approvalType
==
2
)
{
//指定成员
if
(
this
.
approvalType
==
2
)
{
//指定成员
let
Au
=
this
.
showMember
;
let
Au
=
this
.
showMember
;
...
@@ -621,7 +599,6 @@
...
@@ -621,7 +599,6 @@
return
return
}
}
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
//console.log(zg.AuditUserList)
}
}
if
(
this
.
approvalType
==
3
)
{
//岗位
if
(
this
.
approvalType
==
3
)
{
//岗位
zg
.
AuditType
=
3
;
zg
.
AuditType
=
3
;
...
@@ -637,14 +614,11 @@
...
@@ -637,14 +614,11 @@
}
}
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
}
}
// console.log(this.myAuditList)
this
.
closeLayer
()
this
.
closeLayer
()
},
},
deleteRole
()
{
deleteRole
()
{
this
.
showRole
=
[];
this
.
showRole
=
[];
//this.showRole.length=0;
//this.showRole=null;
},
},
changeValue
(
value
)
{
changeValue
(
value
)
{
this
.
tempChosenId
=
value
this
.
tempChosenId
=
value
...
@@ -700,7 +674,6 @@
...
@@ -700,7 +674,6 @@
}
}
this
.
myAuditList
.
push
(
zg
);
this
.
myAuditList
.
push
(
zg
);
console
.
log
(
zg
.
AuditUserList
)
}
}
if
(
this
.
approvalType
==
3
)
{
//岗位
if
(
this
.
approvalType
==
3
)
{
//岗位
zg
.
AuditType
=
3
;
zg
.
AuditType
=
3
;
...
@@ -752,7 +725,6 @@
...
@@ -752,7 +725,6 @@
this
.
addMsg
.
AuditUserList
=
this
.
myAuditUserList
;
this
.
addMsg
.
AuditUserList
=
this
.
myAuditUserList
;
this
.
ConditionSortList
=
[],
this
.
ConditionSortList
=
[],
this
.
addMsg
.
AskforleaveType
=
'['
+
this
.
AskforleaveTypeArr
.
toString
()
+
']'
this
.
addMsg
.
AskforleaveType
=
'['
+
this
.
AskforleaveTypeArr
.
toString
()
+
']'
console
.
log
(
this
.
addMsg
)
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apipost
(
'WorkFlow_post_SetOtherCondition'
,
this
.
addMsg
,
res
=>
{
this
.
apipost
(
'WorkFlow_post_SetOtherCondition'
,
this
.
addMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
src/components/administrative/updateProcessDesign.vue
View file @
116f0064
...
@@ -358,7 +358,6 @@
...
@@ -358,7 +358,6 @@
this
.
apipost
(
'WorkFlow_get_GetDepartMentEmployee'
,
{},
res
=>
{
this
.
apipost
(
'WorkFlow_get_GetDepartMentEmployee'
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
userList
=
res
.
data
.
data
this
.
userList
=
res
.
data
.
data
//console.log(_this.$refs.treeUser.setCheckedKeys)
_this
.
$refs
.
treeUser
.
setCheckedKeys
(
_arr
);
_this
.
$refs
.
treeUser
.
setCheckedKeys
(
_arr
);
}
}
},
err
=>
{})
},
err
=>
{})
...
@@ -399,7 +398,6 @@
...
@@ -399,7 +398,6 @@
this
.
askList
=
res
.
data
.
data
.
aftList
;
this
.
askList
=
res
.
data
.
data
.
aftList
;
this
.
askListType
=
res
.
data
.
data
.
TemplateType
this
.
askListType
=
res
.
data
.
data
.
TemplateType
this
.
addMsg
.
Sort
=
res
.
data
.
data
.
Sort
this
.
addMsg
.
Sort
=
res
.
data
.
data
.
Sort
// console.log(this.askListType)
let
_arr
=
res
.
data
.
data
.
AskforleaveType
.
substring
(
1
,
res
.
data
.
data
.
AskforleaveType
.
length
-
1
).
split
(
","
)
let
_arr
=
res
.
data
.
data
.
AskforleaveType
.
substring
(
1
,
res
.
data
.
data
.
AskforleaveType
.
length
-
1
).
split
(
","
)
let
_arr1
=
[]
let
_arr1
=
[]
_arr
.
forEach
(
item
=>
{
_arr
.
forEach
(
item
=>
{
...
@@ -421,13 +419,9 @@
...
@@ -421,13 +419,9 @@
this
.
myAuditList
=
res
.
data
.
data
.
AuditList
this
.
myAuditList
=
res
.
data
.
data
.
AuditList
this
.
myAuditUserList
=
res
.
data
.
data
.
AuditUserList
this
.
myAuditUserList
=
res
.
data
.
data
.
AuditUserList
this
.
myAuditUserList1
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
myAuditUserList
))
this
.
myAuditUserList1
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
myAuditUserList
))
//console.log(this.myAuditUserList1)
this
.
myAuditUserList1
.
forEach
(
item
=>
{
this
.
myAuditUserList1
.
forEach
(
item
=>
{
this
.
sysUserKeys
.
push
(
item
.
EmployeeId
)
this
.
sysUserKeys
.
push
(
item
.
EmployeeId
)
})
})
// console.log(this.sysUserKeys)
// this.myAuditUserList1= res.data.data.AuditUserList
}
else
{}
}
else
{}
},
error
=>
{})
},
error
=>
{})
},
},
...
@@ -443,12 +437,9 @@
...
@@ -443,12 +437,9 @@
this
.
dialogTitle
=
'选择岗位'
;
this
.
dialogTitle
=
'选择岗位'
;
this
.
apipost
(
'WorkFlow_get_GetDepartMentPost'
,
{},
res
=>
{
this
.
apipost
(
'WorkFlow_get_GetDepartMentPost'
,
{},
res
=>
{
this
.
roleList
=
res
.
data
.
data
this
.
roleList
=
res
.
data
.
data
//console.log(this.roleList)
},
err
=>
{})
},
err
=>
{})
},
},
handleNodeChange1
(
data
,
checked
)
{
handleNodeChange1
(
data
,
checked
)
{
//myAuditUserList
//console.log(data)
data
.
IsCheck
=
checked
;
data
.
IsCheck
=
checked
;
if
(
data
.
Type
==
2
&&
data
.
IsCheck
)
{
//是员工且选中
if
(
data
.
Type
==
2
&&
data
.
IsCheck
)
{
//是员工且选中
let
isExsit
=
false
let
isExsit
=
false
...
@@ -487,10 +478,8 @@
...
@@ -487,10 +478,8 @@
}
}
}
}
}
}
// console.log(this.myAuditUserList1)
},
},
handleNodeChange
(
data
,
checked
)
{
handleNodeChange
(
data
,
checked
)
{
// console.log(data)
data
.
IsCheck
=
checked
;
data
.
IsCheck
=
checked
;
if
(
data
.
Type
==
2
&&
data
.
IsCheck
)
{
//是员工且选中
if
(
data
.
Type
==
2
&&
data
.
IsCheck
)
{
//是员工且选中
let
isExsit
=
false
let
isExsit
=
false
...
@@ -528,10 +517,8 @@
...
@@ -528,10 +517,8 @@
}
}
}
}
}
}
//console.log(this.memberSetCheckedKeys)
},
},
mySetCheckedKeys
(
id
)
{
mySetCheckedKeys
(
id
)
{
//console.log(this.memberSetCheckedKeys)
if
(
this
.
memberSetCheckedKeys
.
length
==
0
)
if
(
this
.
memberSetCheckedKeys
.
length
==
0
)
return
return
if
(
id
==
-
1
)
{
if
(
id
==
-
1
)
{
...
@@ -547,29 +534,21 @@
...
@@ -547,29 +534,21 @@
},
},
checkedRole
(
data
,
checked
)
{
checkedRole
(
data
,
checked
)
{
data
.
IsCheck
=
checked
;
data
.
IsCheck
=
checked
;
//console.log(data.Disabled,checked)
//this.$refs.treeRole.setCheckedKeys([]);
if
(
data
.
Disabled
==
false
&&
data
.
IsCheck
)
{
if
(
data
.
Disabled
==
false
&&
data
.
IsCheck
)
{
this
.
showRole
=
[];
this
.
showRole
=
[];
//this.$refs.treeRole.setCheckedKeys([data.DepartmentId]);
this
.
showRole
.
push
({
this
.
showRole
.
push
({
DepartmentName
:
data
.
DepartmentName
,
DepartmentName
:
data
.
DepartmentName
,
Id
:
data
.
DepartmentId
Id
:
data
.
DepartmentId
})
})
//console.log(this.showRole)
}
}
},
},
deleteItem
(
sort
)
{
deleteItem
(
sort
)
{
//console.log(sort)
this
.
myAuditList
.
splice
(
this
.
myAuditList
.
findIndex
(
item
=>
item
.
Sort
===
sort
),
1
)
this
.
myAuditList
.
splice
(
this
.
myAuditList
.
findIndex
(
item
=>
item
.
Sort
===
sort
),
1
)
//console.log(this.myAuditList)
},
},
getItemValue
(
obj
,
index
)
{
getItemValue
(
obj
,
index
)
{
this
.
addBtn
=
false
;
this
.
addBtn
=
false
;
this
.
updateItemIndex
=
index
;
this
.
updateItemIndex
=
index
;
this
.
updateItem
=
obj
;
this
.
updateItem
=
obj
;
console
.
log
(
obj
)
this
.
showLayer
();
this
.
showLayer
();
this
.
approvalType
=
obj
.
AuditType
;
this
.
approvalType
=
obj
.
AuditType
;
if
(
obj
.
AuditType
==
1
)
{
if
(
obj
.
AuditType
==
1
)
{
...
@@ -586,12 +565,9 @@
...
@@ -586,12 +565,9 @@
})
})
this
.
memberSetCheckedKeys
.
push
(
item
.
EmployeeId
)
this
.
memberSetCheckedKeys
.
push
(
item
.
EmployeeId
)
})
})
//this.$refs.tree.setCheckedKeys(this.memberSetCheckedKeys);
}
}
if
(
obj
.
AuditType
==
3
)
{
if
(
obj
.
AuditType
==
3
)
{
this
.
zgObj
.
AuditWay
=
obj
.
AuditWay
;
this
.
zgObj
.
AuditWay
=
obj
.
AuditWay
;
//console.log(this.showRole)
this
.
showRole
=
[];
this
.
showRole
=
[];
this
.
showRole
.
push
({
this
.
showRole
.
push
({
DepartmentName
:
obj
.
AuditDescription
DepartmentName
:
obj
.
AuditDescription
...
@@ -600,8 +576,6 @@
...
@@ -600,8 +576,6 @@
},
},
saveUpdateNode
()
{
saveUpdateNode
()
{
// this.myAuditList.splice(this.updateItemIndex,1)
//console.log(this.updateItem)
let
zg
=
{}
let
zg
=
{}
if
(
this
.
approvalType
==
1
)
{
if
(
this
.
approvalType
==
1
)
{
zg
.
AuditType
=
1
;
zg
.
AuditType
=
1
;
...
@@ -650,7 +624,6 @@
...
@@ -650,7 +624,6 @@
return
return
}
}
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
//console.log(zg.AuditUserList)
}
}
if
(
this
.
approvalType
==
3
)
{
//岗位
if
(
this
.
approvalType
==
3
)
{
//岗位
zg
.
AuditType
=
3
;
zg
.
AuditType
=
3
;
...
@@ -666,14 +639,12 @@
...
@@ -666,14 +639,12 @@
}
}
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
this
.
myAuditList
[
this
.
updateItemIndex
]
=
zg
;
}
}
// console.log(this.myAuditList)
this
.
closeLayer
()
this
.
closeLayer
()
},
},
deleteRole
()
{
deleteRole
()
{
this
.
showRole
=
[];
this
.
showRole
=
[];
//this.showRole.length=0;
//this.showRole=null;
},
},
changeValue
(
value
)
{
changeValue
(
value
)
{
this
.
tempChosenId
=
value
this
.
tempChosenId
=
value
...
@@ -729,7 +700,6 @@
...
@@ -729,7 +700,6 @@
}
}
this
.
myAuditList
.
push
(
zg
);
this
.
myAuditList
.
push
(
zg
);
console
.
log
(
zg
.
AuditUserList
)
}
}
if
(
this
.
approvalType
==
3
)
{
//岗位
if
(
this
.
approvalType
==
3
)
{
//岗位
zg
.
AuditType
=
3
;
zg
.
AuditType
=
3
;
...
@@ -779,7 +749,6 @@
...
@@ -779,7 +749,6 @@
this
.
addMsg
.
AuditUserList
=
this
.
myAuditUserList
;
this
.
addMsg
.
AuditUserList
=
this
.
myAuditUserList
;
this
.
ConditionSortList
=
[],
this
.
ConditionSortList
=
[],
this
.
addMsg
.
AskforleaveType
=
'['
+
this
.
AskforleaveTypeArr
.
toString
()
+
']'
this
.
addMsg
.
AskforleaveType
=
'['
+
this
.
AskforleaveTypeArr
.
toString
()
+
']'
console
.
log
(
this
.
addMsg
)
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apipost
(
'WorkFlow_post_SetOtherCondition'
,
this
.
addMsg
,
res
=>
{
this
.
apipost
(
'WorkFlow_post_SetOtherCondition'
,
this
.
addMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
src/components/commonPage/googleMap.vue
View file @
116f0064
...
@@ -64,7 +64,6 @@ export default {
...
@@ -64,7 +64,6 @@ export default {
},
},
methods
:
{
methods
:
{
getList
(
obj
)
{
getList
(
obj
)
{
console
.
log
(
"地图返回结果:"
,
obj
);
this
.
isdisable
=
true
;
this
.
isdisable
=
true
;
this
.
dataList
.
lat
=
obj
.
lat
;
this
.
dataList
.
lat
=
obj
.
lat
;
this
.
dataList
.
lng
=
obj
.
lng
;
this
.
dataList
.
lng
=
obj
.
lng
;
...
...
src/components/dmc/manager/workCount.vue
View file @
116f0064
...
@@ -243,9 +243,7 @@ export default{
...
@@ -243,9 +243,7 @@ export default{
google
.
maps
.
event
.
addListener
(
_this
.
map
,
'click'
,
function
(
event
)
{
// 地图点击事件 获取经纬度
google
.
maps
.
event
.
addListener
(
_this
.
map
,
'click'
,
function
(
event
)
{
// 地图点击事件 获取经纬度
geocoder
.
geocode
({
'location'
:
event
.
latLng
},
function
(
results
,
status
)
{
geocoder
.
geocode
({
'location'
:
event
.
latLng
},
function
(
results
,
status
)
{
if
(
status
==
google
.
maps
.
GeocoderStatus
.
OK
)
{
if
(
status
==
google
.
maps
.
GeocoderStatus
.
OK
)
{
console
.
log
(
results
[
0
].
geometry
.
location
.
lat
(),
results
[
0
].
geometry
.
location
.
lng
());
}
else
{
}
else
{
console
.
log
(
"对不起没有找到相关的地理位置信息,请点击地图上的准确位置,进行定位!"
);
}
}
});
});
});
});
...
...
src/components/index.vue
View file @
116f0064
...
@@ -1459,10 +1459,7 @@ export default {
...
@@ -1459,10 +1459,7 @@ export default {
let
x
=
this
.
sysMsgList
[
i
];
let
x
=
this
.
sysMsgList
[
i
];
if
(
x
.
IMID
===
item
.
to
)
{
if
(
x
.
IMID
===
item
.
to
)
{
if
(
x
.
unread
!=
item
.
unread
)
{
if
(
x
.
unread
!=
item
.
unread
)
{
// console.log(x)
// console.log(item)
tempCount
=
1
;
tempCount
=
1
;
// this.refreshSysNoteDate()
}
}
x
.
unread
=
item
.
unread
;
x
.
unread
=
item
.
unread
;
x
.
lastMsgShow
=
item
.
lastMsg
.
text
;
x
.
lastMsgShow
=
item
.
lastMsg
.
text
;
...
@@ -1522,7 +1519,6 @@ export default {
...
@@ -1522,7 +1519,6 @@ export default {
item
.
updateTimeShow
=
util
.
formatDate
(
item
.
updateTime
,
true
);
item
.
updateTimeShow
=
util
.
formatDate
(
item
.
updateTime
,
true
);
}
}
if
(
item
.
unread
>
0
)
{
if
(
item
.
unread
>
0
)
{
// console.log(item)
if
(
this
.
unReadMsgId
.
indexOf
(
item
.
lastMsg
.
idServer
)
==
-
1
)
{
if
(
this
.
unReadMsgId
.
indexOf
(
item
.
lastMsg
.
idServer
)
==
-
1
)
{
if
(
!
this
.
isFirst
)
{
if
(
!
this
.
isFirst
)
{
this
.
msgGet
(
item
);
this
.
msgGet
(
item
);
...
@@ -1534,18 +1530,10 @@ export default {
...
@@ -1534,18 +1530,10 @@ export default {
this
.
enterChat
(
item
)
this
.
enterChat
(
item
)
}
}
}
}
// else if(this.currentSession.id && item.lastMsg.sessionId==this.currentSession.id){
// if(item.lastMsg.tip && item.lastMsg.tip=='抖了一下'){
// this.dou()
// }
// }
// console.log(item.lastMsg)
return
item
;
return
item
;
});
});
this
.
hasNewMsg
=
tempCount
;
this
.
hasNewMsg
=
tempCount
;
this
.
isFirstLoad
=
false
;
this
.
isFirstLoad
=
false
;
// this.allSsionList = JSON.parse(JSON.stringify(sessionlist));
return
sessionlist
;
return
sessionlist
;
},
},
sessionId
()
{
sessionId
()
{
...
@@ -1636,7 +1624,6 @@ export default {
...
@@ -1636,7 +1624,6 @@ export default {
}
}
};
};
document
.
addEventListener
(
visibilityChangeEvent
,
onVisibilityChange
);
document
.
addEventListener
(
visibilityChangeEvent
,
onVisibilityChange
);
// console.log('initIM',this.firstMenuList.indexOf('IM'))
if
(
!
localStorage
.
menu
){
if
(
!
localStorage
.
menu
){
this
.
$store
.
dispatch
(
"connect"
);
this
.
$store
.
dispatch
(
"connect"
);
}
else
{
}
else
{
...
@@ -1759,7 +1746,6 @@ export default {
...
@@ -1759,7 +1746,6 @@ export default {
msg
,
msg
,
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
// console.log('res.data.datares.data.datares.data.data',res)
this
.
NewSaleRnkInfo
=
res
.
data
.
data
this
.
NewSaleRnkInfo
=
res
.
data
.
data
let
New
=
this
.
NewSaleRnkInfo
.
StartDateMonth
+
this
.
NewSaleRnkInfo
.
StartDateDay
let
New
=
this
.
NewSaleRnkInfo
.
StartDateMonth
+
this
.
NewSaleRnkInfo
.
StartDateDay
let
arr
=
localStorage
.
saleRnkInfo
?
JSON
.
parse
(
localStorage
.
saleRnkInfo
)
:
[]
let
arr
=
localStorage
.
saleRnkInfo
?
JSON
.
parse
(
localStorage
.
saleRnkInfo
)
:
[]
...
@@ -1898,7 +1884,6 @@ export default {
...
@@ -1898,7 +1884,6 @@ export default {
let
t
=
0
;
let
t
=
0
;
let
c
=
0
;
let
c
=
0
;
this
.
douTimer
=
setInterval
(()
=>
{
this
.
douTimer
=
setInterval
(()
=>
{
// console.log('come in ..........')
if
(
t
==
0
)
if
(
t
==
0
)
this
.
$refs
.
resizeBox
.
_data
.
top
=
y
+
2
this
.
$refs
.
resizeBox
.
_data
.
top
=
y
+
2
if
(
t
==
2
)
if
(
t
==
2
)
...
@@ -1923,7 +1908,6 @@ export default {
...
@@ -1923,7 +1908,6 @@ export default {
}
}
},
},
LogSetReadStatus
(
s
)
{
LogSetReadStatus
(
s
)
{
console
.
log
(
s
)
this
.
apipost
(
this
.
apipost
(
"SystemLog_post_LogSetReadStatus"
,
"SystemLog_post_LogSetReadStatus"
,
{
LogId
:
s
.
ID
},
{
LogId
:
s
.
ID
},
...
@@ -1971,7 +1955,6 @@ export default {
...
@@ -1971,7 +1955,6 @@ export default {
);
);
if
(
add
)
{
if
(
add
)
{
this
.
msgList
.
push
(
x
);
this
.
msgList
.
push
(
x
);
// console.log(this.msgList)
}
}
});
});
if
(
!
add
)
{
if
(
!
add
)
{
...
@@ -3763,7 +3746,6 @@ export default {
...
@@ -3763,7 +3746,6 @@ export default {
}
}
});
});
n
.
onshow
=
function
()
{
n
.
onshow
=
function
()
{
//console.log("通知显示了!");
};
};
n
.
onclick
=
function
(
e
)
{
n
.
onclick
=
function
(
e
)
{
//可以直接通过实例的方式获取data内自定义的数据
//可以直接通过实例的方式获取data内自定义的数据
...
@@ -3775,10 +3757,8 @@ export default {
...
@@ -3775,10 +3757,8 @@ export default {
n
.
close
();
n
.
close
();
};
};
n
.
onclose
=
function
()
{
n
.
onclose
=
function
()
{
//console.log("用户点击关闭");
};
};
n
.
onerror
=
function
(
err
)
{
n
.
onerror
=
function
(
err
)
{
//console.log("出错了,小伙子在检查一下吧");
throw
err
;
throw
err
;
};
};
setTimeout
(()
=>
{
setTimeout
(()
=>
{
...
...
src/components/platformModule/versionspermissionList.vue
View file @
116f0064
This diff is collapsed.
Click to expand it.
src/store/actions/chatroomMsgs.js
View file @
116f0064
...
@@ -98,17 +98,14 @@ export function sendChatroomFileMsg ({state, commit}, obj) {
...
@@ -98,17 +98,14 @@ export function sendChatroomFileMsg ({state, commit}, obj) {
type
,
type
,
fileInput
,
fileInput
,
uploadprogress
:
function
(
data
)
{
uploadprogress
:
function
(
data
)
{
// console.log(data.percentageText)
},
},
uploaderror
:
function
()
{
uploaderror
:
function
()
{
console
&&
console
.
log
(
'上传失败'
)
console
&&
console
.
log
(
'上传失败'
)
},
},
uploaddone
:
function
(
error
,
file
)
{
uploaddone
:
function
(
error
,
file
)
{
// console.log(error);
// console.log(file);
},
},
beforesend
:
function
(
msg
)
{
beforesend
:
function
(
msg
)
{
// console && console.log('正在发送消息, id=', msg);
},
},
done
:
function
(
error
,
msg
)
{
done
:
function
(
error
,
msg
)
{
onSendMsgDone
(
error
,
msg
)
onSendMsgDone
(
error
,
msg
)
...
...
src/store/actions/initChatroomSDK.js
View file @
116f0064
...
@@ -9,7 +9,6 @@ import store from '../'
...
@@ -9,7 +9,6 @@ import store from '../'
import
{
onChatroomMsgs
}
from
'./chatroomMsgs'
import
{
onChatroomMsgs
}
from
'./chatroomMsgs'
// let sdkPath = '@/sdk/' + config.sdk
// let sdkPath = '@/sdk/' + config.sdk
// console.log(sdkPath)
// const SDK = require(sdkPath)
// const SDK = require(sdkPath)
// 切换聊天室之前需要断开连接,原因是移动端不断累积连接实例,消息并发较大时会有性能问题
// 切换聊天室之前需要断开连接,原因是移动端不断累积连接实例,消息并发较大时会有性能问题
...
...
src/store/actions/msgs.js
View file @
116f0064
...
@@ -182,17 +182,16 @@ export function sendFileMsg ({state, commit}, obj) {
...
@@ -182,17 +182,16 @@ export function sendFileMsg ({state, commit}, obj) {
type
,
type
,
fileInput
,
fileInput
,
uploadprogress
:
function
(
data
)
{
uploadprogress
:
function
(
data
)
{
// console.log(data.percentageText)
},
},
uploaderror
:
function
()
{
uploaderror
:
function
()
{
console
&&
console
.
log
(
'上传失败'
)
console
&&
console
.
log
(
'上传失败'
)
},
},
uploaddone
:
function
(
error
,
file
)
{
uploaddone
:
function
(
error
,
file
)
{
// console.log(error);
// console.log(file);
},
},
beforesend
:
function
(
msg
)
{
beforesend
:
function
(
msg
)
{
// console && console.log('正在发送消息, id=', msg);
},
},
done
:
function
(
error
,
msg
)
{
done
:
function
(
error
,
msg
)
{
onSendMsgDone
(
error
,
msg
)
onSendMsgDone
(
error
,
msg
)
...
@@ -218,17 +217,16 @@ export function sendDataUrlMsg ({state, commit}, obj) {
...
@@ -218,17 +217,16 @@ export function sendDataUrlMsg ({state, commit}, obj) {
dataURL
:
dataURL
,
dataURL
:
dataURL
,
custom
:
JSON
.
stringify
(
otherMsg
),
custom
:
JSON
.
stringify
(
otherMsg
),
uploadprogress
:
function
(
data
)
{
uploadprogress
:
function
(
data
)
{
// console.log(data.percentageText)
},
},
uploaderror
:
function
()
{
uploaderror
:
function
()
{
console
&&
console
.
log
(
'上传失败'
)
console
&&
console
.
log
(
'上传失败'
)
},
},
uploaddone
:
function
(
error
,
file
)
{
uploaddone
:
function
(
error
,
file
)
{
// console.log(error);
// console.log(file);
},
},
beforesend
:
function
(
msg
)
{
beforesend
:
function
(
msg
)
{
// console && console.log('正在发送消息, id=', msg);
},
},
done
:
function
(
error
,
msg
)
{
done
:
function
(
error
,
msg
)
{
onSendMsgDone
(
error
,
msg
)
onSendMsgDone
(
error
,
msg
)
...
@@ -282,10 +280,8 @@ export function sendRobotMsg ({state, commit}, obj) {
...
@@ -282,10 +280,8 @@ export function sendRobotMsg ({state, commit}, obj) {
// 发送消息已读回执
// 发送消息已读回执
export
function
sendMsgReceipt
({
state
,
commit
})
{
export
function
sendMsgReceipt
({
state
,
commit
})
{
//console.log('in..................................')
// 如果有当前会话
// 如果有当前会话
let
currSessionId
=
store
.
state
.
currSessionId
let
currSessionId
=
store
.
state
.
currSessionId
//console.log(currSessionId)
if
(
currSessionId
)
{
if
(
currSessionId
)
{
// 只有点对点消息才发已读回执
// 只有点对点消息才发已读回执
if
(
util
.
parseSession
(
currSessionId
).
scene
===
'p2p'
)
{
if
(
util
.
parseSession
(
currSessionId
).
scene
===
'p2p'
)
{
...
...
src/store/actions/session.js
View file @
116f0064
...
@@ -25,14 +25,12 @@ function updateSessionAccount (sessions) {
...
@@ -25,14 +25,12 @@ function updateSessionAccount (sessions) {
// onSessions只在初始化完成后回调
// onSessions只在初始化完成后回调
export
function
onSessions
(
sessions
)
{
export
function
onSessions
(
sessions
)
{
updateSessionAccount
(
sessions
)
updateSessionAccount
(
sessions
)
console
.
log
(
"执行了..."
)
store
.
commit
(
'updateSessions'
,
sessions
)
store
.
commit
(
'updateSessions'
,
sessions
)
}
}
export
function
onUpdateSession
(
session
)
{
export
function
onUpdateSession
(
session
)
{
let
sessions
=
[
session
]
let
sessions
=
[
session
]
updateSessionAccount
(
sessions
)
updateSessionAccount
(
sessions
)
//console.log(session)
store
.
commit
(
'updateSessions'
,
sessions
)
store
.
commit
(
'updateSessions'
,
sessions
)
}
}
...
@@ -97,7 +95,6 @@ export function resetCurrSession ({state, commit}) {
...
@@ -97,7 +95,6 @@ export function resetCurrSession ({state, commit}) {
if
(
!
nim
){
if
(
!
nim
){
return
;
return
;
}
}
console
.
log
(
'重置了..................'
)
nim
.
resetCurrSession
()
nim
.
resetCurrSession
()
commit
(
'updateCurrSessionMsgs'
,
{
commit
(
'updateCurrSessionMsgs'
,
{
type
:
'destroy'
type
:
'destroy'
...
...
src/store/actions/team.js
View file @
116f0064
...
@@ -51,12 +51,10 @@ export function onDismissTeam(obj) {
...
@@ -51,12 +51,10 @@ export function onDismissTeam(obj) {
}
}
export
function
onUpdateTeam
(
team
)
{
export
function
onUpdateTeam
(
team
)
{
console
.
log
(
'in.............'
)
onTeams
(
team
)
onTeams
(
team
)
}
}
export
function
onTeamNotificationMsg
({
state
,
commit
},
msg
)
{
export
function
onTeamNotificationMsg
({
state
,
commit
},
msg
)
{
// console.log('aaaaaaaaaaa')
if
(
msg
.
attach
.
type
===
'updateTeam'
&&
msg
.
attach
.
team
)
{
if
(
msg
.
attach
.
type
===
'updateTeam'
&&
msg
.
attach
.
team
)
{
store
.
commit
(
'updateTeamInfo'
,
msg
.
attach
.
team
)
store
.
commit
(
'updateTeamInfo'
,
msg
.
attach
.
team
)
}
}
...
...
src/store/mutations/index.js
View file @
116f0064
...
@@ -213,7 +213,6 @@ export default {
...
@@ -213,7 +213,6 @@ export default {
let
lastMsgIndex
=
tempMsgs
.
length
-
1
let
lastMsgIndex
=
tempMsgs
.
length
-
1
for
(
let
i
=
lastMsgIndex
;
i
>=
0
;
i
--
)
{
for
(
let
i
=
lastMsgIndex
;
i
>=
0
;
i
--
)
{
let
currMsg
=
tempMsgs
[
i
]
let
currMsg
=
tempMsgs
[
i
]
console
.
log
(
idClient
,
currMsg
.
idClient
,
currMsg
.
text
)
if
(
idClient
===
currMsg
.
idClient
)
{
if
(
idClient
===
currMsg
.
idClient
)
{
state
.
msgs
[
sessionId
].
splice
(
i
,
1
,
msg
)
state
.
msgs
[
sessionId
].
splice
(
i
,
1
,
msg
)
break
break
...
...
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