From dc7d1823b8f29b29fff3d8279cc878f03592dfbc Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Wed, 31 Aug 2022 17:33:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/storeManage/listenManage/index.js     | 18 +++++++
 .../listenManage/listenConfig/index.vue       |  9 ++--
 .../listenManage/module/bindCamera.vue        | 47 ++++++++++++-------
 .../listenManage/videoListen/index.vue        | 16 +------
 4 files changed, 55 insertions(+), 35 deletions(-)
 create mode 100644 src/api/storeManage/listenManage/index.js

diff --git a/src/api/storeManage/listenManage/index.js b/src/api/storeManage/listenManage/index.js
new file mode 100644
index 0000000..9a865c9
--- /dev/null
+++ b/src/api/storeManage/listenManage/index.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+export function bind(data) {
+  return request({
+    url: 'api/camera/bind',
+    method: 'post',
+    data
+  })
+}
+
+export function getDevice() {
+  return request({
+    url: 'api/camera/device',
+    method: 'get'
+  })
+}
+
+export default { bind, getDevice }
diff --git a/src/views/storeManage/listenManage/listenConfig/index.vue b/src/views/storeManage/listenManage/listenConfig/index.vue
index 11a3d3c..ac078d7 100644
--- a/src/views/storeManage/listenManage/listenConfig/index.vue
+++ b/src/views/storeManage/listenManage/listenConfig/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="head-container">
-      <el-button size="mini" icon="el-icon-video-camera" :disabled="!(selections.length===1)" @click="handleBind">绑定摄像头</el-button>
+      <el-button size="mini" icon="el-icon-video-camera" @click="handleBind">绑定摄像头</el-button>
       <el-button icon="el-icon-delete" size="mini" :disabled="!selections.length" @click="delVisible=true">删除</el-button>
       <el-select v-model="timeType" class="filter-item" style="width: 155px; height: 30px;margin:0 0 0 10px" @change="crud.toQuery">
         <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
@@ -30,7 +30,7 @@
     <!-- :cell-class-name="cell" -->
     <el-table
       ref="table"
-      :data="tableData"
+      :data="crud.data"
       style="width: 100%;"
       height="calc(100vh - 356px)"
       @row-click="clickRowHandler"
@@ -82,9 +82,8 @@ export default {
   mixins: [presenter(), crud(), header()],
   cruds() {
     return CRUD({
-      url: 'api/alarmlog/',
-      sort: ['state'],
-      optShow: {}
+      url: 'api/camera/list',
+      sort: ['createTime,asc']
     })
   },
   data() {
diff --git a/src/views/storeManage/listenManage/module/bindCamera.vue b/src/views/storeManage/listenManage/module/bindCamera.vue
index 9ccb951..75fd289 100644
--- a/src/views/storeManage/listenManage/module/bindCamera.vue
+++ b/src/views/storeManage/listenManage/module/bindCamera.vue
@@ -18,7 +18,7 @@
             </el-select>
           </p>
         </div>
-        <el-table ref="table" v-loading="loading" :data="tableData" style="width: 100%;" height="calc(100vh - 556px)" @row-click="clickRowHandler">
+        <el-table ref="table" v-loading="loading" :data="tableData" style="width: 100%;" height="calc(100vh - 556px)" @row-click="clickRowHandler" @selection-change="selectionChangeHandler">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column type="index" label="序号" width="80" align="center" />
           <el-table-column prop="storeroomId.name" label="所属区域" min-width="150" align="center" />
@@ -37,45 +37,59 @@
 </template>
 
 <script>
-// import { getAllDevice } from '@/api/storeManage/listenManage'
+import { bind, getDevice } from '@/api/storeManage/listenManage'
 import { getDeviceList } from '@/api/storeManage/deviceManage/device'
 export default {
   data() {
     return {
       tableData: [],
       bindVisible: false,
-      devType: 1,
+      devType: '',
       devOptions: [],
-      timeType: 1,
+      timeType: 10,
       timeOptions: [
-        { value: 1, label: '事件触发前后10秒' },
-        { value: 2, label: '事件触发前后20秒' },
-        { value: 3, label: '事件触发前后30秒' }
+        { value: 10, label: '事件触发前后10秒' },
+        { value: 20, label: '事件触发前后20秒' },
+        { value: 30, label: '事件触发前后30秒' }
       ],
       page: {
         size: 10,
         total: 0,
-        page: 1
+        page: 0
       },
-      loading: false
+      loading: false,
+      selections: []
     }
   },
   methods: {
     handleSave() {
-      this.bindVisible = false
+      if (this.selections.length === 0) {
+        this.$message({
+          message: '请选择摄像头',
+          type: 'warning'
+        })
+      } else {
+        const storeroomName = this.devOptions.find(X => { return X.value === this.devType }).self.storeroomId.name
+        const deviceName = this.devOptions.find(X => { return X.value === this.devType }).self.deviceName
+        const data = this.selections.map(x => { return { deviceInfoId: this.devType, storeroomName: storeroomName, deviceName: deviceName, cameraId: x.id, timeSize: this.timeType } })
+        bind(data).then((devices) => {
+          this.bindVisible = false
+        })
+      }
     },
     clickRowHandler(row) {
       this.$refs.table.toggleRowSelection(row) // 单击选中
     },
+    selectionChangeHandler(val) {
+      this.selections = val
+    },
     open() {
       this.getDevOptions()
       this.getAllCamera()
     },
     getDevOptions() {
-      Promise.all([getDeviceList({ deviceTypeId: 'DD656054BE3D1DF1E2F1FC' }), getDeviceList({ deviceTypeId: '65D1886B0F864291766421' })]).then((values) => {
-        const devices = values.reduce((previousValue, currentValue) => { return { content: previousValue.content.concat(currentValue.content) } }, { content: [] }).content
-        console.log(devices)
-        this.devOptions = devices.map(data => { return { value: data.id, label: data.storeroomId.name + '-' + data.deviceName } })
+      getDevice().then((devices) => {
+        this.devOptions = devices.map(data => { return { value: data.id, label: data.storeroomId.name + '-' + data.deviceName, self: data } })
         if (this.devOptions?.length > 0) {
           this.devType = this.devOptions[0].value
         }
@@ -83,6 +97,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) => {
         this.loading = false
         this.page.total = data.totalElements !== null ? data.totalElements : data.length
@@ -95,13 +110,13 @@ export default {
     },
     // 当前页改变
     pageChangeHandler(e) {
-      this.page.page = e
+      this.page.page = e - 1
       this.getAllCamera()
     },
     // 每页条数改变
     sizeChangeHandler(e) {
       this.page.size = e
-      this.page.page = 1
+      this.page.page = 0
       this.getAllCamera()
     }
   }
diff --git a/src/views/storeManage/listenManage/videoListen/index.vue b/src/views/storeManage/listenManage/videoListen/index.vue
index adc3e4e..e87c8b4 100644
--- a/src/views/storeManage/listenManage/videoListen/index.vue
+++ b/src/views/storeManage/listenManage/videoListen/index.vue
@@ -9,12 +9,11 @@
     </div>
     <el-table
       ref="table"
-      :data="tableData"
+      :data="crud.data"
       style="width: 100%;"
       :cell-class-name="cell"
       height="calc(100vh - 356px)"
     >
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="序号" width="80" align="center" />
       <el-table-column prop="isdload" label="监控下载" min-width="100" align="center">
         <template slot-scope="scope">
@@ -64,7 +63,7 @@ export default {
   mixins: [presenter(), crud(), header()],
   cruds() {
     return CRUD({
-      url: 'api/alarmlog/',
+      url: 'api/videomonitorng/list',
       sort: ['state'],
       optShow: {}
     })
@@ -87,17 +86,6 @@ export default {
     this.tableData = data1.rows
   },
   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
-    // },
-
     cell({ row, columnIndex }) {
       if (row.isdload === true && columnIndex === 1) {
         return 'text-green'