From d19a24c4bf27ded7793a6be2ca88047400d59be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Sun, 29 Sep 2024 17:38:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=94=81=E5=AE=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl   | 50 +++++++++++++++++++++++++++++++++-----
 pages/manage/area-lock.vue | 19 ++++++---------
 utils/mork2.js             |  2 +-
 3 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index 8e7c877..c7f3f2f 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -501,25 +501,63 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	justify-content: flex-start;
 }
 .point-item {
+	position: relative;
 	width: 32.5%;
 	font-size: 28rpx;
 	line-height: 28rpx;
-	height: 84rpx;
-	padding: 14rpx 4rpx;
+	height: 96rpx;
+	padding: 20rpx 4rpx;
 	color: #303133;
 	text-align: center;
 	background: #fff;
 	border: 2rpx solid #DCDFE6;
 	border-radius: 10rpx;
-	overflow: hidden;
+}
+.point-item.cgreen {
+	background: #67C23A;
+	border-color: #67C23A;
+	color: #fff;
+}
+.point-item.cyellow {
+	background: #E6A23C;
+	border-color: #E6A23C;
+	color: #fff;
+}
+.item-checked-wrap {
+	
+}
+.item-checked {
+	position: absolute;
+	right: -6px;
+	top: -8px;
+}
+.point-item.checked {
+	background: #ff6a00;
+	border-color: #ff6a00;
+	color: #fff;
 }
 .point-item:nth-child(3n+2) {
 	margin-left: 1.25%
 	margin-right: 1.25%
 }
 .point-item:nth-child(n+4) {
-	margin-top: 16rpx
+	margin-top: 20rpx
 }
-.point-item.checked {
-	background: #DCDFE6;
+.point-item_n5 {
+	width: 19%;
+	height: 142rpx;
+}
+.point-item_n5:nth-child(5n+1), .point-item_n5:nth-child(5n+2), .point-item_n5:nth-child(5n+3), .point-item_n5:nth-child(5n+4) {
+	margin-left: 0;
+	margin-right: 1.25%
+}
+.point-item_n5:nth-child(5n+5) {
+	margin-left: 0;
+	margin-right: 0
+}
+.point-item_n5:nth-child(4), .point-item_n5:nth-child(5) {
+	margin-top: 0
+}
+.point-item_n5:nth-child(n+6) {
+	margin-top: 20rpx
 }
\ No newline at end of file
diff --git a/pages/manage/area-lock.vue b/pages/manage/area-lock.vue
index 60126bf..10b45b9 100644
--- a/pages/manage/area-lock.vue
+++ b/pages/manage/area-lock.vue
@@ -32,7 +32,10 @@
 			</view> -->
 			<view v-show="dataList.length > 0" class="zd_wrapper grid-wraper">
 				<view class="zd-row point-wraper">
-					<view class="zd-row point-item" v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.checked}">{{e.point_name}}</view>
+					<view class="zd-row point-item" v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'point-item_n5': index === 'QTJGSLZCQ', 'cgreen': e.point_status === '0', 'cyellow': e.point_status === '1'}">
+						<text>{{e.point_name}}</text>
+						<uni-icons class="item-checked" type="checkbox-filled" size="22" :color="e.checked ? '#4e6ef2' : 'transparent'"></uni-icons>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -51,8 +54,8 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	// import {regionList, selectPointByRegion} from '@/utils/mork2.js'
-	import {regionList, selectPointByRegion, handheldLock} from '@/utils/getData2.js'
+	// import {selectPointByRegion} from '@/utils/mork2.js'
+	import {selectPointByRegion, handheldLock} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -61,7 +64,7 @@
 		data() {
 			return {
 				title: '',
-				options: [],
+				options: [{value: 'NBJGZCQ', text: '内部加工暂存区'}, {value: 'QTJGSLZCQ', text: '其他加工送料暂存区'}, {value: 'WXJGZCQ', text: '外协加工暂存区'}],
 				index: '',
 				multiple: true,
 				disabled: false,
@@ -73,16 +76,8 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._regionList()
 		},
 		methods: {
-			async _regionList () {
-				let res = await regionList()
-				this.options = [...res.content]
-				this.options.map(el => {
-					this.$set(el, 'text', el.label)
-				})
-			},
 			selectChange (e) {
 				if (e) {
 					this._selectPointByRegion(e)
diff --git a/utils/mork2.js b/utils/mork2.js
index c37ac79..174e8db 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -37,6 +37,6 @@ export const fabMaterial = (code, code1) => {
 	return res
 }
 export const selectPointByRegion = (code) => {
-	let res = [{point_code: '1', point_name: 'Amada 80T冲床07-01-06-01'}, {point_code: '2', point_name: 'Amada 80T冲床07-01-06-01'}, {point_code: '3', point_name: 'Amada 80T冲床07-01-06-01'}, {point_code: '4', point_name: 'Amada 80T冲床07-01-06-01'}, {point_code: '5', point_name: 'Amada 80T冲床07-01-06-01'}]
+	let res = [{point_code: '1', point_name: 'Amada 80T冲床07-01-06-01'}, {point_code: '2', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '3', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '4', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '5', point_name: 'Amada 80T冲床07-01-06-01', point_status: '1'}, {point_code: '1', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '2', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '3', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '4', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '5', point_name: 'Amada 80T冲床07-01-06-01', point_status: '1'}]
 	return res
 }
\ No newline at end of file