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

manifest.json

@@ -2,7 +2,8 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.4.22",
+    "versionName" : "V1.0.4.23",
+
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {

pages/home/myTicket/myTicket.vue

@@ -31,6 +31,13 @@
 		</view>
 
 		<view v-else class="work-list">
+			<!-- 站号筛选  && -->
+			<view v-if="activeType == 'patrol' && clientEnvironmentId == 10" class="group-tab-bar rx-sc">
+				<view class="group-tab-item" v-for="(tab, idx) in groupTabs" :key="idx"
+					:class="{ active: groupId === tab.groupId }" @click="switchGroup(tab.groupId)">
+					{{ tab.label }}
+				</view>
+			</view>
 			<u-list @scrolltolower="scrolltolower" :key="activeType" :preLoadScreen="page * 10">
 				<u-list-item v-for="(item, index) in dataList" :key="index">
 					<CardTime :time="item.createTime" />
@@ -111,6 +118,10 @@
 		},
 		data() {
 			return {
+				clientEnvironmentId:
+					uni.getStorageSync("userInfo") &&
+					uni.getStorageSync("userInfo").clientEnvironmentId,
+				groupId: null,
 				formData: {},
 				orderTitle: '',
 				tabsCurrent: 0, // tabs初始位置
@@ -352,6 +363,12 @@
 				isInstall: true, // 是否首次进入页面
 				orderType: 1,
 				codeData: [],
+				groupTabs: [
+					{ label: '全部', groupId: null },
+					{ label: '5号站', groupId: '2008729845612720129' },
+					{ label: '6号站', groupId: '2008729929536548865' },
+					{ label: '7号站', groupId: '2008730320160468994' }
+				],
 			}
 		},
 		created() {
@@ -391,6 +408,11 @@
 			this.getCount()
 		},
 		methods: {
+			switchGroup(groupId) {
+				// this.$emit('changeGroup', groupId)
+				this.groupId = groupId;
+				this.getList()
+			},
 			// 相机扫码
 			HandlScanCode() {
 				// uni.scanCode({
@@ -642,11 +664,11 @@
 					})
 				} else {
 					const params = {
-					type: this.tabList[this.activeIndex].workOrderType,
-					pageNum: this.page,
-					size: 10,
-					...this.searchFrom
-				}
+						type: this.tabList[this.activeIndex].workOrderType,
+						pageNum: this.page,
+						size: 10,
+						...this.searchFrom,
+					}
 				// 维修
 				if (this.tabList[this.activeIndex].workOrderType == 3) {
 					// let userInfo = uni.getStorageSync('userInfo')
@@ -667,6 +689,10 @@
 					}
 				}
 
+
+				if(this.activeType == 'patrol' && this.groupId) {
+					params.executeGroupId = this.groupId
+				}
 				
 				console.log('params~~~', params);
 				getWorkOrderList(params)
@@ -709,6 +735,27 @@
 		color: transparent;
 	}
 
+	.group-tab-bar {
+		background: #fff;
+		padding: 16rpx 32rpx;
+		border-bottom: 2rpx solid #e1e1e1;
+		gap: 16rpx;
+	}
+
+	.group-tab-item {
+		padding: 8rpx 24rpx;
+		font-size: 28rpx;
+		color: #666;
+		border-radius: 32rpx;
+		background: #f5f5f5;
+		white-space: nowrap;
+
+		&.active {
+			background: $theme-color;
+			color: #fff;
+		}
+	}
+
 	.scan_btn {
 		background: url('../../../static/scan.png');
 		background-size: 100% 100%;

pages/tour_tally/order/OrderTask.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content_box">
 		<!-- 站号筛选 -->
-		<view class="group-tab-bar rx-sc">
+		<view v-if="clientEnvironmentId == 10" class="group-tab-bar rx-sc">
 			<view class="group-tab-item" v-for="(tab, idx) in groupTabs" :key="idx"
 				:class="{ active: groupId === tab.groupId }" @click="switchGroup(tab.groupId)">
 				{{ tab.label }}
@@ -69,6 +69,9 @@
 		},
 		data() {
 			return {
+				clientEnvironmentId:
+					uni.getStorageSync("userInfo") &&
+					uni.getStorageSync("userInfo").clientEnvironmentId,
 				groupTabs: [
 					{ label: '全部', groupId: null },
 					{ label: '5号站', groupId: '2008729845612720129' },