Merge remote-tracking branch 'aliyun/master-0720-lyc' into master-0720-lyc

src/views/study/coursenew.vue

@@ -22,6 +22,7 @@
       <div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
         <div class="course-player" ref="coursePlayer" id="id_course_player">
           <div>
+            <div v-if="Internet != 2">
               <div v-if="resType == null || resType == 0">
                 <!--先显示视频图片-->
                 <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
@@ -109,6 +110,15 @@
                 </assess>
               </div>
             </div>
+            <div v-if="Internet == 2" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
+              <div style="margin-top:40px">
+                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。</span>
+              </div>
+              <div style="margin-top:20px" @click="getInternet">
+                <el-button type="primary">重新检测</el-button>
+              </div>
+            </div>
+          </div>
           <!--交互部分-->
           <div>
             <div class="course-interact">
@@ -303,6 +313,17 @@
         </div>
       </div>
     </div>
+    <el-dialog class="protocol" :close-on-click-modal="false" :visible="protocolDialogVisible" width="30%"
+               :show-close="false">
+      <div class="protocol-title">{{warnTitle}}</div>
+      <div class="protocol-content">
+        &emsp;&emsp;{{warn}}
+      </div>
+      <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="protocolDialogVisible = false">确
+                定</el-button>
+      </span>
+    </el-dialog>
     <!-- <div><portal-footer></portal-footer></div> -->
   </div>
 </template>
@@ -369,6 +390,7 @@
     },
     data() {
       return {
+        protocolDialogVisible: false,
         tentative: false,
         isContentTypeTwo: null,
         isContentType: null,
@@ -390,6 +412,7 @@
         curCFile: {
           converStatus: 4,
         },
+        Internet: 3,//1是成功 2是是失败 3是检测中
         radio: '',
         interactRuning: false,
         playerBoxShow: false,
@@ -454,6 +477,8 @@
         cumulativeDuration:0, //非音频累计时长
         maxDuration:0, //非音频最大时长
         defaultMaxTime:1800, //非音频默认最大时间
+        warn:"测试内容",
+        warnTitle:"测试标题",
       }
     },
     mounted() {
@@ -1357,7 +1382,8 @@
               }
             }
             this.courseInfo = rs.result.course;
-
+            this.warn = rs.result.warn;
+            this.warnTitle = rs.result.warnTitle;
             if (rs.result.teachers && rs.result.teachers.length > 0) {
               let userIds = [];
               let ctoUsers = [];
@@ -1387,6 +1413,7 @@
             //加载学习的数据
             this.loadStudyData(rs.result);
             if (rs.result.isPermission){
+            // if (true){
               this.getInternet()
               console.log('需要内网环境')
             }
@@ -1420,19 +1447,7 @@
             if (xmlhttp.status != 200) {
               clearTimeout(timer);
               $this.Internet = 1;
-              $this.$store.dispatch("userTrigger", {
-                key: "ViewCase",//后台的事件key  发布文章且审核通过
-                title: '查看案例',//事件的标题
-                parameters: "",//用户自定义参数 name:value,name:value
-                content: '查看了案例',//事件的内容
-                objId: $this.resolveId,//关联的id
-                objType: "3",//关联的类型
-                objInfo: $this.caseDetail?.title,
-                aid: $this.userInfo.aid, //当前登录人的id
-                aname: $this.userInfo.name,//当前人的姓名
-                status: 1 //状态，直接写1
-              });
-              $this.sendEventData();
+              $this.protocolDialogVisible=true
             } else {
               clearTimeout(timer);
               $this.Internet = 2;
@@ -2419,4 +2434,18 @@
     height: 200px;
     background: url('../../../public/images/couresdetail.png');
   }
+
+.protocol {
+  .protocol-title {
+    font-size: 20px;
+    font-weight: 600;
+    text-align: center;
+    margin-bottom: 25px;
+  }
+
+  .protocol-content {
+    font-size: 14px;
+    line-height: 25px;
+  }
+}
 </style>