Browse Source

no message

xiaoxin 2 years ago
parent
commit
66dd5fd416

+ 4 - 0
src/components/school/schoolRight.vue

@@ -350,6 +350,10 @@ const getCountUpNum = () => {
           height: 134px;
         }
 
+        video::-webkit-media-controls-timeline {
+          display: none !important;
+        }
+
         .box_name {
           position: absolute;
           top: 0;

+ 9 - 1
src/components/student/studentCenter.vue

@@ -47,7 +47,15 @@
             <!-- 详细信息区域 -->
             <div class="detail">
               <div class="detail_img">
-                <img v-if="item.type === '打卡'" src="@/assets/images/1.png" />
+                <img
+                  v-if="
+                    item.type === '准时打卡' ||
+                    item.type === '迟到打卡' ||
+                    item.type === '超时打卡' ||
+                    item.type === '请假'
+                  "
+                  src="@/assets/images/1.png"
+                />
                 <el-image
                   v-else
                   style="width: 38px; height: 45px"

+ 1 - 1
src/components/student/studentRight.vue

@@ -47,7 +47,7 @@
             align="center"
             width="150"
           />
-          <el-table-column prop="scoreNum" label="考评等级" align="center" />
+          <el-table-column prop="scoreLevel" label="考评等级" align="center" />
         </el-table>
       </div>
     </div>

+ 20 - 11
src/views/more.vue

@@ -57,8 +57,8 @@ const router = useRouter();
 // 当前监控地址
 const currentUrl = ref("");
 
-// 当前监控通道
-const currentD = ref("");
+// 当前监控通道  默认学习大门
+const currentD = ref("D70");
 
 const treeProps = {
   label: "spotName",
@@ -69,6 +69,7 @@ const treeProps = {
 const dataSource = ref([]);
 
 onMounted(() => {
+  startVideo();
   // 获取列表数据
   getVideoList();
 });
@@ -88,7 +89,7 @@ const getVideoList = async () => {
 };
 
 // 点击树状结构每一个节点触发的回调
-const handleNodeClick = async (data: any) => {
+const handleNodeClick = (data: any) => {
   if (currentD.value) {
     // 关流请求
     stopVideo();
@@ -97,19 +98,23 @@ const handleNodeClick = async (data: any) => {
   if (data.d) {
     currentD.value = data.d;
     // 监控拉流
-    const res = await reqVideoPull({
-      d: currentD.value,
-      nowLine: "1",
-      isNvr: "1",
-    });
-    // console.log(res);
-
-    currentUrl.value = res.data.mp4;
+    startVideo(currentD.value);
   } else {
     currentUrl.value = "";
   }
 };
 
+// 拉流请求
+const startVideo = async (d: string = currentD.value) => {
+  const res = await reqVideoPull({
+    d,
+    nowLine: "1",
+    isNvr: "1",
+  });
+  // console.log(res);
+  currentUrl.value = res.data.mp4;
+};
+
 // 关流请求
 const stopVideo = async () => {
   await reqVideoStop({
@@ -199,6 +204,10 @@ const handleClose = () => {
         width: 100%;
         height: 100%;
       }
+
+      video::-webkit-media-controls-timeline {
+        display: none !important;
+      }
     }
   }