From 1b1296ed45070c4460879afeedf0cdcac5353731 Mon Sep 17 00:00:00 2001 From: 4670101279 Date: Tue, 28 Jun 2022 16:41:56 +0800 Subject: [PATCH] youhua --- .gitignore | 23 +++++ src/views/data/currdata/index.vue | 10 +- src/views/data/monitor/index.vue | 2 +- src/views/data/photo/index.vue | 4 +- src/views/web/camera/index.vue | 157 ++++++++++++++++++++++++++++++ 5 files changed, 188 insertions(+), 8 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..78a752d --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock diff --git a/src/views/data/currdata/index.vue b/src/views/data/currdata/index.vue index 7ab14ce..91d5c0d 100644 --- a/src/views/data/currdata/index.vue +++ b/src/views/data/currdata/index.vue @@ -9,10 +9,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -26,7 +26,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -91,7 +91,7 @@ export default { total: 100, // 实时数据表格数据 currdataList: [ - {stnmId: 1,stnm:'鄞州公园',ip:'123.2.4.1',value:'2.95',tm: '2022-06-08 13:00:00'}, + {stnmId: 1,stnm:'鄞州公园',ip:'视频水位计-yzgy',value:'2.95',tm: '2022-06-08 13:00:00'}, {stnmId: 2,stnm:'画龙',ip:'123.2.3.2',value:'39.2',tm: '2022-06-08 13:00:00'}, {stnmId: 3,stnm:'大盘山',ip:'123.2.3.3',value:'41.2',tm: '2022-06-08 13:00:00'}, {stnmId: 4,stnm:'大石门',ip:'123.2.3.4',value:'45.3',tm: '2022-06-08 13:00:00'}, diff --git a/src/views/data/monitor/index.vue b/src/views/data/monitor/index.vue index 083683a..e57af0b 100644 --- a/src/views/data/monitor/index.vue +++ b/src/views/data/monitor/index.vue @@ -4,7 +4,7 @@
-
摄像机列表
+
水位计列表
{{item.stnm + " (" + item.ip + ")"}}
diff --git a/src/views/data/photo/index.vue b/src/views/data/photo/index.vue index afb0a71..ec51c32 100644 --- a/src/views/data/photo/index.vue +++ b/src/views/data/photo/index.vue @@ -9,10 +9,10 @@ @keyup.enter.native="handleQuery" /> - + diff --git a/src/views/web/camera/index.vue b/src/views/web/camera/index.vue index 573b503..92aa3b4 100644 --- a/src/views/web/camera/index.vue +++ b/src/views/web/camera/index.vue @@ -77,6 +77,13 @@ @@ -174,6 +241,21 @@ export default { form: {}, // 表单校验 rules: { + }, + // ftp配置 + ftp: { + open: false, + form: { + address: '', + port: '', + username: '', + password: '', + pathRule: '', + isEnable: '', + devsn: '' + }, + run: false, + width: '100px' } }; }, @@ -210,6 +292,19 @@ export default { }; this.resetForm("form"); }, + // 表单重置 + ftpCfgReset() { + this.ftp.form = { + address: '', + port: '', + username: '', + password: '', + pathRule: '', + isEnable: '', + devsn: '' + }; + this.resetForm("form"); + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; @@ -243,6 +338,25 @@ export default { this.title = "修改"; } }, + async openFtpCfg(row){ + this.ftpCfgReset(); + const id = row.id; + let res = await this.$axiosGet('/camera/ftp/getNetCfg',{'cameraId': id}); + if(res.code === 0){ + this.ftp.form = res.data; + this.ftp.run = this.ftp.form.isEnable == 1; + this.ftp.open = true; + } + }, + // 发送ftp配置表单 + async ftpConfirm() { + this.ftp.form.isEnable = this.ftp.run ? 1 : 0; + let res = await this.$axiosPost('/camera/ftp/editNetCfg',this.ftp.form); + if(res.code === 0){ + this.$modal.msgSuccess("修改成功"); + this.ftp.open = false; + } + }, async reboot(row) { const id = row.id; const status = row.status; @@ -317,3 +431,46 @@ export default { } }; + +