Skip to content

S
SuperMan
Commit 620b0194 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 6e6dd507 3e1a9772
Hide whitespace changes
Inline Side-by-side
Showing with 521 additions and 262 deletions
src/App.vue
View file @ 620b0194
...@@ -179,7 +179,7 @@ export default { ...@@ -179,7 +179,7 @@ export default {
} }
</script> </script>
<style> <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/Semibold.css";
@import "./assets/css/global/config.css"; @import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css"; @import "./assets/css/fileIcon.css";
......
src/assets/css/Details.css
View file @ 620b0194
...@@ -74,6 +74,10 @@ ...@@ -74,6 +74,10 @@
.secondMenu .el-submenu__title i { .secondMenu .el-submenu__title i {
color: #a3ace0; color: #a3ace0;
font-size: 18px; font-size: 18px;
margin-left: 16px;
margin-right: 16px;
min-width: 18px;
display: inline-block;
} }
.el-menu--vertical .thridMenu { .el-menu--vertical .thridMenu {
......
src/components/Login2019.vue
View file @ 620b0194
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
this.userInfo.name = "paulwu1657@gmail.com"; this.userInfo.name = "paulwu1657@gmail.com";
this.userInfo.password = "123456"; this.userInfo.password = "123456";
} }
this.userInfo.Domain = 'ys.oytour.com'//window.location.hostname this.userInfo.Domain = window.location.hostname
}, },
doLogin() { doLogin() {
if (this.userInfo.name == "") { if (this.userInfo.name == "") {
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
}); });
}, },
getGroup() { //获取集团 getGroup() { //获取集团
let Domain = 'ys.oytour.com'///window.location.hostname let Domain = window.location.hostname
this.apipost('admin_get_GetModelByDomain', { this.apipost('admin_get_GetModelByDomain', {
'Domain': Domain 'Domain': Domain
}, res => { }, res => {
......
src/components/WebSet/WebSiteSearch.vue
View file @ 620b0194
<style> <style>
.webSiteBg { .webSiteBg {
padding: 20px; padding: 20px;
background-color: #fff; background-color: #fff;
} height: 100%;
}
.WebSiteSearch .el-tabs__content {
height: calc(100% - 55px);
}
</style> </style>
<template> <template>
<!--网站设定(网站设置)--> <!--网站设定(网站设置)-->
<div class="WebSiteSearch"> <div class="WebSiteSearch" style="height:100%">
<el-form :model="PostMsg" ref="PostMsg" label-width="130px"> <el-form :model="PostMsg" ref="PostMsg" label-width="130px" style="height:100%">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName" style="height:100%;">
<el-tab-pane label="基本設定" name="first"> <el-tab-pane label="基本設定" name="first">
<div class="webSiteBg"> <div class="webSiteBg">
<el-row> <el-row>
...@@ -31,10 +34,14 @@ ...@@ -31,10 +34,14 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item> <el-form-item>
<el-tag v-for="(tag,index) in keyWordsArr" :key="tag" closable :type="tag" @close="closeTag(index)" <el-tag
style="margin-right:10px;"> v-for="(tag,index) in keyWordsArr"
{{tag}} :key="tag"
</el-tag> closable
:type="tag"
@close="closeTag(index)"
style="margin-right:10px;"
>{{tag}}</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -51,45 +58,69 @@ ...@@ -51,45 +58,69 @@
<div class="webSiteBg"> <div class="webSiteBg">
<el-row> <el-row>
<el-checkbox-group v-model="SearchAreaArr"> <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-checkbox :label="item.Id" :key="item.AreaName">{{item.AreaName}}</el-checkbox>
</el-col> </el-col>
</el-checkbox-group> </el-checkbox-group>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <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-col>
</el-row> </el-row>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="供應商旅行社" name="third"> <el-tab-pane label="供應商旅行社" name="third" style="height:100%">
<div class="webSiteBg"> <div class="webSiteBg">
<el-button :disabled="chooseTAArray.length>0?false:true" @click="setTravelagencyArea(1)" style="padding-bottom:10px;">批次設定區域</el-button> <!-- <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%" <el-table
@selection-change="handleSelectionChange" height="550"> v-loading="isLoadingAgentArea"
<el-table-column type="selection" width="100px"> ref="multipleTable"
</el-table-column> :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"> <el-table-column prop="IsOpenSearch" label="開放搜尋" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.IsOpenSearch" :active-value="1" :inactive-value="0" <el-switch
active-color="#13ce66" inactive-color="#dcdfe6"></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> </template>
</el-table-column> </el-table-column>
<el-table-column prop="AgencyName" label="旅行社" width="300px"> <el-table-column prop="AgencyName" label="旅行社" width="300px"></el-table-column>
</el-table-column>
<el-table-column label="設定區域" width="200px"> <el-table-column label="設定區域" width="200px">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column prop="SetArea" label="開放區域"> <el-table-column prop="SetArea" label="開放區域">
<template slot-scope="scope"> <template slot-scope="scope">{{getAreaName(scope.row.SetArea)}}</template>
{{getAreaName(scope.row.SetArea)}}
</template>
</el-table-column> </el-table-column>
</el-table> </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> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="搜尋結果頁面" name="fourth"> <el-tab-pane label="搜尋結果頁面" name="fourth">
...@@ -103,7 +134,12 @@ ...@@ -103,7 +134,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<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-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -114,7 +150,12 @@ ...@@ -114,7 +150,12 @@
<el-dialog custom-class="w450" title="設定區域" :visible.sync="outerVisible" center> <el-dialog custom-class="w450" title="設定區域" :visible.sync="outerVisible" center>
<el-row> <el-row>
<el-checkbox-group v-model="taAreaArr"> <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-checkbox :label="item.Id" :key="item.AreaName">{{item.AreaName}}</el-checkbox>
</el-col> </el-col>
</el-checkbox-group> </el-checkbox-group>
...@@ -124,234 +165,406 @@ ...@@ -124,234 +165,406 @@
<button class="normalBtn" @click="sureTAArea()">确定</button> <button class="normalBtn" @click="sureTAArea()">确定</button>
</div> </div>
</el-dialog> </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">&nbsp;</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> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
//是否显示弹窗 //是否显示弹窗
outerVisible: false, outerVisible: false,
//选项卡 //选项卡
activeName: 'first', activeName: "first",
//关键字 //关键字
keywords: '', keywords: "",
keyWordsArr: [], //关键字数组 keyWordsArr: [], //关键字数组
PostMsg: { PostMsg: {
Id: 0, Id: 0,
ShowTitle: '', ShowTitle: "",
HotWords: '', HotWords: "",
SearchAreaIds: '', SearchAreaIds: "",
ShowType: 0, ShowType: 0,
TravelagencyList: [], TravelagencyList: [],
},
//地区数据
areaData: [],
//总数据
dataList: [],
//选中的地区
SearchAreaArr: [],
//选中的旅行社
chooseTAArray: [],
//旅行社区域
taAreaArr: [],
agentArea:[],
isLoadingAgentArea:false,
showAgentArea:false,
agentChosenArea:[],
chosenStep:0,
agentName:"",
isPreOpenSearch:false,
chosenAgentId:0
};
},
mounted() {
this.getData();
this.getAreaList();
},
methods: {
//获取配置
getData() {
this.apipost(
"ws_get_GetSearchConfig",
{},
(res) => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
if (tempData) {
if (tempData.Id) {
this.PostMsg.Id = tempData.Id;
}
if (tempData.ShowTitle) {
this.PostMsg.ShowTitle = tempData.ShowTitle;
}
if (tempData.HotWords) {
this.PostMsg.HotWords = tempData.HotWords;
}
if (tempData.HotWordsList && tempData.HotWordsList.length > 0) {
this.keyWordsArr = tempData.HotWordsList;
}
if (tempData.SearchAreaIds) {
this.PostMsg.SearchAreaIds = tempData.SearchAreaIds;
}
if (
tempData.SearchAreaIdsList &&
tempData.SearchAreaIdsList.length > 0
) {
this.SearchAreaArr = tempData.SearchAreaIdsList;
}
if (tempData.ShowType) {
this.PostMsg.ShowType = tempData.ShowType;
}
if (tempData.TravelagencyList) {
this.PostMsg.TravelagencyList = tempData.TravelagencyList;
}
}
this.$forceUpdate()
} else {
this.Error(res.data.message);
}
}, },
//地区数据 (err) => {}
areaData: [], );
//总数据
dataList: [],
//选中的地区
SearchAreaArr: [],
//选中的旅行社
chooseTAArray: [],
//旅行社区域
taAreaArr: [],
};
}, },
mounted() { getCheckStatus(id){
this.getData(); return this.agentChosenArea.findIndex(x=>x.Id==id)!=-1
this.getAreaList();
}, },
methods: { goPrevSetup(){
//获取配置 this.chosenStep=0
getData() { },
this.apipost( changeMapping(d){
"ws_get_GetSearchConfig", {}, console.log('in.....',d)
res => { if(d){
if (res.data.resultCode == 1) { let t=d.split('_')
var tempData = res.data.data; // this.agentChosenArea[t[1]].targetId=t[0]
if (tempData) { this.agentChosenArea[t[1]].targetId=d
if (tempData.Id) { console.log(this.agentChosenArea[t[1]].targetId)
this.PostMsg.Id = tempData.Id; this.$forceUpdate()
} }
if (tempData.ShowTitle) { //this.agentChosenArea[i].targetId=id
this.PostMsg.ShowTitle = tempData.ShowTitle; },
} sureAgentArea(){
if (tempData.HotWords) { if(this.chosenStep==0 && this.agentChosenArea.length>0){
this.PostMsg.HotWords = tempData.HotWords; this.agentChosenArea.forEach(x=>{
} x.targetId=x.targetId?x.targetId:''
if (tempData.HotWordsList && tempData.HotWordsList.length > 0) { })
this.keyWordsArr = tempData.HotWordsList; this.chosenStep=1
} } else if(this.chosenStep==0 && this.agentChosenArea.length==0){
if (tempData.SearchAreaIds) { this.Error("請選擇您需要使用的區域");
this.PostMsg.SearchAreaIds = tempData.SearchAreaIds; } else if(this.chosenStep==1 && this.agentChosenArea.length>0){
} let errorMsg=""
if (tempData.SearchAreaIdsList && tempData.SearchAreaIdsList.length > 0) { let msg={
this.SearchAreaArr = tempData.SearchAreaIdsList; SetArea:[]
} };
if (tempData.ShowType) { this.agentChosenArea.forEach(x=>{
this.PostMsg.ShowType = tempData.ShowType; if(x.targetId!=''){
} msg.SetArea.push({
if (tempData.TravelagencyList) { "agentAreaId":x.Id,
this.PostMsg.TravelagencyList = tempData.TravelagencyList; "agentAreaName":x.AreaName,
} "targetId":x.targetId.split('_')[0]
}
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//保存数据
saveData() {
//区域
var tempSearchAreaIds = "";
if (this.SearchAreaArr && this.SearchAreaArr.length > 0) {
this.SearchAreaArr.forEach(item => {
tempSearchAreaIds += item + ",";
})
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 => {
tempHotWords += item + ",";
})
this.PostMsg.HotWords = tempHotWords.substr(0, tempHotWords.length - 1);
} else {
this.PostMsg.HotWords = tempHotWords;
}
this.apipost(
"ws_post_SetSearchConfig", this.PostMsg,
res => {
if (res.data.resultCode == 1) {
this.getData();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//获取地区
getAreaList() {
this.apipost(
"ws_get_GetRootArea", {},
res => {
if (res.data.resultCode == 1) {
this.areaData = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//关闭标签
closeTag(index) {
this.keyWordsArr.splice(index, 1);
},
//多选
handleSelectionChange(val) {
this.chooseTAArray = JSON.parse(JSON.stringify(val));
},
//返回地区名称
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 + "、"
}
}); });
}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);
} }
if (nameStr && nameStr.length > 0) { }
nameStr = nameStr.substr(0, nameStr.length - 1) },
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("加載失敗，請嘗試刷新頁面");
} }
return nameStr; this.isLoadingAgentArea=false
}, });
//设置旅行区域 },
setTravelagencyArea(type, item) { formatChosenInit(row){
this.taAreaArr = []; if(row.SetArea){
if (type == 1) { try {
if (this.chooseTAArray && this.chooseTAArray.length > 0) { let area=JSON.parse(row.SetArea)
this.outerVisible = true; if(area.length>0){
this.chooseTAArray.forEach(subItem => { this.agentChosenArea=this.agentArea.filter(x=>{
var tempArray = subItem.SetArea.split(','); let t=area.find(n=>n.agentAreaId==x.Id)
if (tempArray && tempArray.length > 0) { if(t){
tempArray.forEach(sItem => { x.targetId=t.targetId
//数组里面不存在 return x
if (this.taAreaArr.indexOf(Number(sItem)) == -1) {
this.taAreaArr.push(Number(sItem));
}
});
} }
}); 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) => {
tempSearchAreaIds += item + ",";
});
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) => {
tempHotWords += item + ",";
});
this.PostMsg.HotWords = tempHotWords.substr(0, tempHotWords.length - 1);
} else {
this.PostMsg.HotWords = tempHotWords;
}
this.apipost(
"ws_post_SetSearchConfig",
this.PostMsg,
(res) => {
if (res.data.resultCode == 1) {
this.getData();
this.Success(res.data.message);
} else { } else {
this.Info("请选择要设置的旅行社!"); this.Error(res.data.message);
} }
} else { },
(err) => {}
);
},
//获取地区
getAreaList() {
this.apipost(
"ws_get_GetRootArea",
{},
(res) => {
if (res.data.resultCode == 1) {
this.areaData = res.data.data;
} else {
this.Error(res.data.message);
}
},
(err) => {}
);
},
//关闭标签
closeTag(index) {
this.keyWordsArr.splice(index, 1);
},
//多选
handleSelectionChange(val) {
this.chooseTAArray = JSON.parse(JSON.stringify(val));
},
//返回地区名称
getAreaName(areaIds) {
var nameStr = "";
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;
},
//设置旅行区域
setTravelagencyArea(type, item) {
this.taAreaArr = [];
if (type == 1) {
if (this.chooseTAArray && this.chooseTAArray.length > 0) {
this.outerVisible = true; this.outerVisible = true;
if (item) { this.chooseTAArray.forEach((subItem) => {
if (item.SetArea) { var tempArray = subItem.SetArea.split(",");
var tempArray = item.SetArea.split(','); if (tempArray && tempArray.length > 0) {
if (tempArray && tempArray.length > 0) { tempArray.forEach((sItem) => {
tempArray.forEach(sItem => { //数组里面不存在
if (this.taAreaArr.indexOf(Number(sItem)) == -1) {
this.taAreaArr.push(Number(sItem)); this.taAreaArr.push(Number(sItem));
}); }
} });
} }
this.chooseTAArray.push(item);
}
}
},
//新增关键字
addKeyWords() {
if (this.keywords != '') {
this.keyWordsArr.push(this.keywords);
this.keywords = '';
}
},
//关闭弹窗
closeArea() {
this.outerVisible = false;
},
//选中区域确定
sureTAArea() {
var tempAreaIds = "";
if (this.taAreaArr && this.taAreaArr.length > 0) {
this.taAreaArr.sort().forEach(item => {
tempAreaIds += item + ",";
}); });
if (tempAreaIds && tempAreaIds.length > 0) { } else {
tempAreaIds = tempAreaIds.substr(0, tempAreaIds.length - 1); this.Info("请选择要设置的旅行社!");
}
} else {
this.outerVisible = true;
if (item) {
if (item.SetArea) {
var tempArray = item.SetArea.split(",");
if (tempArray && tempArray.length > 0) {
tempArray.forEach((sItem) => {
this.taAreaArr.push(Number(sItem));
});
}
} }
this.chooseTAArray.push(item);
} }
if (this.chooseTAArray && this.chooseTAArray.length > 0) { }
var jsonData = JSON.parse(JSON.stringify(this.chooseTAArray)); },
var that = this; //新增关键字
jsonData.forEach(item => { addKeyWords() {
that.PostMsg.TravelagencyList.forEach(subItem => { if (this.keywords != "") {
if (item.AgencyId == subItem.AgencyId) { this.keyWordsArr.push(this.keywords);
subItem.SetArea = tempAreaIds; this.keywords = "";
} }
}) },
}); //关闭弹窗
this.chooseTAArray = []; closeArea() {
this.taAreaArr = []; this.outerVisible = false;
this.showAgentArea=false;
},
//选中区域确定
sureTAArea() {
var tempAreaIds = "";
if (this.taAreaArr && this.taAreaArr.length > 0) {
this.taAreaArr.sort().forEach((item) => {
tempAreaIds += item + ",";
});
if (tempAreaIds && tempAreaIds.length > 0) {
tempAreaIds = tempAreaIds.substr(0, tempAreaIds.length - 1);
} }
this.outerVisible = false;
} }
} 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) => {
if (item.AgencyId == subItem.AgencyId) {
subItem.SetArea = tempAreaIds;
}
});
});
this.chooseTAArray = [];
this.taAreaArr = [];
}
this.outerVisible = false;
},
},
};
</script> </script>
\ No newline at end of file
src/components/index.vue
View file @ 620b0194
...@@ -4530,7 +4530,7 @@ ...@@ -4530,7 +4530,7 @@
width: 24px; width: 24px;
height: 24px; height: 24px;
border-radius: 50%; border-radius: 50%;
margin-top: 17px; margin-top: 17px !important;
} }
.nav { .nav {
...@@ -4556,8 +4556,7 @@ ...@@ -4556,8 +4556,7 @@
width: 36px; width: 36px;
height: 36px; height: 36px;
-webkit-border-radius: 36px; -webkit-border-radius: 36px;
margin: 0px 30px 0px 15px; margin: 0px 30px 0px 15px !important;
} }
.nav-left i.iconfont { .nav-left i.iconfont {
......
src/components/personalCenter.vue
View file @ 620b0194
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<span class="v">{{CurrentUserInfo.DepartName}}</span> <span class="v">{{CurrentUserInfo.DepartName}}</span>
</div> </div>
</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)"> <div class="item" @click="changeBoard(0)">
<i class="iconfont icon-yichuheimingdan"></i> <i class="iconfont icon-yichuheimingdan"></i>
<span class="n-name">个人首页</span> <span class="n-name">个人首页</span>
...@@ -164,15 +164,16 @@ ...@@ -164,15 +164,16 @@
); );
}, },
goUrlNav(url, index, name) { goUrlNav(url, index, name) {
let query = { // let query = {
Conditon: index // Conditon: index
}; // };
query.tab = name; // query.tab = name;
query.blank = "y"; // query.blank = "y";
this.$router.push({ // this.$router.push({
path: url, // path: "/"+url,
query // query
}); // });
window.location.href=`http://${window.location.host}/#/${url}?tab=${name}&Conditon=${index}`
} }
} }
}; };
...@@ -198,6 +199,11 @@ ...@@ -198,6 +199,11 @@
border: 1px solid #2c2739; border: 1px solid #2c2739;
} }
.red-theme .personal .u-box{
background: #FBFBFB;
border: none;
}
.personal .m-box { .personal .m-box {
position: absolute; position: absolute;
left: 300px; left: 300px;
...@@ -218,7 +224,18 @@ ...@@ -218,7 +224,18 @@
margin: 15px; margin: 15px;
display: flex; 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 { .personal .u-box .h-info-box .h-info {
flex: 1; flex: 1;
} }
...@@ -233,7 +250,15 @@ ...@@ -233,7 +250,15 @@
display: block; display: block;
margin-top: 10px; 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 { .personal .u-box .h-info-box .h-info .v {
color: #ddd; color: #ddd;
height: 20; height: 20;
...@@ -302,7 +327,20 @@ ...@@ -302,7 +327,20 @@
margin: 20px 0; margin: 20px 0;
background: rgba(25, 19, 62, 0.56); 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 { .personal .u-box .n-info .item {
align-items: center; align-items: center;
display: flex; display: flex;
...@@ -384,7 +422,12 @@ ...@@ -384,7 +422,12 @@
border-left: 3px solid #8a8894; border-left: 3px solid #8a8894;
border-bottom: 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 { .personal .right-point::after {
position: absolute; position: absolute;
width: 9px; width: 9px;
......
src/components/work/mywork.vue
View file @ 620b0194
...@@ -461,7 +461,7 @@ export default { ...@@ -461,7 +461,7 @@ export default {
addData() { addData() {
this.addMsg.BeginTime = this.addMsg.TimeRanges[0]; this.addMsg.BeginTime = this.addMsg.TimeRanges[0];
this.addMsg.EndTime = this.addMsg.TimeRanges[1]; 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("只能添加当日工作计划，不能跨天计划"); this.$message.error("只能添加当日工作计划，不能跨天计划");
} else { } else {
this.addMsg.Tags = this.addMsg.Tags =
......
src/plug/index.js
View file @ 620b0194
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
Vue.prototype.domainManager = function() { Vue.prototype.domainManager = function() {
let domainUrl = ''; let domainUrl = '';
//domainUrl = "http://reborn.oytour.com"; //domainUrl = "http://reborn.oytour.com";
domainUrl = "http://127.0.0.1:8082"; domainUrl = "http://localhost:13491";
let locationName = window.location.hostname; let locationName = window.location.hostname;
......
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