更新设备详情

admin/package-lock.json

@@ -17,6 +17,7 @@
                 "css-color-function": "^1.3.3",
                 "echarts": "^5.3.3",
                 "element-plus": "^2.2.9",
+                "flv.js": "^1.6.2",
                 "highlight.js": "^11.6.0",
                 "nprogress": "^0.2.0",
                 "pinia": "^2.0.14",
@@ -2629,6 +2630,11 @@
                 "es6-symbol": "^3.1.1"
             }
         },
+        "node_modules/es6-promise": {
+            "version": "4.2.8",
+            "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+            "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+        },
         "node_modules/es6-symbol": {
             "version": "3.1.3",
             "resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -3618,6 +3624,15 @@
             "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==",
             "dev": true
         },
+        "node_modules/flv.js": {
+            "version": "1.6.2",
+            "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
+            "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
+            "dependencies": {
+                "es6-promise": "^4.2.8",
+                "webworkify-webpack": "^2.1.5"
+            }
+        },
         "node_modules/follow-redirects": {
             "version": "1.15.1",
             "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.1.tgz",
@@ -7310,6 +7325,11 @@
             "integrity": "sha512-h9atBP/bsZohWpHnr+2sic8Iecb60GxftXsWNLLLSqewgIsGzByd2gcIID4nXcG+3tNe4GQG3dLcff3kXupdRA==",
             "dev": true
         },
+        "node_modules/webworkify-webpack": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+            "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="
+        },
         "node_modules/which": {
             "version": "2.0.2",
             "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
@@ -9571,6 +9591,11 @@
                 "es6-symbol": "^3.1.1"
             }
         },
+        "es6-promise": {
+            "version": "4.2.8",
+            "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+            "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+        },
         "es6-symbol": {
             "version": "3.1.3",
             "resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -10258,6 +10283,15 @@
             "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==",
             "dev": true
         },
+        "flv.js": {
+            "version": "1.6.2",
+            "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
+            "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
+            "requires": {
+                "es6-promise": "^4.2.8",
+                "webworkify-webpack": "^2.1.5"
+            }
+        },
         "follow-redirects": {
             "version": "1.15.1",
             "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.1.tgz",
@@ -13257,6 +13291,11 @@
             "integrity": "sha512-h9atBP/bsZohWpHnr+2sic8Iecb60GxftXsWNLLLSqewgIsGzByd2gcIID4nXcG+3tNe4GQG3dLcff3kXupdRA==",
             "dev": true
         },
+        "webworkify-webpack": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+            "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="
+        },
         "which": {
             "version": "2.0.2",
             "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",

admin/package.json

@@ -18,6 +18,7 @@
         "css-color-function": "^1.3.3",
         "echarts": "^5.3.3",
         "element-plus": "^2.2.9",
+        "flv.js": "^1.6.2",
         "highlight.js": "^11.6.0",
         "nprogress": "^0.2.0",
         "pinia": "^2.0.14",

admin/src/views/device/detail.vue

@@ -10,11 +10,11 @@
                 </div>
             </template>
             <div class="flex flex-wrap">
-                <div class="w-1/2 md:w-1/3 mb-4">
+                <div v-if="deviceData.device.land_id != ''" class="w-1/2 md:w-1/3 mb-4">
                     <div class="leading-10">所属土地：</div>
                     <div class="text-3xl text-tx-secondary">ID：{{ deviceData.device.land_id }} / 名称：{{ deviceData.device.land_title }}</div>
                 </div>
-                <div class="w-1/2 md:w-1/3 mb-4">
+                <div v-if="deviceData.device.product_id != ''" class="w-1/2 md:w-1/3 mb-4">
                     <div class="leading-10">所属产品：</div>
                     <div class="text-3xl text-tx-secondary">ID：{{ deviceData.device.product_id }} / 名称：{{ deviceData.device.land_title }}</div>
                 </div>
@@ -74,7 +74,9 @@
                         </el-col>
                     </el-row>
                 </el-tab-pane>
-                <el-tab-pane label="监控视频" name="monitor_video">监控视频</el-tab-pane>
+                <el-tab-pane v-if="deviceData.device.type==3" label="监控视频" name="monitor_video">
+                    <video src="http://192.168.1.27/live/test.live.mp4?secret=gqig2yFKkDpIMic1uWZY1L5MsIo0eflm" controls></video>
+                </el-tab-pane>
             </el-tabs>
         </el-card>
     </div>
@@ -102,8 +104,8 @@ import { ref } from 'vue'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiDeviceDetail, apiDeviceMonitorData } from '@/api/device'
 import { timeFormat } from '@/utils/util'
-const activeName = ref('monitor_item')
 
+const activeName = ref('monitor_item')
 const deviceData: any = reactive({
     device: {},
     monitor_item: []

admin/yarn.lock

@@ -1794,6 +1794,11 @@ es6-iterator@^2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
+es6-promise@^4.2.8:
+  version "4.2.8"
+  resolved "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
 es6-symbol@^3.1.1, es6-symbol@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.3.tgz"
@@ -2178,6 +2183,14 @@ flatted@^3.1.0:
   resolved "https://registry.npmmirror.com/flatted/-/flatted-3.2.6.tgz"
   integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
 
+flv.js@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz"
+  integrity sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==
+  dependencies:
+    es6-promise "^4.2.8"
+    webworkify-webpack "^2.1.5"
+
 follow-redirects@^1.14.9:
   version "1.15.1"
   resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.1.tgz"
@@ -4330,6 +4343,11 @@ webpack-virtual-modules@^0.4.4:
   resolved "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.4.tgz"
   integrity sha512-h9atBP/bsZohWpHnr+2sic8Iecb60GxftXsWNLLLSqewgIsGzByd2gcIID4nXcG+3tNe4GQG3dLcff3kXupdRA==
 
+webworkify-webpack@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz"
+  integrity sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw==
+
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.npmmirror.com/which/-/which-2.0.2.tgz"