Browse Source

隐藏未开发完功能,bug基本修改完

newStyle
douzhuo 3 years ago
parent
commit
b9072c719e
8 changed files with 21 additions and 49 deletions
  1. +3
    -3
      src/page/index/top/index.vue
  2. +7
    -5
      src/page/wel.vue
  3. +2
    -2
      src/views/Customer/SalesStage.vue
  4. +3
    -2
      src/views/Equipment/equipmentDetailList.vue
  5. +2
    -2
      src/views/ReceivingRecords/index.vue
  6. +2
    -2
      src/views/Statistics/BuildingContrast.vue
  7. +0
    -31
      src/views/Statistics/index.js
  8. +2
    -2
      vue.config.js

+ 3
- 3
src/page/index/top/index.vue View File

@@ -87,8 +87,8 @@
<top-lock />
</div>
</el-tooltip>
<el-popover placement="bottom" width="350" trigger="click">
<!-- 暂时注释下一版本开发上线 -->
<!-- <el-popover placement="bottom" width="350" trigger="click">
<el-table :data="gridData" @row-click="msgTap">
<el-table-column
width="324"
@@ -104,7 +104,7 @@
</el-table-column>
</el-table>
<i slot="reference" class="el-icon-bell" style="font-size: 18px;color: #fff;"></i>
</el-popover>
</el-popover> -->

<el-tooltip
v-if="showTheme"


+ 7
- 5
src/page/wel.vue View File

@@ -415,7 +415,7 @@
:data="equipmentList"
height="320"
style="width: 100%; font-size: 14px"
>>
>
<el-table-column prop="accName" label="顾问" align="center">
</el-table-column>
<el-table-column prop="accPhone" label="电话" align="center">
@@ -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();


+ 2
- 2
src/views/Customer/SalesStage.vue View File

@@ -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);
}
});
})


+ 3
- 2
src/views/Equipment/equipmentDetailList.vue View File

@@ -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),


+ 2
- 2
src/views/ReceivingRecords/index.vue View File

@@ -344,8 +344,8 @@
@click="Receivedetailsabout(row)"
>查看</el-button
>
<!-- To Doing?按钮未添加权限判断 -->
<el-button type="text" @click="deleteReceive(row)">删除</el-button>
<!-- To Doing?按钮未添加权限判断 下一版本开发(删除) -->
<!-- <el-button type="text" @click="deleteReceive(row)">删除</el-button> -->
<!-- <el-button type="text" v-if="rec_index_text">下载文本</el-button>
<el-button type="text" v-if="rec_index_voice">下载录音</el-button> -->
</template>


+ 2
- 2
src/views/Statistics/BuildingContrast.vue View File

@@ -183,11 +183,11 @@
<div class="text1-2">{{ objList3.sum }}次</div>
</div>
<div class="sanbox1" style="width: 40%">
<div class="text1-1">顾问</div>
<div class="text1-1">楼盘总数</div>
<div class="text1-2">{{ objList3.num }}个</div>
</div>
<div class="sanbox1" style="width: 25%">
<div class="text1-1">人均接待量</div>
<div class="text1-1">平均违规</div>
<div class="text1-2">{{ objList3.avg }}次</div>
</div>
</div>


+ 0
- 31
src/views/Statistics/index.js View File

@@ -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);
});

+ 2
- 2
vue.config.js View File

@@ -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']


Loading…
Cancel
Save