sunyadv 5 년 전
부모
커밋
eca7bae13f

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -14,7 +14,7 @@ spring:
       location: C:/upload/
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://118.190.47.230:3306/man2?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:mysql://118.190.47.230:3306/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
     password: p011430seya1026
     hikari:

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -55,8 +55,8 @@
             v-if="scope.row.role == 2 && user.role == 1"
             @click="switchRole(scope.$index)"
           >切换为员工</el-button>
-          <el-button size="small" type="primary" @click="openInsertDialog(scope.$index)">编辑</el-button>
-          <el-button size="small" type="danger" @click="deleteUser(scope.$index)">删除</el-button>
+          <el-button size="small" type="primary" v-if="scope.row.role != 1" @click="openInsertDialog(scope.$index)">编辑</el-button>
+          <el-button size="small" type="danger" v-if="scope.row.role == 0" @click="deleteUser(scope.$index)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>