Merge remote-tracking branch 'origin/master'

src/pages/assessment/add/index.vue

@@ -311,7 +311,7 @@ export default {
             this.allCheckedNodes = this.allCheckedNodes.filter(i => (i.level === 3 && i.id !== tag.id) || (i.level === 4 && i.parentId !== tag.id));
         },
         handleCheck(data, checked) { // 当复选框被点击的时候触发
-            console.log(checked);
+            // console.log(checked);
 
             // 全选和半选状态下的班级都显示在标签
             let checkedClass = checked.checkedNodes.filter(i => i.level === 3);
@@ -355,7 +355,7 @@ export default {
                         i.nodeKey = `${i.id}-${new Date().getTime()}`;
                         i.leaf = false;
                     }
-                    console.log(JSON.stringify(i));
+                    // console.log(JSON.stringify(i));
                     result.push(i);
                 });
                 this.$nextTick(() => {

src/pages/assessment/list/index.vue

@@ -5,7 +5,7 @@
             <ul class="filter">
                 <li>
                     <label>考核时间</label>
-                    <el-radio-group v-model="form.month" @change="initData">
+                    <el-radio-group v-model="form.month">
                         <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{ item.name }}</el-radio>
                     </el-radio-group>
                     <el-date-picker v-model="date" align="right" unlink-panels type="daterange" style="width: 300px;margin-left: 10px;" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker>
@@ -44,13 +44,13 @@
             </ul>
             <div>
                 <div>
-                    <el-button v-if="auth('创建考核')" type="primary" round @click="add" >创建考核</el-button>
+                    <el-button v-if="auth('创建考核')" type="info" round @click="add" >创建考核</el-button>
                     <el-button v-if="auth('批量删除')" type="primary" round @click="delAllData">批量删除</el-button>
                 </div>
             </div>
         </div>
 
-        <el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
+        <el-table v-loading="listLoading" ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
             <el-table-column type="selection" :selectable="row => row.status !== 1" width="50" align="center" :reserve-selection="true"></el-table-column>
             <el-table-column type="index" width="60" label="序号" align="center">
                 <template slot-scope="scope">
@@ -90,12 +90,12 @@
                 </template>
             </el-table-column>
             <el-table-column label="实验状态" align="center">
-                <template slot-scope="scope">
+                <template slot-scope="scope" v-if="scope.row.show">
                     <span>{{ status[scope.row.status] }}</span>
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="170">
-                <template slot-scope="scope">
+                <template slot-scope="scope" v-if="scope.row.show">
                     <template v-if="scope.row.status == 0">
                         <el-button v-if="auth('启动')" type="text" @click="start(scope.row)">启动</el-button>
                         <el-button v-if="auth('修改')" type="text" @click="edit(scope.row)">修改</el-button>
@@ -191,6 +191,7 @@ export default {
             total: 0, // 总数
             listData: [], // 表格数据
             multipleSelection: [], // 多选
+            listLoading:false,// 列表加载
             ticker: null // 倒计时定时器
         };
     },
@@ -256,11 +257,14 @@ export default {
                             item.status = 2;
                         }
                     }
+                    item.show = true;
                     this.$set(this.listData, i, item);
                 }
             }, 1000);
         },
         getData() {
+            this.listLoading = true;
+            this.listData.splice(0);
             if (this.ticker) {
                 clearInterval(this.ticker);
             }
@@ -275,6 +279,7 @@ export default {
                 this.listData = res.list;
                 this.total = res.total;
                 this.listData.forEach(i => {
+                    i.show = false;
                     if (i.status === 2) { // 已结束
                         i.countDown = 0;
                     } else {
@@ -298,8 +303,9 @@ export default {
                     }
                 });
                 this.beginTimer();
+                this.listLoading = false;
             }).catch(err => {
-                console.log(err);
+                this.listLoading = false;
             });
         },
         initData() {

src/pages/course/list/courseManagement/index.vue

@@ -16,7 +16,7 @@
                 </li>
             </ul>
             <div>
-                <el-button v-if="auth('课程管理-新增')" type="primary" round @click="addCourse">新增</el-button>
+                <el-button v-if="auth('课程管理-新增')" type="info" round @click="addCourse">新增</el-button>
                 <el-button v-if="auth('课程管理-批量删除')" type="primary" round @click="delAllData">批量删除</el-button>
             </div>
         </div>

src/pages/evaluation/list/index.vue

@@ -19,8 +19,8 @@
                 </li>
             </ul>
             <div>
-                <el-button v-if="auth('测评设置')" type="primary" @click="getInfo">测评设置</el-button>
-                <el-button v-if="auth('新增题目')" type="primary" @click="addTopics">新增题目</el-button>
+                <el-button v-if="auth('测评设置')" type="info" @click="getInfo">测评设置</el-button>
+                <el-button v-if="auth('新增题目')" type="info" @click="addTopics">新增题目</el-button>
                 <el-button v-if="auth('批量上传')" type="primary" @click="showBatchUpload">批量上传</el-button>
                 <el-button v-if="auth('批量删除')" type="primary" @click="delAllData">批量删除</el-button>
             </div>

src/pages/information/columnManage/index.vue

@@ -14,7 +14,7 @@
                 <template v-if="!sorting">
                     <el-button v-if="auth('栏目管理-更改排序')" class="action-btn" type="primary" round @click="openSort">更改排序
                     </el-button>
-                    <el-button v-if="auth('栏目管理-添加栏目')" class="action-btn" type="primary" round @click="addColumn">添加栏目
+                    <el-button v-if="auth('栏目管理-添加栏目')" class="action-btn" type="info" round @click="addColumn">添加栏目
                     </el-button>
                 </template>
             </div>

src/pages/information/contentManage/contentList.vue

@@ -6,7 +6,7 @@
         <div class="btn-wrap">
             <el-button v-if="auth('内容管理-保存排序')" class="action-btn" type="primary" @click="sortSubmit">保存排序</el-button>
             <el-button v-if="auth('内容管理-批量删除')" class="action-btn" type="primary" @click="delAllData">批量删除</el-button>
-            <el-button v-if="auth('内容管理-新增文章')" class="action-btn" type="primary" @click="addArticle">新增文章</el-button>
+            <el-button v-if="auth('内容管理-新增文章')" class="action-btn" type="info" @click="addArticle">新增文章</el-button>
         </div>
         <div class="page-content" style="padding-top: 24px">
             <el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">

src/pages/match/list/index.vue

@@ -25,7 +25,7 @@
                 </li>
             </ul>
             <div>
-                <el-button type="primary" round @click="add">创建竞赛</el-button>
+                <el-button type="info" round @click="add">创建竞赛</el-button>
             </div>
         </div>
 

src/pages/project/list/index.vue

@@ -56,7 +56,7 @@
                     </li>
                 </ul>
                 <div>
-                    <el-button v-if="auth('新增项目')" type="primary" @click="add">新增项目</el-button>
+                    <el-button v-if="auth('新增项目')" type="info" @click="add">新增项目</el-button>
                     <el-button v-if="auth('批量删除')" type="primary" @click="delAllData">批量删除</el-button>
                 </div>
             </div>

src/pages/student/list/index.vue

@@ -99,7 +99,7 @@
                             </li>
                         </ul>
                         <div>
-                            <el-button type="primary" v-if="auth('新增学生')" @click="addStudent">新增学生</el-button>
+                            <el-button type="info" v-if="auth('新增学生')" @click="addStudent">新增学生</el-button>
                             <el-button type="primary" v-if="auth('批量导入')" @click="batchImport">批量导入</el-button>
                             <el-button type="primary" v-if="auth('批量删除')" @click="delAllSelection">批量删除</el-button>
                         </div>

src/pages/system/list/role.vue

@@ -8,7 +8,7 @@
                 </li>
             </ul>
             <div>
-                <el-button v-if="auth('角色权限-新增角色')" type="primary" round @click="addRole">新增角色</el-button>
+                <el-button v-if="auth('角色权限-新增角色')" type="info" round @click="addRole">新增角色</el-button>
                 <el-button v-if="auth('角色权限-批量删除')" type="primary" round @click="delAllSelection">批量删除</el-button>
             </div>
         </div>

src/pages/system/list/staff.vue

@@ -13,7 +13,7 @@
                     </li>
                 </ul>
                 <div>
-                    <el-button v-if="auth('员工管理-新增员工')" type="primary" round @click="addTeacher">新增员工</el-button>
+                    <el-button v-if="auth('员工管理-新增员工')" type="info" round @click="addTeacher">新增员工</el-button>
                     <el-button v-if="auth('员工管理-批量导入')" type="primary" round @click="batchImport">批量导入</el-button>
                     <el-button v-if="auth('员工管理-批量删除')" type="primary" round @click="delAllSelection">批量删除</el-button>
                 </div>

src/styles/common.scss

@@ -33,6 +33,13 @@
   border-radius: 4px !important;
 }
 
+.el-button--info.action-btn {
+  color: #fff !important;
+  font-size: 14px !important;
+  background-color: $--color-primary !important;
+  border-radius: 4px !important;
+}
+
 .el-input {
   .el-input__inner {
     border-color: rgba(0, 0, 0, 0.15);
@@ -84,6 +91,10 @@
       @extend .action-btn;
     }
 
+    .el-button--info {
+      @extend .action-btn;
+    }
+
     &.mul {
       margin-bottom: 0;
 
@@ -253,6 +264,7 @@
         background-color: #fae9e8;
       }
     }
+
   }
 }