Commit d7fe72f4 authored by 黄奎's avatar 黄奎

团控代码优化

parent 4e1cf046
...@@ -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=" item.Url">
<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"
......
...@@ -209,9 +209,9 @@ ...@@ -209,9 +209,9 @@
this.FeatureData.FeatureHtmlJson.d && this.FeatureData.FeatureHtmlJson.d &&
this.FeatureData.FeatureHtmlJson.d.length > 0 this.FeatureData.FeatureHtmlJson.d.length > 0
) { ) {
// console.log("to do something"); //to do something
} else { } else {
// this.$set(this.FeatureData, "DayList", data); //this.$set(this.FeatureData, "DayList", data);
this.$refs.TravelFeature.setNewDate(data); this.$refs.TravelFeature.setNewDate(data);
} }
}, },
...@@ -589,7 +589,6 @@ ...@@ -589,7 +589,6 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
console.log("tempData",tempData);
if (tempData.Feature != null) { if (tempData.Feature != null) {
this.FeatureData.ID = tempData.Feature.ID; this.FeatureData.ID = tempData.Feature.ID;
this.FeatureData.ConfigId = tempData.Feature.ConfigId; this.FeatureData.ConfigId = tempData.Feature.ConfigId;
......
...@@ -1666,11 +1666,6 @@ ...@@ -1666,11 +1666,6 @@
watch:{ watch:{
data:{ data:{
handler: function (val, oldVal) { handler: function (val, oldVal) {
// console.log(val.DayList.length);
// console.log(oldVal.DayList.length);
// if (val && (val.DayList.length !== oldVal.DayList.length)) {
// console.log('ssss')
// }
}, },
deep: true deep: true
} }
......
...@@ -1170,7 +1170,6 @@ ...@@ -1170,7 +1170,6 @@
}, },
methods: { methods: {
DataComparison: function () { // 数据对比 DataComparison: function () { // 数据对比
console.log("DataComparison")
let newVal = this.newVal; let newVal = this.newVal;
let newRestaurantObj = { let newRestaurantObj = {
title:{ title:{
...@@ -1201,14 +1200,9 @@ ...@@ -1201,14 +1200,9 @@
deleteRestaurantHistory = []; deleteRestaurantHistory = [];
//json 历史数据 jsonDelete 历史删除数据 //json 历史数据 jsonDelete 历史删除数据
let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : ''; let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
console.log(json)
let jsonDelete = this.FeatureData.FeatureHtmlJsonDelete ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)) : ''; let jsonDelete = this.FeatureData.FeatureHtmlJsonDelete ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)) : '';
// console.log("json",json)
// console.log("jsonDelete",jsonDelete)
// 历史数据组装 // 历史数据组装
// console.log("json",json)
if (JSON.stringify(json) !== '{}' && json && json.hotelObj.list && json.hotelObj.list.length>0 && this.theFirstTime) { if (JSON.stringify(json) !== '{}' && json && json.hotelObj.list && json.hotelObj.list.length>0 && this.theFirstTime) {
// console.log("json.travelFeature2",json)
this.jsonTravelFeature2 = json; this.jsonTravelFeature2 = json;
newHtelObj = json.hotelObj; newHtelObj = json.hotelObj;
newViewSpotObj = json.viewSpotObj; newViewSpotObj = json.viewSpotObj;
...@@ -1238,9 +1232,6 @@ ...@@ -1238,9 +1232,6 @@
}) })
newRestaurantObj = restaurantObj; newRestaurantObj = restaurantObj;
} }
// console.log('1newViewSpotObj',newViewSpotObj)
// console.log('1restaurantObj',newRestaurantObj)
// console.log('1newHtelObj',newHtelObj)
// 获取并组装历史删除数据 // 获取并组装历史删除数据
if (jsonDelete && jsonDelete.length>0) { if (jsonDelete && jsonDelete.length>0) {
jsonDelete.forEach(x=>{ jsonDelete.forEach(x=>{
...@@ -1264,23 +1255,18 @@ ...@@ -1264,23 +1255,18 @@
newViewSpotObj.list.push(...viewSpotObj); newViewSpotObj.list.push(...viewSpotObj);
} }
// 对比景点 newViewSpotObj this.viewSpotObj.list // 对比景点 newViewSpotObj this.viewSpotObj.list
let DalateView = travelFeatureTwo.getArrDifference(newViewSpotObj.list, this.viewSpotObj.list); let DalateView = travelFeatureTwo.getArrDifference(newViewSpotObj.list, this.viewSpotObj.list);
if (deleteViewSpotHistory.length>0) { if (deleteViewSpotHistory.length>0) {
DalateView.push(...deleteViewSpotHistory) DalateView.push(...deleteViewSpotHistory)
} }
// console.log("newViewSpotObj.list",newViewSpotObj.list)
let VSobj = {}; let VSobj = {};
console.log(this.viewSpotObj.list)
let ov = JSON.parse(JSON.stringify(this.viewSpotObj)) let ov = JSON.parse(JSON.stringify(this.viewSpotObj))
ov.list.push(...newViewSpotObj.list) ov.list.push(...newViewSpotObj.list)
// newViewSpotObj.list.push(...this.viewSpotObj.list) //1-24 因为保存后特色已更改的刷新后变为上一次保存结果,所以调换顺序进行测试
ov.list = ov.list.reduce(function(item, next) { //根据MD5Sign数组对象去重 ov.list = ov.list.reduce(function(item, next) { //根据MD5Sign数组对象去重
VSobj[next.MD5Sign] ? '' : VSobj[next.MD5Sign] = true && item.push(next); VSobj[next.MD5Sign] ? '' : VSobj[next.MD5Sign] = true && item.push(next);
return item; return item;
}, []); }, []);
// console.log("newViewSpotObj.list",newViewSpotObj.list)
DalateView.forEach((x, index)=>{ // 根据MD5Sign过滤删除数据 DalateView.forEach((x, index)=>{ // 根据MD5Sign过滤删除数据
ov.list.filter((val, vIndex)=>{ ov.list.filter((val, vIndex)=>{
if(x.MD5Sign === val.MD5Sign) if(x.MD5Sign === val.MD5Sign)
...@@ -1298,7 +1284,6 @@ ...@@ -1298,7 +1284,6 @@
let HTobj = {}; let HTobj = {};
let hv = JSON.parse(JSON.stringify(this.hotelObj)) let hv = JSON.parse(JSON.stringify(this.hotelObj))
hv.list.push(...newHtelObj.list) hv.list.push(...newHtelObj.list)
// newHtelObj.list.push(...this.hotelObj.list)
hv.list = hv.list.reduce(function(item, next) { //数组对象去重 hv.list = hv.list.reduce(function(item, next) { //数组对象去重
HTobj[next.MD5Sign] ? '' : HTobj[next.MD5Sign] = true && item.push(next); HTobj[next.MD5Sign] ? '' : HTobj[next.MD5Sign] = true && item.push(next);
return item; return item;
...@@ -1320,8 +1305,6 @@ ...@@ -1320,8 +1305,6 @@
let RTobj = {}; let RTobj = {};
let rv = JSON.parse(JSON.stringify(this.restaurantObj)) let rv = JSON.parse(JSON.stringify(this.restaurantObj))
rv.list.push(...newRestaurantObj.list) rv.list.push(...newRestaurantObj.list)
console.log("rvrvrvrvrv",rv.list)
// newRestaurantObj.list.push(...this.restaurantObj.list)
rv.list = rv.list.reduce(function(item, next) { //数组对象去重 rv.list = rv.list.reduce(function(item, next) { //数组对象去重
RTobj[next.MD5Sign] ? '' : RTobj[next.MD5Sign] = true && item.push(next); RTobj[next.MD5Sign] ? '' : RTobj[next.MD5Sign] = true && item.push(next);
return item; return item;
...@@ -1332,9 +1315,7 @@ ...@@ -1332,9 +1315,7 @@
rv.list.splice(vIndex,1) rv.list.splice(vIndex,1)
}) })
}) })
// console.log('2newViewSpotObj',newViewSpotObj)
// console.log('2restaurantObj',newRestaurantObj)
// console.log('2newHtelObj',newHtelObj)
// 餐饮对比结束 // 餐饮对比结束
this.hotelObj.list = hv.list; this.hotelObj.list = hv.list;
this.viewSpotObj.list = ov.list; this.viewSpotObj.list = ov.list;
...@@ -1344,7 +1325,6 @@ ...@@ -1344,7 +1325,6 @@
this.pageCount('restaurant'); this.pageCount('restaurant');
this.Refresh = false; this.Refresh = false;
this.RenderingOk = false; this.RenderingOk = false;
// console.log(this.viewSpotObj.list)
this.$forceUpdate() this.$forceUpdate()
}, },
UpDateInfo: function () { // 防止组件改动一直渲染数据造成卡顿 添加点击更新视图 UpDateInfo: function () { // 防止组件改动一直渲染数据造成卡顿 添加点击更新视图
...@@ -1363,9 +1343,6 @@ ...@@ -1363,9 +1343,6 @@
let dataList = JSON.parse(JSON.stringify(this.FeatureData)); let dataList = JSON.parse(JSON.stringify(this.FeatureData));
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)); let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = !deleteDataList ? [] : deleteDataList; this.deleteArray = !deleteDataList ? [] : deleteDataList;
// console.log("this.deleteArray", this.deleteArray)
// console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
// console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4) || (this.$route.query.configId && this.FeatureData.FeatureType<4)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType)){ if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType)){
for (let i = 0; i < dataList.DayList.length; i++) { //组装数据 for (let i = 0; i < dataList.DayList.length; i++) { //组装数据
let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮 let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
...@@ -1421,7 +1398,6 @@ ...@@ -1421,7 +1398,6 @@
} }
} }
let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : ''; let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
// console.log("jsonjsonjson",json)
this.hotelObj.title = json.hotelObj ? json.hotelObj.title : this.hotelObj.title; this.hotelObj.title = json.hotelObj ? json.hotelObj.title : this.hotelObj.title;
this.restaurantObj.title = json.restaurantObj ? json.restaurantObj.title : this.restaurantObj.title; this.restaurantObj.title = json.restaurantObj ? json.restaurantObj.title : this.restaurantObj.title;
this.viewSpotObj.title = json.viewSpotObj ? json.viewSpotObj.title : this.viewSpotObj.title; this.viewSpotObj.title = json.viewSpotObj ? json.viewSpotObj.title : this.viewSpotObj.title;
...@@ -1868,7 +1844,6 @@ ...@@ -1868,7 +1844,6 @@
}, },
// 版块删除 // 版块删除
bolckToDelete: function (name, index1, index2) { bolckToDelete: function (name, index1, index2) {
console.log(name, index1)
let blockList = []; let blockList = [];
if (name === 'hotel') { if (name === 'hotel') {
blockList = this.hotelObj.list blockList = this.hotelObj.list
...@@ -1877,10 +1852,8 @@ ...@@ -1877,10 +1852,8 @@
} else if (name === 'restaurant') { } else if (name === 'restaurant') {
blockList = this.restaurantObj.list blockList = this.restaurantObj.list
} }
console.log(blockList)
this.imgTopReset(name, index1, index2); this.imgTopReset(name, index1, index2);
this.deleteArray.push(blockList[index1]); this.deleteArray.push(blockList[index1]);
console.log("删除",blockList[index1])
blockList.splice(index1,1); blockList.splice(index1,1);
this.pageCount(name) this.pageCount(name)
}, },
...@@ -1896,7 +1869,6 @@ ...@@ -1896,7 +1869,6 @@
basicData:travelFeature2, basicData:travelFeature2,
deleteArray:this.deleteArray deleteArray:this.deleteArray
} }
console.log(obj)
return obj; return obj;
}, },
// 设置编辑状态 // 设置编辑状态
...@@ -1924,17 +1896,13 @@ ...@@ -1924,17 +1896,13 @@
watch:{ watch:{
FeatureData:{ FeatureData:{
handler: function (val, oldVal) { handler: function (val, oldVal) {
console.log('2019年2月12日10:53:11',oldVal)
console.log('2019年2月12日10:53:22',val)
if (this.ReadOnly) return; if (this.ReadOnly) return;
if (val && this.oldVal != null) { if (val && this.oldVal != null) {
// console.log("watch_if_FeatureData",11111)
this.newVal = JSON.parse(JSON.stringify(val)); this.newVal = JSON.parse(JSON.stringify(val));
this.Refresh = true; this.Refresh = true;
this.theFirstTime = false this.theFirstTime = false
return return
} else { } else {
// console.log("watch_else_FeatureData",333)
this.oldVal = JSON.parse(JSON.stringify(this.FeatureData)); this.oldVal = JSON.parse(JSON.stringify(this.FeatureData));
this.init() this.init()
} }
......
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