Skip to content

S
SuperMan
Commit 43e8d373 authored by 王悦's avatar 王悦
Browse files
Options

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

parents 844f5f43 f09d453b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1261 additions and 225 deletions
package.json
View file @ 43e8d373
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"start": "npm run dev", "start": "npm run dev",
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",
"serve" : "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",
"build": "node --max-old-space-size=4096 build/build.js" "build": "node --max-old-space-size=4096 build/build.js"
}, },
"dependencies": { "dependencies": {
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ 43e8d373
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
} }
.page_addCapitalAllocation ._conten ul li._inList textarea,.page_addCapitalAllocation ._conten ul li._outList textarea{ .page_addCapitalAllocation ._conten ul li._inList textarea,.page_addCapitalAllocation ._conten ul li._outList textarea{
border: none; border: none;
border-bottom: 1px solid #666666; /* border-bottom: 1px solid #666666; */
min-height: 300px; min-height: 300px;
} }
.page_addCapitalAllocation ._conten ul li._inList ._uoload,.page_addCapitalAllocation ._conten ul li._outList ._uoload{ .page_addCapitalAllocation ._conten ul li._inList ._uoload,.page_addCapitalAllocation ._conten ul li._outList ._uoload{
......
src/components/Hotel/HotelInfo.vue
View file @ 43e8d373
...@@ -286,7 +286,7 @@ export default { ...@@ -286,7 +286,7 @@ export default {
inActive: 1, //已选中 inActive: 1, //已选中
notInActive: 0, //未选中 notInActive: 0, //未选中
SupplierList: "", SupplierList: "",
imgBeforeFile: this.domainManager().AliUrl, imgBeforeFile: this.domainManager().ViittoFileUrl,
isBook: true, isBook: true,
isDinner: false, isDinner: false,
dinerList: "", dinerList: "",
...@@ -622,8 +622,7 @@ export default { ...@@ -622,8 +622,7 @@ export default {
obj.PicID = imgItem.PicID; obj.PicID = imgItem.PicID;
obj.ShowPath = obj.ShowPath =
_self.imgBeforeFile + _self.imgBeforeFile +
imgItem.Path + imgItem.Path;
"?x-oss-process=image/resize,l_140";
this.HotelImageArray.push(obj); this.HotelImageArray.push(obj);
}); });
} }
......
src/components/Hotel/HotelManagement.vue
View file @ 43e8d373
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
<div class="resourceList" v-for="(item,index) in tableData" :key="index"> <div class="resourceList" v-for="(item,index) in tableData" :key="index">
<div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)"> <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
<img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png"> <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
<img v-else :src="item.PicPath"> <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
<div class="RemainingInventory">{{item.RemainingInventory}}</div> <div class="RemainingInventory">{{item.RemainingInventory}}</div>
<div class="resTypeList"> <div class="resTypeList">
<span v-for="(items,index) in item.OpenPlatformList" :key="index" :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}">{{items.Name}}</span> <span v-for="(items,index) in item.OpenPlatformList" :key="index" :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}">{{items.Name}}</span>
...@@ -356,6 +356,7 @@ ...@@ -356,6 +356,7 @@
label: "删除" label: "删除"
} }
], ],
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
loading: true, loading: true,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
......
src/components/Restaurant/restaurantList.vue
View file @ 43e8d373
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
<div class="resourceList" v-for="(item,index) in tableData" :key="index"> <div class="resourceList" v-for="(item,index) in tableData" :key="index">
<div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)"> <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
<img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png"> <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
<img v-else :src="item.PicPath" :onerror="defaultImg"> <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
<div class="resTypeList"> <div class="resTypeList">
<span v-for="(items,index) in item.OpenPlatformList" :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}" <span v-for="(items,index) in item.OpenPlatformList" :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}"
:key="index">{{items.Name}}</span> :key="index">{{items.Name}}</span>
......
src/components/SalesModule/planeTicketInquiry.vue
View file @ 43e8d373
...@@ -474,7 +474,7 @@ ...@@ -474,7 +474,7 @@
padding-left: 15px !important; padding-left: 15px !important;
padding-right: 15px !important; padding-right: 15px !important;
} }
._add_btn { .PlaneTicket ._add_btn {
float: right; float: right;
display: inline-block; display: inline-block;
color: #b7ddf2; color: #b7ddf2;
......
src/components/Ticketing/PassengerList.vue
View file @ 43e8d373
<style> <style>
.PT_teamTable { .PT_teamTable {
width: 754px; width: 800px;
background-color: #fff;
border-collapse: collapse; border-collapse: collapse;
} }
.PT_teamTable td, .PT_teamTable td,
.PT_teamTable th { .PT_teamTable th {
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
padding: 5px; padding: 6px;
height: 30px; height: 30px;
} }
.PT_teamTable tr th { .PT_teamTable tr th {
...@@ -27,6 +28,48 @@ ...@@ -27,6 +28,48 @@
.Tp_table .el-table .cell { .Tp_table .el-table .cell {
line-height: 3 !important; line-height: 3 !important;
} }
.passgenrDialog{
width:900px;
}
.PgflightDiv{
font-size: 12px;
color: #666666;
background-color: #e0f4ff;
width: 230px;
height: 175px;
border-radius: 4px;
float:left;
margin-right:10px;
}
.PgflightDiv p:first-child{
padding-left:8px;
color: #387ea5;
background-color: #cbe9fa;
height: 34px;
line-height: 34px;
}
.PgflightDiv ._add_info{
margin-top: 12px;
padding: 0 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.pg_table{
width:100%;
}
.pg_table tr{
display: block;
margin:10px 0;
}
.pg_table tr:last-child{
border-top:1px dashed #d1d1d1;
padding-top:10px;
}
/* .PassengerList .el-input__inner{
height:23px!important;
padding:0 5px;
} */
</style> </style>
<template> <template>
...@@ -50,6 +93,7 @@ ...@@ -50,6 +93,7 @@
</table> </table>
</li> </li>
<li> <li>
<input type="button" class="normalBtn" style="display:none;" value="导出报表" @click="getFlightInfo()" />
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" /> <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
</li> </li>
</ul> </ul>
...@@ -86,6 +130,85 @@ ...@@ -86,6 +130,85 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" layout="total,prev, pager, next, jumper"
:page-size='msg.PageSize' :total='msg.total'> :page-size='msg.PageSize' :total='msg.total'>
</el-pagination> </el-pagination>
<el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
<div>
<table border=0 class="pg_table">
<tr>
<td width="50" style="vertical-align:top;">去程</td>
<td>
<div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==1">
<p>
<span class="iconfont icon-hangban"></span>
<span>{{item.Flight_number}}</span>
<span>
<el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> -
<el-input class="w60" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
</span>
</p>
<el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('Airticket.Air_StartTime')}}：{{item.FlightDate}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.dName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_flightAir')}}：{{item.dName}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.aName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_arrivalAir')}}：{{item.aName }}</span>
</p>
</el-tooltip>
</div>
</td>
</tr>
<tr>
<td width="50" style="vertical-align:top;">回程</td>
<td>
<div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==3">
<p>
<span class="iconfont icon-hangban"></span>
<span>{{item.Flight_number}}</span>
<span>
<el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> -
<el-input class="w60" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
</span>
</p>
<el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('Airticket.Air_StartTime')}}：{{item.FlightDate}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.dName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_flightAir')}}：{{item.dName}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.aName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_arrivalAir')}}：{{item.aName }}</span>
</p>
</el-tooltip>
</div>
</td>
</tr>
</table>
</div>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="getCheckInfo()">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -112,7 +235,9 @@ ...@@ -112,7 +235,9 @@
nowDate: "", nowDate: "",
//模板代码 //模板代码
TempCode: "" TempCode: ""
} },
outerVisible:false,
flightList:[],
}; };
}, },
methods: { methods: {
...@@ -140,8 +265,48 @@ ...@@ -140,8 +265,48 @@
err => {} err => {}
); );
}, },
exportExcel() { getFlightInfo() {
//导出报表 let msg = {
ID:this.$route.query.id
}
this.apipost("ticket_get_GetEntityExtend", msg,res => {
if (res.data.resultCode == 1) {
this.flightList = res.data.data.flightList;
} else {
this.Error(res.data.message);
}
},err => {}
);
this.outerVisible = true;
},
//确定
getCheckInfo(){
let FlightList = []
this.flightList.forEach(x=>{
var obj = {
ID:x.ID,
TicketDepartureTime:x.TicketDepartureTime,
TicketArrivalTime:x.TicketArrivalTime
}
FlightList.push(obj);
})
let msg = {
AirTicketId:this.$route.query.id,
FlightList:FlightList
}
this.apipost("ticket_post_SetFlightChildConfirm", msg ,res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.exportExcel();
this.outerVisible = false;
} else {
this.Error(res.data.message);
}
},err => {}
);
},
//导出报表
exportExcel(){
let msg = { let msg = {
AirTicketId: this.msg.AirTicketId AirTicketId: this.msg.AirTicketId
}; };
...@@ -164,6 +329,8 @@ ...@@ -164,6 +329,8 @@
} }
this.GetLocalFile("travel_get_GetAirTicketGuestExport", msg, fileName); this.GetLocalFile("travel_get_GetAirTicketGuestExport", msg, fileName);
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
......
src/components/Ticketing/TicketManager.vue
View file @ 43e8d373
...@@ -563,7 +563,7 @@ ...@@ -563,7 +563,7 @@
padding-right: 15px !important; padding-right: 15px !important;
} }
._add_btn { .PlaneTicket ._add_btn {
float: right; float: right;
display: inline-block; display: inline-block;
color: #b7ddf2; color: #b7ddf2;
......
src/components/Ticketing/flightChild.vue 0 → 100644
View file @ 43e8d373
This diff is collapsed.
src/components/Ticketing/flightManagement.vue
View file @ 43e8d373
...@@ -229,6 +229,10 @@ ...@@ -229,6 +229,10 @@
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-else> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-else>
<el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button> <el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="效期维护" placement="top-start" style="display:none;">
<el-button type="danger" icon="el-icon-delete" circle @click="gotoChild(item)"></el-button>
</el-tooltip>
</el-row> </el-row>
</td> </td>
</tr> </tr>
...@@ -814,6 +818,18 @@ ...@@ -814,6 +818,18 @@
}, },
err => {} err => {}
); );
},
//跳转到子项
gotoChild(item)
{
this.$router.push({
name: "flightChild",
query: {
id: item.ID,
blank: 'y',
tab: "航班有效期维护"
}
})
} }
}, },
mounted() { mounted() {
......
src/components/TravelManager/TravelQuotationCenter/DirectQuotation.vue
View file @ 43e8d373
...@@ -826,7 +826,7 @@ ...@@ -826,7 +826,7 @@
FileSize: fileSize FileSize: fileSize
}); });
this.uploadList.push({ this.uploadList.push({
Url: this.domainManager().AliUrl + x.name, Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
Name: file.file.name Name: file.file.name
}); });
}); });
......
src/components/administrative/CommissionDetail.vue
View file @ 43e8d373
...@@ -74,6 +74,8 @@ export default { ...@@ -74,6 +74,8 @@ export default {
'额外奖励':x.otherMoney.toFixed(2), '额外奖励':x.otherMoney.toFixed(2),
'额外扣除':x.backMoney.toFixed(2), '额外扣除':x.backMoney.toFixed(2),
'应发提成':x.sumMoney.toFixed(2), '应发提成':x.sumMoney.toFixed(2),
'收客数':x.peopleCount,
'单签证人数':x.visaPeopleCount,
'所属期数':x.periods '所属期数':x.periods
} }
data.push(obj) data.push(obj)
......
src/components/commonPage/DMCchooseImg.vue
View file @ 43e8d373
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<div class="addimgContent test-1"> <div class="addimgContent test-1">
<div class="addimgDiv" v-for="(item,index) in imglistArry" :key="item.subCode" v-if="item.isShowImgDiv&&item.Path!=null"> <div class="addimgDiv" v-for="(item,index) in imglistArry" :key="item.subCode" v-if="item.isShowImgDiv&&item.Path!=null">
<div class="itemImgdiv" @click="selectImg(index)"> <div class="itemImgdiv" @click="selectImg(index)">
<img :src="item.Path" @error="imgError(item)"/> <img :src='compressImg(item.Path, "filt", 160, "")' @error="imgError(item)"/>
<div class="imgseclet" v-show="item.isShow"><i class="iconfont icon-dagouyouquan"></i></div> <div class="imgseclet" v-show="item.isShow"><i class="iconfont icon-dagouyouquan"></i></div>
</div> </div>
<div class="imgDescription">{{item.Name}}</div> <div class="imgDescription">{{item.Name}}</div>
......
src/components/commonPage/fiveday.vue
View file @ 43e8d373
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<div class="five-box day_table"> <div class="five-box day_table">
<div class="left"> <div class="left">
<div class="image"> <div class="image">
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[2].img, "filt", 663, "")' />
<img v-else :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</div> </div>
<table class="day_table"> <table class="day_table">
<tr> <tr>
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
<div class="item item5"> <div class="item item5">
<div class="upFour"> <div class="upFour">
<!-- <img :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> --> <!-- <img :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> -->
<img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")' />
<img v-else :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-else :src='compressImg(item.img, "filt", 663, "")' />
</div> </div>
<div class="down"> <div class="down">
......
src/components/commonPage/fourday.vue
View file @ 43e8d373
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<td> <td>
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[0].img, "filt", 663, "")' />
<img v-else :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
<div class="item"> <div class="item">
<div class="upFour"> <div class="upFour">
<!-- <img :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> --> <!-- <img :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> -->
<img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")' />
<img v-else :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-else :src='compressImg(item.img, "filt", 663, "")' />
</div> </div>
<div class="down"> <div class="down">
<h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4> <h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4>
......
src/components/commonPage/oneday.vue
View file @ 43e8d373
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<td> <td>
<div class="item big" style='margin-bottom:20px;'> <div class="item big" style='margin-bottom:20px;'>
<div class="left"> <div class="left">
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[0].img, "filt", 663, "")'/>
<img v-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" /> <img v-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" />
<img v-else-if="day.dayNum==1 && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" /> <img v-else-if="day.dayNum==1 && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<img v-else-if="day.islast && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" /> <img v-else-if="day.islast && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
......
src/components/commonPage/threeday.vue
View file @ 43e8d373
...@@ -20,8 +20,9 @@ ...@@ -20,8 +20,9 @@
<td> <td>
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}"
<img v-else :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> :src='compressImg(day.details[0].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
...@@ -72,8 +73,9 @@ ...@@ -72,8 +73,9 @@
<div> <div>
<div class="item hor-box"> <div class="item hor-box">
<div class="image"> <div class="image">
<img v-if="day.details[1].img!='' && day.details[1].scenicJson" :style="{'top':day.details[1].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[1].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-if="day.details[1].img!='' && day.details[1].scenicJson" :style="{'top':day.details[1].scenicJson.y+'px'}"
<img v-else :src="$commonUtils.replaceHttps(day.details[1].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> :src='compressImg(day.details[1].img, "filt", 663, "")'/>
<img v-else :src='compressImg(day.details[1].img, "filt", 663, "")' />
</div> </div>
</div> </div>
</div> </div>
...@@ -88,8 +90,8 @@ ...@@ -88,8 +90,8 @@
<div> <div>
<div class="item hor-box"> <div class="item hor-box">
<div class="image"> <div class="image">
<img v-if="day.details[2].img!='' && day.details[2].scenicJson" :style="{'top':day.details[2].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[2].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-if="day.details[2].img!='' && day.details[2].scenicJson" :style="{'top':day.details[2].scenicJson.y+'px'}" :src='compressImg(day.details[2].img, "filt", 663, "")' />
<img v-else :src="$commonUtils.replaceHttps(day.details[2].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> <img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</div> </div>
</div> </div>
</div> </div>
......
src/components/commonPage/twoday.vue
View file @ 43e8d373
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<div class="twoday_item" v-for="item in day.details" :key="item.dayNum"> <div class="twoday_item" v-for="item in day.details" :key="item.dayNum">
<div class="item"> <div class="item">
<div class="up"> <div class="up">
<img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_325'" /> <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, 325)'/>
<img v-else :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_325'" /> <img v-else :src='compressImg(item.img, "filt", 663, 325)' />
</div> </div>
<div class="down" style='padding:22px 0;'> <div class="down" style='padding:22px 0;'>
<h4 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4> <h4 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4>
......
src/components/confirmationOrderDownLoad.vue
View file @ 43e8d373
...@@ -652,8 +652,8 @@ ...@@ -652,8 +652,8 @@
if (this.showType >= 4) { // 判断是否为行程特色 if (this.showType >= 4) { // 判断是否为行程特色
var apiurl = this.domainManager().UploadUrl + '/Upload/GetImage?filePath=Feature/' + tcid; var apiurl = this.domainManager().UploadUrl + '/Upload/GetImage?filePath=Feature/' + tcid;
this.$http.post(apiurl).then(res => { this.$http.post(apiurl).then(res => {
let msg = res let msg = res.data
if (msg.ResultCode) { // 已经存在文件 直接调用下载 if (msg.ResultCode === 1 && _this.vshowC) { // 已经存在文件 直接调用下载
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
'日游', isPc) '日游', isPc)
} else if (document.querySelector("#gernalCanvas")) { // 不存在图片保存图片后下载 } else if (document.querySelector("#gernalCanvas")) { // 不存在图片保存图片后下载
...@@ -662,14 +662,6 @@ ...@@ -662,14 +662,6 @@
'日游', isPc) '日游', isPc)
return return
} }
document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
let src = x.src
src = src.replace('https:', 'http:')
if (src.indexOf('http') != -1) {
x.setAttribute('crossOrigin', 'anonymous')
}
x.src = src
});
let cName = '' let cName = ''
if (_this.showType == 4) { if (_this.showType == 4) {
cName = '.feature-box' cName = '.feature-box'
...@@ -1042,6 +1034,12 @@ ...@@ -1042,6 +1034,12 @@
for (let i = 0; i < imgs.length; i++) { for (let i = 0; i < imgs.length; i++) {
document.getElementsByTagName('img')[i].removeAttribute('crossOrigin') document.getElementsByTagName('img')[i].removeAttribute('crossOrigin')
} }
// let imgList = document.getElementById("gernalCanvas").getElementsByTagName("img")
// for (let i = 0; i < imgList.length; i++) {
// if (imgList[i].src.indexOf('http') !== -1 && imgList[i].src.indexOf('icon') === -1 && imgList[i].src.indexOf('_bg_') === -1 && imgList[i].src.indexOf('_top_') === -1 && imgList[i].src.indexOf('_title') === -1) {
// imgList[i].src = this.compressImg(imgList[i].src, "filt", imgList[i].clientWidth, '')
// }
// }
}) })
}, err => {}) }, err => {})
}, },
......
src/components/dmc/manager/teamReimbursement.vue
View file @ 43e8d373
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
<el-button-group> <el-button-group>
<el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button> <el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button>
<!-- <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 --> <!-- <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 -->
<el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 <el-button v-show="outItem.TravelPriceList.LeaderApplyStatus==1" @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
</el-button> </el-button>
</el-button-group> </el-button-group>
......
src/components/leaderPay2.vue
View file @ 43e8d373
...@@ -223,10 +223,10 @@ ...@@ -223,10 +223,10 @@
<td>{{totalHotelPrice}}</td> <td>{{totalHotelPrice}}</td>
</tr> </tr>
</table> </table>
<el-input type="textarea" v-if="isShowRemark" placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/> <el-input type="textarea" v-show="dataList.LeaderApply.Status==1" placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/>
<div class="btnListDiv"> <div class="btnListDiv" >
<input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过"/> <input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过" v-show="dataList.LeaderApply.Status==1"/>
<input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过"/> <input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过" v-show="dataList.LeaderApply.Status==1"/>
<input type="button" class="leader2Btn" value="打印" @click="printTable()"> <input type="button" class="leader2Btn" value="打印" @click="printTable()">
</div> </div>
</div> </div>
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ 43e8d373
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<div class="Travel_ImgList clearfix"> <div class="Travel_ImgList clearfix">
<div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode"> <div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode">
<img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png"> <img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png">
<img v-else :src=" item.Url"> <img v-else :src='compressImg(item.Url, "filt", 170, "")'>
<div class="TFIMGzhe"> <div class="TFIMGzhe">
<div class="TFreupload" @click="updateTFimg(index)"> <div class="TFreupload" @click="updateTFimg(index)">
<el-upload :file-list="PostConfig.fileList" :http-request="reUpload" :multiple="true" <el-upload :file-list="PostConfig.fileList" :http-request="reUpload" :multiple="true"
......
src/components/newTravelmanager/TravelTripPreview/fivedayList.vue
View file @ 43e8d373
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="TC-ImgTop" :id='"boxs_"+DayNum+"_"+0'> <div class="TC-ImgTop" :id='"boxs_"+DayNum+"_"+0'>
<VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+0' tabindex="0" :w="318" :h="525" :resizable='false' :x="scenicArray[0].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+0' tabindex="0" :w="318" :h="525" :resizable='false' :x="scenicArray[0].ScenicJson.x"
:y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)"> :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
<img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 318, "")' :id='"bodys_"+DayNum+"_"+0' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
<el-form-item> <el-form-item>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+1'> <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+1'>
<VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+1' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[1].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+1' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[1].ScenicJson.x"
:y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)"> :y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)">
<img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+1' /> <img :src='compressImg(scenicArray[1].NewImaArray[0].Url, "filt", 323, "")' :id='"bodys_"+DayNum+"_"+1' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+2'> <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+2'>
<VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+2' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[2].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+2' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[2].ScenicJson.x"
:y="scenicArray[2].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(2)"> :y="scenicArray[2].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(2)">
<img :src='scenicArray[2].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+2' /> <img :src='compressImg(scenicArray[2].NewImaArray[0].Url, "filt", 323, "")' :id='"bodys_"+DayNum+"_"+2' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+3'> <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+3'>
<VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+3' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[3].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+3' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[3].ScenicJson.x"
:y="scenicArray[3].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(3)"> :y="scenicArray[3].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(3)">
<img :src='scenicArray[3].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+3' /> <img :src='compressImg(scenicArray[3].NewImaArray[0].Url, "filt", 323, "")' :id='"bodys_"+DayNum+"_"+3' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
<el-form-item> <el-form-item>
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
<div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+4'> <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+4'>
<VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+4' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[4].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+4' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[4].ScenicJson.x"
:y="scenicArray[4].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(4)"> :y="scenicArray[4].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(4)">
<img :src='scenicArray[4].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+4' /> <img :src='compressImg(scenicArray[4].NewImaArray[0].Url, "filt", 323, "")' :id='"bodys_"+DayNum+"_"+4' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
......
src/components/newTravelmanager/TravelTripPreview/fourdayList.vue
View file @ 43e8d373
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<div class="TC-OneDayImg" :id='"boxs_"+DayNum+"_"+0'> <div class="TC-OneDayImg" :id='"boxs_"+DayNum+"_"+0'>
<VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+0' tabindex="0" :w="660" :h="449" :resizable='false' :x="scenicArray[0].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+0' tabindex="0" :w="660" :h="449" :resizable='false' :x="scenicArray[0].ScenicJson.x"
:y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)"> :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
<img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 660, "")' :id='"bodys_"+DayNum+"_"+0' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
<el-form-item> <el-form-item>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<div class="image" :id='"boxs_"+DayNum+"_"+1'> <div class="image" :id='"boxs_"+DayNum+"_"+1'>
<VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+1' tabindex="0" :w="321" :h="246" :resizable='false' :x="scenicArray[1].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+1' tabindex="0" :w="321" :h="246" :resizable='false' :x="scenicArray[1].ScenicJson.x"
:y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)"> :y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)">
<img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+1' /> <img :src='compressImg(scenicArray[1].NewImaArray[0].Url, "filt", 321, "")' :id='"bodys_"+DayNum+"_"+1' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<div class="image" :id='"boxs_"+DayNum+"_"+2'> <div class="image" :id='"boxs_"+DayNum+"_"+2'>
<VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+2' tabindex="0" :w="321" :h="246" :resizable='false' :x="scenicArray[2].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+2' tabindex="0" :w="321" :h="246" :resizable='false' :x="scenicArray[2].ScenicJson.x"
:y="scenicArray[2].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(2)"> :y="scenicArray[2].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(2)">
<img :src='scenicArray[2].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+2' /> <img :src='compressImg(scenicArray[2].NewImaArray[0].Url, "filt", 321, "")' :id='"bodys_"+DayNum+"_"+2' />
</VueDraggableResizable> </VueDraggableResizable>
<!-- <img v-if="scenicArray[2].NewImaArray.length>0&&scenicArray[2].NewImaArray[0].Url" :src="scenicArray[2].NewImaArray[0].Url" alt="" /> <!-- <img v-if="scenicArray[2].NewImaArray.length>0&&scenicArray[2].NewImaArray[0].Url" :src="scenicArray[2].NewImaArray[0].Url" alt="" />
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<div class="image" :id='"boxs_"+DayNum+"_"+3'> <div class="image" :id='"boxs_"+DayNum+"_"+3'>
<VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+3' tabindex="0" :w="321" :h="246" :resizable='false' :x="scenicArray[3].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+3' tabindex="0" :w="321" :h="246" :resizable='false' :x="scenicArray[3].ScenicJson.x"
:y="scenicArray[3].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(3)"> :y="scenicArray[3].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(3)">
<img :src='scenicArray[3].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+3' /> <img :src='compressImg(scenicArray[3].NewImaArray[0].Url, "filt", 321, "")' :id='"bodys_"+DayNum+"_"+3' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
<el-form-item> <el-form-item>
......
src/components/newTravelmanager/TravelTripPreview/onedayList.vue
View file @ 43e8d373
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="TC-OneDayImg" :id='"boxs_"+DayNum+"_"+0'> <div class="TC-OneDayImg" :id='"boxs_"+DayNum+"_"+0'>
<VueDraggableResizable axis="y" :ref='"oneDay_"+DayNum+"_"+0' tabindex="0" :w="660" :h="449" :resizable='false' :x="scenicArray[0].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"oneDay_"+DayNum+"_"+0' tabindex="0" :w="660" :h="449" :resizable='false' :x="scenicArray[0].ScenicJson.x"
:y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)"> :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
<img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 600, "")' :id='"bodys_"+DayNum+"_"+0' />
</VueDraggableResizable> </VueDraggableResizable>
<!-- <img v-if="scenicArray[0].NewImaArray.length>0&&scenicArray[0].NewImaArray[0].Url" :src="scenicArray[0].NewImaArray[0].Url" alt> <!-- <img v-if="scenicArray[0].NewImaArray.length>0&&scenicArray[0].NewImaArray[0].Url" :src="scenicArray[0].NewImaArray[0].Url" alt>
<div v-else class="_noData_img" src=""></div> --> <div v-else class="_noData_img" src=""></div> -->
......
src/components/newTravelmanager/TravelTripPreview/threedayList.vue
View file @ 43e8d373
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="TC-threeOneImg" :id='"boxs_"+DayNum+"_"+0'> <div class="TC-threeOneImg" :id='"boxs_"+DayNum+"_"+0'>
<VueDraggableResizable axis="y" :ref='"threeDay_"+DayNum+"_"+0' tabindex="0" :w="660" :h="449" :resizable='false' :x="scenicArray[0].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"threeDay_"+DayNum+"_"+0' tabindex="0" :w="660" :h="449" :resizable='false' :x="scenicArray[0].ScenicJson.x"
:y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)"> :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
<img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 660, "")' :id='"bodys_"+DayNum+"_"+0' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
<el-form-item> <el-form-item>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<div class="TC-ThreeDetail" :id='"boxs_"+DayNum+"_"+1'> <div class="TC-ThreeDetail" :id='"boxs_"+DayNum+"_"+1'>
<VueDraggableResizable axis="y" :ref='"threeDay_"+DayNum+"_"+1' tabindex="0" :w="665" :resizable='false' :x="scenicArray[1].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"threeDay_"+DayNum+"_"+1' tabindex="0" :w="665" :resizable='false' :x="scenicArray[1].ScenicJson.x"
:y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)"> :y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)">
<img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+1' /> <img :src='compressImg(scenicArray[1].NewImaArray[0].Url, "filt", 665, "")' :id='"bodys_"+DayNum+"_"+1' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
<el-form-item> <el-form-item>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<div class="TC-ThreeDetail" :id='"boxs_"+DayNum+"_"+2'> <div class="TC-ThreeDetail" :id='"boxs_"+DayNum+"_"+2'>
<VueDraggableResizable axis="y" :ref='"threeDay_"+DayNum+"_"+2' tabindex="0" :w="665" :resizable='false' :x="scenicArray[2].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"threeDay_"+DayNum+"_"+2' tabindex="0" :w="665" :resizable='false' :x="scenicArray[2].ScenicJson.x"
:y="scenicArray[2].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(2)"> :y="scenicArray[2].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(2)">
<img :src='scenicArray[2].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+2' /> <img :src='compressImg(scenicArray[2].NewImaArray[0].Url, "filt", 486, "")' :id='"bodys_"+DayNum+"_"+2' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
<el-form-item> <el-form-item>
......
src/components/newTravelmanager/TravelTripPreview/twodayList.vue
View file @ 43e8d373
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="TC-twoimage" :id='"boxs_"+DayNum+"_"+0'> <div class="TC-twoimage" :id='"boxs_"+DayNum+"_"+0'>
<VueDraggableResizable axis="y" :ref='"twoDay_"+DayNum+"_"+0' tabindex="0" :w="486" :resizable='false' :x="scenicArray[0].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"twoDay_"+DayNum+"_"+0' tabindex="0" :w="486" :resizable='false' :x="scenicArray[0].ScenicJson.x"
:y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)"> :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
<img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 486, "")' :id='"bodys_"+DayNum+"_"+0' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
<el-form-item> <el-form-item>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<div class="TC-twoimage" :id='"boxs_"+DayNum+"_"+1'> <div class="TC-twoimage" :id='"boxs_"+DayNum+"_"+1'>
<VueDraggableResizable axis="y" :ref='"twoDay_"+DayNum+"_"+1' tabindex="0" :w="486" :resizable='false' :x="scenicArray[1].ScenicJson.x" <VueDraggableResizable axis="y" :ref='"twoDay_"+DayNum+"_"+1' tabindex="0" :w="486" :resizable='false' :x="scenicArray[1].ScenicJson.x"
:y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)"> :y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)">
<img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+1' /> <img :src='compressImg(scenicArray[1].NewImaArray[0].Url, "filt", 486, "")' :id='"bodys_"+DayNum+"_"+1' />
</VueDraggableResizable> </VueDraggableResizable>
<div class="TC_uploadDiv"> <div class="TC_uploadDiv">
<el-form-item> <el-form-item>
......
src/components/platformModule/appMenuManagement.vue
View file @ 43e8d373
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
border-color: #409EFF; border-color: #409EFF;
} }
.avatar-uploader-icon { .appmenumanage .avatar-uploader-icon {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
width: 50px; width: 50px;
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
} }
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne appmenumanage">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
......
src/components/scenicSpot/admissionStatistics.vue
View file @ 43e8d373
...@@ -285,7 +285,7 @@ export default { ...@@ -285,7 +285,7 @@ export default {
.admissionStatisticsTalbe tr td .pHouseStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px;} .admissionStatisticsTalbe tr td .pHouseStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px;}
.admissionStatisticsTalbe tr td .pHouseStyle:last-child{border-bottom: none;} .admissionStatisticsTalbe tr td .pHouseStyle:last-child{border-bottom: none;}
.admissionStatisticsTalbe tr td .pDateStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px; margin-top: 0;} .admissionStatisticsTalbe tr td .pDateStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px; margin-top: 0;}
.admissionStatisticsTalbe tr td .pMsgStyle{; padding: 0 10px; line-height: 20px;} .admissionStatisticsTalbe tr td .pMsgStyle{padding: 0 10px; line-height: 20px;}
.admissionStatisticsTalbe tr td .link p:hover{text-decoration: underline; cursor: pointer;} .admissionStatisticsTalbe tr td .link p:hover{text-decoration: underline; cursor: pointer;}
.admissionStatisticsTalbe tr td .phoverStype:hover{text-decoration: underline; cursor: pointer;} .admissionStatisticsTalbe tr td .phoverStype:hover{text-decoration: underline; cursor: pointer;}
.admissionStatistics_tripDetails {padding: 0; box-shadow: 0px 1px 3px 0px #dedede; max-height: 400px;overflow-y: auto;} .admissionStatistics_tripDetails {padding: 0; box-shadow: 0px 1px 3px 0px #dedede; max-height: 400px;overflow-y: auto;}
......
src/components/scenicSpot/scenicSpotList.vue
View file @ 43e8d373
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
<div class="resourceList" v-for="item in tableData" :key="item.subCode"> <div class="resourceList" v-for="item in tableData" :key="item.subCode">
<div class="reTopInfo" :class="{'comCursorUrl':item.Url}" @click="OpenNewUrl(item.Url)"> <div class="reTopInfo" :class="{'comCursorUrl':item.Url}" @click="OpenNewUrl(item.Url)">
<img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png"> <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
<img v-else :src="item.PicPath" :onerror="defaultImg"> <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
<div class="resTypeList"> <div class="resTypeList">
<span <span
v-for="(items,index) in item.OpenPlatformList" v-for="(items,index) in item.OpenPlatformList"
......
src/components/systemManagement/pictureResourceManagement.vue
View file @ 43e8d373
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<tr v-for="(item,index) in DataList"> <tr v-for="(item,index) in DataList">
<td class="picturMG"> <td class="picturMG">
<img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png"> <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
<img v-else :src="item.PicPath" :onerror='defaultImg'> <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror='defaultImg'>
</td> </td>
<td>{{item.TypeName}}</td> <td>{{item.TypeName}}</td>
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
} }
this.apipost('Pictureresource_get_Get', msg, res => { this.apipost('Pictureresource_get_Get', msg, res => {
this.addMsg = res.data.data this.addMsg = res.data.data
this.imageUrl = this.addMsg.PicPath this.imageUrl = this.domainManager().ViittoFileUrl + this.addMsg.PicPath
}, err => {}) }, err => {})
}, },
submitForm(addMsg) { //提交创建、修改表单 submitForm(addMsg) { //提交创建、修改表单
......
src/plug/index.js
View file @ 43e8d373
This diff is collapsed.
src/router/config.js
View file @ 43e8d373
...@@ -715,6 +715,14 @@ export default { ...@@ -715,6 +715,14 @@ export default {
title: '航班管理' title: '航班管理'
}, },
}, },
{
path: '/flightChild', //航班子表管理
name: 'flightChild',
component: resolve => require(['@/components/Ticketing/flightChild'], resolve),
meta: {
title: '航班管理'
},
},
{ {
path: '/startCityManagement', //出发城市管理 path: '/startCityManagement', //出发城市管理
name: 'startCityManagement', name: 'startCityManagement',
......
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