From 76a3eb05129f0af9f9b5798b1c8abbf9afaf7f19 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 27 八月 2024 17:59:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/clean/index.vue | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 05fc82b..e42367b 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -64,7 +64,20 @@
border-radius: 6px 6px 6px 6px;opacity:1;">閲嶇疆</el-button>
</el-form-item>
</el-form>
-
+ <el-row :gutter="10" >
+ <el-col>
+ <el-input
+ v-model="searchQuery"
+ placeholder="鎼滅储鐧惧害"
+ clearable
+ style="width: 320px;
+ height: 15px;
+ margin-bottom: 23px;
+ opacity: 0.5;"
+ @keyup.enter.native="searchBaidu"
+ />
+ </el-col>
+</el-row>
<el-row :gutter="10" class="mb8" v-if="userId != 2">
<el-col :span="1.5">
<el-button
@@ -122,6 +135,7 @@
</el-upload>
</el-col>
+ <el-col :span="1.5">
<el-dropdown placement="鍒嗕韩鐩稿叧">
<el-button size="mini" type="primary"
plain
@@ -135,9 +149,14 @@
<el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
</el-dropdown-menu>
</template>
- </el-dropdown>
-
-
+
+ </el-dropdown>
+
+</el-col>
+
+
+
+
<right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -230,7 +249,8 @@
/>
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @click.native="handleDialogClick"
+>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="绫诲瀷" prop="kind">
@@ -247,7 +267,9 @@
</el-input>
</el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
- <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" @click.native.stop
+ ref="datePicker"
+
:editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
@@ -541,6 +563,7 @@
data() {
return {
// 鍒嗕韩缁欒皝鐨刲ist
+ searchQuery: undefined,
listRoot: [],
open1:false,
open2:false,
@@ -702,6 +725,17 @@
},
methods: {
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.datePicker.handleClose();
+ },
+ searchBaidu() {
+ // 鎵撳紑鐧惧害鎼滅储缁撴灉
+ window.open(`https://www.baidu.com/s?wd=${encodeURIComponent(this.searchQuery)}`);
+ // 娓呯┖鎼滅储妗�
+ this.searchQuery = '';
+ },
// 鍒嗛〉
fenYe(){
// @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
--
Gitblit v1.9.1