Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app

pages/maintenance/check/components/CheckCard.vue

@@ -12,7 +12,7 @@
 			<text class="label">标准</text>
 			<text class="cell-content">{{ item.norm }}</text>
 		</view>
-		<view class="card-cell">
+		<!-- <view class="card-cell">
 			<text class="label">工具</text>
 			<view class="cell-content" v-if="item.operationGuide && item.operationGuide.toolList.length > 0">
 				<view v-for="(item, index) in item.operationGuide.toolList">{{ index + 1 }}、{{ item.categoryLevelName }}</view>
@@ -25,7 +25,7 @@
 				<view v-for="(item, index) in item.operationGuide.procedureList">{{ index + 1 }}、{{ item.content }}</view>
 			</view>
 			<view class="cell-content" v-else>无</view>
-		</view>
+		</view> -->
 		<view class="card-cell">
 			<text class="label">结果</text>
 			<view class="cell-content">
@@ -34,17 +34,17 @@
 					<div v-if="item.status == 0" style="color: green">正常</div>
 					<div v-else-if="item.status == -1" style="color: red">异常</div>
 				</view>
-				<textarea v-if="type !== 'view'" placeholder="请输入" v-model="item.result" />
+				<textarea v-if="type !== 'view'" placeholder="请输入" v-model="item.result" @input="inputChange($event, item)" />
 				<view class="result-text" v-else>{{ item.result }}</view>
 				<view class="radio-wrapper" v-if="type !== 'view'">
-					<div
+					<!-- <div
 						v-for="(it, ind) in statusList"
 						:key="ind"
 						class="wrapper-box"
 						@click="changeStatus(item, it)"
 						:style="item.status == it.status && item.status == -1 ? 'color:red;border: 1rpx solid red' : item.status == it.status && item.status == 0 ? 'color:green;border: 1rpx solid green' : ''">
 						{{ it.label }}
-					</div>
+					</div> -->
 					<!-- <u-radio-group
             v-model="item.isNormal"
             placement="row"
@@ -96,6 +96,13 @@
 			}
 		},
 		methods: {
+			inputChange(obj, item) {
+				if (obj.target.value.length > 0) {
+					item.status = -1
+				} else {
+					item.status = 0
+				}
+			},
 			changeStatus(item, it) {
 				item.status = it.status
 			}

pages/quantity/check/components/CheckCard.vue

@@ -12,7 +12,7 @@
 			<text class="label">标准</text>
 			<text class="cell-content">{{ item.norm }}</text>
 		</view>
-		<view class="card-cell">
+		<!-- <view class="card-cell">
 			<text class="label">工具</text>
 			<view class="cell-content" v-if="item.operationGuide && item.operationGuide.toolList.length > 0">
 				<view v-for="(item, index) in item.operationGuide.toolList">{{ index + 1 }}、{{ item.categoryLevelName }}</view>
@@ -25,7 +25,7 @@
 				<view v-for="(item, index) in item.operationGuide.procedureList">{{ index + 1 }}、{{ item.content }}</view>
 			</view>
 			<view class="cell-content" v-else>无</view>
-		</view>
+		</view> -->
 		<view class="card-cell">
 			<text class="label">结果</text>
 			<view class="cell-content">
@@ -34,10 +34,10 @@
 					<div v-if="item.status == 0" style="color: green">正常</div>
 					<div v-else-if="item.status == -1" style="color: red">异常</div>
 				</view>
-				<textarea v-if="type !== 'view'" placeholder="请输入" v-model="item.result" />
+				<textarea v-if="type !== 'view'" placeholder="请输入" v-model="item.result" @input="inputChange($event, item)" />
 				<view class="result-text" v-else>{{ item.result }}</view>
 				<view class="radio-wrapper">
-					<div
+					<!-- <div
 						v-for="(it, ind) in statusList"
 						:key="ind"
 						v-if="type !== 'view'"
@@ -45,7 +45,7 @@
 						@click="changeStatus(item, it)"
 						:style="item.status == it.status && item.status == -1 ? 'color:red;border: 1rpx solid red' : item.status == it.status && item.status == 0 ? 'color:green;border: 1rpx solid green' : ''">
 						{{ it.label }}
-					</div>
+					</div> -->
 					<!-- <u-radio-group
             v-model="item.executeStatus"
             placement="row"
@@ -97,6 +97,13 @@
 			}
 		},
 		methods: {
+			inputChange(obj, item) {
+				if (obj.target.value.length > 0) {
+					item.status = -1
+				} else {
+					item.status = 0
+				}
+			},
 			changeStatus(item, it) {
 				item.status = it.status
 			}

pages/tour_tally/check/components/CheckCard.vue

@@ -12,7 +12,7 @@
 			<text class="label">标准</text>
 			<text class="cell-content">{{ item.norm }}</text>
 		</view>
-		<view class="card-cell">
+		<!-- <view class="card-cell">
 			<text class="label">工具</text>
 			<view class="cell-content" v-if="item.operationGuide && item.operationGuide.toolList.length > 0">
 				<view v-for="(item, index) in item.operationGuide.toolList">{{ index + 1 }}、{{ item.categoryLevelName }}</view>
@@ -25,7 +25,7 @@
 				<view v-for="(item, index) in item.operationGuide.procedureList">{{ index + 1 }}、{{ item.content }}</view>
 			</view>
 			<view class="cell-content" v-else>无</view>
-		</view>
+		</view> -->
 		<view class="card-cell">
 			<text class="label">结果</text>
 			<view class="cell-content">
@@ -34,10 +34,10 @@
 					<div v-if="item.status == 0" style="color: green">正常</div>
 					<div v-else-if="item.status == -1" style="color: red">异常</div>
 				</view>
-				<textarea v-if="type !== 'view'" placeholder="请输入" v-model="item.result" />
+				<textarea v-if="type !== 'view'" placeholder="请输入" v-model="item.result" @input="inputChange($event, item)" />
 				<view class="result-text" v-else>{{ item.result }}</view>
 				<view class="radio-wrapper">
-					<div
+					<!-- <div
 						v-for="(it, ind) in statusList"
 						:key="ind"
 						v-if="type !== 'view'"
@@ -45,7 +45,7 @@
 						@click="changeStatus(item, it)"
 						:style="item.status == it.status && item.status == -1 ? 'color:red;border: 1rpx solid red' : item.status == it.status && item.status == 0 ? 'color:green;border: 1rpx solid green' : ''">
 						{{ it.label }}
-					</div>
+					</div> -->
 					<!-- <u-radio-group
             v-model="item.executeStatus"
             placement="row"
@@ -97,6 +97,13 @@
 			}
 		},
 		methods: {
+			inputChange(obj, item) {
+				if (obj.target.value.length > 0) {
+					item.status = -1
+				} else {
+					item.status = 0
+				}
+			},
 			changeStatus(item, it) {
 				item.status = it.status
 			}