Browse Source

基础信息:样式

Michael Wang 6 năm trước cách đây
mục cha
commit
0f4360b22f

+ 5 - 2
src/modules/basic/view/campus.vue

@@ -13,6 +13,7 @@
               v-model="formSearch.parentId"
               placeholder="请选择"
               :disabled="!isSuperAdmin"
+              style="width: 180px"
             >
               <el-option
                 v-for="item in rootOrgList"
@@ -26,12 +27,14 @@
             <el-input
               placeholder="请输入学习中心代码"
               v-model="formSearch.code"
+              style="width: 180px"
             />
           </el-form-item>
           <el-form-item label="中心名称">
             <el-input
               placeholder="请输入学习中心名称"
               v-model="formSearch.name"
+              style="width: 180px"
             />
           </el-form-item>
           <el-form-item>
@@ -242,7 +245,7 @@
           <el-table-column width="70" label="状态">
             <span slot-scope="scope"> {{ getStatus(scope.row.enable) }} </span>
           </el-table-column>
-          <el-table-column :context="_self" label="操作">
+          <el-table-column :context="_self" label="操作" width="200">
             <div slot-scope="scope">
               <el-button
                 size="mini"
@@ -268,7 +271,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 30, 50, 100]"
+            :page-sizes="[10, 20, 50, 100]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

+ 157 - 171
src/modules/basic/view/course.vue

@@ -5,115 +5,110 @@
         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 inline :model="formSearch" label-width="70px">
+          <el-form-item label="课程名称">
+            <el-input
+              class="input_width_lg"
+              placeholder="请输入课程名称"
+              v-model="formSearch.name"
+            />
+          </el-form-item>
+          <el-form-item label="课程代码">
+            <el-input
+              class="input_width_lg"
+              placeholder="请输入课程代码"
+              v-model="formSearch.code"
+            />
+          </el-form-item>
+          <el-form-item label="课程状态">
+            <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-form-item>
-            <el-form-item label="课程代码" class="pull-left">
-              <el-input
-                class="input_width_lg"
-                placeholder="请输入课程代码"
-                v-model="formSearch.code"
+            </el-select>
+          </el-form-item>
+          <el-form-item label="层次">
+            <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-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-select>
+          </el-form-item>
+          <el-form-item label="专业" 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="d-block">
+            <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-form>
 
+        <div class="block-seperator"></div>
+
         <!-- 添加或新增课程弹出框 -->
-        <el-dialog title="课程学习" :visible.sync="courseDialog">
+        <el-dialog title="课程" width="400px" :visible.sync="courseDialog">
           <el-form
             :inline="true"
             :model="courseForm"
             ref="courseForm"
             :rules="rules"
-            label-position="right"
             label-width="90px"
           >
             <el-row>
@@ -140,7 +135,6 @@
             <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="请选择"
@@ -230,53 +224,47 @@
         <el-dialog
           :title="specialtyDialogTitle"
           :visible.sync="specialtyDialog"
+          width="800px"
         >
           <!-- 表单 -->
-          <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 :inline="true" :model="specialtySearchForm">
+            <el-form-item label="专业名称">
+              <el-input
+                class="input_width_lg"
+                placeholder="请输入专业名称"
+                v-model="specialtySearchForm.name"
+              />
+            </el-form-item>
+            <el-form-item label="专业代码">
+              <el-input
+                class="input_width_lg"
+                placeholder="请输入专业代码"
+                v-model="specialtySearchForm.code"
+              />
+            </el-form-item>
+            <el-form-item>
+              <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-form>
 
           <!-- 专业列表 -->
           <el-table :data="specialtyTableData" border>
-            <el-table-column prop="id" label="ID" width="150" />
+            <el-table-column prop="id" label="ID" width="100" />
             <el-table-column prop="name" label="专业名称" width="250" />
             <el-table-column prop="code" label="专业代码" />
             <el-table-column prop="updateTime" label="更新时间" width="170" />
@@ -302,6 +290,7 @@
               :total="specialtyTotal"
             />
           </div>
+          <div style="margin-bottom: 20px"></div>
         </el-dialog>
 
         <!-- 添加关联 -->
@@ -310,7 +299,6 @@
             :inline="true"
             :model="addRelationForm"
             ref="addRelationForm"
-            label-position="right"
             label-width="100px"
             :rules="addRelationRules"
           >
@@ -367,42 +355,40 @@
             </span>
           </el-table-column>
           <el-table-column prop="updateTime" label="更新时间" width="170" />
-          <el-table-column label="操作">
+          <el-table-column label="操作" width="260">
             <div slot-scope="scope">
               <el-button
                 size="mini"
                 type="primary"
+                plain
                 @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>
+              <el-button
+                size="mini"
+                type="primary"
+                plain
+                @click="editCourse(scope.row)"
+              >
+                <i class="el-icon-edit"></i> 编辑
+              </el-button>
+              <el-button
+                size="mini"
+                v-if="!scope.row.enable"
+                type="danger"
+                @click="enableById(scope.row)"
+              >
+                <i class="fa fa-check" aria-hidden="true"></i>启用
+              </el-button>
+              <el-button
+                size="mini"
+                v-if="scope.row.enable"
+                type="danger"
+                @click="disableById(scope.row)"
+              >
+                <i class="fa fa-close" aria-hidden="true"></i>禁用
+              </el-button>
             </div>
           </el-table-column>
         </el-table>
@@ -411,7 +397,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="10"
-            :page-sizes="[10, 30, 50, 100]"
+            :page-sizes="[10, 20, 50, 100]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

+ 1 - 1
src/modules/basic/view/exam_site.vue

@@ -182,7 +182,7 @@
               @current-change="handleCurrentChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 30, 50, 100]"
+              :page-sizes="[10, 20, 50, 100]"
               @size-change="handleSizeChange"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"

+ 2 - 4
src/modules/basic/view/school.vue

@@ -31,9 +31,7 @@
         </el-form-item>
       </el-form>
 
-      <div
-        style="width: 100%; border-bottom: 1px solid #eee; margin: 20px 0 ;"
-      ></div>
+      <div class="block-seperator"></div>
 
       <span>批量操作:</span>
       <el-button
@@ -277,7 +275,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 30, 50, 100]"
+          :page-sizes="[10, 20, 50, 100]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

+ 1 - 1
src/modules/basic/view/specially.vue

@@ -267,7 +267,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 30, 50, 100]"
+            :page-sizes="[10, 20, 50, 100]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

+ 46 - 29
src/modules/basic/view/user.vue

@@ -3,13 +3,14 @@
     <div class="box box-info">
       <div class="box-body">
         <!-- 搜索 -->
-        <ecs-form-search :model="searchForm">
+        <el-form inline :model="searchForm" label-width="70px">
           <el-form-item label="顶级机构">
             <el-select
               v-model="searchForm.rootOrgId"
               placeholder="请选择"
               :disabled="!isSuperAdmin"
               @change="rootOrgChanged4Search"
+              class="input_width"
             >
               <el-option
                 v-for="item in rootOrgList"
@@ -24,6 +25,7 @@
               clearable
               v-model="searchForm.roleId"
               placeholder="请选择"
+              class="input_width"
             >
               <el-option
                 v-for="item in roleList4Search"
@@ -37,10 +39,15 @@
             <el-input
               placeholder="请输入登录名"
               v-model="searchForm.loginName"
+              class="input_width"
             />
           </el-form-item>
           <el-form-item label="姓名">
-            <el-input placeholder="请输入姓名" v-model="searchForm.name" />
+            <el-input
+              placeholder="请输入姓名"
+              v-model="searchForm.name"
+              class="input_width"
+            />
           </el-form-item>
           <div></div>
           <el-form-item>
@@ -64,10 +71,14 @@
               新增
             </el-button>
           </el-form-item>
-        </ecs-form-search>
+        </el-form>
+
+        <div
+          style="width: 100%; border-bottom: 1px solid #eee; margin: 20px 0 ;"
+        ></div>
 
         <!-- 添加用户信息弹出框 -->
-        <el-dialog title="用户信息" :visible.sync="addingDialog">
+        <el-dialog title="新增用户" width="400px" :visible.sync="addingDialog">
           <el-form
             :inline="true"
             :model="userForm"
@@ -187,7 +198,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-row>
-            <el-row class="pull_center">
+            <el-row class="d-flex justify-content-center">
               <el-button type="primary" @click="add">保 存</el-button>
               <el-button @click="addingDialog = false">取 消</el-button>
             </el-row>
@@ -195,7 +206,7 @@
         </el-dialog>
 
         <!-- 修改用户信息弹出框 -->
-        <el-dialog title="用户信息" :visible.sync="updateDialog">
+        <el-dialog title="编辑用户" width="400px" :visible.sync="updateDialog">
           <el-form
             :inline="true"
             :model="userForm"
@@ -319,7 +330,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-row>
-            <el-row class="pull_center">
+            <el-row class="d-flex justify-content-center">
               <el-button type="primary" @click="update">保 存</el-button>
               <el-button @click="updateDialog = false">取 消</el-button>
             </el-row>
@@ -331,13 +342,14 @@
           :data="tableData"
           border
           resizable
+          stripe
           style="width: 100%;"
           @selection-change="selectChange"
         >
           <el-table-column prop="id" width="80" label="ID" />
           <el-table-column prop="name" width="120" label="姓名" />
           <el-table-column prop="loginName" width="100" label="登录名" />
-          <el-table-column prop="rootOrgName" width="150" label="顶级机构" />
+          <el-table-column prop="rootOrgName" label="顶级机构" />
           <!-- <el-table-column prop="roleNamesStr" width="110" label="角色" /> -->
           <el-table-column width="120" label="角色">
             <span
@@ -350,7 +362,7 @@
           <el-table-column width="70" label="状态">
             <span slot-scope="scope"> {{ getEnable(scope.row.enable) }} </span>
           </el-table-column>
-          <el-table-column label="操作">
+          <el-table-column width="170" label="操作">
             <div slot-scope="scope">
               <el-button
                 v-if="!scope.row.enable"
@@ -413,7 +425,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="10"
-            :page-sizes="[10, 30, 50, 100]"
+            :page-sizes="[10, 20, 50, 100]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
@@ -828,27 +840,29 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(() => {
-        var url = CORE_API + "/user/resetPass/" + row.id;
-        this.$http
-          .put(url)
-          .then(() => {
-            this.$notify({
-              type: "success",
-              message: "重置成功!"
-            });
-            this.search();
-          })
-          .catch(response => {
-            if (response.status == 500) {
+      })
+        .then(() => {
+          var url = CORE_API + "/user/resetPass/" + row.id;
+          this.$http
+            .put(url)
+            .then(() => {
               this.$notify({
-                showClose: true,
-                message: response.data.desc,
-                type: "error"
+                type: "success",
+                message: "重置成功!"
               });
-            }
-          });
-      });
+              this.search();
+            })
+            .catch(response => {
+              if (response.status == 500) {
+                this.$notify({
+                  showClose: true,
+                  message: response.data.desc,
+                  type: "error"
+                });
+              }
+            });
+        })
+        .catch(e => console.log(e));
     },
     //删除单个数据
     deleteById(row) {
@@ -1078,4 +1092,7 @@ export default {
 .select {
   width: 195px;
 }
+.input_width {
+  width: 150px;
+}
 </style>

+ 2 - 1
src/modules/portal/views/home/HomeSide.vue

@@ -11,6 +11,7 @@
       text-color="#fff"
       active-text-color="#409eff"
       router
+      :default-active="$route.path"
     >
       <el-submenu
         v-for="menu1 in menuList1"
@@ -31,7 +32,7 @@
 
         <el-menu-item
           v-for="menu2 in menuList2(menu1)"
-          :index="menu2.nodeCode"
+          :index="menu2.ext5"
           :key="menu2.id"
           :route="{ path: menu2.ext5 }"
         >

+ 3 - 0
src/styles/elementuiCustomize.css

@@ -5,6 +5,9 @@
 .el-table label {
   margin-bottom: 0;
 }
+.el-form label.el-radio {
+  margin-bottom: 0;
+}
 
 .el-form .el-form-item {
   margin-bottom: 0px;

+ 6 - 0
src/styles/global.css

@@ -114,3 +114,9 @@ body {
 .pull-left {
   float: left !important;
 }
+
+.block-seperator {
+  width: 100%;
+  border-bottom: 1px solid #eee;
+  margin: 20px 0;
+}