Commit d0083447bbd1c8e0c2eef2a0f77d848802c3bb6e
1 parent
a91fe69f
修复地图页面云台状态显示以及状态显示
Showing
3 changed files
with
12 additions
and
12 deletions
web_src/package-lock.json
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | "name": "gb_web", | 8 | "name": "gb_web", |
| 9 | "version": "1.0.0", | 9 | "version": "1.0.0", |
| 10 | "dependencies": { | 10 | "dependencies": { |
| 11 | - "@liveqing/liveplayer": "^2.7.0", | 11 | + "@liveqing/liveplayer": "^2.7.10", |
| 12 | "axios": "^0.24.0", | 12 | "axios": "^0.24.0", |
| 13 | "core-js": "^2.6.5", | 13 | "core-js": "^2.6.5", |
| 14 | "echarts": "^4.9.0", | 14 | "echarts": "^4.9.0", |
| @@ -71,9 +71,9 @@ | @@ -71,9 +71,9 @@ | ||
| 71 | } | 71 | } |
| 72 | }, | 72 | }, |
| 73 | "node_modules/@liveqing/liveplayer": { | 73 | "node_modules/@liveqing/liveplayer": { |
| 74 | - "version": "2.7.0", | ||
| 75 | - "resolved": "https://registry.npmmirror.com/@liveqing/liveplayer/-/liveplayer-2.7.0.tgz", | ||
| 76 | - "integrity": "sha512-SWveQRqhhfJzkcpmHZxL6eLn+xLQuub888/JiBtUDHgt1eVwYYsorDiGcAKciNcyD70PuMfQ3+QrLoLbWE2vWA==" | 74 | + "version": "2.7.10", |
| 75 | + "resolved": "https://registry.npmmirror.com/@liveqing/liveplayer/-/liveplayer-2.7.10.tgz", | ||
| 76 | + "integrity": "sha512-OrRzy2t0WZvO/h+hxMYL2+Ips7ON75l+PH8rjZDT7sps1zKW6dct6qPJm3EsVQuttUQ0dVGu3UXaSUm5gEM4dQ==" | ||
| 77 | }, | 77 | }, |
| 78 | "node_modules/@mapbox/jsonlint-lines-primitives": { | 78 | "node_modules/@mapbox/jsonlint-lines-primitives": { |
| 79 | "version": "2.0.2", | 79 | "version": "2.0.2", |
| @@ -14464,9 +14464,9 @@ | @@ -14464,9 +14464,9 @@ | ||
| 14464 | }, | 14464 | }, |
| 14465 | "dependencies": { | 14465 | "dependencies": { |
| 14466 | "@liveqing/liveplayer": { | 14466 | "@liveqing/liveplayer": { |
| 14467 | - "version": "2.7.0", | ||
| 14468 | - "resolved": "https://registry.npmmirror.com/@liveqing/liveplayer/-/liveplayer-2.7.0.tgz", | ||
| 14469 | - "integrity": "sha512-SWveQRqhhfJzkcpmHZxL6eLn+xLQuub888/JiBtUDHgt1eVwYYsorDiGcAKciNcyD70PuMfQ3+QrLoLbWE2vWA==" | 14467 | + "version": "2.7.10", |
| 14468 | + "resolved": "https://registry.npmmirror.com/@liveqing/liveplayer/-/liveplayer-2.7.10.tgz", | ||
| 14469 | + "integrity": "sha512-OrRzy2t0WZvO/h+hxMYL2+Ips7ON75l+PH8rjZDT7sps1zKW6dct6qPJm3EsVQuttUQ0dVGu3UXaSUm5gEM4dQ==" | ||
| 14470 | }, | 14470 | }, |
| 14471 | "@mapbox/jsonlint-lines-primitives": { | 14471 | "@mapbox/jsonlint-lines-primitives": { |
| 14472 | "version": "2.0.2", | 14472 | "version": "2.0.2", |
web_src/package.json
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | "build": "node build/build.js" | 10 | "build": "node build/build.js" |
| 11 | }, | 11 | }, |
| 12 | "dependencies": { | 12 | "dependencies": { |
| 13 | - "@liveqing/liveplayer": "^2.7.0", | 13 | + "@liveqing/liveplayer": "^2.7.10", |
| 14 | "axios": "^0.24.0", | 14 | "axios": "^0.24.0", |
| 15 | "core-js": "^2.6.5", | 15 | "core-js": "^2.6.5", |
| 16 | "echarts": "^4.9.0", | 16 | "echarts": "^4.9.0", |
web_src/src/components/map.vue
| @@ -22,10 +22,10 @@ | @@ -22,10 +22,10 @@ | ||
| 22 | <el-descriptions-item label="行政区域" >{{channel.civilCode}}</el-descriptions-item> | 22 | <el-descriptions-item label="行政区域" >{{channel.civilCode}}</el-descriptions-item> |
| 23 | <el-descriptions-item label="设备归属" >{{channel.owner}}</el-descriptions-item> | 23 | <el-descriptions-item label="设备归属" >{{channel.owner}}</el-descriptions-item> |
| 24 | <el-descriptions-item label="安装地址" >{{channel.address == null?'未知': channel.address}}</el-descriptions-item> | 24 | <el-descriptions-item label="安装地址" >{{channel.address == null?'未知': channel.address}}</el-descriptions-item> |
| 25 | - <el-descriptions-item label="云台类型" >{{channel.ptztypeText}}</el-descriptions-item> | ||
| 26 | - <el-descriptions-item label="状态"> | ||
| 27 | - <el-tag size="small" v-if="channel.status === 1">在线</el-tag> | ||
| 28 | - <el-tag size="small" type="info" v-if="channel.status === 0">离线</el-tag> | 25 | + <el-descriptions-item label="云台类型" >{{channel.PTZTypeText}}</el-descriptions-item> |
| 26 | + <el-descriptions-item label="通道状态"> | ||
| 27 | + <el-tag size="small" v-if="channel.status === true">在线</el-tag> | ||
| 28 | + <el-tag size="small" type="info" v-if="channel.status === false">离线</el-tag> | ||
| 29 | </el-descriptions-item> | 29 | </el-descriptions-item> |
| 30 | </el-descriptions> | 30 | </el-descriptions> |
| 31 | <div style="padding-top: 10px"> | 31 | <div style="padding-top: 10px"> |