瀏覽代碼

定制查找页面

Michael Wang 6 年之前
父節點
當前提交
9f827c8988

+ 47 - 0
src/components/EcsFormSearch.vue

@@ -0,0 +1,47 @@
+<template>
+  <section class="content">
+    <!-- 表单 -->
+    <el-form
+      ref="resetEcsFormSearch"
+      :inline="!advanceSearch"
+      :model="model"
+      :advance-search="advanceSearch"
+      :label-position="labelPosition"
+      :label-width="advanceSearch ? formLabelWidth : 'auto'"
+    >
+      <slot />
+    </el-form>
+
+    <div
+      style="width: 100%; border-bottom: 1px solid #eee; margin: 10px 0;"
+    ></div>
+  </section>
+</template>
+<script>
+export default {
+  name: "EcsFormSearch",
+  props: {
+    model: Object,
+    advanceSearch: {
+      type: Boolean,
+      default: false
+    },
+    labelPosition: {
+      type: String,
+      default: "left"
+    },
+    formLabelWidth: {
+      type: String,
+      default: "100px"
+    }
+  },
+  data() {
+    return {
+      // inline: true,
+      // formLabelWidth: ""
+    };
+  }
+};
+</script>
+
+<style scoped></style>

+ 1 - 1
src/components/LinkTitlesCustom.vue

@@ -2,7 +2,7 @@
   <el-breadcrumb
     v-if="currentPaths.length > 0"
     separator-class="el-icon-arrow-right"
-    style="border-bottom: 1px solid #aaa; padding-bottom: 5px; margin-top: -20px; margin-bottom: 20px"
+    style="border-bottom: 1px solid #eee; padding-bottom: 5px; margin-top: -20px; margin-bottom: 20px"
   >
     <el-breadcrumb-item :to="{ path: '/home/overview' }">
       首页

+ 3 - 0
src/main.js

@@ -10,6 +10,7 @@ import "./directives/directives.js";
 import "./filters/filters.js";
 import "./styles/bootstrap.scss";
 import "./styles/global.css";
+import EcsFormSearch from "./components/EcsFormSearch";
 
 Vue.config.productionTip = process.env.NODE_ENV !== "production";
 
@@ -20,6 +21,8 @@ if (
   require("./plugins/vueLifecylceLogs");
 }
 
+Vue.component("ecs-form-search", EcsFormSearch);
+
 new Vue({
   router,
   store,

+ 53 - 36
src/modules/basic/view/campus.vue

@@ -7,16 +7,10 @@
         element-loading-text="机构上传中,请稍后..."
       >
         <!-- 表单 -->
-        <el-form
-          :inline="true"
-          :model="formSearch"
-          label-position="right"
-          label-width="100"
-        >
-          <el-row :gutter="5">
-            <el-form-item label="顶级机构" class="pull-left">
+        <ecs-form-search :advance-search="true" :model="formSearch">
+          <el-row>
+            <el-form-item label="顶级机构">
               <el-select
-                class="input_width_lg"
                 v-model="formSearch.parentId"
                 placeholder="请选择"
                 :disabled="!isSuperAdmin"
@@ -29,19 +23,19 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="中心代码" class="pull-left">
+            <el-form-item label="中心代码">
               <el-input
                 placeholder="请输入学习中心代码"
                 v-model="formSearch.code"
               />
             </el-form-item>
-            <el-form-item label="中心名称" class="pull-left">
+            <el-form-item label="中心名称">
               <el-input
                 placeholder="请输入学习中心名称"
                 v-model="formSearch.name"
               />
             </el-form-item>
-            <el-form-item class="pull-right">
+            <el-form-item>
               <el-button
                 size="small"
                 type="primary"
@@ -50,6 +44,9 @@
               >
                 查询
               </el-button>
+              <el-button size="small" @click="resetEcsFormSearch">
+                重置
+              </el-button>
               <el-button
                 size="small"
                 type="primary"
@@ -58,26 +55,35 @@
               >
                 新增
               </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>
+        </ecs-form-search>
+
+        <span>批量操作:</span>
+        <el-button
+          size="small"
+          type="success"
+          :disabled="noBatchSelected"
+          @click="enableOrg"
+        >
+          <i class="fa fa-check" aria-hidden="true"></i>启用
+        </el-button>
+        <el-button
+          size="small"
+          type="danger"
+          :disabled="noBatchSelected"
+          @click="disableOrg"
+        >
+          <i class="fa fa-close" aria-hidden="true"></i>禁用
+        </el-button>
+        <el-button size="small" type="primary" icon="upload2" @click="imp">
+          导入
+        </el-button>
+
+        <div style="width: 100%;margin-bottom: 10px;"></div>
 
         <!-- 添加或修改学习中心弹出框 -->
-        <el-dialog title="中心信息" :visible.sync="campusDialog">
+        <el-dialog title="中心信息" width="400px" :visible.sync="campusDialog">
           <el-form
             :inline="true"
             :model="campusForm"
@@ -146,7 +152,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="submitForm">保 存</el-button>
               <el-button @click="campusDialog = false">取 消</el-button>
             </el-row>
@@ -154,7 +160,7 @@
         </el-dialog>
 
         <!-- 导入弹窗 -->
-        <el-dialog title="导入窗口" :visible.sync="impDialog">
+        <el-dialog title="导入窗口" width="460px" :visible.sync="impDialog">
           <el-form>
             <el-row>
               <el-form-item style="margin-left:20px">
@@ -236,21 +242,23 @@
             <span slot-scope="scope">{{ scope.row.updateTime }}</span>
           </el-table-column>
           <el-table-column width="70" label="状态">
-            <span slot-scope="scope">
-              <el-tag :type="getTag(scope.row.enable)">
-                {{ getStatus(scope.row.enable) }}
-              </el-tag>
-            </span>
+            <span slot-scope="scope"> {{ getStatus(scope.row.enable) }} </span>
           </el-table-column>
           <el-table-column :context="_self" label="操作">
             <div slot-scope="scope">
-              <el-button size="mini" type="primary" @click="edit(scope.row)">
+              <el-button
+                size="mini"
+                type="primary"
+                plain
+                @click="edit(scope.row)"
+              >
                 <i class="el-icon-edit"></i> 编辑
               </el-button>
               <el-button
                 size="mini"
                 type="primary"
                 @click="toExamSite(scope.row)"
+                plain
               >
                 考点设置
               </el-button>
@@ -338,9 +346,18 @@ export default {
         }
       }
       return orgIds;
+    },
+    noBatchSelected() {
+      return this.selectedOrgIds.length === 0;
     }
   },
   methods: {
+    resetEcsFormSearch() {
+      this.formSearch = Object.assign(this.formSearch, {
+        code: "",
+        name: ""
+      });
+    },
     toExamSite(row) {
       this.$router.push({ path: "/basic/examSite/" + row.id });
     },

+ 166 - 163
src/modules/basic/view/exam_site.vue

@@ -1,185 +1,185 @@
 <template>
-  <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>
+  <div>
+    <LinkTitlesCustom :currentPaths="['机构管理 ', '中心列表', '考点设置']" />
 
-        <!-- 添加考点信息弹出框 -->
-        <el-dialog title="考点信息" :visible.sync="examSiteDialog">
-          <el-form
-            :inline="true"
-            :model="examSiteForm"
-            ref="examSiteForm"
-            :rules="rules"
-            label-position="right"
-            label-width="90px"
-          >
+    <section class="content">
+      <div class="box box-info">
+        <div class="box-body">
+          <!-- 表单 -->
+          <ecs-form-search :model="formSearch">
             <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 label="学习中心">
+                <el-input v-model="orgName" disabled />
               </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="考点代码" label-width="120px" prop="code">
+              <el-form-item label="考点代码">
                 <el-input
-                  class="pull_length"
-                  v-model="examSiteForm.code"
-                  auto-complete="off"
-                  placeholder="考点代码"
-                  :readonly="null != examSiteForm.id"
+                  placeholder="请输入考点代码"
+                  v-model="formSearch.code"
                 />
               </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="考点名称" label-width="120px" prop="name">
+              <el-form-item label="考点名称">
                 <el-input
-                  class="pull_length"
-                  v-model="examSiteForm.name"
-                  auto-complete="off"
-                  placeholder="考点名称"
+                  placeholder="请输入考点名称"
+                  v-model="formSearch.name"
                 />
               </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-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-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>
+          </ecs-form-search>
 
-        <!-- 页面列表 -->
-        <el-table
-          :data="tableData"
-          border
-          resizable
-          stripe
-          @selection-change="selectChange"
-        >
-          <el-table-column type="selection" width="35" />
-          <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"
-          />
+          <!-- 添加考点信息弹出框 -->
+          <el-dialog title="考点信息" :visible.sync="examSiteDialog">
+            <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
+            @selection-change="selectChange"
+          >
+            <el-table-column type="selection" width="35" />
+            <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>
       </div>
-    </div>
-  </section>
+    </section>
+  </div>
 </template>
 
 <script>
 import { CORE_API } from "@/constants/constants.js";
 import { mapState } from "vuex";
+import LinkTitlesCustom from "@/components/LinkTitlesCustom.vue";
 
 export default {
   name: "ExamSite",
@@ -236,7 +236,7 @@ export default {
   },
   methods: {
     back() {
-      this.$router.push({ path: "/index/campus" });
+      this.$router.back();
     },
     handleCurrentChange(val) {
       this.currentPage = val;
@@ -435,6 +435,9 @@ export default {
     this.orgId = this.$route.params.orgId;
     this.formSearch.orgId = this.$route.params.orgId;
     this.init();
+  },
+  components: {
+    LinkTitlesCustom
   }
 };
 </script>

+ 290 - 277
src/modules/basic/view/school.vue

@@ -1,303 +1,311 @@
 <template>
   <section class="content">
-    <div class="box box-info">
-      <div class="box-body">
-        <!-- 表单 -->
+    <div class="box-body">
+      <!-- 表单 -->
+      <el-form
+        ref="ttt"
+        :model="formSearch"
+        :inline="true"
+        label-position="left"
+        label-width="100px"
+      >
+        <el-row>
+          <el-form-item label="学校名称">
+            <el-input placeholder="请输入学校名称" v-model="formSearch.name" />
+          </el-form-item>
+          <el-form-item label="学校代码">
+            <el-input placeholder="请输入学校代码" v-model="formSearch.code" />
+          </el-form-item>
+          <el-form-item label="学校域名">
+            <el-input
+              placeholder="请输入学校域名"
+              v-model="formSearch.domainName"
+            />
+          </el-form-item>
+          <el-form-item label="学校域名xxxsdfs">
+            <el-input
+              placeholder="请输入学校域名"
+              v-model="formSearch.domainName"
+            />
+          </el-form-item>
+          <el-form-item label="学校域名">
+            <el-input
+              placeholder="请输入学校域名"
+              v-model="formSearch.domainName"
+            />
+          </el-form-item>
+          <el-form-item label="学校域名">
+            <el-input
+              placeholder="请输入学校域名"
+              v-model="formSearch.domainName"
+            />
+          </el-form-item>
+          <el-form-item label="学校域名">
+            <el-input
+              placeholder="请输入学校域名"
+              v-model="formSearch.domainName"
+            />
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item>
+            <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" icon="plus" @click="resetSearchForm">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
+
+      <div
+        style="width: 100%; border-bottom: 1px solid #eee; margin: 20px 0 ;"
+      ></div>
+
+      <span>批量操作:</span>
+      <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>
+
+      <div style="width: 100%;margin-bottom: 10px;"></div>
+
+      <!-- 添加或修改学校弹出框 -->
+      <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
-                placeholder="请输入学校名称"
-                v-model="formSearch.name"
+                class="pull_length"
+                v-model="schoolForm.code"
+                auto-complete="off"
+                placeholder="学校域名"
+                :disabled="null != schoolForm.id"
               />
             </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="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.domainName"
+                class="pull_length"
+                v-model="schoolForm.domainName"
+                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="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-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="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="学校域名"
-                  :disabled="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-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" disabled />
+            </el-form-item>
+            <el-form-item label="学校代码" label-width="120px">
+              <el-input class="pull_length" v-model="curSchool.code" disabled />
+            </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-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-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>
+                <div slot="tip" class="el-upload__tip">只能上传图片</div>
+              </el-upload>
+            </el-form-item>
+          </el-row>
+        </el-form>
+      </el-dialog>
 
-        <!-- 学校产品分配弹出框 -->
-        <el-dialog title="产品分配" :visible.sync="functionDialog">
-          <div>
-            <el-button type="primary" @click="saveOrgFunction">
-              保 存
+      <!-- 页面列表 -->
+      <el-table
+        :data="tableData"
+        border
+        resizable
+        stripe
+        @selection-change="selectChange"
+      >
+        <el-table-column type="selection" width="35" />
+        <el-table-column prop="id" label="ID" width="60" />
+        <el-table-column label="学校名称">
+          <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" width="190" label="学校域名" />
+        <el-table-column prop="updateTime" width="170" label="更新时间" />
+        <el-table-column width="70" 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="200" prop="" label="操作">
+          <div slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              plain
+              @click="edit(scope.row)"
+            >
+              <i class="el-icon-edit"></i> 编辑
+            </el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              plain
+              @click="setLogo(scope.row)"
+            >
+              logo上传
             </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"
-                  disabled
-                />
-              </el-form-item>
-              <el-form-item label="学校代码" label-width="120px">
-                <el-input
-                  class="pull_length"
-                  v-model="curSchool.code"
-                  disabled
-                />
-              </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>
-                  &nbsp;
-                  <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
-          @selection-change="selectChange"
-        >
-          <el-table-column type="selection" width="35" />
-          <el-table-column prop="id" label="ID" width="60" />
-          <el-table-column label="学校名称">
-            <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" width="190" label="学校域名" />
-          <el-table-column prop="updateTime" width="170" label="更新时间" />
-          <el-table-column width="70" 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="200" prop="" label="操作">
-            <div slot-scope="scope">
-              <el-button
-                size="mini"
-                type="primary"
-                plain
-                @click="edit(scope.row)"
-              >
-                <i class="el-icon-edit"></i> 编辑
-              </el-button>
-              <el-button
-                size="mini"
-                type="primary"
-                plain
-                @click="setLogo(scope.row)"
-              >
-                logo上传
-              </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-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>
@@ -379,6 +387,11 @@ export default {
     }
   },
   methods: {
+    resetSearchForm() {
+      this.formSearch.code = "";
+      this.formSearch.name = "";
+      this.formSearch.domainName = "";
+    },
     getStatus(status) {
       if (status == true) {
         return "启用";

+ 1 - 1
src/modules/portal/views/home/LinkTitles.vue

@@ -2,7 +2,7 @@
   <el-breadcrumb
     v-if="currentPaths.length > 0"
     separator-class="el-icon-arrow-right"
-    style="border-bottom: 1px solid #aaa; padding-bottom: 5px;"
+    style="border-bottom: 1px solid #eee; padding-bottom: 5px;"
   >
     <el-breadcrumb-item :to="{ path: '/home/overview' }"
       >首页</el-breadcrumb-item

+ 8 - 0
src/styles/elementuiCustomize.css

@@ -1,3 +1,11 @@
 .el-table td {
   padding: 4px 0;
 }
+
+.el-table label {
+  margin-bottom: 0;
+}
+
+.el-form .el-form-item {
+  margin-bottom: 0px;
+}