Forráskód Böngészése

追加修复已知bug

ming 3 éve
szülő
commit
d6c6d54f43

+ 2 - 1
src/main.js

@@ -54,6 +54,7 @@ router.beforeEach((to) => {
         store.commit('publicDeviceList')
     }
     if (to.path == '/home') {
-        window.open("https://wx.ewoogi.com/vuefiv/#/home");
+        // window.open("https://wx.ewoogi.com/vuefiv/#/home");
+        window.location.href = "https://wx.ewoogi.com/vuefiv/#/home";
     }
 })

+ 4 - 1
src/views/deviceManage/powerEquip/videoEquip/checkVideo.vue

@@ -71,7 +71,7 @@ export default defineComponent({
       }
 
       window.setTimeout(function () {
-        player.value = videojs('my-video', options)
+        player.value = videojs('my-video', options,)
       }, 100)
     }
 
@@ -119,4 +119,7 @@ export default defineComponent({
 .el-form-item__content {
     margin-left: 150px
 }
+</style>
+<style >
+* { touch-action: pan-y; }
 </style>

+ 7 - 1
src/views/deviceManage/powerEquip/videoEquip/index.vue

@@ -30,7 +30,7 @@
           type="primary"
           icon="el-icon-search"
           class="search-button"
-          @click="videoMonitoringDeviceList()"
+          @click="searchData()"
         >
           搜索
         </el-button>
@@ -221,6 +221,11 @@ export default defineComponent({
       showDialog.value = false
       // videoMonitoringDeviceList()
     }
+    function searchData(){
+      videoMonitoringDeviceList()
+      chk_video()
+
+    }
 
     //视频列表
     function videoMonitoringDeviceList() {
@@ -390,6 +395,7 @@ export default defineComponent({
       LookUp,
       handleSizeChange,
       handleCurrentChange,
+      searchData,
       videoMonitoringDeviceList,
 
       filterText,

+ 6 - 1
src/views/siteManage/basicInfo/index.vue

@@ -403,6 +403,7 @@ export default defineComponent({
       })
     }
 
+
     //表单提交
     function submitForm() {
       ruleForm.value.sitePictureOne = dataSet.fileList[0]
@@ -511,6 +512,7 @@ export default defineComponent({
           getSite()
           dynamicPropertiesDroplist(2)
           dynamicPropertiesDroplist(1)
+        
         }
       }
     )
@@ -521,6 +523,7 @@ export default defineComponent({
           getSite()
           dynamicPropertiesDroplist(2)
           dynamicPropertiesDroplist(1)
+     
         }
       }
     )
@@ -529,6 +532,7 @@ export default defineComponent({
       (newVal) => {
         if (newVal == '') {
           formStatus.value = '修改'
+            resetForm()
           // getSite()
           // dynamicPropertiesDroplist(2)
           // dynamicPropertiesDroplist(1)
@@ -562,6 +566,7 @@ export default defineComponent({
         routeDroplist()
         dynamicPropertiesDroplist(2)
         dynamicPropertiesDroplist(1)
+     
       }
     })
 
@@ -579,6 +584,7 @@ export default defineComponent({
 
       accessToken,
       ruleForm,
+      resetForm,
       rules: {
         siteName: [
           { required: true, message: '请输入站点名称', trigger: 'blur' },
@@ -687,7 +693,6 @@ export default defineComponent({
       handlePictureCardPreview,
       submitForm,
       routeDropData,
-      resetForm,
       handleUpAvatar,
       fileImages,
       getSite,