From 7e1d38f401555ac635c9ce10f63902d9a4c402e0 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 14 十月 2024 17:15:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-procheck-1014'
---
src/components/SearchBar.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 2562c97..539278a 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -1,6 +1,6 @@
<template>
<el-row class="layout">
- <el-col :span="16">
+ <el-col :span="12">
<el-form :inline="true" :model="formSearch">
<el-form-item label="鎬讳换鍔�">
<!-- <el-input v-model="formSearch.topTaskId" placeholder="鎬讳换鍔�" /> -->
@@ -28,7 +28,7 @@
</el-form-item>
</el-form>
</el-col>
- <el-col :span="8">
+ <el-col :span="12">
<el-row justify="end">
<slot name="summary"></slot>
</el-row>
@@ -37,18 +37,19 @@
</template>
<script>
-import taskApi from '@/api/taskApi';
-import { enumScene_2NA } from "@/enum/scene";
+import taskApi from '@/api/fysp/taskApi';
+import { enumScene } from "@/enum/scene";
export default {
emits: ['onSubmit'],
data() {
return {
topTasks: [],
- sceneTypes: enumScene_2NA(),
+ sceneTypes: enumScene(2, false),
formSearch: {
topTaskId: '',
sceneTypeId: '',
+ obj: '',
},
};
},
@@ -61,6 +62,7 @@
list.push({
value: r.tguid,
label: r.name,
+ obj: r,
towncode: r.towncode,
districtCode: r.districtcode,
month: r.starttime.slice(0, 7),
@@ -68,6 +70,7 @@
});
this.topTasks = list;
this.formSearch.topTaskId = list[0].value;
+ this.formSearch.obj = list[0].obj;
this.$emit('onSubmit', this.formSearch);
});
},
--
Gitblit v1.9.3