From 8805d111644bc8eed2b5fc052d03856b40d7b394 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 09 Feb 2023 10:47:52 +0800
Subject: [PATCH] 设备通道号更换
---
src/api/police/index.js | 6 +-
src/api/home/index.js | 6 +-
src/views/video/list.vue | 137 +++++++++++----------------------------------
src/api/video/index.js | 10 +-
4 files changed, 44 insertions(+), 115 deletions(-)
diff --git a/src/api/home/index.js b/src/api/home/index.js
index bf72d9f..0bb13c8 100644
--- a/src/api/home/index.js
+++ b/src/api/home/index.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-12-27 14:19:19
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-01 16:56:46
+ * @LastEditTime: 2023-02-09 10:46:30
* @FilePath: \srs-police-affairs\src\api\home\index.js
* @Description:
*
@@ -139,8 +139,8 @@
method: 'get',
params: {
...params,
- // deviceId: '36110000002009999000'
- deviceId: '34020000002000000003'
+ deviceId: '36110000002009999000'
+ // deviceId: '34020000002000000003'
}
})
}
diff --git a/src/api/police/index.js b/src/api/police/index.js
index e8534ec..e181281 100644
--- a/src/api/police/index.js
+++ b/src/api/police/index.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-11-15 15:10:41
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-01-09 10:14:34
+ * @LastEditTime: 2023-02-09 10:46:18
* @FilePath: \srs-police-affairs\src\api\police\index.js
* @Description:
*
@@ -18,9 +18,9 @@
export const getHistoricalTrack = (params, requestBaseUrl = 'outside') => {
return request({
// 平台ID在这里更换，不要传了内网使用
- // url: `/position/history/36110000002009999000`,
+ url: `/position/history/36110000002009999000`,
// 开发使用
- url: `/position/history/34020000002000000003`,
+ // url: `/position/history/34020000002000000003`,
method: 'get',
requestBaseUrl,
params: params
diff --git a/src/api/video/index.js b/src/api/video/index.js
index 097e145..c492def 100644
--- a/src/api/video/index.js
+++ b/src/api/video/index.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-11-15 15:10:41
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-08 10:11:23
+ * @LastEditTime: 2023-02-09 10:46:58
* @FilePath: \srs-police-affairs\src\api\video\index.js
* @Description:
*
@@ -21,9 +21,9 @@
export const getVideoList = (page, count, query, params = {}) => {
return request({
// 内网使用地址，外网把36110000002009999000更换掉
- // url: '/device/query/devices/36110000002009999000/channels',
+ url: '/device/query/devices/36110000002009999000/channels',
// 外网使用地址
- url: '/device/query/devices/34020000002000000003/channels',
+ // url: '/device/query/devices/34020000002000000003/channels',
method: 'get',
requestBaseUrl: 'outside',
params: {
@@ -43,9 +43,9 @@
export const getDevices = (channelId) => {
return request({
// 内网使用地址，外网把36110000002009999000更换掉
- // url: `/play/start/36110000002009999000/${channelId}`,
+ url: `/play/start/36110000002009999000/${channelId}`,
// 外网使用地址
- url: `/play/start/34020000002000000003/${channelId}`,
+ // url: `/play/start/34020000002000000003/${channelId}`,
method: 'get',
requestBaseUrl: 'outside'
})
diff --git a/src/views/video/list.vue b/src/views/video/list.vue
index 9064209..67b4def 100644
--- a/src/views/video/list.vue
+++ b/src/views/video/list.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 16:18:17
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-08 11:21:57
+ * @LastEditTime: 2023-02-09 10:47:17
* @FilePath: \srs-police-affairs\src\views\video\list.vue
* @Description: 辖区管理
*
@@ -14,12 +14,7 @@
<div v-show="boxShow" class="container-content">
<div class="search-box">
点位名称：
- <input
- v-model="searchValue"
- @input="searchChange"
- type="text"
- placeholder="请输入搜索条件"
- />
+ <input v-model="searchValue" @input="searchChange" type="text" placeholder="请输入搜索条件" />
</div>
<div class="draw-btn">
@@ -36,93 +31,49 @@
<button @click="changeRange" class="btn">确定</button>
</div>
<div v-show="searchValBoxShow" class="search-val-box">
- <div
- @click="searchVlaClick(item)"
- v-for="(item, index) in searchArray"
- :key="index"
- >{{ item.name }}</div>
+ <div @click="searchVlaClick(item)" v-for="(item, index) in searchArray" :key="index">{{ item.name }}
+ </div>
</div>
<div class="down-tree">
<el-scrollbar>
- <el-tree
- v-show="searchLazyFlag"
- :props="props"
- :load="loadNode"
- lazy
- @node-click="treeClick"
- ></el-tree>
+ <el-tree v-show="searchLazyFlag" :props="props" :load="loadNode" lazy
+ @node-click="treeClick"></el-tree>
- <el-tree
- v-show="searchLazyFlag == false"
- :data="searchTreeData"
- :props="defaultProps"
- :default-expand-all="true"
- @node-click="treeClick"
- ></el-tree>
+ <el-tree v-show="searchLazyFlag == false" :data="searchTreeData" :props="defaultProps"
+ :default-expand-all="true" @node-click="treeClick"></el-tree>
</el-scrollbar>
</div>
<div class="list-show" v-if="false">
<div class="car-list">
<div class="list-box">
- <el-table
- :data="monitoringList"
- style="width: 100%"
+ <el-table :data="monitoringList" style="width: 100%"
:header-cell-style="{ 'text-align': 'center', 'background-color': 'rgba(9, 40, 199, 0.5)', 'borderColor': '#324e75' }"
- :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
- @cell-click="rowClick"
- >
- <el-table-column
- :show-overflow-tooltip="true"
- prop="name"
- label="点位名称"
- min-width="35%"
- ></el-table-column>
- <el-table-column
- :show-overflow-tooltip="true"
- prop="pTZTypeText"
- label="点位类型"
- min-width="35%"
- ></el-table-column>
- <el-table-column
- :show-overflow-tooltip="true"
- prop="status"
- label="状态"
- min-width="30%"
- >
+ :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }" @cell-click="rowClick">
+ <el-table-column :show-overflow-tooltip="true" prop="name" label="点位名称"
+ min-width="35%"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" prop="pTZTypeText" label="点位类型"
+ min-width="35%"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" prop="status" label="状态" min-width="30%">
<template slot-scope="scope">
- <div
- class="state-box"
- :class="{ online: scope.row.status == '1' }"
- ></div>
+ <div class="state-box" :class="{ online: scope.row.status == '1' }"></div>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
- <el-pagination
- background
- layout="prev, pager, next"
- :page-size="pagesize"
- :page-count="pagesCount"
- :current-page="currentPage"
- pager-count="5"
- @current-change="handleCurrentChange"
- ></el-pagination>
+ <el-pagination background layout="prev, pager, next" :page-size="pagesize"
+ :page-count="pagesCount" :current-page="currentPage" pager-count="5"
+ @current-change="handleCurrentChange"></el-pagination>
</div>
</div>
</div>
</div>
<div class="search-content">
- <input
- v-model="searchExtensivelyValue"
- @input="searchExtensivelyChange"
- @focus="searchExtensivelyFocus"
- type="text"
- placeholder="请输入搜索条件"
- />
+ <input v-model="searchExtensivelyValue" @input="searchExtensivelyChange" @focus="searchExtensivelyFocus"
+ type="text" placeholder="请输入搜索条件" />
<div class="clear" v-show="isShowClearBtn" @click="clearSearchValue" title="清空">
<img src="../../../public/img/icon/clear.png" alt />
</div>
@@ -130,39 +81,17 @@
</div>
<div v-show="searchExtensivelyValBoxShow" class="searchExtensively-val-box">
<div>
- <div
- @click="searchExtensivelyVlaClick(item)"
- v-for="(item, index) in searchExtensivelyArray"
- :key="index"
- >{{ item.name }}</div>
+ <div @click="searchExtensivelyVlaClick(item)" v-for="(item, index) in searchExtensivelyArray"
+ :key="index">{{ item.name }}</div>
</div>
</div>
- <el-dialog
- :title="dialogTitle"
- :modal="false"
- :visible.sync="dialogVisible"
- :before-close="dialogBeforeClose"
- :close-on-click-modal="true"
- class="car-video-box"
- >
- <video
- id="videoElement"
- autoplay
- controls
- width="100%"
- height="100%"
- style="object-fit: fill"
- ></video>
+ <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
+ :close-on-click-modal="true" class="car-video-box">
+ <video id="videoElement" autoplay controls width="100%" height="100%" style="object-fit: fill"></video>
</el-dialog>
- <el-dialog
- :title="drawDialogTitle"
- :modal="false"
- :visible.sync="drawDialogVisible"
- :before-close="drawDialogBeforeClose"
- :close-on-click-modal="true"
- class="video-draw-box"
- >
+ <el-dialog :title="drawDialogTitle" :modal="false" :visible.sync="drawDialogVisible"
+ :before-close="drawDialogBeforeClose" :close-on-click-modal="true" class="video-draw-box">
<input type="text" v-model="drawName" placeholder="请输入绘制线或面的名称" />
<button @click="saveDrawInfo">保存</button>
</el-dialog>
@@ -621,8 +550,8 @@
}
await getTreeDevices({
- // deviceId: '36110000002009999000',
- deviceId: '34020000002000000003',
+ deviceId: '36110000002009999000',
+ // deviceId: '34020000002000000003',
parentId,
deptId: this.userInfo.dept_id,
type,
@@ -774,7 +703,7 @@
border-radius: 10px;
overflow-y: auto;
- & > div {
+ &>div {
height: 100%;
padding: 0 10px;
line-height: 36px;
@@ -848,7 +777,7 @@
.list-show {
flex: 1;
- & > div {
+ &>div {
height: 100%;
display: flex;
flex-direction: column;
@@ -971,7 +900,7 @@
border-radius: 10px;
overflow: hidden;
- & > div {
+ &>div {
height: 100%;
overflow-y: auto;
--
Gitblit v1.9.3