Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

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 () {

src/views/dataBoard/renfang/cpts/rkfx.vue

@@ -17,7 +17,7 @@
 				</div>
 			</div>
 			<div class="pie">
-				<screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame>
+				<screen-echarts-frame @myChartMethod="pieInitOk" @handelClickMyPei="handelClickMyPei" ref="pieChart"></screen-echarts-frame>
 			</div>
 		</div>
 	</div>
@@ -312,6 +312,9 @@
 				this.pieOption.series[0].data = this.pieData;
 				this.$refs.pieChart.setOption(this.pieOption);
 			},
+			handelClickMyPei(item){
+				this.handleClickItem(item)
+			}
 		},
 	};
 </script>

src/views/dataBoard/renfang/index.vue

@@ -426,7 +426,7 @@
 					</div>
 
 					<div class="m-subbox">
-						<rkfx :orgId="orgData.org_id"></rkfx>
+						<rkfx :orgId="orgData.org_id" @handelClickRkfxPei="handelClickRkfxPei"></rkfx>
 					</div>
 				</div>
 			</div>
@@ -869,6 +869,9 @@ export default {
 				this.$message.error(msg);
 			}
 		},
+		handelClickRkfxPei(val){
+			console.log(val);
+		}
 	},
 };
 </script>

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

src/views/main-navbar.vue

@@ -52,7 +52,7 @@
 				>
 					<el-menu-item
 						index="3"
-						@click="$router.push({ name: 'dataBoard' })"
+						@click="handleCLickNav"
 					>
 						<div class="nav-item">
 							<img src="~@/assets/images/main/nav-sjdb.png" />
@@ -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');
+		},
 	},
 };
 </script>

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

src/views/main-sidebar.vue

@@ -36,21 +36,21 @@
             <span>{{ menu.name }}</span>
           </div>
 
-          <div class="nav-div"></div>
+          <!-- <div class="nav-div"></div> -->
 
-          <div class="nav-item" @click="$router.push({ name: 'dataBoard' })">
+          <!-- <div class="nav-item" @click="$router.push({ name: 'dataBoard' })">
             <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
               <use xlink:href="#icon-stock" />
             </svg>
             <span>可视化</span>
-          </div>
+          </div> -->
 
-          <div class="nav-item" @click="$router.push({ name: 'main-shuju' })">
+          <!-- <div class="nav-item" @click="$router.push({ name: 'main-shuju' })">
             <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
               <use xlink:href="#icon-stock" />
             </svg>
             <span>可视化旧</span>
-          </div>
+          </div> -->
         </div>
       </div>
 

src/views/main.vue

@@ -161,7 +161,7 @@ export default {
 					if (!localStorage.getItem("customerName")) {
 						localStorage.setItem(
 							"customerName",
-							data.customerName || ""
+							data.agencyName || ""
 						);
 					}
 				} else {

src/views/modules/cabaseinfo/carotators-binding-house.vue

@@ -226,7 +226,7 @@ export default {
 
       typePlaceholder: {
         jumin: "请输入姓名或电话或证件号",
-        fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
+        fangwu: "请输入小区名称或楼栋名称",
         xuqiu: "请输入需求人或需求内容或服务方",
       },
 

src/views/modules/home/index.vue

@@ -299,7 +299,7 @@ export default {
 
 			typePlaceholder: {
 				jumin: "请输入姓名或电话或证件号",
-				fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
+				fangwu: "请输入小区名称或楼栋名称",
 				xuqiu: "请输入需求人或需求内容或服务方",
 			},
 

src/views/modules/plugins/power/kernelhouseholdForm.vue

@@ -11,7 +11,7 @@
                         class="resi-cell-input"
                         size="small"
                         clearable
-                        placeholder="请输入“小区名称，楼号，如：亿联小区，1号楼">
+                        placeholder="请输入小区名称或楼栋名称">
               </el-input>
             </div>
           </div>

src/views/modules/shequ/chaxun.vue

@@ -364,7 +364,7 @@ export default {
 
       typePlaceholder: {
         jumin: "请输入姓名或电话或证件号",
-        fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
+        fangwu: "请输入小区名称或楼栋名称",
         xuqiu: "请输入需求人或需求内容或服务方",
       },
 

src/views/modules/shequ/index.vue

@@ -606,7 +606,7 @@ export default {
 
       typePlaceholder: {
         jumin: "请输入姓名或电话或证件号",
-        fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
+        fangwu: "请输入小区名称或楼栋名称",
         xuqiu: "请输入需求人或需求内容或服务方",
       },