diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 53e5899..e0d5eab 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -87,8 +87,8 @@ - - + + > + > @@ -1299,18 +1299,19 @@ export default { chooseCompanyRank(keys, index) { this[keys] = index console.log(keys) + console.log(this.role, '123891273892178937129837') if (this.role != 2) { if (keys == 'classatec1') { if (index == 0) { - this.companyRank = this.allCompanyRank.avgFraction - } else { this.companyRank = this.allCompanyRank.receptionCount + } else { + this.companyRank = this.allCompanyRank.avgFraction } } else { if (index == 0) { - this.houseRank = this.allHouseRank.avgFraction - } else { this.houseRank = this.allHouseRank.receptionCount + } else { + this.houseRank = this.allHouseRank.avgFraction } } } else { @@ -1462,6 +1463,7 @@ export default { this.statDateEnd = ""; this.customtime = []; this.TimetoAhoose = i; + console.log(this.role) if (this.role == 3) { this.getgicd(); this.getindexZxllist(); diff --git a/src/views/Customer/SalesStage.vue b/src/views/Customer/SalesStage.vue index 6b6ecc3..6f29416 100644 --- a/src/views/Customer/SalesStage.vue +++ b/src/views/Customer/SalesStage.vue @@ -181,11 +181,11 @@ computed: { if (res.code == 0) { this.$message({ type: "success", - message: "删除成功!", + message: res.msg, }); this.findbypage(); } else { - this.$message.error(res.message); + this.$message.error(res.msg); } }); }) diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index e76f508..8577de2 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -887,11 +887,11 @@ export default { mounted() { // return; let theRequest = this.$route.query; - // console.log(theRequest,'123') //此时的theRequest就是我们需要的参数； + console.log(theRequest,'123') //此时的theRequest就是我们需要的参数； if (theRequest.houseId) { this.flag = true; this.houseId = theRequest.houseId; - this.timeType = theRequest.timeType; + this.timeType = theRequest.timeType || -1; this.selValue="2" } else { this.flag = false; @@ -1117,6 +1117,7 @@ export default { if (this.timeType == 6) { num = 24 * 3600 * 1000 * 30; } + console.log('ashjdklasjkldasjdlks') if (i != -1) { this.customtime = [ this.timestampToTime(new Date().getTime() - num), diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue index 479eb08..be0abcd 100644 --- a/src/views/ReceivingRecords/index.vue +++ b/src/views/ReceivingRecords/index.vue @@ -344,8 +344,8 @@ @click="Receivedetailsabout(row)" >查看 - - 删除 + + diff --git a/src/views/Statistics/BuildingContrast.vue b/src/views/Statistics/BuildingContrast.vue index 55b1e38..35a83d9 100644 --- a/src/views/Statistics/BuildingContrast.vue +++ b/src/views/Statistics/BuildingContrast.vue @@ -183,11 +183,11 @@
{{ objList3.sum }}次
-
顾问
+
楼盘总数
{{ objList3.num }}个
-
人均接待量
+
平均违规
{{ objList3.avg }}次
diff --git a/src/views/Statistics/index.js b/src/views/Statistics/index.js deleted file mode 100644 index 46c381d..0000000 --- a/src/views/Statistics/index.js +++ /dev/null @@ -1,31 +0,0 @@ -var IframeOnClick = { - resolution: 200, - iframes: [], - interval: null, - Iframe: function () { - this.element = arguments[0]; - this.cb = arguments[1]; - }, - track: function (element, cb) { - this.iframes.push(new this.Iframe(element, cb)); - var _this = this; - this.interval = setInterval(function () { - _this.checkClick(); - }, this.resolution); - }, - checkClick: function () { - if (document.activeElement) { - var activeElement = document.activeElement; - for (var i in this.iframes) { - if (activeElement === this.iframes[i].element) { // user is in this Iframe - this.iframes[i].cb.apply(window, []); - var btn = document.getElementById("btn") - btn.focus() - } - } - } - } -}; -IframeOnClick.track(document.getElementById("iFrame"), function () { - console.log(11111); -}); \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 41846be..0646ad8 100644 --- a/vue.config.js +++ b/vue.config.js @@ -4,10 +4,10 @@ */ // const url = 'http://pigx-gateway' // const url = 'http://39.97.167.65:9999' //测试 -const url = 'http://192.168.31.167:9999' //长龙 +// const url = 'http://192.168.31.167:9999' //长龙 // const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 -// const url = 'http://62.234.122.43:9999' //正式 +const url = 'http://62.234.122.43:9999' //正式 const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css']