From 64274de013b172d31d6cda1349786e5c165cf79f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 05 九月 2024 16:55:45 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Web/src/views/device/deviceMonitor/index.vue | 49 +++++++++++++++++++++----------------------------
1 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/Web/src/views/device/deviceMonitor/index.vue b/Web/src/views/device/deviceMonitor/index.vue
index 66a81a1..8865fab 100644
--- a/Web/src/views/device/deviceMonitor/index.vue
+++ b/Web/src/views/device/deviceMonitor/index.vue
@@ -4,14 +4,12 @@
<el-card class="box-card">
<div slot="header" class="linefix">
<span>杈撻�佺嚎</span>
- <div
- :class="['lineStatus', { 'device-status-0': stationValue.status === true }, { 'device-status-1': stationValue.status === false }]">
- </div>
+ <div :class="['lineStatus', stationValue.status ? 'device-status-0' : 'device-status-1']"></div>
</div>
<div class="choosefix">
<el-select v-model="lineValue" placeholder="璇烽�夋嫨" @change="handleLineChange('item', $event)">
- <el-option v-for="item in lineOptions" :key="item.value" :label="item.label"
- :value="item.value"></el-option>
+ <el-option v-for="item in lineOptions" :key="item.id" :label="item.text"
+ :value="item.id"></el-option>
</el-select>
<el-select v-model="stationValue" placeholder="璇烽�夋嫨" style="margin-top: 10px;"
value-key="stationNum">
@@ -27,8 +25,9 @@
</el-form-item>
<el-form-item label="浠诲姟绫诲瀷">
<el-select clearable v-model="stationValue.taskType" placeholder="璇烽�夋嫨浠诲姟绫诲瀷">
- <el-option v-for="(item,index) in dl('TaskTypeEnum')" :key="index" :value="Number(item.value)" :label="`${item.name} [${item.value}]`"></el-option>
- </el-select>
+ <el-option v-for="(item, index) in dl('TaskTypeEnum')" :key="index"
+ :value="Number(item.value)" :label="`${item.name} [${item.value}]`"></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="璧峰宸ヤ綅">
<el-input v-model="stationValue.startLocatNo"></el-input>
@@ -77,8 +76,7 @@
<el-form-item label="浠诲姟绫诲瀷">
<el-select clearable="" v-model="deviceInfo.taskType" placeholder="璇烽�夋嫨鐘舵��">
<el-option v-for="(item, index) in dl('TaskTypeEnum')" :key="index"
- :value="Number(item.value)"
- :label="`${item.name} [${item.value}] `" />
+ :value="Number(item.value)" :label="`${item.name} [${item.value}] `" />
</el-select>
</el-form-item>
<el-form-item label="璧峰宸ヤ綅">
@@ -116,17 +114,17 @@
import { ref, reactive } from 'vue';
import { listWcsDevice } from '/@/api/wcs/wcsDevice';
import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
-import { getDictLabelByVal as dv } from '/@/utils/dict-utils';
+import { listWcsPlc } from '/@/api/wcs/wcsPlc';
const stations = ref<any>([]);
const listStationsData = ref<any>([]);
const listStackingMachineData = ref<any>([]);
-
+const lineOptions = ref<any>([]);
const lineValue = ref(1);
const stationValue = ref<any>({
taskNo: '',
taskType: '',
- startLocatNo:'',
+ startLocatNo: '',
endLocatNo: '',
plc: '',
wcs: '',
@@ -135,16 +133,17 @@
// 鏌ヨ鎿嶄綔
const handleQuery = async () => {
+ var listplc = await listWcsPlc({ type: 1 });
+ lineOptions.value = listplc.data.result;
+ lineValue.value = listplc.data.result[0].id;
var res = await listWcsDevice();
listStackingMachineData.value = res.data.result.filter(s => s.type == 0);
- const listConveyorLineData = res.data.result.filter(s => s.type == 1 || s.type == 4);
- stations.value = {
- 1: listConveyorLineData.filter(s => s.text == '1灞傛墭鐩樿緭閫佺嚎'),
- 2: listConveyorLineData.filter(s => s.text == '2灞傛墭鐩樿緭閫佺嚎'),
- 3: listConveyorLineData.filter(s => s.text == '3灞傛墭鐩樿緭閫佺嚎')
- }
- if (stations.value[1].length > 0) {
- listStationsData.value = stations.value[1];
+ const listConveyorLineData = res.data.result.filter(s => s.type == 1);
+ listplc.data.result.forEach(s => {
+ stations.value[s.id] = listConveyorLineData.filter(c => c.plcId === s.id)
+ });
+ if (stations.value[lineValue.value].length > 0) {
+ listStationsData.value = stations.value[lineValue.value];
stationValue.value = listStationsData.value[0];
}
};
@@ -152,15 +151,9 @@
const handleLineChange = (field: string, value: number) => {
listStationsData.value = stations.value[value];
- stationValue.value = {};
+ if (listStationsData.value.length > 0)
+ stationValue.value = listStationsData.value[0];
};
-
-
-const lineOptions = [
- { value: 1, label: '涓�妤艰緭閫佺嚎' },
- { value: 2, label: '浜屾ゼ杈撻�佺嚎' },
- { value: 3, label: '涓夋ゼ杈撻�佺嚎' }
-];
</script>
--
Gitblit v1.8.0