From 9169a74e1d7b2d24d20d708b4498d7ca17eda9d8 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期一, 28 四月 2025 13:42:52 +0800 Subject: [PATCH] 1. 新增自动评估监测数据统计导入功能 2. 修改问题审核界面巡查点次统计没有根据场景类型切换的问题 --- src/components/SearchBar.vue | 61 +++++++++++++++--------------- 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue index fedb1e6..83835cb 100644 --- a/src/components/SearchBar.vue +++ b/src/components/SearchBar.vue @@ -1,10 +1,14 @@ <template> <el-row class="layout"> - <el-col :span="16"> + <el-col :span="10"> <el-form :inline="true" :model="formSearch"> <el-form-item label="鎬讳换鍔�"> <!-- <el-input v-model="formSearch.topTaskId" placeholder="鎬讳换鍔�" /> --> - <el-select v-model="formSearch.topTaskId" placeholder="鎬讳换鍔�"> + <el-select + v-model="formSearch.topTaskId" + placeholder="鎬讳换鍔�" + style="width: 260px" + > <el-option v-for="s in topTasks" :key="s.value" @@ -13,22 +17,17 @@ /> </el-select> </el-form-item> - <el-form-item label="鍦烘櫙绫诲瀷"> - <el-select v-model="formSearch.sceneTypeId" placeholder="鍦烘櫙绫诲瀷"> - <el-option - v-for="s in sceneTypes" - :key="s.value" - :label="s.label" - :value="s.value" - /> - </el-select> - </el-form-item> + <FYOptionScene + :allOption="false" + :type="2" + v-model:value="formSearch.scenetype" + ></FYOptionScene> <el-form-item> <el-button type="primary" @click="onSubmit">鏌ヨ</el-button> </el-form-item> </el-form> </el-col> - <el-col :span="8"> + <el-col :span="14"> <el-row justify="end"> <slot name="summary"></slot> </el-row> @@ -38,49 +37,51 @@ <script> import taskApi from '@/api/fysp/taskApi'; -import { enumScene } from "@/enum/scene"; export default { emits: ['onSubmit'], data() { return { topTasks: [], - sceneTypes: enumScene(2, false), formSearch: { topTaskId: '', - sceneTypeId: '', - }, + scenetype: '' + } }; }, methods: { //鑾峰彇鏌ヨ鏉′欢 getOptions() { taskApi.getTopTask().then((res) => { - const list = []; - res.forEach((r) => { - list.push({ + const list = res.map((r) => { + return { value: r.tguid, label: r.name, - towncode: r.towncode, - districtCode: r.districtcode, - month: r.starttime.slice(0, 7), - }); + data: r + }; }); this.topTasks = list; this.formSearch.topTaskId = list[0].value; - this.$emit('onSubmit', this.formSearch); + this.onSubmit(); }); }, //鏌ヨ瀛愪换鍔$粺璁′俊鎭� onSubmit() { - // console.log(this.formSearch.sceneTypeId) - this.$emit('onSubmit', this.formSearch); - }, + const task = this.topTasks.find( + (t) => t.data.tguid == this.formSearch.topTaskId + ); + const param = { + topTask: task ? task.data : {}, + sceneTypeId: this.formSearch.scenetype.value + }; + // console.log(param); + + this.$emit('onSubmit', param); + } }, mounted() { - this.formSearch.sceneTypeId = this.sceneTypes[0].value; this.getOptions(); - }, + } }; </script> -- Gitblit v1.9.3