Merge remote-tracking branch 'origin/master'

src/api/courseManage.js

@@ -79,3 +79,11 @@ export function queryStudentChartCount(parameter) {
   });
 }
 
+// 取消指派
+export function cancelAssignment(parameter) {
+  return axios({
+    url: api.BLesson + '/cancelAppoint',
+    method: 'post',
+    params: parameter
+  });
+}

src/views/courseTrain/onlineCourse/onlineCourseMain.vue

 <template>
   <div>
     <div class="content" id="onlineCourse">
-      <div class="table-operator">
-        <a-button type="primary" @click="newUpdateCourse">新建课程</a-button>
-      </div>
       <!-- 搜索项 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
@@ -32,13 +29,16 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons" :style="{ float: 'left', overflow: 'hidden' } || {} ">
-                <a-button type="primary" @click="getLessonManage" ghost class="search">搜索</a-button>
+                <a-button type="primary" @click="getLessonManage" >查询</a-button>
                 <a-button style="margin-left: 8px" @click="() =>{ queryParam.lessonName='';queryParam.lecturerId='';queryParam.releaseState='' }">重置</a-button>
               </span>
             </a-col>
           </a-row>
         </a-form>
       </div>
+      <div class="table-operator">
+        <a-button type="primary" @click="newUpdateCourse">新建课程</a-button>
+      </div>
       <!-- 表格 -->
       <a-table
         class="onlineTable"
@@ -66,7 +66,6 @@
           <a class="onlineAction" href="javascript:;" @click="newUpdateCourse(record)">编辑</a>
           <a class="onlineAction" href="javascript:;" v-show="record.releaseState === '0'">发布</a>
           <a class="onlineAction" href="javascript:;" v-show="record.releaseState !== '0' && record.releaseState !== '4'">指派</a>
-          <a class="onlineAction" href="javascript:;" v-show="record.releaseState !== '0' && record.releaseState !== '4'">跟踪</a>
           <a class="onlineAction" href="javascript:;" v-show="record.releaseState !== '0' && record.releaseState !== '4'">推荐</a>
           <a-popconfirm
             v-show="record.releaseState !== '0' && record.releaseState !== '4'"
@@ -318,5 +317,13 @@
         color: #3CBAFF;
       }
     }
+    .table-page-search-wrapper {
+      background: white;
+      height: 80px;
+      padding: 20px;
+    }
+    .table-operator {
+      margin: 20px 0;
+    }
   }
 </style>

src/views/courseTrain/onlineCourse/studentTracking.vue

@@ -64,16 +64,16 @@
       }">
       <span slot="customTitle">指派时间
         <a-tooltip placement="bottom" >
-        <template slot="title">
+          <template slot="title">
             <span>自主学习学员，此处显示的是加入学习的时间</span>
-        </template>
-        <a-button icon="question" shape="circle" size="small" class="table-question"></a-button>
-      </a-tooltip></span>
+          </template>
+          <a-button icon="question" shape="circle" size="small" class="table-question"></a-button>
+        </a-tooltip></span>
       <span slot="action" slot-scope="text, record">
         <a-popconfirm
           v-if="data.length"
           title="确定取消指派吗?"
-          @confirm="() => cancelSetStudent(record.businessId)">
+          @confirm="() => cancelSetStudent(record)">
           <a class="onlineAction" href="javascript:;" v-if="record.isAppoint === '1'">取消指派</a>
         </a-popconfirm>
       </span>
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-    import { queryStudentTracking, queryStudentChartCount } from '@/api/courseManage';
+    import { queryStudentTracking, queryStudentChartCount, cancelAssignment } from '@/api/courseManage';
 
     export default {
         name: 'onlineCourse',
@@ -329,8 +329,18 @@
                 });
             },
             // 取消指派
-            cancelSetStudent(id) {
-               console.log(id);
+            cancelSetStudent(recond) {
+               console.log(recond);
+               const queryParam = { 'corpId': 1, 'userId': 1, 'businessId': recond.businessId, 'lessonId': recond.lessonId, 'personId': recond.personId };
+                cancelAssignment(queryParam)
+                    .then(res => {
+                        if (res.code === 200) {
+                            this.$message.success(res.message, 3);
+                        } else {
+                            this.$message.error(res.message, 3);
+                        }
+                        this.getStudentTrackingList();
+                    });
             },
             // 表格改变后函数
             tableChange(pagination, filters, sorter) {

src/views/systemManagement/UserManage.vue

@@ -68,9 +68,9 @@
       <span slot="tags" slot-scope="tags">
         <!--<a-tag v-for="tag in tags" color="blue" :key="tag">{{tags}}</a-tag>-->
         <!--<a-badge :status="tags==='1'?'success':'error'" :text="tags==='1'?'正常':'禁用'" />-->
-        <a-avatar v-if="tags==='1'"  class="table-check" icon="check" size="small"/>
+        <a-avatar v-if="tags==='1'" class="table-check" icon="check" size="small"/>
         <span v-if="tags==='1'" style="margin-left: 5px">正常</span>
-        <a-avatar  v-if="tags==='0'"  class="table-close" icon="close" size="small"/>
+        <a-avatar v-if="tags==='0'" class="table-close" icon="close" size="small"/>
         <span v-if="tags==='0'" style="margin-left: 5px">禁用</span>
       </span>
       <span slot="action" slot-scope="text, record">
@@ -79,9 +79,34 @@
       </span>
     </a-table>
 
-    <a-modal title="分配角色" v-model="setRoleVisible" @ok="setRoleOK" >
+    <!--<a-modal title="分配角色" v-model="setRoleVisible" @ok="setRoleOK" >
       <a-checkbox-group :options="roleCheckOptions" @change="onRoleCheckChange" />
-    </a-modal>
+    </a-modal>-->
+
+    <a-drawer
+      title="分配角色"
+      :width="500"
+      @close="onClose"
+      :visible="setRoleVisible"
+      :wrapStyle="{height: 'calc(100% - 108px)',overflow: 'auto',paddingBottom: '108px'}"
+    >
+      <a-checkbox-group :options="roleCheckOptions" @change="onRoleCheckChange" v-model="roleCheckValue"/>
+      <div
+        :style="{
+          position: 'absolute',
+          left: 0,
+          bottom: 0,
+          width: '100%',
+          borderTop: '1px solid #e9e9e9',
+          padding: '10px 16px',
+          background: '#fff',
+          textAlign: 'right',
+        }"
+      >
+        <a-button @click="setRoleOK" type="primary" :style="{marginRight: '8px'}">确定</a-button>
+        <a-button @click="onClose">取消</a-button>
+      </div>
+    </a-drawer>
   </a-card>
 </template>
 
@@ -184,6 +209,8 @@
                 setRoleForUser(param).then(res => {
                     _this.$message.success(res.message, 3);
                 });
+                this.setRoleVisible = false;
+                this.roleCheckValue = [];
             },
             onSelectChange(selectedRowKeys, selectedRows) {
                 this.selectedRowKeys = selectedRowKeys;
@@ -220,6 +247,7 @@
                 } else {
                     if (this.selectedRowKeys.length <= 0) {
                         this.$message.warning('请选中数据后再操作', 3);
+                        return;
                     } else {
                         param.businessId = this.selectedRowKeys.toString();
                     }
@@ -263,6 +291,10 @@
             },
             onRoleCheckChange(checkedList) {
                 this.roleCheckValue = checkedList;
+            },
+            onClose() {
+                this.setRoleVisible = false;
+                this.roleCheckValue = [];
             }
         }
     };