From f4357cc86cd66e27476bc865b8a61b04c1e7c59a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 23 三月 2024 22:16:07 +0800
Subject: [PATCH] 提交代码
---
ruoyi-ui/src/api/pet/index.js | 8 ++++++++
ruoyi-ui/src/views/economy/economyInfo.vue | 5 ++++-
ruoyi-ui/src/views/note/propertyInfo.vue | 6 +++++-
ruoyi-ui/src/views/pet/petInfo.vue | 8 ++++----
ruoyi-ui/src/views/pet/index.vue | 6 +++---
5 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/api/pet/index.js b/ruoyi-ui/src/api/pet/index.js
index 6c570c9..ef2334a 100644
--- a/ruoyi-ui/src/api/pet/index.js
+++ b/ruoyi-ui/src/api/pet/index.js
@@ -90,6 +90,14 @@
//涓婁紶鏂囦欢
+export function uploadPic1(data) {
+ return request({
+ url: '/common/upload',
+ method: 'post',
+ data: data
+ })
+}
+//涓婁紶鏂囦欢
export function uploadPic(data) {
return request({
url: '/common/uploads',
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index 4792616..2d20c79 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -15,8 +15,11 @@
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
<el-form-item label="鍙拌处" prop="type">
- <el-input v-model="formData.type" placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-input v-model="formData.type" placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
</el-input>
+<!--
+ <el-select v-model="formData.type" filterable clearable placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ </el-select> -->
</el-form-item>
<el-form-item label="鏃堕棿" prop="createTime">
<el-input v-model="formData.createTime" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
diff --git a/ruoyi-ui/src/views/note/propertyInfo.vue b/ruoyi-ui/src/views/note/propertyInfo.vue
index f72797c..fc5f8c4 100644
--- a/ruoyi-ui/src/views/note/propertyInfo.vue
+++ b/ruoyi-ui/src/views/note/propertyInfo.vue
@@ -21,10 +21,14 @@
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
<el-form-item label="绫诲瀷" prop="type">
- <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" allow-create
+ filterable clearable :style="{width: '100%'}" :disabled="dsb" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
:disabled="item.disabled"></el-option>
</el-select>
+
+
+
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime" >
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 4f97874..862bf55 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -332,7 +332,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
-import {listPet,enload, getPetInfo, delPet,addPet, uploadPic} from "@/api/pet/index";
+import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1} from "@/api/pet/index";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
@@ -732,7 +732,7 @@
formData.append('uploadFile', file);
let _this = this
- uploadPic(formData).then(response => {
+ uploadPic1(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
_this.fileList1.push({name:response.data.fileName, url:response.data.url})
// _this.fileList2.push({name:response.data.fileName, url:response.data.url})
@@ -748,7 +748,7 @@
formData.append('uploadFile', file);
let _this = this
- uploadPic(formData).then(response => {
+ uploadPic1(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
// _this.fileList1.push({name:response.data.fileName, url:response.data.url})
_this.fileList2.push({name:response.data.fileName, url:response.data.url})
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index e0d5a8c..199962a 100644
--- a/ruoyi-ui/src/views/pet/petInfo.vue
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -387,7 +387,7 @@
</div>
</template>
<script>
-import {getPetList, listPetnote,uploadPic, download,updatePet} from "@/api/pet/index";
+import {getPetList, listPetnote,uploadPic1, download,updatePet} from "@/api/pet/index";
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
@@ -619,7 +619,7 @@
formData.append('uploadFile', file);
let _this = this
- uploadPic(formData).then(response => {
+ uploadPic1(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
_this.fileList2.push({name:response.data.fileName, url:response.data.url})
console("ok")
@@ -753,7 +753,7 @@
this.$refs.upload.clearFiles();
// this.uploading1 = true;
//alert(100)
- uploadPic(formData).then(response => {
+ uploadPic1(formData).then(response => {
// alert(18)
// let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
// _this.fileList1.push({name:response.data.fileName, url:response.data.url})
@@ -780,7 +780,7 @@
this.$refs.upload1.clearFiles();
// this.uploading1 = true;
//alert(100)
- uploadPic(formData).then(response => {
+ uploadPic1(formData).then(response => {
// alert(18)
// let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
// _this.fileList1.push({name:response.data.fileName, url:response.data.url})
--
Gitblit v1.9.1