站点管理

locale/en.json

@@ -9,7 +9,7 @@
 	"button.clear": "清空",
 	"button.clear-point": "清空点位",
 	"button.search": "查询",
-	"button.clear-col": "清空列",
+	"button.clear-col": "清空排",
 	"button.scan-add": "扫码插入",
 	"button.add-row": "插入行",
 	"button.del-row": "删除行",
@@ -77,7 +77,7 @@
 	"filter.start-area": "起点区域",
 	"filter.end-area": "终点区域",
 	"filter.control-area": "管制区域",
-	"filter.col": "列",
+	"filter.col": "排",
 	"filter.carno": "车号",
 	"grid.number": "序号",
 	"grid.roll-number": "卷号",
@@ -97,6 +97,8 @@
 	"grid.enter-area": "进入区域",
 	"grid.wltype": "物料类型",
 	"grid.has-task": "是否有任务",
+	"grid.region_code": "区域编码",
+	"grid.region_name": "区域名称",
 	"toast.select-row": "请选择一行",
 	"toast.device-not-empty": "设备不能为空",
 	"toast.material-not-empty": "物料不能为空",

locale/jp.json

@@ -9,7 +9,7 @@
 	"button.clear": "クリアランス",
 	"button.clear-point": "ポイントをクリア",
 	"button.search": "クエリー＃クエリー＃",
-	"button.clear-col": "列を空にする",
+	"button.clear-col": "整理整列",
 	"button.scan-add": "スイープコード挿入",
 	"button.add-row": "行の挿入",
 	"button.del-row": "行の削除",
@@ -97,6 +97,8 @@
 	"grid.enter-area": "ゾーンに入る",
 	"grid.wltype": "品目タイプ",
 	"grid.has-task": "タスクの有無",
+	"grid.region_code": "ゾーンコーディング",
+	"grid.region_name": "領域名",
 	"toast.select-row": "行を選択してください",
 	"toast.device-not-empty": "デバイスを空にすることはできません",
 	"toast.material-not-empty": "品目を空にすることはできません",

locale/zh-Hans.json

@@ -9,7 +9,7 @@
 	"button.clear": "清空",
 	"button.clear-point": "清空点位",
 	"button.search": "查询",
-	"button.clear-col": "清空列",
+	"button.clear-col": "清空排",
 	"button.scan-add": "扫码插入",
 	"button.add-row": "插入行",
 	"button.del-row": "删除行",
@@ -77,7 +77,7 @@
 	"filter.start-area": "起点区域",
 	"filter.end-area": "终点区域",
 	"filter.control-area": "管制区域",
-	"filter.col": "列",
+	"filter.col": "排",
 	"filter.carno": "车号",
 	"grid.number": "序号",
 	"grid.roll-number": "卷号",
@@ -97,6 +97,8 @@
 	"grid.enter-area": "进入区域",
 	"grid.wltype": "物料类型",
 	"grid.has-task": "是否有任务",
+	"grid.region-code": "区域编码",
+	"grid.region-name": "区域名称",
 	"toast.select-row": "请选择一行",
 	"toast.device-not-empty": "设备不能为空",
 	"toast.material-not-empty": "物料不能为空",

pages/ftdlDTY/agv-manage.vue

@@ -6,7 +6,7 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<!-- <span class="filter_label">管制区域</span> -->
+						<!-- <span class="filter_label">车号</span> -->
 						<span class="filter_label">{{$t('filter.carno')}}</span>
 					</view>
 					<view class="zd-col-24 filter_select">
@@ -57,7 +57,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import { confirmAction } from '@/utils/utils.js'
-	import {getAgvNos, selectRegionInfo, pause, resume} from '@/utils/getData4.js'
+	import {getAgvNos, selectAgvInfo, pause, resume} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -118,10 +118,10 @@
 			searchList () {
 				this.dataList = []
 				this.pageNum = 1
-				this._selectRegionInfo()
+				this._selectAgvInfo()
 			},
-			async _selectRegionInfo () {
+			async _selectAgvInfo () {
-				let res = await selectRegionInfo(this.index)
+				let res = await selectAgvInfo(this.index)
 				if (res.code === '200') {
 					this.dataList = res.data
 					// this.totalCount = res.totalElements
@@ -143,7 +143,7 @@
 					this.status = 'loading'
 					setTimeout(() => {
 						this.pageNum++
-						this._selectRegionInfo()
+						this._selectAgvInfo()
 					}, 1000)
 				} else { //停止加载
 					this.status = 'noMore'

pages/ftdlDTY/area-manage.vue

@@ -24,16 +24,16 @@
 								<th>进入人</th>
 								<th>进入区域</th> -->
 								<th>{{$t('grid.number')}}</th>
-								<th>{{$t('grid.enter-time')}}</th>
+								<th>{{$t('grid.region-code')}}</th>
-								<th>{{$t('grid.enter-man')}}</th>
+								<th>{{$t('grid.status')}}</th>
-								<th>{{$t('grid.enter-area')}}</th>
+								<th>{{$t('grid.region-name')}}</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.create_name === pkId}">
 								<td>{{i+1}}</td>
-								<td>{{e.create_time}}</td>
+								<td>{{e.region_code}}</td>
-								<td>{{e.create_name}}</td>
+								<td>{{e.status}}</td>
 								<td>{{e.region_name}}</td>
 							</tr>
 						</tbody>

pages/ftdlDTY/man-get-goods.vue

@@ -18,7 +18,7 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<!-- <span class="filter_label">列</span> -->
+						<!-- <span class="filter_label">排</span> -->
 						<span class="filter_label">{{$t('filter.col')}}</span>
 					</view>
 					<view class="zd-col-24 filter_select">

pages/ftdlDTY/zd-manage.vue

@@ -40,7 +40,7 @@
 							v-for="item in group" 
 							:key="item.point_code"
 							class="point-item"
-							:class="item.status === '2' ? 'has-goods' : 'no-goods'"
+							:class="item.point_status === '2' ? 'has-goods' : 'no-goods'"
 						>
 							<!-- 左上角状态标识 -->
 							<!-- <view class="status-indicator" :class="item.status === '2' ? 'has-goods' : 'no-goods'"></view> -->
@@ -72,91 +72,91 @@
 				dataList: [
 					{
 					"point_code": "R6_01_01", 
-					"status": "1", //1-无货 2-有货
+					"point_status": "1", //1-无货 2-有货
 					"row_num": "1",
 					"point_name": "1区域01排01列"
 					},
 					{
 					"point_code": "R6_01_02", 
-					"status": "2", 
+					"point_status": "2", 
 					"row_num": "1",
 					"point_name": "1区域01排02列"
 					},
 					{
 					"point_code": "R6_01_03", 
-					"status": "1", 
+					"point_status": "1", 
 					"row_num": "1",
 					"point_name": "1区域01排03列"
 					},
 					{
 					"point_code": "R6_01_04", 
-					"status": "2", 
+					"point_status": "2", 
 					"row_num": "1",
 					"point_name": "1区域01排04列"
 					},
 					{
 					"point_code": "R6_01_05", 
-					"status": "1", 
+					"point_status": "1", 
 					"row_num": "1",
 					"point_name": "1区域01排05列"
 					},
 					{
 					"point_code": "R6_01_06", 
-					"status": "2", 
+					"point_status": "2", 
 					"row_num": "1",
 					"point_name": "1区域01排06列"
 					},
 					{
 					"point_code": "R6_02_01", 
-					"status": "2", 
+					"point_status": "2", 
 					"row_num": "2",
 					"point_name": "1区域02排01列"
 					},
 					{
 					"point_code": "R6_02_02", 
-					"status": "1", 
+					"point_status": "1", 
 					"row_num": "2",
 					"point_name": "1区域02排02列"
 					},
 					{
 					"point_code": "R6_02_03", 
-					"status": "2", 
+					"point_status": "2", 
 					"row_num": "2",
 					"point_name": "1区域02排03列"
 					},
 					{
 					"point_code": "R6_02_04", 
-					"status": "1", 
+					"point_status": "1", 
 					"row_num": "2",
 					"point_name": "1区域02排04列"
 					},
 					{
 					"point_code": "R6_02_05", 
-					"status": "2", 
+					"point_status": "2", 
 					"row_num": "2",
 					"point_name": "1区域02排05列"
 					},
 					{
 					"point_code": "R6_03_01", 
-					"status": "1", 
+					"point_status": "1", 
 					"row_num": "3",
 					"point_name": "1区域03排01列"
 					},
 					{
 					"point_code": "R6_03_02", 
-					"status": "2", 
+					"point_status": "2", 
 					"row_num": "3",
 					"point_name": "1区域03排02列"
 					},
 					{
 					"point_code": "R6_03_03", 
-					"status": "2", 
+					"point_status": "2", 
 					"row_num": "3",
 					"point_name": "1区域03排03列"
 					},
 					{
 					"point_code": "R6_03_04", 
-					"status": "1", 
+					"point_status": "1", 
 					"row_num": "3",
 					"point_name": "1区域03排04列"
 					}
@@ -181,7 +181,7 @@
 			}
 		},
 		created () {
-			// this._selectRegions()
+			this._selectRegions()
 		},
 		methods: {
 			async _selectRegions () {
@@ -199,13 +199,14 @@
 			selectChange (e) {
 				this.index = e
 				this.searchList()
-			},
-			searchList () {
-				this.dataList = []
 				setTimeout(() => {
 					this._selectPointInfo()
 				}, 9000)
 			},
+			searchList () {
+				this.dataList = []
+				this._selectPointInfo()
+			},
 			async _selectPointInfo () {
 				let res = await selectPointInfo(this.index)
 				if (res.code === '200') {

utils/getData4.js

@@ -218,6 +218,11 @@ export const resume = (agvno, option) => request({
 	url:'api/hand/resume',
 	data: {agv_no: agvno, option: option}
 })
+// 1.1根据区域查询进出区域信息
+export const selectAgvInfo = (agvno) => request({
+	url:'api/hand/selectAgvInfo',
+	data: {agv_no: agvno}
+})
 
 // 站点管理
 // 1.2查询区域