From 72b22be0d887d6793b8955b5a40ab5bbc6d9e7c4 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 25 四月 2023 17:52:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/.env.production | 4 +++-
ruoyi-ui/src/views/contacts/index.vue | 26 +++++++++++++-------------
ruoyi-ui/src/views/doctor/index.vue | 19 +++++++------------
3 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index b4893b0..26d289a 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,8 +1,10 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鑻ヤ緷绠＄悊绯荤粺
+VUE_APP_TITLE = 寮犳皬APP绠＄悊绯荤粺
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
# 鑻ヤ緷绠＄悊绯荤粺/鐢熶骇鐜
VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_TRUE_API = 'http://47.93.189.255:8080/'
+VUE_APP_BASE_OTHER_API = 'http://47.93.189.255:8083/'
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 2841519..c187f35 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -228,18 +228,19 @@
@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']">
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-d-arrow-right"-->
-<!-- @click="handleCheck(scope.row)"-->
-<!-- >鏌ョ湅璇︽儏</el-button>-->
- </el-dropdown>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+鏌ョ湅璇︽儏</el-button>
+
+
+
+
+
+
</template>
</el-table-column>
</el-table>
@@ -253,7 +254,7 @@
@pagination="getList"
/>
- <!-- 娣诲姞閫氳褰曢厤缃璇濇 -->
+
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
@@ -363,7 +364,6 @@
</div>
</el-dialog>
- <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
</el-dialog>
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 94e0aed..df0e855 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -252,18 +252,13 @@
@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']">
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-d-arrow-right"-->
-<!-- @click="handleCheck(scope.row)"-->
-<!-- >鏌ョ湅璇︽儏</el-button>-->
-
- </el-dropdown>
+
+<el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.1