查漏补缺 借阅新增-异常 首页搜索公用组件 系统管理

src/api/archivesManage/lendManage.js

@@ -135,6 +135,15 @@ export function FetchReadyReturnShowTid(parameter) {
   })
 }
 
+// 借阅档案异常处理
+export function FetchBorrowException(parameter) {
+  return request({
+    url: 'api/borrow/borrowException',
+    method: 'post',
+    data: parameter
+  })
+}
+
 // 借出确认
 export function FetchBillBorrowConfirm(parameter) {
   return request({

src/assets/icons/svg/exception.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 931.5" style="enable-background:new 0 0 1024 931.5;" xml:space="preserve">
+<style type="text/css">
+</style>
+<path id="路径_1382" class="st0" d="M509.1,657.6c-28.9,0-52.4,23.4-52.4,52.4c0,28.9,23.4,52.4,52.4,52.4
+	c28.9,0,52.4-23.4,52.4-52.4l0,0c0.1-28.8-23.1-52.3-52-52.4C509.4,657.6,509.2,657.6,509.1,657.6z"/>
+<path id="路径_1383" class="st0" d="M997.8,843.9c34.9-55.1,34.9-125.3,0-180.4L672,93.3C624.6,6.5,515.7-25.4,429,22.1
+	c-30,16.4-54.7,41.1-71.2,71.2L26.2,663.5c-34.9,55.1-34.9,125.3,0,180.4c32.7,55.4,92.8,88.7,157.1,87.3h657.5
+	C905.7,935.1,967,901.1,997.8,843.9z M922.2,803.2c-18.5,30.9-51.3,50.6-87.3,52.4H177.4c-35.1,0.5-68.1-17.1-87.3-46.5
+	c-17.5-30.7-17.5-68.3,0-98.9l331.6-570.3c18.5-30.9,51.3-50.6,87.3-52.4c36.7-0.7,70.6,19.7,87.3,52.4l325.8,570.3
+	c23.3,26.6,23.3,66.3,0.1,92.9L922.2,803.2z"/>
+<path id="路径_1384" class="st0" d="M497.9,292.8c-31,9.2-41,44-39.8,74.4c1.8,43.8,12.1,175.3,13.8,197.4
+	c2,26,6.9,57.9,44.1,57.9c18.3,0,36.3-8.8,40.2-48.9c1.9-19.3,9.6-142.6,11-196.2c0.7-25.3,0-60.2-21.7-77.5
+	C532.1,289.3,514.1,288,497.9,292.8z"/>
+</svg>

src/layout/components/Navbar.vue

@@ -26,7 +26,7 @@
       </div> -->
 
       <!-- 消息中心 -->
-      <el-dropdown class="message-center right-menu-item hover-effect" trigger="click">
+      <el-dropdown ref="messageDrop" class="message-center right-menu-item hover-effect" trigger="click">
         <div class="message-icon">
           <span class="iconfont icon-xiaoxi" />
           <i class="message-num">6</i>
@@ -35,7 +35,7 @@
           <div style="display: flex; justify-content: flex-end; padding: 0 20px; height: 40px; line-height: 40px; color: #339CFF; font-size: 14px; border-bottom: 1px solid #339CFF;">
             <span style="cursor: pointer;">全部标记为已读</span>
             <!-- 消息中心router -->
-            <router-link to="/system/messageCenter" style="color:#fff; margin-left: 10px;">去查看</router-link>
+            <span style="color:#fff; margin-left: 10px; cursor: pointer;" @click="toAllMessage()">去查看</span>
           </div>
           <div style="max-height: 450px; overflow: hidden; overflow-y: scroll;">
             <el-dropdown-item v-for="(item,index) in 12" :key="index" class="message-list-item">
@@ -150,6 +150,10 @@ export default {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
+    toAllMessage() {
+      this.$router.push('/system/messageCenter')
+      this.$refs.messageDrop.hide()
+    },
     // open() {
     //   this.$confirm('确定注销并退出系统吗？', '提示', {
     //     confirmButtonText: '确定',

src/views/archivesManage/archivesList/module/archivesInfo/index.vue

@@ -243,5 +243,6 @@ export default {
 @import "~@/assets/styles/archives-manage.scss";
 .base-info .base-info-item span.el-tag{
   width: auto;
+  color: #fff;
 }
 </style>

src/views/archivesManage/archivesList/module/packing/index.vue

@@ -279,7 +279,10 @@ export default {
         this.$message.error('请选择要装盒的档案！')
         return
       }
+      // 分卷装盒存在未完成装盒操作，且某一个盒能一直搜索到，故添加到盒里时进行判断筛选
+      if (this.selectTableData.findIndex(val => val.id === row.id) === -1) {
         this.selectTableData.push(row)
+      }
       this.tableData.splice(index, 1)
       this.selections.forEach(item => {
         item.caseId = row.id

src/views/archivesManage/archivesSearch/index.vue

@@ -1,9 +1,7 @@
 <template>
-  <div>
-    <div>
+  <div class="search-main">
     <div class="head-container">
-        <h2>模糊检索</h2>
-        <div>
+      <h2 v-if="this.$route.path.indexOf('dashboard') === -1">模糊检索</h2>
       <div class="search-input">
         <el-input v-model="keywords" placeholder="请输入内容" class="input-with-select" style="width:50%;" @keyup.enter.native="dimSearch">
           <el-select slot="prepend" v-model="select" placeholder="请选择">
@@ -14,12 +12,11 @@
               :value="item.value"
             />
           </el-select>
-              <el-button slot="append" icon="el-icon-search" @click="dimSearch" />
+          <el-button slot="append" icon="el-icon-search" @click="handleSearch" />
         </el-input>
       </div>
     </div>
-      </div>
-      <div class="search-result">
+    <div v-if="this.$route.path.indexOf('dashboard') === -1" class="search-result">
       <div v-show="isShow" class="search-title">
         <p>检索结果</p>
         <p>本次检索结果共计{{ resNum }}条数据</p>
@@ -65,7 +62,6 @@
       <detailDialog ref="detailDom" />
     </div>
   </div>
-  </div>
 </template>
 
 <script>
@@ -102,7 +98,16 @@ export default {
         query: null,
         page: null,
         size: null
+      },
+      homeSearchWords: '',
+      homeSearchSelect: ''
     }
+  },
+  mounted() {
+    if (localStorage.getItem('homeSearchWords') !== null) {
+      this.keywords = localStorage.getItem('homeSearchWords')
+      this.select = localStorage.getItem('homeSearchSelect')
+      this.dimSearch()
     }
   },
   methods: {
@@ -111,12 +116,9 @@ export default {
       const params = {
         'categoryId': row.category_id,
         'archivesId': row.archives_id
-        // 'categoryId': '5EB3DE8FF78BBC64729E43',
-        // 'archivesId': 'D63A2DFA58C02E09CB196C'
       }
       FetchArchivesDetails(params).then(res => {
         if (res) {
-          // console.log(res, 'res')
           const rowData = {}
           res.forEach(item => {
             rowData[item.fieldName] = item.context
@@ -130,6 +132,16 @@ export default {
         }
       })
     },
+    // 首页 / 搜索页切换操作
+    handleSearch() {
+      if (this.$route.path.indexOf('dashboard') !== -1) {
+        this.$router.push('/archivesManage/archivesSearch')
+        localStorage.setItem('homeSearchWords', this.keywords)
+        localStorage.setItem('homeSearchSelect', this.select)
+      } else {
+        this.dimSearch()
+      }
+    },
     // 搜索
     dimSearch() {
       this.loading = true
@@ -141,6 +153,8 @@ export default {
         this.page.total = 0
         this.page.size = 10
         this.page.page = 1
+        localStorage.removeItem('homeSearchWords')
+        localStorage.removeItem('homeSearchSelect')
       } else {
         this.params.criteria = this.select
         this.params.query = this.keywords.replace(/\s+/ig, ' ')
@@ -153,11 +167,12 @@ export default {
     // 调用搜索接口
     doQuery(params) {
       queryVagueArchives(params).then(res => {
-        // console.log(res, 'res')
         this.tableData = res.content
         this.page.total = res.totalElements
         this.resNum = res.totalElements
         this.isShow = true
+        localStorage.removeItem('homeSearchWords')
+        localStorage.removeItem('homeSearchSelect')
       })
     },
     // 每页条数改变
@@ -183,9 +198,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// @import "~@/assets/styles/archives-manage.scss";
-// @import "~@/assets/styles/lend-manage.scss";
-
+.search-main{
+  width: 100%;
+}
 .head-container{
   padding: 100px 0 30px 0;
   text-align: center;
@@ -202,7 +217,6 @@ export default {
   align-items: center;
   justify-content: center;
   & .search-input {
-    // width: 796px;
     & .el-select .el-input {
       width: 130px;
     }
@@ -224,11 +238,8 @@ export default {
   width: 125px;
   background-color: #339cff;
   border: 1px solid #339cff;
-  border-radius: 34px;
+  border-radius: 34px 0 0 34px;
   border-right: 0;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-
 }
 ::v-deep .el-input__inner {
   color: #fff;

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

@@ -1,4 +1,6 @@
 <template>
+  <div class="lendComfirm-arcList">
+    <el-button class="exception-btn" size="mini" :disabled="!selections.length" @click="handleBorrowException"><svg-icon icon-class="exception" class-name="lend-handle" />异常处理</el-button>
     <div class="container-wrap">
       <span class="right-top-line" />
       <span class="left-bottom-line" />
@@ -8,13 +10,16 @@
         v-loading="tableLoading"
         :data="tableData"
         style="min-width: 100%"
+        @selection-change="selectionChangeHandler"
+        @row-click="clickRowHandler"
       >
+        <el-table-column type="selection" width="55" />
         <el-table-column type="index" label="序号" align="center" width="55" />
         <el-table-column prop="categoryName" align="center" label="门类名称" min-width="85" />
         <el-table-column prop="archiveNo" align="center" label="档号" min-width="85" />
         <el-table-column prop="maintitle" align="center" label="题名" min-width="60" />
         <el-table-column prop="caseName" align="center" label="盒名称" min-width="85" />
-      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="100">
+        <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="130">
           <template slot-scope="scope">
             <div v-if="scope.row.folderLocationDetails.includes(',')">
               <el-tag
@@ -44,10 +49,23 @@
         </el-table-column>
       </el-table>
     </div>
+    <el-dialog title="异常处理" :visible.sync="exceptionVisible" :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="handleExceptionConfirm">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { FetchInitArchivesByOrderNo } from '@/api/archivesManage/lendManage'
+import { FetchInitArchivesByOrderNo, FetchBorrowException } from '@/api/archivesManage/lendManage'
 import { lendingCrud } from '../mixins/lending'
 export default {
   name: 'LendArchivesList',
@@ -62,8 +80,10 @@ export default {
   },
   data() {
     return {
+      selections: [],
       tableData: [],
-      tableLoading: false
+      tableLoading: false,
+      exceptionVisible: false
     }
   },
   watch: {
@@ -79,6 +99,23 @@ export default {
     this.getArchivesTable()
   },
   methods: {
+    // 档案异常处理
+    handleBorrowException() {
+      this.exceptionVisible = true
+    },
+    // 确认加入异常
+    handleExceptionConfirm() {
+      this.tableLoading = true
+      const params = this.selections.map(item => item.archivesId)
+      FetchBorrowException(params).then(data => {
+        if (data === this.selections.length) {
+          this.$message.success('已成功加入异常!')
+          this.exceptionVisible = false
+          this.tableLoading = false
+        }
+      })
+    },
+    // 获取借阅确认下的档案list
     getArchivesTable() {
       this.tableLoading = true
       const params = {
@@ -90,6 +127,17 @@ export default {
           this.tableLoading = false
         }
       })
+    },
+    selectionChangeHandler(val) {
+      this.selections = val
+      console.log(this.selections)
+    },
+    clickRowHandler(row) {
+      this.$refs.table.toggleRowSelection(row)
+    },
+    handleClose(done) {
+      this.exceptionVisible = false
+      done()
     }
   }
 }
@@ -97,8 +145,16 @@ export default {
 
 <style lang="scss" scoped>
 @import '~@/assets/styles/lend-manage.scss';
+.lendComfirm-arcList{
+  .exception-btn{
+    margin: 20px 0;
+    .lend-handle{
+      margin-right: 6px;
+    }
+  }
   .container-wrap{
     min-height: auto;
-  margin-top: 20px;
   }
+}
+
 </style>

src/views/archivesManage/lendManage/lendConfirm/index.vue

@@ -7,7 +7,6 @@
       <el-button size="mini" icon="el-icon-download" :disabled="!selections.length" :loading="crud.downloadLoading" @click="downloadApi">导出</el-button>
     </div>
     <!--表格渲染-->
-    <!-- height="calc(100vh - 355px)" -->
     <el-table
       ref="table"
       v-loading="crud.loading"

src/views/archivesManage/lendManage/lendQuery/index.vue

@@ -131,7 +131,8 @@ export default {
         { value: '2', label: '待借阅' },
         { value: '3', label: '待归还' },
         { value: '5', label: '逾期' },
-        { value: '4', label: '已归还' }
+        { value: '4', label: '已归还' },
+        { value: '-1', label: '异常' }
       ],
       borrowType: '全部',
       queryOption: [

src/views/archivesManage/lendManage/mixins/lending.js

@@ -18,6 +18,8 @@ export const lendingCrud = {
           return '已归还'
         case 5:
           return '逾期'
+        case -1:
+          return '异常'
       }
     },
     tidType(val) {
@@ -72,6 +74,8 @@ export const lendingCrud = {
       switch (val) {
         case '逾期':
           return 'cell-lend have-lend'
+        case '异常':
+          return 'cell-lend have-lend'
         case '已归还':
           return 'cell-lend has-return'
         default:

src/views/home.vue

@@ -11,17 +11,7 @@
           <div class="container-left search-area">
             <span class="right-top-line" />
             <span class="left-bottom-line" />
-            <div class="search-input">
-              <!-- v-model="input3"  v-model="select"-->
-              <el-input placeholder="2022，办公室" class="input-with-select">
-                <el-select slot="prepend" v-model="selectValue">
-                  <el-option label="全目录" value="1" />
-                  <el-option label="订单号" value="2" />
-                  <el-option label="用户电话" value="3" />
-                </el-select>
-                <el-button slot="append" icon="el-icon-search" />
-              </el-input>
-            </div>
+            <SearchAcrives />
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8">
@@ -182,6 +172,7 @@ import typePie from '@/views/components/echarts/typePie.vue'
 import data1 from './data1.json'
 import WarehouseWarning from '@/views/components/WarehouseWarning'
 import SecurityDoor from '@/views/components/SecurityDoor'
+import SearchAcrives from '@/views/archivesManage/archivesSearch/index'
 
 // const lineChartData = {
 //   newVisitis: {
@@ -211,14 +202,13 @@ export default {
     PanelGroup,
     // LineChart,
     // RadarChart,
-    // PieChart
-    // ,
+    // PieChart,
     // BarChart
-    lendAcross, catePie, typePie
+    lendAcross, catePie, typePie,
+    SearchAcrives
   },
   data() {
     return {
-      selectValue: '1',
       lendData: [18203, 23489, 29034, 104970],
       cateData: [1000, 700],
       typeData: [1110, 2000, 800, 600, 900]
@@ -253,18 +243,8 @@ export default {
   background-color: #031435;
   position: relative;
 
-  // .github-corner {
-  //   position: absolute;
-  //   top: 0;
-  //   border: 0;
-  //   right: 0;
-  // }
-
   .chart-wrapper {
     height: calc(100% - 40px);
-    // background: #fff;
-    // padding: 16px 16px 0;
-    // margin-bottom: 32px;
   }
 }
 @media (max-width: 1024px) {
@@ -272,15 +252,6 @@ export default {
     padding: 8px;
   }
 }
-// .title-arrow {
-//   width: 100%;
-//   &:before{
-//     left: calc(50% - 100px)
-//   }
-//   &:after{
-//     right: calc(50% - 100px)
-//   }
-// }
 .warehouse-tab {
   color: #fff;
   .warehouse-nav {
@@ -288,44 +259,29 @@ export default {
     justify-content: space-around;
     position: absolute;
     bottom: 15px;
-    // left: 20px;
     z-index: 11;
-    // width: calc(100vw - 545px);
     width: 100%;
-    // height: 90px;
-    // min-height: 90px;
     padding: 0;
     li {
       display: flex;
       flex-direction: column;
       align-items: center;
       flex-wrap: nowrap;
-      // align-items: center;
       align-content: center;
       justify-content: center;
-      // width: 25%;
       height: 90px;
-      // line-height: 90px;
       text-align: right;
-      // padding-right: 20px;
-      // margin-right: 20px;
       font-size: 14px;
       position: relative;
       &:hover {
         cursor: pointer;
       }
-      // background: url('~@/assets/images/warehouse_tab_bg.png') no-repeat;
-      // background-size: 100% 100%;
       span {
         width: 72px;
         height: 52px;
         margin-bottom: 7px;
-        // position: absolute;
-        // left: 60px;
-        // top: 20px;
       }
       p {
-        // flex: 1;
         text-align: left;
       }
       &:first-child span {
@@ -341,68 +297,6 @@ export default {
         background: url("~@/assets/images/tab_read_logo.png") no-repeat;
       }
     }
-    // .active-nav{
-    //   color: #fff;
-    //   background: url('~@/assets/images/warehouse_tab_active.png') no-repeat;
-    //   background-size: 100% 100%;
-    // }
-  }
-}
-.search-area {
-  height: 100%;
-  margin: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  & .search-input {
-    width: 796px;
-    ::v-deep .el-input-group {
-      height: 42px;
-      & > input {
-        height: 42px;
-        border: 1px solid #339cff;
-        background-color: #021941;
-        &::placeholder {
-          color: #fff;
-        }
-      }
-    }
-    // border: 1px solid #339cff;
-    // background-color: #021941;
-    // height: 42px;
-    // line-height: 42px;
-    // color: #fff;
-    & ::v-deep .el-input-group__prepend {
-      width: 125px;
-      background-color: #339cff;
-      border: 1px solid #339cff;
-      border-radius: 34px;
-      border-right: 0;
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-      .el-input__inner {
-        text-align: center;
-        color: #fff;
-      }
-    }
-    & ::v-deep .el-input-group__append {
-      width: 72px;
-      left: -20px;
-      text-align: center;
-      background-color: #339cff;
-      border: 1px solid #339cff;
-      border-radius: 34px;
-      & i {
-        font-size: 25px;
-        color: #fff;
-      }
-    }
-    & .el-select .el-input {
-      width: 130px;
-    }
-    & ::v-deep .input-with-select ::v-deep .el-input-group__prepend {
-      background-color: #fff;
-    }
   }
 }
 .el-col {
@@ -460,4 +354,25 @@ export default {
   td.el-table__cell {
   background: #02255f;
 }
+.search-area {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+::v-deep .search-main{
+  padding: 0 62px;
+  .head-container{
+    padding: 0;
+    width: 100% !important;
+    .search-input {
+      width: 100% !important;
+    }
+    .input-with-select{
+      width: 100% !important;
+    }
+  }
+}
 </style>

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

@@ -35,16 +35,19 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="100" align="center" />
-      <el-table-column prop="" label="事件" min-width="150" align="center" />
-      <el-table-column prop="" 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="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="" label="档案信息" align="center" min-width="180" />
       <el-table-column prop="" label="档号" align="center" min-width="180" />
+      <el-table-column prop="" label="警情描述" align="center" min-width="180" />
       <el-table-column prop="" label="报警时间" align="center" min-width="180" />
       <el-table-column prop="" label="操作" align="center" min-width="180">
         <el-button size="mini" style="background:#3A99FD" @click="handleListen">查看监控</el-button>
       </el-table-column>
+      <el-table-column prop="" label="事件" min-width="150" align="center" />
+      <el-table-column prop="" label="用户" align="center" min-width="150" />
     </el-table>
     <pagination />
     <!-- 查看监控 -->

src/views/system/notifyManage/index.vue

@@ -112,13 +112,13 @@ export default {
       ],
       personOptions: [
         { value: 0, label: '全部用户' },
-        { value: 1, label: '张三' },
-        { value: 2, label: '李四' },
-        { value: 3, label: '王五' },
-        { value: 4, label: '张三' },
-        { value: 5, label: '李四' },
-        { value: 6, label: '王五' },
-        { value: 7, label: '王五' }
+        { value: 1, label: '部门名称 - 张三' },
+        { value: 2, label: '部门名称 - 李四' },
+        { value: 3, label: '部门名称 - 王五' },
+        { value: 4, label: '部门名称 - 张三' },
+        { value: 5, label: '部门名称 - 李四' },
+        { value: 6, label: '部门名称 - 王五' },
+        { value: 7, label: '部门名称 - 王五' }
       ],
       devOptions: [
         { value: 0, label: '全部设备' },
@@ -216,7 +216,6 @@ export default {
     //   // console.log(this.sendForm.sendObj)
     // },
     // el-select 选中值发生变化时触发，val为目前选中的值
-
     // 默认全选
     defaultSelAll() {
       this.selectOptions = this.sendObjOptions.map(item => { return item.value })
@@ -226,6 +225,7 @@ export default {
     changeSelect(val) {
       if (val[val.length - 1] === 0) { // 选中全选
         this.defaultSelAll()
+        this.$refs.selectBox.$el.querySelector('.el-input__inner').style.height = '34px'
       } else {
         const arr1 = this.oldSelect.filter(item => item !== 0)
         const arr2 = val.filter(item => item !== 0)