Merge remote-tracking branch 'origin/master'

linwenling

2023-04-25 72b22be0d887d6793b8955b5a40ab5bbc6d9e7c4

Merge remote-tracking branch 'origin/master'

 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/'

 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>

 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>