diff --git a/frontend/src/views/home/index.vue b/frontend/src/views/home/index.vue index 4d6b18e..fa0dacf 100644 --- a/frontend/src/views/home/index.vue +++ b/frontend/src/views/home/index.vue @@ -38,9 +38,9 @@ import { useAuthStore } from "@/stores/modules/auth"; import model from "./tabs/model.vue"; import dashboard from "./tabs/dashboard.vue"; import { onMounted, ref } from "vue"; -defineOptions({ - name: 'home' - }) +// defineOptions({ +// name: 'home' +// }) const authStore = useAuthStore(); const activeIndex = ref("1-1"); diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue index c298d8d..de0736b 100644 --- a/frontend/src/views/machine/device/components/devicePopup.vue +++ b/frontend/src/views/machine/device/components/devicePopup.vue @@ -384,6 +384,8 @@ const rules = computed(() => { // 打开弹窗,可能是新增,也可能是编辑 const open = async (sign: string, data: Device.ResPqDev,currentMode: string,currentScene: string,devType:Device.ResDev[] ) => { + + console.log('open', dictStore.getDictData('app_scene')) devTypeOptions.value = devType mode.value = currentMode scene.value = currentScene diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue index 9c01121..287737c 100644 --- a/frontend/src/views/machine/device/index.vue +++ b/frontend/src/views/machine/device/index.vue @@ -168,6 +168,11 @@ const columns = reactive[]>([ } : {}), minWidth: 200, }, + { + prop: 'createTime', + label: '创建时间', + width: 200, + }, { prop: 'operation', label: '操作', fixed: 'right', width: 200 }, ]) diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue index c445102..ece26b1 100644 --- a/frontend/src/views/plan/planList/index.vue +++ b/frontend/src/views/plan/planList/index.vue @@ -65,9 +65,9 @@ import ImportExcel from "@/components/ImportExcel/index.vue"; import {useDownload} from "@/hooks/useDownload"; import {exportPqDev} from "@/api/device/device"; -defineOptions({ -name: 'planList' -}) +// defineOptions({ +// name: 'planList' +// }) const dictStore = useDictStore() const openDeviceView = ref() const openSourceView = ref() @@ -115,6 +115,51 @@ const columns = reactive[]>([ width: 220, search: { el: 'input' }, }, + { + prop: 'testState', + label: '检测状态', + width: 120, + enum:dictTestState, + search: { el:'select',props: { filterable: true }}, + fieldNames: { label: 'label', value: 'id' }, + render: scope => { + return ( + scope.row.testState === 0 ? '未检' : scope.row.testState === 1 ? '检测中' : '检测完成' + ) + }, + }, + { + prop: 'reportState', + label: '检测报告状态', + width: 120, + enum:dictReportState, + search: { el: 'select', props: { filterable: true } }, + fieldNames: { label: 'label', value: 'id' }, + render: scope => { + return ( + scope.row.reportState === 0 ? '未生成' : scope.row.reportState === 1 ? '部分生成' : '全部生成' + ) + }, + }, + { + prop: 'result', + label: '检测结果', + width: 120, + enum:dictResult, + search: { el: 'select', props: { filterable: true } }, + fieldNames: { label: 'label', value: 'id' }, + render: scope => { + console.log('检测结果',scope.row.result) + return ( + scope.row.result === 0 ? '不符合' : scope.row.result === 1 ? '符合' : '/' + ) + }, + }, + { + prop: 'createTime', + label: '创建时间', + width: 200, + }, { prop: 'sourceName', label: '检测源', @@ -194,50 +239,7 @@ const columns = reactive[]>([ return dictItem ? dictItem.name : '/' // 如果找到匹配的项,返回对应的 name }, }, - { - prop: 'testState', - label: '检测状态', - width: 120, - enum:dictTestState, - search: { el:'select',props: { filterable: true }}, - fieldNames: { label: 'label', value: 'id' }, - render: scope => { - return ( - scope.row.testState === 0 ? '未检' : scope.row.testState === 1 ? '检测中' : '检测完成' - ) - }, - }, - { - prop: 'reportState', - label: '检测报告状态', - width: 120, - enum:dictReportState, - search: { el: 'select', props: { filterable: true } }, - fieldNames: { label: 'label', value: 'id' }, - render: scope => { - return ( - scope.row.reportState === 0 ? '未生成' : scope.row.reportState === 1 ? '部分生成' : '全部生成' - ) - }, - }, - { - prop: 'result', - label: '检测结果', - width: 120, - enum:dictResult, - search: { el: 'select', props: { filterable: true } }, - fieldNames: { label: 'label', value: 'id' }, - render: scope => { - return ( - scope.row.result === 0 ? '不符合' : scope.row.result === 1 ? '符合' : '/' - ) - }, - }, - { - prop: 'createTime', - label: '创建时间', - width: 200, - }, + { prop: 'operation', label: '操作', fixed: 'right', width: 200 }, ])