From 242b8b15aab934c0a65ef55f1471e995a9afd29c Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 12 Aug 2022 17:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E6=88=BF=E4=BD=8D=E7=BD=AE=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80/=E6=A1=A3=E6=A1=88-1=E7=8A=B6=E6=80=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archivesManage/archivesCheck/module/checkDetail.vue  | 9 ++++++++-
 .../archivesList/module/archivesInfo/index.vue           | 2 ++
 src/views/archivesManage/archivesSearch/index.vue        | 9 ++++++++-
 .../archivesSearch/module/detailDialog.vue               | 9 ++++++++-
 src/views/archivesManage/caseManage/caseList/index.vue   | 6 ++++--
 .../caseManage/caseList/module/detailDialog.vue          | 9 ++++++++-
 src/views/environmentalScreen/index.vue                  | 9 +++++++++
 7 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/views/archivesManage/archivesCheck/module/checkDetail.vue b/src/views/archivesManage/archivesCheck/module/checkDetail.vue
index 09b885a..e68f555 100644
--- a/src/views/archivesManage/archivesCheck/module/checkDetail.vue
+++ b/src/views/archivesManage/archivesCheck/module/checkDetail.vue
@@ -48,7 +48,14 @@
           <el-table-column prop="securityClass" align="center" label="保密程度" min-width="90" />
           <el-table-column prop="department" align="center" label="部门" min-width="90" />
           <el-table-column prop="caseName" align="center" label="盒名称" min-width="180" />
-          <el-table-column prop="folderLocationDetails" align="center" :show-overflow-tooltip="true" label="所在位置" min-width="220" />
+          <el-table-column prop="folderLocationDetails" align="center" :show-overflow-tooltip="true" label="所在位置" min-width="280">
+            <template slot-scope="scope">
+              <span v-if="!scope.row.folderLocationDetails">-</span>
+              <span v-else>
+                <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="createTime" align="center" label="创建时间" min-width="150">
             <template slot-scope="scope">
               <div>{{ scope.row.createTime | parseTime }}</div>
diff --git a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
index 5fc5f31..5d7d6a9 100644
--- a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
@@ -117,6 +117,8 @@ export default {
               item.context = '待归还'
             } else if (item.context === 4 || item.context === '' || item.context === null) {
               item.context = '-'
+            } else if (item.context === -1) {
+              item.context = '在库'
             }
           }
         })
diff --git a/src/views/archivesManage/archivesSearch/index.vue b/src/views/archivesManage/archivesSearch/index.vue
index 649990c..58bce5d 100644
--- a/src/views/archivesManage/archivesSearch/index.vue
+++ b/src/views/archivesManage/archivesSearch/index.vue
@@ -49,7 +49,14 @@
           <el-table-column prop="security_class" label="保密程度" align="center" min-width="100" />
           <el-table-column prop="department" label="部门" align="center" min-width="100" />
           <el-table-column prop="case_name" label="盒名称" align="center" min-width="180" />
-          <el-table-column prop="folder_location_details" label="所在位置" align="center" min-width="180" />
+          <el-table-column prop="folder_location_details" label="所在位置" align="center" min-width="260">
+            <template slot-scope="scope">
+              <span v-if="!scope.row.folder_location_details">-</span>
+              <span v-else>
+                <el-tag effect="dark">{{ scope.row.folder_location_details }}</el-tag>
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="create_time" label="创建时间" align="center" min-width="180">
             <template slot-scope="scope">
               <div>{{ scope.row.create_time | parseTime }}</div>
diff --git a/src/views/archivesManage/archivesSearch/module/detailDialog.vue b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
index 7a77fa0..852e884 100644
--- a/src/views/archivesManage/archivesSearch/module/detailDialog.vue
+++ b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
@@ -54,7 +54,14 @@
                 <p class="right"><span class="color-blue">盒名称：</span><span class="color-white">{{ rowData.fieldCnName }}</span></p>
               </div>
               <div class="dpflex">
-                <p class="left"><span class="color-blue">库房位置：</span><span class="color-white">{{ rowData.folder_location }}</span></p>
+                <p class="left"><span class="color-blue">库房位置：</span>
+                  <span v-if="!rowData.folder_location" class="color-white">-</span>
+                  <span v-else class="color-white"><el-tag effect="dark">{{ rowData.folder_location }}</el-tag></span>
+                <!-- <span v-if="!scope.row.folder_location_details">-</span>
+                <span v-else>
+                  <el-tag effect="dark">{{ scope.row.folder_location_details }}</el-tag>
+                </span> -->
+                </p>
                 <p class="right"><span class="color-blue">借阅状态：</span><span class="color-white">{{ rowData.borrow_type | borrowStatus }}</span></p>
               </div>
               <p class="sin-row"><span class="color-blue">条形码：</span><span class="color-white">{{ rowData.barcode }}</span></p>
diff --git a/src/views/archivesManage/caseManage/caseList/index.vue b/src/views/archivesManage/caseManage/caseList/index.vue
index c167c51..52b1b44 100644
--- a/src/views/archivesManage/caseManage/caseList/index.vue
+++ b/src/views/archivesManage/caseManage/caseList/index.vue
@@ -51,8 +51,10 @@
       <el-table-column prop="barcode" label="条形码" align="center" min-width="120" />
       <el-table-column label="存放位置" align="center" min-width="150">
         <template slot-scope="scope">
-          <span v-if="scope.row.folderLocationDetails === ''">-</span>
-          <span v-else>{{ scope.row.folderLocationDetails }}</span>
+          <span v-if="!scope.row.folderLocationDetails">-</span>
+          <span v-else>
+            <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="update_time" width="175" label="操作时间" align="center">
diff --git a/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue b/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
index 237a4fd..1df6662 100644
--- a/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
+++ b/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
@@ -33,7 +33,14 @@
           <el-table-column prop="securityClass" label="保密程度" align="center" width="150" />
           <el-table-column prop="department" label="部门名称" align="center" width="150" />
           <el-table-column prop="caseName" label="盒名称" align="center" width="150" />
-          <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="180" />
+          <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="260">
+            <template slot-scope="scope">
+              <span v-if="!scope.row.folderLocationDetails">-</span>
+              <span v-else>
+                <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="create_time" align="center" label="创建时间" width="150">
             <template slot-scope="scope">
               <div>{{ scope.row.create_time | parseTime }}</div>
diff --git a/src/views/environmentalScreen/index.vue b/src/views/environmentalScreen/index.vue
index f091ba3..012b97b 100644
--- a/src/views/environmentalScreen/index.vue
+++ b/src/views/environmentalScreen/index.vue
@@ -242,6 +242,7 @@ export default {
     this.timer = setInterval(() => {
       this.nowDate = getCurrentTime()
     }, 1000)
+    window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
   },
   mounted() {
     this.tableData = data1.rows
@@ -259,6 +260,14 @@ export default {
     }
   },
   methods: {
+    // 加载完成状态传值
+    getIframeLoading(value) {
+      // console.log(`我是iframe传过来的参数：${value}`)
+      if (value === 'false') {
+        this.handleHide('DAK_MO_OAO_001')
+        this.handleAlarm('DAK_MO_OAO_003')
+      }
+    },
     // 传入设备状态data  / 给iframe传初始值
     deviceState(e) {
       this.iframeWin.postMessage({