From cf948b62048be5f217623cc31a0d6d2680c72476 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期日, 22 十月 2023 22:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/honor/index.vue | 67 ++++---
ruoyi-ui/src/views/self/memo.vue | 60 ++++---
ruoyi-ui/.env.production | 2
ruoyi-ui/.env.development | 2
ruoyi-ui/src/views/collection/collectionInfo.vue | 37 ++--
ruoyi-ui/src/views/contacts/index.vue | 67 ++++---
ruoyi-ui/src/views/clean/cleanInfo.vue | 11 +
ruoyi-ui/src/views/contacts/contactsInfo.vue | 21 -
ruoyi-ui/src/views/search/index.vue | 23 ++
ruoyi-ui/src/views/wish/index.vue | 62 ++++---
ruoyi-ui/src/views/collection/index.vue | 78 ++++-----
ruoyi-ui/src/views/doctor/index.vue | 42 +++--
12 files changed, 260 insertions(+), 212 deletions(-)
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index ed59561..af73f7e 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -7,6 +7,6 @@
# 鑻ヤ緷绠＄悊绯荤粺/寮�鍙戠幆澧�
VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_TRUE_API = 'https://47.93.189.255:8080/'
-VUE_APP_BASE_OTHER_API = 'http://47.93.189.255:8083/'
+VUE_APP_BASE_OTHER_API = 'https://www.bendudu.com:8085/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index d3a75ec..76a00c0 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -7,4 +7,4 @@
# 鑻ヤ緷绠＄悊绯荤粺/鐢熶骇鐜
VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_TRUE_API = 'https://47.93.189.255:8080/'
-VUE_APP_BASE_OTHER_API = 'http://47.93.189.255:8083/'
+VUE_APP_BASE_OTHER_API = 'https://www.bendudu.com:8085/'
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 5545b6f..4616848 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -393,9 +393,16 @@
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
+ // alert(file.url)
+ // this.dialogFileUrl = 'https://www.bendudu.com:8080/profile/upload/2023/10/18/20231018214647A011.doc'
+ // this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
+ if(this.dialogFileUrl.includes("47.93.189.255")==true)
+ this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+ //alert(this.dialogFileUrl)
const Base64 = require('js-base64').Base64
- this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
- myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
},
//鍒犳枃浠�
handleRemoveFile(file,) {
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 0d57756..29fed60 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -23,15 +23,15 @@
<!-- </el-form-item>-->
<el-container>
<el-row :span="12">
- <el-cow >
+ <el-col >
<el-form-item label="鑾峰緱鏃堕棿" prop="happenTime" label-width="70px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-date-picker v-model="formData.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
:editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
- </el-cow>
- <el-cow >
+ </el-col>
+ <el-col >
<el-form-item label="绫诲埆" prop="type" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" :disabled="dsb">
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
@@ -39,42 +39,42 @@
</el-select>
<el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input>
</el-form-item>
- </el-cow>
- <el-cow >
+ </el-col>
+ <el-col >
<el-form-item label="鍚嶇О" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="formData.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow >
+ </el-col>
+ <el-col >
<el-form-item label="鏉ユ簮" prop="source" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="formData.source" placeholder="璇疯緭鍏ユ潵婧�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow >
+ </el-col>
+ <el-col >
<el-form-item label="鎸佹湁鑰�" prop="owner" label-width="65px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="formData.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow >
+ </el-col>
+ <el-col >
<el-form-item label="浠峰��" prop="price" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="formData.price" placeholder="璇疯緭鍏ヤ环鍊�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow >
+ </el-col>
+ <el-col >
<el-form-item label="瀛樻斁浣嶇疆" prop="location" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="formData.location" placeholder="璇疯緭鍏ュ瓨鏀句綅缃�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow >
+ </el-col>
+ <el-col >
<el-form-item label="澶囨敞" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- </el-cow>
+ </el-col>
</el-row>
</el-container>
@@ -468,9 +468,14 @@
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
+ if(this.dialogFileUrl.includes("47.93.189.255")==true)
+ this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+
const Base64 = require('js-base64').Base64
this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 6247371..a389964 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -186,37 +186,37 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
- <el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
- <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
- <el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="100" align="center">
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
+ <el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="120" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="绫诲埆" prop="type" sortable width="120" align="center">
+ <el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center">
<!-- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
<template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鏉ユ簮" prop="source" sortable width="120" align="center" >
+ <el-table-column label="鏉ユ簮" prop="source" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎸佹湁鑰�" prop="owner" sortable width="110" align="center">
+ <el-table-column label="鎸佹湁鑰�" prop="owner" sortable :show-overflow-tooltip="true" width="110" align="center">
<template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="浠峰��" prop="price" sortable width="120" align="center">
+ <el-table-column label="浠峰��" prop="price" sortable :show-overflow-tooltip="true" width="120" align="center">
<template slot-scope="scope">{{scope.row.price? scope.row.price: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="160" align="center">
+ <el-table-column label="瀛樻斁浣嶇疆" prop="location" :show-overflow-tooltip="true" sortable width="160" align="center">
<template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
+ <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="120" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" :show-overflow-tooltip="true" sortable width="150px" align="center">
<template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
@@ -242,35 +242,32 @@
></div>
</template>
</el-table-column>
- <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">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown
- size="mini"
- @command="(command) => handleCommand(command, scope.row)"
- v-hasPermi="['system:role:edit']">
+ <div class="button-container">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ >
+ <span style="font-size: 14px;">淇敼</span>
+ </el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
<el-button
size="mini"
type="text"
icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)"
-
- >鏌ョ湅璇︽儏</el-button>
-
- </el-dropdown>
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -552,10 +549,6 @@
created() {
this.getList();
this.getTypeOptions();
- // this.getCateInfor()
- // for (let i = 0; i < this.contactList.length; i++) {
- // this.formDat[i] = this.contactList[i];
- // }
},
methods: {
// 鍙栨秷鎸夐挳
@@ -601,7 +594,7 @@
);
listType(this.queryParams).then(response => {
this.typeList = response.data;
- this.total = response.data.total;
+
// console.log( this.typeList )
// 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
this.getTypeOptions();
@@ -880,5 +873,10 @@
}
-
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index 594a6a8..9e7a379 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -236,7 +236,7 @@
remark:undefined,
url: undefined,
},
- desurl:'',
+
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
@@ -328,17 +328,6 @@
},
mounted() {},
methods: {
- /** 鏌ヨ绫诲埆淇℃伅 */
- // getCateInfor()
- // {
- // let _this = this
- // getCategory().then(response=>{
- //
- // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- // })
- // })
- // },
submitForm() {
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -421,9 +410,13 @@
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
+ if(this.dialogFileUrl.includes("47.93.189.255")==true)
+ this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+
const Base64 = require('js-base64').Base64
- this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
- myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index b03ee25..6a3865d 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -136,9 +136,9 @@
</el-row>
</div>
- <el-table v-loading="loading" :data="contactList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;" >
+ <el-table v-loading="loading" :data="contactList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
- <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100px"/>
<el-table-column label="瀹朵汉濮撳悕" prop="myName" sortable width="130" >
<template slot-scope="scope">
@@ -150,10 +150,10 @@
</el-table-column>
<el-table-column label="閫氳褰曚腑绉板懠" prop="nickName" sortable :show-overflow-tooltip="true" width="160" align="center" />
<el-table-column label="濮撳悕" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center"/>
- <el-table-column label="宸ヤ綔鍗曚綅" prop="work" sortable width="160" align="center" >
+ <el-table-column label="宸ヤ綔鍗曚綅" prop="work" sortable :show-overflow-tooltip="true" width="160" align="center" >
<template slot-scope="scope">{{scope.row.work? scope.row.work: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎵嬫満" prop="phone" sortable width="120" align="center" >
+ <el-table-column label="鎵嬫満" prop="phone" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.phone? scope.row.phone: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鍏跺畠鑱旂郴鏂瑰紡" prop="wx qq twitter" sortable :show-overflow-tooltip="true" width="150" align="center" >
@@ -164,19 +164,19 @@
<span v-else>鈥斺�斺�斺��</span>
</template>
</el-table-column>
- <el-table-column label="鏄惁甯歌仈绯�" prop="isAlways" sortable width="170" align="center" >
+ <el-table-column label="鏄惁甯歌仈绯�" prop="isAlways" :show-overflow-tooltip="true" sortable width="170" align="center" >
<template slot-scope="scope">
<span v-if="scope.row.isAlways===1">鏄�</span>
<span v-if="scope.row.isAlways===0">鍚�</span>
<span v-if="scope.row.isAlways== null">鈥斺��</span>
</template>
</el-table-column>
- <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" align="center" >
<template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
</el-table-column>
- <el-table-column label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark" sortable width="120" align="center">
+ <el-table-column label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark" :show-overflow-tooltip="true" sortable width="120" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -204,28 +204,32 @@
</el-table-column>
- <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">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)">
-鏌ョ湅璇︽儏</el-button>
+ <div class="button-container">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ >
+ <span style="font-size: 14px;">淇敼</span>
+ </el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -804,6 +808,11 @@
background: #FFEFF2;
}
-
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 0dc87ca..b6cf43e 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -139,7 +139,7 @@
<el-table v-loading="loading" :data="doctorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
- <el-table-column label="绫诲埆" prop="type" sortable width="80" align="center">
+ <el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="80" align="center">
<!-- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
<template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -149,23 +149,23 @@
<el-table-column label="鎸佺画鏃堕棿" prop="duration" sortable :show-overflow-tooltip="true" width="160" align="center" >
<template slot-scope="scope">{{scope.row.duration? scope.row.duration: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="涓尰澶勬柟" prop="cmedical" sortable width="160" align="center" >
+ <el-table-column label="涓尰澶勬柟" prop="cmedical" sortable :show-overflow-tooltip="true" width="160" align="center" >
<template slot-scope="scope">{{scope.row.cmedical? scope.row.cmedical: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="瑗垮尰澶勬柟" prop="wmedical" sortable width="160" align="center">
+ <el-table-column label="瑗垮尰澶勬柟" prop="wmedical" sortable :show-overflow-tooltip="true" width="160" align="center">
<template slot-scope="scope">{{scope.row.wmedical? scope.row.wmedical: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍔熸晥" prop="effect" sortable width="120" align="center" >
+ <el-table-column label="鍔熸晥" prop="effect" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.effect? scope.row.effect: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="閫傜敤浜�" prop="suitable" sortable width="140" align="center" >
+ <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="140" align="center" >
<template slot-scope="scope">{{scope.row.suitable? scope.row.suitable: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable :show-overflow-tooltip="true" width="150px" align="center" >
<template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
</el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="120" align="center">
+ <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="120" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
@@ -191,30 +191,32 @@
</template>
</el-table-column>
-<!-- </el-table-column>-->
- <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"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
+ >
+ <span style="font-size: 14px;">淇敼</span>
+ </el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
-
-<el-button
+ ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
+ <el-button
size="mini"
type="text"
icon="el-icon-d-arrow-right"
@click="handleCheck(scope.row)">
-鏌ョ湅璇︽儏</el-button>
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -530,7 +532,6 @@
);
listType(this.queryParams).then(response => {
this.typeList = response.data;
- this.total = response.data.total;
// console.log( this.typeList )
// 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
this.getTypeOptions();
@@ -809,6 +810,13 @@
background: #FFEFF2;
}
-
-
+.tableRowClassName {
+ height: 40px;
+}
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 7ff7ffc..ae2921f 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -124,22 +124,22 @@
<template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
<!-- <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>-->
</el-table-column>
- <el-table-column label="鍚嶇О" prop="name" sortable width="120" align="center" >
+ <el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="璇佸彿/涓撲笟" prop="idNo" sortable width="170" align="center" >
+ <el-table-column label="璇佸彿/涓撲笟" prop="idNo" sortable :show-overflow-tooltip="true" width="170" align="center" >
<template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="绾у埆" prop="grade" sortable width="120" align="center">
+ <el-table-column label="绾у埆" prop="grade" sortable :show-overflow-tooltip="true" width="120" align="center">
<template slot-scope="scope">{{scope.row.grade? scope.row.grade: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鏈夋晥鏃堕棿" prop="validityDate" sortable width="170" align="center" >
+ <el-table-column label="鏈夋晥鏃堕棿" prop="validityDate" :show-overflow-tooltip="true" sortable width="170" align="center" >
<template slot-scope="scope">{{scope.row.validityDate? scope.row.validityDate: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鑾峰緱鏃堕棿" prop="getDate" sortable width="170" align="center" >
+ <el-table-column label="鑾峰緱鏃堕棿" prop="getDate" sortable :show-overflow-tooltip="true" width="170" align="center" >
<template slot-scope="scope">{{scope.row.getDate? scope.row.getDate: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="170" align="center" >
+ <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable :show-overflow-tooltip="true" width="170" align="center" >
<template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
@@ -168,29 +168,32 @@
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<!-- </el-table-column>-->
- <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">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
-
- <el-button
- size="mini"
- type="text"
- icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)">
- 鏌ョ湅璇︽儏</el-button>
+ <div class="button-container">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ >
+ <span style="font-size: 14px;">淇敼</span>
+ </el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -520,7 +523,6 @@
);
listType(this.queryParams).then(response => {
this.typeList = response.data;
- this.total = response.data.total;
// console.log( this.typeList )
// 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
this.getTypeOptions();
@@ -824,6 +826,11 @@
background: #FFEFF2;
}
-
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
diff --git a/ruoyi-ui/src/views/search/index.vue b/ruoyi-ui/src/views/search/index.vue
index f7283a8..a6cb3ba 100644
--- a/ruoyi-ui/src/views/search/index.vue
+++ b/ruoyi-ui/src/views/search/index.vue
@@ -47,14 +47,20 @@
<template slot-scope="scope">{{scope.row.ctTableName? scope.row.ctTableName: '鈥斺�斺�斺��'}}</template>
<!-- <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>-->
</el-table-column>
- <el-table-column label="瀛楁" prop="remark" sortable width="120" align="center" >
- <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ <el-table-column label=" " prop="by1" sortable width="120" align="center" >
+ <template slot-scope="scope">{{scope.row.by1? scope.row.by1: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鏃堕棿" prop="getDate" sortable width="170" align="center" >
- <template slot-scope="scope">{{scope.row.getDate? scope.row.getDate: '鈥斺�斺�斺��'}}</template>
+ <el-table-column label=" " prop="by2" sortable width="170" align="center" >
+ <template slot-scope="scope">{{scope.row.by2? scope.row.by2: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="浣嶇疆" prop="by5" sortable width="170" align="center" >
- <template slot-scope="scope">{{scope.row.by5 ? scope.row.by5: '鈥斺�斺�斺��'}}</template>
+ <el-table-column label=" " prop="by3" sortable width="170" align="center" >
+ <template slot-scope="scope">{{scope.row.by3 ? scope.row.by3: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label=" " prop="by4" sortable width="170" align="center" >
+ <template slot-scope="scope">{{scope.row.by4? scope.row.by4: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label=" " prop="by6" sortable width="170" align="center" >
+ <template slot-scope="scope">{{scope.row.by6 ? scope.row.by6: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<!-- </el-table-column>-->
@@ -136,7 +142,12 @@
formDat: {
ctTableName:undefined,
createTime:undefined,
+ by1:undefined,
+ by2:undefined,
+ by3:undefined,
+ by4:undefined,
by5:undefined,
+ by6:undefined,
remark:undefined,
location:undefined,
ctId:undefined
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 05bc4f1..3e442d9 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -139,13 +139,13 @@
<el-table-column label="浜虹墿" prop="people" sortable :show-overflow-tooltip="true" width="150" align="center" >
<template slot-scope="scope">{{scope.row.people? scope.row.people: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍦扮偣" prop="address" sortable width="160" align="center" >
+ <el-table-column label="鍦扮偣" prop="address" sortable :show-overflow-tooltip="true" width="160" align="center" >
<template slot-scope="scope">{{scope.row.address? scope.row.address: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="浜嬩欢鏍囬" prop="title" sortable width="160" align="center">
+ <el-table-column label="浜嬩欢鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="160" align="center">
<template slot-scope="scope">{{scope.row.title? scope.row.title: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="150" align="center">
+ <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="150" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
@@ -172,29 +172,32 @@
</el-table-column>
<!-- </el-table-column>-->
- <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">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
-
- <el-button
- size="mini"
- type="text"
- icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)">
- 鏌ョ湅璇︽儏</el-button>
+ <div class="button-container">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ >
+ <span style="font-size: 14px;">淇敼</span>
+ </el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -703,6 +706,11 @@
background: #FFEFF2;
}
-
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 2e368e3..16b7a22 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -158,19 +158,19 @@
<el-table-column label="鏃堕棿" prop="happenTime" sortable width="150" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title" sortable width="160" align="center">
+ <el-table-column label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title" sortable :show-overflow-tooltip="true" width="160" align="center">
<template slot-scope="scope">{{scope.row.title? scope.row.title: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="濮嬩簬浣曞洜" prop="cause" sortable :show-overflow-tooltip="true" width="140" align="center" >
<template slot-scope="scope">{{scope.row.cause? scope.row.cause: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍙楁儬浜�" prop="beneficiary" sortable width="140" align="center" >
+ <el-table-column label="鍙楁儬浜�" prop="beneficiary" sortable :show-overflow-tooltip="true" width="140" align="center" >
<template slot-scope="scope">{{scope.row.beneficiary? scope.row.beneficiary: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="缁ф壙浜�" prop="heir" sortable width="140" align="center">
+ <el-table-column label="缁ф壙浜�" prop="heir" sortable :show-overflow-tooltip="true" width="140" align="center">
<template slot-scope="scope">{{scope.row.heir? scope.row.heir: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="瀹炵幇闅惧害" prop="difficulty" sortable width="120" align="center">
+ <el-table-column label="瀹炵幇闅惧害" prop="difficulty" :show-overflow-tooltip="true" sortable width="120" align="center">
<template slot-scope="scope">{{scope.row.difficulty? scope.row.difficulty: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鏄惁渚濇棫鏈夋晥" prop="isEffective" sortable width="160" align="center">
@@ -202,38 +202,35 @@
></div>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
+ <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="90" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <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">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown
- size="mini"
- @command="(command) => handleCommand(command, scope.row)"
- v-hasPermi="['system:role:edit']">
+ <div class="button-container">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ >
+ <span style="font-size: 14px;">淇敼</span>
+ </el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
<el-button
size="mini"
type="text"
icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)"
-
- >鏌ョ湅璇︽儏</el-button>
-
- </el-dropdown>
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -823,6 +820,11 @@
background: #FFEFF2;
}
-
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
--
Gitblit v1.9.1