From 74c662058b047bca28876b1851006ed16b6dc237 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 27 八月 2024 17:51:02 +0800
Subject: [PATCH] 修改了对应的bug
---
ruoyi-ui/src/views/economy/economyInfo.vue | 2
ruoyi-ui/src/views/bignote/index.vue | 33 ++++++----
ruoyi-ui/src/views/clean/index.vue | 46 +++++++++++++--
ruoyi-ui/src/views/selfeconomy/index.vue | 21 +++++-
ruoyi-ui/src/views/clean/cleanInfo.vue | 15 +++--
ruoyi-ui/src/views/economy/index.vue | 13 +++
ruoyi-ui/src/views/pet/index.vue | 12 +++-
ruoyi-ui/src/views/healthy/index.vue | 9 ++
ruoyi-ui/src/layout/components/Navbar.vue | 29 +++++----
9 files changed, 129 insertions(+), 51 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index dba4a53..97b87fe 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -88,20 +88,7 @@
'avatar',
'device'
]),
- setGreeting() {
- const currentTime = new Date();
- const currentHour = currentTime.getHours();
- let name = this.$store.state.user.name
- if (currentHour < 12) {
- this.greeting = "鏃╀笂濂�,"+name;
- } else if (currentHour < 14) {
- this.greeting = "涓崍濂�,"+name;
- } else if (currentHour < 18) {
- this.greeting = "涓嬪崍濂�,"+name;
- } else {
- this.greeting = "鏅氫笂濂�,"+name;
- }
- },
+
setting: {
get() {
return this.$store.state.settings.showSettings
@@ -120,6 +107,20 @@
}
},
methods: {
+ setGreeting() {
+ const currentTime = new Date();
+ const currentHour = currentTime.getHours();
+ let name = this.$store.state.user.name
+ if (currentHour < 12) {
+ this.greeting = "鏃╀笂濂�,"+name;
+ } else if (currentHour < 14) {
+ this.greeting = "涓崍濂�,"+name;
+ } else if (currentHour < 18) {
+ this.greeting = "涓嬪崍濂�,"+name;
+ } else {
+ this.greeting = "鏅氫笂濂�,"+name;
+ }
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index a353ab7..6b06362 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container" style="opacity: 1;">
+ <div class="app-container" style="opacity: 1;" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form-item label="澶т簨鏍囬" prop="title">
@@ -244,7 +244,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
- <el-dialog :title="title" @click="handleVisibleChange" :visible.sync="open" width="800px" append-to-body :before-close="close" >
+ <el-dialog :title="title" @click.native="handleDialogClick" :visible.sync="open" width="800px" :append-to-body="true">
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
@@ -262,9 +262,11 @@
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-date-picker ref="datePicker" v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- :visible="isVisible"
- @blur="handleVisibleChange"
+ <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>
@@ -531,7 +533,8 @@
dicts: ['sys_normal_disable'],
data() {
return {
- isVisible:false,
+
+ total1: 0,
// 鍒嗕韩缁欒皝鐨刲ist
listRoot: [],
open1:false,
@@ -670,14 +673,22 @@
typeOptions: [],
};
},
+
created() {
this.getList();
// this.getCateInfor()
this.getInfo()
this.getList1();
+
+
},
methods: {
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.datePicker.handleClose();
+ },
// 鍒嗛〉
fenYe(){
// @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
@@ -863,20 +874,16 @@
isInFot(fileName) {
return this.fot.includes(fileName);
},
- handleVisibleChange(){
- alert(12)
- this.isVisible = false
- this.$refs.datePicker.hidePicker();
- },
+
close(){
//alert(234)
- this.$refs.datePicker.hidePicker()
+
this.open = false
},
// 鍙栨秷鎸夐挳
cancelData() {
- this.$refs.datePicker.hidePicker()
+
this.open = false;
this.reset();
},
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 5ae540e..6fc5633 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -320,6 +320,7 @@
this.loading = true;
getCLeanInfo(id).then((response) => {
this.formData = response.data;
+ console.log(this.formData)
if(this.formData.kind==1)
this.formData.kind = '鏀剁撼'
else
@@ -367,7 +368,7 @@
}
this.loading = false;
});
- this.getCateInfor()
+ // this.getCateInfor()
}
},
@@ -380,10 +381,11 @@
this.loading = true;
getCLeanInfo(id).then((response) => {
this.formData = response.data;
- if(this.formData.kind==1)
- this.formData.kind = '鏀剁撼'
- else
- this.formData.kind = '淇濇磥'
+ // if(this.formData.kind==1)
+ // this.formData.kind = '鏀剁撼'
+ // else
+ // this.formData.kind = '淇濇磥'
+ if(response.data.url!=null){
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
{
@@ -406,10 +408,11 @@
}
}
}
+ }
_this.fileListOther = _this.fileListOther1
this.loading = false;
});
- this.getCateInfor()
+ // this.getCateInfor()
}
},
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)'
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index a0b95c4..434e831 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -25,7 +25,7 @@
<el-input v-model="formData.createTime" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
<el-form-item label="鏀跺叆/鏀嚭" prop="price">
- <el-select v-model="formData.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
+ <el-select :disabled="dsb" v-model="formData.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index db9f086..e6ca814 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -219,7 +219,7 @@
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
<!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <el-dialog :title="title" @click.native="handleDialogClick" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="鍙拌处" prop="type">
<el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
@@ -227,11 +227,13 @@
<el-form-item label="鍙戠敓鏃堕棿" prop="creatTime">
<el-date-picker v-model="formDat.createTime" 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>
<el-form-item label="鏀跺叆/鏀嚭" prop="price">
- <el-select v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
+ <el-select ref="multiSelect" v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -698,6 +700,13 @@
},
methods: {
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.multiSelect.blur()
+
+ this.$refs.datePicker.handleClose();
+ },
// 鍒嗛〉
fenYe(){
// @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index faba6e9..bd58e64 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -201,12 +201,14 @@
style="background: #FEF7FC;"
/>
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <el-dialog :title="title" @click.native="handleDialogClick" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="鍙戠敓鏃堕棿" prop="checkTime">
<el-date-picker v-model="formDat.checkTime" 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>
@@ -495,6 +497,11 @@
},
methods: {
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.datePicker.handleClose();
+ },
getInfo(){
console.log('-----------------')
getInfo().then(response=>{
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 9329289..2dcfda0 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -174,9 +174,8 @@
/>
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
- <h2 style="width: 100px;height: 16px;font-size: 15px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #000000;line-height: 15px;">榄呭疇淇℃伅</h2>
-
+ <el-dialog :title="title" @click.native="handleDialogClick" :visible.sync="open" width="800px" append-to-body>
+
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="璇佷欢鍙风爜" prop="idNum">
@@ -196,6 +195,8 @@
</el-form-item>
<el-form-item label="鍑虹敓鏃ユ湡" prop="birth">
<el-date-picker v-model="formDat.birth" 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>
@@ -735,6 +736,11 @@
this.getInfo()
},
methods: {
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.datePicker.handleClose();
+ },
// 鍒嗛〉
fenYe(){
// @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index dcd0308..282625b 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -262,13 +262,15 @@
/>
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
- <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="happenTime">-->
<!-- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="鏃堕棿" prop="happenTime">
<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>
@@ -293,7 +295,7 @@
</el-input>
</el-form-item>
<el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange">
- <el-select v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢" clearable :style="{width: '100%'}" >
+ <el-select ref="multiSelect" v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -303,7 +305,7 @@
</el-input>
</el-form-item>
<el-form-item label="鏄惁娉ㄩ攢" prop="status">
- <el-select v-model="formDat.status" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}" >
+ <el-select ref="multiSelect1" v-model="formDat.status" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -596,6 +598,8 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ selfeconomyList:[],
+ total1: 0,
// 鍒嗕韩缁欒皝鐨刲ist
listRoot: [],
open1:false,
@@ -792,13 +796,20 @@
created() {
this.getList1()
this.getList();
- this.getCateInfor()
+ // this.getCateInfor()
this.getInfo()
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
},
methods: {
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.multiSelect.blur()
+ this.$refs.multiSelect1.blur()
+ this.$refs.datePicker.handleClose();
+ },
// 鍒嗛〉
fenYe(){
// @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
@@ -1101,7 +1112,7 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.reset();
+ // this.reset();
this.open = true;
this.title = "鏂板涓汉璐骇璇︾粏淇℃伅";
},
--
Gitblit v1.9.1