Merge branch 'dev-yjl' into 'shenzhen-dev'

萤石云点击窗口高亮

See merge request !137

src/assets/js/http.js

@@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') {
   
   // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
-  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
-  // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+  axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地

src/views/projectAdmin/jlw/components/progress.vue

@@ -5,9 +5,7 @@
       <vue-scroll>
         <div class="box" v-for="(item, index) in progressData" :key="index">
           <p class="title">{{ item.taskName }}</p>
-          <div class="line" v-show="progressData.length != index + 1">
+         
-            -------
-          </div>
           <div class="imgStyle">
             <img
               :src="
@@ -22,6 +20,9 @@
 
           <p class="timeText">开始时间：{{ item.startDate }}</p>
           <p class="timeText">结束时间：{{ item.finishDate }}</p>
+          <div class="line" v-show="progressData.length != index + 1">
+            -------
+          </div>
         </div>
       </vue-scroll>
       <!-- <div class="box">
@@ -107,14 +108,19 @@ export default {
 
     .box {
       text-align: center;
-      margin-right: 6%;
+      margin-right: 2%;
       display: inline-block;
       margin-top: 35px;
       margin-left: 2%;
+      width: 170px;
     }
     .title {
       font-size: 14px;
       position: relative;
+      overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 140px;
     }
     .title::before {
       position: absolute;
@@ -126,7 +132,7 @@ export default {
       margin: 20px;
       width: 100px;
       height: 70px;
-      margin-left: 55px;
+      // margin-left: 55px;
       // width: 20%;
       // height:20%;
       img {
@@ -143,7 +149,7 @@ export default {
     .line {
       top: 50%;
       position: absolute;
-      margin-left: 250px;
+      margin-left: 160px;
       color: #465161;
     }
   }

src/views/projectAdmin/jlw/projectHuli/index.vue

@@ -122,7 +122,7 @@ export default {
   }
 }
 .centerBox {
-  width: 60%;
+  width: 48%;
   height: 100%;
   margin-right: 15px;
   .centerTop {

src/views/projectFront/videoManage/ysyNew.vue

@@ -22,9 +22,8 @@
             <div
               :id="'video-cover' + item"
               class="video-cover"
-              :class="Istrue== true? 'login-box-focus':''"
+              @click="btnStyle(item)"
-              @mouseenter="mouseenterName()"
+              :class="{ 'btnCss': btnIndex == item }"
-              @mouseleave="mouseleaveName()"
             ></div>
             <div :id="'video-container' + item"></div>
           </div>
@@ -91,7 +90,7 @@ export default {
       devList: [],
       demoList: [],
       indextest: 0,
-      Istrue: false,
+      btnIndex: 0
     }
   },
   created() { },
@@ -113,7 +112,7 @@ export default {
         var index = this.devList.findIndex((item) => item.url == a[0].url)
         let devs = []
         devs.push(this.devList[index])
-        console.log('块的点击事件：', devs)
+        console.log('块的点击事件1：', devs)
         this.ysyBtn(devs, this.indextest, this.select)
       }
 
@@ -133,6 +132,7 @@ export default {
       this.select = value
       this.selectVideoFirst = 1
       this.devList.forEach((item, index) => {
+        console.log('item数据', item);
         // item.player.stop()
         if (value == 1) {
           item.player.reSize(
@@ -150,7 +150,6 @@ export default {
             this.$refs.videoBox.offsetHeight / 3
           )
         }
-        console.log('==========')
       })
     }
     // 选择显示video数量
@@ -162,17 +161,15 @@ export default {
     })
   },
   methods: {
-    mouseenterName() {
+    //点击高亮
-      this.Istrue = true;
+    btnStyle(item) {
-    },
+      this.btnIndex = item
-    mouseleaveName() {
-      this.Istrue = false;
     },
     pieceClick(item) {
       this.indextest = item
       // let devs = []
       // devs.push(this.devList[item - 1])
-      console.log('块的点击事件：', item)
+      console.log('块的点击事件2：', item)
       // this.ysyBtn(devs,item+1,this.select)
     },
     // 视频播放数据   视频容器id（所在窗口）   当前窗口是几分屏（1、4、9）
@@ -180,7 +177,7 @@ export default {
 
       item.forEach((item2, index) => {
         let container;
-        console.log('块的点击事件：', indeBtn)
+        console.log('块的点击事件3：', indeBtn)
         if (indeBtn == 0) {
           container = `video-container${index + 1}`;
         } else {
@@ -300,10 +297,6 @@ export default {
 .video-active {
   border: 0.125rem solid rgb(255, 133, 62) !important;
 }
-.login-box-focus{
-  // border: 4px solid red;
-}
-
 
 .rect {
   width: 1.625rem;
@@ -493,4 +486,7 @@ export default {
 .videoItem.active {
   background: #fff !important;
 }
+.btnCss {
+  border: 2px solid orange;
+}
 </style>