fix styles

src/modules/basic/view/app_list.vue

@@ -1,23 +1,21 @@
 <template>
-  <div>
-    <section class="content" style="margin-top: 20px;">
-      <div class="box box-info">
-        <div class="box-body">
-          <el-table
-            :data="appList"
-            border
-            resizable
-            stripe
-            style="width: 800px;text-align:center;"
-          >
-            <el-table-column prop="id" label="ID" width="100" />
-            <el-table-column prop="code" label="应用编码" />
-            <el-table-column prop="name" label="应用名称" />
-          </el-table>
-        </div>
+  <section class="content">
+    <div class="box box-info">
+      <div class="box-body">
+        <el-table
+          :data="appList"
+          border
+          resizable
+          stripe
+          style="width: 800px;text-align:center;"
+        >
+          <el-table-column prop="id" label="ID" width="100" />
+          <el-table-column prop="code" label="应用编码" />
+          <el-table-column prop="name" label="应用名称" />
+        </el-table>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 
 <script>

src/modules/basic/view/campus.vue

@@ -1,286 +1,278 @@
 <template>
-  <div>
-    <section class="content" style="margin-top: 20px;">
-      <div class="box box-info">
-        <div
-          class="box-body"
-          v-loading.body="fileLoading"
-          element-loading-text="机构上传中,请稍后..."
+  <section class="content">
+    <div class="box box-info">
+      <div
+        class="box-body"
+        v-loading.body="fileLoading"
+        element-loading-text="机构上传中,请稍后..."
+      >
+        <!-- 表单 -->
+        <el-form
+          :inline="true"
+          :model="formSearch"
+          label-position="right"
+          label-width="100px"
         >
-          <!-- 表单 -->
+          <el-row :gutter="5">
+            <el-form-item label="顶级机构" class="pull-left">
+              <el-select
+                class="input_width_lg"
+                v-model="formSearch.parentId"
+                placeholder="请选择"
+                :disabled="!isSuperAdmin"
+              >
+                <el-option
+                  v-for="item in rootOrgList"
+                  :label="item.name"
+                  :value="item.id"
+                  :key="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="中心代码" class="pull-left">
+              <el-input
+                placeholder="请输入学习中心代码"
+                v-model="formSearch.code"
+              />
+            </el-form-item>
+            <el-form-item label="中心名称" class="pull-left">
+              <el-input
+                placeholder="请输入学习中心名称"
+                v-model="formSearch.name"
+              />
+            </el-form-item>
+            <el-form-item class="pull-right">
+              <el-button
+                size="small"
+                type="primary"
+                icon="search"
+                @click="searchForm"
+              >
+                查询
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                icon="plus"
+                @click="insert"
+              >
+                新增
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                icon="upload2"
+                @click="imp"
+              >
+                导入
+              </el-button>
+              <el-button size="small" type="success" @click="enableOrg">
+                <i class="fa fa-check" aria-hidden="true"></i>启用
+              </el-button>
+              <el-button size="small" type="danger" @click="disableOrg">
+                <i class="fa fa-close" aria-hidden="true"></i>禁用
+              </el-button>
+            </el-form-item>
+          </el-row>
+        </el-form>
+
+        <!-- 添加或修改学习中心弹出框 -->
+        <el-dialog title="中心信息" :visible.sync="campusDialog">
           <el-form
             :inline="true"
-            :model="formSearch"
+            :model="campusForm"
+            ref="campusForm"
+            :rules="rules"
             label-position="right"
-            label-width="100px"
+            label-width="90px"
           >
-            <el-row :gutter="5">
-              <el-form-item label="顶级机构" class="pull-left">
-                <el-select
-                  class="input_width_lg"
-                  v-model="formSearch.parentId"
-                  placeholder="请选择"
-                  :disabled="!isSuperAdmin"
-                >
-                  <el-option
-                    v-for="item in rootOrgList"
-                    :label="item.name"
-                    :value="item.id"
-                    :key="item.id"
-                  />
-                </el-select>
+            <el-row>
+              <el-form-item label="中心代码" label-width="120px" prop="code">
+                <el-input
+                  :readonly="null != campusForm.id"
+                  class="pull_length"
+                  v-model="campusForm.code"
+                  auto-complete="off"
+                  placeholder="中心代码"
+                />
               </el-form-item>
-              <el-form-item label="中心代码" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item label="中心名称" label-width="120px" prop="name">
                 <el-input
-                  placeholder="请输入学习中心代码"
-                  v-model="formSearch.code"
+                  class="pull_length"
+                  v-model="campusForm.name"
+                  auto-complete="off"
+                  placeholder="中心名称"
                 />
               </el-form-item>
-              <el-form-item label="中心名称" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item
+                label="中心负责人"
+                label-width="120px"
+                prop="contacts"
+              >
                 <el-input
-                  placeholder="请输入学习中心名称"
-                  v-model="formSearch.name"
+                  class="pull_length"
+                  v-model="campusForm.contacts"
+                  auto-complete="off"
+                  placeholder="中心负责人"
                 />
               </el-form-item>
-              <el-form-item class="pull-right">
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="search"
-                  @click="searchForm"
-                >
-                  查询
-                </el-button>
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="plus"
-                  @click="insert"
-                >
-                  新增
-                </el-button>
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="upload2"
-                  @click="imp"
+            </el-row>
+            <el-row>
+              <el-form-item
+                label="联系方式"
+                label-width="120px"
+                prop="telephone"
+              >
+                <el-input
+                  class="pull_length"
+                  v-model="campusForm.telephone"
+                  auto-complete="off"
+                  placeholder="联系方式"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="状态" label-width="120px" prop="enable">
+                <el-radio-group
+                  class="pull_right_sm"
+                  v-model="campusForm.enable"
                 >
-                  导入
-                </el-button>
-                <el-button size="small" type="success" @click="enableOrg">
-                  <i class="fa fa-check" aria-hidden="true"></i>启用
-                </el-button>
-                <el-button size="small" type="danger" @click="disableOrg">
-                  <i class="fa fa-close" aria-hidden="true"></i>禁用
-                </el-button>
+                  <el-radio label="true">启用</el-radio>
+                  <el-radio label="false">禁用</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-row>
+            <el-row class="pull_center">
+              <el-button type="primary" @click="submitForm">保 存</el-button>
+              <el-button @click="campusDialog = false;">取 消</el-button>
+            </el-row>
           </el-form>
+        </el-dialog>
 
-          <!-- 添加或修改学习中心弹出框 -->
-          <el-dialog title="中心信息" :visible.sync="campusDialog">
-            <el-form
-              :inline="true"
-              :model="campusForm"
-              ref="campusForm"
-              :rules="rules"
-              label-position="right"
-              label-width="90px"
-            >
-              <el-row>
-                <el-form-item label="中心代码" label-width="120px" prop="code">
-                  <el-input
-                    :readonly="null != campusForm.id"
-                    class="pull_length"
-                    v-model="campusForm.code"
-                    auto-complete="off"
-                    placeholder="中心代码"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="中心名称" label-width="120px" prop="name">
-                  <el-input
-                    class="pull_length"
-                    v-model="campusForm.name"
-                    auto-complete="off"
-                    placeholder="中心名称"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="中心负责人"
-                  label-width="120px"
-                  prop="contacts"
+        <!-- 导入弹窗 -->
+        <el-dialog title="导入窗口" :visible.sync="impDialog">
+          <el-form>
+            <el-row>
+              <el-form-item style="margin-left:20px">
+                <el-upload
+                  class="form_left"
+                  ref="upload"
+                  accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                  :action="uploadAction"
+                  :headers="uploadHeaders"
+                  :data="uploadData"
+                  :before-upload="beforeUpload"
+                  :on-progress="uploadProgress"
+                  :on-success="uploadSuccess"
+                  :on-error="uploadError"
+                  :file-list="fileList"
+                  :auto-upload="false"
+                  :multiple="false"
                 >
-                  <el-input
-                    class="pull_length"
-                    v-model="campusForm.contacts"
-                    auto-complete="off"
-                    placeholder="中心负责人"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="联系方式"
-                  label-width="120px"
-                  prop="telephone"
-                >
-                  <el-input
-                    class="pull_length"
-                    v-model="campusForm.telephone"
-                    auto-complete="off"
-                    placeholder="联系方式"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="状态" label-width="120px" prop="enable">
-                  <el-radio-group
-                    class="pull_right_sm"
-                    v-model="campusForm.enable"
-                  >
-                    <el-radio label="true">启用</el-radio>
-                    <el-radio label="false">禁用</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-row>
-              <el-row class="pull_center">
-                <el-button type="primary" @click="submitForm">保 存</el-button>
-                <el-button @click="campusDialog = false;">取 消</el-button>
-              </el-row>
-            </el-form>
-          </el-dialog>
+                  <el-button size="small" slot="trigger" type="primary">
+                    选择文件
+                  </el-button>
+                  &nbsp;
+                  <el-button size="small" type="success" @click="submitUpload">
+                    确认上传
+                  </el-button>
+                  <el-button size="small" type="danger" @click="removeFile">
+                    清空文件
+                  </el-button>
+                  <el-button size="small" type="info" @click="exportFile">
+                    下载模板
+                  </el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传xlsx文件</div>
+                </el-upload>
+              </el-form-item>
+            </el-row>
+          </el-form>
+        </el-dialog>
 
-          <!-- 导入弹窗 -->
-          <el-dialog title="导入窗口" :visible.sync="impDialog">
-            <el-form>
-              <el-row>
-                <el-form-item style="margin-left:20px">
-                  <el-upload
-                    class="form_left"
-                    ref="upload"
-                    accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-                    :action="uploadAction"
-                    :headers="uploadHeaders"
-                    :data="uploadData"
-                    :before-upload="beforeUpload"
-                    :on-progress="uploadProgress"
-                    :on-success="uploadSuccess"
-                    :on-error="uploadError"
-                    :file-list="fileList"
-                    :auto-upload="false"
-                    :multiple="false"
-                  >
-                    <el-button size="small" slot="trigger" type="primary">
-                      选择文件
-                    </el-button>
-                    &nbsp;
-                    <el-button
-                      size="small"
-                      type="success"
-                      @click="submitUpload"
-                    >
-                      确认上传
-                    </el-button>
-                    <el-button size="small" type="danger" @click="removeFile">
-                      清空文件
-                    </el-button>
-                    <el-button size="small" type="info" @click="exportFile">
-                      下载模板
-                    </el-button>
-                    <div slot="tip" class="el-upload__tip">
-                      只能上传xlsx文件
-                    </div>
-                  </el-upload>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-dialog>
+        <!-- 导入错误信息列表 -->
+        <el-dialog title="错误提示" :visible.sync="errDialog">
+          <div
+            class="text-danger"
+            v-for="errMessage in errMessages"
+            :key="errMessage.lineNum"
+          >
+            第{{ errMessage.lineNum }}行：{{ errMessage.msg }}
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="errDialog = false;">确定</el-button>
+          </span>
+        </el-dialog>
 
-          <!-- 导入错误信息列表 -->
-          <el-dialog title="错误提示" :visible.sync="errDialog">
+        <!-- 页面列表 -->
+        <el-table
+          :data="tableData"
+          border
+          resizable
+          stripe
+          style="width: 100%;text-align:center;"
+          @selection-change="selectChange"
+        >
+          <el-table-column type="selection" width="55" />
+          <el-table-column width="80" label="ID">
+            <span slot-scope="scope">{{ scope.row.id }}</span>
+          </el-table-column>
+          <el-table-column width="100" label="中心代码">
+            <span slot-scope="scope">{{ scope.row.code }}</span>
+          </el-table-column>
+          <el-table-column width="200" label="中心名称">
+            <span slot-scope="scope">{{ scope.row.name }}</span>
+          </el-table-column>
+          <el-table-column width="100" label="负责人">
+            <span slot-scope="scope">{{ scope.row.contacts }}</span>
+          </el-table-column>
+          <el-table-column width="150" label="联系方式">
+            <span slot-scope="scope">{{ scope.row.telephone }}</span>
+          </el-table-column>
+          <el-table-column width="170" label="更新时间">
+            <span slot-scope="scope">{{ scope.row.updateTime }}</span>
+          </el-table-column>
+          <el-table-column width="100" label="状态">
+            <span slot-scope="scope">
+              <el-tag :type="getTag(scope.row.enable)">
+                {{ getStatus(scope.row.enable) }}
+              </el-tag>
+            </span>
+          </el-table-column>
+          <el-table-column :context="_self" label="操作" width="150">
             <div
-              class="text-danger"
-              v-for="errMessage in errMessages"
-              :key="errMessage.lineNum"
+              slot-scope="scope"
+              style="display: flex; flex-direction: column;"
             >
-              第{{ errMessage.lineNum }}行：{{ errMessage.msg }}
-            </div>
-            <span slot="footer" class="dialog-footer">
-              <el-button @click="errDialog = false;">确定</el-button>
-            </span>
-          </el-dialog>
-
-          <!-- 页面列表 -->
-          <el-table
-            :data="tableData"
-            border
-            resizable
-            stripe
-            style="width: 100%;text-align:center;"
-            @selection-change="selectChange"
-          >
-            <el-table-column type="selection" width="55" />
-            <el-table-column width="80" label="ID">
-              <span slot-scope="scope">{{ scope.row.id }}</span>
-            </el-table-column>
-            <el-table-column width="100" label="中心代码">
-              <span slot-scope="scope">{{ scope.row.code }}</span>
-            </el-table-column>
-            <el-table-column width="200" label="中心名称">
-              <span slot-scope="scope">{{ scope.row.name }}</span>
-            </el-table-column>
-            <el-table-column width="100" label="负责人">
-              <span slot-scope="scope">{{ scope.row.contacts }}</span>
-            </el-table-column>
-            <el-table-column width="150" label="联系方式">
-              <span slot-scope="scope">{{ scope.row.telephone }}</span>
-            </el-table-column>
-            <el-table-column width="170" label="更新时间">
-              <span slot-scope="scope">{{ scope.row.updateTime }}</span>
-            </el-table-column>
-            <el-table-column width="100" label="状态">
-              <span slot-scope="scope">
-                <el-tag :type="getTag(scope.row.enable)">
-                  {{ getStatus(scope.row.enable) }}
-                </el-tag>
-              </span>
-            </el-table-column>
-            <el-table-column :context="_self" label="操作" width="150">
-              <div
-                slot-scope="scope"
-                style="display: flex; flex-direction: column;"
+              <el-button size="mini" type="primary" @click="edit(scope.row);">
+                <i class="el-icon-edit"></i> 修改
+              </el-button>
+              <span style="line-height: 5px">&nbsp;</span>
+              <el-button
+                size="mini"
+                type="info"
+                @click="toExamSite(scope.row);"
               >
-                <el-button size="mini" type="primary" @click="edit(scope.row);">
-                  <i class="el-icon-edit"></i> 修改
-                </el-button>
-                <span style="line-height: 5px">&nbsp;</span>
-                <el-button
-                  size="mini"
-                  type="info"
-                  @click="toExamSite(scope.row);"
-                >
-                  考点设置
-                </el-button>
-              </div>
-            </el-table-column>
-          </el-table>
-          <div class="page pull-right">
-            <el-pagination
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="pageSize"
-              layout="total, prev, pager, next, jumper"
-              :total="total"
-            />
-          </div>
+                考点设置
+              </el-button>
+            </div>
+          </el-table-column>
+        </el-table>
+        <div class="page pull-right">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total"
+          />
         </div>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 <script>
 import { CORE_API } from "@/constants/constants.js";

src/modules/basic/view/course.vue

@@ -1,423 +1,298 @@
 <template>
-  <div>
-    <section class="content" style="margin-top: 20px">
-      <div class="box box-info">
-        <div
-          v-loading.body="fileLoading"
-          element-loading-text="课程上传中,请稍后..."
+  <section class="content">
+    <div class="box box-info">
+      <div
+        v-loading.body="fileLoading"
+        element-loading-text="课程上传中,请稍后..."
+      >
+        <el-form
+          :inline="true"
+          :model="formSearch"
+          label-position="right"
+          label-width="100px"
         >
+          <el-row>
+            <el-form-item label="课程名称" class="pull-left">
+              <el-input
+                class="input_width_lg"
+                placeholder="请输入课程名称"
+                v-model="formSearch.name"
+              />
+            </el-form-item>
+            <el-form-item label="课程代码" class="pull-left">
+              <el-input
+                class="input_width_lg"
+                placeholder="请输入课程代码"
+                v-model="formSearch.code"
+              />
+            </el-form-item>
+            <el-form-item label="课程状态" class="pull-left">
+              <el-select
+                class="input_width_lg"
+                v-model="formSearch.enable"
+                placeholder="请选择"
+                clearable
+              >
+                <el-option
+                  v-for="item in statusList"
+                  :label="item.label"
+                  :value="item.value"
+                  :key="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="层次" class="pull-left">
+              <el-select
+                class="input_width_lg"
+                v-model="formSearch.level"
+                placeholder="请选择"
+                clearable
+              >
+                <el-option
+                  v-for="item in levelList"
+                  :label="item.label"
+                  :value="item.value"
+                  :key="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="专业" class="pull-left" prop="specialtyId">
+              <el-select
+                class="input_width_lg"
+                remote
+                :remote-method="getSpecialtyList4Search"
+                :loading="specialtyLoading4Search"
+                filterable
+                clearable
+                v-model="formSearch.specialtyId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in specialtyList4SearchWrapper"
+                  :label="item.name"
+                  :value="item.id"
+                  :key="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item class="pull-right">
+              <el-button
+                size="small"
+                type="primary"
+                icon="search"
+                @click="searchForm"
+                >查询</el-button
+              >
+              <el-button size="small" type="primary" @click="impCourse">
+                <i class="fa fa-upload" aria-hidden="true"></i>导入
+              </el-button>
+              <el-button size="small" type="primary" @click="exportCourse">
+                <i class="fa fa-download" aria-hidden="true"></i>导出
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                icon="plus"
+                @click="insertCourse"
+                >新增</el-button
+              >
+              <el-button size="small" type="success" @click="enableByIds">
+                <i class="fa fa-check" aria-hidden="true"></i>启用
+              </el-button>
+              <el-button size="small" type="warning" @click="disableByIds">
+                <i class="fa fa-close" aria-hidden="true"></i>禁用
+              </el-button>
+            </el-form-item>
+          </el-row>
+        </el-form>
+
+        <!-- 添加或新增课程弹出框 -->
+        <el-dialog title="课程学习" :visible.sync="courseDialog">
           <el-form
             :inline="true"
-            :model="formSearch"
+            :model="courseForm"
+            ref="courseForm"
+            :rules="rules"
             label-position="right"
-            label-width="100px"
+            label-width="90px"
           >
             <el-row>
-              <el-form-item label="课程名称" class="pull-left">
+              <el-form-item label="课程代码" label-width="120px" prop="code">
                 <el-input
-                  class="input_width_lg"
-                  placeholder="请输入课程名称"
-                  v-model="formSearch.name"
+                  :disabled="null != courseForm.id"
+                  class="pull_length"
+                  v-model="courseForm.code"
+                  auto-complete="off"
+                  placeholder="请输入课程代码"
                 />
               </el-form-item>
-              <el-form-item label="课程代码" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item label="课程名称" label-width="120px" prop="name">
                 <el-input
-                  class="input_width_lg"
-                  placeholder="请输入课程代码"
-                  v-model="formSearch.code"
+                  class="pull_length"
+                  v-model="courseForm.name"
+                  auto-complete="off"
+                  placeholder="请输入课程名称"
                 />
               </el-form-item>
-              <el-form-item label="课程状态" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item label="层次" label-width="120px" prop="level">
                 <el-select
+                  style="width: 198px"
                   class="input_width_lg"
-                  v-model="formSearch.enable"
+                  v-model="courseForm.level"
                   placeholder="请选择"
-                  clearable
                 >
                   <el-option
-                    v-for="item in statusList"
+                    v-for="item in levelList"
                     :label="item.label"
                     :value="item.value"
                     :key="item.value"
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="层次" class="pull-left">
-                <el-select
-                  class="input_width_lg"
-                  v-model="formSearch.level"
-                  placeholder="请选择"
-                  clearable
+            </el-row>
+            <el-row>
+              <el-form-item label="课程状态" label-width="120px" prop="enable">
+                <el-radio-group
+                  class="pull_right_sm"
+                  v-model="courseForm.enable"
                 >
-                  <el-option
-                    v-for="item in levelList"
-                    :label="item.label"
-                    :value="item.value"
-                    :key="item.value"
-                  />
-                </el-select>
+                  <el-radio label="true">开启</el-radio>
+                  <el-radio label="false">关闭</el-radio>
+                </el-radio-group>
               </el-form-item>
-              <el-form-item label="专业" class="pull-left" prop="specialtyId">
-                <el-select
-                  class="input_width_lg"
-                  remote
-                  :remote-method="getSpecialtyList4Search"
-                  :loading="specialtyLoading4Search"
-                  filterable
-                  clearable
-                  v-model="formSearch.specialtyId"
-                  placeholder="请选择"
+            </el-row>
+            <el-row class="pull-center">
+              <el-button type="primary" @click="submitForm">保 存</el-button>
+              <el-button @click="courseDialog = false;">取 消</el-button>
+            </el-row>
+          </el-form>
+        </el-dialog>
+
+        <!-- 导入弹窗 -->
+        <el-dialog title="导入窗口" :visible.sync="impDialog">
+          <el-form>
+            <el-row>
+              <el-form-item style="margin-left:20px">
+                <el-upload
+                  class="form_left"
+                  ref="upload"
+                  accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                  :action="uploadAction"
+                  :headers="uploadHeaders"
+                  :data="uploadData"
+                  :before-upload="beforeUpload"
+                  :on-progress="uploadProgress"
+                  :on-success="uploadSuccess"
+                  :on-error="uploadError"
+                  :file-list="fileList"
+                  :auto-upload="false"
+                  :multiple="false"
                 >
-                  <el-option
-                    v-for="item in specialtyList4SearchWrapper"
-                    :label="item.name"
-                    :value="item.id"
-                    :key="item.id"
-                  />
-                </el-select>
+                  <el-button size="small" slot="trigger" type="primary">
+                    选择文件
+                  </el-button>
+                  &nbsp;
+                  <el-button size="small" type="success" @click="submitUpload">
+                    确认上传
+                  </el-button>
+                  <el-button size="small" type="danger" @click="removeFile">
+                    清空文件
+                  </el-button>
+                  <el-button size="small" type="info" @click="exportFile">
+                    下载模板
+                  </el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传xlsx文件</div>
+                </el-upload>
+              </el-form-item>
+            </el-row>
+          </el-form>
+        </el-dialog>
+
+        <!-- 导入错误信息列表 -->
+        <el-dialog title="错误提示" :visible.sync="errDialog">
+          <div
+            class="text-danger"
+            v-for="errMessage in errMessages"
+            :key="errMessage.lineNum"
+          >
+            第{{ errMessage.lineNum }}行：{{ errMessage.msg }}
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="errDialog = false;">确定</el-button>
+          </span>
+        </el-dialog>
+
+        <!-- 关联专业弹出框 -->
+        <el-dialog
+          :title="specialtyDialogTitle"
+          :visible.sync="specialtyDialog"
+        >
+          <!-- 表单 -->
+          <el-form
+            :inline="true"
+            :model="specialtySearchForm"
+            label-position="right"
+            label-width="100px"
+          >
+            <el-row>
+              <el-form-item label="专业名称" class="pull-left">
+                <el-input
+                  class="input_width_lg"
+                  placeholder="请输入专业名称"
+                  v-model="specialtySearchForm.name"
+                />
+              </el-form-item>
+              <el-form-item label="专业代码" class="pull-left">
+                <el-input
+                  class="input_width_lg"
+                  placeholder="请输入专业代码"
+                  v-model="specialtySearchForm.code"
+                />
               </el-form-item>
               <el-form-item class="pull-right">
                 <el-button
                   size="small"
                   type="primary"
                   icon="search"
-                  @click="searchForm"
-                  >查询</el-button
+                  @click="searchSpecialtyPage"
                 >
-                <el-button size="small" type="primary" @click="impCourse">
-                  <i class="fa fa-upload" aria-hidden="true"></i>导入
-                </el-button>
-                <el-button size="small" type="primary" @click="exportCourse">
-                  <i class="fa fa-download" aria-hidden="true"></i>导出
+                  查询
                 </el-button>
                 <el-button
                   size="small"
                   type="primary"
-                  icon="plus"
-                  @click="insertCourse"
-                  >新增</el-button
+                  icon="search"
+                  @click="addRelation"
                 >
-                <el-button size="small" type="success" @click="enableByIds">
-                  <i class="fa fa-check" aria-hidden="true"></i>启用
-                </el-button>
-                <el-button size="small" type="warning" @click="disableByIds">
-                  <i class="fa fa-close" aria-hidden="true"></i>禁用
+                  新增
                 </el-button>
               </el-form-item>
             </el-row>
           </el-form>
 
-          <!-- 添加或新增课程弹出框 -->
-          <el-dialog title="课程学习" :visible.sync="courseDialog">
-            <el-form
-              :inline="true"
-              :model="courseForm"
-              ref="courseForm"
-              :rules="rules"
-              label-position="right"
-              label-width="90px"
-            >
-              <el-row>
-                <el-form-item label="课程代码" label-width="120px" prop="code">
-                  <el-input
-                    :disabled="null != courseForm.id"
-                    class="pull_length"
-                    v-model="courseForm.code"
-                    auto-complete="off"
-                    placeholder="请输入课程代码"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="课程名称" label-width="120px" prop="name">
-                  <el-input
-                    class="pull_length"
-                    v-model="courseForm.name"
-                    auto-complete="off"
-                    placeholder="请输入课程名称"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="层次" label-width="120px" prop="level">
-                  <el-select
-                    style="width: 198px"
-                    class="input_width_lg"
-                    v-model="courseForm.level"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in levelList"
-                      :label="item.label"
-                      :value="item.value"
-                      :key="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="课程状态"
-                  label-width="120px"
-                  prop="enable"
-                >
-                  <el-radio-group
-                    class="pull_right_sm"
-                    v-model="courseForm.enable"
-                  >
-                    <el-radio label="true">开启</el-radio>
-                    <el-radio label="false">关闭</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-row>
-              <el-row class="pull-center">
-                <el-button type="primary" @click="submitForm">保 存</el-button>
-                <el-button @click="courseDialog = false;">取 消</el-button>
-              </el-row>
-            </el-form>
-          </el-dialog>
-
-          <!-- 导入弹窗 -->
-          <el-dialog title="导入窗口" :visible.sync="impDialog">
-            <el-form>
-              <el-row>
-                <el-form-item style="margin-left:20px">
-                  <el-upload
-                    class="form_left"
-                    ref="upload"
-                    accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-                    :action="uploadAction"
-                    :headers="uploadHeaders"
-                    :data="uploadData"
-                    :before-upload="beforeUpload"
-                    :on-progress="uploadProgress"
-                    :on-success="uploadSuccess"
-                    :on-error="uploadError"
-                    :file-list="fileList"
-                    :auto-upload="false"
-                    :multiple="false"
-                  >
-                    <el-button size="small" slot="trigger" type="primary">
-                      选择文件
-                    </el-button>
-                    &nbsp;
-                    <el-button
-                      size="small"
-                      type="success"
-                      @click="submitUpload"
-                    >
-                      确认上传
-                    </el-button>
-                    <el-button size="small" type="danger" @click="removeFile">
-                      清空文件
-                    </el-button>
-                    <el-button size="small" type="info" @click="exportFile">
-                      下载模板
-                    </el-button>
-                    <div slot="tip" class="el-upload__tip">
-                      只能上传xlsx文件
-                    </div>
-                  </el-upload>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-dialog>
-
-          <!-- 导入错误信息列表 -->
-          <el-dialog title="错误提示" :visible.sync="errDialog">
-            <div
-              class="text-danger"
-              v-for="errMessage in errMessages"
-              :key="errMessage.lineNum"
-            >
-              第{{ errMessage.lineNum }}行：{{ errMessage.msg }}
-            </div>
-            <span slot="footer" class="dialog-footer">
-              <el-button @click="errDialog = false;">确定</el-button>
-            </span>
-          </el-dialog>
-
-          <!-- 关联专业弹出框 -->
-          <el-dialog
-            :title="specialtyDialogTitle"
-            :visible.sync="specialtyDialog"
-          >
-            <!-- 表单 -->
-            <el-form
-              :inline="true"
-              :model="specialtySearchForm"
-              label-position="right"
-              label-width="100px"
-            >
-              <el-row>
-                <el-form-item label="专业名称" class="pull-left">
-                  <el-input
-                    class="input_width_lg"
-                    placeholder="请输入专业名称"
-                    v-model="specialtySearchForm.name"
-                  />
-                </el-form-item>
-                <el-form-item label="专业代码" class="pull-left">
-                  <el-input
-                    class="input_width_lg"
-                    placeholder="请输入专业代码"
-                    v-model="specialtySearchForm.code"
-                  />
-                </el-form-item>
-                <el-form-item class="pull-right">
-                  <el-button
-                    size="small"
-                    type="primary"
-                    icon="search"
-                    @click="searchSpecialtyPage"
-                  >
-                    查询
-                  </el-button>
-                  <el-button
-                    size="small"
-                    type="primary"
-                    icon="search"
-                    @click="addRelation"
-                  >
-                    新增
-                  </el-button>
-                </el-form-item>
-              </el-row>
-            </el-form>
-
-            <!-- 专业列表 -->
-            <el-table
-              :data="specialtyTableData"
-              border
-              style="width: 100%;text-align:center;"
-            >
-              <el-table-column prop="id" label="ID" width="150" />
-              <el-table-column prop="name" label="专业名称" width="250" />
-              <el-table-column prop="code" label="专业代码" />
-              <el-table-column prop="updateTime" label="更新时间" width="170" />
-              <el-table-column label="操作">
-                <div slot-scope="scope">
-                  <span>
-                    <el-button
-                      size="mini"
-                      type="info"
-                      @click="deleteRelation(scope.row);"
-                    >
-                      <i class="el-icon-edit"></i> 取消关联
-                    </el-button>
-                  </span>
-                </div>
-              </el-table-column>
-            </el-table>
-            <div class="page pull-right">
-              <el-pagination
-                @current-change="handleSpecialtyCurrentChange"
-                :current-page="currentSpecialtyPage"
-                :page-size="10"
-                layout="total, prev, pager, next, jumper"
-                :total="specialtyTotal"
-              />
-            </div>
-          </el-dialog>
-
-          <!-- 添加关联 -->
-          <el-dialog title="添加关联专业" v-model="addRelationDialog">
-            <el-form
-              :inline="true"
-              :model="addRelationForm"
-              ref="addRelationForm"
-              label-position="right"
-              label-width="100px"
-              :rules="addRelationRules"
-            >
-              <el-row>
-                <el-form-item label="专业" class="pull-left" prop="specialtyId">
-                  <el-select
-                    class="input"
-                    remote
-                    :remote-method="getSpecialtyList4AddRelation"
-                    :loading="specialtyLoading4AddRelation"
-                    filterable
-                    clearable
-                    v-model="addRelationForm.specialtyId"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in specialtyList4AddRelationWrapper"
-                      :label="item.name"
-                      :value="item.id"
-                      :key="item.id"
-                    />
-                  </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-form>
-          </el-dialog>
-
-          <!-- 页面列表 -->
+          <!-- 专业列表 -->
           <el-table
-            :data="tableData"
+            :data="specialtyTableData"
             border
-            resizable
-            stripe
             style="width: 100%;text-align:center;"
-            @selection-change="selectChange"
           >
-            <el-table-column type="selection" width="50" />
-            <el-table-column prop="id" label="课程ID" width="80" />
-            <el-table-column prop="name" label="课程名称" width="180" />
-            <el-table-column prop="code" label="课程代码" />
-            <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">
-                <el-tag :type="getTag(scope.row.enable)">
-                  {{ getEnable(scope.row.enable) }}
-                </el-tag>
-              </span>
-            </el-table-column>
+            <el-table-column prop="id" label="ID" width="150" />
+            <el-table-column prop="name" label="专业名称" width="250" />
+            <el-table-column prop="code" label="专业代码" />
             <el-table-column prop="updateTime" label="更新时间" width="170" />
             <el-table-column label="操作">
               <div slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click="relation(scope.row);"
-                >
-                  关联专业
-                </el-button>
                 <span>
                   <el-button
                     size="mini"
                     type="info"
-                    @click="editCourse(scope.row);"
+                    @click="deleteRelation(scope.row);"
                   >
-                    <i class="el-icon-edit"></i> 修改
-                  </el-button>
-                </span>
-                <span v-if="!scope.row.enable">
-                  <el-button
-                    size="mini"
-                    type="success"
-                    @click="enableById(scope.row);"
-                  >
-                    <i class="fa fa-check" aria-hidden="true"></i>启用
-                  </el-button>
-                </span>
-                <span v-if="scope.row.enable">
-                  <el-button
-                    size="mini"
-                    type="warning"
-                    @click="disableById(scope.row);"
-                  >
-                    <i class="fa fa-close" aria-hidden="true"></i>禁用
+                    <i class="el-icon-edit"></i> 取消关联
                   </el-button>
                 </span>
               </div>
@@ -425,18 +300,131 @@
           </el-table>
           <div class="page pull-right">
             <el-pagination
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
+              @current-change="handleSpecialtyCurrentChange"
+              :current-page="currentSpecialtyPage"
               :page-size="10"
               layout="total, prev, pager, next, jumper"
-              :total="total"
-            >
-            </el-pagination>
+              :total="specialtyTotal"
+            />
           </div>
+        </el-dialog>
+
+        <!-- 添加关联 -->
+        <el-dialog title="添加关联专业" v-model="addRelationDialog">
+          <el-form
+            :inline="true"
+            :model="addRelationForm"
+            ref="addRelationForm"
+            label-position="right"
+            label-width="100px"
+            :rules="addRelationRules"
+          >
+            <el-row>
+              <el-form-item label="专业" class="pull-left" prop="specialtyId">
+                <el-select
+                  class="input"
+                  remote
+                  :remote-method="getSpecialtyList4AddRelation"
+                  :loading="specialtyLoading4AddRelation"
+                  filterable
+                  clearable
+                  v-model="addRelationForm.specialtyId"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in specialtyList4AddRelationWrapper"
+                    :label="item.name"
+                    :value="item.id"
+                    :key="item.id"
+                  />
+                </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-form>
+        </el-dialog>
+
+        <!-- 页面列表 -->
+        <el-table
+          :data="tableData"
+          border
+          resizable
+          stripe
+          style="width: 100%;text-align:center;"
+          @selection-change="selectChange"
+        >
+          <el-table-column type="selection" width="50" />
+          <el-table-column prop="id" label="课程ID" width="80" />
+          <el-table-column prop="name" label="课程名称" width="180" />
+          <el-table-column prop="code" label="课程代码" />
+          <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">
+              <el-tag :type="getTag(scope.row.enable)">
+                {{ getEnable(scope.row.enable) }}
+              </el-tag>
+            </span>
+          </el-table-column>
+          <el-table-column prop="updateTime" label="更新时间" width="170" />
+          <el-table-column label="操作">
+            <div slot-scope="scope">
+              <el-button
+                size="mini"
+                type="primary"
+                @click="relation(scope.row);"
+              >
+                关联专业
+              </el-button>
+              <span>
+                <el-button
+                  size="mini"
+                  type="info"
+                  @click="editCourse(scope.row);"
+                >
+                  <i class="el-icon-edit"></i> 修改
+                </el-button>
+              </span>
+              <span v-if="!scope.row.enable">
+                <el-button
+                  size="mini"
+                  type="success"
+                  @click="enableById(scope.row);"
+                >
+                  <i class="fa fa-check" aria-hidden="true"></i>启用
+                </el-button>
+              </span>
+              <span v-if="scope.row.enable">
+                <el-button
+                  size="mini"
+                  type="warning"
+                  @click="disableById(scope.row);"
+                >
+                  <i class="fa fa-close" aria-hidden="true"></i>禁用
+                </el-button>
+              </span>
+            </div>
+          </el-table-column>
+        </el-table>
+        <div class="page pull-right">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="10"
+            layout="total, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
         </div>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 
 <script>

src/modules/basic/view/exam_site.vue

@@ -1,187 +1,181 @@
 <template>
-  <div>
-    <section class="content" style="margin-top: 20px;">
-      <div class="box box-info">
-        <div class="box-body">
-          <!-- 表单 -->
+  <section class="content">
+    <div class="box box-info">
+      <div class="box-body">
+        <!-- 表单 -->
+        <el-form
+          :inline="true"
+          :model="formSearch"
+          label-position="right"
+          label-width="100px"
+        >
+          <el-row :gutter="5">
+            <el-form-item label="学习中心" class="pull-left">
+              <el-input v-model="orgName" readonly />
+            </el-form-item>
+            <el-form-item label="考点代码" class="pull-left">
+              <el-input
+                placeholder="请输入考点代码"
+                v-model="formSearch.code"
+              />
+            </el-form-item>
+            <el-form-item label="考点名称" class="pull-left">
+              <el-input
+                placeholder="请输入考点名称"
+                v-model="formSearch.name"
+              />
+            </el-form-item>
+            <el-form-item class="pull-right">
+              <el-button
+                size="small"
+                type="primary"
+                icon="search"
+                @click="searchForm"
+              >
+                查询
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                icon="plus"
+                @click="insert"
+              >
+                新增
+              </el-button>
+              <el-button size="small" type="danger" @click="deleteByIds">
+                <i class="el-icon-delete"></i>删除
+              </el-button>
+              <el-button size="small" type="info" @click="back">
+                退回
+              </el-button>
+            </el-form-item>
+          </el-row>
+        </el-form>
+
+        <!-- 添加考点信息弹出框 -->
+        <el-dialog title="考点信息" :visible.sync="examSiteDialog">
           <el-form
             :inline="true"
-            :model="formSearch"
+            :model="examSiteForm"
+            ref="examSiteForm"
+            :rules="rules"
             label-position="right"
-            label-width="100px"
+            label-width="90px"
           >
-            <el-row :gutter="5">
-              <el-form-item label="学习中心" class="pull-left">
-                <el-input v-model="orgName" readonly />
+            <el-row>
+              <el-form-item label="学习中心" label-width="120px" prop="code">
+                <el-input
+                  class="pull_length"
+                  v-model="orgName"
+                  auto-complete="off"
+                  placeholder="中心代码"
+                  readonly
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="考点代码" label-width="120px" prop="code">
+                <el-input
+                  class="pull_length"
+                  v-model="examSiteForm.code"
+                  auto-complete="off"
+                  placeholder="考点代码"
+                  :readonly="null != examSiteForm.id"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="考点名称" label-width="120px" prop="name">
+                <el-input
+                  class="pull_length"
+                  v-model="examSiteForm.name"
+                  auto-complete="off"
+                  placeholder="考点名称"
+                />
               </el-form-item>
-              <el-form-item label="考点代码" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item label="负责人" label-width="120px">
                 <el-input
-                  placeholder="请输入考点代码"
-                  v-model="formSearch.code"
+                  class="pull_length"
+                  v-model="examSiteForm.contacts"
+                  auto-complete="off"
+                  placeholder="负责人"
                 />
               </el-form-item>
-              <el-form-item label="考点名称" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item label="联系方式" label-width="120px">
                 <el-input
-                  placeholder="请输入考点名称"
-                  v-model="formSearch.name"
+                  class="pull_length"
+                  v-model="examSiteForm.telephone"
+                  auto-complete="off"
+                  placeholder="联系方式"
                 />
               </el-form-item>
-              <el-form-item class="pull-right">
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="search"
-                  @click="searchForm"
-                >
-                  查询
-                </el-button>
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="plus"
-                  @click="insert"
-                >
-                  新增
-                </el-button>
-                <el-button size="small" type="danger" @click="deleteByIds">
-                  <i class="el-icon-delete"></i>删除
-                </el-button>
-                <el-button size="small" type="info" @click="back">
-                  退回
-                </el-button>
+            </el-row>
+            <el-row>
+              <el-form-item label="备注" label-width="120px">
+                <el-input
+                  class="pull_length"
+                  v-model="examSiteForm.remark"
+                  auto-complete="off"
+                  placeholder="备注"
+                />
               </el-form-item>
             </el-row>
+            <el-row class="pull_center">
+              <el-button type="primary" @click="submitForm">保 存</el-button>
+              <el-button @click="examSiteDialog = false;">取 消</el-button>
+            </el-row>
           </el-form>
+        </el-dialog>
 
-          <!-- 添加考点信息弹出框 -->
-          <el-dialog
-            title="考点信息"
-            :visible.sync="examSiteDialog"
-            size="tiny"
-          >
-            <el-form
-              :inline="true"
-              :model="examSiteForm"
-              ref="examSiteForm"
-              :rules="rules"
-              label-position="right"
-              label-width="90px"
-            >
-              <el-row>
-                <el-form-item label="学习中心" label-width="120px" prop="code">
-                  <el-input
-                    class="pull_length"
-                    v-model="orgName"
-                    auto-complete="off"
-                    placeholder="中心代码"
-                    readonly
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="考点代码" label-width="120px" prop="code">
-                  <el-input
-                    class="pull_length"
-                    v-model="examSiteForm.code"
-                    auto-complete="off"
-                    placeholder="考点代码"
-                    :readonly="null != examSiteForm.id"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="考点名称" label-width="120px" prop="name">
-                  <el-input
-                    class="pull_length"
-                    v-model="examSiteForm.name"
-                    auto-complete="off"
-                    placeholder="考点名称"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="负责人" label-width="120px">
-                  <el-input
-                    class="pull_length"
-                    v-model="examSiteForm.contacts"
-                    auto-complete="off"
-                    placeholder="负责人"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="联系方式" label-width="120px">
-                  <el-input
-                    class="pull_length"
-                    v-model="examSiteForm.telephone"
-                    auto-complete="off"
-                    placeholder="联系方式"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="备注" label-width="120px">
-                  <el-input
-                    class="pull_length"
-                    v-model="examSiteForm.remark"
-                    auto-complete="off"
-                    placeholder="备注"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row class="pull_center">
-                <el-button type="primary" @click="submitForm">保 存</el-button>
-                <el-button @click="examSiteDialog = false;">取 消</el-button>
-              </el-row>
-            </el-form>
-          </el-dialog>
-
-          <!-- 页面列表 -->
-          <el-table
-            :data="tableData"
-            border
-            resizable
-            stripe
-            style="width: 100%;text-align:center;"
-            @selection-change="selectChange"
-          >
-            <el-table-column type="selection" width="50" />
-            <el-table-column prop="id" width="80" label="ID" />
-            <el-table-column prop="orgName" label="学习中心" />
-            <el-table-column prop="code" label="考点代码" />
-            <el-table-column prop="name" label="考点名称" />
-            <el-table-column prop="contacts" width="100" label="负责人" />
-            <el-table-column prop="telephone" width="100" label="联系方式" />
-            <el-table-column prop="remark" width="150" label="备注" />
-            <el-table-column prop="updateTime" width="180" label="更新时间" />
-            <el-table-column label="操作" width="180">
-              <div slot-scope="scope">
-                <el-button size="mini" type="primary" @click="edit(scope.row);">
-                  <i class="el-icon-edit"></i> 修改
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="deleteById(scope.row);"
-                >
-                  <i class="el-icon-delete"></i> 删除
-                </el-button>
-              </div>
-            </el-table-column>
-          </el-table>
-          <div class="page pull-right">
-            <el-pagination
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="pageSize"
-              layout="total, prev, pager, next, jumper"
-              :total="total"
-            />
-          </div>
+        <!-- 页面列表 -->
+        <el-table
+          :data="tableData"
+          border
+          resizable
+          stripe
+          style="width: 100%;text-align:center;"
+          @selection-change="selectChange"
+        >
+          <el-table-column type="selection" width="50" />
+          <el-table-column prop="id" width="80" label="ID" />
+          <el-table-column prop="orgName" label="学习中心" />
+          <el-table-column prop="code" label="考点代码" />
+          <el-table-column prop="name" label="考点名称" />
+          <el-table-column prop="contacts" width="100" label="负责人" />
+          <el-table-column prop="telephone" width="100" label="联系方式" />
+          <el-table-column prop="remark" width="150" label="备注" />
+          <el-table-column prop="updateTime" width="180" label="更新时间" />
+          <el-table-column label="操作" width="180">
+            <div slot-scope="scope">
+              <el-button size="mini" type="primary" @click="edit(scope.row);">
+                <i class="el-icon-edit"></i> 修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="danger"
+                @click="deleteById(scope.row);"
+              >
+                <i class="el-icon-delete"></i> 删除
+              </el-button>
+            </div>
+          </el-table-column>
+        </el-table>
+        <div class="page pull-right">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total"
+          />
         </div>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 
 <script>

src/modules/basic/view/privilege_group_list.vue

@@ -1,35 +1,33 @@
 <template>
-  <div>
-    <section class="content" style="margin-top: 20px;">
-      <div class="box box-info">
-        <div class="box-body">
-          <el-table
-            :data="privilegeGroupList"
-            border
-            resizable
-            stripe
-            style="width: 100%;text-align:center;"
-          >
-            <el-table-column prop="id" label="ID" width="100" />
-            <el-table-column prop="code" label="权限组编码" />
-            <el-table-column prop="name" label="权限组名称" />
-            <el-table-column prop="appName" label="应用名称" />
-            <el-table-column width="300" label="操作">
-              <div slot-scope="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  @click="editPrivilege(scope.row);"
-                >
-                  权限配置
-                </el-button>
-              </div>
-            </el-table-column>
-          </el-table>
-        </div>
+  <section class="content">
+    <div class="box box-info">
+      <div class="box-body">
+        <el-table
+          :data="privilegeGroupList"
+          border
+          resizable
+          stripe
+          style="width: 100%;text-align:center;"
+        >
+          <el-table-column prop="id" label="ID" width="100" />
+          <el-table-column prop="code" label="权限组编码" />
+          <el-table-column prop="name" label="权限组名称" />
+          <el-table-column prop="appName" label="应用名称" />
+          <el-table-column width="300" label="操作">
+            <div slot-scope="scope">
+              <el-button
+                size="small"
+                type="primary"
+                @click="editPrivilege(scope.row);"
+              >
+                权限配置
+              </el-button>
+            </div>
+          </el-table-column>
+        </el-table>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 
 <script>

src/modules/basic/view/privilege_tree.vue

@@ -1,243 +1,241 @@
 <template>
-  <div>
-    <section class="content" style="margin-top: 20px;">
-      <div class="box box-info">
-        <div class="box-body">
-          <!-- 权限树 -->
-          <div style="width: 80%;">
-            <el-tree
-              :data="treeData"
-              :props="defaultProps"
-              node-key="id"
-              ref="tree"
-              highlight-current
-              :default-expanded-keys="[-1]"
-              :expand-on-click-node="false"
-              :render-content="renderContent"
-            />
-          </div>
+  <section class="content">
+    <div class="box box-info">
+      <div class="box-body">
+        <!-- 权限树 -->
+        <div style="width: 80%;">
+          <el-tree
+            :data="treeData"
+            :props="defaultProps"
+            node-key="id"
+            ref="tree"
+            highlight-current
+            :default-expanded-keys="[-1]"
+            :expand-on-click-node="false"
+            :render-content="renderContent"
+          />
+        </div>
 
-          <!-- 新增权限 -->
-          <el-dialog title="新增权限" :visible.sync="addingDialog.show">
-            <el-form
-              :model="addingDialog.privilege"
-              ref="addingForm"
-              label-width="100px"
-              :rules="rules"
-            >
-              <el-form-item label="父权限名称" prop="parentName">
-                <el-col>
-                  <el-input
-                    v-model="addingDialog.parentName"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="权限名称" prop="name">
-                <el-col>
-                  <el-input v-model="addingDialog.privilege.name"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="权限编码" prop="code">
-                <el-col>
-                  <el-input v-model="addingDialog.privilege.code"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="描述" prop="description">
-                <el-col>
-                  <el-input
-                    v-model="addingDialog.privilege.description"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="权重" prop="weight">
-                <el-col>
-                  <el-input v-model="addingDialog.privilege.weight"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性1">
-                <el-col>
-                  <el-input v-model="addingDialog.privilege.ext1"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性2">
-                <el-col>
-                  <el-input v-model="addingDialog.privilege.ext2"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性3">
-                <el-col>
-                  <el-input v-model="addingDialog.privilege.ext3"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性4">
-                <el-col>
-                  <el-input v-model="addingDialog.privilege.ext4"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性5">
-                <el-col>
-                  <el-input v-model="addingDialog.privilege.ext5"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="addPrivilege">确定</el-button>
-                <el-button @click="addingDialog.show = false;">取消</el-button>
-              </el-form-item>
-            </el-form>
-          </el-dialog>
+        <!-- 新增权限 -->
+        <el-dialog title="新增权限" :visible.sync="addingDialog.show">
+          <el-form
+            :model="addingDialog.privilege"
+            ref="addingForm"
+            label-width="100px"
+            :rules="rules"
+          >
+            <el-form-item label="父权限名称" prop="parentName">
+              <el-col>
+                <el-input
+                  v-model="addingDialog.parentName"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="权限名称" prop="name">
+              <el-col>
+                <el-input v-model="addingDialog.privilege.name"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="权限编码" prop="code">
+              <el-col>
+                <el-input v-model="addingDialog.privilege.code"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="描述" prop="description">
+              <el-col>
+                <el-input
+                  v-model="addingDialog.privilege.description"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="权重" prop="weight">
+              <el-col>
+                <el-input v-model="addingDialog.privilege.weight"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性1">
+              <el-col>
+                <el-input v-model="addingDialog.privilege.ext1"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性2">
+              <el-col>
+                <el-input v-model="addingDialog.privilege.ext2"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性3">
+              <el-col>
+                <el-input v-model="addingDialog.privilege.ext3"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性4">
+              <el-col>
+                <el-input v-model="addingDialog.privilege.ext4"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性5">
+              <el-col>
+                <el-input v-model="addingDialog.privilege.ext5"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="addPrivilege">确定</el-button>
+              <el-button @click="addingDialog.show = false;">取消</el-button>
+            </el-form-item>
+          </el-form>
+        </el-dialog>
 
-          <!-- 修改权限 -->
-          <el-dialog title="修改权限" :visible.sync="updateDialog.show">
-            <el-form
-              :model="updateDialog.privilege"
-              ref="updateForm"
-              label-width="100px"
-              :rules="rules"
-            >
-              <el-form-item label="权限名称" prop="name">
-                <el-col>
-                  <el-input v-model="updateDialog.privilege.name"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="权限编码" prop="code">
-                <el-col>
-                  <el-input
-                    v-model="updateDialog.privilege.code"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="描述" prop="description">
-                <el-col>
-                  <el-input
-                    v-model="updateDialog.privilege.description"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="权重" prop="weight">
-                <el-col>
-                  <el-input v-model="updateDialog.privilege.weight"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性1">
-                <el-col>
-                  <el-input v-model="updateDialog.privilege.ext1"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性2">
-                <el-col>
-                  <el-input v-model="updateDialog.privilege.ext2"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性3">
-                <el-col>
-                  <el-input v-model="updateDialog.privilege.ext3"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性4">
-                <el-col>
-                  <el-input v-model="updateDialog.privilege.ext4"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性5">
-                <el-col>
-                  <el-input v-model="updateDialog.privilege.ext5"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="updatePrivilege"
-                  >确定</el-button
-                >
-                <el-button @click="updateDialog.show = false;">取消</el-button>
-              </el-form-item>
-            </el-form>
-          </el-dialog>
+        <!-- 修改权限 -->
+        <el-dialog title="修改权限" :visible.sync="updateDialog.show">
+          <el-form
+            :model="updateDialog.privilege"
+            ref="updateForm"
+            label-width="100px"
+            :rules="rules"
+          >
+            <el-form-item label="权限名称" prop="name">
+              <el-col>
+                <el-input v-model="updateDialog.privilege.name"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="权限编码" prop="code">
+              <el-col>
+                <el-input
+                  v-model="updateDialog.privilege.code"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="描述" prop="description">
+              <el-col>
+                <el-input
+                  v-model="updateDialog.privilege.description"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="权重" prop="weight">
+              <el-col>
+                <el-input v-model="updateDialog.privilege.weight"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性1">
+              <el-col>
+                <el-input v-model="updateDialog.privilege.ext1"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性2">
+              <el-col>
+                <el-input v-model="updateDialog.privilege.ext2"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性3">
+              <el-col>
+                <el-input v-model="updateDialog.privilege.ext3"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性4">
+              <el-col>
+                <el-input v-model="updateDialog.privilege.ext4"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性5">
+              <el-col>
+                <el-input v-model="updateDialog.privilege.ext5"></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="updatePrivilege"
+                >确定</el-button
+              >
+              <el-button @click="updateDialog.show = false;">取消</el-button>
+            </el-form-item>
+          </el-form>
+        </el-dialog>
 
-          <!-- 查看权限 -->
-          <el-dialog title="查看权限" :visible.sync="showDialog.show">
-            <el-form :model="showDialog.privilege" label-width="100px">
-              <el-form-item label="权限名称">
-                <el-col>
-                  <el-input
-                    v-model="showDialog.privilege.name"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="权限编码">
-                <el-col>
-                  <el-input
-                    v-model="showDialog.privilege.code"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="描述">
-                <el-col>
-                  <el-input
-                    v-model="showDialog.privilege.description"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="权重">
-                <el-col>
-                  <el-input
-                    v-model="showDialog.privilege.weight"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性1">
-                <el-col>
-                  <el-input
-                    v-model="showDialog.privilege.ext1"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性2">
-                <el-col>
-                  <el-input
-                    v-model="showDialog.privilege.ext2"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性3">
-                <el-col>
-                  <el-input
-                    v-model="showDialog.privilege.ext3"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性4">
-                <el-col>
-                  <el-input
-                    v-model="showDialog.privilege.ext4"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="属性5">
-                <el-col>
-                  <el-input
-                    v-model="showDialog.privilege.ext5"
-                    :readonly="true"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item>
-                <el-button @click="showDialog.show = false;">关闭</el-button>
-              </el-form-item>
-            </el-form>
-          </el-dialog>
-        </div>
+        <!-- 查看权限 -->
+        <el-dialog title="查看权限" :visible.sync="showDialog.show">
+          <el-form :model="showDialog.privilege" label-width="100px">
+            <el-form-item label="权限名称">
+              <el-col>
+                <el-input
+                  v-model="showDialog.privilege.name"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="权限编码">
+              <el-col>
+                <el-input
+                  v-model="showDialog.privilege.code"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="描述">
+              <el-col>
+                <el-input
+                  v-model="showDialog.privilege.description"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="权重">
+              <el-col>
+                <el-input
+                  v-model="showDialog.privilege.weight"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性1">
+              <el-col>
+                <el-input
+                  v-model="showDialog.privilege.ext1"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性2">
+              <el-col>
+                <el-input
+                  v-model="showDialog.privilege.ext2"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性3">
+              <el-col>
+                <el-input
+                  v-model="showDialog.privilege.ext3"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性4">
+              <el-col>
+                <el-input
+                  v-model="showDialog.privilege.ext4"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="属性5">
+              <el-col>
+                <el-input
+                  v-model="showDialog.privilege.ext5"
+                  :readonly="true"
+                ></el-input>
+              </el-col>
+            </el-form-item>
+            <el-form-item>
+              <el-button @click="showDialog.show = false;">关闭</el-button>
+            </el-form-item>
+          </el-form>
+        </el-dialog>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 
 <script type="text/jsx">
@@ -532,16 +530,14 @@ export default {
         renderContent(h, {node, data, store}) {
             if (-1 == data.id) {
                 return (
-                  <div>
+                  <span>
                     <span>
                         <span>{node.label}</span>
                     </span>
                     <span style="float: right; margin-left: 20px; margin-right: 65px">
                         <el-button type="primary" size="mini" on-click={() => this.openAddingDialog(store, data)}>追加</el-button>
                     </span>
-                    <br/>
-                    <br/>
-                  </div>
+                  </span>
                 )
             }
             return (

src/modules/basic/view/role_privilege_settings.vue

@@ -1,91 +1,89 @@
 <template>
-  <div>
-    <section class="content" style="margin-top: 20px;">
-      <div class="box box-info">
-        <div class="box-body">
-          <!-- 选择 -->
-          <el-form
-            :inline="true"
-            :model="form"
-            label-position="right"
-            label-width="100px"
-          >
-            <el-row>
-              <el-form-item label="顶级机构" class="pull-left">
-                <el-select
-                  class="input_width_lg"
-                  v-model="form.orgId"
-                  placeholder="请选择"
-                  @change="rootOrgChanged"
-                  :disabled="!isSuperAdmin"
-                >
-                  <el-option
-                    v-for="item in orgList"
-                    :label="item.name"
-                    :value="item.id"
-                    :key="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="角色" class="pull-left">
-                <el-select
-                  class="input_width_lg"
-                  v-model="form.roleId"
-                  placeholder="请选择"
-                  @change="change"
-                >
-                  <el-option
-                    v-for="item in roleList"
-                    :label="item.roleName"
-                    :value="item.roleId"
-                    :key="item.roleId"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="权限组" class="pull-left">
-                <el-select
-                  class="input_width_lg"
-                  v-model="form.privilegeGroupId"
-                  placeholder="请选择"
-                  @change="change"
-                >
-                  <el-option
-                    v-for="item in privilegeGroupList"
-                    :label="item.name"
-                    :value="item.id"
-                    :key="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-row>
-          </el-form>
+  <section class="content">
+    <div class="box box-info">
+      <div class="box-body">
+        <!-- 选择 -->
+        <el-form
+          :inline="true"
+          :model="form"
+          label-position="right"
+          label-width="100px"
+        >
+          <el-row>
+            <el-form-item label="顶级机构" class="pull-left">
+              <el-select
+                class="input_width_lg"
+                v-model="form.orgId"
+                placeholder="请选择"
+                @change="rootOrgChanged"
+                :disabled="!isSuperAdmin"
+              >
+                <el-option
+                  v-for="item in orgList"
+                  :label="item.name"
+                  :value="item.id"
+                  :key="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="角色" class="pull-left">
+              <el-select
+                class="input_width_lg"
+                v-model="form.roleId"
+                placeholder="请选择"
+                @change="change"
+              >
+                <el-option
+                  v-for="item in roleList"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :key="item.roleId"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="权限组" class="pull-left">
+              <el-select
+                class="input_width_lg"
+                v-model="form.privilegeGroupId"
+                placeholder="请选择"
+                @change="change"
+              >
+                <el-option
+                  v-for="item in privilegeGroupList"
+                  :label="item.name"
+                  :value="item.id"
+                  :key="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-row>
+        </el-form>
 
-          <div style="margin-bottom:10px;margin-left: 50px;">
-            <el-button type="primary" :disabled="!treeChanged" @click="save">
-              保 存
-            </el-button>
-          </div>
+        <div style="margin-bottom:10px;margin-left: 50px;">
+          <el-button type="primary" :disabled="!treeChanged" @click="save">
+            保 存
+          </el-button>
+        </div>
 
-          <!-- 权限树 -->
-          <div style="width: 50%;margin-left: 50px;">
-            <el-tree
-              :data="treeData"
-              :props="defaultProps"
-              show-checkbox
-              node-key="id"
-              ref="tree"
-              highlight-current
-              :check-strictly="true"
-              :default-expanded-keys="[-1]"
-              :default-checked-keys="checkedKeys"
-              @check-change="treeChange"
-              :expand-on-click-node="true"
-            />
-          </div>
+        <!-- 权限树 -->
+        <div style="width: 50%;margin-left: 50px;">
+          <el-tree
+            :data="treeData"
+            :props="defaultProps"
+            show-checkbox
+            node-key="id"
+            ref="tree"
+            highlight-current
+            :check-strictly="true"
+            :default-expanded-keys="[-1]"
+            :default-checked-keys="checkedKeys"
+            @check-change="treeChange"
+            :expand-on-click-node="true"
+          />
         </div>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 
 <script>

src/modules/basic/view/school.vue

@@ -1,310 +1,300 @@
 <template>
-  <div>
-    <section class="content" style="margin-top: 20px;">
-      <div class="box box-info">
-        <div class="box-body">
-          <!-- 表单 -->
+  <section class="content">
+    <div class="box box-info">
+      <div class="box-body">
+        <!-- 表单 -->
+        <el-form
+          :inline="true"
+          :model="formSearch"
+          label-position="right"
+          label-width="100px"
+        >
+          <el-row :gutter="5">
+            <el-form-item label="学校名称" class="pull-left">
+              <el-input
+                placeholder="请输入学校名称"
+                v-model="formSearch.name"
+              />
+            </el-form-item>
+            <el-form-item label="学校代码" class="pull-left">
+              <el-input
+                placeholder="请输入学校代码"
+                v-model="formSearch.code"
+              />
+            </el-form-item>
+            <el-form-item label="学校域名" class="pull-left">
+              <el-input
+                placeholder="请输入学校域名"
+                v-model="formSearch.domainName"
+              />
+            </el-form-item>
+            <el-form-item class="pull-right">
+              <el-button
+                size="small"
+                type="primary"
+                icon="search"
+                @click="searchForm"
+              >
+                查询
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                icon="plus"
+                @click="insert"
+              >
+                新增
+              </el-button>
+              <el-button size="small" type="success" @click="enableOrg">
+                <i class="fa fa-check" aria-hidden="true"></i>启用
+              </el-button>
+              <el-button size="small" type="danger" @click="disableOrg">
+                <i class="fa fa-close" aria-hidden="true"></i>禁用
+              </el-button>
+            </el-form-item>
+          </el-row>
+        </el-form>
+
+        <!-- 添加或修改学校弹出框 -->
+        <el-dialog title="学校信息" :visible.sync="schoolDialog">
           <el-form
             :inline="true"
-            :model="formSearch"
+            :model="schoolForm"
+            ref="schoolForm"
+            :rules="rules"
             label-position="right"
-            label-width="100px"
+            label-width="90px"
           >
-            <el-row :gutter="5">
-              <el-form-item label="学校名称" class="pull-left">
+            <el-row>
+              <el-form-item label="学校代码" label-width="120px" prop="code">
+                <el-input
+                  class="pull_length"
+                  v-model="schoolForm.code"
+                  auto-complete="off"
+                  placeholder="学校域名"
+                  :readonly="null != schoolForm.id"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="学校名称" label-width="120px" prop="name">
                 <el-input
-                  placeholder="请输入学校名称"
-                  v-model="formSearch.name"
+                  class="pull_length"
+                  v-model="schoolForm.name"
+                  auto-complete="off"
+                  placeholder="学校名称"
                 />
               </el-form-item>
-              <el-form-item label="学校代码" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item
+                label="学校域名"
+                label-width="120px"
+                prop="domainName"
+              >
                 <el-input
-                  placeholder="请输入学校代码"
-                  v-model="formSearch.code"
+                  class="pull_length"
+                  v-model="schoolForm.domainName"
+                  auto-complete="off"
+                  placeholder="学校域名"
                 />
               </el-form-item>
-              <el-form-item label="学校域名" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item label="负责人" label-width="120px" prop="contacts">
                 <el-input
-                  placeholder="请输入学校域名"
-                  v-model="formSearch.domainName"
+                  class="pull_length"
+                  v-model="schoolForm.contacts"
+                  auto-complete="off"
+                  placeholder="负责人"
                 />
               </el-form-item>
-              <el-form-item class="pull-right">
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="search"
-                  @click="searchForm"
-                >
-                  查询
-                </el-button>
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="plus"
-                  @click="insert"
+            </el-row>
+            <el-row>
+              <el-form-item
+                label="联系方式"
+                label-width="120px"
+                prop="telephone"
+              >
+                <el-input
+                  class="pull_length"
+                  v-model="schoolForm.telephone"
+                  auto-complete="off"
+                  placeholder="联系方式"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="考生端产品名" label-width="120px">
+                <el-input
+                  class="pull_length"
+                  v-model="schoolForm.properties.OE_STUDENT_SYS_NAME"
+                  auto-complete="off"
+                  placeholder="考生端产品名"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="状态" label-width="120px" prop="enable">
+                <el-radio-group
+                  class="pull_right_sm"
+                  v-model="schoolForm.enable"
                 >
-                  新增
-                </el-button>
-                <el-button size="small" type="success" @click="enableOrg">
-                  <i class="fa fa-check" aria-hidden="true"></i>启用
-                </el-button>
-                <el-button size="small" type="danger" @click="disableOrg">
-                  <i class="fa fa-close" aria-hidden="true"></i>禁用
-                </el-button>
+                  <el-radio label="true">启用</el-radio>
+                  <el-radio label="false">禁用</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-row>
+            <el-row class="pull_center">
+              <el-button type="primary" @click="submitForm">保 存</el-button>
+              <el-button @click="schoolDialog = false;">取 消</el-button>
+            </el-row>
           </el-form>
+        </el-dialog>
 
-          <!-- 添加或修改学校弹出框 -->
-          <el-dialog title="学校信息" :visible.sync="schoolDialog">
-            <el-form
-              :inline="true"
-              :model="schoolForm"
-              ref="schoolForm"
-              :rules="rules"
-              label-position="right"
-              label-width="90px"
-            >
-              <el-row>
-                <el-form-item label="学校代码" label-width="120px" prop="code">
-                  <el-input
-                    class="pull_length"
-                    v-model="schoolForm.code"
-                    auto-complete="off"
-                    placeholder="学校域名"
-                    :readonly="null != schoolForm.id"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="学校名称" label-width="120px" prop="name">
-                  <el-input
-                    class="pull_length"
-                    v-model="schoolForm.name"
-                    auto-complete="off"
-                    placeholder="学校名称"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="学校域名"
-                  label-width="120px"
-                  prop="domainName"
-                >
-                  <el-input
-                    class="pull_length"
-                    v-model="schoolForm.domainName"
-                    auto-complete="off"
-                    placeholder="学校域名"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="负责人"
-                  label-width="120px"
-                  prop="contacts"
-                >
-                  <el-input
-                    class="pull_length"
-                    v-model="schoolForm.contacts"
-                    auto-complete="off"
-                    placeholder="负责人"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="联系方式"
-                  label-width="120px"
-                  prop="telephone"
-                >
-                  <el-input
-                    class="pull_length"
-                    v-model="schoolForm.telephone"
-                    auto-complete="off"
-                    placeholder="联系方式"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="考生端产品名" label-width="120px">
-                  <el-input
-                    class="pull_length"
-                    v-model="schoolForm.properties.OE_STUDENT_SYS_NAME"
-                    auto-complete="off"
-                    placeholder="考生端产品名"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="状态" label-width="120px" prop="enable">
-                  <el-radio-group
-                    class="pull_right_sm"
-                    v-model="schoolForm.enable"
-                  >
-                    <el-radio label="true">启用</el-radio>
-                    <el-radio label="false">禁用</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-row>
-              <el-row class="pull_center">
-                <el-button type="primary" @click="submitForm">保 存</el-button>
-                <el-button @click="schoolDialog = false;">取 消</el-button>
-              </el-row>
-            </el-form>
-          </el-dialog>
-
-          <!-- 学校产品分配弹出框 -->
-          <el-dialog title="产品分配" :visible.sync="functionDialog">
-            <div>
-              <el-button type="primary" @click="saveOrgFunction">
-                保 存
-              </el-button>
-              <el-button @click="functionDialog = false;">取 消</el-button>
-            </div>
-          </el-dialog>
+        <!-- 学校产品分配弹出框 -->
+        <el-dialog title="产品分配" :visible.sync="functionDialog">
+          <div>
+            <el-button type="primary" @click="saveOrgFunction">
+              保 存
+            </el-button>
+            <el-button @click="functionDialog = false;">取 消</el-button>
+          </div>
+        </el-dialog>
 
-          <!-- logo上传弹窗 -->
-          <el-dialog title="logo上传" :visible.sync="logoDialog">
-            <el-form>
-              <el-row>
-                <el-form-item label="学校名称" label-width="120px">
-                  <el-input
-                    class="pull_length"
-                    v-model="curSchool.name"
-                    :readonly="true"
-                  />
-                </el-form-item>
-                <el-form-item label="学校代码" label-width="120px">
-                  <el-input
-                    class="pull_length"
-                    v-model="curSchool.code"
-                    :readonly="true"
-                  />
-                </el-form-item>
-                <el-form-item style="margin-left:20px">
-                  <el-upload
-                    class="form_left"
-                    ref="upload"
-                    accept="image/*"
-                    :action="uploadAction"
-                    :headers="uploadHeaders"
-                    :data="uploadData"
-                    :before-upload="beforeUpload"
-                    :on-progress="uploadProgress"
-                    :on-success="uploadSuccess"
-                    :on-error="uploadError"
-                    :file-list="fileList"
-                    :auto-upload="false"
-                    :multiple="false"
-                  >
-                    <el-button size="small" slot="trigger" type="primary">
-                      选择文件
-                    </el-button>
-                    <el-button
-                      size="small"
-                      type="success"
-                      @click="submitUpload"
-                    >
-                      确认上传
-                    </el-button>
-                    <el-button size="small" type="danger" @click="removeFile">
-                      清空文件
-                    </el-button>
-                    <div slot="tip" class="el-upload__tip">只能上传图片</div>
-                  </el-upload>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-dialog>
+        <!-- logo上传弹窗 -->
+        <el-dialog title="logo上传" :visible.sync="logoDialog">
+          <el-form>
+            <el-row>
+              <el-form-item label="学校名称" label-width="120px">
+                <el-input
+                  class="pull_length"
+                  v-model="curSchool.name"
+                  :readonly="true"
+                />
+              </el-form-item>
+              <el-form-item label="学校代码" label-width="120px">
+                <el-input
+                  class="pull_length"
+                  v-model="curSchool.code"
+                  :readonly="true"
+                />
+              </el-form-item>
+              <el-form-item style="margin-left:20px">
+                <el-upload
+                  class="form_left"
+                  ref="upload"
+                  accept="image/*"
+                  :action="uploadAction"
+                  :headers="uploadHeaders"
+                  :data="uploadData"
+                  :before-upload="beforeUpload"
+                  :on-progress="uploadProgress"
+                  :on-success="uploadSuccess"
+                  :on-error="uploadError"
+                  :file-list="fileList"
+                  :auto-upload="false"
+                  :multiple="false"
+                >
+                  <el-button size="small" slot="trigger" type="primary">
+                    选择文件
+                  </el-button>
+                  <el-button size="small" type="success" @click="submitUpload">
+                    确认上传
+                  </el-button>
+                  <el-button size="small" type="danger" @click="removeFile">
+                    清空文件
+                  </el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传图片</div>
+                </el-upload>
+              </el-form-item>
+            </el-row>
+          </el-form>
+        </el-dialog>
 
-          <!-- 页面列表 -->
-          <el-table
-            :data="tableData"
-            border
-            resizable
-            stripe
-            style="width: 100%;text-align:center;"
-            @selection-change="selectChange"
-          >
-            <el-table-column type="selection" width="50" />
-            <el-table-column prop="id" label="ID" width="100" />
-            <el-table-column label="学校名称" width="250">
-              <template slot-scope="scope">
-                <el-popover trigger="hover" placement="left">
-                  <div style="font-size: 18px;font-family: 新宋体">
-                    <tr>
-                      <td style="color: green">学校名称</td>
-                      <td style="color:purple;padding-left: 20px;">
-                        {{ scope.row.name }}
-                      </td>
-                    </tr>
-                    <tr>
-                      <td style="color: green">学校代码</td>
-                      <td style="color:purple;padding-left: 20px;">
-                        {{ scope.row.code }}
-                      </td>
-                    </tr>
-                    <tr>
-                      <td style="color: green">负责人</td>
-                      <td style="color:purple;padding-left: 20px;">
-                        {{ scope.row.contacts }}
-                      </td>
-                    </tr>
-                    <tr>
-                      <td style="color: green">联系方式</td>
-                      <td style="color:purple;padding-left: 20px;">
-                        {{ scope.row.telephone }}
-                      </td>
-                    </tr>
-                  </div>
+        <!-- 页面列表 -->
+        <el-table
+          :data="tableData"
+          border
+          resizable
+          stripe
+          style="width: 100%;text-align:center;"
+          @selection-change="selectChange"
+        >
+          <el-table-column type="selection" width="50" />
+          <el-table-column prop="id" label="ID" width="100" />
+          <el-table-column label="学校名称" width="250">
+            <template slot-scope="scope">
+              <el-popover trigger="hover" placement="left">
+                <div style="font-size: 18px;font-family: 新宋体">
+                  <tr>
+                    <td style="color: green">学校名称</td>
+                    <td style="color:purple;padding-left: 20px;">
+                      {{ scope.row.name }}
+                    </td>
+                  </tr>
+                  <tr>
+                    <td style="color: green">学校代码</td>
+                    <td style="color:purple;padding-left: 20px;">
+                      {{ scope.row.code }}
+                    </td>
+                  </tr>
+                  <tr>
+                    <td style="color: green">负责人</td>
+                    <td style="color:purple;padding-left: 20px;">
+                      {{ scope.row.contacts }}
+                    </td>
+                  </tr>
+                  <tr>
+                    <td style="color: green">联系方式</td>
+                    <td style="color:purple;padding-left: 20px;">
+                      {{ scope.row.telephone }}
+                    </td>
+                  </tr>
+                </div>
 
-                  <div slot="reference" class="name-wrapper">
-                    <span>{{ scope.row.name }}</span>
-                  </div>
-                </el-popover>
-              </template>
-            </el-table-column>
-            <el-table-column prop="domainName" label="学校域名" />
-            <el-table-column prop="updateTime" width="170" label="更新时间" />
-            <el-table-column width="100" label="状态">
-              <span slot-scope="scope">
-                <el-tag :type="getTag(scope.row.enable)">
-                  {{ getStatus(scope.row.enable) }}
-                </el-tag>
+                <div slot="reference" class="name-wrapper">
+                  <span>{{ scope.row.name }}</span>
+                </div>
+              </el-popover>
+            </template>
+          </el-table-column>
+          <el-table-column prop="domainName" label="学校域名" />
+          <el-table-column prop="updateTime" width="170" label="更新时间" />
+          <el-table-column width="100" label="状态">
+            <span slot-scope="scope">
+              <el-tag :type="getTag(scope.row.enable)">
+                {{ getStatus(scope.row.enable) }}
+              </el-tag>
+            </span>
+          </el-table-column>
+          <el-table-column :context="_self" width="300" prop="" label="操作">
+            <div>
+              <span>
+                <el-button size="mini" type="primary" @click="edit(row);">
+                  <i class="el-icon-edit"></i> 修改
+                </el-button>
               </span>
-            </el-table-column>
-            <el-table-column :context="_self" width="300" prop="" label="操作">
-              <div>
-                <span>
-                  <el-button size="mini" type="primary" @click="edit(row);">
-                    <i class="el-icon-edit"></i> 修改
-                  </el-button>
-                </span>
-                <span>
-                  <el-button size="mini" type="primary" @click="setLogo(row);">
-                    <i class="el-icon-edit"></i> logo上传
-                  </el-button>
-                </span>
-              </div>
-            </el-table-column>
-          </el-table>
-          <div class="page pull-right">
-            <el-pagination
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="pageSize"
-              layout="total, prev, pager, next, jumper"
-              :total="total"
-            />
-          </div>
+              <span>
+                <el-button size="mini" type="primary" @click="setLogo(row);">
+                  <i class="el-icon-edit"></i> logo上传
+                </el-button>
+              </span>
+            </div>
+          </el-table-column>
+        </el-table>
+        <div class="page pull-right">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total"
+          />
         </div>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 
 <script>

src/modules/basic/view/specially.vue

@@ -1,348 +1,339 @@
 <template>
-  <div>
-    <section class="content">
-      <div class="box box-info">
-        <div class="box-body">
+  <section class="content">
+    <div class="box box-info">
+      <div class="box-body">
+        <el-form
+          :inline="true"
+          :model="formSearch"
+          label-position="right"
+          label-width="100px"
+        >
+          <el-row>
+            <el-form-item label="专业名称" class="pull-left">
+              <el-input
+                class="input_width_lg"
+                placeholder="请输入专业名称"
+                v-model="formSearch.name"
+              />
+            </el-form-item>
+            <el-form-item label="专业代码" class="pull-left">
+              <el-input
+                class="input_width_lg"
+                placeholder="请输入专业代码"
+                v-model="formSearch.code"
+              />
+            </el-form-item>
+            <el-form-item label="课程" class="pull-left">
+              <el-select
+                class="input"
+                :remote-method="getCourses"
+                :loading="courseLoading"
+                remote
+                filterable
+                clearable
+                v-model="formSearch.courseId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in courseList4SearchWrapper"
+                  :label="item.name"
+                  :value="item.id"
+                  :key="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="" class="pull-right">
+              <el-button
+                size="small"
+                type="primary"
+                icon="search"
+                @click="searchForm"
+              >
+                查询
+              </el-button>
+              <el-button size="small" type="primary" @click="impSpecialty">
+                <i class="fa fa-upload" aria-hidden="true"></i>导入
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                icon="plus"
+                @click="insert"
+              >
+                新增
+              </el-button>
+              <el-button size="small" type="danger" @click="deleteIds">
+                <i class="el-icon-delete"></i> 删除
+              </el-button>
+              <el-button size="small" type="primary" @click="exportSpeciatly">
+                <i class="fa fa-upload" aria-hidden="true"></i> 导出
+              </el-button>
+            </el-form-item>
+          </el-row>
+        </el-form>
+
+        <!-- 新增或修改弹出框 -->
+        <el-dialog title="专业信息" :visible.sync="speciallyDialog">
           <el-form
             :inline="true"
-            :model="formSearch"
+            :model="speciallyForm"
+            ref="speciallyForm"
+            :rules="rules"
+            label-position="right"
+            label-width="90px"
+          >
+            <el-row>
+              <el-form-item label="专业代码" label-width="120px" prop="code">
+                <el-input
+                  :disabled="null != speciallyForm.id"
+                  class="pull_length"
+                  v-model="speciallyForm.code"
+                  auto-complete="off"
+                  placeholder="专业代码"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="专业名称" label-width="120px" prop="name">
+                <el-input
+                  class="pull_length"
+                  v-model="speciallyForm.name"
+                  auto-complete="off"
+                  placeholder="专业名称"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row class="pull_center">
+              <el-button type="primary" @click="submitForm('speciallyForm');">
+                保 存
+              </el-button>
+              <el-button type="danger" @click="close">取 消</el-button>
+            </el-row>
+          </el-form>
+        </el-dialog>
+
+        <!-- 关联课程弹出框 -->
+        <el-dialog :title="courseDialogTitle" :visible.sync="courseDialog">
+          <!-- 表单 -->
+          <el-form
+            :inline="true"
+            :model="courseSearchForm"
             label-position="right"
             label-width="100px"
           >
             <el-row>
-              <el-form-item label="专业名称" class="pull-left">
+              <el-form-item label="课程名称" class="pull-left">
                 <el-input
                   class="input_width_lg"
-                  placeholder="请输入专业名称"
-                  v-model="formSearch.name"
+                  placeholder="请输入课程名称"
+                  v-model="courseSearchForm.name"
                 />
               </el-form-item>
-              <el-form-item label="专业代码" class="pull-left">
+              <el-form-item label="课程代码" class="pull-left">
                 <el-input
                   class="input_width_lg"
-                  placeholder="请输入专业代码"
-                  v-model="formSearch.code"
+                  placeholder="请输入课程代码"
+                  v-model="courseSearchForm.code"
                 />
               </el-form-item>
-              <el-form-item label="课程" class="pull-left">
-                <el-select
-                  class="input"
-                  :remote-method="getCourses"
-                  :loading="courseLoading"
-                  remote
-                  filterable
-                  clearable
-                  v-model="formSearch.courseId"
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in courseList4SearchWrapper"
-                    :label="item.name"
-                    :value="item.id"
-                    :key="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="" class="pull-right">
+              <el-form-item class="pull-right">
                 <el-button
                   size="small"
                   type="primary"
                   icon="search"
-                  @click="searchForm"
+                  @click="searchCoursePage"
                 >
                   查询
                 </el-button>
-                <el-button size="small" type="primary" @click="impSpecialty">
-                  <i class="fa fa-upload" aria-hidden="true"></i>导入
-                </el-button>
                 <el-button
                   size="small"
                   type="primary"
-                  icon="plus"
-                  @click="insert"
+                  icon="search"
+                  @click="addRelation"
                 >
                   新增
                 </el-button>
-                <el-button size="small" type="danger" @click="deleteIds">
-                  <i class="el-icon-delete"></i> 删除
-                </el-button>
-                <el-button size="small" type="primary" @click="exportSpeciatly">
-                  <i class="fa fa-upload" aria-hidden="true"></i> 导出
-                </el-button>
               </el-form-item>
             </el-row>
           </el-form>
 
-          <!-- 新增或修改弹出框 -->
-          <el-dialog title="专业信息" :visible.sync="speciallyDialog">
-            <el-form
-              :inline="true"
-              :model="speciallyForm"
-              ref="speciallyForm"
-              :rules="rules"
-              label-position="right"
-              label-width="90px"
-            >
-              <el-row>
-                <el-form-item label="专业代码" label-width="120px" prop="code">
-                  <el-input
-                    :disabled="null != speciallyForm.id"
-                    class="pull_length"
-                    v-model="speciallyForm.code"
-                    auto-complete="off"
-                    placeholder="专业代码"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="专业名称" label-width="120px" prop="name">
-                  <el-input
-                    class="pull_length"
-                    v-model="speciallyForm.name"
-                    auto-complete="off"
-                    placeholder="专业名称"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row class="pull_center">
-                <el-button type="primary" @click="submitForm('speciallyForm');">
-                  保 存
-                </el-button>
-                <el-button type="danger" @click="close">取 消</el-button>
-              </el-row>
-            </el-form>
-          </el-dialog>
-
-          <!-- 关联课程弹出框 -->
-          <el-dialog :title="courseDialogTitle" :visible.sync="courseDialog">
-            <!-- 表单 -->
-            <el-form
-              :inline="true"
-              :model="courseSearchForm"
-              label-position="right"
-              label-width="100px"
-            >
-              <el-row>
-                <el-form-item label="课程名称" class="pull-left">
-                  <el-input
-                    class="input_width_lg"
-                    placeholder="请输入课程名称"
-                    v-model="courseSearchForm.name"
-                  />
-                </el-form-item>
-                <el-form-item label="课程代码" class="pull-left">
-                  <el-input
-                    class="input_width_lg"
-                    placeholder="请输入课程代码"
-                    v-model="courseSearchForm.code"
-                  />
-                </el-form-item>
-                <el-form-item class="pull-right">
-                  <el-button
-                    size="small"
-                    type="primary"
-                    icon="search"
-                    @click="searchCoursePage"
-                  >
-                    查询
-                  </el-button>
-                  <el-button
-                    size="small"
-                    type="primary"
-                    icon="search"
-                    @click="addRelation"
-                  >
-                    新增
-                  </el-button>
-                </el-form-item>
-              </el-row>
-            </el-form>
-
-            <!-- 课程列表 -->
-            <el-table
-              :data="courseTableData"
-              border
-              resizable
-              stripe
-              style="width: 100%;text-align:center;"
-            >
-              <el-table-column prop="id" label="ID" width="150" />
-              <el-table-column prop="name" label="课程名称" width="250" />
-              <el-table-column prop="code" label="课程代码" />
-              <el-table-column prop="updateTime" label="更新时间" width="170" />
-              <el-table-column label="操作">
-                <span slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="info"
-                    @click="deleteRelation(scope.row);"
-                  >
-                    <i class="el-icon-edit"></i> 取消关联
-                  </el-button>
-                </span>
-              </el-table-column>
-            </el-table>
-            <div class="page pull-right">
-              <el-pagination
-                @current-change="handleCourseCurrentChange"
-                :current-page="currentCoursePage"
-                :page-size="10"
-                layout="total, prev, pager, next, jumper"
-                :total="courseTotal"
-              />
-            </div>
-          </el-dialog>
-
-          <!-- 添加关联 -->
-          <el-dialog title="添加关联课程" :visible.sync="addRelationDialog">
-            <el-form
-              :inline="true"
-              :model="addRelationForm"
-              ref="addRelationForm"
-              label-position="right"
-              label-width="100px"
-              :rules="addRelationRules"
-            >
-              <el-row>
-                <el-form-item label="课程" class="pull-left" prop="courseId">
-                  <el-select
-                    class="input"
-                    :remote-method="getCourses4AddRelation"
-                    :loading="courseLoading4AddRelation"
-                    remote
-                    filterable
-                    clearable
-                    v-model="addRelationForm.courseId"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in courseList4AddRelationWrapper"
-                      :label="item.name"
-                      :value="item.id"
-                      :key="item.id"
-                    />
-                  </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-form>
-          </el-dialog>
-
-          <!-- 页面列表 -->
+          <!-- 课程列表 -->
           <el-table
-            :data="tableData"
+            :data="courseTableData"
             border
+            resizable
+            stripe
             style="width: 100%;text-align:center;"
-            @selection-change="handleSelectionChange"
           >
-            <el-table-column type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="200">
-            </el-table-column>
-            <el-table-column prop="code" label="专业代码"> </el-table-column>
-            <el-table-column prop="name" label="专业名称"> </el-table-column>
-            <el-table-column prop="updateTime" label="更新时间" width="170">
-            </el-table-column>
-            <el-table-column label="操作" width="250">
-              <template slot-scope="scope">
-                <div>
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    @click="relation(scope.row);"
-                  >
-                    关联课程
-                  </el-button>
-                  <el-button size="mini" type="info" @click="edit(scope.row);">
-                    修改
-                  </el-button>
-                  <el-button
-                    size="mini"
-                    type="danger"
-                    @click="deleteId(scope.row);"
-                  >
-                    删除
-                  </el-button>
-                </div>
-              </template>
+            <el-table-column prop="id" label="ID" width="150" />
+            <el-table-column prop="name" label="课程名称" width="250" />
+            <el-table-column prop="code" label="课程代码" />
+            <el-table-column prop="updateTime" label="更新时间" width="170" />
+            <el-table-column label="操作">
+              <span slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="info"
+                  @click="deleteRelation(scope.row);"
+                >
+                  <i class="el-icon-edit"></i> 取消关联
+                </el-button>
+              </span>
             </el-table-column>
           </el-table>
           <div class="page pull-right">
             <el-pagination
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="pageSize"
+              @current-change="handleCourseCurrentChange"
+              :current-page="currentCoursePage"
+              :page-size="10"
               layout="total, prev, pager, next, jumper"
-              :total="total"
+              :total="courseTotal"
             />
           </div>
+        </el-dialog>
 
-          <!-- 导入弹窗 -->
-          <el-dialog title="导入窗口" :visible.sync="impDialog">
-            <el-form>
-              <el-row>
-                <el-form-item style="margin-left:20px">
-                  <el-upload
-                    class="form_left"
-                    ref="upload"
-                    accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-                    :action="uploadAction"
-                    :headers="uploadHeaders"
-                    :data="uploadData"
-                    :before-upload="beforeUpload"
-                    :on-progress="uploadProgress"
-                    :on-success="uploadSuccess"
-                    :on-error="uploadError"
-                    :file-list="fileList"
-                    :auto-upload="false"
-                    :multiple="false"
-                  >
-                    <el-button size="small" slot="trigger" type="primary">
-                      选择文件
-                    </el-button>
-                    <el-button
-                      size="small"
-                      type="success"
-                      @click="submitUpload"
-                    >
-                      确认上传
-                    </el-button>
-                    <el-button size="small" type="danger" @click="removeFile">
-                      清空文件
-                    </el-button>
-                    <el-button size="small" type="info" @click="exportFile">
-                      下载模板
-                    </el-button>
-                    <div slot="tip" class="el-upload__tip">
-                      只能上传xlsx文件
-                    </div>
-                  </el-upload>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-dialog>
+        <!-- 添加关联 -->
+        <el-dialog title="添加关联课程" :visible.sync="addRelationDialog">
+          <el-form
+            :inline="true"
+            :model="addRelationForm"
+            ref="addRelationForm"
+            label-position="right"
+            label-width="100px"
+            :rules="addRelationRules"
+          >
+            <el-row>
+              <el-form-item label="课程" class="pull-left" prop="courseId">
+                <el-select
+                  class="input"
+                  :remote-method="getCourses4AddRelation"
+                  :loading="courseLoading4AddRelation"
+                  remote
+                  filterable
+                  clearable
+                  v-model="addRelationForm.courseId"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in courseList4AddRelationWrapper"
+                    :label="item.name"
+                    :value="item.id"
+                    :key="item.id"
+                  />
+                </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-form>
+        </el-dialog>
 
-          <!-- 导入错误信息列表 -->
-          <el-dialog title="错误提示" :visible.sync="errDialog">
-            <div
-              class="text-danger"
-              v-for="errMessage in errMessages"
-              :key="errMessage.lineNum"
-            >
-              第{{ errMessage.lineNum }}行：{{ errMessage.msg }}
-            </div>
-            <span slot="footer" class="dialog-footer">
-              <el-button @click="errDialog = false;">确定</el-button>
-            </span>
-          </el-dialog>
+        <!-- 页面列表 -->
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%;text-align:center;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="50"> </el-table-column>
+          <el-table-column prop="id" label="ID" width="200"> </el-table-column>
+          <el-table-column prop="code" label="专业代码"> </el-table-column>
+          <el-table-column prop="name" label="专业名称"> </el-table-column>
+          <el-table-column prop="updateTime" label="更新时间" width="170">
+          </el-table-column>
+          <el-table-column label="操作" width="250">
+            <template slot-scope="scope">
+              <div>
+                <el-button
+                  size="mini"
+                  type="primary"
+                  @click="relation(scope.row);"
+                >
+                  关联课程
+                </el-button>
+                <el-button size="mini" type="info" @click="edit(scope.row);">
+                  修改
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="deleteId(scope.row);"
+                >
+                  删除
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="page pull-right">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total"
+          />
         </div>
+
+        <!-- 导入弹窗 -->
+        <el-dialog title="导入窗口" :visible.sync="impDialog">
+          <el-form>
+            <el-row>
+              <el-form-item style="margin-left:20px">
+                <el-upload
+                  class="form_left"
+                  ref="upload"
+                  accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                  :action="uploadAction"
+                  :headers="uploadHeaders"
+                  :data="uploadData"
+                  :before-upload="beforeUpload"
+                  :on-progress="uploadProgress"
+                  :on-success="uploadSuccess"
+                  :on-error="uploadError"
+                  :file-list="fileList"
+                  :auto-upload="false"
+                  :multiple="false"
+                >
+                  <el-button size="small" slot="trigger" type="primary">
+                    选择文件
+                  </el-button>
+                  <el-button size="small" type="success" @click="submitUpload">
+                    确认上传
+                  </el-button>
+                  <el-button size="small" type="danger" @click="removeFile">
+                    清空文件
+                  </el-button>
+                  <el-button size="small" type="info" @click="exportFile">
+                    下载模板
+                  </el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传xlsx文件</div>
+                </el-upload>
+              </el-form-item>
+            </el-row>
+          </el-form>
+        </el-dialog>
+
+        <!-- 导入错误信息列表 -->
+        <el-dialog title="错误提示" :visible.sync="errDialog">
+          <div
+            class="text-danger"
+            v-for="errMessage in errMessages"
+            :key="errMessage.lineNum"
+          >
+            第{{ errMessage.lineNum }}行：{{ errMessage.msg }}
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="errDialog = false;">确定</el-button>
+          </span>
+        </el-dialog>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 
 <script>

src/modules/basic/view/user.vue

@@ -1,447 +1,429 @@
 <template>
-  <div>
-    <section class="content">
-      <div class="box box-info">
-        <div class="box-body">
-          <!-- 搜索 -->
+  <section class="content">
+    <div class="box box-info">
+      <div class="box-body">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          :model="searchForm"
+          label-position="right"
+          label-width="80px"
+        >
+          <el-row>
+            <el-form-item label="顶级机构" class="pull-left">
+              <el-select
+                style="width: 180px"
+                class="input_width_lg"
+                v-model="searchForm.rootOrgId"
+                placeholder="请选择"
+                :disabled="!isSuperAdmin"
+                @change="rootOrgChanged4Search"
+              >
+                <el-option
+                  v-for="item in rootOrgList"
+                  :label="item.name"
+                  :value="item.id"
+                  :key="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="角色" class="pull-left">
+              <el-select
+                style="width: 180px"
+                class="input_width_lg"
+                clearable
+                v-model="searchForm.roleId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in roleList4Search"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :key="item.roleId"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="登录名" class="pull-left">
+              <el-input
+                style="width: 180px"
+                class="input_width_lg"
+                placeholder="请输入登录名"
+                v-model="searchForm.loginName"
+              />
+            </el-form-item>
+            <el-form-item label="姓名" class="pull-left">
+              <el-input
+                style="width: 180px"
+                class="input_width_lg"
+                placeholder="请输入姓名"
+                v-model="searchForm.name"
+              />
+            </el-form-item>
+            <el-form-item class="pull-right">
+              <el-button
+                size="small"
+                type="primary"
+                icon="search"
+                @click="search"
+              >
+                查询
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                icon="plus"
+                @click="openAddingDialog"
+              >
+                新增
+              </el-button>
+            </el-form-item>
+          </el-row>
+        </el-form>
+
+        <!-- 添加用户信息弹出框 -->
+        <el-dialog title="用户信息" :visible.sync="addingDialog">
           <el-form
             :inline="true"
-            :model="searchForm"
+            :model="userForm"
+            ref="addingForm"
+            :rules="rules"
             label-position="right"
-            label-width="80px"
           >
             <el-row>
-              <el-form-item label="顶级机构" class="pull-left">
-                <el-select
-                  style="width: 180px"
+              <el-form-item label="姓名" label-width="120px" prop="name">
+                <el-input
+                  class="input_width_lg"
+                  v-model="userForm.name"
+                  auto-complete="off"
+                  placeholder="请输入姓名"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="登录名" label-width="120px" prop="loginName">
+                <el-input
+                  class="input_width_lg"
+                  v-model="userForm.loginName"
+                  auto-complete="off"
+                  placeholder="请输入登录名"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="密码" label-width="120px" prop="password">
+                <el-input
                   class="input_width_lg"
-                  v-model="searchForm.rootOrgId"
+                  v-model="userForm.password"
+                  auto-complete="off"
+                  placeholder="请输入密码"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="联系方式" label-width="120px" prop="mobile">
+                <el-input
+                  class="input_width_lg"
+                  v-model="userForm.mobile"
+                  auto-complete="off"
+                  placeholder="请输入联系方式"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item
+                label="顶级机构"
+                label-width="120px"
+                prop="rootOrgId"
+              >
+                <el-select
+                  class="select"
+                  v-model="userForm.rootOrgId"
                   placeholder="请选择"
                   :disabled="!isSuperAdmin"
-                  @change="rootOrgChanged4Search"
+                  @change="rootOrgChanged4InsertOrUpdate"
                 >
                   <el-option
                     v-for="item in rootOrgList"
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
-                  />
+                  >
+                  </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="角色" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item label="角色" label-width="120px" prop="roleIds">
                 <el-select
-                  style="width: 180px"
-                  class="input_width_lg"
-                  clearable
-                  v-model="searchForm.roleId"
+                  class="select"
+                  multiple
+                  v-model="userForm.roleIds"
                   placeholder="请选择"
+                  @change="rolesChanged"
                 >
                   <el-option
-                    v-for="item in roleList4Search"
+                    v-for="item in roleList4InsertOrUpdateWithoutSuperAdmin"
                     :label="item.roleName"
                     :value="item.roleId"
                     :key="item.roleId"
-                  />
+                  >
+                  </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="登录名" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item label="子机构" label-width="120px" prop="orgId">
+                <el-select
+                  class="select"
+                  :remote-method="getOrgList4InsertOrUpdate"
+                  :loading="orgLoading4InsertOrUpdate"
+                  remote
+                  filterable
+                  clearable
+                  v-model="userForm.orgId"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in orgList4InsertOrUpdate"
+                    :label="item.name"
+                    :value="item.id"
+                    :key="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="状态" label-width="120px">
+                <el-radio-group class="pull_right_sm" v-model="enableStr">
+                  <el-radio label="true">启用</el-radio>
+                  <el-radio label="false">禁用</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-row>
+            <el-row class="pull_center">
+              <el-button type="primary" @click="add">保 存</el-button>
+              <el-button @click="addingDialog = false;">取 消</el-button>
+            </el-row>
+          </el-form>
+        </el-dialog>
+
+        <!-- 修改用户信息弹出框 -->
+        <el-dialog title="用户信息" :visible.sync="updateDialog">
+          <el-form
+            :inline="true"
+            :model="userForm"
+            ref="updateForm"
+            :rules="rules"
+            label-position="right"
+          >
+            <el-row>
+              <el-form-item label="ID" label-width="120px">
                 <el-input
-                  style="width: 180px"
                   class="input_width_lg"
-                  placeholder="请输入登录名"
-                  v-model="searchForm.loginName"
+                  v-model="userForm.id"
+                  :disabled="true"
                 />
               </el-form-item>
-              <el-form-item label="姓名" class="pull-left">
+            </el-row>
+            <el-row>
+              <el-form-item label="姓名" label-width="120px" prop="name">
                 <el-input
-                  style="width: 180px"
                   class="input_width_lg"
+                  v-model="userForm.name"
+                  auto-complete="off"
                   placeholder="请输入姓名"
-                  v-model="searchForm.name"
                 />
               </el-form-item>
-              <el-form-item class="pull-right">
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="search"
-                  @click="search"
+            </el-row>
+            <el-row>
+              <el-form-item label="登录名" label-width="120px" prop="loginName">
+                <el-input
+                  class="input_width_lg"
+                  v-model="userForm.loginName"
+                  auto-complete="off"
+                  placeholder="请输入登录名"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="联系方式" label-width="120px" prop="mobile">
+                <el-input
+                  class="input_width_lg"
+                  v-model="userForm.mobile"
+                  auto-complete="off"
+                  placeholder="请输入联系方式"
+                />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item
+                label="顶级机构"
+                label-width="120px"
+                prop="rootOrgId"
+              >
+                <el-select
+                  class="select"
+                  v-model="userForm.rootOrgId"
+                  placeholder="请选择"
+                  :disabled="true"
                 >
-                  查询
-                </el-button>
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="plus"
-                  @click="openAddingDialog"
+                  <el-option
+                    v-for="item in rootOrgList"
+                    :label="item.name"
+                    :value="item.id"
+                    :key="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="角色" label-width="120px" prop="roleIds">
+                <el-select
+                  class="select"
+                  multiple
+                  v-model="userForm.roleIds"
+                  placeholder="请选择"
+                  :disabled="rowIsSuperAdmin"
+                  @change="rolesChanged"
                 >
-                  新增
-                </el-button>
+                  <el-option
+                    v-for="item in roleList4InsertOrUpdate"
+                    :label="item.roleName"
+                    :disabled="item.roleCode == 'SUPER_ADMIN'"
+                    :value="item.roleId"
+                    :key="item.roleId"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-row>
+            <el-row>
+              <el-form-item label="子机构" label-width="120px" prop="orgId">
+                <el-select
+                  class="select"
+                  :remote-method="getOrgList4InsertOrUpdate"
+                  :loading="orgLoading4InsertOrUpdate"
+                  remote
+                  filterable
+                  clearable
+                  v-model="userForm.orgId"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in orgList4InsertOrUpdate"
+                    :label="item.name"
+                    :value="item.id"
+                    :key="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="状态" label-width="120px">
+                <el-radio-group
+                  class="pull_right_sm"
+                  v-model="enableStr"
+                  :disabled="rowIsSuperAdmin"
+                >
+                  <el-radio label="true">启用</el-radio>
+                  <el-radio label="false">禁用</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-row>
+            <el-row class="pull_center">
+              <el-button type="primary" @click="update">保 存</el-button>
+              <el-button @click="updateDialog = false;">取 消</el-button>
+            </el-row>
           </el-form>
+        </el-dialog>
 
-          <!-- 添加用户信息弹出框 -->
-          <el-dialog title="用户信息" :visible.sync="addingDialog">
-            <el-form
-              :inline="true"
-              :model="userForm"
-              ref="addingForm"
-              :rules="rules"
-              label-position="right"
-            >
-              <el-row>
-                <el-form-item label="姓名" label-width="120px" prop="name">
-                  <el-input
-                    class="input_width_lg"
-                    v-model="userForm.name"
-                    auto-complete="off"
-                    placeholder="请输入姓名"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="登录名"
-                  label-width="120px"
-                  prop="loginName"
-                >
-                  <el-input
-                    class="input_width_lg"
-                    v-model="userForm.loginName"
-                    auto-complete="off"
-                    placeholder="请输入登录名"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="密码" label-width="120px" prop="password">
-                  <el-input
-                    class="input_width_lg"
-                    v-model="userForm.password"
-                    auto-complete="off"
-                    placeholder="请输入密码"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="联系方式"
-                  label-width="120px"
-                  prop="mobile"
+        <!-- 页面列表 -->
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%;text-align:center;"
+          @selection-change="selectChange"
+        >
+          <el-table-column type="selection" width="55" />
+          <el-table-column prop="id" width="100" label="ID" />
+          <el-table-column prop="name" width="150" label="姓名" />
+          <el-table-column prop="loginName" width="150" label="登录名" />
+          <el-table-column prop="rootOrgName" width="150" label="顶级机构" />
+          <el-table-column prop="roleNamesStr" width="250" label="角色" />
+          <el-table-column prop="updateTime" width="180" label="更新时间" />
+          <el-table-column width="80" label="状态">
+            <span slot-scope="scope">
+              <el-tag :type="getTag(scope.row.enable)">
+                {{ getEnable(scope.row.enable) }}
+              </el-tag>
+            </span>
+          </el-table-column>
+          <el-table-column label="操作">
+            <div slot-scope="scope">
+              <span>
+                <el-button
+                  size="mini"
+                  type="primary"
+                  @click="openUpdateDialog(scope.row);"
                 >
-                  <el-input
-                    class="input_width_lg"
-                    v-model="userForm.mobile"
-                    auto-complete="off"
-                    placeholder="请输入联系方式"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="顶级机构"
-                  label-width="120px"
-                  prop="rootOrgId"
+                  <i class="el-icon-edit"></i> 修改
+                </el-button>
+              </span>
+              <span>
+                <el-button
+                  v-if="false"
+                  size="mini"
+                  type="danger"
+                  @click="deleteById(scope.row);"
                 >
-                  <el-select
-                    class="select"
-                    v-model="userForm.rootOrgId"
-                    placeholder="请选择"
-                    :disabled="!isSuperAdmin"
-                    @change="rootOrgChanged4InsertOrUpdate"
-                  >
-                    <el-option
-                      v-for="item in rootOrgList"
-                      :label="item.name"
-                      :value="item.id"
-                      :key="item.id"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="角色" label-width="120px" prop="roleIds">
-                  <el-select
-                    class="select"
-                    multiple
-                    v-model="userForm.roleIds"
-                    placeholder="请选择"
-                    @change="rolesChanged"
-                  >
-                    <el-option
-                      v-for="item in roleList4InsertOrUpdateWithoutSuperAdmin"
-                      :label="item.roleName"
-                      :value="item.roleId"
-                      :key="item.roleId"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="子机构" label-width="120px" prop="orgId">
-                  <el-select
-                    class="select"
-                    :remote-method="getOrgList4InsertOrUpdate"
-                    :loading="orgLoading4InsertOrUpdate"
-                    remote
-                    filterable
-                    clearable
-                    v-model="userForm.orgId"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in orgList4InsertOrUpdate"
-                      :label="item.name"
-                      :value="item.id"
-                      :key="item.id"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="状态" label-width="120px">
-                  <el-radio-group class="pull_right_sm" v-model="enableStr">
-                    <el-radio label="true">启用</el-radio>
-                    <el-radio label="false">禁用</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-row>
-              <el-row class="pull_center">
-                <el-button type="primary" @click="add">保 存</el-button>
-                <el-button @click="addingDialog = false;">取 消</el-button>
-              </el-row>
-            </el-form>
-          </el-dialog>
-
-          <!-- 修改用户信息弹出框 -->
-          <el-dialog title="用户信息" :visible.sync="updateDialog">
-            <el-form
-              :inline="true"
-              :model="userForm"
-              ref="updateForm"
-              :rules="rules"
-              label-position="right"
-            >
-              <el-row>
-                <el-form-item label="ID" label-width="120px">
-                  <el-input
-                    class="input_width_lg"
-                    v-model="userForm.id"
-                    :disabled="true"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="姓名" label-width="120px" prop="name">
-                  <el-input
-                    class="input_width_lg"
-                    v-model="userForm.name"
-                    auto-complete="off"
-                    placeholder="请输入姓名"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="登录名"
-                  label-width="120px"
-                  prop="loginName"
+                  <i class="el-icon-delete"></i> 删除
+                </el-button>
+              </span>
+              <span>
+                <el-button
+                  size="mini"
+                  type="info"
+                  @click="resetPass(scope.row);"
                 >
-                  <el-input
-                    class="input_width_lg"
-                    v-model="userForm.loginName"
-                    auto-complete="off"
-                    placeholder="请输入登录名"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="联系方式"
-                  label-width="120px"
-                  prop="mobile"
+                  <i class="el-icon-reset"></i>重置密码
+                </el-button>
+              </span>
+              <span v-if="!scope.row.enable">
+                <el-button
+                  size="mini"
+                  type="success"
+                  @click="enableById(scope.row);"
                 >
-                  <el-input
-                    class="input_width_lg"
-                    v-model="userForm.mobile"
-                    auto-complete="off"
-                    placeholder="请输入联系方式"
-                  />
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item
-                  label="顶级机构"
-                  label-width="120px"
-                  prop="rootOrgId"
+                  <i class="fa fa-check" aria-hidden="true"></i>启用
+                </el-button>
+              </span>
+              <span v-if="scope.row.enable">
+                <el-button
+                  size="mini"
+                  type="warning"
+                  @click="disableById(scope.row);"
                 >
-                  <el-select
-                    class="select"
-                    v-model="userForm.rootOrgId"
-                    placeholder="请选择"
-                    :disabled="true"
-                  >
-                    <el-option
-                      v-for="item in rootOrgList"
-                      :label="item.name"
-                      :value="item.id"
-                      :key="item.id"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="角色" label-width="120px" prop="roleIds">
-                  <el-select
-                    class="select"
-                    multiple
-                    v-model="userForm.roleIds"
-                    placeholder="请选择"
-                    :disabled="rowIsSuperAdmin"
-                    @change="rolesChanged"
-                  >
-                    <el-option
-                      v-for="item in roleList4InsertOrUpdate"
-                      :label="item.roleName"
-                      :disabled="item.roleCode == 'SUPER_ADMIN'"
-                      :value="item.roleId"
-                      :key="item.roleId"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="子机构" label-width="120px" prop="orgId">
-                  <el-select
-                    class="select"
-                    :remote-method="getOrgList4InsertOrUpdate"
-                    :loading="orgLoading4InsertOrUpdate"
-                    remote
-                    filterable
-                    clearable
-                    v-model="userForm.orgId"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in orgList4InsertOrUpdate"
-                      :label="item.name"
-                      :value="item.id"
-                      :key="item.id"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="状态" label-width="120px">
-                  <el-radio-group
-                    class="pull_right_sm"
-                    v-model="enableStr"
-                    :disabled="rowIsSuperAdmin"
-                  >
-                    <el-radio label="true">启用</el-radio>
-                    <el-radio label="false">禁用</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-row>
-              <el-row class="pull_center">
-                <el-button type="primary" @click="update">保 存</el-button>
-                <el-button @click="updateDialog = false;">取 消</el-button>
-              </el-row>
-            </el-form>
-          </el-dialog>
-
-          <!-- 页面列表 -->
-          <el-table
-            :data="tableData"
-            border
-            style="width: 100%;text-align:center;"
-            @selection-change="selectChange"
-          >
-            <el-table-column type="selection" width="55" />
-            <el-table-column prop="id" width="100" label="ID" />
-            <el-table-column prop="name" width="150" label="姓名" />
-            <el-table-column prop="loginName" width="150" label="登录名" />
-            <el-table-column prop="rootOrgName" width="150" label="顶级机构" />
-            <el-table-column prop="roleNamesStr" width="250" label="角色" />
-            <el-table-column prop="updateTime" width="180" label="更新时间" />
-            <el-table-column width="80" label="状态">
-              <span slot-scope="scope">
-                <el-tag :type="getTag(scope.row.enable)">
-                  {{ getEnable(scope.row.enable) }}
-                </el-tag>
+                  <i class="fa fa-close" aria-hidden="true"></i>禁用
+                </el-button>
               </span>
-            </el-table-column>
-            <el-table-column label="操作">
-              <div slot-scope="scope">
-                <span>
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    @click="openUpdateDialog(scope.row);"
-                  >
-                    <i class="el-icon-edit"></i> 修改
-                  </el-button>
-                </span>
-                <span>
-                  <el-button
-                    v-if="false"
-                    size="mini"
-                    type="danger"
-                    @click="deleteById(scope.row);"
-                  >
-                    <i class="el-icon-delete"></i> 删除
-                  </el-button>
-                </span>
-                <span>
-                  <el-button
-                    size="mini"
-                    type="info"
-                    @click="resetPass(scope.row);"
-                  >
-                    <i class="el-icon-reset"></i>重置密码
-                  </el-button>
-                </span>
-                <span v-if="!scope.row.enable">
-                  <el-button
-                    size="mini"
-                    type="success"
-                    @click="enableById(scope.row);"
-                  >
-                    <i class="fa fa-check" aria-hidden="true"></i>启用
-                  </el-button>
-                </span>
-                <span v-if="scope.row.enable">
-                  <el-button
-                    size="mini"
-                    type="warning"
-                    @click="disableById(scope.row);"
-                  >
-                    <i class="fa fa-close" aria-hidden="true"></i>禁用
-                  </el-button>
-                </span>
-              </div>
-            </el-table-column>
-          </el-table>
-          <div class="page pull-right">
-            <el-pagination
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="10"
-              layout="total, prev, pager, next, jumper"
-              :total="total"
-            />
-          </div>
+            </div>
+          </el-table-column>
+        </el-table>
+        <div class="page pull-right">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="10"
+            layout="total, prev, pager, next, jumper"
+            :total="total"
+          />
         </div>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 
 <script>

src/modules/portal/views/home/Home.vue

@@ -255,6 +255,7 @@ body > .el-container {
 
 .main-content {
   min-height: calc(100vh - 60px - 60px - 60px);
+  margin-top: 20px;
 }
 
 .footer {

src/modules/portal/views/home/HomeSide.vue

@@ -17,23 +17,29 @@
         :index="menu1.nodeCode"
       >
         <template slot="title">
-          <router-link v-if="menu1.ext5" :to="{ path: menu1.ext5 }">
+          <router-link
+            v-if="menu1.ext5"
+            :to="{ path: menu1.ext5 }"
+            active-class="router-link-active"
+          >
             <i class="fa fa-circle-o"></i> {{ menu1.name }}
           </router-link>
           <span v-else>{{ menu1.name }}</span>
         </template>
 
-        <el-menu-item-group>
-          <el-menu-item
-            v-for="menu2 in menuList2(menu1)"
-            :index="menu2.nodeCode"
-            :key="menu2.id"
+        <el-menu-item
+          v-for="menu2 in menuList2(menu1)"
+          :index="menu2.nodeCode"
+          :key="menu2.id"
+        >
+          <router-link
+            :to="{ path: menu2.ext5 }"
+            style="color: white; text-decoration: none;"
+            active-class="router-link-active"
           >
-            <router-link :to="{ path: menu2.ext5 }">
-              <i class="fa fa-circle-o"></i> {{ menu2.name }}
-            </router-link>
-          </el-menu-item>
-        </el-menu-item-group>
+            <i class="fa fa-circle-o"></i> {{ menu2.name }}
+          </router-link>
+        </el-menu-item>
       </el-submenu>
     </el-menu>
   </el-aside>
@@ -157,4 +163,9 @@ export default {
   background-color: #545c64;
   color: #fff;
 }
+
+.router-link-active {
+  color: rgb(101, 183, 247) !important;
+  font-weight: bold;
+}
 </style>