From 9f16b5c553b479ea12fe368a7ecc748872ea8b98 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期四, 12 六月 2025 11:11:27 +0800 Subject: [PATCH] 修改配置文件 --- web_src/src/components/channelList.vue | 455 +++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 347 insertions(+), 108 deletions(-) diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue old mode 100644 new mode 100755 index 136ddfe..ff1d784 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -13,109 +13,206 @@ prefix-icon="el-icon-search" v-model="searchSrt" clearable></el-input> 閫氶亾绫诲瀷: - <el-select size="mini" @change="search" style="margin-right: 1rem;" v-model="channelType" placeholder="璇烽�夋嫨" + <el-select size="mini" @change="search" style="width: 8rem; margin-right: 1rem;" v-model="channelType" placeholder="璇烽�夋嫨" default-first-option> <el-option label="鍏ㄩ儴" value=""></el-option> <el-option label="璁惧" value="false"></el-option> <el-option label="瀛愮洰褰�" value="true"></el-option> </el-select> 鍦ㄧ嚎鐘舵��: - <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="online" placeholder="璇烽�夋嫨" + <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="search" v-model="online" placeholder="璇烽�夋嫨" default-first-option> <el-option label="鍏ㄩ儴" value=""></el-option> <el-option label="鍦ㄧ嚎" value="true"></el-option> <el-option label="绂荤嚎" value="false"></el-option> </el-select> + 鐮佹祦绫诲瀷閲嶇疆: + <el-select size="mini" style="width: 16rem; margin-right: 1rem;" @change="subStreamChange" v-model="subStream" + placeholder="璇烽�夋嫨鐮佹祦绫诲瀷" default-first-option > + <el-option label="stream:0(涓荤爜娴�)" value="stream:0"></el-option> + <el-option label="stream:1(瀛愮爜娴�)" value="stream:1"></el-option> + <el-option label="streamnumber:0(涓荤爜娴�-2022)" value="streamnumber:0"></el-option> + <el-option label="streamnumber:1(瀛愮爜娴�-2022)" value="streamnumber:1"></el-option> + <el-option label="streamprofile:0(涓荤爜娴�-澶у崕)" value="streamprofile:0"></el-option> + <el-option label="streamprofile:1(瀛愮爜娴�-澶у崕)" value="streamprofile:1"></el-option> + <el-option label="streamMode:main(涓荤爜娴�-姘存槦+TP-LINK)" value="streamMode:main"></el-option> + <el-option label="streamMode:sub(瀛愮爜娴�-姘存槦+TP-LINK)" value="streamMode:sub"></el-option> + </el-select> </div> - <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button> - <el-button v-if="showTree" icon="iconfont icon-list" circle size="mini" @click="switchList()"></el-button> - <el-button v-if="!showTree" icon="iconfont icon-tree" circle size="mini" @click="switchTree()"></el-button> + <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button> + <el-button v-if="showTree" icon="iconfont icon-list" circle size="mini" @click="switchList()"></el-button> + <el-button v-if="!showTree" icon="iconfont icon-tree" circle size="mini" @click="switchTree()"></el-button> + </div> </div> - </div> - <devicePlayer ref="devicePlayer" ></devicePlayer> - <el-container v-loading="isLoging" style="height: 82vh;"> - <el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree" > - <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent" ></DeviceTree> - </el-aside> - <el-main style="padding: 5px;"> - <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%" header-row-class-name="table-header"> - <el-table-column prop="channelId" label="閫氶亾缂栧彿" min-width="200"> - </el-table-column> - <el-table-column prop="deviceId" label="璁惧缂栧彿" min-width="200"> - </el-table-column> - <el-table-column prop="name" label="閫氶亾鍚嶇О" min-width="200"> - </el-table-column> - <el-table-column label="蹇収" min-width="120"> - <template v-slot:default="scope"> - <el-image - :src="getSnap(scope.row)" - :preview-src-list="getBigSnap(scope.row)" - @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)" - :fit="'contain'" - style="width: 60px"> - <div slot="error" class="image-slot"> - <i class="el-icon-picture-outline"></i> + <devicePlayer ref="devicePlayer"></devicePlayer> + <el-container v-loading="isLoging" style="height: 82vh;"> + <el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree"> + <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent"></DeviceTree> + </el-aside> + <el-main style="padding: 5px;"> + <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%" + header-row-class-name="table-header"> + <el-table-column prop="channelId" label="閫氶亾缂栧彿" min-width="180"> + </el-table-column> + <el-table-column prop="deviceId" label="璁惧缂栧彿" min-width="180"> + </el-table-column> + <el-table-column prop="name" label="閫氶亾鍚嶇О" min-width="180"> + <template v-slot:default="scope"> + <el-input + v-show="scope.row.edit" + v-model="scope.row.name" + placeholder="閫氶亾鍚嶇О" + :maxlength="255" + show-word-limit + clearable + /> + <span v-show="!scope.row.edit">{{ scope.row.name }}</span> + </template> + </el-table-column> + <el-table-column label="蹇収" min-width="100"> + <template v-slot:default="scope"> + <el-image + :src="getSnap(scope.row)" + :preview-src-list="getBigSnap(scope.row)" + @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)" + :fit="'contain'" + style="width: 60px"> + <div slot="error" class="image-slot"> + <i class="el-icon-picture-outline"></i> + </div> + </el-image> + </template> + </el-table-column> + <el-table-column prop="subCount" label="瀛愯妭鐐规暟" min-width="100"> + </el-table-column> + <el-table-column prop="manufacture" label="鍘傚" min-width="100"> + </el-table-column> + <el-table-column label="浣嶇疆淇℃伅" min-width="120"> + <template v-slot:default="scope"> + <el-input + v-show="scope.row.edit" + v-model="scope.row.location" + placeholder="渚嬶細117.234,36.378" + :maxlength="30" + show-word-limit + clearable + /> + <span v-show="!scope.row.edit">{{ scope.row.location }}</span> + </template> + </el-table-column> + <el-table-column prop="ptzType" label="浜戝彴绫诲瀷" min-width="100"> + <template v-slot:default="scope"> + <el-select v-show="scope.row.edit" v-model="scope.row.ptzType" + placeholder="浜戝彴绫诲瀷" filterable> + <el-option + v-for="(value, key) in ptzTypes" + :key="key" + :label="value" + :value="key" + /> + </el-select> + <div v-show="!scope.row.edit">{{ scope.row.ptzTypeText }}</div> + </template> + </el-table-column> + <el-table-column label="寮�鍚煶棰�" min-width="100"> + <template slot-scope="scope"> + <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF"> + </el-switch> + </template> + </el-table-column> + <el-table-column label="鐮佹祦绫诲瀷" min-width="180"> + <template slot-scope="scope"> + <el-select size="mini" style="margin-right: 1rem;" @change="channelSubStreamChange(scope.row)" v-model="scope.row.streamIdentification" + placeholder="璇烽�夋嫨鐮佹祦绫诲瀷" default-first-option > + <el-option label="stream:0(涓荤爜娴�)" value="stream:0"></el-option> + <el-option label="stream:1(瀛愮爜娴�)" value="stream:1"></el-option> + <el-option label="streamnumber:0(涓荤爜娴�-2022)" value="streamnumber:0"></el-option> + <el-option label="streamnumber:1(瀛愮爜娴�-2022)" value="streamnumber:1"></el-option> + <el-option label="streamprofile:0(涓荤爜娴�-澶у崕)" value="streamprofile:0"></el-option> + <el-option label="streamprofile:1(瀛愮爜娴�-澶у崕)" value="streamprofile:1"></el-option> + <el-option label="streamMode:main(涓荤爜娴�-姘存槦+TP-LINK)" value="streamMode:main"></el-option> + <el-option label="streamMode:sub(瀛愮爜娴�-姘存槦+TP-LINK)" value="streamMode:sub"></el-option> + </el-select> + </template> + </el-table-column> + <el-table-column label="鐘舵��" min-width="100"> + <template slot-scope="scope"> + <div slot="reference" class="name-wrapper"> + <el-tag size="medium" v-if="scope.row.status === true">鍦ㄧ嚎</el-tag> + <el-tag size="medium" type="info" v-if="scope.row.status === false">绂荤嚎</el-tag> </div> - </el-image> - </template> - </el-table-column> - <el-table-column prop="subCount" label="瀛愯妭鐐规暟" min-width="120"> - </el-table-column> - <el-table-column prop="manufacture" label="鍘傚" min-width="120"> - </el-table-column> - <el-table-column label="浣嶇疆淇℃伅" min-width="200"> - <template slot-scope="scope"> - <span v-if="scope.row.longitude*scope.row.latitude > 0">{{ scope.row.longitude }},<br>{{ scope.row.latitude }}</span> - <span v-if="scope.row.longitude*scope.row.latitude === 0">鏃�</span> - </template> - </el-table-column> - <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷" min-width="120"/> - <el-table-column label="寮�鍚煶棰�" min-width="120"> - <template slot-scope="scope"> - <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF"> - </el-switch> - </template> - </el-table-column> - <el-table-column label="鐘舵��" min-width="120"> - <template slot-scope="scope"> - <div slot="reference" class="name-wrapper"> - <el-tag size="medium" v-if="scope.row.status === 1">鍦ㄧ嚎</el-tag> - <el-tag size="medium" type="info" v-if="scope.row.status === 0">绂荤嚎</el-tag> - </div> - </template> - </el-table-column> + </template> + </el-table-column> + <el-table-column label="鎿嶄綔" min-width="340" fixed="right"> + <template slot-scope="scope"> + <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play" + type="text" @click="sendDevicePush(scope.row)">鎾斁 + </el-button> + <el-button size="medium" v-bind:disabled="device == null || device.online === 0" + icon="el-icon-switch-button" + type="text" style="color: #f56c6c" v-if="!!scope.row.streamId" + @click="stopDevicePush(scope.row)">鍋滄 + </el-button> + <el-divider direction="vertical"></el-divider> + <el-button + v-if="scope.row.edit" + size="medium" + type="text" + icon="el-icon-edit-outline" + @click="handleSave(scope.row)" + > + 淇濆瓨 + </el-button> + <el-button + v-else + size="medium" + type="text" + icon="el-icon-edit" + @click="handleEdit(scope.row)" + > + 缂栬緫 + </el-button> + <el-divider direction="vertical"></el-divider> + <el-button size="medium" icon="el-icon-s-open" type="text" + v-if="scope.row.subCount > 0 || scope.row.parental === 1" + @click="changeSubchannel(scope.row)">鏌ョ湅 + </el-button> + <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider> +<!-- <el-button size="medium" v-bind:disabled="device == null || device.online === 0"--> +<!-- icon="el-icon-video-camera"--> +<!-- type="text" @click="queryRecords(scope.row)">璁惧褰曞儚--> +<!-- </el-button>--> +<!-- <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-cloudy"--> +<!-- type="text" @click="queryCloudRecords(scope.row)">浜戠褰曞儚--> +<!-- </el-button>--> + <el-dropdown @command="(command)=>{moreClick(command, scope.row)}"> + <el-button size="medium" type="text" > + 鏇村鍔熻兘<i class="el-icon-arrow-down el-icon--right"></i> + </el-button> + <el-dropdown-menu slot="dropdown"> + <el-dropdown-item command="records" v-bind:disabled="device == null || device.online === 0"> + 璁惧褰曞儚</el-dropdown-item> + <el-dropdown-item command="cloudRecords" v-bind:disabled="device == null || device.online === 0" > + 浜戠褰曞儚</el-dropdown-item> + </el-dropdown-menu> + </el-dropdown> + </template> + </el-table-column> + </el-table> + <el-pagination + style="float: right" + @size-change="handleSizeChange" + @current-change="currentChange" + :current-page="currentPage" + :page-size="count" + :page-sizes="[15, 25, 35, 50]" + layout="total, sizes, prev, pager, next" + :total="total"> + </el-pagination> + </el-main> + </el-container> - - <el-table-column label="鎿嶄綔" min-width="280" fixed="right"> - <template slot-scope="scope"> - <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play" type="text" @click="sendDevicePush(scope.row)">鎾斁</el-button> - <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-switch-button" type="text" style="color: #f56c6c" v-if="!!scope.row.streamId" - @click="stopDevicePush(scope.row)">鍋滄 - </el-button> - <el-divider direction="vertical"></el-divider> - <el-button size="medium" icon="el-icon-s-open" type="text" v-if="scope.row.subCount > 0 || scope.row.parental === 1" - @click="changeSubchannel(scope.row)">鏌ョ湅 - </el-button> - <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider> - <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-camera" type="text" @click="queryRecords(scope.row)">璁惧褰曞儚 - </el-button> - </template> - </el-table-column> - </el-table> - <el-pagination - style="float: right" - @size-change="handleSizeChange" - @current-change="currentChange" - :current-page="currentPage" - :page-size="count" - :page-sizes="[15, 25, 35, 50]" - layout="total, sizes, prev, pager, next" - :total="total"> - </el-pagination> - </el-main> - </el-container> - - <!--璁惧鍒楄〃--> + <!--璁惧鍒楄〃--> </div> </template> @@ -123,7 +220,6 @@ <script> import devicePlayer from './dialog/devicePlayer.vue' import uiHeader from '../layout/UiHeader.vue' -import moment from "moment"; import DeviceService from "./service/DeviceService"; import DeviceTree from "./common/DeviceTree"; @@ -147,6 +243,7 @@ searchSrt: "", channelType: "", online: "", + subStream: "", winHeight: window.innerHeight - 200, currentPage: 1, count: 15, @@ -154,16 +251,23 @@ beforeUrl: "/deviceList", isLoging: false, showTree: false, - loadSnap: {} + loadSnap: {}, + ptzTypes: { + 0: "鏈煡", + 1: "鐞冩満", + 2: "鍗婄悆", + 3: "鍥哄畾鏋満", + 4: "閬ユ帶鏋満" + } }; }, mounted() { if (this.deviceId) { - this.deviceService.getDevice(this.deviceId, (result)=>{ - this.device = result; + this.deviceService.getDevice(this.deviceId, (result) => { + this.device = result; - }, (error)=>{ + }, (error) => { console.log("鑾峰彇璁惧淇℃伅澶辫触") console.error(error) }) @@ -218,6 +322,16 @@ if (res.data.code === 0) { that.total = res.data.data.total; that.deviceChannelList = res.data.data.list; + that.deviceChannelList.forEach(e => { + e.ptzType = e.ptzType + ""; + that.$set(e, "edit", false); + that.$set(e, "location", ""); + if (e.customLongitude && e.customLatitude) { + that.$set(e, "location", e.customLongitude + "," + e.customLatitude); + }else if (e.longitude && e.latitude) { + that.$set(e, "location", e.longitude + "," + e.latitude); + } + }); // 闃叉鍑虹幇琛ㄦ牸閿欎綅 that.$nextTick(() => { that.$refs.channelListTable.doLayout(); @@ -238,7 +352,10 @@ let that = this; this.$axios({ method: 'get', - url: '/api/play/start/' + deviceId + '/' + channelId + url: '/api/play/start/' + deviceId + '/' + channelId, + params: { + isSubStream: this.isSubStream + } }).then(function (res) { console.log(res) that.isLoging = false; @@ -259,7 +376,7 @@ that.initData(); }, 1000) - }else{ + } else { that.$message.error(res.data.msg); } }).catch(function (e) { @@ -268,17 +385,33 @@ // that.$message.error("璇锋眰瓒呮椂"); }); }, + moreClick: function (command, itemData) { + if (command === "records") { + this.queryRecords(itemData) + }else if (command === "cloudRecords") { + this.queryCloudRecords(itemData) + } + }, queryRecords: function (itemData) { - var format = moment().format("yyyy-MM-DD"); let deviceId = this.deviceId; let channelId = itemData.channelId; - this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format}) + + this.$router.push(`/gbRecordDetail/${deviceId}/${channelId}`) + }, + queryCloudRecords: function (itemData) { + let deviceId = this.deviceId; + let channelId = itemData.channelId; + + this.$router.push(`/cloudRecordDetail/rtp/${deviceId}_${channelId}`) }, stopDevicePush: function (itemData) { var that = this; this.$axios({ method: 'get', - url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId + url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId, + params: { + isSubStream: this.isSubStream + } }).then(function (res) { that.initData(); }).catch(function (error) { @@ -290,8 +423,8 @@ }); }, getSnap: function (row) { - let url = (process.env.NODE_ENV === 'development'? "debug": "") + '/api/device/query/snap/' + row.deviceId + '/' + row.channelId - return url + let baseUrl = window.baseUrl ? window.baseUrl : ""; + return ((process.env.NODE_ENV === 'development') ? process.env.BASE_API : baseUrl) + '/api/device/query/snap/' + row.deviceId + '/' + row.channelId; }, getBigSnap: function (row) { return [this.getSnap(row)] @@ -305,7 +438,7 @@ return; } setTimeout(() => { - let url = (process.env.NODE_ENV === 'development'? "debug": "") + '/api/device/query/snap/' + deviceId + '/' + channelId + let url = (process.env.NODE_ENV === 'development' ? "debug" : "") + '/api/device/query/snap/' + deviceId + '/' + channelId this.loadSnap[deviceId + channelId]++ document.getElementById(deviceId + channelId).setAttribute("src", url + '?' + new Date().getTime()) }, 1000) @@ -342,10 +475,20 @@ online: this.online, channelType: this.channelType } - }).then( (res) =>{ + }).then((res) => { if (res.data.code === 0) { this.total = res.data.data.total; this.deviceChannelList = res.data.data.list; + this.deviceChannelList.forEach(e => { + e.ptzType = e.ptzType + ""; + this.$set(e, "edit", false); + this.$set(e, "location", ""); + if (e.customLongitude && e.customLatitude) { + this.$set(e, "location", e.customLongitude + "," + e.customLatitude); + }else if (e.longitude && e.latitude) { + this.$set(e, "location", e.longitude + "," + e.latitude); + } + }); // 闃叉鍑虹幇琛ㄦ牸閿欎綅 this.$nextTick(() => { this.$refs.channelListTable.doLayout(); @@ -355,7 +498,7 @@ }).catch(function (error) { console.log(error); }); - }else { + } else { this.$axios({ method: 'get', url: `/api/device/query/tree/channel/${this.deviceId}`, @@ -364,7 +507,7 @@ page: this.currentPage, count: this.count, } - }).then((res)=> { + }).then((res) => { if (res.data.code === 0) { this.total = res.data.total; this.deviceChannelList = res.data.list; @@ -393,17 +536,54 @@ console.log(JSON.stringify(res)); }); }, + subStreamChange: function () { + this.$confirm('纭畾閲嶇疆鎵�鏈夐�氶亾鐨勭爜娴佺被鍨�?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(() => { + this.$axios({ + method: 'post', + url: `/api/device/query/channel/stream/identification/update/`, + params: { + deviceId: this.deviceId, + streamIdentification: this.subStream + } + }).then((res)=> { + console.log(JSON.stringify(res)); + this.initData() + }).finally(()=>{ + this.subStream = "" + }) + }).catch(() => { + this.subStream = "" + }); + + }, + channelSubStreamChange: function (row) { + this.$axios({ + method: 'post', + url: `/api/device/query/channel/stream/identification/update/`, + params: { + deviceId: this.deviceId, + channelId: row.channelId, + streamIdentification: row.streamIdentification + } + }).then(function (res) { + console.log(JSON.stringify(res)); + }); + }, refresh: function () { this.initData(); }, - switchTree: function (){ + switchTree: function () { this.showTree = true; this.deviceChannelList = []; this.parentChannelId = 0; this.currentPage = 1; }, - switchList: function (){ + switchList: function () { this.showTree = false; this.deviceChannelList = []; this.parentChannelId = 0; @@ -414,12 +594,71 @@ console.log(device) if (!!!data.channelId) { this.parentChannelId = device.deviceId; - }else { + } else { this.parentChannelId = data.channelId; } this.initData(); - } + }, + // 淇濆瓨 + handleSave(row) { + if (row.location) { + const segements = row.location.split(","); + if (segements.length !== 2) { + console.log(1) + this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378"); + return; + } else { + row.customLongitude = parseFloat(segements[0]); + row.customLatitude = parseFloat(segements[1]); + if (!(row.customLongitude && row.customLatitude)) { + this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378"); + return; + } + } + } else { + delete row.longitude; + delete row.latitude; + } + Object.keys(row).forEach(key => { + const value = row[key]; + if (value === null || value === undefined || (typeof value === "string" && value.trim() === "")) { + delete row[key]; + } + }); + this.$axios({ + method: 'post', + url: `/api/device/query/channel/update/${this.deviceId}`, + params: row + }).then(response => { + if (response.data.code === 0) { + this.$message.success("淇敼鎴愬姛锛�"); + this.initData(); + } else { + this.$message.error("淇敼澶辫触锛�"); + } + }).catch(_ => { + this.$message.error("淇敼澶辫触锛�"); + }) + }, + // 鏄惁姝e湪缂栬緫 + isEdit() { + let editing = false; + this.deviceChannelList.forEach(e => { + if (e.edit) { + editing = true; + } + }); + return editing; + }, + // 缂栬緫 + handleEdit(row) { + if (this.isEdit()) { + this.$message.warning('璇蜂繚瀛樺綋鍓嶇紪杈戦」锛�'); + } else { + row.edit = true; + } + } } }; </script> -- Gitblit v1.8.0