Browse Source

refactor: remove screen timing control

Casper Dai 3 years ago
parent
commit
93b212f7f7

+ 1 - 2
src/components/external/camera/CameraDetail/index.vue

@@ -414,7 +414,6 @@ export default {
             color: '#fff',
             fontWeight: 'bold'
           }
-          // padding: [0, 30],
         },
         xAxis: {
           type: 'category',
@@ -492,9 +491,9 @@ $theme-blue: #003e90;
 }
 
 .c-detail {
+  position: relative;
   width: 100%;
   height: 100%;
-  position: relative;
   overflow: hidden;
 }
 

+ 1 - 2
src/views/device/back/components/Video.vue

@@ -132,12 +132,11 @@ export default {
     createPlayer ({ timestamp, token, expire }) {
       if (flvjs.isSupported()) {
         // 创建一个flvjs实例
-        const url = `${CAMERA_URL}/live/${this.device.id}.flv?authorization=${token}&timestamp=${timestamp}&expire=${expire}`
         this.$player = flvjs.createPlayer({
           type: 'flv',
           isLive: true,
           hasAudio: false,
-          url
+          url: `${CAMERA_URL}/live/${this.device.id}.flv?authorization=${token}&timestamp=${timestamp}&expire=${expire}`
         })
         this.$player.on('error', () => {
           this.refreshShow = true

+ 1 - 1
src/views/device/detail/components/DeviceInvoke/DeviceNetwork/Wired.vue

@@ -33,7 +33,7 @@
           placeholder="255.255.255.0"
           maxlength="15"
         />
-        <span class="c-grid-form__label">网关:</span>
+        <span class="c-grid-form__label required">网关:</span>
         <el-input
           v-model.trim="wired.ip4.gateway"
           placeholder="192.168.0.1"

+ 2 - 2
src/views/device/detail/components/DeviceInvoke/DeviceNetwork/index.vue

@@ -325,8 +325,8 @@ export default {
       if (!this.isValid(mask, validIPv4, type, '子网掩码')) {
         return false
       }
-      if (gateway && !validIPv4(gateway)) {
-        return this.onError('IPv4的网关格式错误')
+      if (!this.isValid(gateway, validIPv4, type, '网关')) {
+        return false
       }
       if (dns1 && !validIPv4(dns1)) {
         return this.onError('IPv4的主DNS格式错误')

+ 2 - 2
src/views/device/detail/components/DeviceInvoke/ScreenSwitch.vue

@@ -11,10 +11,10 @@
       title="开关大屏"
       :before-close="onCloseDialog"
     >
-      <tabs
+      <!-- <tabs
         :items="tabs"
         :active.sync="active"
-      />
+      /> -->
       <template v-if="show">
         <template v-if="isImmediate">
           <div class="l-flex__fill l-flex--col jcenter center has-bottom-padding">