Merge branch 'develop' of http://192.168.1.222:3000/duhongyu/AnYang_UI into develop

WebChartNewest/css/index.css

@@ -456,6 +456,7 @@ body {
 	margin-bottom: 4px;
 	padding: 0 7px;
 	cursor: pointer;
+	white-space: nowrap;
 }
 #keyword span label{
 	color: #00fcff !important;

WebChartNewest/js/index.js

@@ -614,32 +614,32 @@ function getHotLineInfo(strName, bili, n) {
 	if (n == 8) {
 		$('.lineB').css({
 			'display': 'block',
-			'top': '-24px',
-			'left': '-25px'
+			'top': '60px',
+			'left': '-24px'
 		})
 	} else if (n == 11) {
 		$('.lineB').css({
 			'display': 'block',
-			'top': '137px',
-			'left': '136px'
+			'top': '-24px',
+			'left': '305px'
 		})
 	} else if (n == 4) {
 		$('.lineB').css({
 			'display': 'block',
-			'top': '137px',
-			'left': '-24px'
+			'top': '60px',
+			'left': '380px'
 		})
 	} else if (n == 10) {
 		$('.lineB').css({
 			'display': 'block',
 			'top': '-24px',
-			'left': '55px'
+			'left': '380px'
 		})
 	} else if (n == 5) {
 		$('.lineB').css({
 			'display': 'block',
-			'top': '57px',
-			'left': '391px'
+			'top': '144px',
+			'left': '60px'
 		})
 	} else if (n == 3) {
 		$('.lineB').css({
@@ -656,8 +656,8 @@ function getHotLineInfo(strName, bili, n) {
 	} else if (n == 2) {
 		$('.lineB').css({
 			'display': 'block',
-			'top': '57px',
-			'left': '56px'
+			'top': '60px',
+			'left': '60px'
 		})
 	} else if (n == 1) {
 		$('.lineB').css({
@@ -668,44 +668,44 @@ function getHotLineInfo(strName, bili, n) {
 	} else if (n == 7) {
 		$('.lineB').css({
 			'display': 'block',
-			'top': '137px',
-			'left': '56px'
+			'top': '144px',
+			'left': '225px'
 		})
 	} else if (n == 12) {
 		$('.lineB').css({
 			'display': 'block',
 			'top': '-24px',
-			'left': '390px'
+			'left': '225px'
 		})
 	} else if (n == 6) {
 		$('.lineB').css({
 			'display': 'block',
-			'top': '134px',
-			'left': '230px'
+			'top': '144px',
+			'left': '-24px'
 		})
 	} else if (n == 9) {
 		$('.lineB').css({
 			'display': 'block',
-			'top': '62px',
-			'left': '-24px'
+			'top': '144px',
+			'left': '140px'
 		})
 	} else if (n == 13) {
 		$('.lineB').css({
 			'display': 'block',
 			'top': '-24px',
-			'left': '304px'
+			'left': '140px'
 		})
 	} else if (n == 15) {
 		$('.lineB').css({
 			'display': 'block',
 			'top': '-24px',
-			'left': '145px'
+			'left': '-25px'
 		})
 	} else if (n == 14) {
 		$('.lineB').css({
 			'display': 'block',
 			'top': '-24px',
-			'left': '222px'
+			'left': '60px'
 		})
 	}
 }

anyangWebAPP/pages/myTask/workOrderList/workOrderDetail/buttons/components/button_17/button_17.vue

@@ -13,7 +13,7 @@
 				<uni-forms-item label="申请延时时间" required name="limittime">
 					<view class="detailContent" v-model="valiFormData.newlimittime">{{valiFormData.newlimittime}}</view>
 				</uni-forms-item>
-				<uni-forms-item label="审核意见" required name="reason">
+				<uni-forms-item label="审核意见"  name="reason">
 					<uni-easyinput type="textarea" autoHeight v-model="valiFormData.reason" placeholder="请输入审核意见"/>
 				</uni-forms-item>
 				
@@ -43,12 +43,6 @@
 				auditInfotData:{}, //审核信息
 				// 校验规则
 				rules: {
-					reason: {
-						rules: [{
-							required: true,
-							errorMessage: '审核原因不能为空'
-						}]
-					}
 				},
 			}
 		},

anyangWebAPP/pages/myTask/workOrderList/workOrderDetail/workOrderDetail.vue

@@ -40,18 +40,6 @@
 		<yiLine>
 			<view></view>
 		</yiLine>
-
-
-		<view class="operationButton">
-			<view>
-				<text class="operationButtonTitle">操作</text>
-				<buttonsComponents class="buttons" :order-button-data="orderButtonData" :wid="wid" :tap='tap'/>
-			</view>
-		</view>
-
-		<yiLine>
-			<view></view>
-		</yiLine>
 		<view class="handleProcess">
 			<view>
 				<text class="handleProcessTitle">办理过程</text>
@@ -65,6 +53,17 @@
 				</view>
 			</view>
 		</view>
+		<yiLine>
+			<view></view>
+		</yiLine>
+
+		<view class="operationButton">
+			<view>
+				<text class="operationButtonTitle">操作</text>
+				<buttonsComponents class="buttons" :order-button-data="orderButtonData" :wid="wid" :tap='tap'/>
+			</view>
+		</view>
+		
 	</view>
 </template>