From c1d2051abc8ca88cd07f0d7c56c0dbf8165d5c33 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期四, 18 九月 2025 17:02:22 +0800 Subject: [PATCH] 2025.9.18 数据产品(待完成) --- src/views/fysp/check/ProCheck.vue | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue index 5f02bd7..d47f6a0 100644 --- a/src/views/fysp/check/ProCheck.vue +++ b/src/views/fysp/check/ProCheck.vue @@ -5,6 +5,7 @@ <template #summary> <CompSubTaskStatistic :loading="sideLoading" + :sceneType="sceneTypeId" :subtasks="subtasks" :monitorObjList="curMonitorObjList" /> @@ -20,18 +21,16 @@ ></SideList> </template> <template #main> - <el-scrollbar > + <el-scrollbar> <ToolBar + ref="toolBarRef" + class="toolbar-sticky" :title="curSubtask.title" :descriptions="proStatus" :buttons="buttons" :loading="mainLoading" ></ToolBar> - <el-scrollbar - v-if="curProList.length > 0" - class="scrollbar-inner" - v-loading="mainLoading" - > + <div v-if="curProList.length > 0" v-loading="mainLoading"> <CompProblemCard :key="i" v-for="(p, i) in curProList" @@ -42,7 +41,7 @@ @submit="updateSubtask" @check="handleProblemCheck" ></CompProblemCard> - </el-scrollbar> + </div> <el-empty v-else description="鏆傛棤闂" v-loading="mainLoading" /> </el-scrollbar> </template> @@ -71,38 +70,49 @@ ref="deviceShowRef" > </CompDeviceShowTest> + <SceneEditDialog + v-model="sceneInfoDialog" + :sceneId="curSubtask.data ? curSubtask.data.sceneId : undefined" + ></SceneEditDialog> </template> <script> import ArbitraryPhoto from './components/ArbitraryPhoto.vue'; import taskApi from '@/api/fysp/taskApi'; +import problemApi from '@/api/fysp/problemApi'; import ProCheckProxy from './ProCheckProxy'; import CompProblemAddOrUpd from './components/CompProblemAddOrUpd.vue'; import CompProblemCard from './components/CompProblemCard.vue'; import CompSubTaskStatistic from './components/CompSubTaskStatistic.vue'; import CompDeviceShowTest from './components/CompDeviceShowTest.vue'; +import SceneEditDialog from '@/views/fysp/scene/SceneEditDialog.vue'; export default { components: { CompProblemCard, CompSubTaskStatistic, CompProblemAddOrUpd, ArbitraryPhoto, - CompDeviceShowTest + CompDeviceShowTest, + SceneEditDialog }, data() { return { - // 璁惧鍥� + // 璁惧鍥惧璇濇 deviceShowDialog: false, - // 浠绘剰鍥� + // 浠绘剰鍥惧璇濇 anyPhotoDialog: false, - // 鏂板闂 + // 鏂板闂瀵硅瘽妗� proAddOrUpdDialogVisible: false, + // 鍩烘湰淇℃伅瀵硅瘽妗� + sceneInfoDialog: false, //宸︿晶鑿滃崟鏍忓姞杞界姸鎬� sideLoading: false, //鍙充晶鍐呭鏍忓姞杞界姸鎬� mainLoading: false, // 鎬讳换鍔� topTask: {}, + // 鍦烘櫙绫诲瀷id + sceneTypeId: undefined, // 鎬讳换鍔″贰鏌ヨ鍒掓竻鍗� curMonitorObjList: [], //瀛愪换鍔″垪琛� @@ -113,6 +123,14 @@ curProList: [], //鎿嶄綔鎸夐挳 buttons: [ + { + name: '鍦烘櫙淇℃伅', + color: 'success', + // color: 'primary', + click: () => { + this.sceneInfoDialog = true; + } + }, { name: '鏂板闂', // color: 'success', @@ -165,6 +183,7 @@ this.mainLoading = true; this.curProList = []; this.curSubtask = {}; + this.sceneTypeId = formSearch.sceneTypeId; const param = { topTaskId: formSearch.topTask.tguid, sceneTypeId: formSearch.sceneTypeId @@ -197,7 +216,7 @@ this.sideLoading = false; this.mainLoading = true; // const controller = new AbortController(); - taskApi + problemApi .getProBySubtask(s.data.stGuid) .then((res) => { this.curProList = res; @@ -222,7 +241,7 @@ this.sideLoading = false; setTimeout(() => { this.mainLoading = true; - taskApi + problemApi .getProBySubtask(this.curSubtask.data.stGuid) .then((res) => { if (refresh) { @@ -269,4 +288,10 @@ .scrollbar-inner { height: calc(100vh - 60px * 2 - 20px * 2 - var(--height-toolbar)); } + +.toolbar-sticky { + position: sticky; + z-index: 2; + top: 0; +} </style> -- Gitblit v1.9.3