From aa56bb3c26201df2af46db0c2af4afd5345a6ba9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 14 六月 2024 09:47:19 +0800
Subject: [PATCH] 优化docker内ip变化的情况
---
web_src/src/components/channelList.vue | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 71b5e5c..ff1d784 100755
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -178,13 +178,24 @@
@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-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>
@@ -373,6 +384,13 @@
that.isLoging = false;
// that.$message.error("璇锋眰瓒呮椂");
});
+ },
+ moreClick: function (command, itemData) {
+ if (command === "records") {
+ this.queryRecords(itemData)
+ }else if (command === "cloudRecords") {
+ this.queryCloudRecords(itemData)
+ }
},
queryRecords: function (itemData) {
let deviceId = this.deviceId;
@@ -586,12 +604,13 @@
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.custom_latitude = parseFloat(segements[1]);
- if (!(row.longitude && row.latitude)) {
+ row.customLatitude = parseFloat(segements[1]);
+ if (!(row.customLongitude && row.customLatitude)) {
this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378");
return;
}
--
Gitblit v1.8.0