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
620b0194
Commit
620b0194
authored
Jul 28, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
6e6dd507
3e1a9772
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
521 additions
and
262 deletions
+521
-262
App.vue
src/App.vue
+1
-1
Details.css
src/assets/css/Details.css
+4
-0
Login2019.vue
src/components/Login2019.vue
+2
-2
WebSiteSearch.vue
src/components/WebSet/WebSiteSearch.vue
+453
-240
index.vue
src/components/index.vue
+2
-3
personalCenter.vue
src/components/personalCenter.vue
+57
-14
mywork.vue
src/components/work/mywork.vue
+1
-1
index.js
src/plug/index.js
+1
-1
No files found.
src/App.vue
View file @
620b0194
...
...
@@ -179,7 +179,7 @@ export default {
}
</
script
>
<
style
>
@import
"//at.alicdn.com/t/font_635492_
5umd0wfprhv
.css"
;
@import
"//at.alicdn.com/t/font_635492_
corysyogb8g
.css"
;
@import
"./assets/css/Semibold.css"
;
@import
"./assets/css/global/config.css"
;
@import
"./assets/css/fileIcon.css"
;
...
...
src/assets/css/Details.css
View file @
620b0194
...
...
@@ -74,6 +74,10 @@
.secondMenu
.el-submenu__title
i
{
color
:
#a3ace0
;
font-size
:
18px
;
margin-left
:
16px
;
margin-right
:
16px
;
min-width
:
18px
;
display
:
inline-block
;
}
.el-menu--vertical
.thridMenu
{
...
...
src/components/Login2019.vue
View file @
620b0194
...
...
@@ -267,7 +267,7 @@
this
.
userInfo
.
name
=
"paulwu1657@gmail.com"
;
this
.
userInfo
.
password
=
"123456"
;
}
this
.
userInfo
.
Domain
=
'ys.oytour.com'
//
window.location.hostname
this
.
userInfo
.
Domain
=
window
.
location
.
hostname
},
doLogin
()
{
if
(
this
.
userInfo
.
name
==
""
)
{
...
...
@@ -423,7 +423,7 @@
});
},
getGroup
()
{
//获取集团
let
Domain
=
'ys.oytour.com'
///
window.location.hostname
let
Domain
=
window
.
location
.
hostname
this
.
apipost
(
'admin_get_GetModelByDomain'
,
{
'Domain'
:
Domain
},
res
=>
{
...
...
src/components/WebSet/WebSiteSearch.vue
View file @
620b0194
<
style
>
.webSiteBg
{
.webSiteBg
{
padding
:
20px
;
background-color
:
#fff
;
}
height
:
100%
;
}
.WebSiteSearch
.el-tabs__content
{
height
:
calc
(
100%
-
55px
);
}
</
style
>
<
template
>
<!--网站设定(网站设置)-->
<div
class=
"WebSiteSearch"
>
<el-form
:model=
"PostMsg"
ref=
"PostMsg"
label-width=
"130px"
>
<el-tabs
v-model=
"activeName"
>
<div
class=
"WebSiteSearch"
style=
"height:100%"
>
<el-form
:model=
"PostMsg"
ref=
"PostMsg"
label-width=
"130px"
style=
"height:100%"
>
<el-tabs
v-model=
"activeName"
style=
"height:100%;"
>
<el-tab-pane
label=
"基本設定"
name=
"first"
>
<div
class=
"webSiteBg"
>
<el-row>
...
...
@@ -31,10 +34,14 @@
<el-row>
<el-col
:span=
"24"
>
<el-form-item>
<el-tag
v-for=
"(tag,index) in keyWordsArr"
:key=
"tag"
closable
:type=
"tag"
@
close=
"closeTag(index)"
style=
"margin-right:10px;"
>
{{
tag
}}
</el-tag>
<el-tag
v-for=
"(tag,index) in keyWordsArr"
:key=
"tag"
closable
:type=
"tag"
@
close=
"closeTag(index)"
style=
"margin-right:10px;"
>
{{
tag
}}
</el-tag>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -51,45 +58,69 @@
<div
class=
"webSiteBg"
>
<el-row>
<el-checkbox-group
v-model=
"SearchAreaArr"
>
<el-col
:span=
"6"
v-for=
"(item,index) in areaData"
:key=
"index"
style=
"margin-bottom:20px;"
>
<el-col
:span=
"6"
v-for=
"(item,index) in areaData"
:key=
"index"
style=
"margin-bottom:20px;"
>
<el-checkbox
:label=
"item.Id"
:key=
"item.AreaName"
>
{{
item
.
AreaName
}}
</el-checkbox>
</el-col>
</el-checkbox-group>
</el-row>
<el-row>
<el-col
:span=
"24"
>
<el-button
type=
"primary"
size=
"small"
style=
"margin:40px 0"
@
click=
"saveData()"
>
儲存修改
</el-button>
<el-button
type=
"primary"
size=
"small"
style=
"margin:40px 0"
@
click=
"saveData()"
>
儲存修改
</el-button>
</el-col>
</el-row>
</div>
</el-tab-pane>
<el-tab-pane
label=
"供應商旅行社"
name=
"third"
>
<el-tab-pane
label=
"供應商旅行社"
name=
"third"
style=
"height:100%"
>
<div
class=
"webSiteBg"
>
<el-button
:disabled=
"chooseTAArray.length>0?false:true"
@
click=
"setTravelagencyArea(1)"
style=
"padding-bottom:10px;"
>
批次設定區域
</el-button>
<el-table
ref=
"multipleTable"
:data=
"PostMsg.TravelagencyList"
tooltip-effect=
"dark"
style=
"width: 100%"
@
selection-change=
"handleSelectionChange"
height=
"550"
>
<el-table-column
type=
"selection"
width=
"100px"
>
</el-table-column>
<!--
<el-button
:disabled=
"chooseTAArray.length>0?false:true"
@
click=
"setTravelagencyArea(1)"
style=
"padding-bottom:10px;"
>
批次設定區域
</el-button>
-->
<el-table
v-loading=
"isLoadingAgentArea"
ref=
"multipleTable"
:data=
"PostMsg.TravelagencyList"
tooltip-effect=
"dark"
style=
"width: 100%;height:calc(100% - 50px);overflow-y:auto;"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"100px"
></el-table-column>
<el-table-column
prop=
"IsOpenSearch"
label=
"開放搜尋"
width=
"100px"
>
<template
slot-scope=
"scope"
>
<el-switch
v-model=
"scope.row.IsOpenSearch"
:active-value=
"1"
:inactive-value=
"0"
active-color=
"#13ce66"
inactive-color=
"#dcdfe6"
></el-switch>
<el-switch
v-model=
"scope.row.IsOpenSearch"
:active-value=
"1"
:inactive-value=
"0"
active-color=
"#13ce66"
inactive-color=
"#dcdfe6"
:disabled=
"scope.row.SyncStatus==0"
></el-switch>
</
template
>
</el-table-column>
<el-table-column
prop=
"AgencyName"
label=
"旅行社"
width=
"300px"
>
</el-table-column>
<el-table-column
prop=
"AgencyName"
label=
"旅行社"
width=
"300px"
></el-table-column>
<el-table-column
label=
"設定區域"
width=
"200px"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"primary"
size=
"small"
@
click=
"setTravelagencyArea(2,scope.row)"
>
設定
</el-button>
<el-button
v-if=
"scope.row.SyncStatus==1"
type=
"primary"
size=
"small"
@
click=
"getAgentArea(scope.row)"
>
設定
</el-button>
<span
v-else
style=
"color:#f45c43;"
>
正在接入,敬請期待
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"SetArea"
label=
"開放區域"
>
<
template
slot-scope=
"scope"
>
{{
getAreaName
(
scope
.
row
.
SetArea
)
}}
</
template
>
<
template
slot-scope=
"scope"
>
{{
getAreaName
(
scope
.
row
.
SetArea
)
}}
</
template
>
</el-table-column>
</el-table>
<el-button
type=
"primary"
size=
"small"
style=
"margin
:40px 0
"
@
click=
"saveData()"
>
儲存修改
</el-button>
<el-button
type=
"primary"
size=
"small"
style=
"margin
-top:20px;
"
@
click=
"saveData()"
>
儲存修改
</el-button>
</div>
</el-tab-pane>
<el-tab-pane
label=
"搜尋結果頁面"
name=
"fourth"
>
...
...
@@ -103,7 +134,12 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
size=
"small"
style=
"margin:40px 0"
@
click=
"saveData()"
>
儲存修改
</el-button>
<el-button
type=
"primary"
size=
"small"
style=
"margin:40px 0"
@
click=
"saveData()"
>
儲存修改
</el-button>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -114,7 +150,12 @@
<el-dialog
custom-class=
"w450"
title=
"設定區域"
:visible
.
sync=
"outerVisible"
center
>
<el-row>
<el-checkbox-group
v-model=
"taAreaArr"
>
<el-col
:span=
"6"
v-for=
"(item,index) in areaData"
:key=
"index"
style=
"margin-bottom:20px;"
>
<el-col
:span=
"6"
v-for=
"(item,index) in areaData"
:key=
"index"
style=
"margin-bottom:20px;"
>
<el-checkbox
:label=
"item.Id"
:key=
"item.AreaName"
>
{{item.AreaName}}
</el-checkbox>
</el-col>
</el-checkbox-group>
...
...
@@ -124,24 +165,70 @@
<button
class=
"normalBtn"
@
click=
"sureTAArea()"
>
确定
</button>
</div>
</el-dialog>
<el-dialog
custom-class=
"w450"
title=
"選擇您需要的區域"
:visible
.
sync=
"showAgentArea"
center
>
<transition
name=
"el-zoom-in-top"
>
<el-row
v-show=
"chosenStep==0"
>
<el-checkbox-group
v-model=
"agentChosenArea"
>
<el-col
:span=
"6"
v-for=
"(item,index) in agentArea"
:key=
"index"
style=
"margin-bottom:20px;"
>
<el-checkbox
:label=
"item"
:key=
"item.AreaName"
>
{{item.AreaName}}
</el-checkbox>
</el-col>
</el-checkbox-group>
</el-row>
</transition>
<transition
name=
"el-zoom-in-bottom"
>
<el-row
v-show=
"chosenStep==1"
>
<el-row
style=
"margin-bottom:10px;"
>
<el-col
:span=
"10"
style=
"font-size:16px;color:#33B3FF"
>
{{agentName}}
</el-col>
<el-col
:span=
"4"
>
</el-col>
<el-col
:span=
"10"
style=
"font-size:16px;color:#33B3FF"
>
您的分區
</el-col>
</el-row>
<el-row
type=
"flex"
style=
"margin-bottom:10px;"
align=
"middle"
v-for=
"(x,i) in agentChosenArea"
:key=
"i"
>
<el-col
:span=
"10"
style=
"font-size:14px"
>
{{x.AreaName}}
</el-col>
<el-col
:span=
"4"
style=
"color:#ccc;"
>
<i
style=
"font-size:16px;"
class=
"iconfont icon-gengduojiantou"
></i>
</el-col>
<el-col
:span=
"10"
style=
"font-size:12px"
>
<el-select
v-model=
"x.targetId"
filterable
placeholder=
"請選擇"
@
change=
"changeMapping"
>
<el-option
v-for=
"(y,yi) in areaData"
:key=
"yi"
:label=
"y.AreaName"
:value=
"`${y.Id}_${i}`"
>
</el-option>
</el-select>
</el-col>
</el-row>
</el-row>
</transition>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"closeArea()"
>
取消
</button>
<button
class=
"hollowFixedBtn"
@
click=
"goPrevSetup"
v-if=
"chosenStep==1"
>
上一步
</button>
<button
class=
"normalBtn"
@
click=
"sureAgentArea()"
>
{{chosenStep==0?"下一步":"完成"}}
</button>
</div>
</el-dialog>
</div>
</template>
<
script
>
export
default
{
export
default
{
data
()
{
return
{
//是否显示弹窗
outerVisible
:
false
,
//选项卡
activeName
:
'first'
,
activeName
:
"first"
,
//关键字
keywords
:
''
,
keywords
:
""
,
keyWordsArr
:
[],
//关键字数组
PostMsg
:
{
Id
:
0
,
ShowTitle
:
''
,
HotWords
:
''
,
SearchAreaIds
:
''
,
ShowTitle
:
""
,
HotWords
:
""
,
SearchAreaIds
:
""
,
ShowType
:
0
,
TravelagencyList
:
[],
},
...
...
@@ -155,6 +242,14 @@
chooseTAArray
:
[],
//旅行社区域
taAreaArr
:
[],
agentArea
:[],
isLoadingAgentArea
:
false
,
showAgentArea
:
false
,
agentChosenArea
:[],
chosenStep
:
0
,
agentName
:
""
,
isPreOpenSearch
:
false
,
chosenAgentId
:
0
};
},
mounted
()
{
...
...
@@ -165,8 +260,9 @@
//获取配置
getData
()
{
this
.
apipost
(
"ws_get_GetSearchConfig"
,
{},
res
=>
{
"ws_get_GetSearchConfig"
,
{},
(
res
)
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
var
tempData
=
res
.
data
.
data
;
if
(
tempData
)
{
...
...
@@ -185,7 +281,10 @@
if
(
tempData
.
SearchAreaIds
)
{
this
.
PostMsg
.
SearchAreaIds
=
tempData
.
SearchAreaIds
;
}
if
(
tempData
.
SearchAreaIdsList
&&
tempData
.
SearchAreaIdsList
.
length
>
0
)
{
if
(
tempData
.
SearchAreaIdsList
&&
tempData
.
SearchAreaIdsList
.
length
>
0
)
{
this
.
SearchAreaArr
=
tempData
.
SearchAreaIdsList
;
}
if
(
tempData
.
ShowType
)
{
...
...
@@ -195,38 +294,141 @@
this
.
PostMsg
.
TravelagencyList
=
tempData
.
TravelagencyList
;
}
}
this
.
$forceUpdate
()
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
(
err
)
=>
{}
);
},
getCheckStatus
(
id
){
return
this
.
agentChosenArea
.
findIndex
(
x
=>
x
.
Id
==
id
)
!=-
1
},
goPrevSetup
(){
this
.
chosenStep
=
0
},
changeMapping
(
d
){
console
.
log
(
'in.....'
,
d
)
if
(
d
){
let
t
=
d
.
split
(
'_'
)
// this.agentChosenArea[t[1]].targetId=t[0]
this
.
agentChosenArea
[
t
[
1
]].
targetId
=
d
console
.
log
(
this
.
agentChosenArea
[
t
[
1
]].
targetId
)
this
.
$forceUpdate
()
}
//this.agentChosenArea[i].targetId=id
},
sureAgentArea
(){
if
(
this
.
chosenStep
==
0
&&
this
.
agentChosenArea
.
length
>
0
){
this
.
agentChosenArea
.
forEach
(
x
=>
{
x
.
targetId
=
x
.
targetId
?
x
.
targetId
:
''
})
this
.
chosenStep
=
1
}
else
if
(
this
.
chosenStep
==
0
&&
this
.
agentChosenArea
.
length
==
0
){
this
.
Error
(
"請選擇您需要使用的區域"
);
}
else
if
(
this
.
chosenStep
==
1
&&
this
.
agentChosenArea
.
length
>
0
){
let
errorMsg
=
""
let
msg
=
{
SetArea
:[]
};
this
.
agentChosenArea
.
forEach
(
x
=>
{
if
(
x
.
targetId
!=
''
){
msg
.
SetArea
.
push
({
"agentAreaId"
:
x
.
Id
,
"agentAreaName"
:
x
.
AreaName
,
"targetId"
:
x
.
targetId
.
split
(
'_'
)[
0
]
});
}
else
{
errorMsg
=
"請選擇對應分區"
}
})
if
(
errorMsg
==
""
){
msg
.
IsOpenSearch
=
this
.
isPreOpenSearch
?
1
:
0
msg
.
AgencyId
=
this
.
chosenAgentId
msg
.
SetArea
=
JSON
.
stringify
(
msg
.
SetArea
)
this
.
apipost
(
"ws_set_agentarea"
,
msg
,
(
res
)
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
closeArea
()
this
.
getData
()
}
else
{
this
.
Error
(
"設置失敗,請嘗試刷新頁面"
);
}
this
.
isLoadingAgentArea
=
false
});
}
else
{
this
.
Error
(
errorMsg
);
}
}
},
getAgentArea
(
row
)
{
this
.
isLoadingAgentArea
=
true
let
msg
=
{
'agentid'
:
row
.
AgencyId
};
this
.
apipost
(
"ws_get_getagent_areafirstlevel"
,
msg
,
(
res
)
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
agentArea
=
res
.
data
.
data
this
.
agentChosenArea
=
[]
this
.
formatChosenInit
(
row
)
this
.
showAgentArea
=
true
this
.
chosenStep
=
0
this
.
agentName
=
row
.
AgencyName
this
.
chosenAgentId
=
row
.
AgencyId
}
else
{
this
.
Error
(
"加載失敗,請嘗試刷新頁面"
);
}
this
.
isLoadingAgentArea
=
false
});
},
formatChosenInit
(
row
){
if
(
row
.
SetArea
){
try
{
let
area
=
JSON
.
parse
(
row
.
SetArea
)
if
(
area
.
length
>
0
){
this
.
agentChosenArea
=
this
.
agentArea
.
filter
(
x
=>
{
let
t
=
area
.
find
(
n
=>
n
.
agentAreaId
==
x
.
Id
)
if
(
t
){
x
.
targetId
=
t
.
targetId
return
x
}
return
false
})
this
.
agentChosenArea
.
forEach
((
x
,
i
)
=>
{
x
.
targetId
=
x
.
targetId
+
"_"
+
i
})
console
.
log
(
this
.
agentChosenArea
)
}
}
catch
(
error
)
{}
}
},
//保存数据
saveData
()
{
//区域
var
tempSearchAreaIds
=
""
;
if
(
this
.
SearchAreaArr
&&
this
.
SearchAreaArr
.
length
>
0
)
{
this
.
SearchAreaArr
.
forEach
(
item
=>
{
this
.
SearchAreaArr
.
forEach
((
item
)
=>
{
tempSearchAreaIds
+=
item
+
","
;
})
this
.
PostMsg
.
SearchAreaIds
=
tempSearchAreaIds
.
substr
(
0
,
tempSearchAreaIds
.
length
-
1
);
});
this
.
PostMsg
.
SearchAreaIds
=
tempSearchAreaIds
.
substr
(
0
,
tempSearchAreaIds
.
length
-
1
);
}
else
{
this
.
PostMsg
.
SearchAreaIds
=
tempSearchAreaIds
;
}
//热门关键词
var
tempHotWords
=
""
;
if
(
this
.
keyWordsArr
&&
this
.
keyWordsArr
.
length
>
0
)
{
this
.
keyWordsArr
.
forEach
(
item
=>
{
this
.
keyWordsArr
.
forEach
((
item
)
=>
{
tempHotWords
+=
item
+
","
;
})
});
this
.
PostMsg
.
HotWords
=
tempHotWords
.
substr
(
0
,
tempHotWords
.
length
-
1
);
}
else
{
this
.
PostMsg
.
HotWords
=
tempHotWords
;
}
this
.
apipost
(
"ws_post_SetSearchConfig"
,
this
.
PostMsg
,
res
=>
{
"ws_post_SetSearchConfig"
,
this
.
PostMsg
,
(
res
)
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
getData
();
this
.
Success
(
res
.
data
.
message
);
...
...
@@ -234,21 +436,22 @@
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
(
err
)
=>
{}
);
},
//获取地区
getAreaList
()
{
this
.
apipost
(
"ws_get_GetRootArea"
,
{},
res
=>
{
"ws_get_GetRootArea"
,
{},
(
res
)
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
areaData
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
(
err
)
=>
{}
);
},
//关闭标签
...
...
@@ -262,22 +465,31 @@
//返回地区名称
getAreaName
(
areaIds
)
{
var
nameStr
=
""
;
if
(
areaIds
)
{
var
tempArray
=
areaIds
.
split
(
","
);
if
(
tempArray
&&
tempArray
.
length
>
0
)
{
tempArray
.
forEach
(
item
=>
{
var
areaItem
=
this
.
areaData
.
find
(
member
=>
{
return
member
.
Id
==
item
;
});
if
(
areaItem
)
{
nameStr
+=
areaItem
.
AreaName
+
"、"
}
});
}
}
if
(
nameStr
&&
nameStr
.
length
>
0
)
{
nameStr
=
nameStr
.
substr
(
0
,
nameStr
.
length
-
1
)
try
{
var
t
=
JSON
.
parse
(
areaIds
)
if
(
t
&&
t
.
length
>
0
){
t
.
forEach
(
x
=>
{
nameStr
+=
x
.
agentAreaName
+
"、"
;
})
}
}
catch
(
e
){}
// if (areaIds) {
// var tempArray = areaIds.split(",");
// if (tempArray && tempArray.length > 0) {
// tempArray.forEach((item) => {
// var areaItem = this.areaData.find((member) => {
// return member.Id == item;
// });
// if (areaItem) {
// nameStr += areaItem.AreaName + "、";
// }
// });
// }
// }
// if (nameStr && nameStr.length > 0) {
// nameStr = nameStr.substr(0, nameStr.length - 1);
// }
return
nameStr
;
},
//设置旅行区域
...
...
@@ -286,10 +498,10 @@
if
(
type
==
1
)
{
if
(
this
.
chooseTAArray
&&
this
.
chooseTAArray
.
length
>
0
)
{
this
.
outerVisible
=
true
;
this
.
chooseTAArray
.
forEach
(
subItem
=>
{
var
tempArray
=
subItem
.
SetArea
.
split
(
','
);
this
.
chooseTAArray
.
forEach
((
subItem
)
=>
{
var
tempArray
=
subItem
.
SetArea
.
split
(
","
);
if
(
tempArray
&&
tempArray
.
length
>
0
)
{
tempArray
.
forEach
(
sItem
=>
{
tempArray
.
forEach
((
sItem
)
=>
{
//数组里面不存在
if
(
this
.
taAreaArr
.
indexOf
(
Number
(
sItem
))
==
-
1
)
{
this
.
taAreaArr
.
push
(
Number
(
sItem
));
...
...
@@ -304,9 +516,9 @@
this
.
outerVisible
=
true
;
if
(
item
)
{
if
(
item
.
SetArea
)
{
var
tempArray
=
item
.
SetArea
.
split
(
','
);
var
tempArray
=
item
.
SetArea
.
split
(
","
);
if
(
tempArray
&&
tempArray
.
length
>
0
)
{
tempArray
.
forEach
(
sItem
=>
{
tempArray
.
forEach
((
sItem
)
=>
{
this
.
taAreaArr
.
push
(
Number
(
sItem
));
});
}
...
...
@@ -317,20 +529,21 @@
},
//新增关键字
addKeyWords
()
{
if
(
this
.
keywords
!=
''
)
{
if
(
this
.
keywords
!=
""
)
{
this
.
keyWordsArr
.
push
(
this
.
keywords
);
this
.
keywords
=
''
;
this
.
keywords
=
""
;
}
},
//关闭弹窗
closeArea
()
{
this
.
outerVisible
=
false
;
this
.
showAgentArea
=
false
;
},
//选中区域确定
sureTAArea
()
{
var
tempAreaIds
=
""
;
if
(
this
.
taAreaArr
&&
this
.
taAreaArr
.
length
>
0
)
{
this
.
taAreaArr
.
sort
().
forEach
(
item
=>
{
this
.
taAreaArr
.
sort
().
forEach
((
item
)
=>
{
tempAreaIds
+=
item
+
","
;
});
if
(
tempAreaIds
&&
tempAreaIds
.
length
>
0
)
{
...
...
@@ -340,18 +553,18 @@
if
(
this
.
chooseTAArray
&&
this
.
chooseTAArray
.
length
>
0
)
{
var
jsonData
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
chooseTAArray
));
var
that
=
this
;
jsonData
.
forEach
(
item
=>
{
that
.
PostMsg
.
TravelagencyList
.
forEach
(
subItem
=>
{
jsonData
.
forEach
((
item
)
=>
{
that
.
PostMsg
.
TravelagencyList
.
forEach
((
subItem
)
=>
{
if
(
item
.
AgencyId
==
subItem
.
AgencyId
)
{
subItem
.
SetArea
=
tempAreaIds
;
}
})
});
});
this
.
chooseTAArray
=
[];
this
.
taAreaArr
=
[];
}
this
.
outerVisible
=
false
;
}
}
}
},
},
};
</
script
>
\ No newline at end of file
src/components/index.vue
View file @
620b0194
...
...
@@ -4530,7 +4530,7 @@
width: 24px;
height: 24px;
border-radius: 50%;
margin-top: 17px;
margin-top: 17px
!important
;
}
.nav {
...
...
@@ -4556,8 +4556,7 @@
width: 36px;
height: 36px;
-webkit-border-radius: 36px;
margin: 0px 30px 0px 15px;
margin: 0px 30px 0px 15px !important;
}
.nav-left i.iconfont {
...
...
src/components/personalCenter.vue
View file @
620b0194
...
...
@@ -24,7 +24,7 @@
<span
class=
"v"
>
{{
CurrentUserInfo
.
DepartName
}}
</span>
</div>
</div>
<div
class=
"n-info"
v-if=
"CurrentUserInfo.RB_Group_id==2 || EditBtn"
>
<div
class=
"n-info"
>
<!-- v-if="CurrentUserInfo.RB_Group_id==2 || EditBtn" --
>
<div
class=
"item"
@
click=
"changeBoard(0)"
>
<i
class=
"iconfont icon-yichuheimingdan"
></i>
<span
class=
"n-name"
>
个人首页
</span>
...
...
@@ -164,15 +164,16 @@
);
},
goUrlNav
(
url
,
index
,
name
)
{
let
query
=
{
Conditon
:
index
};
query
.
tab
=
name
;
query
.
blank
=
"y"
;
this
.
$router
.
push
({
path
:
url
,
query
});
// let query = {
// Conditon: index
// };
// query.tab = name;
// query.blank = "y";
// this.$router.push({
// path: "/"+url,
// query
// });
window
.
location
.
href
=
`http://
${
window
.
location
.
host
}
/#/
${
url
}
?tab=
${
name
}
&Conditon=
${
index
}
`
}
}
};
...
...
@@ -198,6 +199,11 @@
border
:
1px
solid
#2c2739
;
}
.red-theme
.personal
.u-box
{
background
:
#FBFBFB
;
border
:
none
;
}
.personal
.m-box
{
position
:
absolute
;
left
:
300px
;
...
...
@@ -218,7 +224,18 @@
margin
:
15px
;
display
:
flex
;
}
.red-theme
.personal
.u-box
.h-info-box
{
background
:
#F4F4F4
;
margin
:
0
;
padding
:
20px
15px
;
}
.red-theme
.personal
.u-box
.u-info
{
background
:
none
;
}
.red-theme
.personal
.u-box
.u-info
.item
.k
{
color
:
#787A7D
;
font-family
:
unset
;
}
.personal
.u-box
.h-info-box
.h-info
{
flex
:
1
;
}
...
...
@@ -233,7 +250,15 @@
display
:
block
;
margin-top
:
10px
;
}
.red-theme
.personal
.u-box
.h-info-box
.h-img
{
border
:
1px
dotted
#EB3349
;
}
.red-theme
.personal
.u-box
.h-info-box
.h-info
.k
{
font-family
:
unset
;
}
.red-theme
.personal
.u-box
.h-info-box
.h-info
.v
{
color
:
#121315
;
}
.personal
.u-box
.h-info-box
.h-info
.v
{
color
:
#ddd
;
height
:
20
;
...
...
@@ -302,7 +327,20 @@
margin
:
20px
0
;
background
:
rgba
(
25
,
19
,
62
,
0.56
);
}
.red-theme
.personal
.u-box
.n-info
{
background
:
#F4F4F4
;
}
.red-theme
.personal
.u-box
.n-info
.item
:hover
{
background
:
#eaeaea
;
}
.red-theme
.personal
.u-box
.n-info
.item
:hover
*
:not
(
.tips
)
{
color
:
#33B3FF
;
}
.red-theme
.personal
.u-box
.n-info
.item
.n-name
{
color
:
#333
;
font-family
:
unset
;
}
.personal
.u-box
.n-info
.item
{
align-items
:
center
;
display
:
flex
;
...
...
@@ -384,7 +422,12 @@
border-left
:
3px
solid
#8a8894
;
border-bottom
:
3px
solid
#8a8894
;
}
.red-theme
.personal
.left-point-samll
::before
,
.red-theme
.personal
.left-point-samll
::after
,
.red-theme
.personal
.right-point-samll
::before
,
.red-theme
.personal
.right-point-samll
::after
{
border-color
:
#EB3349
;
}
.personal
.right-point
::after
{
position
:
absolute
;
width
:
9px
;
...
...
src/components/work/mywork.vue
View file @
620b0194
...
...
@@ -461,7 +461,7 @@ export default {
addData
()
{
this
.
addMsg
.
BeginTime
=
this
.
addMsg
.
TimeRanges
[
0
];
this
.
addMsg
.
EndTime
=
this
.
addMsg
.
TimeRanges
[
1
];
if
(
this
.
addMsg
.
BeginTime
!=
this
.
addMsg
.
EndTime
)
{
if
(
this
.
addMsg
.
BeginTime
.
split
(
' '
)[
0
]
!=
this
.
addMsg
.
EndTime
.
split
(
' '
)[
0
]
)
{
this
.
$message
.
error
(
"只能添加当日工作计划,不能跨天计划"
);
}
else
{
this
.
addMsg
.
Tags
=
...
...
src/plug/index.js
View file @
620b0194
...
...
@@ -115,7 +115,7 @@ export default {
Vue
.
prototype
.
domainManager
=
function
()
{
let
domainUrl
=
''
;
//domainUrl = "http://reborn.oytour.com";
domainUrl
=
"http://
127.0.0.1:8082
"
;
domainUrl
=
"http://
localhost:13491
"
;
let
locationName
=
window
.
location
.
hostname
;
...
...
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