From 6e7c84d397d6a95460f70e8e0f53f78e913507f5 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Tue, 5 May 2020 18:13:31 +0800
Subject: [PATCH] 2

---
 ruoyi-ui/src/views/system/teacher/index.vue | 36 ++++++++++++++-------
 ruoyi/src/main/resources/application.yml    |  2 +-
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/system/teacher/index.vue b/ruoyi-ui/src/views/system/teacher/index.vue
index ac5e715f4..33fbf91a8 100644
--- a/ruoyi-ui/src/views/system/teacher/index.vue
+++ b/ruoyi-ui/src/views/system/teacher/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="用户id" prop="userid">
+      <el-form-item label="用户名称" prop="userid">
          <el-select v-model="queryParams.userid" filterable  placeholder="请选择用户" >
           <el-option
             v-for="item in teacherListAll"
@@ -37,15 +37,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5" v-show="false">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:teacher:add']"
-        >新增</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -97,6 +88,13 @@
       <el-table-column label="创建人" align="center" prop="createuserid" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleDetail(scope.row)"
+            v-hasPermi="['system:teacher:edit']"
+          >详情</el-button>
           <el-button
             size="mini"
             type="text"
@@ -125,7 +123,7 @@
 
     <!-- 添加或修改教师基本信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="flag">
         <el-form-item label="id" prop="id" v-show="false">
           <el-input v-model="form.id" />
         </el-form-item>
@@ -236,6 +234,8 @@ export default {
       zgzsOptions: [],
       //教师名称
       teacherMingCheng: "",
+      //修改和查看详情的标志  当查看详情时不允许编辑页面
+      flag: "",
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -353,9 +353,23 @@ export default {
         this.form = response.data;
         this.teacherMingCheng = this.form.user.nickName;
         this.open = true;
+        this.flag = false;
         this.title = "修改教师基本信息";
       });
     },
+    /** 详情按钮 */
+    handleDetail(row) {
+      this.reset();
+      const id = row.id;
+      getTeacher(id).then(response => {
+        this.form = response.data;
+        this.teacherMingCheng = this.form.user.nickName;
+        this.open = true;
+        //详情页不允许编辑页面
+        this.flag = true;
+        this.title = "教师基本信息详情";
+      });
+  },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {
diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml
index 424c5dfdd..3881fa71c 100644
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@@ -57,7 +57,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 120.53.14.147
+    host: localhost
     # 端口，默认为6379
     port: 6379
     # 密码