0627需求修改

src/views/archivesManage/lendManage/components/archiveDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="借阅详情" :visible.sync="detailVisible">
+    <el-dialog class="lendDetail" title="借阅详情" :visible.sync="detailVisible">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
@@ -53,6 +53,23 @@
         </el-table>
       </div>
     </el-dialog>
+
+    <!-- 是否查看视频监控 -->
+    <el-dialog title="提示" :visible.sync="videoTipVisible" :close-on-click-modal="false" :before-close="handleClose">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <div class="dialog-delt">
+          <p><span>是否需要查看相关视频监控？</span></p>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click.native="handleLookVideo">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 摄像头视频 -->
+    <Video ref="camera" :dialog-open.sync="open" :camera-data="cameraData" />
   </div>
 </template>
 
@@ -61,8 +78,11 @@ import { FetchInitBillDetails } from '@/api/archivesManage/lendManage'
 import CallExternal from '@/api/storeManage/deviceManage/device'
 import { lendingCrud } from '../mixins/lending'
 import { parseTime } from '@/utils/index.js'
+import Video from './video'
+import displayConfigApi from '@/api/storeManage/displayConfig'
 export default {
   name: 'ArchiveDetail',
+  components: { Video },
   mixins: [lendingCrud],
   props: {
     isReturn: {
@@ -78,9 +98,20 @@ export default {
       otherInfo: {},
       tableData: [],
       lendDatesInfo: null,
-      deviceData: null
+      deviceData: null,
+      videoTipVisible: false,
+      camConfigData: [],
+      cameraData: [],
+      open: false
     }
   },
+  created() {
+    displayConfigApi.list({ storeroomId: 'D6490DA3D4261E8C26D0E3' }).then((data) => {
+      if (data) {
+        this.camConfigData = data
+      }
+    })
+  },
   methods: {
     getBillDetails() {
       const params = {
@@ -142,6 +173,7 @@ export default {
       CallExternal.FetchCallExternalOpenCol(params).then(res => {
         if (res.success && res.success === '0') {
           this.$message.success('开架执行成功')
+          this.videoTipVisible = true
         } else {
           this.$message.error(res.msg)
         }
@@ -149,6 +181,20 @@ export default {
         console.log(error)
         this.$message.error('连接失败')
       })
+    },
+    handleLookVideo() {
+      this.videoTipVisible = false
+      this.cameraData = this.camConfigData.filter((item) => { return item.divPosition.includes('CAM') })
+      this.open = true
+      this.$nextTick(() => {
+        this.$refs.camera.camConfig = this.cameraData[0]
+        this.$refs.camera.videoIndex = 0
+        this.$refs.camera.play()
+      })
+    },
+    handleClose(done) {
+      this.videoTipVisible = false
+      done()
     }
   }
 }
@@ -156,17 +202,20 @@ export default {
 
 <style lang="scss" scoped>
 @import '~@/assets/styles/lend-manage.scss';
-::v-deep .el-dialog__body{
-  padding: 20px 0 60px 0;
-}
-::v-deep .el-dialog{
-  width: 1200px;
-}
-::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{
-  position: absolute;
-  right: -280px;
-  bottom: -10px;
+.lendDetail{
+  ::v-deep .el-dialog{
+    width: 1200px;
+  }
+  ::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{
+    position: absolute;
+    right: -280px;
+    bottom: -10px;
+  }
+  ::v-deep .el-dialog__body{
+    padding: 20px 0 60px 0;
+  }
 }
+
 .dpflex{
   display: flex;
   flex-wrap: wrap;

src/views/system/logManage/storeLog/index.vue

@@ -3,7 +3,7 @@
     <div class="head-container">
       <!-- <crudOperation /> -->
       <!-- <el-button v-permission="permission.download" :loading="crud.downloadLoading" :disabled="!selections.length" size="mini" icon="el-icon-download" @click="handleDownload">导出</el-button> -->
-      <!-- <el-button :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="handleDownload">导出</el-button> -->
+      <el-button :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="handleDownload">导出</el-button>
       <!-- <el-input
         v-model="keyWord"
         size="small"
@@ -35,7 +35,7 @@
       @selection-change="selectionChangeHandler"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column prop="storeCode" label="库房" align="center" min-width="150">
+      <el-table-column prop="storeCode" label="库房" align="center" min-width="100">
         <template>
           <div>5F档案库</div>
         </template>
@@ -105,9 +105,18 @@ export default {
     },
     // 导出
     handleDownload() {
+      if (this.queryTime && this.queryTime.length !== 0) {
+        this.crud.query.startTime = this.queryTime[0]
+        this.crud.query.endTime = this.queryTime[1]
+      } else {
+        this.crud.query.startTime = null
+        this.crud.query.endTime = null
+        this.$message.warning('请先选择开始时间和结束时间！')
+        return false
+      }
       this.crud.downloadLoading = true
       const fileName = parseTime(new Date()) + '-库房环控日志.xlsx'
-      getBlob(this.baseApi + '/api/securitydoor/exportSecurityDoorLog1List' + '?' + qs.stringify(this.crud.query, { indices: false }), function(blob) {
+      getBlob(this.baseApi + '/api/device/exportEnvironmentControlLog' + '?' + qs.stringify(this.crud.query, { indices: false }), function(blob) {
         saveAs(blob, fileName)
       })
       this.crud.downloadLoading = false