From c033d7fe639821bddd3a39d7baae17973b5dd387 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 28 Jul 2023 15:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=BA=93-style/=E6=A1=A3?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/svg/s-sjzb.svg               |  2 +-
 src/assets/styles/archives-manage.scss        | 39 +++++++++++++++++++
 .../collectionLibrary/anjuan/content.vue      | 12 +++++-
 .../collectionLibrary/anjuan/index.vue        |  9 ++---
 .../collectionLibrary/anjuan/tableList.vue    | 14 ++++---
 .../collectionLibrary/file/index.vue          | 18 ++++++---
 .../collectionLibrary/index.vue               | 23 ++++++++---
 .../collectionLibrary/juannei/index.vue       | 15 ++++---
 .../module/collectHeader.vue                  |  8 +++-
 .../collectionLibrary/project/index.vue       | 12 +++---
 10 files changed, 114 insertions(+), 38 deletions(-)

diff --git a/src/assets/icons/svg/s-sjzb.svg b/src/assets/icons/svg/s-sjzb.svg
index 2814773..8664e43 100644
--- a/src/assets/icons/svg/s-sjzb.svg
+++ b/src/assets/icons/svg/s-sjzb.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689576981628" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4323" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M947.2 486.4c-70.4-38.4-108.8-115.2-108.8-192V96c0-19.2-12.8-32-32-32H211.2c-19.2 0-32 12.8-32 32v198.4c0 76.8-38.4 153.6-108.8 192-25.6 12.8-38.4 38.4-38.4 70.4V960c0 32 25.6 64 64 64h832c32 0 64-25.6 64-64V556.8c0-44.8-19.2-51.2-44.8-70.4z m-780.8 6.4c44.8-51.2 76.8-121.6 76.8-192V140.8c0-6.4 6.4-12.8 12.8-12.8h505.6c6.4 0 12.8 6.4 12.8 12.8v153.6c0 70.4 25.6 140.8 76.8 192 6.4 6.4 0 25.6-12.8 25.6h-102.4c-12.8 0-19.2 6.4-25.6 19.2l-25.6 76.8c-6.4 12.8-12.8 19.2-25.6 19.2H371.2c-12.8 0-19.2-6.4-25.6-19.2L320 531.2C313.6 512 294.4 512 281.6 512H179.2c-12.8 0-19.2-12.8-12.8-19.2z m768 441.6s0 32-38.4 32H121.6c-19.2 0-32-12.8-32-32V601.6c0-19.2 12.8-32 32-32H256s6.4 0 6.4 6.4l25.6 70.4c6.4 25.6 32 38.4 57.6 38.4h332.8c25.6 0 51.2-19.2 57.6-38.4 0 0 25.6-64 25.6-70.4s6.4-6.4 6.4-6.4h134.4c19.2 0 32 12.8 32 32v332.8z" fill="#FFFFFF" p-id="4324"></path><path d="M659.2 249.6H358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h300.8c19.2 0 32 12.8 32 32s-12.8 32-32 32zM659.2 371.2H358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h300.8c19.2 0 32 12.8 32 32 0 12.8-12.8 32-32 32zM659.2 486.4H358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h300.8c19.2 0 32 12.8 32 32s-12.8 32-32 32z" fill="#FFFFFF" p-id="4325"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689576981628" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4323" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M947.2 486.4c-70.4-38.4-108.8-115.2-108.8-192V96c0-19.2-12.8-32-32-32H211.2c-19.2 0-32 12.8-32 32v198.4c0 76.8-38.4 153.6-108.8 192-25.6 12.8-38.4 38.4-38.4 70.4V960c0 32 25.6 64 64 64h832c32 0 64-25.6 64-64V556.8c0-44.8-19.2-51.2-44.8-70.4z m-780.8 6.4c44.8-51.2 76.8-121.6 76.8-192V140.8c0-6.4 6.4-12.8 12.8-12.8h505.6c6.4 0 12.8 6.4 12.8 12.8v153.6c0 70.4 25.6 140.8 76.8 192 6.4 6.4 0 25.6-12.8 25.6h-102.4c-12.8 0-19.2 6.4-25.6 19.2l-25.6 76.8c-6.4 12.8-12.8 19.2-25.6 19.2H371.2c-12.8 0-19.2-6.4-25.6-19.2L320 531.2C313.6 512 294.4 512 281.6 512H179.2c-12.8 0-19.2-12.8-12.8-19.2z m768 441.6s0 32-38.4 32H121.6c-19.2 0-32-12.8-32-32V601.6c0-19.2 12.8-32 32-32H256s6.4 0 6.4 6.4l25.6 70.4c6.4 25.6 32 38.4 57.6 38.4h332.8c25.6 0 51.2-19.2 57.6-38.4 0 0 25.6-64 25.6-70.4s6.4-6.4 6.4-6.4h134.4c19.2 0 32 12.8 32 32v332.8z" p-id="4324"></path><path d="M659.2 249.6H358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h300.8c19.2 0 32 12.8 32 32s-12.8 32-32 32zM659.2 371.2H358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h300.8c19.2 0 32 12.8 32 32 0 12.8-12.8 32-32 32zM659.2 486.4H358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h300.8c19.2 0 32 12.8 32 32s-12.8 32-32 32z"  p-id="4325"></path></svg>
\ No newline at end of file
diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss
index 305cf8b..287718d 100644
--- a/src/assets/styles/archives-manage.scss
+++ b/src/assets/styles/archives-manage.scss
@@ -659,9 +659,20 @@
   right: -22px;
   height: calc(100vh - 138px);
 }
+[data-theme=dark] .el-drawer__wrapper {
+  position: absolute;
+  top: -42px;
+  right: -22px;
+  height: calc(100vh - 159px);
+}
+
 .el-drawer{
   overflow: visible;
 }
+[data-theme=dark] .el-drawer{
+  background-color: #031435;
+  border: 1px solid #113d72;
+}
 
 .el-drawer.rtl{
   top: 0;
@@ -669,9 +680,30 @@
   border: 1px solid #E6E8ED;
 }
 
+[data-theme=dark] .el-drawer.rtl{
+  border: 1px solid #113d72;
+}
+
 .el-drawer__body{
   position: relative;
   overflow: visible;
+  padding-top: 57px;
+}
+
+[data-theme=dark] .el-drawer__body{
+  padding-top: 40px;
+}
+
+.anjuan-drawer .el-drawer__body{
+  padding-top: 23px;
+}
+
+[data-theme=dark] .anjuan-drawer .el-drawer__body{
+  padding-top: 42px;
+}
+
+[data-theme=dark] .anjuan-drawer .el-drawer.rtl {
+  border-top: none;
 }
 
 .closed-btn{
@@ -745,6 +777,13 @@
   }
 }
 
+[data-theme=dark] .collect-header{
+  border-top: none;
+  h4{
+    color: #fff;
+  }
+}
+
 .collect-menu{
   .el-menu.el-menu--horizontal{
     border-bottom: none;
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue
index d15b9c4..0b54f1e 100644
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue
@@ -6,7 +6,7 @@
       <!-- 最右侧装饰img -->
       <span class="tab-right-img" />
     </ul>
-    <TableListMoudle ref="tableList" :is-title-type="isTitleType" :selected-category="selectedCategory" :active-index="activeIndex" />
+    <TableListMoudle ref="tableList" :is-title-type="isTitleType" :selected-category="selectedCategory" :active-index="activeIndex" :test="test" />
   </div>
 </template>
 
@@ -30,12 +30,14 @@ export default {
   data() {
     return {
       isTitleType: 3,
-      activeIndex: 0
+      activeIndex: 0,
+      test: ''
     }
   },
   created() {
   },
   mounted() {
+    console.log('test', this.test)
   },
   methods: {
     changeActiveTab(data) {
@@ -46,4 +48,10 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+[data-theme=dark] .archives-container .tab-content .tab-nav{
+  margin: -41px 0 0 -1px;
+}
+[data-theme=light] .archives-container .tab-content .tab-nav{
+  border-bottom: none;
+}
 </style>
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue
index f46a1d5..8b9eb5d 100644
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <AnjuanContent v-if="selectedCategory.isType === 3 || selectedCategory.isType === 5" ref="ajContent" :selected-category="selectedCategory" />
+    <AnjuanContent v-if="selectedCategory.isType === 3 || selectedCategory.isType === 5" ref="ajContent" class="ajContent" :selected-category="selectedCategory" />
     <el-drawer
       v-else
       class="anjuan-drawer"
@@ -43,6 +43,7 @@ export default {
   created() {
   },
   mounted() {
+
   },
   methods: {
     closeDrawer() {
@@ -53,9 +54,7 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-.anjuan-drawer{
-  ::v-deep .el-drawer__body{
-    padding-top: 20px;
-  }
+[data-theme=light] .ajContent{
+  padding-top: 2px;
 }
 </style>
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue
index 38e4d54..36551b4 100644
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :arc-id="arcId" :selections="selections" :active-index="activeIndex" />
+    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :arc-id="arcId" :selections="selections" :active-index="activeIndex" :test="test" />
     <el-table
       ref="table"
       v-loading="crud.loading || getTableDisplayFieldsLoading"
@@ -77,6 +77,10 @@ export default {
     activeIndex: {
       type: Number,
       default: 0
+    },
+    test: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -115,12 +119,12 @@ export default {
   mounted() {
   },
   methods: {
-    openJuannei() {
+    openJuannei(data) {
       // this.$emit('openJuannei', '这是来自案卷的通知')
       if (this.selectedCategory.isType === 2) {
-        this.$parent.$parent.$parent.$emit('openJuannei')
+        this.$parent.$parent.$parent.$emit('openJuannei', data)
       } else {
-        this.$parent.$parent.$emit('openJuannei')
+        this.$parent.$parent.$emit('openJuannei', data)
       }
     },
     handleSelect(key, keyPath) {
@@ -175,7 +179,7 @@ export default {
         clearTimeout(this.timer)
       }
       this.timer = setTimeout(() => {
-        this.openJuannei()
+        this.openJuannei(row.archive_no)
       }, 300)
       this.selections = this.crud.selections
     },
diff --git a/src/views/collectReorganizi/collectionLibrary/file/index.vue b/src/views/collectReorganizi/collectionLibrary/file/index.vue
index 3f0a228..8234b8f 100644
--- a/src/views/collectReorganizi/collectionLibrary/file/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/file/index.vue
@@ -6,9 +6,10 @@
     :wrapper-closable="false"
     :show-close="false"
     direction="rtl"
-    :size="selectedCategory.isType === 3 ? '80%' : selectedCategory.isType === 5 ? '90%' : '70%'"
+
+    :size="((selectedCategory.isType === 3 && isAjNo === 0) || (selectedCategory.isType === 2 && isAjNo === 1)) ? '80%' : (isAjNo === 1) ? '90%' : (selectedCategory.isType === 5) ? '90%' : '70%'"
   >
-    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :selections="selections" />
+    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :selections="selections" :test="test" />
     <span class="closed-btn" @click="closeDrawer" />
     <el-table
       ref="table"
@@ -95,7 +96,9 @@ export default {
         page: 1,
         size: 10,
         total: 0
-      }
+      },
+      test: '',
+      isAjNo: 0
     }
   },
   watch: {
@@ -159,9 +162,12 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-::v-deep .el-drawer__body{
-  padding-top: 56px;
-}
+// ::v-deep .el-drawer__body{
+//   padding-top: 56px;
+// }
+// [data-theme=dark] ::v-deep .el-drawer__body{
+//   padding-top: 22px;
+// }
 .svg-style{
   width: 60px;
   height: 32px;
diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue
index 314f3af..1c05d3e 100644
--- a/src/views/collectReorganizi/collectionLibrary/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/index.vue
@@ -62,7 +62,7 @@
         </div>
       </div>
       <!--用户数据-->
-      <div class="elect-cont-right">
+      <div v-if="selectedCategory.isType !== 1" class="elect-cont-right">
         <div class="container-right tab-content">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
@@ -195,17 +195,30 @@ export default {
     },
     handleOpenAnjuan(data) {
       this.$refs.anjuanEle.anjuanDrawer = true
+      this.$nextTick(() => {
+        this.$refs.anjuanEle.$refs.ajContent.test = data
+      })
     },
-    handleOpenJuannei() {
-      this.sharedData = '新的数据'
-      if (this.selectedCategory.isType === 5) {
+    handleOpenJuannei(data) {
+      if (this.selectedCategory.isType === 5 || (this.selectedCategory.isType === 3 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1) || (this.selectedCategory.isType === 2 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1)) {
         this.$refs.fileEle.fileDrawer = true
+        this.$nextTick(() => {
+          this.$refs.fileEle.test = data
+          this.$refs.fileEle.isAjNo = 1
+        })
       } else {
         this.$refs.juanneiEle.juanneiDrawer = true
+        this.$nextTick(() => {
+          this.$refs.juanneiEle.test = data
+          this.$refs.fileEle.isAjNo = 0
+        })
       }
     },
-    handleOpenFile() {
+    handleOpenFile(data) {
       this.$refs.fileEle.fileDrawer = true
+      this.$nextTick(() => {
+        this.$refs.fileEle.test = data
+      })
     }
   }
 }
diff --git a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue
index 5447735..e78ceee 100644
--- a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue
@@ -8,7 +8,7 @@
     direction="rtl"
     :size="selectedCategory.isType === 3 ? '90%' :'80%'"
   >
-    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :selections="selections" />
+    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :selections="selections" :test="test" />
     <el-table
       ref="table"
       v-loading="crud.loading || getTableDisplayFieldsLoading"
@@ -95,7 +95,8 @@ export default {
         size: 10,
         total: 0
       },
-      timer: null
+      timer: null,
+      test: ''
     }
   },
   watch: {
@@ -113,9 +114,9 @@ export default {
 
   },
   methods: {
-    openFile() {
+    openFile(data) {
       // this.$emit('openFile', '这是来自卷内的通知')
-      this.$emit('openFile')
+      this.$emit('openFile', data)
     },
     closeDrawer() {
       this.juanneiDrawer = false
@@ -162,7 +163,7 @@ export default {
         clearTimeout(this.timer)
       }
       this.timer = setTimeout(() => {
-        this.openFile()
+        this.openFile(row.archive_no)
       }, 300)
       this.selections = this.crud.selections
     },
@@ -189,7 +190,5 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-::v-deep .el-drawer__body{
-  padding-top: 56px;
-}
+
 </style>
diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
index d5e20dc..ba50548 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="collect-header">
-    <h4 :class="classType">{{ collectTitle }}</h4>
+    <h4 :class="classType">{{ collectTitle }} <span v-if="isTitleType !== 2 && !(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 5) )"> > {{ test }}</span></h4>
     <div v-if="isTitleType !== 6" class="head-search">
       <!-- 搜索 -->
       <el-input v-model="query.blurry" clearable size="small" :placeholder="placeholderType" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" />
@@ -274,6 +274,12 @@ export default {
     activeIndex: {
       type: Number,
       default: 0
+    },
+    test: {
+      type: String,
+      default: function() {
+        return ''
+      }
     }
   },
   data() {
diff --git a/src/views/collectReorganizi/collectionLibrary/project/index.vue b/src/views/collectReorganizi/collectionLibrary/project/index.vue
index 4b874e3..160de0d 100644
--- a/src/views/collectReorganizi/collectionLibrary/project/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/project/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="collect-no-tab">
-    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :arc-id="arcId" :selections="selections" />
+    <CollectHeader ref="collectHeaderRef" :is-title-type="isTitleType" :selected-category="selectedCategory" :arc-id="arcId" :selections="selections" />
     <!-- <el-button type="text" @click="openAnjuan">打开案卷的Drawer</el-button> -->
 
     <el-table
@@ -49,7 +49,6 @@
     />
     <!-- 档案详情 -->
     <ArchivesInfo ref="archivesInfo" :category-id="categoryId" :arc-id="arcId" />
-
   </div>
 </template>
 
@@ -113,9 +112,9 @@ export default {
   mounted() {
   },
   methods: {
-    openAnjuan() {
+    openAnjuan(data) {
       // this.$emit('openAnjuan', '传值')
-      this.$emit('openAnjuan')
+      this.$emit('openAnjuan', data)
     },
     handleSelect(key, keyPath) {
       console.log(key, keyPath)
@@ -157,7 +156,7 @@ export default {
         clearTimeout(this.timer)
       }
       this.timer = setTimeout(() => {
-        this.openAnjuan()
+        this.openAnjuan(row.item_no)
       }, 300)
       this.selections = this.crud.selections
     },
@@ -187,4 +186,7 @@ export default {
 .collect-no-tab{
   padding-top: 36px;
 }
+[data-theme=dark] .collect-no-tab{
+  padding-top: 0;
+}
 </style>