浏览代码

12/07 14:51

111
mo 4 年之前
父节点
当前提交
d6b25d6e63

+ 1 - 1
src/router/notKeepAliveList.js

@@ -8,5 +8,5 @@ export default [
   '/vipClassSet/vipParameterManager',
   '/vipClassSet/branchActive',
   '/vipClassSet/branchActiveOperation',
-  '/vipClassSet/vipChargeSeting'
+  '/vipClassSet/vipChargeSeting',
 ]

+ 2 - 1
src/store/modules/tagsView.js

@@ -5,6 +5,7 @@ const tagsView = {
   },
   mutations: {
     ADD_VISITED_VIEWS: (state, view) => {
+      console.log(view)
       if (state.visitedViews.some(v => v.path === view.path)) {
         state.visitedViews.forEach(v => {
           if (v.path === view.path) {
@@ -81,7 +82,7 @@ const tagsView = {
     delOthersViews ({ commit, state }, view) {
       return new Promise((resolve) => {
         commit('DEL_OTHERS_VIEWS', view)
-        resolve([...state.visitedViews])
+        resolve([...state.visitedViews]) 
       })
     },
     delAllViews ({ commit, state }) {

+ 1 - 1
src/views/auditList/index.vue

@@ -5,7 +5,7 @@
       <div class="squrt"></div>
       审核列表
     </h2>
-    <div class="m-core">
+    <div class="m-core"> 
       <!-- 搜索标题 -->
       <save-form :inline="true"
                class="searchForm"

+ 204 - 0
src/views/categroyManager/generalSettings/vipCourseTimeSet.vue

@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <el-button
+      v-permission="'vipGroupDefaultClassesCycle/add'"
+      @click="addVipTimer"
+      type="primary"
+      style="margin-bottom: 20px"
+      >新建</el-button
+    >
+    <el-table
+      :data="rightList"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+    >
+      <el-table-column label="达到课时总数(次)" prop="maxClassTimes">
+      </el-table-column>
+      <el-table-column label="可排课时间段(月)" prop="month"> </el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <div>
+            <el-button
+              type="text"
+              v-permission="'vipGroupDefaultClassesCycle/update'"
+              @click="resetTimerList(scope.row)"
+              >修改</el-button
+            >
+            <el-popover
+              placement="top"
+              width="160"
+              v-permission="'vipGroupDefaultClassesCycle/delete'"
+              :ref="scope.row.id"
+            >
+              <p>您确定删除该周期循环吗?</p>
+              <div style="text-align: right; margin: 0">
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="scope._self.$refs[scope.row.id].doClose()"
+                  >取消</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="removeDefaultClassesCycle(scope)"
+                  >确定</el-button
+                >
+              </div>
+              <el-button type="text" slot="reference">删除</el-button>
+            </el-popover>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 周期循环新增弹窗 -->
+    <el-dialog
+      :title="(vipTimerFrom.isAdd ? '添加' : '修改') + 'VIP时间段'"
+      width="500px"
+      @close="onVipStatusClose('timerStatus')"
+      :visible.sync="timerStatus"
+    >
+      <el-form :model="vipTimerFrom" ref="timerStatus">
+        <el-form-item
+          label="达到课时总数"
+          prop="count"
+          :rules="[
+            { required: true, message: '请输入达到课时总数', trigger: 'blur' },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            v-model.trim="vipTimerFrom.count"
+            type="number"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="可排课时间段"
+          prop="timer"
+          :rules="[
+            { required: true, message: '请输入可排课时间段', trigger: 'blur' },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            v-model.trim="vipTimerFrom.timer"
+            type="number"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="timerStatus = false">取 消</el-button>
+        <el-button type="primary" @click="addTimerStatus('timerStatus')"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  getDefaultClassesCycle,
+  addDefaultClassesCycle,
+  resetDefaultClassesCycle,
+  removeDefaultClassesCycle,
+} from "@/api/vipSeting";
+export default {
+  data() {
+    return {
+      formLabelWidth: "120px",
+      rightList: [],
+      timerStatus: false, //课程时间段弹窗状态
+      vipTimerFrom: {
+        count: "",
+        timer: "",
+        isAdd: true,
+        id: "",
+      },
+      dynamicTags: [],
+
+      inputValue: "",
+    };
+  },
+  mounted() {
+    this.getDefaultClassesCycle();
+  },
+  methods: {
+    async getDefaultClassesCycle() {
+      // 获取默认右边参数
+      await getDefaultClassesCycle().then((res) => {
+        this.rightList = res.data;
+      });
+    },
+
+    // 新增时间段
+    addVipTimer() {
+      this.timerStatus = true;
+      this.vipTimerFrom.isAdd = true;
+    },
+    addTimerStatus(formName) {
+      // 点击添加后 发送请求单独添加=> 刷新列表
+      // 判断是添加还是修改
+      this.$refs[formName].validate(async (valid) => {
+        if (valid) {
+          const vipTimerFrom = this.vipTimerFrom;
+          if (vipTimerFrom.isAdd) {
+            // 添加
+            await addDefaultClassesCycle({
+              organId: null,
+              maxClassTimes: vipTimerFrom.count,
+              month: vipTimerFrom.timer,
+            }).then((res) => {
+              if (res.code == 200) {
+                this.$message.success("添加成功");
+                this.getDefaultClassesCycle();
+                this.timerStatus = false;
+              }
+            });
+          } else {
+            // 修改
+            await resetDefaultClassesCycle({
+              maxClassTimes: vipTimerFrom.count,
+              month: vipTimerFrom.timer,
+              id: vipTimerFrom.id,
+            }).then((res) => {
+              this.$message.success("修改成功");
+              this.getDefaultClassesCycle();
+              this.timerStatus = false;
+            });
+          }
+        }
+      });
+    },
+    resetTimerList(row) {
+      this.timerStatus = true;
+      const vipTimerFrom = this.vipTimerFrom;
+      this.$nextTick(() => {
+        vipTimerFrom.count = row.maxClassTimes;
+        vipTimerFrom.timer = row.month;
+        vipTimerFrom.id = row.id;
+        vipTimerFrom.isAdd = false;
+      });
+    },
+    // 删除时间管理
+    removeDefaultClassesCycle(scope) {
+      removeDefaultClassesCycle({
+        id: scope.row.id,
+      }).then((res) => {
+        if (res.code == 200) {
+          scope._self.$refs[scope.row.id].doClose();
+          this.$message.success("删除成功");
+          this.getDefaultClassesCycle();
+        }
+      });
+    },
+    onVipStatusClose(formName) {
+      this.inputVisible = false;
+      this.inputValue = "";
+      this.$refs[formName].resetFields();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

+ 163 - 53
src/views/categroyManager/generalSettings/vipCourseType.vue

@@ -52,76 +52,110 @@
         </template>
       </el-table-column>
     </el-table>
-        <!-- 课程类型新增弹窗 -->
-    <el-dialog :title="(vipStatusFrom.isAdd ? '添加' : '修改') + `VIP课程形式`"
-               class="courseMask"
-               width="500px"
-               @close="onVipStatusClose('vipStatus')"
-               :visible.sync="vipStatus">
-      <el-form :model="vipStatusFrom"
-               ref='vipStatus'>
-        <el-form-item label="课程形式"
-                      prop='name'
-                      :rules="[{ required: true, message: '请输入课程形式', trigger: 'blur' }]"
-                      :label-width="formLabelWidth">
-          <el-input v-model.trim="vipStatusFrom.name"
-                    autocomplete="off"></el-input>
+    <!-- 课程类型新增弹窗 -->
+    <el-dialog
+      :title="(vipStatusFrom.isAdd ? '添加' : '修改') + `VIP课程形式`"
+      class="courseMask"
+      width="500px"
+      @close="onVipStatusClose('vipStatus')"
+      :visible.sync="vipStatus"
+    >
+      <el-form :model="vipStatusFrom" ref="vipStatus">
+        <el-form-item
+          label="课程形式"
+          prop="name"
+          :rules="[
+            { required: true, message: '请输入课程形式', trigger: 'blur' },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            v-model.trim="vipStatusFrom.name"
+            autocomplete="off"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="班级人数"
-                      prop="num"
-                      :rules="[{ required: true, message: '请输入班级人数', trigger: 'blur' }]"
-                      :label-width="formLabelWidth">
-          <el-input v-model.trim="vipStatusFrom.num" type="number"
-                    autocomplete="off"></el-input>
+        <el-form-item
+          label="班级人数"
+          prop="num"
+          :rules="[
+            { required: true, message: '请输入班级人数', trigger: 'blur' },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            v-model.trim="vipStatusFrom.num"
+            type="number"
+            autocomplete="off"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="课程课时"
-                      prop="dynamicTags"
-                      :rules="[{ required: true, message: '请输入课程课时', trigger: 'blur, change' }]"
-                      :label-width="formLabelWidth">
-          <el-tag :key="index"
-                  effect="dark"
-                  type="info"
-                  v-for="(tag, index) in vipStatusFrom.dynamicTags"
-                  closable
-                  :disable-transitions="false"
-                  @close="handleClose(tag)">
-            {{tag}}
+        <el-form-item
+          label="课程课时"
+          prop="dynamicTags"
+          :rules="[
+            {
+              required: true,
+              message: '请输入课程课时',
+              trigger: 'blur, change',
+            },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-tag
+            :key="index"
+            effect="dark"
+            type="info"
+            v-for="(tag, index) in vipStatusFrom.dynamicTags"
+            closable
+            :disable-transitions="false"
+            @close="handleClose(tag)"
+          >
+            {{ tag }}
           </el-tag>
-          <el-input class="input-new-tag"
-                    v-if="inputVisible"
-                    v-model.trim="inputValue"
-                    ref="saveTagInput"
-                    style="width:100px;"
-                    size="small"
-                    @keyup.enter.native="handleInputConfirm">
+          <el-input
+            class="input-new-tag"
+            v-if="inputVisible"
+            v-model.trim="inputValue"
+            ref="saveTagInput"
+            style="width: 100px"
+            size="small"
+            @keyup.enter.native="handleInputConfirm"
+          >
           </el-input>
-          <el-button v-if="!inputVisible"
-                     class="button-new-tag"
-                     size="small"
-                     @click="showInput">+ 添加</el-button>
-          <el-button v-if="inputVisible"
-                     class="button-new-tag"
-                     size="small"
-                     @click="handleInputConfirm">保存</el-button>
+          <el-button
+            v-if="!inputVisible"
+            class="button-new-tag"
+            size="small"
+            @click="showInput"
+            >+ 添加</el-button
+          >
+          <el-button
+            v-if="inputVisible"
+            class="button-new-tag"
+            size="small"
+            @click="handleInputConfirm"
+            >保存</el-button
+          >
         </el-form-item>
       </el-form>
-      <div slot="footer"
-           class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button @click="vipStatus = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="addVipStatus('vipStatus')">确 定</el-button>
+        <el-button type="primary" @click="addVipStatus('vipStatus')"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
-
   </div>
 </template>
 <script>
+import { removeVipGroupCategory, vipGroupCategory, addVipGroupCategory,
+  resetVipGroupCategory, } from "@/api/vipSeting";
 export default {
   data() {
     return {
       leftList: [],
       vipStatus: false, // 课程形态弹窗状态
       formLabelWidth: "120px",
+      inputValue:'',
       vipStatusFrom: {
         name: "",
         num: "",
@@ -129,8 +163,12 @@ export default {
         isAdd: true,
         id: "",
       }, // 弹窗内容
+      inputVisible: false,
     };
   },
+  mounted() {
+    this.getVipGroupCategoryList();
+  },
   methods: {
     resetGroupCategory(row) {
       // 修改课程形式
@@ -146,16 +184,88 @@ export default {
       });
     },
     async removeGroupCategory(scope) {
-      // 删除
       await removeVipGroupCategory({
         id: scope.row.id,
       }).then((res) => {
         if (res.code == 200) {
+            scope._self.$refs[scope.row.id].doClose()
           this.$message.success("删除成功");
           this.getVipGroupCategoryList();
         }
       });
     },
+    // 新增分类
+    addGroupCategory() {
+      this.vipStatus = true;
+      this.vipStatusFrom.isAdd = true;
+    },
+    showInput() {
+      this.inputVisible = true;
+      this.$nextTick((_) => {
+        this.$refs.saveTagInput.$refs.input.focus();
+      });
+    },
+    onVipStatusClose(formName) {
+      this.inputVisible = false;
+      this.inputValue = "";
+      this.$refs[formName].resetFields();
+    },
+    async getVipGroupCategoryList() {
+      // 获取默认左边参数
+      await vipGroupCategory().then((res) => {
+        if (res.code == 200) {
+          this.leftList = res.data;
+        }
+      });
+    },
+    addVipStatus(formName) {
+      // 点击添加后 发送请求单独添加=> 刷新列表
+      // 判断是添加还是修改
+      this.$refs[formName].validate(async (valid) => {
+        console.log(valid);
+        if (valid) {
+          const vipStatusFrom = this.vipStatusFrom;
+          if (vipStatusFrom.isAdd) {
+            await addVipGroupCategory({
+              name: vipStatusFrom.name,
+              singleClassMinutes: vipStatusFrom.dynamicTags.join(","),
+              studentNum: vipStatusFrom.num,
+            }).then((res) => {
+              if (res.code == 200) {
+                this.$message.success("添加成功");
+                this.getVipGroupCategoryList();
+                this.vipStatus = false;
+              }
+            });
+          } else {
+            await resetVipGroupCategory({
+              name: vipStatusFrom.name,
+              singleClassMinutes: vipStatusFrom.dynamicTags.join(","),
+              studentNum: vipStatusFrom.num,
+              id: vipStatusFrom.id,
+            }).then((res) => {
+              this.$message.success("修改成功");
+              this.getVipGroupCategoryList();
+              this.vipStatus = false;
+            });
+          }
+        }
+      });
+    },
+    handleInputConfirm() {
+      let inputValue = this.inputValue;
+      if (inputValue) {
+        this.vipStatusFrom.dynamicTags.push(inputValue);
+      }
+      this.inputVisible = false;
+      this.inputValue = "";
+    },
+    handleClose(tag) {
+      this.vipStatusFrom.dynamicTags.splice(
+        this.vipStatusFrom.dynamicTags.indexOf(tag),
+        1
+      );
+    },
   },
 };
 </script>

+ 21 - 243
src/views/categroyManager/generalSettings/vipParameterManager.vue

@@ -1,261 +1,39 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div> VIP参数设置
+      <div class="squrt"></div>
+      VIP参数设置
     </h2>
     <div class="m-core">
-       <el-tabs v-model.trim="activeIndex"  type="card"
-               @tab-click="handleClick">
-           <el-tab-pane label="课程形式"
-                     v-if="permission('/teamDetails/baseInfo')"
-                     name="1">
-          <baseinfo v-if="activeIndex == '1'"
-                     />
+      <el-tabs v-model.trim="activeIndex" type="card" @tab-click="handleClick">
+        <el-tab-pane lazy label="课程形式" name="1">
+          <vipCourseType />
         </el-tab-pane>
-       </el-tabs>
-      <el-row :gutter="20">
-        <el-col :span="12" :xs="24">
-         
-        </el-col>
-        <el-col :span="12" :xs="24">
-          <el-button v-permission="'vipGroupDefaultClassesCycle/add'" @click="addVipTimer" type="primary" style="margin-bottom: 20px">新建</el-button>
-          <el-table :data='rightList'
-                    :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-            <el-table-column label="达到课时总数(次)"
-                             prop="maxClassTimes">
-            </el-table-column>
-            <el-table-column label="可排课时间段(月)"
-                             prop="month">
-            </el-table-column>
-            <el-table-column label="操作">
-              <template slot-scope="scope">
-                <div>
-                  <el-button type="text" v-permission="'vipGroupDefaultClassesCycle/update'"
-                             @click="resetTimerList(scope.row)">修改</el-button>
-                  <el-popover placement="top"
-                              width="160"
-                              v-permission="'vipGroupDefaultClassesCycle/delete'"
-                              :ref="scope.row.id">
-                    <p>您确定删除该周期循环吗?</p>
-                    <div style="text-align: right; margin: 0">
-                      <el-button size="mini"
-                                 type="text"
-                                 @click="scope._self.$refs[scope.row.id].doClose()">取消</el-button>
-                      <el-button type="primary"
-                                 size="mini"
-                                 @click="removeDefaultClassesCycle(scope)">确定</el-button>
-                    </div>
-                    <el-button type="text"
-                               slot="reference">删除</el-button>
-                  </el-popover>
-
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
+        <el-tab-pane lazy label="周期循环" name="2">
+          <vipCourseTimeSet />
+        </el-tab-pane>
+      </el-tabs>
     </div>
-
-
-    <!-- 周期循环新增弹窗 -->
-    <el-dialog :title="(vipTimerFrom.isAdd ? '添加' : '修改') + 'VIP时间段'"
-               width="500px"
-               @close="onVipStatusClose('timerStatus')"
-               :visible.sync="timerStatus">
-      <el-form :model="vipTimerFrom"
-               ref='timerStatus'>
-        <el-form-item label="达到课时总数"
-                      prop='count'
-                      :rules="[{required: true, message: '请输入达到课时总数', trigger: 'blur'}]"
-                      :label-width="formLabelWidth">
-          <el-input v-model.trim="vipTimerFrom.count" type="number" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="可排课时间段"
-                      prop="timer"
-                      :rules="[{required: true, message: '请输入可排课时间段', trigger: 'blur'}]"
-                      :label-width="formLabelWidth">
-          <el-input v-model.trim="vipTimerFrom.timer" type="number" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer"
-           class="dialog-footer">
-        <el-button @click="timerStatus=false">取 消</el-button>
-        <el-button type="primary"
-                   @click="addTimerStatus('timerStatus')">确 定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
-import { vipGroupCategory, getDefaultClassesCycle, addVipGroupCategory, resetVipGroupCategory, removeVipGroupCategory, addDefaultClassesCycle, resetDefaultClassesCycle, removeDefaultClassesCycle } from "@/api/vipSeting"
+import vipCourseType from "./vipCourseType";
+import vipCourseTimeSet from "./vipCourseTimeSet";
 export default {
-  name: 'vipParameterManager',
-  data () {
+  name: "vipParameterManager",
+  components: { vipCourseType, vipCourseTimeSet },
+  data() {
     return {
-        formLabelWidth: "120px",
-       rightList: [],
-      timerStatus: false, //课程时间段弹窗状态
-      vipTimerFrom: {
-        count: '',
-        timer: '',
-        isAdd: true,
-        id: ''
-      },
-      dynamicTags: [],
-      inputVisible: false,
-      inputValue: '',
-      activeIndex:'1'
-      
-    }
-  },
-  mounted () {
-    this.getVipGroupCategoryList()
-    this.getDefaultClassesCycle()
+      activeIndex: "1",
+    };
   },
+  mounted() {},
   methods: {
-    handleClick(val){
-       this.activeIndex = val.name;
-    },
-    handleClose (tag) {
-      this.vipStatusFrom.dynamicTags.splice(this.vipStatusFrom.dynamicTags.indexOf(tag), 1);
-    },
-    showInput () {
-      this.inputVisible = true;
-      this.$nextTick(_ => {
-        this.$refs.saveTagInput.$refs.input.focus();
-      });
-    },
-    handleInputConfirm () {
-      let inputValue = this.inputValue;
-      if (inputValue) {
-        this.vipStatusFrom.dynamicTags.push(inputValue);
-      }
-      this.inputVisible = false;
-      this.inputValue = '';
-    },
-    async getVipGroupCategoryList () {
-      // 获取默认左边参数
-      await vipGroupCategory().then(res => {
-        if (res.code == 200) {
-          this.leftList = res.data;
-        }
-      })
-    },
-    async getDefaultClassesCycle () {
-      // 获取默认右边参数
-      await getDefaultClassesCycle().then(res => {
-        this.rightList = res.data;
-      })
-    },
-    onVipStatusClose(formName) {
-      this.inputVisible = false
-      this.inputValue = ''
-      this.$refs[formName].resetFields()
-    },
-    // 新增分类
-    addGroupCategory () {
-      this.vipStatus = true;
-      this.vipStatusFrom.isAdd = true;
+    handleClick(val) {
+      this.activeIndex = val.name;
     },
-    addVipStatus (formName) {
-      // 点击添加后 发送请求单独添加=> 刷新列表
-      // 判断是添加还是修改
-      this.$refs[formName].validate(async (valid) => {
-        console.log(valid)
-        if(valid) {
-          const vipStatusFrom = this.vipStatusFrom
-          if(vipStatusFrom.isAdd) {
-            await addVipGroupCategory({
-              name: vipStatusFrom.name,
-              singleClassMinutes: vipStatusFrom.dynamicTags.join(','),
-              studentNum: vipStatusFrom.num
-            }).then(res => {
-              if (res.code == 200) {
-                this.$message.success('添加成功')
-                this.getVipGroupCategoryList();
-                this.vipStatus = false;
-              }
-            })
-          } else {
-            await resetVipGroupCategory({
-              name: vipStatusFrom.name,
-              singleClassMinutes: vipStatusFrom.dynamicTags.join(','),
-              studentNum: vipStatusFrom.num,
-              id: vipStatusFrom.id
-            }).then(res => {
-              this.$message.success('修改成功')
-              this.getVipGroupCategoryList();
-              this.vipStatus = false;
-            })
-          }
-        }
-      })
-    },
-
-
-    // 新增时间段
-    addVipTimer () {
-      this.timerStatus = true;
-      this.vipTimerFrom.isAdd = true;
-    },
-    addTimerStatus (formName) {
-      // 点击添加后 发送请求单独添加=> 刷新列表
-      // 判断是添加还是修改
-      this.$refs[formName].validate(async (valid) => {
-        if(valid) {
-          const vipTimerFrom = this.vipTimerFrom
-          if (vipTimerFrom.isAdd) {
-            // 添加
-            await addDefaultClassesCycle({
-              organId: null,
-              maxClassTimes: vipTimerFrom.count,
-              month: vipTimerFrom.timer,
-            }).then(res => {
-              if (res.code == 200) {
-                this.$message.success('添加成功')
-                this.getDefaultClassesCycle();
-                this.timerStatus = false;
-              }
-            })
-          } else {
-            // 修改
-            await resetDefaultClassesCycle({
-              maxClassTimes: vipTimerFrom.count,
-              month: vipTimerFrom.timer,
-              id: vipTimerFrom.id
-            }).then(res => {
-              this.$message.success('修改成功')
-              this.getDefaultClassesCycle();
-              this.timerStatus = false;
-            })
-          }
-        }
-      })
-    },
-    resetTimerList (row) {
-      this.timerStatus = true;
-      const vipTimerFrom = this.vipTimerFrom
-      this.$nextTick(() => {
-        vipTimerFrom.count = row.maxClassTimes;
-        vipTimerFrom.timer = row.month;
-        vipTimerFrom.id = row.id;
-        vipTimerFrom.isAdd = false;
-      })
-    },
-    // 删除时间管理
-    removeDefaultClassesCycle (scope) {
-      removeDefaultClassesCycle({
-        id: scope.row.id
-      }).then(res => {
-        if (res.code == 200) {
-          scope._self.$refs[scope.row.id].doClose()
-          this.getDefaultClassesCycle();
-        }
-      })
-    },
-  }
-}
+  },
+};
 </script>
 <style lang="scss" scoped>
 .left {

+ 36 - 29
src/views/teamDetail/componentCourse/courseEvaluate.vue

@@ -2,24 +2,31 @@
 <template>
   <div class>
     <div class="tableWrap">
-      <el-table :data="tableList"
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center"
-                         width="100"
-                         prop="username"
-                         label="学生姓名"></el-table-column>
-        <el-table-column align="center"
-                         width="100"
-                         prop="score"
-                         label="星级">
+      <el-table
+        :data="tableList"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      >
+        <el-table-column
+          align="center"
+          width="100"
+          prop="username"
+          label="学生姓名"
+        >
           <template slot-scope="scope">
             <div>
-              {{ scope.row.score?scope.row.score+'星':'' }}
+              {{ scope.row.username }}
+              <span style="color: #f56c6c">{{scope.row.id}}</span>
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="reason"
-                         label="评价内容"></el-table-column>
+        <el-table-column align="center" width="100" prop="score" label="星级">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.score ? scope.row.score + "星" : "" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="reason" label="评价内容"></el-table-column>
       </el-table>
       <!-- <pagination
         :total="rules.total"
@@ -33,10 +40,10 @@
 
 <script>
 // import pagination from '@/components/Pagination/index'
-import { getStuAndTeaReview } from '@/api/buildTeam'
+import { getStuAndTeaReview } from "@/api/buildTeam";
 export default {
-  props: ['courseScheduleId'],
-  data () {
+  props: ["courseScheduleId"],
+  data() {
     return {
       tableList: [],
       rules: {
@@ -44,28 +51,28 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
-      }
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created () { },
+  created() {},
   //生命周期 - 挂载完成(可以访问DOM元素)
-  mounted () {
-    this.getList()
+  mounted() {
+    this.getList();
   },
-  activated () {
-    this.getList()
+  activated() {
+    this.getList();
   },
   methods: {
-    getList () {
-      getStuAndTeaReview({ courseId: this.courseScheduleId }).then(res => {
+    getList() {
+      getStuAndTeaReview({ courseId: this.courseScheduleId }).then((res) => {
         if (res.code == 200) {
-          this.tableList = res.data.courseScheduleComplaints
+          this.tableList = res.data.courseScheduleComplaints;
         }
-      })
-    }
-  }
+      });
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>

+ 2 - 1
src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -30,7 +30,8 @@
                          label="学生姓名">
           <template slot-scope="scope">
             <div>
-              {{scope.row.username}}({{scope.row.userId}})
+              {{scope.row.username}}
+               <span style="color:#F56C6C;">{{scope.row.userId}}</span>
             </div>
           </template>
         </el-table-column>

+ 6 - 4
src/views/teamDetail/componentCourse/studentWork.vue

@@ -1,12 +1,13 @@
 <template>
   <div>
-  <el-alert
+  <!-- <el-alert
     title="作业内容"
     type="info"
     :closable="false"
     :description="content">
-  </el-alert>
-    <!-- <div class="workTitle">作业内容:  <span>{{content}}</span> </div> -->
+  </el-alert> -->
+<!-- <el-tag type="danger"></el-tag> -->
+    <div class="workTitle"><el-tag type="info">作业 <i class="el-icon-edit"></i>: {{content}}</el-tag></div>
     <el-form :inline="true"
              class="workForm"
              style="padding: 0 25px">
@@ -37,7 +38,8 @@
                          label="学生姓名">
           <template slot-scope="scope">
             <div>
-              {{scope.row.studentName}}({{scope.row.studentId}})
+              {{scope.row.studentName}}
+              <span style="color:#F56C6C;">{{scope.row.studentId}}</span>
             </div>
           </template>
         </el-table-column>

+ 2 - 1
src/views/teamDetail/componentCourse/teacherList.vue

@@ -8,7 +8,8 @@
                        label="老师姓名">
         <template slot-scope="scope">
           <div>
-            {{scope.row.teacherName}}({{scope.row.teacherId}})
+            {{scope.row.teacherName}}
+             <span style="color:#F56C6C;">{{scope.row.teacherId}}</span>
           </div>
         </template>
       </el-table-column>