From 652f7a070f7a65a01054089fdd91b8bcf07d0694 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期六, 28 九月 2024 20:41:33 +0800
Subject: [PATCH] merge
---
src/components/SearchBar.vue | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index fedb1e6..ca5c7e2 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -1,26 +1,21 @@
<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="鎬讳换鍔�" /> -->
- <el-select v-model="formSearch.topTaskId" placeholder="鎬讳换鍔�">
- <el-option
- v-for="s in topTasks"
- :key="s.value"
- :label="s.label"
- :value="s.value"
- />
+ <el-select v-model="formSearch.topTaskId" placeholder="鎬讳换鍔�" style="width: 260px">
+ <el-option v-for="s in topTasks" :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 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 v-model="formSearch.sceneTypeId" placeholder="鍦烘櫙绫诲瀷" style="width: 150px">
+ <el-option v-for="s in sceneTypes" :key="s.value" :label="s.label" :value="s.value" />
</el-select>
</el-form-item>
<el-form-item>
@@ -28,7 +23,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>
@@ -38,7 +33,7 @@
<script>
import taskApi from '@/api/fysp/taskApi';
-import { enumScene } from "@/enum/scene";
+import { enumScene } from '@/enum/scene';
export default {
emits: ['onSubmit'],
@@ -48,8 +43,8 @@
sceneTypes: enumScene(2, false),
formSearch: {
topTaskId: '',
- sceneTypeId: '',
- },
+ sceneTypeId: ''
+ }
};
},
methods: {
@@ -63,7 +58,7 @@
label: r.name,
towncode: r.towncode,
districtCode: r.districtcode,
- month: r.starttime.slice(0, 7),
+ month: r.starttime.slice(0, 7)
});
});
this.topTasks = list;
@@ -75,12 +70,12 @@
onSubmit() {
// console.log(this.formSearch.sceneTypeId)
this.$emit('onSubmit', this.formSearch);
- },
+ }
},
mounted() {
this.formSearch.sceneTypeId = this.sceneTypes[0].value;
this.getOptions();
- },
+ }
};
</script>
--
Gitblit v1.9.3