Skip to content

S
SuperMan
Commit 0805450c authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

解决冲突

parents 99643a58 8d4c274b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1043 additions and 881 deletions
index.html
View file @ 0805450c
......@@ -12,8 +12,7 @@
<!-- <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script> -->
<script type="text/javascript" src="static/MarkerClusterer.js"></script>
<script type="text/javascript" src="static/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyBx6JAiyAFPwBN1nM-g_hpQ7lvdPY3n2oU&language=zh-CN"></script>
<title>四川和平国际旅行社</title>
</head>
<body>
......
src/assets/utils/googleMap.js
View file @ 0805450c
/**
* Created by Administrator on 2018/7/17.
*/
......@@ -35,8 +34,7 @@ var googleMap = {
googleMap.initMap();
if (googleMap.defaultAddress == "") {
googleMap.initMapFirst();
}
else {
} else {
googleMap.searchAddress();
}
googleMap.callback = callback;
......@@ -57,7 +55,8 @@ var googleMap = {
var LatLng = new google.maps.LatLng(data[0].lat, data[0].lng);
if (data.length > 0) {
googleMap.map = new google.maps.Map(googleMap.map_id, {
zoom: 14, center: LatLng
zoom: 14,
center: LatLng
});
}
}
......@@ -90,9 +89,17 @@ var googleMap = {
if (googleMap.marker) {
googleMap.marker.setMap(null);
}
var imageUrl = googleMap.imageDomain + "/static/img/position_red.png";
var imageUrl = {};
if (isCallBack == 1) {
imageUrl = googleMap.imageDomain + "/static/img/position_blue.png";
imageUrl = {
url: googleMap.imageDomain + "/static/location_01.png", // image is 512 x 512
scaledSize: new google.maps.Size(30, 40),
}
} else {
imageUrl = {
url: googleMap.imageDomain + "/static/location_01.png", // image is 512 x 512
scaledSize: new google.maps.Size(30, 40),
}
}
googleMap.marker = new google.maps.Marker({
title: address,
......@@ -129,16 +136,20 @@ var googleMap = {
},
searchAddress: function () {
var address = googleMap.search_id.value;
googleMap.geocoder.geocode({ 'address': address }, function (results, status) {
googleMap.geocoder.geocode({
'address': address
}, function (results, status) {
if (status == google.maps.GeocoderStatus.OK) {
googleMap.getAddress(results,1);
googleMap.getAddress(results, 1);
}
});
},
placeMarker: function (location) {
//地图的点击事件，根据点击的点获取经度，纬度和地址信息
if (googleMap.geocoder) {
googleMap.geocoder.geocode({ 'location': location }, function (results, status) {
googleMap.geocoder.geocode({
'location': location
}, function (results, status) {
if (status == google.maps.GeocoderStatus.OK) {
googleMap.getAddress(results, 1);
}
......@@ -178,7 +189,10 @@ var googleMap = {
let _dataList = JSON.parse(JSON.stringify(dataList));
let lat = parseFloat(_dataList[0].lat);
let lng = parseFloat(_dataList[0].lng);
let center = {lng: lng, lat: lat}
let center = {
lng: lng,
lat: lat
}
//创建地图实例，zoom是缩放比例
_this.map = new google.maps.Map(document.getElementById('map_canvas'), {
zoom: 7,
......@@ -188,18 +202,18 @@ var googleMap = {
_this.directionsDisplay.setMap(_this.map);
googleMap.calcRoute(_dataList, _this)
},
calcRoute: function(_dataList, _this) { // 创建路径规划
calcRoute: function (_dataList, _this) { // 创建路径规划
// 分解数据 获得起 止 以及中间数据
let lat = parseFloat(_dataList[0].lat);
let lng = parseFloat(_dataList[0].lng);
let elat = parseFloat(_dataList[_dataList.length-1].lat);
let elng = parseFloat(_dataList[_dataList.length-1].lng);
let elat = parseFloat(_dataList[_dataList.length - 1].lat);
let elng = parseFloat(_dataList[_dataList.length - 1].lng);
let start = lat + ',' + lng;
let end = elat + ',' + elng;
let waypoints = [];
if (_dataList.length > 2) {
_dataList.forEach((x, index) => {
if (index >= 1 && index !== (_dataList.length-1)) {
if (index >= 1 && index !== (_dataList.length - 1)) {
let obj = {
location: x.lat + ',' + x.lng
};
......@@ -208,8 +222,8 @@ var googleMap = {
});
}
let request = { // 组装连线数据
origin:start, // 起
destination:end, // 止
origin: start, // 起
destination: end, // 止
travelMode: google.maps.TravelMode.DRIVING,
// waypoints: [{location:"30.5226477,104.05806469999993"},{location:"30.67416759999999,104.04721970000003"}] // 中间点数据
};
......@@ -217,7 +231,7 @@ var googleMap = {
request.waypoints = waypoints
}
_this.directionsService.route(request, function(result, status) {
_this.directionsService.route(request, function (result, status) {
if (status == google.maps.DirectionsStatus.OK) {
_this.directionsDisplay.setDirections(result);
}
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 0805450c
......@@ -273,7 +273,6 @@
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj;
this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
console.log("this.Handmsg",this.Handmsg)
this.Financial_post_GetList();
},components: {
"my-FlowChartModule": myFlowChartModule
......
src/components/FinancialModule/accountingWork.vue
View file @ 0805450c
......@@ -316,7 +316,6 @@ export default {
},methods:{
getSingleList(){ // 获取费用类型
this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{
console.log("1231",res);
if(res.data.resultCode==1){
this.SingleList=res.data.data;
}else{}
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 0805450c
......@@ -1099,7 +1099,6 @@ export default {
this.msg.OrderTradeWay=this.tradeWay;
this.msg.PlatformAccountId=this.platformAccount;
this.loading = true;
console.log("this.msg",this.msg)
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
......
src/components/Hotel/HotelInfo.vue
View file @ 0805450c
......@@ -73,24 +73,28 @@
</el-select>
</span>
</div>
<span class="resource-lititle sheshi">{{$t('ground.jiudianyouhui')}} <el-button icon="el-icon-plus" circle @click="addAir"></el-button>
<span class="resource-lititle sheshi">{{$t('ground.jiudianyouhui')}} <el-button icon="el-icon-plus" circle
@click="addAir"></el-button>
</span>
<div class="jiudianyouhuiDiv">
<el-row v-for="(list,index) in addMsg.DiscountList" :key="index">
<el-col :span="6" :gutter="35">
<el-form-item :label="$t('ground.kaishishuliang')">
<el-input class='w80' type="text" v-model="list.StartNum" @keyup.native="checkInteger(list,'StartNum')" maxlength="2"></el-input>
<el-input class='w80' type="text" v-model="list.StartNum"
@keyup.native="checkInteger(list,'StartNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item :label="$t('ground.jieshushuliang')">
<el-input class='w80' type="text" v-model="list.EndNum" @keyup.native="checkInteger(list,'EndNum')" maxlength="2"></el-input>
<el-input class='w80' type="text" v-model="list.EndNum" @keyup.native="checkInteger(list,'EndNum')"
maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item :label="$t('ground.fanhuanshuliang')">
<el-input class='w80' type="text" v-model="list.DisCountNum" @keyup.native="checkInteger(list,'DisCountNum')" maxlength="2"></el-input>
<el-input class='w80' type="text" v-model="list.DisCountNum"
@keyup.native="checkInteger(list,'DisCountNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35" v-if="index==0">
......@@ -125,8 +129,8 @@
class="w300"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_country')">
<el-select :placeholder="$t('visaT.qxzguojia')" filterable v-model="addMsg.Country" class='multiple_input w300'
@change="GetSubAreaList(addMsg.Country,1)">
<el-select :placeholder="$t('visaT.qxzguojia')" filterable v-model="addMsg.Country"
class='multiple_input w300' @change="GetSubAreaList(addMsg.Country,1)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
......@@ -134,8 +138,8 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_province')">
<el-select :placeholder="$t('ground.qingxuanzesheng')" filterable class='multiple_input w300' v-model="addMsg.Province"
@change="GetSubAreaList(addMsg.Province,2)">
<el-select :placeholder="$t('ground.qingxuanzesheng')" filterable class='multiple_input w300'
v-model="addMsg.Province" @change="GetSubAreaList(addMsg.Province,2)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in ProvinceList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
......@@ -143,7 +147,8 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_city')">
<el-select :placeholder="$t('ground.qingxuanzeshi')" filterable class='multiple_input w300' v-model="addMsg.City">
<el-select :placeholder="$t('ground.qingxuanzeshi')" filterable class='multiple_input w300'
v-model="addMsg.City">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
......@@ -155,6 +160,19 @@
<el-button slot="append" @click="selectAddress = true" icon="iconfont icon-img_dw"></el-button>
</el-input>
</el-form-item>
<div class="toolOne">
<span class="fanbili">地理位置</span>
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
<div class="leftPnum">经度</div>
<input type="text" class="toolInput inpuOne" v-model="addMsg.Lng" maxlength="20">
</div>
<div class="RebateCount reTwo">
<div class="fanNum">纬度</div>
<input type="text" class="toolInput inpuTwo" v-model="addMsg.Lat" maxlength="20">
</div>
</div>
</div>
<el-form-item :label="$t('hotel.hotel_fax')">
<el-input type="text" v-model="addMsg.Fax" maxlength="20" class="w300"></el-input>
</el-form-item>
......@@ -169,8 +187,8 @@
<el-input type="textarea" v-model="addMsg.WarmTip" class="w300"></el-input>
</el-form-item>
<el-form-item>
<el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949" :active-text="$t('hotel.hotel_Supplier')"
:inactive-text="$t('ground.ziding')"></el-switch>
<el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949"
:active-text="$t('hotel.hotel_Supplier')" :inactive-text="$t('ground.ziding')"></el-switch>
</el-form-item>
<el-form-item>
<el-switch v-model="isDinner" active-color="#13ce66" @change="getDinnerList" inactive-color="#ff4949"
......@@ -187,13 +205,16 @@
<el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item :label="$t('ground.tingchefei')" v-if="addMsg.IsHavearking==1">
<el-input type="text" v-model="addMsg.ParkFee" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'ParkFee')"></el-input>
<el-input type="text" v-model="addMsg.ParkFee" class="w300" maxlength="10"
@keyup.native="checkPrice(addMsg,'ParkFee')"></el-input>
</el-form-item>
<el-form-item :label="$t('ground.rutangshui')">
<el-input type="text" v-model="addMsg.InTangTax" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'InTangTax')"></el-input>
<el-input type="text" v-model="addMsg.InTangTax" class="w300" maxlength="10"
@keyup.native="checkPrice(addMsg,'InTangTax')"></el-input>
</el-form-item>
<el-form-item :label="$t('ground.chengshishui')">
<el-input type="text" v-model="addMsg.CityTax" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'CityTax')"></el-input>
<el-input type="text" v-model="addMsg.CityTax" class="w300" maxlength="10"
@keyup.native="checkPrice(addMsg,'CityTax')"></el-input>
</el-form-item>
<el-form-item :label="$t('ground.fanyongleixing')">
<el-select v-model="addMsg.RebateType" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
......
src/components/administrative/XaddFinancialProcess.vue
View file @ 0805450c
......@@ -1476,7 +1476,6 @@ export default {
addNode(){ // 添加节点
let AuditList = {};
let type = this.approvalType
console.log("this.approvalType",this.approvalType)
if(this.AuditDescription==''){
return this.$message.error(this.$t('tips.qtxjdmiaoshu'))
}
......@@ -1648,7 +1647,6 @@ export default {
AuditList.SpecialNode = this.GetNodeValue;
this.myAuditList.push(AuditList);
}
console.log("this.myAuditList",this.myAuditList)
this.closeLayer()
},
clearValue(t){ // 选择会计出纳窗口获取对应下拉
......
src/plug/index.js
View file @ 0805450c
......@@ -113,6 +113,7 @@ export default {
let domainUrl = '';
// domainUrl = "http://192.168.2.66:8025";
domainUrl = "http://192.168.2.17:8083";
domainUrl = "http://192.168.2.214:8082";
let locationName = window.location.hostname;
let javaUrldo="";
......@@ -144,9 +145,9 @@ export default {
//SocketUrl
WebSocketUrl: "ws://192.168.1.110:8080?account=",
//google地图Url
GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN",
GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyBx6JAiyAFPwBN1nM-g_hpQ7lvdPY3n2oU&sensor=false&language=zh-CN",
//google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com",
GoogleMapImageUrl: "http://imgfile.oytour.com",
//上传站点
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
//文件站点
......
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