fix 启用/禁用 图标

src/modules/basic/view/campus.vue

@@ -228,7 +228,7 @@
           <el-table-column width="150" label="中心代码">
             <span slot-scope="scope">{{ scope.row.code }}</span>
           </el-table-column>
-          <el-table-column width="150" label="中心名称">
+          <el-table-column label="中心名称">
             <span slot-scope="scope">{{ scope.row.name }}</span>
           </el-table-column>
           <el-table-column width="100" label="负责人">
@@ -240,8 +240,29 @@
           <el-table-column width="170" label="更新时间">
             <span slot-scope="scope">{{ scope.row.updateTime }}</span>
           </el-table-column>
-          <el-table-column width="70" label="状态">
-            <span slot-scope="scope"> {{ getStatus(scope.row.enable) }} </span>
+          <el-table-column width="50" label="状态">
+            <span slot-scope="scope">
+              <span v-if="scope.row.enable">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="启用"
+                  placement="left"
+                >
+                  <i class="el-icon-success" style="color:green;"></i>
+                </el-tooltip>
+              </span>
+              <span v-else>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="禁用"
+                  placement="left"
+                >
+                  <i class="el-icon-error" style="color:red;"></i>
+                </el-tooltip>
+              </span>
+            </span>
           </el-table-column>
           <el-table-column :context="_self" label="操作" width="200">
             <div slot-scope="scope">
@@ -367,14 +388,6 @@ export default {
     toExamSite(row) {
       this.$router.push({ path: "/basic/examSite/" + row.id });
     },
-    getStatus(status) {
-      if (status == true) {
-        return "启用";
-      } else if (status == false) {
-        return "禁用";
-      }
-      return status;
-    },
     getTag(status) {
       if (status == true) {
         return "success";

src/modules/basic/view/course.vue

@@ -375,8 +375,29 @@
           <el-table-column label="层次">
             <span slot-scope="scope">{{ getLevel(scope.row.level) }}</span>
           </el-table-column>
-          <el-table-column label="状态" width="70">
-            <span slot-scope="scope">{{ getEnable(scope.row.enable) }}</span>
+          <el-table-column width="50" label="状态">
+            <span slot-scope="scope">
+              <span v-if="scope.row.enable">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="启用"
+                  placement="left"
+                >
+                  <i class="el-icon-success" style="color:green;"></i>
+                </el-tooltip>
+              </span>
+              <span v-else>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="禁用"
+                  placement="left"
+                >
+                  <i class="el-icon-error" style="color:red;"></i>
+                </el-tooltip>
+              </span>
+            </span>
           </el-table-column>
           <el-table-column prop="updateTime" label="更新时间" width="170" />
           <el-table-column label="操作" width="260">
@@ -702,14 +723,6 @@ export default {
         this.specialtyTotal = response.data.totalElements;
       });
     },
-    getEnable(enable) {
-      if (enable == true) {
-        return "启用";
-      } else if (enable == false) {
-        return "禁用";
-      }
-      return enable;
-    },
     getTag(status) {
       if (status == true) {
         return "success";

src/modules/basic/view/school.vue

@@ -249,11 +249,28 @@
         </el-table-column>
         <el-table-column prop="domainName" width="190" label="学校域名" />
         <el-table-column prop="updateTime" width="170" label="更新时间" />
-        <el-table-column width="70" label="状态">
+        <el-table-column width="50" label="状态">
           <span slot-scope="scope">
-            <!-- <el-tag :type="getTag(scope.row.enable)"> -->
-            {{ getStatus(scope.row.enable) }}
-            <!-- </el-tag> -->
+            <span v-if="scope.row.enable">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="启用"
+                placement="left"
+              >
+                <i class="el-icon-success" style="color:green;"></i>
+              </el-tooltip>
+            </span>
+            <span v-else>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="禁用"
+                placement="left"
+              >
+                <i class="el-icon-error" style="color:red;"></i>
+              </el-tooltip>
+            </span>
           </span>
         </el-table-column>
         <el-table-column :context="_self" width="200" prop="" label="操作">
@@ -384,14 +401,6 @@ export default {
       this.currentPage = 1;
       this.searchForm();
     },
-    getStatus(status) {
-      if (status == true) {
-        return "启用";
-      } else if (status == false) {
-        return "禁用";
-      }
-      return status;
-    },
     getTag(status) {
       if (status == true) {
         return "success";

src/modules/basic/view/specially.vue

@@ -128,14 +128,13 @@
       </el-dialog>
 
       <!-- 关联课程弹出框 -->
-      <el-dialog :title="courseDialogTitle" :visible.sync="courseDialog">
+      <el-dialog
+        :title="courseDialogTitle"
+        width="720px"
+        :visible.sync="courseDialog"
+      >
         <!-- 表单 -->
-        <el-form
-          :inline="true"
-          :model="courseSearchForm"
-          label-position="right"
-          label-width="100px"
-        >
+        <el-form :inline="true" :model="courseSearchForm">
           <el-row>
             <el-form-item label="课程名称" class="pull-left">
               <el-input
@@ -174,11 +173,11 @@
 
         <!-- 课程列表 -->
         <el-table :data="courseTableData" border resizable stripe>
-          <el-table-column prop="id" label="ID" width="150" />
-          <el-table-column prop="name" label="课程名称" width="250" />
+          <el-table-column prop="id" label="ID" width="60" />
+          <el-table-column prop="name" label="课程名称" width="220" />
           <el-table-column prop="code" label="课程代码" />
           <el-table-column prop="updateTime" label="更新时间" width="170" />
-          <el-table-column label="操作">
+          <el-table-column label="操作" width="120">
             <span slot-scope="scope">
               <el-button
                 size="mini"
@@ -202,13 +201,15 @@
       </el-dialog>
 
       <!-- 添加关联 -->
-      <el-dialog title="添加关联课程" :visible.sync="addRelationDialog">
+      <el-dialog
+        title="添加关联课程"
+        width="500px"
+        :visible.sync="addRelationDialog"
+      >
         <el-form
           :inline="true"
           :model="addRelationForm"
           ref="addRelationForm"
-          label-position="right"
-          label-width="100px"
           :rules="addRelationRules"
         >
           <el-row>
@@ -231,13 +232,12 @@
                 />
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row class="pull_center">
             <el-button type="primary" @click="submitAddRelationForm">
               保 存
             </el-button>
             <el-button @click="addRelationDialog = false">取 消</el-button>
           </el-row>
+          <el-row class="pull_center"> </el-row>
         </el-form>
       </el-dialog>
 
@@ -402,8 +402,8 @@ export default {
       courseDialogTitle: null,
       courseSearchForm: {
         specialtyId: null,
-        code: null,
-        name: null
+        code: "",
+        name: ""
       },
       courseTableData: [],
       currentCoursePage: 1,
@@ -543,7 +543,7 @@ export default {
       this.addRelationForm.courseId = null;
       this.addRelationForm.specialtyId = this.courseSearchForm.specialtyId;
       this.addRelationDialog = true;
-      this.$refs.addRelationForm.resetFields();
+      // this.$refs.addRelationForm.resetFields();
     },
     searchCoursePage() {
       var param = new URLSearchParams(this.courseSearchForm);
@@ -797,12 +797,12 @@ export default {
       this.courseDialogTitle =
         "关联课程列表 【专业名称：" +
         row.name +
-        "】【       专业代码：" +
+        "】【专业代码：" +
         row.code +
         "】";
       this.courseSearchForm.specialtyId = row.id;
-      this.courseSearchForm.name = null;
-      this.courseSearchForm.code = null;
+      this.courseSearchForm.code = "";
+      this.courseSearchForm.name = "";
 
       this.searchCoursePage();
       this.courseDialog = true;

src/modules/basic/view/user.vue

@@ -352,8 +352,29 @@
             </span>
           </el-table-column>
           <el-table-column prop="updateTime" width="160" label="更新时间" />
-          <el-table-column width="70" label="状态">
-            <span slot-scope="scope"> {{ getEnable(scope.row.enable) }} </span>
+          <el-table-column width="50" label="状态">
+            <span slot-scope="scope">
+              <span v-if="scope.row.enable">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="启用"
+                  placement="left"
+                >
+                  <i class="el-icon-success" style="color:green;"></i>
+                </el-tooltip>
+              </span>
+              <span v-else>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="禁用"
+                  placement="left"
+                >
+                  <i class="el-icon-error" style="color:red;"></i>
+                </el-tooltip>
+              </span>
+            </span>
           </el-table-column>
           <el-table-column width="170" label="操作">
             <div slot-scope="scope">
@@ -668,14 +689,6 @@ export default {
           this.orgLoading4InsertOrUpdate = false;
         });
     },
-    getEnable(enable) {
-      if (enable == true) {
-        return "启用";
-      } else if (enable == false) {
-        return "禁用";
-      }
-      return enable;
-    },
     getTag(status) {
       if (status == true) {
         return "success";