Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

配置更新
2022-08-12 17:17:06 +08:00 · 2022-08-12 17:17:03 +08:00
4 changed files with 6 additions and 6 deletions
--- a/front/public/index.html
+++ b/front/public/index.html
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-09 18:09:19
+ * @LastEditTime: 2022-08-12 16:43:50
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-06 10:43:53
+ * @LastEditTime: 2022-08-12 16:44:21
 * @Description: 数据资源参数配置
 */
 const newLocation = 'qingdao'
--- a/front/public/static/js/rem.js
+++ b/front/public/static/js/rem.js
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2021-06-15 18:50:17
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-06 10:54:11
+ * @LastEditTime: 2022-08-12 16:20:45
 * @Description: 告诉大家这是什么
 */
 ;(function (doc, win) {
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@ -643,6 +643,7 @@
  const videoTotal = ref(0)
  const router = useRouter()
  const whoShow1 = ref(whoShow)
+  const isXiHaiAn = whoShow1.value.itShowXiHaiAn
  const options = reactive({
    width: '912px', //播放器宽度
    height: '513px', //播放器高度
@ -653,7 +654,7 @@
    muted: false, //静音
    webFullScreen: false,
    speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-    autoPlay: false, //自动播放
+    autoPlay: isXiHaiAn, //自动播放
    loop: false, //循环播放
    mirror: false, //镜像画面
    ligthOff: false, //关灯模式
@ -1272,7 +1273,7 @@
            muted: false, //静音
            webFullScreen: false,
            speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-            autoPlay: false, //自动播放
+            autoPlay: isXiHaiAn, //自动播放
            loop: false, //循环播放
            mirror: false, //镜像画面
            ligthOff: false, //关灯模式
@ -1367,7 +1368,6 @@
  // const addShopCar = () => {
  //   console.log('添加至购物车')
  // }
-  const isXiHaiAn = whoShow1.value.itShowXiHaiAn
  const wrjFlag = ref(false)
  const getCamera = () => {
    console.log('初始化调用')
Author	SHA1	Message	Date
wuhongjian	a2267a59bb	Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-08-12 17:17:06 +08:00
wuhongjian	ce3f7ec183	配置更新	2022-08-12 17:17:03 +08:00