Browse Source

勇哥优化

1
mo 4 years ago
parent
commit
2f6fc163c9

+ 0 - 1
src/components/filter-search/index.vue

@@ -84,7 +84,6 @@ export default {
   },
   mounted() {
     this.initSearch = this.$route.query
-    console.log(this.activeItems)
   },
   watch: {
     $route() {

+ 13 - 1
src/views/operateManager/serverIndexList.vue

@@ -56,7 +56,7 @@
 
         <el-form-item>
           <el-button
-            type="primary"
+             :type="isSearch ? 'primary' : 'info'"
             icon="el-icon-circle-plus-outline"
             @click="showMove = true"
             >更多选项</el-button
@@ -762,6 +762,18 @@ export default {
       }
     },
   },
+  computed:{
+    isSearch(){
+      return  this.searchForm.organIdList ||
+        this.searchForm.actualExercisesNumIsAchieve ||
+        this.searchForm.exercisesReplyNumIsAchieve ||
+        this.searchForm.exercisesMessageNumIsAchieve ||
+        this.searchForm.exercisesMessageTimelyNumIsAchieve ||
+        this.searchForm.existVipCourse||
+        this.searchForm.existPracticeCourse||
+        this.searchForm.workTimer?.length>0
+    }
+  }
 };
 </script>
 <style lang='scss' scoped>

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

@@ -332,6 +332,7 @@ export default {
             if (res.code == 200) {
               this.$message.success("补卡成功");
               this.getList();
+              this.$emit('syncTeacherAttend')
             } else {
               this.$message.error(res.msg);
             }

+ 54 - 28
src/views/teamDetail/teamCourseList.vue

@@ -195,25 +195,24 @@
         </el-form-item> -->
 
         <el-form-item>
-             <el-button
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="showMove = true"
-          >更多选项</el-button
-        >
+          <el-button
+            :type="isSearch ? 'primary' : 'info'"
+            icon="el-icon-circle-plus-outline"
+            @click="showMove = true"
+            >更多选项</el-button
+          >
         </el-form-item>
         <el-form-item>
-               <el-button native-type="submit" type="primary">搜索</el-button>
-        <el-button native-type="reset" type="danger">重置</el-button>
+          <el-button native-type="submit" type="primary">搜索</el-button>
+          <el-button native-type="reset" type="danger">重置</el-button>
 
-        <el-button
-          v-permission="'export/superFindCourseSchedules'"
-          @click="onCourseExport"
-          type="primary"
-          >导出课表</el-button
-        >
+          <el-button
+            v-permission="'export/superFindCourseSchedules'"
+            @click="onCourseExport"
+            type="primary"
+            >导出课表</el-button
+          >
         </el-form-item>
-
       </save-form>
       <!-- 列表 -->
       <div class="tableWrap">
@@ -588,6 +587,7 @@
               :courseScheduleId="maskForm.id"
               :teachMode="maskForm.teachMode"
               :courseStatus="maskForm.status"
+              @syncTeacherAttend="syncTeacherAttend"
             ></teacherList>
           </div>
         </el-tab-pane>
@@ -656,7 +656,7 @@
       >
         <el-form-item label="课程组编号/名称" prop="search">
           <el-input
-          style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.search"
             clearable
             placeholder="课程组编号/课程名称"
@@ -664,7 +664,7 @@
         </el-form-item>
         <el-form-item label="教学点" prop="schoolId">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.schoolId"
             clearable
             filterable
@@ -680,7 +680,7 @@
         </el-form-item>
         <el-form-item label="分部" prop="organIdList">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             class="multiple"
             v-model.trim="searchForm.organIdList"
             filterable
@@ -697,7 +697,7 @@
         </el-form-item>
         <el-form-item label="课程组类型" prop="groupType">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.groupType"
             clearable
             filterable
@@ -713,7 +713,7 @@
         </el-form-item>
         <el-form-item label="教学模式" prop="teachMode">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.teachMode"
             clearable
             filterable
@@ -738,7 +738,7 @@
         </el-form-item> -->
         <el-form-item label="合并课类型" prop="mergeCourseType">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.mergeCourseType"
             clearable
             filterable
@@ -754,7 +754,7 @@
         </el-form-item>
         <el-form-item label="老师类型" prop="teachType">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.teachType"
             clearable
             filterable
@@ -770,7 +770,7 @@
         </el-form-item>
         <el-form-item label="是否点名" prop="isCallNames">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.isCallNames"
             clearable
             filterable
@@ -919,6 +919,19 @@ export default {
     mergeCourseTypeOptions() {
       return objectToOptions(mergeCourseType);
     },
+    isSearch() {
+      return (
+        this.searchForm.search ||
+        this.searchForm.schoolId ||
+        this.searchForm.organIdList ||
+        this.searchForm.groupType ||
+        this.searchForm.teachMode ||
+        this.searchForm.mergeCourseType||
+        this.searchForm.teachType||
+        this.searchForm.isCallNames||
+        this.searchForm.creatTimer?.length>0
+      );
+    },
   },
   mounted() {
     const { query } = this.$route;
@@ -1172,6 +1185,19 @@ export default {
         }
       );
     },
+    syncTeacherAttend() {
+      if (this.maskForm.id) {
+        getTeacherPersonalAttendanceDetail({
+          courseScheduleId: this.maskForm.id,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.maskForm = { ...this.maskForm, ...res.data };
+            this.isMainGo = this.$refs.filterSearch?.show;
+          }
+        });
+      }
+    },
+
     handleClick(tab, event) {
       // console.log(tab, event);
     },
@@ -1201,13 +1227,13 @@ export default {
         })
         .catch(() => {});
     },
-    cancleMore(){
+    cancleMore() {
       // this.$refs.searchForm2.resetFields()
-      this.showMove = false
+      this.showMove = false;
     },
-    okMore(){
-      this.getList()
-      this.showMove = false
+    okMore() {
+      this.getList();
+      this.showMove = false;
     },
     // addCompound(row) {
     //   this.compoundList.push(row);

+ 2 - 2
vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 开发环境
-let target = 'https://test.dayaedu.com' //测试环境
+let target = 'http://dev.dayaedu.com' // 开发环境
+// let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {