Merge branch 'master' into houxq

src/components/CommonHeader/index.vue

@@ -148,7 +148,7 @@ if(currentRootRoute !== 'message') {
 <template>
   <header class="header">
     <div class="main">
-      <h3 class="logo" @click="toHome">桐乡艺校</h3>
+      <h3 class="logo" @click="toHome">桐艺云校</h3>
       <ul class="nav-list">
         <li v-for="item in navList" :class="{'selected':currentRootRoute===item.name}"
             @click="handleSwitchRoute(item.name)">

src/pages/home/index.vue

@@ -1,8 +1,7 @@
 <template>
-  <common-header/>
+  <common-header />
   <div class="banner-box pr">
-    <div class="banner"
-         :style="{'background': 'url('+curMenu.img+') top no-repeat','background-size': 'cover'}"></div>
+    <div class="banner" :style="{'background': 'url('+curMenu.img+') top no-repeat','background-size': 'cover'}"></div>
     <div class="right-menu">
       <ul>
         <li v-for="item in menuList" :class="item.id == curMenu.id?'selected':''" @mouseover="switchImg(item)">
@@ -18,28 +17,25 @@
         <div class="">
           <div class="d-flex flex-between flex-v-mid">
             <h3 class="font-size-26 text-white">学生优秀作业</h3>
-            <div>
-              <span class="d-in-block v-mid arrow prev"></span>
-              <span class="ml10 d-in-block v-mid arrow next"></span>
-            </div>
+            <!-- <div>
+              <span class="d-in-block v-mid arrow prev" style="cursor: pointer;" @click="handlePrev(1)"></span>
+              <span class="ml10 d-in-block v-mid arrow next" style="cursor: pointer;" @click="handleNext(1)"></span>
+            </div> -->
           </div>
           <ul class="mt10 course-list">
-            <li v-for="item in xsyxzy">
+            <li v-for="item in xsyxzy" :key="item.yz_id">
               <div class="course-img pr">
-                <img :src="item.img" alt="">
+                <img :src="getFullUrl(item.yz_img)" alt="">
                 <div class="tag-info text-center">
                   <span class="tag-icon prove d-in-block v-mid"></span>
-                  <span class="d-in-block v-mid font-size-13 text-white">{{ item.prove }}</span>
+                  <span class="d-in-block v-mid font-size-13 text-white">{{ item.yz_like_num }}</span>
                   <span class="ml10 tag-icon favor d-in-block v-mid"></span>
-                  <span class="d-in-block v-mid font-size-13 text-white">{{ item.favor }}</span>
+                  <span class="d-in-block v-mid font-size-13 text-white">{{ item.yz_fav_num }}</span>
                 </div>
               </div>
               <div class="course-info">
-                <h3 class="font-size-16 text-overflow">{{ item.title }}</h3>
-                <el-rate
-                    v-model="item.rate"
-                    disabled
-                />
+                <h3 class="font-size-16 text-overflow">{{ item.yz_name }}</h3>
+                <el-rate disabled-void-color="#fff" v-model="item.yz_star_num" disabled />
               </div>
             </li>
           </ul>
@@ -47,28 +43,25 @@
         <div class="">
           <div class="d-flex flex-between">
             <h3 class="font-size-26 text-white">教师优秀作品</h3>
-            <div>
-              <span class="d-in-block v-mid arrow prev"></span>
-              <span class="ml10 d-in-block v-mid arrow next"></span>
-            </div>
+            <!-- <div>
+              <span class="d-in-block v-mid arrow prev" style="cursor: pointer;" @click="handlePrev(2)"></span>
+              <span class="ml10 d-in-block v-mid arrow next" style="cursor: pointer;" @click="handleNext(2)"></span>
+            </div> -->
           </div>
           <ul class="mt10 course-list">
-            <li v-for="item in jsxyzp">
+            <li v-for="item in jsxyzp" :key="item.yz_id">
               <div class="course-img pr">
-                <img :src="item.img" alt="">
+                <img :src="getFullUrl(item.yz_img)" alt="">
                 <div class="tag-info text-center">
                   <span class="tag-icon prove d-in-block v-mid"></span>
-                  <span class="d-in-block v-mid font-size-13 text-white">{{ item.prove }}</span>
+                  <span class="d-in-block v-mid font-size-13 text-white">{{ item.yz_like_num }}</span>
                   <span class="ml10 tag-icon favor d-in-block v-mid"></span>
-                  <span class="d-in-block v-mid font-size-13 text-white">{{ item.favor }}</span>
+                  <span class="d-in-block v-mid font-size-13 text-white">{{ item.yz_fav_num }}</span>
                 </div>
               </div>
               <div class="course-info">
-                <h3 class="font-size-16 text-overflow">{{ item.title }}</h3>
-                <el-rate
-                    v-model="item.rate"
-                    disabled
-                />
+                <h3 class="font-size-16 text-overflow">{{ item.yz_name }}</h3>
+                <el-rate v-model="item.yz_star_num" disabled disabled-void-color="#fff" />
               </div>
             </li>
           </ul>
@@ -123,26 +116,21 @@
       </div>
       <h3 class="title m-65">直播课程</h3>
       <div class="mt45 d-flex live-list">
-        <a href="javascript:;" class="pt65 pl85" @click="toLive(1)">
-          <h3 class="font-size-30 text-white font-bold-1">双师一生</h3>
-          <h4 class="mt40 font-size-16 text-white">轻松便捷的快速构建教学</h4>
-          <h4 class="mt15 font-size-16 text-white">超强的抗弱网能力，优秀的网络自适应策略保证优质观看效果</h4>
-          <h4 class="mt15 font-size-16 text-white">满足大规模教师、学生同时接入</h4>
-          <h5 class="mt80 pr80 font-size-16 lh20 text-white text-right">
-            <span class="d-in-block v-mid">查看课程</span>
-            <span class="ml3 d-in-block v-mid arrow-right"></span>
-          </h5>
-        </a>
-        <a href="javascript:;" @click="toLive(2)">
-          <div class="text-center">
-            <h3 class="font-size-30">网络直播</h3>
-            <h4 class="mt15 font-size-16 color-6">网络直播网络直播网络直播</h4>
-          </div>
-        </a>
-        <a href="javascript:;" @click="toLive(3)">
-          <div class="text-center">
-            <h3 class="font-size-30">专题直播</h3>
-            <h4 class="mt15 font-size-16 color-6">专题直播专题直播专题直播专题直播</h4>
+        <a v-for="(item, index) in liveData" :key="index" @click="toLive(index+1)" @mouseover="handleHover(index)">
+          <div class="list" :class="activeLive==index?'activeLive pt65 pl85':''" :style="{background: activeLive==index ? `url(${item.img}) center no-repeat` : `url(${item.bgImg}) center no-repeat`}">
+            <div v-if="activeLive==index">
+              <h3 class="font-size-30 text-white font-bold-1">{{item.name}}</h3>
+              <h4 class="mt40 font-size-16 text-white">{{item.pro1}}</h4>
+              <h4 class="mt15 font-size-16 text-white">{{item.pro2}}</h4>
+              <h4 class="mt15 font-size-16 text-white">{{item.pro3}}</h4>
+              <h5 class="mt80 pr80 font-size-16 lh20 text-white text-right">
+                <span class="d-in-block v-mid">查看课程</span>
+                <span class="ml3 d-in-block v-mid arrow-right"></span>
+              </h5>
+            </div>
+            <div v-else>
+              <h3 class="font-size-30">{{item.name}}</h3>
+            </div>
           </div>
         </a>
       </div>
@@ -188,11 +176,15 @@
     </div>
   </div>
 
-
-
 </template>
 <script>
 import CommonHeader from "@/components/CommonHeader/index.vue";
+import { getFullUrl } from '@/utils/helper';
+import img1 from "/images/home/live-1.png";
+import img2 from "/images/home/live2.png";
+import img3 from "/images/home/live3.png";
+import bgImg1 from "/images/home/live-2.png";
+import bgImg2 from "/images/home/live-3.png";
 export default {
   components: {
     CommonHeader
@@ -265,7 +257,7 @@ export default {
         favor: '14w+'
       }, {
         id: '4',
-        img:'/images/home/4.png',
+        img: '/images/home/4.png',
         title: '拇指姑娘',
         rate: 4,
         prove: '10w+',
@@ -292,7 +284,36 @@ export default {
         rate: 4,
         prove: '10w+',
         favor: '14w+'
-      }]
+      }],
+      xsPage: 1,
+      jsPage: 1,
+      liveData: [
+        {
+          name: "双师一生",
+          pro1: "轻松便捷的快速构建教学",
+          pro2: "超强的抗弱网能力，优秀的网络自适应策略保证优质观看效果",
+          pro3: "满足大规模教师、学生同时接入",
+          img: img1,
+          bgImg: bgImg1
+        },
+        {
+          name: "网络直播",
+          pro1: "支持音频/视频实景上课，音频、动作等实时传递，呈现真实课堂的教学环境",
+          pro2: "老师在线发布测验题，学生端进行答题检测，老师可查看测验结果，检查教室内学员是否认真听课",
+          pro3: "",
+          img: img2,
+          bgImg: bgImg1
+        },
+        {
+          name: "专题直播",
+          pro1: "支持云端录制和本地录制，生成直播录制视频及云端回放链接",
+          pro2: "完全重现直播时的场景，便于学习复习及教学内容再次传播",
+          pro3: "",
+          img: img3,
+          bgImg: bgImg2
+        }
+      ],
+      activeLive: 0
     }
 
   },
@@ -301,25 +322,96 @@ export default {
       this.curMenu = item;
     },
     toTeacher() {
-      this.$router.push({name:'resource'});
-      localStorage.setItem('curNav','resource');
+      this.$router.push({ name: 'resource' });
+      localStorage.setItem('curNav', 'resource');
     },
     toLive(type) {
       switch (type) {
         case 1:
-          this.$router.push({name:'ssys'});
-          localStorage.setItem('curNav','zbkt');
+          this.$router.push({ name: 'ssys' });
+          localStorage.setItem('curNav', 'zbkt');
           break;
         case 2:
-          this.$router.push({name:'wlzb'});
-          localStorage.setItem('curNav','zbkt');
+          this.$router.push({ name: 'wlzb' });
+          localStorage.setItem('curNav', 'zbkt');
           break;
         case 3:
-          this.$router.push({name:'ztzb'});
-          localStorage.setItem('curNav','zbkt');
+          this.$router.push({ name: 'ztzb' });
+          localStorage.setItem('curNav', 'zbkt');
           break;
       }
+    },
+    initXSData() {
+      request({
+        url: '/ysgc/zp/index',
+        data: {
+          yz_type: 1,
+          limit: 4,
+          page: this.xsPage
+        }
+      }).then(res => {
+        if (res.code == 1) {
+          this.xsyxzy = res.data.page_data;
+        }
+      })
+    },
+    initJSData() {
+      request({
+        url: '/ysgc/zp/index',
+        data: {
+          yz_type: 2,
+          limit: 3,
+          page: this.jsPage
+        }
+      }).then(res => {
+        if (res.code == 1) {
+          this.jsxyzp = res.data.page_data;
+        }
+      })
+    },
+    setActiveItem(i) {
+      if (this.$refs["carousel" + i][0]) {
+        // 手动切换幻灯片 setActiveItem(i)(Carousel Methods)
+        // 需要切换的幻灯片的索引，从 0 开始；或相应 el-carousel-item 的 name 属性值
+        // i 与 name 里面的值绑定 ，i 决定显示那个 name值的 el-carousel-item
+        this.$refs["carousel" + i][0].setActiveItem("name" + i)
+        // console.log(i)
+      }
+    },
+    handlePrev(type) {
+      if (type == 1) {
+        if (this.xsPage == 1) {
+          return false;
+        }
+        this.xsPage--;
+        this.initXSData();
+      } else if (type == 2) {
+        if (this.jsPage == 1) {
+          return false;
+        }
+        this.jsPage--;
+        this.initJSData();
+      }
+    },
+    handleNext(type) {
+      if (type == 1) {
+        this.xsPage++;
+        this.initXSData();
+      } else if (type == 2) {
+        this.jsPage++;
+        this.initJSData();
+      }
+    },
+    handleHover(index) {
+      this.activeLive = index;
+      if (index == 2) {
+        this.liveData[1].bgImg = bgImg2;
+      }
     }
+  },
+  created() {
+    this.initXSData();
+    this.initJSData();
   }
 }
 </script>
@@ -348,7 +440,12 @@ export default {
     z-index: 50;
     width: 100%;
     height: 100%;
-    background: radial-gradient(rgba(255, 255, 255, 0.00), rgba(160, 221, 255, 0.00), rgba(74, 190, 255, 0.54), rgba(0, 163, 255, 0.86));
+    background: radial-gradient(
+      rgba(255, 255, 255, 0),
+      rgba(160, 221, 255, 0),
+      rgba(74, 190, 255, 0.54),
+      rgba(0, 163, 255, 0.86)
+    );
   }
 
   .right-menu {
@@ -359,7 +456,11 @@ export default {
     margin-left: 505px;
     width: 318px;
     height: 560px;
-    background: linear-gradient(270deg, rgba(0, 163, 255, .41), rgba(0, 208, 255, 0.16));
+    background: linear-gradient(
+      270deg,
+      rgba(0, 163, 255, 0.41),
+      rgba(0, 208, 255, 0.16)
+    );
     display: flex;
     justify-content: right;
 
@@ -392,7 +493,11 @@ export default {
 .content-bg {
   width: 100%;
   height: 700px;
-  background: linear-gradient(0deg, rgba(255, 255, 255, 0.00) 0%, rgba(0, 163, 255, .86));
+  background: linear-gradient(
+    0deg,
+    rgba(255, 255, 255, 0) 0%,
+    rgba(0, 163, 255, 0.86)
+  );
 }
 
 .course-box {
@@ -442,6 +547,13 @@ export default {
       }
     }
 
+    ::v-deep .el-carousel__indicators--horizontal {
+      display: none;
+    }
+    ::v-deep .el-carousel__arrow {
+      display: none;
+    }
+
     .course-img {
       width: 100%;
       height: 131px;
@@ -459,7 +571,7 @@ export default {
         z-index: 30;
         width: 137px;
         height: 27px;
-        background: rgba(0, 0, 0, .59);
+        background: rgba(0, 0, 0, 0.59);
         border-radius: 0 10px 0 10px;
 
         .tag-icon {
@@ -532,31 +644,25 @@ export default {
   a {
     height: 391px;
 
-    &:first-child {
-      margin-top: -15px;
-      margin-right: -25px;
-      width: 885px;
-      height: 439px;
-      background: url("/images/home/live-1.png") center no-repeat;
-    }
-
-    &:nth-child(2) {
-      width: 301px;
-      background: url("/images/home/live-2.png") center no-repeat;
+    .list {
+      height: 100%;
+      width: 300px;
+      cursor: pointer;
       display: flex;
       align-items: center;
       justify-content: center;
+      transition: width linear 0.05s;
     }
 
-    &:nth-child(3) {
-      width: 301px;
-      background: url("/images/home/live-3.png") center no-repeat;
-      display: flex;
-      align-items: center;
-      justify-content: center;
+    .activeLive {
+      margin-top: -15px;
+      margin-right: -25px;
+      width: 885px;
+      height: 439px;
+      cursor: pointer;
+      display: block;
     }
   }
-
 }
 
 .wit-list {

src/pages/personal/components/MyCourse/kczy-create.vue

@@ -4,13 +4,11 @@
     <el-card>
       <div style="padding: 0 75px">
         <span class="title">课程资源</span>
-        <span class="subTitle"
-          >我的课程 - 我创建的 -
+        <span class="subTitle">我的课程 - 我创建的 -
           <span class="pointer" @click="goBack">课程资源</span> -
           <span style="color: #000">{{
             editId == "" ? "创建" : "编辑"
-          }}</span></span
-        >
+          }}</span></span>
       </div>
     </el-card>
 
@@ -19,58 +17,29 @@
         {{ editId == "" ? "创建" : "编辑" }}
       </div>
       <div class="formContent">
-        <el-form
-          :model="formline"
-          ref="formline"
-          :rules="rules"
-          size="large"
-          label-position="top"
-          class="demo-ruleForm"
-        >
+        <el-form :model="formline" ref="formline" :rules="rules" size="large" label-position="top" class="demo-ruleForm">
           <div class="must">
             <div class="label">课程封面图</div>
             <div class="uploadDiv">
               <div style="display: flex">
-                <el-upload
-                  class="mainUpload"
-                  action=""
-                  accept=".png, .jpg, .jpeg"
-                  :auto-upload="false"
-                  list-type="picture-card"
-                  :on-change="handleMainChange"
-                  :file-list="fileList"
-                >
-                  <el-icon
-                    size="38"
-                    color="#9d9ab9"
-                    v-if="fileList.length == 0"
-                  >
+                <el-upload class="mainUpload" action="" accept=".png, .jpg, .jpeg" :auto-upload="false" list-type="picture-card" :on-change="handleMainChange" :file-list="fileList">
+                  <el-icon size="38" color="#9d9ab9" v-if="fileList.length == 0">
                     <Picture />
                   </el-icon>
-                  <img
-                    v-else
-                    :src="fileList[0].url"
-                    alt=""
-                    style="width: 100%; height: 100%"
-                  />
+                  <img v-else :src="fileList[0].url" alt="" style="width: 100%; height: 100%" />
                 </el-upload>
-                <div
-                  style="font-size: 12px; margin-left: 20px; position: relative"
-                >
+                <div style="font-size: 12px; margin-left: 20px; position: relative">
                   <div style="color: #949494">
                     支持格式：jpg,png,jpeg（200kb以内） 建议尺寸600x320
                   </div>
-                  <div
-                    style="color: #f35421; position: absolute; bottom: 0"
-                    v-if="fileList.length == 0"
-                  >
+                  <div style="color: #f35421; position: absolute; bottom: 0" v-if="fileList.length == 0">
                     {{ mainTip }}
                   </div>
                 </div>
               </div>
             </div>
           </div>
-          <el-form-item label="创建人" prop="kk_zrjs">
+          <el-form-item label="责任教师" prop="kk_zrjs">
             <el-input v-model="formline.kk_zrjs" />
           </el-form-item>
           <el-form-item label="学校/机构名称" prop="kk_jgmc">
@@ -84,94 +53,47 @@
           </el-form-item>
           <div style="display: flex">
             <el-form-item style="flex: 1" label="年级" prop="grade_id">
-              <el-select
-                v-model="activeGrade"
-                placeholder=" "
-                size="large"
-                @change="initGrade"
-                value-key="grade_id"
-              >
-                <el-option
-                  v-for="item in gradeData"
-                  :key="item.grade_id"
-                  :label="item.grade_name"
-                  :value="item"
-                />
+              <el-select v-model="activeGrade" placeholder=" " size="large" @change="initGrade" value-key="grade_id">
+                <el-option v-for="item in gradeData" :key="item.grade_id" :label="item.grade_name" :value="item" />
               </el-select>
             </el-form-item>
-            <el-form-item
-              style="flex: 1; margin-left: 50px"
-              label="学科"
-              prop="subject_id"
-            >
-              <el-select
-                v-model="activeSubject"
-                placeholder=" "
-                size="large"
-                @change="initSubject"
-                value-key="subject_id"
-              >
-                <el-option
-                  v-for="item in subjectData"
-                  :key="item.subject_id"
-                  :label="item.subject_name"
-                  :value="item"
-                />
+            <el-form-item style="flex: 1; margin-left: 50px" label="学科" prop="subject_id">
+              <el-select v-model="activeSubject" placeholder=" " size="large" @change="initSubject" value-key="subject_id">
+                <el-option v-for="item in subjectData" :key="item.subject_id" :label="item.subject_name" :value="item" />
               </el-select>
             </el-form-item>
           </div>
           <el-form-item label="分类">
-            <el-cascader
-              :options="cateData"
-              placeholder=" "
-              :props="cateProps"
-              v-model="cateValue"
-              @change="initCate"
-            />
+            <el-cascader :options="cateData" placeholder=" " :props="cateProps" v-model="cateValue" @change="initCate" />
           </el-form-item>
           <div class="must">
             <div class="label">上传附件</div>
             <div class="uploadDiv" v-loading="attachLoading">
               <div style="position: relative">
-                <el-upload
-                  class="attachUpload"
-                  action=""
-                  accept=".xls, .xlsx"
-                  :auto-upload="false"
-                  drag
-                  :on-change="handleAttachChange"
-                  :file-list="attachList"
-                >
+                <el-upload class="attachUpload" action="" accept=".xls, .xlsx" :auto-upload="false" drag :on-change="handleAttachChange" :file-list="attachList">
                   <el-icon size="19" color="#9d9ab9">
                     <FolderOpened />
                   </el-icon>
                 </el-upload>
-                <div
-                  style="
+                <div style="
                     font-size: 12px;
                     position: absolute;
                     left: 85px;
                     top: 0;
-                  "
-                >
-                  <div
-                    style="
+                  ">
+                  <div style="
                       color: #949494;
                       position: absolute;
                       white-space: nowrap;
-                    "
-                  >
+                    ">
                     支持格式：xls,xlsx
                   </div>
-                  <div
-                    style="
+                  <div style="
                       color: #f35421;
                       position: absolute;
                       white-space: nowrap;
                       top: 50px;
-                    "
-                    v-if="attachList.length == 0"
-                  >
+                    " v-if="attachList.length == 0">
                     {{ attachTip }}
                   </div>
                 </div>
@@ -179,21 +101,11 @@
             </div>
           </div>
           <el-form-item v-if="editId == ''">
-            <el-checkbox
-              class="read"
-              v-model="isRead"
-              label="已阅读并同意《课程上传协议》"
-              size="large"
-            />
+            <el-checkbox class="read" v-model="isRead" label="已阅读并同意《课程上传协议》" size="large" />
           </el-form-item>
           <el-form-item>
             <div class="btnDiv">
-              <el-button
-                type="primary"
-                @click="submitForm('formline')"
-                :loading="commitLoading"
-                >提 交</el-button
-              >
+              <el-button type="primary" @click="submitForm('formline')" :loading="commitLoading">提 交</el-button>
               <el-button @click="goBack">关 闭</el-button>
             </div>
           </el-form-item>

src/pages/personal/components/MyCourse/ssys-create.vue

@@ -94,38 +94,51 @@
           </el-form-item>
 
           <el-form-item label="结对老师/组">
-            <div>
-              <el-input v-model="input1" size="large" placeholder=" " :suffix-icon="ArrowDownBold" />
-              <div class="jdlsDiv">
-                <div class="operate">
-                  <div class="searchValue">
-                    <input type="text" placeholder="搜索关键字" v-model="searchKey">
-                    <div class="searchBtn" @click="initTeacherData">
-                      <img src="/kczy/searchIcon.png" alt="">
-                    </div>
-                  </div>
-                  <div>
-                    <el-button @click="backTeacher">
-                      <el-icon>
-                        <Back />
-                      </el-icon>
-                    </el-button>
-                    <el-button @click="nextTeacher">
-                      <el-icon>
-                        <Right />
-                      </el-icon>
-                    </el-button>
+            <div class="showDiv">
+              <div class="flex" style="flex-wrap: wrap;">
+                <div class="flex" style="margin-right: 20px;align-items: center;padding: 8px 0;" v-for="(item, index) in activeTeacherData" :key="index">
+                  <div class="typeItem">{{item.user_realname}}</div>
+                  <el-icon color="#00A3FF" class="pointer" @click="handleRemoveTeacher(index)">
+                    <CircleClose />
+                  </el-icon>
+                </div>
+              </div>
+              <el-icon class="drop pointer" color="#a8abb2" :size="12" @click="showTeacher=!showTeacher">
+                <ArrowDownBold />
+              </el-icon>
+            </div>
+            <div class="jdlsDiv" v-show="showTeacher">
+              <div class="operate">
+                <div class="searchValue">
+                  <input type="text" placeholder="搜索关键字" v-model="searchKey">
+                  <div class="searchBtn" @click="initTeacherData(false)">
+                    <img src="/kczy/searchIcon.png" alt="">
                   </div>
                 </div>
-                <el-checkbox-group v-model="activeTeacher">
-                  <el-checkbox v-for="(item, index) in teacherData" :key="index" :label="item.user_id">{{item.user_realname}}</el-checkbox>
+                <div>
+                  <el-button @click="backTeacher">
+                    <el-icon>
+                      <Back />
+                    </el-icon>
+                  </el-button>
+                  <el-button @click="nextTeacher">
+                    <el-icon>
+                      <Right />
+                    </el-icon>
+                  </el-button>
+                </div>
+              </div>
+              <div v-if="teacherData.length!=0">
+                <el-checkbox-group v-model="activeTeacher" @change="initActiveTeacher">
+                  <el-checkbox v-for="(item, index) in teacherData" :key="index" :label="JSON.stringify(item)">{{item.user_realname}}</el-checkbox>
                 </el-checkbox-group>
               </div>
+              <el-empty v-if="teacherData.length==0" image-size="100" description="无数据" style="padding: 10px 0;" />
             </div>
           </el-form-item>
           <el-form-item label="结对班级">
-            <el-select v-model="formline.class_id" placeholder=" " size="large">
-              <el-option v-for="item in classData" :key="item.class_id" :label="item.class_name" :value="item.class_id" />
+            <el-select v-model="activeClass" placeholder=" " multiple size="large" value-key="class_id" @change="initActiveClass">
+              <el-option v-for="item in classData" :key="item.class_id" :label="item.class_name" :value="item" />
             </el-select>
           </el-form-item>
 
@@ -174,7 +187,7 @@
 <script>
 import { grade_list, subject_list, ssyskc_list, upload_file, ssyskc_add, ssyskc_edit, ssyskc_detail } from "./api";
 
-import { Picture, FolderOpened, ArrowDownBold, Back, Right } from "@element-plus/icons-vue";
+import { Picture, FolderOpened, ArrowDownBold, CircleClose, Back, Right } from "@element-plus/icons-vue";
 import { ElConfigProvider } from 'element-plus'
 import zhcn from 'element-plus/lib/locale/lang/zh-cn'
 import { getFullUrl } from '@/utils/helper';
@@ -197,7 +210,8 @@ export default {
         subject_id: "",
         subject_name: "",
         yys_id: "",
-        class_id: "",
+        ks_jdjs_json: "",
+        ks_jdbj_json: "",
         ks_sfsjdtjkc: "",
         ks_sfjp: "",
         ks_sfxysh: "",
@@ -234,11 +248,15 @@ export default {
       subjectData: ["美术", "音乐", "舞蹈"],
       workData: [],
       linkWork: [],
+      showTeacher: true,
       teacherData: [],
+      activeTeacher: [],
+      activeTeacherData: [],
       searchKey: "",
       currentPage: 1,
-      activeTeacher: [],
+      totalPage: 0,
       classData: [],
+      activeClass: [],
       sfsjdtjkcData: [],
       sfjpData: [],
       sfxyshData: [],
@@ -264,7 +282,7 @@ export default {
       commitLoading: false,
     }
   },
-  components: { Picture, FolderOpened, ElConfigProvider, ArrowDownBold, Back, Right },
+  components: { Picture, FolderOpened, ElConfigProvider, ArrowDownBold, CircleClose, Back, Right },
   methods: {
     goBack() {
       this.$router.go(-1);
@@ -311,6 +329,10 @@ export default {
             this.linkWork = this.formline.yys_id.split(",");
           }
 
+          this.activeClass = JSON.parse(this.formline.ks_jdbj_json);
+          this.activeTeacherData = JSON.parse(this.formline.ks_jdjs_json);
+          this.activeTeacher = this.activeTeacherData.map(item => JSON.stringify(item));
+
           this.loading = false;
         }
       });
@@ -377,29 +399,55 @@ export default {
       })
     },
     backTeacher() {
+      if (this.currentPage == 1) {
+        return false;
+      }
       this.currentPage--;
       this.initTeacherData();
     },
     nextTeacher() {
+      if (this.currentPage == this.totalPage) {
+        return false;
+      }
       this.currentPage++;
       this.initTeacherData();
     },
     // 老师
-    initTeacherData() {
+    initTeacherData(flag = true) {
+      if (!flag) {
+        this.currentPage = 1;
+      }
       request({
         url: '/user/main/index',
         data: {
           user_role_id: "75",
-          user_name: this.searchKey,
+          user_realname: this.searchKey,
           page: this.currentPage,
           limit: 20
         }
       }).then(res => {
         if (res.code == 1) {
-          this.teacherData = res.data.page_data;
+          this.teacherData = [];
+          res.data.page_data.map((item) => {
+            let obj = {
+              user_id: item.user_id,
+              user_realname: item.user_realname
+            }
+            this.teacherData.push(obj);
+          })
+          this.totalPage = res.data.total_page;
         }
       })
     },
+    handleRemoveTeacher(index) {
+      this.activeTeacherData.splice(index, 1);
+      this.activeTeacher.splice(index, 1);
+      this.formline.ks_jdjs_json = JSON.stringify(this.activeTeacherData);
+    },
+    initActiveTeacher(value) {
+      this.activeTeacherData = value.map(item => JSON.parse(item));
+      this.formline.ks_jdjs_json = JSON.stringify(this.activeTeacherData);
+    },
     // 班级
     initClassData() {
       request({
@@ -411,6 +459,17 @@ export default {
         }
       })
     },
+    initActiveClass(value) {
+      let data = [];
+      value.map((item) => {
+        let obj = {
+          class_id: item.class_id,
+          class_name: item.class_name
+        }
+        data.push(obj);
+      })
+      this.formline.ks_jdbj_json = JSON.stringify(data);
+    },
     // 封面图
     handleMainChange(file) {
       let fileType = file.name.substring(file.name.lastIndexOf(".") + 1);
@@ -628,10 +687,33 @@ export default {
         }
       }
     }
+    .showDiv {
+      position: relative;
+      width: 100%;
+      min-height: 44px;
+      background: #f9f9f9;
+      border-radius: 6px;
+      padding: 0 30px 0 15px;
+      .el-icon.drop {
+        position: absolute;
+        right: 15px;
+        top: 15px;
+      }
+      .typeItem {
+        background: #00a3ff;
+        color: #fff;
+        font-size: 13px;
+        padding: 3px 8px;
+        border-radius: 6px;
+        line-height: 22px;
+        margin-right: 8px;
+      }
+    }
     .jdlsDiv {
       border: 1px solid #e4e6e8;
       border-radius: 6px;
       padding: 10px 12px;
+      width: 100%;
       .operate {
         display: flex;
         justify-content: space-between;

src/pages/personal/components/main/setting.vue

@@ -5,7 +5,7 @@
       <div class="main" v-loading="loading">
         <div class="header">
           <div class="title">基础信息</div>
-          <div class="pwd">修改密码</div>
+          <div class="pwd" @click="modifyPwd">修改密码</div>
         </div>
         <div class="formContent" v-loading="loading">
           <el-form :model="formline" ref="formline" :rules="rules" size="large" label-position="top" class="demo-ruleForm">
@@ -236,6 +236,9 @@ export default {
           }
         }
       });
+    },
+    modifyPwd() {
+      this.$router.push(({ name: "personal_components_sz_modifyPwd" }));
     }
   },
   created() {
@@ -286,6 +289,7 @@ export default {
     text-decoration: underline;
     text-align: center;
     color: #00a3ff;
+    cursor: pointer;
   }
 }
 .formContent {

src/pages/personal/index.vue

@@ -13,12 +13,12 @@
         <ordinary-teacher v-if="!isFamous" :userInfo="userInfo" :proData="proData" />
 
         <div class="menuDiv" v-if="!isStudent">
-          <div class="list pointer font-size-16" :class="activeMenu == item.url ? 'active' : ''" v-for="item in menuData" :key="item.name" @click="goToPage(item.url)">
+          <div class="list pointer font-size-16" :class="activeMenu == item.url ? 'active' : ''" v-for="item in menuData" :key="item.name" @click="goToPage(item.url, item.type)">
             {{ item.name }}
           </div>
         </div>
         <div class="menuDiv" v-if="isStudent">
-          <div class="list pointer font-size-16" :class="activeMenu == item.url ? 'active' : ''" v-for="item in menuData1" :key="item.name" @click="goToPage(item.url)">
+          <div class="list pointer font-size-16" :class="activeMenu == item.url ? 'active' : ''" v-for="item in menuData1" :key="item.name" @click="goToPage(item.url, item.type)">
             {{ item.name }}
           </div>
         </div>
@@ -91,10 +91,10 @@ export default {
           name: "我参与的组",
           url: "participate",
         },
-        {
-          name: "赞与收藏",
-          url: "collection",
-        },
+        // {
+        //   name: "赞与收藏",
+        //   url: "collection",
+        // },
         {
           name: "我关注的人",
           url: "attention",
@@ -115,6 +115,15 @@ export default {
           name: "申请成为名师",
           url: "masterTeacher",
         },
+        {
+          name: "约课",
+          url: "personal_yk",
+        },
+        {
+          name: "同步课堂",
+          url: "http://www.txhlwxx.com/index.php?mod=txwx&action=hdhy&do=index&api=html",
+          type: 1
+        },
       ],
       menuData1: [
         {
@@ -138,9 +147,13 @@ export default {
     };
   },
   methods: {
-    goToPage(url) {
-      this.activeMenu = url;
-      this.$router.push({ name: url });
+    goToPage(url, type) {
+      if (type == 1) {
+        window.open(url);
+      } else {
+        this.activeMenu = url;
+        this.$router.push({ name: url });
+      }
     },
     initUserInfo() {
       user_info().then((res) => {
@@ -160,12 +173,6 @@ export default {
               }
             }
           });
-          if (!this.isFamous) {
-            this.menuData.push({
-              name: "约课",
-              url: "personal_yk",
-            });
-          }
           this.loading = false;
         }
       });
@@ -194,7 +201,7 @@ export default {
       display: flex;
       margin-bottom: -10px;
       .list {
-        margin: 0 30px;
+        margin: 0 20px;
         color: #949494;
         position: relative;
         line-height: 40px;

src/pages/szmsg/tzkc/detail/index.vue

@@ -1,11 +1,11 @@
 <script setup>
 import bannerImg from '~/assets/szmsg_tskc/banner.png';
 import { timestamp2string } from '~/utils/string';
-const props = defineProps({
+let props = defineProps({
   id: String
 })
 
-const szmsg_school_notice = $ref([])
+let szmsg_school_notice = $ref([])
 request({
   url: '/szmsg/school_notice/index',
   data: {
@@ -18,7 +18,7 @@ request({
 })
 
 
-const queryForm = reactive({
+let queryForm = reactive({
   grade_id: undefined,
   subject_id: undefined,
   limit: 6,
@@ -32,8 +32,8 @@ watch(
   }
 )
 
-const nj = $ref([])
-const km = $ref([])
+let nj = $ref([])
+let km = $ref([])
 
 function queryParams() {
   return Promise.all([
@@ -95,7 +95,7 @@ function queryYxzp() {
   })
 }
 
-const loading = $ref(true)
+let loading = $ref(true)
 
 Promise.all([queryData(), queryParams(), queryYxzp()]).then(() => {
   loading = false

src/pages/zbkt/wlzb/detail.vue

@@ -21,228 +21,228 @@ let toolLink = ref("");
 
 var player = "";
 
-function videoPlay(data, isLive) {
-  // debugger
-  // console.log(data.live_src.student.high.rts);
-  // console.log(videoURL.value.high);
-  // 初始化播放器 开始
-  player = new Aliplayer(
-    {
-      id: "player-con",
-      source: data.live_src.student.high.rts,
-      width: "100%",
-      height: "100%",
-      autoplay: true,
-      isLive: isLive == 3 ? true : false,
-      cover: data.img, //修改 直播封面
-      rePlay: false,
-      playsinline: true,
-      preload: true,
-      controlBarVisibility: "hover",
-      showBarTime: 5000,
-      useH5Prism: true,
-      skinLayout: [
-        {
-          name: "bigPlayButton",
-          align: "blabs",
-          x: 30,
-          y: 80,
-        },
-        {
-          name: "errorDisplay",
-          align: "tlabs",
-          x: 0,
-          y: 0,
-        },
-        {
-          name: "infoDisplay",
-        },
-        {
-          name: "controlBar",
-          align: "blabs",
-          x: 0,
-          y: 0,
-          children: [
-            {
-              name: "liveDisplay",
-              align: "tlabs",
-              x: 15,
-              y: 6,
-            },
-            {
-              name: "fullScreenButton",
-              align: "tr",
-              x: 10,
-              y: 10,
-            },
-            {
-              name: "subtitle",
-              align: "tr",
-              x: 15,
-              y: 12,
-            },
-            {
-              name: "setting",
-              align: "tr",
-              x: 15,
-              y: 12,
-            },
-            {
-              name: "volume",
-              align: "tr",
-              x: 5,
-              y: 10,
-            },
-            {
-              name: "snapshot",
-              align: "tr",
-              x: 10,
-              y: 12,
-            },
-          ],
-        },
-      ],
-    },
-    (player) => {
-      player.on("error", (e) => {
-        if (player != "") {
-          player.dispose(); //销毁
-        }
-        liveState.value = 5;
-        let cur_time = Date.parse(new Date()) / 1000;
-        if (cur_time + 300 > data.starttime && cur_time < data.endtime) {
-          let liveSRC = data.live_src.student;
-          videoURL.value = {
-            high: liveSRC.high.rts,
-            middle: liveSRC.medium.rts,
-            low: liveSRC.low.rts,
-            hls: liveSRC.high.hls,
-          };
-          console.log(videoURL.value.high);
-          req.open("GET", videoURL.value.hls, false);
-          req.send(null);
-          if (req.status == 200) {
-            liveState.value = 3;
-            videoPlay(data, liveState.value);
-            clearInterval(time_live);
-          } else {
-            time_live = setInterval(() => {
-              req.open("GET", videoURL.value.hls, false);
-              req.send(null);
-              if (req.status == 200) {
-                liveState.value = 3;
-                videoPlay(data, liveState.value);
-                clearInterval(time_live);
-              }
-            }, 30000);
+  function videoPlay(data, isLive) {
+    // debugger
+    // console.log(data.live_src.student.high.rts);
+    // console.log(videoURL.value.high);
+    // 初始化播放器 开始
+    player = new Aliplayer(
+      {
+        id: "player-con",
+        source: data.live_src.student.high.rts,
+        width: "100%",
+        height: "100%",
+        autoplay: true,
+        isLive: isLive == 3 ? true : false,
+        cover: data.img, //修改 直播封面
+        rePlay: false,
+        playsinline: true,
+        preload: true,
+        controlBarVisibility: "hover",
+        showBarTime: 5000,
+        useH5Prism: true,
+        skinLayout: [
+          {
+            name: "bigPlayButton",
+            align: "blabs",
+            x: 30,
+            y: 80,
+          },
+          {
+            name: "errorDisplay",
+            align: "tlabs",
+            x: 0,
+            y: 0,
+          },
+          {
+            name: "infoDisplay",
+          },
+          {
+            name: "controlBar",
+            align: "blabs",
+            x: 0,
+            y: 0,
+            children: [
+              {
+                name: "liveDisplay",
+                align: "tlabs",
+                x: 15,
+                y: 6,
+              },
+              {
+                name: "fullScreenButton",
+                align: "tr",
+                x: 10,
+                y: 10,
+              },
+              {
+                name: "subtitle",
+                align: "tr",
+                x: 15,
+                y: 12,
+              },
+              {
+                name: "setting",
+                align: "tr",
+                x: 15,
+                y: 12,
+              },
+              {
+                name: "volume",
+                align: "tr",
+                x: 5,
+                y: 10,
+              },
+              {
+                name: "snapshot",
+                align: "tr",
+                x: 10,
+                y: 12,
+              },
+            ],
+          },
+        ],
+      },
+      (player) => {
+        player.on("error", (e) => {
+          if (player != "") {
+            player.dispose(); //销毁
           }
-        } else if (cur_time > data.endtime) {
-          liveState.value = 4;
-          // console.log(liveState.value);
-        }
-      });
-    }
-  );
-  /* h5截图按钮, 截图成功回调 */
-  player.on("snapshoted", function (data) {
-    var pictureData = data.paramData.base64;
-    var downloadElement = document.createElement("a");
-    downloadElement.setAttribute("href", pictureData);
-    var fileName = "Aliplayer" + Date.now() + ".png";
-    downloadElement.setAttribute("download", fileName);
-    downloadElement.click();
-    pictureData = null;
-  });
-}
-// 详情
-let dgData = {
-  // id: "10161",
-  site: 'tyyx',
-  id: route.params.id,
-};
-var req = new XMLHttpRequest();
-var time_live = "";
-let videoURL = ref({});
-let liveState = ref(null);
-var dgMsg = ref({});
-function getDgDetail() {
-  zbkt_dg(dgData)
-    .then((res) => {
-      dgMsg.value = res.data.one_info;
-      // 判断当前用户是否为主讲人
-      var locData = window.localStorage.getItem("userInfo");
-      var isWho = JSON.parse(locData).user_role_id;
-      var user_id = JSON.parse(locData).user_id; //老师的role_id
-      console.log(user_id);
-      // console.log(dgMsg.value);
-      if (isWho == "75" && user_id == dgMsg.value.master_user_id) {
-        isMaster.value = true;
-        toolLink.value =
-          "LiteLiveClass://push_screen://" +
-          dgMsg.value.live_src.teacher.desktop;
-        // console.log(toolLink);
-      }
-      // toolLink.value =
-      //   "LiteLiveClass://push_screen://" + dgMsg.value.live_src.teacher.desktop;
-      // 判断当前直播状态
-      if (dgMsg.value.live_src.video == "") {
-        let cur_time = Date.parse(new Date()) / 1000;
-        if (cur_time + dgMsg.value.ahead_min * 60 < dgMsg.value.starttime) {
-          liveState.value = 1;
-        } else if (
-          cur_time + 300 > dgMsg.value.starttime &&
-          cur_time < dgMsg.value.endtime
-        ) {
-          let liveSRC = dgMsg.value.live_src.student;
-          videoURL.value = {
-            high: liveSRC.high.rts,
-            middle: liveSRC.medium.rts,
-            low: liveSRC.low.rts,
-            hls: liveSRC.high.hls,
-          };
-          req.open("GET", videoURL.value.hls, false);
-          req.send(null);
-          // req.status
-          if (req.status == 200) {
-            liveState.value = 3;
-            videoPlay(dgMsg.value, liveState.value);
-            clearInterval(time_live);
-          } else {
-            liveState.value = 2;
-            time_live = setInterval(() => {
-              req.open("GET", videoURL.value.hls, false);
-              req.send(null);
-              if (req.status == 200) {
-                liveState.value = 3;
-                if (player != "") {
-                  player.dispose(); //销毁
-                }
-                setTimeout(() => {
-                  videoPlay(dgMsg.value, liveState.value);
+          liveState.value = 5;
+          let cur_time = Date.parse(new Date()) / 1000;
+          if (cur_time + 300 > data.starttime && cur_time < data.endtime) {
+            let liveSRC = data.live_src.student;
+            videoURL.value = {
+              high: liveSRC.high.rts,
+              middle: liveSRC.medium.rts,
+              low: liveSRC.low.rts,
+              hls: liveSRC.high.hls,
+            };
+            console.log(videoURL.value.high);
+            req.open("GET", videoURL.value.hls, false);
+            req.send(null);
+            if (req.status == 200) {
+              liveState.value = 3;
+              videoPlay(data, liveState.value);
+              clearInterval(time_live);
+            } else {
+              time_live = setInterval(() => {
+                req.open("GET", videoURL.value.hls, false);
+                req.send(null);
+                if (req.status == 200) {
+                  liveState.value = 3;
+                  videoPlay(data, liveState.value);
                   clearInterval(time_live);
-                }, 1000);
-              }
-            }, 30000);
-          }
-        } else if (cur_time > dgMsg.value.endtime) {
-          req.open("GET", videoURL.value.hls, false);
-          req.send(null);
-          if (req.status == 200) {
-            liveState.value = 3;
-            videoPlay(dgMsg.value, liveState.value);
-          } else {
+                }
+              }, 30000);
+            }
+          } else if (cur_time > data.endtime) {
             liveState.value = 4;
+            // console.log(liveState.value);
           }
-        }
-      } else {
-        videoPlay(dgMsg.value, dgMsg.value.status);
+        });
       }
-    })
-    .catch((err) => {
-      console.log(err);
-      alert("请刷新");
+    );
+    /* h5截图按钮, 截图成功回调 */
+    player.on("snapshoted", function (data) {
+      var pictureData = data.paramData.base64;
+      var downloadElement = document.createElement("a");
+      downloadElement.setAttribute("href", pictureData);
+      var fileName = "Aliplayer" + Date.now() + ".png";
+      downloadElement.setAttribute("download", fileName);
+      downloadElement.click();
+      pictureData = null;
     });
-}
+  }
+  // 详情
+  let dgData = {
+    // id: "10161",
+    site:'tyyx',
+    id:route.params.id,
+  };
+  var req = new XMLHttpRequest();
+  var time_live = "";
+  let videoURL = ref({});
+  let liveState = ref(null);
+  var dgMsg = ref({});
+  function getDgDetail() {
+    zbkt_dg(dgData)
+      .then((res) => {
+        dgMsg.value = res.data.one_info;
+        // 判断当前用户是否为主讲人
+        var locData = window.localStorage.getItem("userInfo");
+        var isWho = JSON.parse(locData).user_role_id;
+        var user_id = JSON.parse(locData).user_id; //老师的role_id
+        console.log(user_id);
+        // console.log(dgMsg.value);
+        if (isWho == "75" && user_id == dgMsg.value.master_user_id) {
+          isMaster.value = true;
+          toolLink.value =
+            "LiteLiveClass://push_screen://" +
+            dgMsg.value.live_src.teacher.desktop;
+          // console.log(toolLink);
+        }
+        // toolLink.value =
+        //   "LiteLiveClass://push_screen://" + dgMsg.value.live_src.teacher.desktop;
+        // 判断当前直播状态
+        if (dgMsg.value.live_src.video == "") {
+          let cur_time = Date.parse(new Date()) / 1000;
+          if (cur_time + dgMsg.value.ahead_min * 60 < dgMsg.value.starttime) {
+            liveState.value = 1;
+          } else if (
+            cur_time + 300 > dgMsg.value.starttime &&
+            cur_time < dgMsg.value.endtime
+          ) {
+            let liveSRC = dgMsg.value.live_src.student;
+            videoURL.value = {
+              high: liveSRC.high.rts,
+              middle: liveSRC.medium.rts,
+              low: liveSRC.low.rts,
+              hls: liveSRC.high.hls,
+            };
+            req.open("GET", videoURL.value.hls, false);
+            req.send(null);
+            // req.status
+            if (req.status == 200) {
+              liveState.value = 3;
+              videoPlay(dgMsg.value, liveState.value);
+              clearInterval(time_live);
+            } else {
+              liveState.value = 2;
+              time_live = setInterval(() => {
+                req.open("GET", videoURL.value.hls, false);
+                req.send(null);
+                if (req.status == 200) {
+                  liveState.value = 3;
+                  if (player != "") {
+                    player.dispose(); //销毁
+                  }
+                  setTimeout(() => {
+                    videoPlay(dgMsg.value, liveState.value);
+                    clearInterval(time_live);
+                  }, 1000);
+                }
+              }, 30000);
+            }
+          } else if (cur_time > dgMsg.value.endtime) {
+            req.open("GET", videoURL.value.hls, false);
+            req.send(null);
+            if (req.status == 200) {
+              liveState.value = 3;
+              videoPlay(dgMsg.value, liveState.value);
+            } else {
+              liveState.value = 4;
+            }
+          }
+        } else {
+          videoPlay(dgMsg.value, dgMsg.value.status);
+        }
+      })
+      .catch((err) => {
+        console.log(err);
+        alert("请刷新");
+      });
+  }
 
 //判断是老师登录还是学生(76)
 // function isWhoLogin() {
@@ -368,25 +368,25 @@ let isStudent = $ref(false);
 function initUserInfo() {
   let userInfo = localStorage.getItem("userInfo");
   let userData = JSON.parse(userInfo);
-  isStudent = userData.user_role_id == 75 ? false : true;
+  isStudent = userData.user_role_id < 76 ? false : true;
 }
 
-function command(j) {
-  if (j.is_xf == 2) {
-    request({
-      url: '/yzy/zy_zbkc/xiafa',
-      data: {
-        kzk_id: dgMsg.value.id,
-        yzz_id: j.yzz_id
-      }
-    }).then(res => {
-      if (res.code == 1) {
-        ElMessage.success("下达成功!");
-        j.is_xf = 1;
-      }
-    })
+  function command(j) {
+    if(j.is_xf == 2) {
+      request({
+        url: '/yzy/zy_zbkc/xiafa',
+        data: {
+          kzk_id: dgMsg.value.id,
+          yzz_id: j.yzz_id
+        }
+      }).then(res => {
+        if (res.code == 1) {
+          ElMessage.success("下达成功!");
+          j.is_xf = 1;
+        }
+      })
+    }
   }
-}
 
 
 let dialogVisible = $ref(false);
@@ -439,8 +439,9 @@ function commitData() {
   }).then(res => {
     if (res.code == 1) {
       ElMessage.success("提交成功!");
-      currentRow.value.answerd = 1;
+      // currentRow.value.answerd = 1;
       handleClose();
+      getDgDetail();
     }
   })
 }