name 批量调整显示

pages/abnormal/abnormalAlarmRecord.vue

@@ -42,7 +42,8 @@
 
 				<view class="equipment">
 					<view class="equipment1">
-						{{item.meterName}}
+						
+						{{replaceLastTwoWords(item.meterName)}}
 					</view>
 					<view class="equipment2">
 						{{item.installationAddressSimple}}

pages/equipmentDataMonitoring/dataMonitoring-list.vue

@@ -32,7 +32,8 @@
 					</view>
 					<view class="equipment">
 						<view class="name1">
-							{{item.name}}
+						
+							{{replaceLastTwoWords(item.name)}}
 						</view>
 						<view class="name2">
 							{{item.installationAddressSimple}}

pages/equipmentDataMonitoring/dataMonitoring-map.vue

@@ -67,7 +67,7 @@
 								</view>
 								<view class="equipment">
 									<view class="name1">
-										{{item.name}}
+										{{replaceLastTwoWords(item.name)}}
 									</view>
 									<view class="name2">
 										{{item.installationAddressSimple}}

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -11,10 +11,9 @@
 				<view class="back" @click="backDataMonitoringList">
 					<u-icon name="arrow-left" color="#fff" size="36"></u-icon>
 				</view>
-				<view class="title" @click="titleCk">
+				<view class="title">
 					{{tabsFrom.title}}
-					<u-icon name="arrow-down" v-if="tabsFrom.selector1.length"
-					 color="#fff" size="24"></u-icon>
+				
 				</view>
 			</view>
 		</view>
@@ -328,7 +327,8 @@
 							</view>
 							<view class="item-value">
 								<span>{{meterDetail.installationAddress}}</span>
-								<image class="img" src="@/assets/img/riFill-navigation-fill 1.svg"></image>
+								<image class="img" v-if="0"
+								 src="@/assets/img/riFill-navigation-fill 1.svg"></image>
 							</view>
 						</view>
 						<view class="item">
@@ -504,9 +504,9 @@
 					this.ref=op.ref;
 					this.FormData.meterId = op.id;
 					this.FormData2.meterId = op.id;
-					this.tabsFrom.title = op.name;
+					this.tabsFrom.title = this.replaceLastTwoWords(op.name);
 					this.meterId = op.id;
-					this.titleName = op.name;
+					this.titleName = this.replaceLastTwoWords(op.name);
 					this.companyId = op.companyId;
 				}
 				this.endYear = new Date().getFullYear();
@@ -545,7 +545,7 @@
 				uni.showModal({
 					confirmColor:`${key?'#3CC51F':'red'}`,
 					confirmText:`${key?'开启':'关闭'}`,
-					content: `确认是否要"${key?'开启':'关闭'}"${node.name}`,
+					content: `确认是否要"${key?'开启':'关闭'}"${this.replaceLastTwoWords(node.name)}`,
 					title: "提示",
 					success:res=> {
 						if(res.confirm){
@@ -581,7 +581,8 @@
 					meterId: meterId
 				}).then((res) => {
 					uni.hideLoading();
-					this.meterDetail = res.data.meter;
+					this.meterDetail = res.data.meter;
+					this.meterDetail.name=this.replaceLastTwoWords(this.meterDetail.name)
 					this.codes =this.carhelp.getPersonInfo().codes;
 					
 				}).catch(error => {

pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -53,7 +53,7 @@
 				<view class="item-content">
 					<view class="equipment">
 						<view class="equipment1 ">
-							{{item.name}}
+							{{replaceLastTwoWords(item.name)}}
 						</view>
 						<view class="equipment2">
 							{{item.installationAddressSimple}}
@@ -374,7 +374,7 @@
 				uni.showModal({
 					confirmColor:`${key?'#3CC51F':'red'}`,
 					confirmText:`${key?'开启':'关闭'}`,
-					content: `确认是否要"${key?'开启':'关闭'}"${node.name}`,
+					content: `确认是否要"${key?'开启':'关闭'}"${this.replaceLastTwoWords(node.name)}`,
 					title: "提示",
 					success:res=> {
 						if(res.confirm){

pages/equipmentInformation/equipmentConditionMonitoring.vue

@@ -38,7 +38,7 @@
 				<view class="item-content">
 					<view class="content1">
 						<view class="name1">
-							{{item.name}}
+							{{replaceLastTwoWords(item.name)}}
 						</view>
 						<view class="name2">
 							{{item.installationAddressSimple}}

pages/equipmentInformation/equipmentInformation.vue

@@ -40,7 +40,7 @@
 				</view>
 				<view class="item-name">
 					<view class="name1">
-						{{item.name}}
+						{{replaceLastTwoWords(item.name)}}
 					</view>
 					<view class="name2">
 						{{item.deviceTypeN}}

pages/managementList/applicantsList.vue

@@ -87,7 +87,7 @@
 						
 						<view class="item" v-for="(item,i) in meterList"  >
 							<view class="item-title">
-								{{item.name}}
+								{{replaceLastTwoWords(item.name)}}
 							</view>
 							<view class="item-radio">
 							<!-- 	<label class="radio">

pages/managementList/applyAuthorisation.vue

@@ -227,8 +227,7 @@
 				uni.showModal({
 					confirmColor:`${key?'#3CC51F':'red'}`,
 					confirmText:`${key?'开启':'关闭'}`,
-					content: `确认是否要"${key?'开启':'关闭'}"${node.name}`,
-					title: "提示",
+					content: `确认是否要"${key?'开启':'关闭'}"${this.replaceLastTwoWords(node.name)}`,					title: "提示",
 					success:res=> {
 						if(res.confirm){
 							//this.switchBtnApiMethod(node,key);

pages/managementList/managementList.vue

@@ -118,7 +118,7 @@
 							
 							<view class="item" v-for="(item,i) in meterList"  >
 								<view class="item-title">
-									{{item.name}}
+									{{replaceLastTwoWords(item.name)}}
 								</view>
 								<view class="item-radio">
 								<!-- 	<label class="radio">

pages/statistics/statistics.vue

@@ -327,7 +327,7 @@
 							<view class="item-content">
 								<view class="equipment">
 									<view class="equipment1 ">
-										{{item.name}}
+										{{replaceLastTwoWords(item.name)}}
 									</view>
 
 									<view class="equipment2">
@@ -862,7 +862,7 @@
 				uni.showModal({
 					confirmColor:`${key?'#3CC51F':'red'}`,
 					confirmText:`${key?'开启':'关闭'}`,
-					content: `确认是否要"${key?'开启':'关闭'}"${node.name}`,
+				content: `确认是否要"${key?'开启':'关闭'}"${this.replaceLastTwoWords(node.name)}`,
 					title: "提示",
 					success:res=> {
 						if(res.confirm){

pages/tenantList/operationLog.vue

@@ -23,8 +23,9 @@
 		<view class="log">
 			<view class="log-item" v-for="(item,i) in list">
 				<view class="item-infos">
-					<view class="place">
-						{{item.meterName}} <text v-if="item.installationAddress">({{item.installationAddress}})</text>
+					<view class="place">
+						{{replaceLastTwoWords(item.meterName)}}
+						 <text v-if="item.installationAddress">({{item.installationAddress}})</text>
 					</view>
 					<view class="date">
 						 {{item.switchStatusN}}
@@ -163,7 +164,7 @@
 					var i =0;
 					this.meterList.forEach(item=>{
 						this.tabsFrom.selector1.push({
-							label: item.name,
+							label:  this.replaceLastTwoWords(item.name),
 							value: item.id,
 						})
 						

pages/tenantList/remoteControl.vue

@@ -65,7 +65,7 @@
 						margin:'2rpx 8rpx 2rpx  0',
 				 	color:'#fff',
 				 }" >{{item.typeN}}</span>	
-				 <span class="name2">{{item.name}}</span>
+				 <span class="name2">{{replaceLastTwoWords(item.name)}}</span>
 					</view>
 					<view class="place">
 						{{item.installationAddressSimple}}
@@ -224,7 +224,7 @@
 				uni.showModal({
 					confirmColor:`${key?'#3CC51F':'red'}`,
 					confirmText:`${key?'开启':'关闭'}`,
-					content: `确认是否要"${key?'开启':'关闭'}"${node.name}`,
+					content: `确认是否要"${key?'开启':'关闭'}"${this.replaceLastTwoWords(node.name)}`,
 					title: "提示",
 					success:res=> {
 						if(res.confirm){

pages/tenantList/switchDetail.vue

@@ -178,7 +178,7 @@
 				uni.showModal({
 					confirmColor:`${key?'#3CC51F':'red'}`,
 					confirmText:`${key?'开启':'关闭'}`,
-					content: `确认是否要"${key?'开启':'关闭'}"${node.name}`,
+					content: `确认是否要"${key?'开启':'关闭'}"${this.replaceLastTwoWords(node.name)}`,
 					title: "提示",
 					success:res=> {
 						if(res.confirm){
@@ -211,7 +211,7 @@
 					}
 					this.getMeterReady=true;
 					if(this.meterDetails.meter){
-						this.title=this.meterDetails.meter.name
+						this.title=this.replaceLastTwoWords(this.meterDetails.meter.name)
 						this.source=this.meterDetails.meter.source
 					}