From aa0481c047a57977d23ea2e1e2015866c9d4b201 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 25 三月 2024 23:59:15 +0800
Subject: [PATCH] 完善了一些家庭会议模块1
---
ruoyi-ui/src/views/pet/index.vue | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 23e768a..547de62 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -115,12 +115,14 @@
</el-table-column>
<el-table-column label="瀹犵墿id" prop="id" sortable width="100" />
<el-table-column label="涓讳汉濮撳悕" prop="masterName" sortable width="100" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <div class="button-container">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['familymodel:property:info']"
>淇敼</el-button>
@@ -128,13 +130,14 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:property:info']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
-
+ </div>
</template>
</el-table-column>
</el-table>
@@ -319,6 +322,10 @@
</el-dialog>
+ <el-dialog :visible.sync="dialogVisible">
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
+ </el-dialog>
+
</div>
</template>
@@ -329,7 +336,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'],
@@ -360,10 +367,16 @@
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
+
+ dialogImageUrl: '',
+ dialogVisible: false,
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList1:[ ],
fileList2:[ ],
fileListOther:[ ],
@@ -707,16 +720,24 @@
addPet(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList1.length; i++)
+ {
+ this.handleRemove(this.fileList1[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
+ // this.handleRemove(this.fileList[0]);
+ // this.handleRemoveFile(this.fileListOther[0]);
this.getList();
});
}
});
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- this.handleRemove(this.fileList[0]);
- this.handleRemoveFile(this.fileListOther[0]);
+
},
requestUpload(params)
{
@@ -726,7 +747,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})
@@ -742,7 +763,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})
@@ -791,4 +812,10 @@
color: #999;
border: 1px dashed #999;
}
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
--
Gitblit v1.9.1