From d22ce1ad1c4656f5c2212bbabb35ba498300aced Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期四, 20 七月 2023 17:12:20 +0800 Subject: [PATCH] 线索下发及提交结论和问题模块基本完成 --- src/views/overlay-clue/ClueLayout.vue | 44 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/views/overlay-clue/ClueLayout.vue b/src/views/overlay-clue/ClueLayout.vue index eab7e20..b47e870 100644 --- a/src/views/overlay-clue/ClueLayout.vue +++ b/src/views/overlay-clue/ClueLayout.vue @@ -1,7 +1,7 @@ <template> - <el-row class="container"> + <el-row class="container" justify="space-between"> <el-col :span="6" class="grid-content bg-content"> - <div class="title">涓嬪彂绾跨储娓呭崟</div> + <div class="fy-h1">绾跨储娓呭崟</div> <div class="search-wrap"> <span>鏃堕棿</span> <el-date-picker @@ -10,6 +10,9 @@ placeholder="閫夋嫨鏃ユ湡鍜屾椂闂�" /> <el-button type="primary" @click="getClues">鏌ヨ</el-button> + <el-button type="primary" @click="fetchRemoteClue" + >鎷夊彇绾跨储</el-button + > </div> <ClueList :dataList="clueList" @@ -17,7 +20,10 @@ ></ClueList> </el-col> <el-col :span="6" class="grid-content bg-content-1"> - <ClueReport></ClueReport> + <div class="fy-h1">绾跨储鍙嶉</div> + <el-scrollbar height="80vh" class="bg-fill"> + <ClueReport :clueData="selectedClue"></ClueReport> + </el-scrollbar> </el-col> </el-row> </template> @@ -35,23 +41,37 @@ const updateTime = ref(new Date()); // 绾跨储娓呭崟 const clueList = ref([]); +const selectedClue = ref(); /** * 鏌ヨ宸蹭笅鍙戠殑绾跨储娓呭崟 */ const getClues = function () { - const time = moment(updateTime.value).format('YYYY-MM-DD HH:mm:ss'); + const now = moment(updateTime.value); + const sTime = now.format('YYYY-MM-DD HH:mm:ss'); + const eTime = now.add(1, 'month').format('YYYY-MM-DD HH:mm:ss'); onMapMounted(() => { - clueApi.getClues(time).then((res) => { + clueApi.getClue({ sTime, eTime }).then((res) => { clueList.value = res; }); }); }; +function fetchRemoteClue() { + const time = moment(updateTime.value).format('YYYY-MM-DD HH:mm:ss'); + onMapMounted(() => { + clueApi.fetchRemoteClue(time).then((res) => { + clueList.value = res; + }); + }); +} + /** * 閫夋嫨绾跨储浜嬩欢 */ -const selectClue = function (clue) {}; +const selectClue = function (clue) { + selectedClue.value = clue; +}; </script> <style scoped> @@ -65,12 +85,13 @@ .grid-content { /* min-width: 180px; */ - border-radius: 4px; + border-radius: var(--el-border-radius-round); display: flex; flex-direction: column; gap: 16px; - padding: 8px 8px; + /* padding: 8px 8px; */ pointer-events: auto; + box-shadow: var(--el-box-shadow-dark); } .bg-content { @@ -85,7 +106,14 @@ } .search-wrap { + padding: 0 8px; display: flex; + align-items: center; gap: 4px; } + +.bg-fill { + /* background: var(--el-fill-color-extra-light); */ + padding: 0 8px; +} </style> -- Gitblit v1.9.3