Jelajahi Sumber

add:新需求

Tang 3 tahun lalu
induk
melakukan
545235c64c

+ 2 - 2
src/utils/request.js

@@ -7,8 +7,8 @@ import methods from '@/utils/methodsTool';
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
-export const baseURL = process.env.VUE_APP_BASE_API
-// export const baseURL = 'http://192.168.1.24:5030/'
+// export const baseURL = process.env.VUE_APP_BASE_API
+export const baseURL = 'http://192.168.1.24:5030/'
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分

+ 1 - 1
src/views/education/classManageMent/classList/index.vue

@@ -254,7 +254,7 @@ export default {
         this.formData.hasInterface = this.$route.params.hasInterface;
       }
     } else {
-      await this.moRenBus();
+      // await this.moRenBus();
     }
     if (this.$route.params.timeType >= 0) {
       this.$set(

+ 106 - 15
src/views/education/classManageMent/studentMenu/index.vue

@@ -83,6 +83,34 @@
           @click="moreActive(2)"
           >选班</el-button
         >
+        <el-input
+          clearable
+          style="width: 230px"
+          v-model="formData.companyName"
+          placeholder="所在公司"
+        ><el-button @click="search(3)" slot="append" icon="el-icon-search"></el-button></el-input>
+        <el-select
+          clearable
+          @change="search(3)"
+          v-model="formData.hasBindWx"
+          placeholder="是否绑定微信"
+          style="margin: 0px 10px"
+          size="medium"
+        >
+          <el-option label="是" :value="1"> </el-option>
+          <el-option label="否" :value="0"> </el-option>
+        </el-select>
+        <el-select
+          clearable
+          @change="search(3)"
+          v-model="formData.hasFollowWx"
+          placeholder="是否关注公众号"
+          style="margin: 0px 10px"
+          size="medium"
+        >
+          <el-option label="是" :value="1"> </el-option>
+          <el-option label="否" :value="0"> </el-option>
+        </el-select>
       </template>
       <template slot="btn" slot-scope="props">
         <el-button type="text" @click="addClick(props.scope.row, 2)"
@@ -637,39 +665,77 @@ export default {
         {
           label: "资料变更状态",
           prop: "userStatus",
-          hidden: true,
+          hidden: false,
           scope: "changeCLS",
         },
         {
-          label: "学时",
+          label: "是否绑定小程序账号",
+          prop: "userBindWx",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "是",
+              value: 1,
+            },
+            {
+              label: "否",
+              value: 0,
+            },
+          ],
+        },
+        {
+          label: "是否关注公众号",
+          prop: "userFollowWx",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "是",
+              value: 1,
+            },
+            {
+              label: "否",
+              value: 0,
+            },
+          ],
+        },
+        {
+          label: "课程学时",
           prop: "classHours",
-          hidden: false,
+          hidden: true,
+        },
+        {
+          label: "用户学习时长(秒)",
+          prop: "userStudyDuration",
+          hidden: true,
+          scope: "convert",
         },
         {
           label: "视频学习进度(节)",
           prop1: "stuAllNum",
           prop2: "secAllNum",
-          hidden: false,
+          hidden: true,
           scope: "computer",
         },
         {
           label: "做题进度(章卷)",
           prop1: "recordNum",
           prop2: "examNum",
-          hidden: false,
+          hidden: true,
           scope: "computer",
         },
         {
           label: "学时审批状态",
           prop: "periodStatus",
-          hidden: true,
+          hidden: false,
           scope: "statusPeriods",
         },
         {
           label: "学习服务期",
           prop1: "serviceStartTime",
           prop2: "serviceEndTime",
-          hidden: false,
+          hidden: true,
           Diszing: true,
           scope: "TimeLists",
         },
@@ -677,20 +743,20 @@ export default {
           label: "班级有效期",
           prop1: "classStartTime",
           prop2: "classEndTime",
-          hidden: true,
+          hidden: false,
           Diszing: false,
           scope: "TimeLists",
         },
         {
           label: "学完状态",
           prop: "finishStatus",
-          hidden: true,
+          hidden: false,
           scope: "finishStatus",
         },
         {
           label: "剩余学习机会",
           prop: "studyCount",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "复购-学时冲突",
@@ -983,12 +1049,37 @@ export default {
       } else {
         if (int === 2) {
           //学员详情
-          this.$api
-            .inquiregradestudentlistStudent({ userId: v.userId })
-            .then((res) => {
-              this.listData = res.rows[0];
-              this.dialogVisibleStudent = true;
+          // this.$api
+          //   .inquiregradestudentlistStudent({ userId: v.userId })
+          //   .then((res) => {
+          //     this.listData = res.rows[0];
+          //     this.dialogVisibleStudent = true;
+          //   });
+          const jump = () => {
+            //学员详情
+            this.$router.push({
+              name: "StudentXQ",
+              query: {
+                id: v.userId,
+              },
             });
+          };
+          const statusPage = this.$store.state.tagsView.visitedViews.some(
+            (item) => {
+              return item.name == "StudentXQ";
+            }
+          );
+          if (statusPage) {
+            this.$store
+              .dispatch("tagsView/delCachedView", {
+                name: "StudentXQ",
+              })
+              .then((res) => {
+                jump();
+              });
+          } else {
+            jump();
+          }
         }
         if (int === 3) {
           // 学员管理

+ 32 - 0
src/views/education/studentManageMent/studentList/index.vue

@@ -142,6 +142,38 @@ export default {
           prop: "telphone",
           hidden: true,
         },
+        {
+          label: "是否绑定小程序账号",
+          prop: "userBindWx",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "是",
+              value: 1,
+            },
+            {
+              label: "否",
+              value: 0,
+            },
+          ],
+        },
+        {
+          label: "是否关注公众号",
+          prop: "userFollowWx",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "是",
+              value: 1,
+            },
+            {
+              label: "否",
+              value: 0,
+            },
+          ],
+        },
         {
           label: "所在公司",
           prop: "companyName",