basic: html format

src/modules/basic/view/app_list.vue

@@ -5,15 +5,6 @@
         <!-- 头信息 -->
         <div class="box-header with-border">
           <h3 class="box-title">鉴权管理 > 应用列表</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
 
         <!-- 正文信息 -->
@@ -21,12 +12,13 @@
           <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>
-            <el-table-column prop="code" label="应用编码"> </el-table-column>
-            <el-table-column prop="name" label="应用名称"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100" />
+            <el-table-column prop="code" label="应用编码" />
+            <el-table-column prop="name" label="应用名称" />
           </el-table>
         </div>
       </div>

src/modules/basic/view/campus.vue

@@ -8,15 +8,6 @@
           style="background-color:#D3DCE6;margin-bottom:20px;"
         >
           <h3 class="box-title">学习中心</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
         <!-- 正文信息 -->
         <div
@@ -44,21 +35,20 @@
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="中心代码" class="pull-left">
                 <el-input
                   placeholder="请输入学习中心代码"
                   v-model="formSearch.code"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item label="中心名称" class="pull-left">
                 <el-input
                   placeholder="请输入学习中心名称"
                   v-model="formSearch.name"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item class="pull-right">
                 <el-button
@@ -66,27 +56,30 @@
                   type="primary"
                   icon="search"
                   @click="searchForm"
-                  >查询</el-button
                 >
+                  查询
+                </el-button>
                 <el-button
                   size="small"
                   type="primary"
                   icon="plus"
                   @click="insert"
-                  >新增</el-button
                 >
+                  新增
+                </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="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 size="small" type="danger" @click="disableOrg">
+                  <i class="fa fa-close" aria-hidden="true"></i>禁用
                 </el-button>
               </el-form-item>
             </el-row>
@@ -110,7 +103,7 @@
                     v-model="campusForm.code"
                     auto-complete="off"
                     placeholder="中心代码"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -120,7 +113,7 @@
                     v-model="campusForm.name"
                     auto-complete="off"
                     placeholder="中心名称"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -134,7 +127,7 @@
                     v-model="campusForm.contacts"
                     auto-complete="off"
                     placeholder="中心负责人"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -148,7 +141,7 @@
                     v-model="campusForm.telephone"
                     auto-complete="off"
                     placeholder="联系方式"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -189,17 +182,21 @@
                     :auto-upload="false"
                     :multiple="false"
                   >
-                    <el-button size="small" slot="trigger" type="primary"
-                      >选择文件</el-button
+                    <el-button size="small" slot="trigger" type="primary">
+                      选择文件
+                    </el-button>
+                    <el-button
+                      size="small"
+                      type="success"
+                      @click="submitUpload"
                     >
-                    <el-button size="small" type="success" @click="submitUpload"
-                      >确认上传
+                      确认上传
                     </el-button>
-                    <el-button size="small" type="danger" @click="removeFile"
-                      >清空文件
+                    <el-button size="small" type="danger" @click="removeFile">
+                      清空文件
                     </el-button>
-                    <el-button size="small" type="info" @click="exportFile"
-                      >下载模板
+                    <el-button size="small" type="info" @click="exportFile">
+                      下载模板
                     </el-button>
                     <div slot="tip" class="el-upload__tip">
                       只能上传xlsx文件
@@ -228,82 +225,54 @@
           <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>
-            <el-table-column width="150" label="ID">
-              <template slot-scope="scope">
-                <div>
-                  <span>{{ scope.row.id }}</span>
-                </div>
-              </template>
+            <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="200" label="中心代码">
-              <template slot-scope="scope">
-                <div>
-                  <span>{{ scope.row.code }}</span>
-                </div>
-              </template>
+            <el-table-column width="100" label="中心代码">
+              <span slot-scope="scope">{{ scope.row.code }}</span>
             </el-table-column>
             <el-table-column width="200" label="中心名称">
-              <template slot-scope="scope">
-                <div>
-                  <span>{{ scope.row.name }}</span>
-                </div>
-              </template>
+              <span slot-scope="scope">{{ scope.row.name }}</span>
             </el-table-column>
             <el-table-column width="100" label="负责人">
-              <template slot-scope="scope">
-                <div>
-                  <span>{{ scope.row.contacts }}</span>
-                </div>
-              </template>
+              <span slot-scope="scope">{{ scope.row.contacts }}</span>
             </el-table-column>
             <el-table-column width="150" label="联系方式">
-              <template slot-scope="scope">
-                <div>
-                  <span>{{ scope.row.telephone }}</span>
-                </div>
-              </template>
+              <span slot-scope="scope">{{ scope.row.telephone }}</span>
             </el-table-column>
             <el-table-column width="170" label="更新时间">
-              <template slot-scope="scope">
-                <div>
-                  <span>{{ scope.row.updateTime }}</span>
-                </div>
-              </template>
+              <span slot-scope="scope">{{ scope.row.updateTime }}</span>
             </el-table-column>
             <el-table-column width="100" label="状态">
-              <template slot-scope="scope">
-                <div>
-                  <span>
-                    <el-tag :type="getTag(scope.row.enable)">
-                      {{ getStatus(scope.row.enable) }}
-                    </el-tag>
-                  </span>
-                </div>
-              </template>
+              <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="操作">
-              <template slot-scope="scope">
-                <div>
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    @click="edit(scope.row);"
-                  >
-                    <i class="el-icon-edit"></i> 修改
-                  </el-button>
-                  <el-button
-                    size="mini"
-                    type="info"
-                    @click="toExamSite(scope.row);"
-                  >
-                    考点设置
-                  </el-button>
-                </div>
-              </template>
+            <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>
+              </div>
             </el-table-column>
           </el-table>
           <div class="page pull-right">
@@ -313,8 +282,7 @@
               :page-size="pageSize"
               layout="total, prev, pager, next, jumper"
               :total="total"
-            >
-            </el-pagination>
+            />
           </div>
         </div>
       </div>

src/modules/basic/view/course.vue

@@ -2,27 +2,14 @@
   <div>
     <section class="content">
       <div class="box box-info">
-        <!-- 头信息 -->
         <div class="box-header with-border">
           <h3 class="box-title">课程列表</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
 
-        <!-- 正文信息 -->
         <div
-          class="box-body"
           v-loading.body="fileLoading"
           element-loading-text="课程上传中,请稍后..."
         >
-          <!-- 表单 -->
           <el-form
             :inline="true"
             :model="formSearch"
@@ -35,14 +22,14 @@
                   class="input_width_lg"
                   placeholder="请输入课程名称"
                   v-model="formSearch.name"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item label="课程代码" class="pull-left">
                 <el-input
                   class="input_width_lg"
                   placeholder="请输入课程代码"
                   v-model="formSearch.code"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item label="课程状态" class="pull-left">
                 <el-select
@@ -56,8 +43,7 @@
                     :label="item.label"
                     :value="item.value"
                     :key="item.value"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="层次" class="pull-left">
@@ -72,8 +58,7 @@
                     :label="item.label"
                     :value="item.value"
                     :key="item.value"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="专业" class="pull-left" prop="specialtyId">
@@ -92,8 +77,7 @@
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item class="pull-right">
@@ -145,7 +129,7 @@
                     v-model="courseForm.code"
                     auto-complete="off"
                     placeholder="请输入课程代码"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -155,7 +139,7 @@
                     v-model="courseForm.name"
                     auto-complete="off"
                     placeholder="请输入课程名称"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -171,8 +155,7 @@
                       :label="item.label"
                       :value="item.value"
                       :key="item.value"
-                    >
-                    </el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-row>
@@ -218,18 +201,22 @@
                     :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
+                    <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>
@@ -271,14 +258,14 @@
                     class="input_width_lg"
                     placeholder="请输入专业名称"
                     v-model="specialtySearchForm.name"
-                  ></el-input>
+                  />
                 </el-form-item>
                 <el-form-item label="专业代码" class="pull-left">
                   <el-input
                     class="input_width_lg"
                     placeholder="请输入专业代码"
                     v-model="specialtySearchForm.code"
-                  ></el-input>
+                  />
                 </el-form-item>
                 <el-form-item class="pull-right">
                   <el-button
@@ -286,14 +273,16 @@
                     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>
@@ -305,13 +294,10 @@
               border
               style="width: 100%;text-align:center;"
             >
-              <el-table-column prop="id" label="ID" width="150">
-              </el-table-column>
-              <el-table-column prop="name" label="专业名称" width="250">
-              </el-table-column>
-              <el-table-column prop="code" label="专业代码"> </el-table-column>
-              <el-table-column prop="updateTime" label="更新时间" width="170">
-              </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">
                   <span>
@@ -333,8 +319,7 @@
                 :page-size="10"
                 layout="total, prev, pager, next, jumper"
                 :total="specialtyTotal"
-              >
-              </el-pagination>
+              />
             </div>
           </el-dialog>
 
@@ -365,15 +350,14 @@
                       :label="item.name"
                       :value="item.id"
                       :key="item.id"
-                    >
-                    </el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-row>
               <el-row class="pull_center">
-                <el-button type="primary" @click="submitAddRelationForm"
-                  >保 存</el-button
-                >
+                <el-button type="primary" @click="submitAddRelationForm">
+                  保 存
+                </el-button>
                 <el-button @click="addRelationDialog = false;">取 消</el-button>
               </el-row>
             </el-form>
@@ -383,70 +367,55 @@
           <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>
-            <el-table-column prop="id" label="课程ID" width="150">
-            </el-table-column>
-            <el-table-column prop="name" label="课程名称" width="250">
-            </el-table-column>
-            <el-table-column prop="code" label="课程代码"> </el-table-column>
+            <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="层次">
-              <template slot-scope="scope">
-                <div>
-                  <span>{{ getLevel(scope.row.level) }}</span>
-                </div>
-              </template>
+              <span slot-scope="scope">{{ getLevel(scope.row.level) }}</span>
             </el-table-column>
             <el-table-column label="状态" width="70">
-              <template slot-scope="scope">
-                <div>
-                  <span>
-                    <el-tag :type="getTag(scope.row.enable)">
-                      {{ getEnable(scope.row.enable) }}
-                    </el-tag>
-                  </span>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="updateTime" label="更新时间" width="170">
+              <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="操作">
-              <template slot-scope="scope">
-                <div>
-                  <el-button size="mini" type="primary" @click="relation(row);">
-                    关联专业
+              <div slot-scope="scope">
+                <el-button size="mini" type="primary" @click="relation(row);">
+                  关联专业
+                </el-button>
+                <span>
+                  <el-button size="mini" type="info" @click="editCourse(row);">
+                    <i class="el-icon-edit"></i> 修改
                   </el-button>
-                  <span>
-                    <el-button
-                      size="mini"
-                      type="info"
-                      @click="editCourse(row);"
-                    >
-                      <i class="el-icon-edit"></i> 修改
-                    </el-button>
-                  </span>
-                  <span v-if="!scope.row.enable">
-                    <el-button
-                      size="mini"
-                      type="success"
-                      @click="enableById(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(row);"
-                    >
-                      <i class="fa fa-close" aria-hidden="true"></i>禁用
-                    </el-button>
-                  </span>
-                </div>
-              </template>
+                </span>
+                <span v-if="!scope.row.enable">
+                  <el-button
+                    size="mini"
+                    type="success"
+                    @click="enableById(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(row);"
+                  >
+                    <i class="fa fa-close" aria-hidden="true"></i>禁用
+                  </el-button>
+                </span>
+              </div>
             </el-table-column>
           </el-table>
           <div class="page pull-right">
@@ -768,7 +737,6 @@ export default {
         "?" +
         param;
       this.$http.get(url).then(response => {
-        console.log(response);
         this.tableData = response.data.content;
         this.total = response.data.totalElements;
       });

src/modules/basic/view/exam_site.vue

@@ -8,15 +8,6 @@
           style="background-color:#D3DCE6;margin-bottom:20px;"
         >
           <h3 class="box-title">考点列表</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
         <!-- 正文信息 -->
         <div class="box-body">
@@ -29,19 +20,19 @@
           >
             <el-row :gutter="5">
               <el-form-item label="学习中心" class="pull-left">
-                <el-input v-model="orgName" readonly></el-input>
+                <el-input v-model="orgName" readonly />
               </el-form-item>
               <el-form-item label="考点代码" class="pull-left">
                 <el-input
                   placeholder="请输入考点代码"
                   v-model="formSearch.code"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item label="考点名称" class="pull-left">
                 <el-input
                   placeholder="请输入考点名称"
                   v-model="formSearch.name"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item class="pull-right">
                 <el-button
@@ -49,21 +40,23 @@
                   type="primary"
                   icon="search"
                   @click="searchForm"
-                  >查询</el-button
                 >
+                  查询
+                </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="danger" @click="deleteByIds">
+                  <i class="el-icon-delete"></i>删除
+                </el-button>
+                <el-button size="small" type="info" @click="back">
+                  退回
                 </el-button>
-                <el-button size="small" type="info" @click="back"
-                  >退回</el-button
-                >
               </el-form-item>
             </el-row>
           </el-form>
@@ -90,7 +83,7 @@
                     auto-complete="off"
                     placeholder="中心代码"
                     readonly
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -101,7 +94,7 @@
                     auto-complete="off"
                     placeholder="考点代码"
                     :readonly="null != examSiteForm.id"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -111,7 +104,7 @@
                     v-model="examSiteForm.name"
                     auto-complete="off"
                     placeholder="考点名称"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -121,7 +114,7 @@
                     v-model="examSiteForm.contacts"
                     auto-complete="off"
                     placeholder="负责人"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -131,7 +124,7 @@
                     v-model="examSiteForm.telephone"
                     auto-complete="off"
                     placeholder="联系方式"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -141,7 +134,7 @@
                     v-model="examSiteForm.remark"
                     auto-complete="off"
                     placeholder="备注"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row class="pull_center">
@@ -155,42 +148,33 @@
           <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>
-            <el-table-column prop="id" width="200" label="ID">
-            </el-table-column>
-            <el-table-column prop="orgName" label="学习中心"> </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="contacts" width="100" label="负责人">
-            </el-table-column>
-            <el-table-column prop="telephone" width="100" label="联系方式">
-            </el-table-column>
-            <el-table-column prop="remark" width="150" label="备注">
-            </el-table-column>
-            <el-table-column prop="updateTime" width="180" label="更新时间">
-            </el-table-column>
+            <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">
-              <template slot-scope="scope">
-                <div>
-                  <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>
-              </template>
+              <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">
@@ -200,8 +184,7 @@
               :page-size="pageSize"
               layout="total, prev, pager, next, jumper"
               :total="total"
-            >
-            </el-pagination>
+            />
           </div>
         </div>
       </div>
@@ -213,8 +196,6 @@
 import { core_api } from "../constants/constants.js";
 import { mapState } from "vuex";
 
-let _this = null;
-
 export default {
   data() {
     return {
@@ -288,7 +269,6 @@ export default {
         "?" +
         param;
       this.$http.get(url).then(response => {
-        console.log(response);
         this.tableData = response.data.content;
         this.total = response.data.totalElements;
         this.loading = false;
@@ -452,7 +432,7 @@ export default {
         .get(url)
         .then(response => {
           this.orgName = response.data.name;
-          _this.searchForm();
+          this.searchForm();
         })
         .catch(response => {
           if (response.status == 500) {
@@ -465,9 +445,7 @@ export default {
         });
     }
   },
-  //初始化查询
-  created: function() {
-    _this = this;
+  created() {
     this.orgId = this.$route.params.orgId;
     this.formSearch.orgId = this.$route.params.orgId;
     this.init();

src/modules/basic/view/privilege_group_list.vue

@@ -2,18 +2,8 @@
   <div>
     <section class="content" style="margin-top: -10px;">
       <div class="box box-info">
-        <!-- 头信息 -->
         <div class="box-header with-border">
           <h3 class="box-title">鉴权管理 &gt; 权限组管理</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
 
         <!-- 正文信息 -->
@@ -21,24 +11,24 @@
           <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>
-            <el-table-column prop="code" label="权限组编码"> </el-table-column>
-            <el-table-column prop="name" label="权限组名称"> </el-table-column>
-            <el-table-column prop="appName" label="应用名称"> </el-table-column>
+            <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="操作">
-              <template slot-scope="scope">
-                <div>
-                  <el-button
-                    size="small"
-                    type="primary"
-                    @click="editPrivilege(scope.row);"
-                    >权限配置</el-button
-                  >
-                </div>
-              </template>
+              <div slot-scope="scope">
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="editPrivilege(scope.row);"
+                >
+                  权限配置
+                </el-button>
+              </div>
             </el-table-column>
           </el-table>
         </div>
@@ -48,8 +38,7 @@
 </template>
 
 <script>
-import { mapActions, mapState } from "vuex";
-import { USER_SIGNIN } from "../../portal/store/user";
+import { mapState } from "vuex";
 import { core_api } from "../constants/constants.js";
 
 export default {
@@ -62,25 +51,10 @@ export default {
     ...mapState({ user: state => state.user })
   },
   methods: {
-    ...mapActions([USER_SIGNIN]),
-
-    queryAppList: function() {
+    async queryAppList() {
       var url = core_api + "/rolePrivilege/getPrivilegeGroupList";
-      this.$http
-        .get(url)
-        .then(response => {
-          console.log(response);
-          this.privilegeGroupList = response.data;
-        })
-        .catch(response => {
-          if (response.status == 500) {
-            this.$notify({
-              showClose: true,
-              message: response.data.desc,
-              type: "error"
-            });
-          }
-        });
+      const response = await this.$http.get(url);
+      this.privilegeGroupList = response.data;
     },
     editPrivilege(row) {
       this.$router.replace({ path: "/index/privilege_tree/" + row.id });

src/modules/basic/view/privilege_tree.vue

@@ -5,15 +5,6 @@
         <!-- 头信息 -->
         <div class="box-header with-border">
           <h3 class="box-title">鉴权管理 &gt; 权限组列表 &gt; 权限树</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
 
         <!-- 正文信息 -->
@@ -29,8 +20,7 @@
               :default-expanded-keys="[-1]"
               :expand-on-click-node="false"
               :render-content="renderContent"
-            >
-            </el-tree>
+            />
           </div>
 
           <!-- 新增权限 -->
@@ -404,7 +394,6 @@ export default {
                 if (!valid) {
                     return;
                 }
-                console.log(this.addingDialog.privilege);
                 var url = core_api + '/rolePrivilege/addPrivilege';
                 this.$http.post(url, this.addingDialog.privilege).then((response) => {
                     this.$notify({
@@ -429,7 +418,6 @@ export default {
                 this.addingDialog.show = false;
             });
         },
-
         updatePrivilege() {
             this.$refs.updateForm.validate((valid) => {
                 if (!valid) {
@@ -455,7 +443,6 @@ export default {
                 this.updateDialog.show = false;
             });
         },
-
         openUpdateDialog(store, data) {
             console.log(data);
             this.store = store;
@@ -463,14 +450,12 @@ export default {
             this.getPrivilege(data.id, "for-update");
 
         },
-
         openShowDialog(store, data) {
             console.log(data);
             this.store = store;
             this.data = data;
             this.getPrivilege(data.id, "for-show");
         },
-
         getPrivilege(id, type) {
             var url = core_api + '/rolePrivilege/getPrivilege/' + id;
             this.$http.get(url).then((response) => {
@@ -577,21 +562,13 @@ export default {
             );
         },
 
-        initTree() {
+        async initTree() {
             var url = core_api + '/rolePrivilege/getPrivilegeTree/' + this.privilegeGroupId;
-            this.$http.get(url).then((response) => {
-                console.log(response);
-                this.rootTreeNode.id = response.data.id;
-                this.rootTreeNode.label = response.data.label;
-                this.treeData = [];
-                this.treeData.push(response.data);
-            }).catch((response) => {
-                this.$notify({
-                    showClose: true,
-                    message: response.data.desc,
-                    type: 'error'
-                });
-            });
+            const response = await this.$httpWithMsg.get(url);
+            this.rootTreeNode.id = response.data.id;
+            this.rootTreeNode.label = response.data.label;
+            this.treeData = [];
+            this.treeData.push(response.data);
         }
     },
     created() {

src/modules/basic/view/role_privilege_settings.vue

@@ -5,15 +5,6 @@
         <!-- 头信息 -->
         <div class="box-header with-border">
           <h3 class="box-title">鉴权管理 &gt; 角色权限配置</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
 
         <!-- 正文信息 -->
@@ -39,8 +30,7 @@
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="角色" class="pull-left">
@@ -55,8 +45,7 @@
                     :label="item.roleName"
                     :value="item.roleId"
                     :key="item.roleId"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="权限组" class="pull-left">
@@ -71,8 +60,7 @@
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-row>
@@ -84,8 +72,9 @@
               type="success"
               :disabled="!treeChanged"
               @click="save"
-              >保 存</el-button
             >
+              保 存
+            </el-button>
           </div>
 
           <!-- 权限树 -->
@@ -102,8 +91,7 @@
               :default-checked-keys="checkedKeys"
               @check-change="treeChange"
               :expand-on-click-node="true"
-            >
-            </el-tree>
+            />
           </div>
         </div>
       </div>
@@ -216,9 +204,7 @@ export default {
 
       var url =
         core_api +
-        "/rolePrivilege/getRoles?includeSuperAdmin=" +
-        false +
-        "&rootOrgId=" +
+        "/rolePrivilege/getRoles?includeSuperAdmin=false&rootOrgId=" +
         this.form.orgId;
       this.$http
         .post(url)

src/modules/basic/view/school.vue

@@ -8,15 +8,6 @@
           style="background-color:#D3DCE6;margin-bottom:20px;"
         >
           <h3 class="box-title">学校列表</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
         <!-- 正文信息 -->
         <div class="box-body">
@@ -32,19 +23,19 @@
                 <el-input
                   placeholder="请输入学校名称"
                   v-model="formSearch.name"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item label="学校代码" class="pull-left">
                 <el-input
                   placeholder="请输入学校代码"
                   v-model="formSearch.code"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item label="学校域名" class="pull-left">
                 <el-input
                   placeholder="请输入学校域名"
                   v-model="formSearch.domainName"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item class="pull-right">
                 <el-button
@@ -52,20 +43,22 @@
                   type="primary"
                   icon="search"
                   @click="searchForm"
-                  >查询</el-button
                 >
+                  查询
+                </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 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>
@@ -89,7 +82,7 @@
                     auto-complete="off"
                     placeholder="学校域名"
                     :readonly="null != schoolForm.id"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -99,7 +92,7 @@
                     v-model="schoolForm.name"
                     auto-complete="off"
                     placeholder="学校名称"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -113,7 +106,7 @@
                     v-model="schoolForm.domainName"
                     auto-complete="off"
                     placeholder="学校域名"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -127,7 +120,7 @@
                     v-model="schoolForm.contacts"
                     auto-complete="off"
                     placeholder="负责人"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -141,7 +134,7 @@
                     v-model="schoolForm.telephone"
                     auto-complete="off"
                     placeholder="联系方式"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -151,7 +144,7 @@
                     v-model="schoolForm.properties.OE_STUDENT_SYS_NAME"
                     auto-complete="off"
                     placeholder="考生端产品名"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -175,9 +168,9 @@
           <!-- 学校产品分配弹出框 -->
           <el-dialog title="产品分配" :visible.sync="functionDialog">
             <div>
-              <el-button type="primary" @click="saveOrgFunction"
-                >保 存</el-button
-              >
+              <el-button type="primary" @click="saveOrgFunction">
+                保 存
+              </el-button>
               <el-button @click="functionDialog = false;">取 消</el-button>
             </div>
           </el-dialog>
@@ -191,14 +184,14 @@
                     class="pull_length"
                     v-model="curSchool.name"
                     :readonly="true"
-                  ></el-input>
+                  />
                 </el-form-item>
                 <el-form-item label="学校代码" label-width="120px">
                   <el-input
                     class="pull_length"
                     v-model="curSchool.code"
                     :readonly="true"
-                  ></el-input>
+                  />
                 </el-form-item>
                 <el-form-item style="margin-left:20px">
                   <el-upload
@@ -216,14 +209,18 @@
                     :auto-upload="false"
                     :multiple="false"
                   >
-                    <el-button size="small" slot="trigger" type="primary"
-                      >选择文件</el-button
+                    <el-button size="small" slot="trigger" type="primary">
+                      选择文件
+                    </el-button>
+                    <el-button
+                      size="small"
+                      type="success"
+                      @click="submitUpload"
                     >
-                    <el-button size="small" type="success" @click="submitUpload"
-                      >确认上传
+                      确认上传
                     </el-button>
-                    <el-button size="small" type="danger" @click="removeFile"
-                      >清空文件
+                    <el-button size="small" type="danger" @click="removeFile">
+                      清空文件
                     </el-button>
                     <div slot="tip" class="el-upload__tip">只能上传图片</div>
                   </el-upload>
@@ -236,12 +233,13 @@
           <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>
-            <el-table-column prop="id" label="ID" width="100">
-            </el-table-column>
+            <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">
@@ -278,20 +276,14 @@
                 </el-popover>
               </template>
             </el-table-column>
-            <el-table-column prop="domainName" label="学校域名">
-            </el-table-column>
-            <el-table-column prop="updateTime" width="170" label="更新时间">
-            </el-table-column>
+            <el-table-column prop="domainName" label="学校域名" />
+            <el-table-column prop="updateTime" width="170" label="更新时间" />
             <el-table-column width="100" label="状态">
-              <template slot-scope="scope">
-                <div>
-                  <span>
-                    <el-tag :type="getTag(scope.row.enable)">
-                      {{ getStatus(scope.row.enable) }}
-                    </el-tag>
-                  </span>
-                </div>
-              </template>
+              <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>
@@ -315,14 +307,14 @@
               :page-size="pageSize"
               layout="total, prev, pager, next, jumper"
               :total="total"
-            >
-            </el-pagination>
+            />
           </div>
         </div>
       </div>
     </section>
   </div>
 </template>
+
 <script>
 import { core_api } from "../constants/constants.js";
 import { mapState } from "vuex";

src/modules/basic/view/specially.vue

@@ -5,15 +5,6 @@
         <!-- 头信息 -->
         <div class="box-header with-border">
           <h3 class="box-title">专业列表</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
 
         <!-- 正文信息 -->
@@ -30,14 +21,14 @@
                   class="input_width_lg"
                   placeholder="请输入专业名称"
                   v-model="formSearch.name"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item label="专业代码" class="pull-left">
                 <el-input
                   class="input_width_lg"
                   placeholder="请输入专业代码"
                   v-model="formSearch.code"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item label="课程" class="pull-left">
                 <el-select
@@ -55,8 +46,7 @@
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="" class="pull-right">
@@ -65,23 +55,25 @@
                   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" @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>
                 <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>&nbsp;导出
+                  <i class="fa fa-upload" aria-hidden="true"></i> 导出
                 </el-button>
               </el-form-item>
             </el-row>
@@ -105,7 +97,7 @@
                     v-model="speciallyForm.code"
                     auto-complete="off"
                     placeholder="专业代码"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -115,13 +107,13 @@
                     v-model="speciallyForm.name"
                     auto-complete="off"
                     placeholder="专业名称"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row class="pull_center">
-                <el-button type="primary" @click="submitForm('speciallyForm');"
-                  >保 存</el-button
-                >
+                <el-button type="primary" @click="submitForm('speciallyForm');">
+                  保 存
+                </el-button>
                 <el-button type="danger" @click="close">取 消</el-button>
               </el-row>
             </el-form>
@@ -142,14 +134,14 @@
                     class="input_width_lg"
                     placeholder="请输入课程名称"
                     v-model="courseSearchForm.name"
-                  ></el-input>
+                  />
                 </el-form-item>
                 <el-form-item label="课程代码" class="pull-left">
                   <el-input
                     class="input_width_lg"
                     placeholder="请输入课程代码"
                     v-model="courseSearchForm.code"
-                  ></el-input>
+                  />
                 </el-form-item>
                 <el-form-item class="pull-right">
                   <el-button
@@ -157,14 +149,16 @@
                     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>
@@ -174,29 +168,24 @@
             <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>
-              <el-table-column prop="name" label="课程名称" width="250">
-              </el-table-column>
-              <el-table-column prop="code" label="课程代码"> </el-table-column>
-              <el-table-column prop="updateTime" label="更新时间" width="170">
-              </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="操作">
-                <template slot-scope="scope">
-                  <div>
-                    <span>
-                      <el-button
-                        size="mini"
-                        type="info"
-                        @click="deleteRelation(scope.row);"
-                      >
-                        <i class="el-icon-edit"></i> 取消关联
-                      </el-button>
-                    </span>
-                  </div>
-                </template>
+                <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">
@@ -206,8 +195,7 @@
                 :page-size="10"
                 layout="total, prev, pager, next, jumper"
                 :total="courseTotal"
-              >
-              </el-pagination>
+              />
             </div>
           </el-dialog>
 
@@ -238,15 +226,14 @@
                       :label="item.name"
                       :value="item.id"
                       :key="item.id"
-                    >
-                    </el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-row>
               <el-row class="pull_center">
-                <el-button type="primary" @click="submitAddRelationForm"
-                  >保 存</el-button
-                >
+                <el-button type="primary" @click="submitAddRelationForm">
+                  保 存
+                </el-button>
                 <el-button @click="addRelationDialog = false;">取 消</el-button>
               </el-row>
             </el-form>
@@ -297,8 +284,7 @@
               :page-size="pageSize"
               layout="total, prev, pager, next, jumper"
               :total="total"
-            >
-            </el-pagination>
+            />
           </div>
 
           <!-- 导入弹窗 -->
@@ -321,18 +307,22 @@
                     :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
+                    <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>

src/modules/basic/view/user.vue

@@ -5,15 +5,6 @@
         <!-- 头信息 -->
         <div class="box-header with-border">
           <h3 class="box-title">普通用户管理</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
         </div>
 
         <!-- 正文信息 -->
@@ -40,8 +31,7 @@
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="角色" class="pull-left">
@@ -57,8 +47,7 @@
                     :label="item.roleName"
                     :value="item.roleId"
                     :key="item.roleId"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="登录名" class="pull-left">
@@ -67,7 +56,7 @@
                   class="input_width_lg"
                   placeholder="请输入登录名"
                   v-model="searchForm.loginName"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item label="姓名" class="pull-left">
                 <el-input
@@ -75,7 +64,7 @@
                   class="input_width_lg"
                   placeholder="请输入姓名"
                   v-model="searchForm.name"
-                ></el-input>
+                />
               </el-form-item>
               <el-form-item class="pull-right">
                 <el-button
@@ -83,14 +72,16 @@
                   type="primary"
                   icon="search"
                   @click="search"
-                  >查询</el-button
                 >
+                  查询
+                </el-button>
                 <el-button
                   size="small"
                   type="primary"
                   icon="plus"
                   @click="openAddingDialog"
-                  >新增
+                >
+                  新增
                 </el-button>
               </el-form-item>
             </el-row>
@@ -112,7 +103,7 @@
                     v-model="userForm.name"
                     auto-complete="off"
                     placeholder="请输入姓名"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -126,7 +117,7 @@
                     v-model="userForm.loginName"
                     auto-complete="off"
                     placeholder="请输入登录名"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -136,7 +127,7 @@
                     v-model="userForm.password"
                     auto-complete="off"
                     placeholder="请输入密码"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -150,7 +141,7 @@
                     v-model="userForm.mobile"
                     auto-complete="off"
                     placeholder="请输入联系方式"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -247,7 +238,7 @@
                     class="input_width_lg"
                     v-model="userForm.id"
                     :disabled="true"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -257,7 +248,7 @@
                     v-model="userForm.name"
                     auto-complete="off"
                     placeholder="请输入姓名"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -271,7 +262,7 @@
                     v-model="userForm.loginName"
                     auto-complete="off"
                     placeholder="请输入登录名"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -285,7 +276,7 @@
                     v-model="userForm.mobile"
                     auto-complete="off"
                     placeholder="请输入联系方式"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -379,81 +370,69 @@
             style="width: 100%;text-align:center;"
             @selection-change="selectChange"
           >
-            <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column prop="id" width="100" label="ID">
-            </el-table-column>
-            <el-table-column prop="name" width="150" label="姓名">
-            </el-table-column>
-            <el-table-column prop="loginName" width="150" label="登录名">
-            </el-table-column>
-            <el-table-column prop="rootOrgName" width="150" label="顶级机构">
-            </el-table-column>
-            <el-table-column prop="roleNamesStr" width="250" label="角色">
-            </el-table-column>
-            <el-table-column prop="updateTime" width="180" label="更新时间">
-            </el-table-column>
+            <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="状态">
-              <template slot-scope="scope">
-                <div>
-                  <span>
-                    <el-tag :type="getTag(scope.row.enable)">
-                      {{ getEnable(scope.row.enable) }}
-                    </el-tag>
-                  </span>
-                </div>
-              </template>
+              <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="操作">
-              <template slot-scope="scope">
-                <div>
-                  <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>
-              </template>
+              <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">
@@ -463,8 +442,7 @@
               :page-size="10"
               layout="total, prev, pager, next, jumper"
               :total="total"
-            >
-            </el-pagination>
+            />
           </div>
         </div>
       </div>
@@ -1090,9 +1068,7 @@ export default {
       var url1 = core_api + "/org/getRootOrgList";
       var url2 =
         core_api +
-        "/rolePrivilege/getRoles?includeSuperAdmin=" +
-        true +
-        "&rootOrgId=" +
+        "/rolePrivilege/getRoles?includeSuperAdmin=true&rootOrgId=" +
         this.user.rootOrgId;
 
       Promise.all([this.$http.get(url1), this.$http.post(url2)]).then(

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

@@ -12,17 +12,17 @@
           </router-link>
         </el-menu-item>
         <el-menu-item index="4" style="float: right;" title="退出系统">
-          <v-icon name="sign-out-alt" />&nbsp;
-          <span @click="logout" style="cursor: pointer">退出</span>
+          <v-icon name="sign-out-alt" />
+          <span @click="logout" style="cursor: pointer"> 退出 </span>
         </el-menu-item>
         <el-menu-item index="3" style="float: right;" title="个人信息管理">
-          <v-icon name="user" />&nbsp;
-          <span @click="openUserDialog" style="cursor: pointer">{{
-            user.displayName
-          }}</span>
+          <v-icon name="user" />
+          <span @click="openUserDialog" style="cursor: pointer">
+            {{ user.displayName }}
+          </span>
         </el-menu-item>
         <el-menu-item index="2" style="float: right;" title="机构名称">
-          <v-icon name="users" />&nbsp; {{ user.rootOrgName }}
+          <v-icon name="users" /> {{ user.rootOrgName }}
         </el-menu-item>
       </el-menu>
     </el-header>
@@ -71,7 +71,7 @@
                   v-model="passForm.pass"
                   auto-complete="off"
                   placeholder="请输入密码"
-                ></el-input>
+                />
               </el-form-item>
             </el-row>
             <el-row>
@@ -86,7 +86,7 @@
                   v-model="passForm.checkPass"
                   auto-complete="off"
                   placeholder="请输入确认密码"
-                ></el-input>
+                />
               </el-form-item>
             </el-row>
             <el-row style="margin-left:100px">

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

@@ -18,8 +18,8 @@
       >
         <template slot="title">
           <router-link v-if="menu1.ext5" :to="{ path: menu1.ext5 }">
-            <i class="fa fa-circle-o"></i>{{ menu1.name }}</router-link
-          >
+            <i class="fa fa-circle-o"></i> {{ menu1.name }}
+          </router-link>
           <span v-else>{{ menu1.name }}</span>
         </template>
 
@@ -30,7 +30,7 @@
             :key="menu2.id"
           >
             <router-link :to="{ path: menu2.ext5 }">
-              <i class="fa fa-circle-o"></i>{{ menu2.name }}
+              <i class="fa fa-circle-o"></i> {{ menu2.name }}
             </router-link>
           </el-menu-item>
         </el-menu-item-group>

src/plugins/vueLifecylceLogs.js

@@ -1,6 +1,6 @@
 import Vue from "vue";
 
-const ignoreComponents = [undefined, "transition", "router-link"];
+const ignoreComponents = [undefined, "transition", "router-link", "Bar"];
 
 const ignoreComponentsNameRegexArray = [/^El[A-Z].*/, /^fa-.*/];
 
@@ -96,7 +96,7 @@ Vue.mixin({
   },
   beforeDestroy() {
     const parentNumber = getParentNumber(this);
-    if (!componentNameMatch.includes(this.$options.name))
+    if (!componentNameMatch(this.$options.name))
       console.log(
         "--".repeat(parentNumber) + `${this.$options.name} %c beforeDestroy`,
         "color: red; font-weight: bold"