From 19378c283f19ee0b023b3cd73fbdd331eed2fe17 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 02 十一月 2023 18:45:25 +0800
Subject: [PATCH] feat: 添加工艺列表接口,工艺详情弹窗未完成
---
src/views/dashboard/index.vue | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 51c7ff8..815948f 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -15,7 +15,12 @@
<ProcessingInfo style="margin-top: 6px" :task="activeTask"></ProcessingInfo>
</el-tab-pane>
<el-tab-pane label="宸ヨ壓淇℃伅" name="宸ヨ壓淇℃伅">
- <ProcessInfo :process="process"></ProcessInfo>
+ <ProcessInfo
+ v-for="item in craftModelStore.craftModelList"
+ :key="item.ID"
+ :craft-model="item"
+ @detail="openCraftModelDetailModal"
+ ></ProcessInfo>
</el-tab-pane>
<el-tab-pane label="鐗╂枡娓呭崟" name="鐗╂枡娓呭崟">
<InputMaterialsList></InputMaterialsList>
@@ -51,12 +56,12 @@
<BigButton class="btn" bg-color="red">绾㈢伅鍛煎彨</BigButton>
</template>
</DashboardLayout>
+ <CraftDetailModal v-model="showCraftModelDetail" @close="showCraftModelDetail = false"></CraftDetailModal>
</template>
<script setup lang="ts">
-import { computed, ref, watch, onUnmounted } from 'vue'
+import { computed, ref, watch } from 'vue'
import ChannelCollapse from '@/views/dashboard/components/ChannelCollapse.vue'
import type { Worker, Order, Task } from '@/api/task'
-import type { PLCResponse } from '@/api/plc'
import PersonInfo from '@/views/dashboard/components/PersonInfo.vue'
import ProcessInfo from '@/views/dashboard/components/ProcessInfo.vue'
import ColorInfo from '@/views/dashboard/components/ColorInfo.vue'
@@ -77,6 +82,8 @@
import DashboardTitle from '@/views/dashboard/components/DashboardTitle.vue'
import { usePLCStore } from '@/stores/plc'
import { useDevicesStore } from '@/stores/devices'
+import { useCraftModelStore } from '@/stores/craftModel'
+import CraftDetailModal from '@/views/dashboard/components/CraftDetailModal.vue'
defineOptions({
name: 'DashboardView'
@@ -99,12 +106,7 @@
amount: '10'
} as unknown as Order
})
-const device = computed(() => {
- return {
- plcStatus: 1,
- plcNotConnected: false
- } as unknown as PLCResponse
-})
+
const taskTabsList = [
{
label: '鏈畬鎴�',
@@ -130,16 +132,31 @@
tasksStore.getChannels(tab.value)
}
+/**
+ * 瀹屾垚浠诲姟鎴栬�呬笅鍙戝弬鏁版垚鍔熷悗瑕佸埛鏂伴�氶亾鏁版嵁
+ * @param task
+ */
function reloadAllData(task: Task) {
tasksStore.reload(task.Channel)
}
-
-const plcStore = usePLCStore()
// 鍚姩plc 杞
+const plcStore = usePLCStore()
plcStore.startPollingPLC()
-
+// 鍚姩 璁惧 杞
const deviceStore = useDevicesStore()
deviceStore.startPollingDevice()
+
+// 鍒囨崲浠诲姟鏃惰幏鍙栧搴斾换鍔＄殑宸ヨ壓妯″瀷淇℃伅
+const craftModelStore = useCraftModelStore()
+watch(activeTask, () => {
+ craftModelStore.getCraftModelList()
+})
+
+const showCraftModelDetail = ref(false)
+function openCraftModelDetailModal() {
+ console.log(1)
+ showCraftModelDetail.value = true
+}
</script>
<style scoped lang="scss">
--
Gitblit v1.8.0