From 929cf4c7be11bfd1e134d0cb0d7cbbe94772ebdf Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期一, 07 九月 2020 15:35:14 +0800
Subject: [PATCH] 摄像机树增加导入功能
---
src/pages/cameraAccess/components/CameraInfo.vue | 148 +++---------------------------------------------
1 files changed, 11 insertions(+), 137 deletions(-)
diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index 83ef28a..24b9f41 100644
--- a/src/pages/cameraAccess/components/CameraInfo.vue
+++ b/src/pages/cameraAccess/components/CameraInfo.vue
@@ -207,25 +207,6 @@
eventAudio: new Audio(),
soundPath: '',
form: {
- latitude: 0,
- rtsp: "",
- longitude: 0,
- name: "",
- addr: "",
- alias: "",
- areaid: "",
- brand: "",
- id: "",
- ip: "",
- reserved: "",
- run_type: 0,
- isAI: false,
- username: "",
- password: "",
- cameraType: 0,
- resolution: "",
- voiceId: "",
- voiceEnable: false
},
// 璁板綍娣诲姞鐘舵��
isAdd: false,
@@ -321,7 +302,7 @@
if (node.type === "4") {
getCameraInfo(node.id).then(res => {
if (res.success) {
- console.log(res, '鑾峰彇鎽勫儚鏈轰俊鎭�')
+ // console.log(res, '鑾峰彇鎽勫儚鏈轰俊鎭�')
if (res.data.resolutions) {
let list = res.data.resolutions.map(i => {
let obj = {}
@@ -353,20 +334,22 @@
// 淇濆瓨
onSubmit(formName) {
let list = this.$refs.cameraEditor.getResult()
- console.log(list, "sensor")
+ // console.log(list, "sensor")
// id涓虹┖锛屾柊澧炴憚鍍忔満
this.$refs[formName].validate(async valid => {
if (valid) {
const isRequire = this.verifyRequrie();
if (!isRequire) return false;
+
+ this.form.latitude = Number.isNaN(parseFloat(this.form.latitude)) ? 0 : parseFloat(this.form.latitude);
+ this.form.longitude = Number.isNaN(parseFloat(this.form.longitude)) ? 0 : parseFloat(this.form.longitude);
+ this.form.sensors = list
+ this.form.resolution_width = Number(this.form.resolution.split("*")[0])
+ this.form.resolution_height = Number(this.form.resolution.split("*")[1])
+
// 鏇存柊
if (this.form.id !== "") {
this.form.areaid = this.TreeDataPool.getParent(this.form.id, this.isGb28182);
- this.form.latitude = Number.isNaN(parseFloat(this.form.latitude)) ? 0 : parseFloat(this.form.latitude);
- this.form.longitude = Number.isNaN(parseFloat(this.form.longitude)) ? 0 : parseFloat(this.form.longitude);
- this.form.sensors = list
- this.form.resolution_width = Number(this.form.resolution.split("*")[0])
- this.form.resolution_height = Number(this.form.resolution.split("*")[1])
updateCameraInfo(this.form).then(rsp => {
if (rsp.success) {
this.$notify({
@@ -384,26 +367,7 @@
});
} else {
this.form.areaid = this.addParentId;
- this.form.sensors = list
- const { ...json } = this.form;
- createCamera({
- latitude: parseFloat(json.latitude),
- rtsp: this.form.rtsp,
- longitude: parseFloat(json.longitude),
- name: this.form.name,
- addr: this.form.addr,
- areaid: this.form.areaid,
- brand: this.form.brand,
- id: this.form.id,
- ip: this.form.ip,
- port: parseFloat(json.port),
- reserved: this.form.reserved,
- run_type: this.form.isAI ? this.form.run_type : -1,
- username: this.form.username,
- password: this.form.password,
- areaId: this.form.areaId,
- sensors: this.form.sensors
- }).then(rsp => {
+ createCamera(this.form).then(rsp => {
if (rsp.success) {
this.$notify({
type: "success",
@@ -494,7 +458,7 @@
id: "",
ip: "",
reserved: "",
- run_type: 0,
+ run_type: -1,
isAI: false,
username: "",
password: "",
@@ -508,96 +472,6 @@
this.isAdd = true;
this.addParentId = node;
this.initFormData();
- },
- //瀹炴椂銆佽疆璇㈠垏鎹�
- changePoll(row) {
- // console.log(row,'瀹炴椂銆佽疆璇㈠垏鎹�',this.form,this.PollData.RealTimeSum)
- //鍒ゆ柇鏄柊澧炶繕鏄洿鏂�
- if (this.form.id && this.form.id !== undefined) {
- if (this.PollData.RealTimeSum < 16) {
- if (row.value) {
- this.form.run_type = 1
- } else {
- this.form.run_type = 0
- }
- changeRunType({ camera_ids: [this.form.id], run_type: this.form.run_type }).then(
- rsp => {
- if (rsp && rsp.success) {
- this.$notify({
- type: "success",
- message: "閰嶇疆鎴愬姛"
- });
- } else {
- this.$notify({
- type: "error",
- message: "閰嶇疆澶辫触"
- });
- }
- }
- );
- } else {
- if (this.form.run_type === 1) {
- this.form.run_type = 0
- changeRunType({ camera_ids: [this.form.id], run_type: this.form.run_type }).then(
- rsp => {
- if (rsp && rsp.success) {
- this.$notify({
- type: "success",
- message: "閰嶇疆鎴愬姛"
- });
- } else {
- this.$notify({
- type: "error",
- message: "閰嶇疆澶辫触"
- });
- }
- }
- );
- }
- this.$nextTick(() => {
- this.$set(this.form, 'run_type', 0)
- })
- // this.$notify({
- // type: 'warning',
- // message: '瀹炴椂澶勭悊璺暟宸茶揪鏈�澶у鐞嗚矾鏁帮紒'
- // })
- }
- this.TreeDataPool.fetchTreeData();
- this.PollData.statisticTaskInfo();
- }
- },
- //鏄惁杩涜瑙嗛鍒嗘瀽澶勭悊
- pollEnable(row) {
- // console.log(row,'瀹炴椂銆佽疆璇㈠垏鎹�')
- if (row) {
- if (this.PollData.RealTimeSum < 16) {
- this.form.run_type = 1
- } else {
- this.form.run_type = 0
- }
- } else {
- this.form.run_type = -1
- }
- if (this.form.id && this.form.id !== undefined) {
- changeRunType({ camera_ids: [this.form.id], run_type: this.form.run_type }).then(
- rsp => {
- if (rsp && rsp.success) {
- this.$notify({
- type: "success",
- message: "閰嶇疆鎴愬姛"
- });
- } else {
- this.$notify({
- type: "error",
- message: "閰嶇疆澶辫触"
- });
- }
- this.selectCamera(this.TreeDataPool.selectedNode)
- }
- );
- }
- this.TreeDataPool.fetchTreeData();
- this.PollData.statisticTaskInfo();
}
}
};
--
Gitblit v1.8.0