bug修复

common/common.scss

@@ -22,6 +22,15 @@ radio,checkbox {
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
+.inTwoLine{
+	display: -webkit-box;    
+	-webkit-box-orient: vertical;    
+	-webkit-line-clamp: 2;    
+	overflow: hidden;
+}
+
+
+
 /* 画面监控引入特殊字体 */
 	@font-face {
 	  font-family: 'FANDOLFANG-REGULAR';  /* project id 2394829 */
@@ -120,7 +129,7 @@ radio,checkbox {
 
 .cu-list.menu-avatar>.cu-item .content {
 	left: 120rpx;
-	width: 580rpx;
+	width: 550rpx;
 }
 
 .unProcess,.error {

components/list-test/list-test.vue

@@ -25,8 +25,8 @@
 					
 					
 					<view class="content" v-if="nowType==1"  @tap="goNowUrl(item)" >
-						<view class="text-grey site-tit">
-							<text style="width:93%">{{item.siteName}}（ 共{{item.siteAlarmCount}}个未处理告警 ）</text>
+						<view class="text-grey site-tit ">
+							<text style="width:93%" class="inTwoLine">{{item.siteName}}（ 共{{item.siteAlarmCount}}个未处理告警 ）</text>
 						</view>
 					</view>
 					

pages/device-Manage/device-Manage.vue

@@ -5,8 +5,8 @@
 			<view class="cu-item deviceTypeItem" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in deviceData"
 			 :key="index" :data-target="'move-box-' + index" @tap="goDeviceDetail(item)">
 				<view class="cu-avatar round lg" style="background-image:url(../../static/jx.png)"></view>
-				<view class="content" >
-					<view class="">{{item.deviceName}}</view>
+				<view class="content" style="width:440rpx">
+					<view class="inOneLine cut" style="display:block">{{item.deviceName}}</view>
 				</view>
 				<view class="nav-right num">
 					<view class="text-grey">

pages/eleControl/controlReport/controlReport.vue

@@ -6,12 +6,12 @@
 				<view class="cu-item"  :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in controlReport"
 				 :key="index" :data-target="'move-box-' + index"  @tap="goDetail(item.id)" >
 					<view class="cu-avatar round lg" style="background-image:url(../../../static/controlReportIcon.png)"></view>
-					<view class="content" >
+					<view class="content">
 						<view class="pro-title">
-							<view class="cut">{{item.supervision_title}}</view>
+							<view class="cut inOneLine">{{item.supervision_title}}</view>
 						</view>
-						<view class="pro-date ">{{item.site_name}}</view>
-						<view class="pro-date ">{{item.create_time}}</view>
+						<view class="pro-date inOneLine">{{item.site_name}}</view>
+						<view class="pro-date inOneLine">{{item.create_time}}</view>
 						
 						
 					</view>

pages/eleControl/powerCut/powerCut.vue

@@ -38,9 +38,9 @@
 						 @tap="goDetail(item.id)">
 						<view class="cu-avatar lg" style="background-image:url(../../../static/unprocessIcon.png);">
 						</view>
-						<view class="content">
+						<view class="content"  style="width:460rpx">
 							<view class="pro-title">
-								<view class="cut">{{item.site_name}}</view>
+								<view class="cut inOneLine">{{item.site_name}}</view>
 							</view>
 							<view class="pro-date ">{{item.start_time}}</view>
 						</view>
@@ -59,25 +59,25 @@
 		<!-- 执行中 -->
 		<block v-if="TabCur==1">
 			<view style=" height: calc(100vh - 400rpx);overflow: scroll;">
-				<view class="cu-list menu-avatar ">
-					<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
+				<view class="cu-list menu-avatar eleDoing">
+					<view class="cu-item " :class="modalName=='move-box-'+ index?'move-cur':''"
 						@touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd"
 						:data-target="'move-box-' + index" v-for="(item,index) in planListData" :key="index"
 						 @tap="goDetail(item.id)">
 						<view class="cu-avatar lg" style="background-image:url(../../../static/processingIcon.png);">
 						</view>
-						<view class="content">
+						<view class="content" style="width:460rpx">
 							<view class="pro-title">
-								<view class="cut">{{item.site_name}}</view>
+								<view class="cut inOneLine">{{item.site_name}}</view>
 							</view>
 							<view class="pro-date ">{{item.start_time}}</view>
 						</view>
 						<view class="action" style="z-index:99">
 							<view class="processing" @tap="goProcessedDetail(item.id)">执行中</view>
 						</view>
-						<view class="move">
-							<view class="bg-grey" @click.stop="editItem(item)">编辑</view>
-							<view class="bg-red" @click.stop="deleteItem(item)">删除</view>
+						<view class="move"  style="width: 66px;"  >
+							<view class="bg-grey"@click.stop="editItem(item)">编辑</view>
+							<!-- <view class="bg-red" @click.stop="deleteItem(item)">删除</view> -->
 						</view>
 					</view>
 					<view class="text-center margin-top" v-if="planListData.length === 0">暂无数据...</view>
@@ -91,9 +91,9 @@
 					<view class="cu-item" v-for="(item,index) in planListData" :key="index" @tap="goDetail(item.id)">
 						<view class="cu-avatar lg" style="background-image:url(../../../static/processedIcon.png);">
 						</view>
-						<view class="content">
+						<view class="content"  style="width:460rpx">
 							<view class="pro-title">
-								<view class="cut">{{item.site_name}}</view>
+								<view class="cut inOneLine">{{item.site_name}}</view>
 							</view>
 							<view class="pro-date ">{{item.start_time}}</view>
 						</view>
@@ -283,4 +283,8 @@
 			color: #4274E7
 		}
 	}
+	
+	.cu-list.eleDoing>.cu-item.move-cur {
+		-webkit-transform: translateX(-66px);
+	}
 </style>

pages/messagePush/messagePush.vue

@@ -84,7 +84,7 @@
 						title: '电流越限'
 					},
 					{
-						value: '12',
+						value: 'm12',
 						checked: false,
 						title: '过流跳闸'
 					},

pages/processList/processList.vue

@@ -19,12 +19,12 @@
 
 					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
 						<view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>
-						<view class="content">
+						<view class="content" style="width:450rpx">
 							<view class="pro-title">
-								<view class="cut">{{item.measName}}</view>
+								<view class="cut inOneLine">{{item.measName}}</view>
 							</view>
 							<view class="pro-des  ">
-								<view class="text-cut">
+								<view class="text-cut inOneLine">
 									{{item.digitalValue!=0?"动作":"复归"}}
 								</view>
 							</view>
@@ -84,12 +84,12 @@
 
 							<view class="cu-avatar lg" :style="{'left':handleStatus==2 ? '60rpx':'0'}"
 								style="background-image:url(../../static/processed-icon.png);"></view>
-							<view class="content" :style="{'left':handleStatus==2 ? '180rpx':'120rpx'}">
+							<view class="content" style="width:400rpx" :style="{'left':handleStatus==2 ? '180rpx':'120rpx'}">
 								<view class="pro-title">
-									<view class="cut">{{item.measName}}</view>
+									<view class="cut inOneLine">{{item.measName}}</view>
 								</view>
 								<view class="pro-des  ">
-									<view class="text-cut">
+									<view class="text-cut inOneLine">
 										{{item.digitalValue!=0?"动作":"复归"}}
 									</view>
 								</view>

pages/siteAdd/siteAdd.vue

@@ -8,7 +8,7 @@
 					<text class="necessary">*</text>
 					站点名称:
 				</view>
-				<input name="userName" v-model="siteName"></input>
+				<input name="userName" v-model="siteName" maxlength="15" ></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>地址:</view>

pages/siteArchive/siteArchive.vue

@@ -40,7 +40,7 @@
 						</view>
 					</view>
 
-					<view class="move" style="    width: 66px;">
+					<view class="move" style="width: 66px;">
 						<view class="bg-grey" @click.stop="editItem(item)">编辑</view>
 					</view>
 				</view>

pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -570,7 +570,7 @@
 				}
 				if (this.isDate(this.formMess.electric_test_overdue) == false) {
 					uni.showToast({
-						title: "日期格式不正确，正确格式为：yyyy-mm-dd",
+						title: "电试报告时间日期格式不正确，正确格式为：yyyy-mm-dd",
 						icon: "none"
 					});
 					return

pages/siteManage/siteManage.vue

@@ -38,7 +38,7 @@
 					<view class="cu-avatar round lg" style="background-image: url(../../static/site-icon.png);"></view>
 
 					<view class="content" @tap="goDeviceManage(item)">
-						<view class="text-grey site-tit">{{item.siteName}}</view>
+						<view class="text-grey site-tit inOneLine" style="display:block">{{item.siteName}}</view>
 					</view>
 
 					<view class="nav-right num">