From 3b7ed32fb0d22be7d1b7e23e7101e29a5b2dfb40 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 28 二月 2024 20:33:50 +0800
Subject: [PATCH] 修改了备忘录内容
---
ruoyi-ui/src/views/pet/petnote.vue | 2 ++
ruoyi-ui/src/views/note/memo.vue | 6 +++++-
ruoyi-ui/vue.config.js | 2 +-
ruoyi-ui/src/views/secret/memo.vue | 1 +
ruoyi-ui/src/views/device/memo.vue | 19 ++++++++++---------
5 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/views/device/memo.vue b/ruoyi-ui/src/views/device/memo.vue
index 3b38ebc..55e5714 100644
--- a/ruoyi-ui/src/views/device/memo.vue
+++ b/ruoyi-ui/src/views/device/memo.vue
@@ -51,6 +51,7 @@
v-model='formDat.happenTime'
type='date'
placeholder='閫夋嫨鏃ユ湡'
+ value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
@@ -162,7 +163,7 @@
happenTime: [{
required: true,
message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
- trigger: 'change'
+ trigger: 'blur'
}],
content: [{
required: true,
@@ -336,7 +337,7 @@
this.formDat.fid = 2017;
this.formDat.cid = cid ;
this.formDat.url = ul+","+uls
-
+ let _this = this
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -344,17 +345,17 @@
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
// this.queryParams.cid = cid
- // this.queryParams.fid = fid
- this.getList(this.formDat.fid,this.formDat.cid);
-
+
+ this.getList(_this.formDat.fid,_this.formDat.cid);
+ //娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
resetQuery();
});
}
});
- //娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
+
},
requestUpload(params)
{
diff --git a/ruoyi-ui/src/views/note/memo.vue b/ruoyi-ui/src/views/note/memo.vue
index 7199237..3b19f64 100644
--- a/ruoyi-ui/src/views/note/memo.vue
+++ b/ruoyi-ui/src/views/note/memo.vue
@@ -50,6 +50,7 @@
v-model='formDat.happenTime'
type='date'
placeholder='閫夋嫨鏃ユ湡'
+ value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
@@ -205,6 +206,7 @@
//涓汉鑷紶鐨勪繚瀛�
submitDataScope6: function() {
+
const cid = this.$route.params && this.$route.params.id;
const fid =2007;
this.formDat.fid = 2007;
@@ -232,6 +234,8 @@
});
} else {
// 鎵ц鏂板鎿嶄綔
+ console.log(this.formDat)
+
addNote(this.formDat).then(response => {
// this.formDat.term = selectedOption.label;
this.$modal.msgSuccess("鏂板鎴愬姛");
@@ -483,7 +487,7 @@
var formData = new FormData();
formData.append('excelImport', file);
let _this = this
- alert(file)
+
enload(formData).then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
index d14094f..bdcfccc 100644
--- a/ruoyi-ui/src/views/pet/petnote.vue
+++ b/ruoyi-ui/src/views/pet/petnote.vue
@@ -138,6 +138,7 @@
v-model='formDat.happenTime'
type='date'
placeholder='閫夋嫨鏃ユ湡'
+ value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
@@ -150,6 +151,7 @@
v-model='formDat.remindTime'
type='date'
placeholder='閫夋嫨鏃ユ湡'
+ value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
diff --git a/ruoyi-ui/src/views/secret/memo.vue b/ruoyi-ui/src/views/secret/memo.vue
index d459b9e..ae52372 100644
--- a/ruoyi-ui/src/views/secret/memo.vue
+++ b/ruoyi-ui/src/views/secret/memo.vue
@@ -52,6 +52,7 @@
v-model='formDat.happenTime'
type='date'
placeholder='閫夋嫨鏃ユ湡'
+ value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 53e4e48..8ff7d12 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,7 +35,7 @@
proxy: {
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- //target: `https://192.168.1.3:8080/`,
+ // target: `https://192.168.1.3:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1