diff --git a/src/views/dataBoard/cpts/screen-echarts-frame/index.vue b/src/views/dataBoard/cpts/screen-echarts-frame/index.vue index 11b9fd232..b78f0595c 100644 --- a/src/views/dataBoard/cpts/screen-echarts-frame/index.vue +++ b/src/views/dataBoard/cpts/screen-echarts-frame/index.vue @@ -40,6 +40,10 @@ export default { // 配置option setOption (option) { this.myChart.setOption(option) + let than = this + this.myChart.on('click',function(param){ + than.$emit('handelClickMyPei',param) + }) }, // 获取option getOption () { diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue index 54b020b35..5aa5c5123 100644 --- a/src/views/dataBoard/renfang/cpts/rkfx.vue +++ b/src/views/dataBoard/renfang/cpts/rkfx.vue @@ -17,7 +17,7 @@
- +
@@ -312,6 +312,9 @@ this.pieOption.series[0].data = this.pieData; this.$refs.pieChart.setOption(this.pieOption); }, + handelClickMyPei(item){ + this.handleClickItem(item) + } }, }; diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 8133a26ec..8e5268e6f 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -426,7 +426,7 @@
- +
@@ -869,6 +869,9 @@ export default { this.$message.error(msg); } }, + handelClickRkfxPei(val){ + console.log(val); + } }, }; diff --git a/src/views/dataBoardMain/main.vue b/src/views/dataBoardMain/main.vue index 5f611d361..dfab43a68 100644 --- a/src/views/dataBoardMain/main.vue +++ b/src/views/dataBoardMain/main.vue @@ -126,7 +126,7 @@ localStorage.setItem("agencyId", data.agencyId); localStorage.setItem("level", data.level); if (!localStorage.getItem("customerName")) { - localStorage.setItem("customerName", data.customerName || ""); + localStorage.setItem("customerName", data.agencyName || ""); } } else { this.$message.error(msg); diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 51c5574ee..ca7eeca3c 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -52,7 +52,7 @@ >
@@ -341,6 +341,13 @@ export default { this.$message.error(msg); } }, + handleCLickNav(){ + let routeData = this.$router.resolve({ + name: "dataBoard" + }); + // window.open(this.$router.push({ name: 'dataBoard' })) + window.open(routeData.href, '_blank'); + }, }, }; diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue index e1026e6fd..c583eeedc 100644 --- a/src/views/main-shuju/main.vue +++ b/src/views/main-shuju/main.vue @@ -129,7 +129,7 @@ export default { localStorage.setItem("agencyId", data.agencyId); localStorage.setItem("level", data.level); if (!localStorage.getItem("customerName")) { - localStorage.setItem("customerName", data.customerName || ""); + localStorage.setItem("customerName", data.agencyName || ""); } } else { this.$message.error(msg); diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index 627a7a424..6ff5e8ce1 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -36,21 +36,21 @@ {{ menu.name }}
-
+ -
+ -
+
diff --git a/src/views/main.vue b/src/views/main.vue index 656358f64..278b8e9b6 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -161,7 +161,7 @@ export default { if (!localStorage.getItem("customerName")) { localStorage.setItem( "customerName", - data.customerName || "" + data.agencyName || "" ); } } else { diff --git a/src/views/modules/cabaseinfo/carotators-binding-house.vue b/src/views/modules/cabaseinfo/carotators-binding-house.vue index b7014bcdd..86532b506 100644 --- a/src/views/modules/cabaseinfo/carotators-binding-house.vue +++ b/src/views/modules/cabaseinfo/carotators-binding-house.vue @@ -226,7 +226,7 @@ export default { typePlaceholder: { jumin: "请输入姓名或电话或证件号", - fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼", + fangwu: "请输入小区名称或楼栋名称", xuqiu: "请输入需求人或需求内容或服务方", }, diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 0c3e4b9d4..ee83ccf94 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -299,7 +299,7 @@ export default { typePlaceholder: { jumin: "请输入姓名或电话或证件号", - fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼", + fangwu: "请输入小区名称或楼栋名称", xuqiu: "请输入需求人或需求内容或服务方", }, diff --git a/src/views/modules/plugins/power/kernelhouseholdForm.vue b/src/views/modules/plugins/power/kernelhouseholdForm.vue index ea63b0989..f22d642dd 100644 --- a/src/views/modules/plugins/power/kernelhouseholdForm.vue +++ b/src/views/modules/plugins/power/kernelhouseholdForm.vue @@ -11,7 +11,7 @@ class="resi-cell-input" size="small" clearable - placeholder="请输入“小区名称，楼号，如：亿联小区，1号楼"> + placeholder="请输入小区名称或楼栋名称"> diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue index 8a74de072..581f0e2e1 100644 --- a/src/views/modules/shequ/chaxun.vue +++ b/src/views/modules/shequ/chaxun.vue @@ -364,7 +364,7 @@ export default { typePlaceholder: { jumin: "请输入姓名或电话或证件号", - fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼", + fangwu: "请输入小区名称或楼栋名称", xuqiu: "请输入需求人或需求内容或服务方", }, diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index 1380eac95..bc9ae534f 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -606,7 +606,7 @@ export default { typePlaceholder: { jumin: "请输入姓名或电话或证件号", - fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼", + fangwu: "请输入小区名称或楼栋名称", xuqiu: "请输入需求人或需求内容或服务方", },