3d配置页面解除绑定按钮颜色 监控管理页面代码 以及bug修改

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)

src/views/storeManage/listenManage/listenConfig/index.vue

@@ -24,7 +24,7 @@
           />
         </el-select>
       </el-input>
-      <date-range-picker v-model="queryTime" class="date-item" />
+      <date-range-picker v-model="queryTime" type="datetimerange" class="date-item" />
       <rrOperation />
     </div>
     <!-- :cell-class-name="cell" -->
@@ -39,10 +39,10 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="100" align="center" />
-      <el-table-column prop="area" label="所属区域" align="center" min-width="150" />
-      <el-table-column prop="" label="设备" align="center" min-width="150" />
-      <el-table-column prop="" label="摄像头" align="center" min-width="180" />
-      <el-table-column prop="" label="录像保存时长" align="center" min-width="180" />
+      <el-table-column prop="storeroomName" label="所属区域" align="center" min-width="150" />
+      <el-table-column prop="deviceName" label="设备" align="center" min-width="150" />
+      <el-table-column prop="camerName" label="摄像头" align="center" min-width="180" />
+      <el-table-column prop="timeSize" label="录像保存时长" align="center" min-width="180" />
       <el-table-column prop="create_time" label="操作时间" align="center" min-width="180">
         <template slot-scope="scope">
           <div>{{ scope.row.create_time | parseTime }}</div>
@@ -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 {
 <style lang="scss" scoped>
 @import '~@/assets/styles/lend-manage.scss';
 @import "~@/assets/styles/archives-manage.scss";
+.head-container{
+  .date-item{
+    width: 350px !important;
+  }
+}
 
 </style>

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()
     }
   }

src/views/storeManage/listenManage/videoListen/index.vue

@@ -4,7 +4,7 @@
       <el-select v-model="optionVal" class="filter-item" style="width: 125px; height: 30px;margin:0 10px 0 0">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
-      <date-range-picker v-model="queryTime" class="date-item" />
+      <date-range-picker v-model="queryTime" type="datetimerange" class="date-item" />
       <rrOperation />
     </div>
     <el-table
@@ -21,8 +21,8 @@
           <span v-if="scope.row.isdload===false" class="text">下载失败</span>
         </template>
       </el-table-column>
-      <el-table-column prop="area" label="所属区域" min-width="150" align="center" />
-      <el-table-column prop="" label="设备" align="center" min-width="150" />
+      <el-table-column prop="storeroomName" label="所属区域" min-width="150" align="center" />
+      <el-table-column prop="camerName" label="设备" align="center" min-width="150" />
       <el-table-column prop="" label="摄像头" align="center" min-width="150" />
       <el-table-column prop="" label="事件" align="center" min-width="180" />
       <el-table-column prop="" label="内容描述" align="center" min-width="180" />
@@ -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;
+  }
+}
 </style>

src/views/storeManage/tagManage/bindTagList/index.vue

@@ -14,7 +14,7 @@
       </div>
       <div class="archives-handler-btn">
         <!-- iconfont icon-weibiaoti-2 -->
-        <el-button class="lending-btn" type="primary" :loading="unbindBtnLoading" @click="unbind()">
+        <el-button class="lending-btn" type="primary" :loading="unbindBtnLoading" :disabled="selections.length === 0" @click="unbind()">
           <svg-icon icon-class="remove_bind" class-name="svg-style" style="margin-right:8px" />解除绑定
         </el-button>
       </div>

src/views/storeManage/warehouse3DConfig/index.vue

@@ -8,7 +8,7 @@
       </div>
       <div>
         <el-button type="primary" class="iconfont icon-bangdingcanshu-fanbai" size="mini" :disabled="selections.length !== 1 || selections[0].bindState" @click="handleBindParam">绑定参数</el-button>
-        <el-button type="primary" class="iconfont icon-bangdingcanshu-fanbai" size="mini" :disabled="selections.length !== 1 || !selections[0].bindState" @click="handleUnbind">解除绑定</el-button>
+        <el-button type="primary" class="unbind-btn iconfont icon-jiechubangding-fanbai" size="mini" :disabled="selections.length !== 1 || !selections[0].bindState" @click="handleUnbind">解除绑定</el-button>
       </div>
     </div>
     <div class="app-container container-wrap">
@@ -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;
+  }
+}
 </style>