From 82d8cf2628b7d8f741b53053855b9cfed97b13c9 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 17 十一月 2022 11:23:48 +0800
Subject: [PATCH] 删除debugger
---
src/pages/cameraAccess/components/SystemInfo.vue | 8
src/pages/systemSettings/components/ClusterManagement.vue | 1
src/pages/cameraAccess/components/LinkageRule.vue | 1
src/components/subComponents/VueCron.vue | 1
src/pages/cameraPlayer/components/player/index.vue | 28 +-
src/pages/maintain/index/App.vue | 1
src/pages/desktop/index/App.vue | 1
src/components/subComponents/FileUpload/file.vue | 1
src/components/subComponents/FileUpload/btn.vue | 1
src/pages/settings/views/NetSettings.vue | 437 +++++++++++++++----------------------------
src/pages/cameraAccess/components/SceneRule.vue | 1
src/pages/changchunTrack/index/Video.vue | 1
src/pages/visual/Pool/TreeData.ts | 2
src/components/giantTree/index.vue | 2
src/components/treeMenu/jsTree/tree.vue | 1
src/pages/cameraPlayer/index/App.vue | 98 +++++++--
src/pages/library/components/carList.vue | 2
src/pages/vindicate/views/backUp.vue | 1
src/pages/library/components/personList.vue | 1
src/pages/settings/views/generalSettings.vue | 2
20 files changed, 243 insertions(+), 348 deletions(-)
diff --git a/src/components/giantTree/index.vue b/src/components/giantTree/index.vue
index ab602d2..f6fad7c 100644
--- a/src/components/giantTree/index.vue
+++ b/src/components/giantTree/index.vue
@@ -315,10 +315,10 @@
itemCheck(evt, treeId, treeNode) {
this.TreeDataPool.selectedNode = treeNode;
this.TreeDataPool.treeType = this.treeName;
- debugger;
// 澶氶��
// this.ztreeObj.checkNode(treeNode, true, false, false);
let checkedNodes = this.ztreeObj.getCheckedNodes(true);
+ console.log("itemCheck checkedNodes:", checkedNodes)
this.TreeDataPool.updateZTreeCheckNodes(checkedNodes);
// 瀹炴椂缁熻閫変腑涓暟
diff --git a/src/components/subComponents/FileUpload/btn.vue b/src/components/subComponents/FileUpload/btn.vue
index 9f9d27b..ca7ccc5 100644
--- a/src/components/subComponents/FileUpload/btn.vue
+++ b/src/components/subComponents/FileUpload/btn.vue
@@ -34,7 +34,6 @@
mounted() {
this.$nextTick(() => {
- debugger;
let props = { accept: "" };
if (this.sourceType == 1) {
props.accept = ".mp4";
diff --git a/src/components/subComponents/FileUpload/file.vue b/src/components/subComponents/FileUpload/file.vue
index a0cb881..3b6bd00 100644
--- a/src/components/subComponents/FileUpload/file.vue
+++ b/src/components/subComponents/FileUpload/file.vue
@@ -106,7 +106,6 @@
const isFolder = this.file.isFolder;
let type = isFolder ? "folder" : "unknown";
const categoryMap = this.file.uploader.opts.categoryMap;
- debugger
const typeMap = categoryMap || {
image: ["gif", "jpg", "jpeg", "png", "bmp", "webp"],
video: ["mp4", "m3u8", "rmvb", "avi", "swf", "3gp", "mkv", "flv"],
diff --git a/src/components/subComponents/VueCron.vue b/src/components/subComponents/VueCron.vue
index 07dcc3c..d5d59a0 100644
--- a/src/components/subComponents/VueCron.vue
+++ b/src/components/subComponents/VueCron.vue
@@ -184,7 +184,6 @@
obj.week
},
save() {
- debugger
this.$emit("update", this.cronText)
}
}
diff --git a/src/components/treeMenu/jsTree/tree.vue b/src/components/treeMenu/jsTree/tree.vue
index 81f2d1a..353f853 100644
--- a/src/components/treeMenu/jsTree/tree.vue
+++ b/src/components/treeMenu/jsTree/tree.vue
@@ -262,7 +262,6 @@
}
}
var dataItem = self.initializeDataItem(data[i]);
- debugger
self.$set(oriParent, i, dataItem);
}
} else {
diff --git a/src/pages/cameraAccess/components/LinkageRule.vue b/src/pages/cameraAccess/components/LinkageRule.vue
index d57a3d7..f3a76be 100644
--- a/src/pages/cameraAccess/components/LinkageRule.vue
+++ b/src/pages/cameraAccess/components/LinkageRule.vue
@@ -267,7 +267,6 @@
},
showRules() {
this.tableRuleList = [];
-
if (this.selectedCameraIds.length > 0) {
this.loadingRuleList = true;
let seq = this.newUid();
diff --git a/src/pages/cameraAccess/components/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
index dea5d2e..8bcc9ab 100644
--- a/src/pages/cameraAccess/components/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -324,7 +324,6 @@
});
return false;
}
- debugger;
this.eventAudio.src = "/httpImage/" + this.soundPath;
if (this.togglePlay) {
this.eventAudio.play();
diff --git a/src/pages/cameraAccess/components/SystemInfo.vue b/src/pages/cameraAccess/components/SystemInfo.vue
index 0458385..685f817 100644
--- a/src/pages/cameraAccess/components/SystemInfo.vue
+++ b/src/pages/cameraAccess/components/SystemInfo.vue
@@ -146,13 +146,7 @@
initCpuCharts() {
this.$forceUpdate();
},
- },
- mounted() {
- console.log(
- "PollData.RealTimeValidCount",
- this.PollData.RealTimeValidCount
- );
- },
+ }
};
</script>
<style lang="scss">
diff --git a/src/pages/cameraPlayer/components/player/index.vue b/src/pages/cameraPlayer/components/player/index.vue
index c2102e9..f0d4d89 100644
--- a/src/pages/cameraPlayer/components/player/index.vue
+++ b/src/pages/cameraPlayer/components/player/index.vue
@@ -38,7 +38,7 @@
default: false
}
},
-
+
computed: {
poster() {
return "/images/player/player_poster.gif?t=" + Math.random()
@@ -75,7 +75,7 @@
if (id !== this.wfsId) {
return
}
-
+
if (this.wfs.websocketLoader && this.wfs.websocketLoader.client) {
if (this.wfs.websocketLoader.client.disconnected) {
this.clickStart();
@@ -83,7 +83,7 @@
return
}
}
-
+
let _this = this;
setTimeout(() => {
_this.checkConnect(id)
@@ -93,11 +93,11 @@
if (this.rtspUrl == "") {
return;
}
-
+
if (this.cameraID == "") {
this.cameraID = this.getUuid();
}
-
+
if (Wfs.isSupported()) {
let wsAddr = this.wsAddr;
let cameraInfo = {
@@ -106,14 +106,14 @@
isRunning: this.isRunning,
isGb28181: this.isGb
};
-
+
// let camera = document.getElementById(this.cameraID);
let camera = this.$refs.videoPlayer;
this.wfs = new Wfs();
let randomId = this.getUuid();
this.wfsId = randomId;
this.wfs.attachMedia(camera, "chX", "H264Raw", wsAddr, cameraInfo);
-
+
this.checkConnect(randomId)
}
},
@@ -123,8 +123,8 @@
for (var i = 0; i < 36; i++) {
s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
}
- s[14] = "4"; //聽bits聽12-15聽of聽the聽time_hi_and_version聽field聽to聽0010
- s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); //聽bits聽6-7聽of聽the聽clock_seq_hi_and_reserved聽to聽01
+ s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
+ s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
s[8] = s[13] = s[18] = s[23] = "-";
var uuid = s.join("");
return uuid;
@@ -135,7 +135,7 @@
}
};
</script>
-
+
<style lang="scss">
#area-canvas {
background: transparent;
@@ -146,7 +146,7 @@
width: 100%;
height: 100%;
}
-
+
video {
object-fit: fill;
width: 100%;
@@ -164,7 +164,7 @@
width: 100%;
height: 10%;
background: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.9));
-
+
i {
float: right;
font-size: 15px;
@@ -179,10 +179,10 @@
}
}
}
-
+
.video-player:hover {
.controls {
display: block;
}
}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/cameraPlayer/index/App.vue b/src/pages/cameraPlayer/index/App.vue
index dcdb03c..172afb9 100644
--- a/src/pages/cameraPlayer/index/App.vue
+++ b/src/pages/cameraPlayer/index/App.vue
@@ -1,50 +1,102 @@
<template>
<div style="width:100%; height: 100%;">
- <camera-player :cameraID="query.cameraId" :rtspUrl="query.rtspUrl" :isGb="query.gb28181 ==='1'"></camera-player>
+ <camera-player
+ :cameraID="query.cameraId"
+ :rtspUrl="query.rtspUrl"
+ :isGb="query.gb28181 === '1'"
+ v-if="!enableWasm"
+ ></camera-player>
+ <wasm-player
+ :cameraID="query.cameraId"
+ :rtspUrl="query.rtspUrl"
+ :isGb="query.gb28181 === '1'"
+ :videoUrl="query.videoUrl"
+ :isStream="isStream"
+ v-else
+ ></wasm-player>
</div>
</template>
-
+
<script>
// 鎺ュ彛浣跨敤
-// 鍙傛暟 cameraId 鎽勫儚鏈篿d, rtspUrl 鎽勫儚鏈簉tsp鍦板潃, gb28181 鏄惁鏄浗鏍囨憚鍍忔満(1 鎴� 0)
+// 鍙傛暟 cameraId 鎽勫儚鏈篿d, rtspUrl 鎽勫儚鏈簉tsp鍦板潃, gb28181 鏄惁鏄浗鏍囨憚鍍忔満(1 鎴� 0), enableWasm 浣跨敤wasm 鎾斁鍣�, isStream 鏄惁鎾斁瀹炴椂娴�, videoUrl 瑙嗛鏂囦欢鍦板潃
// http://192.168.20.191:7003/view/cameraPlayer/index.html?cameraId=e7e6157a-5929-4e78-b390-e365141169c8&rtspUrl=rtsp://admin:a1234567@192.168.5.51:554/h264/ch1/main/av_stream
-
-import CameraPlayer from "../components/player";
-
+
+import CameraPlayer from "../components/player"
+import WasmPlayer from "@/components/wasmPlayer"
+
export default {
name: "BasicCameraPlayer",
components: {
- CameraPlayer
+ CameraPlayer,
+ WasmPlayer
},
data() {
return {
query: {
cameraId: "",
rtspUrl: "",
- gb28181: "0"
- }
+ gb28181: "0",
+ videoUrl: `${location.protocol === "https" ? "wss" : "ws"}://${location.host}/ws`
+ },
+ enableWasm: false,
+ isStream: true
}
},
mounted() {
- this.urlParse();
+ this.urlParse()
},
methods: {
urlParse() {
- let url = window.location.search;
- let obj = {};
- let reg = /[?&][^?&]+=[^?&]+/g;
- let arr = url.match(reg);
+ let url = window.location.search
+ let obj = {}
+ let reg = /[?&][^?&]+=[^?&]+/g
+ let arr = url.match(reg)
if (arr) {
arr.forEach((item) => {
- let temArr = item.substring(1).split('=');
- let key = decodeURIComponent(temArr[0]);
- let value = decodeURIComponent(temArr[1]);
- obj[key] = value;
- });
+ let temArr = item.substring(1).split("=")
+ let key = decodeURIComponent(temArr[0])
+ let value = decodeURIComponent(temArr[1])
+ obj[key] = value
+ if (key == "rtspUrl") {
+ obj[key] = this.rtspParse(value)
+ }
+
+ if (key == "enableWasm" && value == "1") {
+ this.enableWasm = true
+ }
+ if (key == "isStream" && value == "0") {
+ this.isStream = false
+ }
+ })
}
- this.query = Object.assign({}, this.query, obj);
- console.log("cameraPlayer:", this.query)
+ this.query = Object.assign({}, this.query, obj)
+ console.log("cameraPlayer:", this.query, "enableWasm:", this.enableWasm, "isStream:", this.isStream)
+ },
+ // 瀵逛紶鍏ョ殑rtsp瀵嗙爜杩涜urlEncode澶勭悊
+ rtspParse(input) {
+ // 鏃犳晥鐨剅tsp鍦板潃
+ if (!input.length || input.indexOf("rtsp://") != 0) {
+ return
+ }
+
+ let userinfoSplitPos = input.indexOf(":", 7)
+ let userinfoEndPos = input.lastIndexOf("@")
+
+ // 鏈寘鍚櫥褰曚俊鎭殑rtsp鍦板潃, 鐩存帴杩斿洖鍘焨rl
+ if (userinfoSplitPos == -1 || userinfoEndPos == -1 || userinfoEndPos < userinfoSplitPos) {
+ return input
+ }
+
+ let usrPassword = input.slice(userinfoSplitPos + 1, userinfoEndPos)
+ if (usrPassword.indexOf("@") != -1) {
+ return input
+ }
+
+ let encodePassword = encodeURIComponent(usrPassword)
+
+ return input.replace(usrPassword, encodePassword)
}
}
-};
-</script>
+}
+</script>
\ No newline at end of file
diff --git a/src/pages/changchunTrack/index/Video.vue b/src/pages/changchunTrack/index/Video.vue
index 1f1b84a..5145fbc 100644
--- a/src/pages/changchunTrack/index/Video.vue
+++ b/src/pages/changchunTrack/index/Video.vue
@@ -219,7 +219,6 @@
this.list2TakeTurn.push(info);
}
});
- // debugger
if (this.list2TakeTurn.length == 0 && res.data.length) {
this.list2TakeTurn.push(res.data[0]);
}
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index 023e7ee..97d9b3d 100644
--- a/src/pages/desktop/index/App.vue
+++ b/src/pages/desktop/index/App.vue
@@ -93,7 +93,6 @@
this.showApps();
}
if (e.data.msg == "checkSN") {
- debugger;
this.$refs.desktop.validateSn();
}
if (e.data.msg === "changeColor") {
diff --git a/src/pages/library/components/carList.vue b/src/pages/library/components/carList.vue
index 7be0a09..0a36390 100644
--- a/src/pages/library/components/carList.vue
+++ b/src/pages/library/components/carList.vue
@@ -753,7 +753,6 @@
},
data() {
var checkCar = (rule, value, callback) => {
- debugger;
if (!value) {
return callback();
} else {
@@ -977,7 +976,6 @@
data: fd,
});
if (res.success) {
- debugger;
this.form.carUrls.push({ url: "/httpImage/" + res.data.picUrl });
}
},
diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index 4048acb..85f0b83 100644
--- a/src/pages/library/components/personList.vue
+++ b/src/pages/library/components/personList.vue
@@ -1121,7 +1121,6 @@
},
deleteThis() {
- debugger;
deleteDbPersonById({ id: this.toDeleteId })
.then((data) => {
if (data.success) {
diff --git a/src/pages/maintain/index/App.vue b/src/pages/maintain/index/App.vue
index 1aa87ed..7f0e417 100644
--- a/src/pages/maintain/index/App.vue
+++ b/src/pages/maintain/index/App.vue
@@ -239,7 +239,6 @@
})
},
setRebootCron(value) {
- debugger
this.rebootCron = value
setRebootTask({ task: value }).then(rsp => {
if (rsp && rsp.success) {
diff --git a/src/pages/settings/views/NetSettings.vue b/src/pages/settings/views/NetSettings.vue
index fa61b0f..b23ecd6 100644
--- a/src/pages/settings/views/NetSettings.vue
+++ b/src/pages/settings/views/NetSettings.vue
@@ -20,28 +20,15 @@
<div class="net-right" v-loading="configLoading">
<div class="net-set" v-if="activePage == 0">
<div class="title">缃戠粶璁剧疆</div>
- <el-form
- :model="ruleForm"
- :rules="rules"
- ref="joinForm"
- class="join-form"
- >
+ <el-form :model="ruleForm" :rules="rules" ref="joinForm" class="join-form">
<el-form-item prop="deviceName">
<div class="p-title">璁惧鍚嶇О</div>
- <el-input
- v-model="ruleForm.deviceName"
- size="small"
- placeholder="蹇呭～"
- ></el-input>
+ <el-input v-model="ruleForm.deviceName" size="small" placeholder="蹇呭～"></el-input>
</el-form-item>
<el-form-item prop="port">
<div class="p-title">绔彛</div>
- <el-input
- v-model="ruleForm.port"
- placeholder="閫夊～锛屽閮ㄨ闂殑绔彛"
- size="small"
- ></el-input>
+ <el-input v-model="ruleForm.port" placeholder="閫夊～锛屽閮ㄨ闂殑绔彛" size="small"></el-input>
</el-form-item>
</el-form>
<!-- <div class="save-btn" @click="saveServerName">淇濆瓨</div> -->
@@ -53,37 +40,22 @@
<div class="wifi-set" v-if="activePage == 1 && !inWifiDetail">
<div class="title">鏃犵嚎缃戠粶</div>
- <switchBar
- :barName="`鏃犵嚎缃戝崱`"
- @switchChange="wifiControl"
- :value="isOpenWifi"
- ></switchBar>
+ <switchBar :barName="`鏃犵嚎缃戝崱`" @switchChange="wifiControl" :value="isOpenWifi"></switchBar>
<div class="wifi-option" v-for="(item, i) in wifiList" :key="i">
<div class="name">
- <span class="icon iconfont" v-if="item.isConnected"
- ></span
- >
- <span
- :style="!item.isConnected ? { 'margin-left': '24px' } : {}"
- >{{ item.name }}</span
- >
+ <span class="icon iconfont" v-if="item.isConnected"></span>
+ <span :style="!item.isConnected ? { 'margin-left': '24px' } : {}">{{ item.name }}</span>
</div>
<div class="more-detail">
<span class="icon iconfont lock"></span>
<span class="icon iconfont signal"></span>
- <span class="icon iconfont more-icon" @click="checkWifi(item)"
- ></span
- >
+ <span class="icon iconfont more-icon" @click="checkWifi(item)"></span>
</div>
</div>
</div>
- <div
- class="wifi-detail"
- v-if="activePage == 1 && inWifiDetail"
- ref="ipvHolder"
- >
+ <div class="wifi-detail" v-if="activePage == 1 && inWifiDetail" ref="ipvHolder">
<div class="title">鏃犵嚎缃戠粶</div>
<div class="btns">
<div class="cancel">鍒犻櫎</div>
@@ -97,21 +69,12 @@
<el-form-item prop="name">
<div class="p-title">鍚嶇О</div>
<!-- <div class="wifi-name">{{ 12123 }}</div> -->
- <el-input
- v-model="wifiForm.name"
- placeholder=""
- size="small"
- ></el-input>
+ <el-input v-model="wifiForm.name" placeholder="" size="small"></el-input>
</el-form-item>
<el-form-item prop="password">
<div class="p-title">瀵嗙爜</div>
- <el-input
- v-model="wifiForm.password"
- placeholder="璇疯緭鍏ュ瘑鐮�"
- size="small"
- show-password
- ></el-input>
+ <el-input v-model="wifiForm.password" placeholder="璇疯緭鍏ュ瘑鐮�" size="small" show-password></el-input>
</el-form-item>
</el-form>
</div>
@@ -121,22 +84,13 @@
<div class="general-box fold" :class="{ hidden: IPV4_hid }">
<div class="in-title">
IPV4
- <span
- class="icon iconfont icon-fold"
- @click="toggleFold('IPV4_hid')"
- ></span
- >
+ <span class="icon iconfont icon-fold" @click="toggleFold('IPV4_hid')"></span>
</div>
<el-form :model="ipv4Form" :rules="ipv4FormRules" ref="ipv4Form">
<el-form-item>
<div class="p-title">鏂规硶</div>
- <el-select
- v-model="value"
- placeholder="璇烽�夋嫨"
- size="small"
- :popper-append-to-body="false"
- >
+ <el-select v-model="value" placeholder="璇烽�夋嫨" size="small" :popper-append-to-body="false">
<el-option
v-for="item in options"
:key="item.value"
@@ -147,66 +101,38 @@
</el-form-item>
<el-form-item prop="ip">
<div class="p-title">IP</div>
- <ip-input
- :ip="ipv4Form.ip"
- @on-blur="ipv4Form.ip = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.ip" @on-blur="ipv4Form.ip = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="subMask">
<div class="p-title">瀛愮綉鎺╃爜</div>
- <ip-input
- :ip="ipv4Form.subMask"
- @on-blur="ipv4Form.subMask = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.subMask" @on-blur="ipv4Form.subMask = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="gateway">
<div class="p-title">缃戝叧</div>
- <ip-input
- :ip="ipv4Form.gateway"
- @on-blur="ipv4Form.gateway = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.gateway" @on-blur="ipv4Form.gateway = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="dns">
<div class="p-title">棣栭�塂NS</div>
- <ip-input
- :ip="ipv4Form.dns1"
- @on-blur="ipv4Form.dns1 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.dns1" @on-blur="ipv4Form.dns1 = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="dns">
<div class="p-title">澶囩敤DNS</div>
- <ip-input
- :ip="ipv4Form.dns2"
- @on-blur="ipv4Form.dns2 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.dns2" @on-blur="ipv4Form.dns2 = arguments[0]"></ip-input>
</el-form-item>
</el-form>
</div>
- <div
- class="general-box fold"
- :class="{ hidden: IPV6_hid }"
- ref="ipv6Holder"
- >
+ <div class="general-box fold" :class="{ hidden: IPV6_hid }" ref="ipv6Holder">
<div class="in-title">
IPV6
- <span
- class="icon iconfont icon-fold"
- @click="toggleFold('IPV6_hid')"
- ></span
- >
+ <span class="icon iconfont icon-fold" @click="toggleFold('IPV6_hid')"></span>
</div>
<el-form :model="ipv6Form" :rules="ipv6FormRules" ref="ipv6Form">
<el-form-item>
<div class="p-title">鏂规硶</div>
- <el-select
- v-model="value"
- placeholder="璇烽�夋嫨"
- size="small"
- :popper-append-to-body="false"
- >
+ <el-select v-model="value" placeholder="璇烽�夋嫨" size="small" :popper-append-to-body="false">
<el-option
v-for="item in options"
:key="item.value"
@@ -217,58 +143,36 @@
</el-form-item>
<el-form-item prop="ip">
<div class="p-title">IP</div>
- <ip-input
- :ip="ipv6Form.ip"
- @on-blur="ipv6Form.ip = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.ip" @on-blur="ipv6Form.ip = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="subMask">
<div class="p-title">鍓嶇紑</div>
<div style="display: flex; width: 100%">
- <el-input
- v-model="ipv6Form.prefix"
- placeholder
- size="small"
- ></el-input>
+ <el-input v-model="ipv6Form.prefix" placeholder size="small"></el-input>
<div class="ad">
<i class="el-icon-remove-outline" @click="minusPrefix"></i>
</div>
<div class="ad">
- <i
- class="el-icon-circle-plus-outline"
- @click="+ipv6Form.prefix++"
- ></i>
+ <i class="el-icon-circle-plus-outline" @click=";+ipv6Form.prefix++"></i>
</div>
<div class="ad">
- <i
- class="el-icon-refresh-left"
- @click="ipv6Form.prefix = ''"
- ></i>
+ <i class="el-icon-refresh-left" @click="ipv6Form.prefix = ''"></i>
</div>
</div>
</el-form-item>
<el-form-item prop="gateway">
<div class="p-title">缃戝叧</div>
- <ip-input
- :ip="ipv6Form.gateway"
- @on-blur="ipv6Form.gateway = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.gateway" @on-blur="ipv6Form.gateway = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="dns">
<div class="p-title">棣栭�塂NS</div>
- <ip-input
- :ip="ipv6Form.dns1"
- @on-blur="ipv6Form.dns1 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.dns1" @on-blur="ipv6Form.dns1 = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="dns">
<div class="p-title">澶囩敤DNS</div>
- <ip-input
- :ip="ipv6Form.dns2"
- @on-blur="ipv6Form.dns2 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.dns2" @on-blur="ipv6Form.dns2 = arguments[0]"></ip-input>
</el-form-item>
</el-form>
</div>
@@ -281,25 +185,12 @@
<div class="wire" v-if="activePage == 2 && !inWireDetail">
<div class="title">鏈夌嚎缃戠粶</div>
- <div
- class="wire-bar"
- v-for="(item, i) in wireArr"
- :key="i"
- @click.self="checkWire(item)"
- >
+ <div class="wire-bar" v-for="(item, i) in wireArr" :key="i" @click.self="checkWire(item)">
<div class="name">{{ "缃戠粶" + item.index }}</div>
<div class="right">
- <span
- class="icon iconfont good"
- v-if="item.lower_up && item.active"
- ></span
- >
- <span
- class="icon iconfont bad"
- v-if="!item.lower_up && item.active"
- ></span
- >
+ <span class="icon iconfont good" v-if="item.lower_up && item.active"></span>
+ <span class="icon iconfont bad" v-if="!item.lower_up && item.active"></span>
<el-switch
v-model="item.active"
active-color="#4E94FF"
@@ -322,32 +213,20 @@
</el-form-item>
<el-form-item prop="ip">
<div class="p-title">IP</div>
- <ip-input
- :ip="wireForm.ip"
- @on-blur="wireForm.ip = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.ip" @on-blur="wireForm.ip = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="subMask">
<div class="p-title">瀛愮綉鎺╃爜</div>
- <ip-input
- :ip="wireForm.subMask"
- @on-blur="wireForm.subMask = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.subMask" @on-blur="wireForm.subMask = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="gateway">
<div class="p-title">缃戝叧</div>
- <ip-input
- :ip="wireForm.gateway"
- @on-blur="wireForm.gateway = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.gateway" @on-blur="wireForm.gateway = arguments[0]"></ip-input>
</el-form-item>
<el-form-item prop="dns">
<div class="p-title">DNS</div>
- <ip-input
- :ip="wireForm.dns"
- @on-blur="wireForm.dns = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.dns" @on-blur="wireForm.dns = arguments[0]"></ip-input>
</el-form-item>
</el-form>
@@ -372,17 +251,17 @@
getNetWorkCardInfo,
getDevInfo,
downNetCard,
- upNetCard,
-} from "@/api/system";
+ upNetCard
+} from "@/api/system"
-import ipInput from "../components/IPInput";
-import switchBar from "../components/switchBar";
+import ipInput from "../components/IPInput"
+import switchBar from "../components/switchBar"
-import WifiGateway from "../components/WifiGateway";
-import LoraGateway from "../components/LoraGateway";
-import MqttGateway from "../components/MqttGateway";
+import WifiGateway from "../components/WifiGateway"
+import LoraGateway from "../components/LoraGateway"
+import MqttGateway from "../components/MqttGateway"
-import { isIPv4 } from "@/scripts/validate";
+import { isIPv4 } from "@/scripts/validate"
export default {
components: {
@@ -390,36 +269,36 @@
switchBar,
WifiGateway,
LoraGateway,
- MqttGateway,
+ MqttGateway
},
data() {
const checkPwd = (rule, value, callback) => {
if (!value) {
- return callback(new Error("瀵嗙爜涓嶈兘涓虹┖"));
+ return callback(new Error("瀵嗙爜涓嶈兘涓虹┖"))
}
setTimeout(() => {
if (value.length != 6) {
- callback(new Error("瀵嗙爜搴斾负6浣�!"));
+ callback(new Error("瀵嗙爜搴斾负6浣�!"))
} else {
- callback();
+ callback()
}
- }, 1000);
- };
+ }, 1000)
+ }
return {
isHighClass: false,
ruleForm: {
deviceName: "",
- port: "",
+ port: ""
},
wifiForm: {
name: "",
- password: "",
+ password: ""
},
wireArr: [],
inWifiDetail: false,
wifiList: [
{ name: "鏃犵嚎缃戠粶1", isConnected: false },
- { name: "鏃犵嚎缃戠粶2", isConnected: true },
+ { name: "鏃犵嚎缃戠粶2", isConnected: true }
],
isOpenWifi: false,
inWireDetail: false,
@@ -427,7 +306,7 @@
dns: "",
subMask: "",
gateway: "",
- ip: "",
+ ip: ""
},
originalConfig: {},
wireFormRules: {
@@ -435,43 +314,41 @@
{
required: true,
message: "璇疯緭鍏P鍦板潃",
- trigger: "change",
+ trigger: "change"
},
- { validator: isIPv4, trigger: "change" },
+ { validator: isIPv4, trigger: "change" }
],
gateway: [
{
required: true,
message: "璇疯緭鍏ョ綉鍏�",
- trigger: "change",
+ trigger: "change"
},
- { validator: isIPv4, trigger: "change" },
+ { validator: isIPv4, trigger: "change" }
],
dns: [
{
required: true,
message: "璇疯緭鍏ns鍦板潃",
- trigger: "change",
+ trigger: "change"
},
- { validator: isIPv4, trigger: "change" },
+ { validator: isIPv4, trigger: "change" }
],
subMask: [
{
required: true,
message: "璇疯緭鍏ュ瓙缃戞帺鐮�",
- trigger: "change",
+ trigger: "change"
},
- { validator: isIPv4, trigger: "change" },
- ],
+ { validator: isIPv4, trigger: "change" }
+ ]
},
activePage: 0,
activeWireItem: {},
rules: {
- deviceName: [
- { required: true, message: "璇疯緭鍏ヨ澶囧悕绉�", trigger: "change" },
- ],
+ deviceName: [{ required: true, message: "璇疯緭鍏ヨ澶囧悕绉�", trigger: "change" }]
},
ipv4Form: {},
ipv6Form: {},
@@ -482,108 +359,107 @@
{ name: "鏈夌嚎缃戠粶", icon: "\ue73b" },
{ name: "WiFi缃戝叧", icon: "\ue73b" },
{ name: "LORA缃戝叧", icon: "\ue73b" },
- { name: "MQTT缃戝叧", icon: "\ue73b" },
+ { name: "MQTT缃戝叧", icon: "\ue73b" }
],
ipv6FormRules: {},
options: [
{
value: "閫夐」1",
- label: "鑷姩",
+ label: "鑷姩"
},
{
value: "閫夐」2",
- label: "鎵嬪姩",
- },
+ label: "鎵嬪姩"
+ }
],
value: "",
IPV4_hid: false,
IPV6_hid: false,
- configLoading: false,
- };
+ configLoading: false
+ }
},
mounted() {
- this.getCurServer();
- this.fetchWireList();
+ this.getCurServer()
+ this.fetchWireList()
},
methods: {
minusPrefix() {
- debugger;
- this.ipv6Form.prefix;
+ this.ipv6Form.prefix
},
switchNetCard(item) {
if (item.active) {
upNetCard({ ifname: item.name }).then(
(res) => {
if (res.success) {
- this.$message.success(res.data);
- this.fetchWireList();
+ this.$message.success(res.data)
+ this.fetchWireList()
}
},
(err) => {
- item.active = false;
- this.$message.error(err.msg);
+ item.active = false
+ this.$message.error(err.msg)
}
- );
+ )
} else {
downNetCard({ ifname: item.name }).then(
(res) => {
if (res.success) {
- this.$message.success(res.data);
- this.fetchWireList();
+ this.$message.success(res.data)
+ this.fetchWireList()
}
},
(err) => {
- item.active = true;
- this.$message.error(err.msg);
+ item.active = true
+ this.$message.error(err.msg)
}
- );
+ )
}
},
getCurServer() {
getDevInfo().then((res) => {
- this.ruleForm.deviceName = res.data.server_name;
- this.ruleForm.port = res.data.server_port;
- });
+ this.ruleForm.deviceName = res.data.server_name
+ this.ruleForm.port = res.data.server_port
+ })
},
fetchWireList() {
getWireList().then((res) => {
if (res && res.success) {
- this.wireArr = res.data;
+ this.wireArr = res.data
this.wireArr.forEach((x) => {
- let t = x.flags.split("|")[0] == "up";
- this.$set(x, "active", t);
- });
+ let t = x.flags.split("|")[0] == "up"
+ this.$set(x, "active", t)
+ })
}
- });
+ })
},
cancelSaveWire() {
- this.inWireDetail = false;
- this.wireForm.ip = "";
- this.wireForm.gateway = "";
- this.wireForm.dns = "";
- this.wireForm.subMask = "";
- this.originalConfig = this.wireForm;
+ this.inWireDetail = false
+ this.wireForm.ip = ""
+ this.wireForm.gateway = ""
+ this.wireForm.dns = ""
+ this.wireForm.subMask = ""
+ this.originalConfig = this.wireForm
},
saveServerName() {
setServerName({
server_name: this.ruleForm.deviceName,
- server_port: this.ruleForm.port,
+ server_port: this.ruleForm.port
}).then((res) => {
if (res && res.success) {
- this.$message.success(res.data);
+ this.$message.success(res.data)
}
- });
+ })
},
openRight(i) {
if (i == 0) {
- this.ruleForm.deviceName = "";
- this.ruleForm.port = "";
- this.getCurServer();
+ this.ruleForm.deviceName = ""
+ this.ruleForm.port = ""
+ this.getCurServer()
}
if (i == 1) {
- this.inWifiDetail = false;
+ this.inWifiDetail = false
}
- this.activePage = i;
+ this.activePage = i
},
saveWire(ifname) {
this.$refs["wireForm"].validate((valid) => {
@@ -593,24 +469,21 @@
gateway: this.wireForm.gateway,
dns: this.wireForm.dns,
subMask: this.wireForm.subMask,
- ifname: this.activeWireItem.name,
- };
+ ifname: this.activeWireItem.name
+ }
- let newUri =
- location.protocol +
- "//" +
- data.ip +
- (location.port == 80 ? "" : ":" + location.port);
+ let newUri = location.protocol + "//" + data.ip + (location.port == 80 ? "" : ":" + location.port)
this.$confirm("纭闇�瑕佷慨鏀规湇鍔″櫒閰嶇疆鍚楋紵", {
center: true,
cancelButtonClass: "comfirm-class-cancle",
- confirmButtonClass: "comfirm-class-sure",
+ confirmButtonClass: "comfirm-class-sure"
})
.then(() => {
- this.configLoading = true;
+ this.configLoading = true
if (this.wireForm.ip !== this.originalConfig.ip) {
- this.configLoading = false;
+ this.configLoading = false
+ console.log("set time out")
var changeIPTimer = setTimeout(() => {
this.$alert(
'<strong>鎮ㄥ凡淇敼浜嗘湇鍔″櫒ip, 璇烽噸鏂扮櫥褰�</strong><a target="_parent" href="' +
@@ -621,99 +494,92 @@
"鎻愮ず",
{
dangerouslyUseHTMLString: true,
- customClass: "noticeBox",
+ customClass: "noticeBox"
}
- );
- }, 10000);
+ )
+ }, 10000)
}
setNetWorkCard(data)
.then((rsp) => {
- this.configLoading = false;
+ this.configLoading = false
if (rsp && rsp.success) {
this.$notify({
type: "success",
- message: "鏈嶅姟鍣ㄩ厤缃垚鍔�",
- });
+ message: "鏈嶅姟鍣ㄩ厤缃垚鍔�"
+ })
}
})
- .catch((err) => {
- clearTimeout(changeIPTimer);
- this.configLoading = false;
- this.$notify({
- type: "error",
- message: "淇濆瓨澶辫触",
- });
- });
+ .catch((err) => {})
this.$message({
message: "鎿嶄綔瀹屾垚,璇风◢鍚�",
- type: "success",
- });
+ type: "success"
+ })
})
- .catch((err) => {});
+ .catch((err) => {})
} else {
- return false;
+ return false
}
- });
+ })
},
wifiControl(val) {},
checkWifi() {
- this.inWifiDetail = true;
+ this.inWifiDetail = true
},
openWireDetail(item) {
- this.inWireDetail = true;
- this.activeWireItem = item;
+ this.inWireDetail = true
+ this.activeWireItem = item
getNetWorkCardInfo({
- ifname: item.name,
+ ifname: item.name
}).then(
(res) => {
if (res && res.success) {
- this.wireForm.ip = res.data.ip;
- this.wireForm.gateway = res.data.gateway;
- this.wireForm.dns = res.data.dns;
- this.wireForm.subMask = res.data.subMask;
- this.originalConfig = JSON.parse(JSON.stringify(this.wireForm));
+ this.wireForm.ip = res.data.ip
+ this.wireForm.gateway = res.data.gateway
+ this.wireForm.dns = res.data.dns
+ this.wireForm.subMask = res.data.subMask
+ this.originalConfig = JSON.parse(JSON.stringify(this.wireForm))
}
},
(err) => {
- this.$message.error("鏌ユ壘涓嶅埌鏁版嵁: " + err.msg);
+ this.$message.error("鏌ユ壘涓嶅埌鏁版嵁: " + err.msg)
}
- );
+ )
},
checkWire(item) {
if (item.addrs) {
- this.openWireDetail(item);
- return;
+ this.openWireDetail(item)
+ return
}
this.$confirm("鎮ㄨ繕鏈厤缃綉缁滀俊鎭紝鏄惁鐜板湪閰嶇疆锛�", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning",
- customClass: "confirmBox",
+ customClass: "confirmBox"
}).then(() => {
- this.openWireDetail(item);
- });
+ this.openWireDetail(item)
+ })
},
toggleFold(tog) {
- const demo = this.$refs.ipvHolder;
+ const demo = this.$refs.ipvHolder
if (!(this.IPV4_hid && !this.IPV6_hid)) {
setTimeout(() => {
demo.scrollIntoView({
block: "end",
inline: "nearest",
- behavior: "smooth",
- });
- }, 300);
+ behavior: "smooth"
+ })
+ }, 300)
}
- this[tog] = !this[tog];
- },
+ this[tog] = !this[tog]
+ }
},
computed: {
showStatus() {
- return this.wireArr.some((item) => item.lower_up == true);
- },
- },
-};
+ return this.wireArr.some((item) => item.lower_up == true)
+ }
+ }
+}
</script>
<style lang="scss">
.all {
@@ -855,11 +721,8 @@
border-radius: 8px;
margin-bottom: 4px;
}
- .el-form-item.is-required:not(.is-no-asterisk)
- > .el-form-item__label:before,
- .el-form-item.is-required:not(.is-no-asterisk)
- .el-form-item__label-wrap
- > .el-form-item__label:before {
+ .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label:before,
+ .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label:before {
display: none;
}
.el-select {
diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index 2cd47a2..40d4d5b 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -396,7 +396,6 @@
}).then((res) => {
if (res.success) {
sessionStorage.setItem("userInfo", JSON.stringify(res.data));
- debugger;
this.$message.success(res.msg);
}
});
@@ -482,7 +481,6 @@
if (res.success) {
window.parent.postMessage({ msg: "AppUpdate" }, "*");
sessionStorage.setItem("userInfo", JSON.stringify(res.data));
- debugger;
this.$message.success(res.msg);
}
});
diff --git a/src/pages/systemSettings/components/ClusterManagement.vue b/src/pages/systemSettings/components/ClusterManagement.vue
index 326a274..b6f12e2 100644
--- a/src/pages/systemSettings/components/ClusterManagement.vue
+++ b/src/pages/systemSettings/components/ClusterManagement.vue
@@ -292,7 +292,6 @@
},
data() {
const checkPwd = (rule, value, callback) => {
- debugger;
if (!value) {
return callback(new Error("瀵嗙爜涓嶈兘涓虹┖"));
}
diff --git a/src/pages/vindicate/views/backUp.vue b/src/pages/vindicate/views/backUp.vue
index aa2b81e..a120af8 100644
--- a/src/pages/vindicate/views/backUp.vue
+++ b/src/pages/vindicate/views/backUp.vue
@@ -176,7 +176,6 @@
},
recoverFile(bakDir) {
recoverBackup({ bakDir }).then((res) => {
- debugger;
res.data;
});
},
diff --git a/src/pages/visual/Pool/TreeData.ts b/src/pages/visual/Pool/TreeData.ts
index d6097a0..f940af2 100644
--- a/src/pages/visual/Pool/TreeData.ts
+++ b/src/pages/visual/Pool/TreeData.ts
@@ -79,6 +79,8 @@
this.gb28181Data.forEach((n: any) => {
nodeFilter(n);
});
+
+ console.log("treedata.", this.selectedNodes)
}
getParent(id: string): string {
--
Gitblit v1.8.0