From 1e129509ed433faa9f8b887977c9cc696fff3454 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Thu, 1 Sep 2022 15:41:23 +0800
Subject: [PATCH] =?UTF-8?q?3d=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E8=A7=A3?=
=?UTF-8?q?=E9=99=A4=E7=BB=91=E5=AE=9A=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2?=
=?UTF-8?q?=20=E7=9B=91=E6=8E=A7=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E4=BB=A5=E5=8F=8Abug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Crud/crud.js | 2 +-
.../listenManage/listenConfig/index.vue | 40 +++++++++++--------
.../listenManage/module/bindCamera.vue | 8 ++--
.../listenManage/videoListen/index.vue | 15 ++++---
.../tagManage/bindTagList/index.vue | 2 +-
.../storeManage/warehouse3DConfig/index.vue | 10 ++++-
6 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index 1ff444f..78fc608 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -262,7 +262,7 @@ function CRUD(options) {
crud.status.add = CRUD.STATUS.NORMAL
crud.resetForm()
crud.addSuccessNotify()
- if (res && res !== 'SUCCESS') {
+ if (res && res !== 'SUCCESS' && res !== '保存成功') {
callVmHook(crud, CRUD.HOOK.afterSubmit, res)
} else {
callVmHook(crud, CRUD.HOOK.afterSubmit)
diff --git a/src/views/storeManage/listenManage/listenConfig/index.vue b/src/views/storeManage/listenManage/listenConfig/index.vue
index ac078d7..4fdeee4 100644
--- a/src/views/storeManage/listenManage/listenConfig/index.vue
+++ b/src/views/storeManage/listenManage/listenConfig/index.vue
@@ -24,7 +24,7 @@
/>
-
+
@@ -39,10 +39,10 @@
>
-
-
-
-
+
+
+
+
{{ scope.row.create_time | parseTime }}
@@ -95,9 +95,9 @@ export default {
timeType: 0,
timeOptions: [
{ value: 0, label: '全部' },
- { value: 1, label: '事件触发前后10秒' },
- { value: 2, label: '事件触发前后20秒' },
- { value: 3, label: '事件触发前后30秒' }
+ { value: 10, label: '事件触发前后10秒' },
+ { value: 20, label: '事件触发前后20秒' },
+ { value: 30, label: '事件触发前后30秒' }
],
optionVal: 1,
options: [
@@ -112,15 +112,16 @@ export default {
},
methods: {
// 获取数据前的处理
- // [CRUD.HOOK.beforeRefresh]() {
- // this.crud.downloadLoading = true
- // this.crud.query.state = null
- // // this.crud.query.blurry = this.keyWord
- // if (this.oprType > -1) {
- // this.crud.query.state = this.oprType
- // }
- // this.crud.downloadLoading = false
- // },
+ [CRUD.HOOK.beforeRefresh]() {
+ // this.crud.downloadLoading = true
+ // this.crud.query.timeType = null
+ // this.crud.query.blurry = this.keyWord
+ // if (this.oprType > -1) {
+ // this.crud.query.state = this.oprType
+ // }
+ // this.crud.downloadLoading = false
+ // this.crud.query.createTime =
+ },
// 绑定摄像头
handleBind() {
this.$refs.bindDom.bindVisible = true
@@ -154,5 +155,10 @@ export default {
diff --git a/src/views/storeManage/listenManage/module/bindCamera.vue b/src/views/storeManage/listenManage/module/bindCamera.vue
index 75fd289..104686c 100644
--- a/src/views/storeManage/listenManage/module/bindCamera.vue
+++ b/src/views/storeManage/listenManage/module/bindCamera.vue
@@ -55,7 +55,7 @@ export default {
page: {
size: 10,
total: 0,
- page: 0
+ page: 1
},
loading: false,
selections: []
@@ -98,7 +98,7 @@ export default {
getAllCamera() {
this.loading = true
console.log(this.page.page)
- getDeviceList({ deviceTypeId: '7305DE3D273B0CAC079538', page: this.page.page, size: this.page.size }).then((data) => {
+ getDeviceList({ deviceTypeId: '7305DE3D273B0CAC079538', page: this.page.page - 1, size: this.page.size }).then((data) => {
this.loading = false
this.page.total = data.totalElements !== null ? data.totalElements : data.length
if (this.page.total > 0) {
@@ -110,13 +110,13 @@ export default {
},
// 当前页改变
pageChangeHandler(e) {
- this.page.page = e - 1
+ this.page.page = e
this.getAllCamera()
},
// 每页条数改变
sizeChangeHandler(e) {
this.page.size = e
- this.page.page = 0
+ this.page.page = 1
this.getAllCamera()
}
}
diff --git a/src/views/storeManage/listenManage/videoListen/index.vue b/src/views/storeManage/listenManage/videoListen/index.vue
index e87c8b4..3098642 100644
--- a/src/views/storeManage/listenManage/videoListen/index.vue
+++ b/src/views/storeManage/listenManage/videoListen/index.vue
@@ -4,7 +4,7 @@
-
+
下载失败
-
-
+
+
@@ -63,9 +63,7 @@ export default {
mixins: [presenter(), crud(), header()],
cruds() {
return CRUD({
- url: 'api/videomonitorng/list',
- sort: ['state'],
- optShow: {}
+ url: 'api/videomonitorng/list'
})
},
data() {
@@ -111,4 +109,9 @@ export default {
.text-red .text{
color:#F65163;
}
+.head-container{
+ .date-item{
+ width: 350px !important;
+ }
+}
diff --git a/src/views/storeManage/tagManage/bindTagList/index.vue b/src/views/storeManage/tagManage/bindTagList/index.vue
index 1046e38..501adc0 100644
--- a/src/views/storeManage/tagManage/bindTagList/index.vue
+++ b/src/views/storeManage/tagManage/bindTagList/index.vue
@@ -14,7 +14,7 @@
-
+
解除绑定
diff --git a/src/views/storeManage/warehouse3DConfig/index.vue b/src/views/storeManage/warehouse3DConfig/index.vue
index b8d7022..9caa35b 100644
--- a/src/views/storeManage/warehouse3DConfig/index.vue
+++ b/src/views/storeManage/warehouse3DConfig/index.vue
@@ -8,7 +8,7 @@
绑定参数
- 解除绑定
+ 解除绑定
@@ -377,4 +377,12 @@ export default {
::v-deep thead .el-table-column--selection .cell {
display: none;
}
+.head-container .el-button.unbind-btn{
+ border-color: #f65163;
+ background-color: #f65163;
+ .is-disabled{
+ border-color: #7a2831;
+ background-color: #7a2831;
+ }
+}