From 54e2740ace36fcb2fdfa7933577e8755fca464ca Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 3 Dec 2024 14:47:26 +0800
Subject: [PATCH] 1

---
 package.json                                  |  2 +-
 src/layout/components/Navbar/index.vue        |  3 +-
 src/settings.js                               |  4 +-
 src/styles/index.scss                         | 17 +++++++
 src/views/preview/index.vue                   |  3 +-
 .../DashboardComponents/AddressBook.vue       |  4 +-
 .../system/DashboardComponents/articles.vue   | 44 +++++++++++++++----
 src/views/system/DashboardComponents/toDo.vue |  4 +-
 8 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 9452a9f..25528ee 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "bpmn-js-properties-panel": "^0.37.2",
     "camunda-bpmn-moddle": "^4.4.0",
     "core-js": "3.6.5",
-    "element-ui": "2.13.2",
+    "element-ui": "2.15.14",
     "element-resize-detector": "^1.2.4",
     "gojs": "^2.3.11",
     "js-cookie": "2.2.0",
diff --git a/src/layout/components/Navbar/index.vue b/src/layout/components/Navbar/index.vue
index 47384ce..01ea515 100644
--- a/src/layout/components/Navbar/index.vue
+++ b/src/layout/components/Navbar/index.vue
@@ -7,7 +7,7 @@
         <!--        </button>-->
         <div class="navbar-brand">
           <router-link to="/">
-            <img class="navbar-brand__img" :src="require('@/assets/title.png')" alt="">
+            <img class="navbar-brand__img" :src="isEnvTest ? require('@/assets/title.png') : require('@/assets/title1.png')" alt="">
           </router-link>
         </div>
         <div v-show="$route.path !== '/dashboard'" class="toggle-sidebar" @click="toggleIframeSidebarOpened">
@@ -130,6 +130,7 @@ export default {
   },
   data() {
     return {
+      isEnvTest: (process.env.ENV === 'staging' || process.env.NODE_ENV === 'development'),
       zIndex: PopupManager.nextZIndex(),
       isFullscreen: false,
       isShowMenuMobile: false,
diff --git a/src/settings.js b/src/settings.js
index 5c2ea93..c82c7c1 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-  title: '内控管理平台',
-  copyright: '内控管理平台',
+  title: (process.env.ENV === 'staging' || process.env.NODE_ENV === 'development') ? '内控管理平台' : '江苏省常州环境监测中心内控管理平台',
+  copyright: (process.env.ENV === 'staging' || process.env.NODE_ENV === 'development') ? '内控管理平台' : '江苏省常州环境监测中心内控管理平台',
 
   /**
    * @type {boolean} true | false
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 3961eb4..700d5c0 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -78,3 +78,20 @@ div:focus {
 .vxe-loading--default-icon,.vxe-loading--text {
   color: var(--theme-color) !important;;
 }
+
+
+::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+::-webkit-scrollbar-track {
+  background: rgb(239, 239, 239);
+}
+::-webkit-scrollbar-thumb {
+  background: #bfbfbf;
+  border-radius: 10px;
+}
+.el-table__body-wrapper::-webkit-scrollbar, .el-scrollbar__wrap::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
diff --git a/src/views/preview/index.vue b/src/views/preview/index.vue
index 3a1ff4e..0c71de3 100644
--- a/src/views/preview/index.vue
+++ b/src/views/preview/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div id="online-preview-container" class="container">
     <template v-if="type === 'docx'">
       <VueOfficeDocx :src="url" style="height: 100vh;" />
     </template>
@@ -60,6 +60,7 @@ export default {
       this.$nextTick(() => {
         document.querySelector('.el-image-viewer__close').style.display = 'none'
         document.querySelector('.el-image__inner').style.display = 'none'
+        document.querySelector('.el-image-viewer__mask').style.pointerEvents = 'none'
       })
     },
     async resolveUrl(url) {
diff --git a/src/views/system/DashboardComponents/AddressBook.vue b/src/views/system/DashboardComponents/AddressBook.vue
index 98d4bd3..5bb6e6b 100644
--- a/src/views/system/DashboardComponents/AddressBook.vue
+++ b/src/views/system/DashboardComponents/AddressBook.vue
@@ -124,7 +124,7 @@ export default {
     },
     init() {
       const cardDom = document.getElementById('address-book')
-      const cardTitleH = 61
+      const cardTitleH = 70
       const elementResize = ElementResize({
         strategy: 'scroll'
       })
@@ -141,7 +141,7 @@ export default {
 
 <style scoped lang="scss">
 .body {
-  overflow: scroll;
+  // overflow: scroll;
 
   ul {
     list-style: none;
diff --git a/src/views/system/DashboardComponents/articles.vue b/src/views/system/DashboardComponents/articles.vue
index c680502..4157319 100644
--- a/src/views/system/DashboardComponents/articles.vue
+++ b/src/views/system/DashboardComponents/articles.vue
@@ -25,17 +25,43 @@
         :data="article"
       >
         <el-table-column type="index" width="46" align="center" />
-        <el-table-column prop="title" width="160" align="left" header-align="center" label="标题" />
-        <el-table-column prop="article_type.name" width="140" align="center" label="类别" />
+        <el-table-column prop="title" width="220" align="left" header-align="center" label="标题" />
+        <el-table-column prop="article_type.name" width="160" align="center" label="类别" />
         <el-table-column prop="sub_title" min-width="160" show-overflow-tooltip header-align="center" align="left" label="简介" />
-        <el-table-column prop="content" min-width="160" show-overflow-tooltip header-align="center" align="left" label="内容" />
-        <el-table-column min-width="140" label="附件" header-align="center">
+        <el-table-column align="center" width="100" label="查看">
           <template #default="{ row }">
-            <div v-for="file in row.files" :key="file.id">
-              <el-link type="primary" @click="$bus.$emit('online-file', file.url)">{{ file.original_name	}}</el-link>
-            </div>
+            <el-popover
+              placement="top"
+              width="480"
+              trigger="hover"
+            >
+              <el-button slot="reference" size="mini" type="primary" style="padding: 5px 10px;">查看</el-button>
+              <template>
+                <el-descriptions size="mini" title="详情" :column="2">
+                  <el-descriptions-item label="标题">{{ row.title }}</el-descriptions-item>
+                  <el-descriptions-item label="类别"><el-tag size="small">{{ row.article_type ? row.article_type.name : '' }}</el-tag></el-descriptions-item>
+                  <el-descriptions-item label="简介">{{ row.sub_title }}</el-descriptions-item>
+                  <el-descriptions-item label="内容">{{ row.content }}</el-descriptions-item>
+                  <el-descriptions-item label="附件">
+                    <div>
+                      <div v-for="file in row.files" :key="file.id">
+                        <el-link type="primary" @click="$bus.$emit('online-file', file.url)">{{ file.original_name	}}</el-link>
+                      </div>
+                    </div>
+                  </el-descriptions-item>
+                </el-descriptions>
+              </template>
+            </el-popover>
           </template>
         </el-table-column>
+        <!--        <el-table-column prop="content" min-width="160" show-overflow-tooltip header-align="center" align="left" label="内容" />-->
+        <!--        <el-table-column min-width="140" label="附件" header-align="center">-->
+        <!--          <template #default="{ row }">-->
+        <!--            <div v-for="file in row.files" :key="file.id">-->
+        <!--              <el-link type="primary" @click="$bus.$emit('online-file', file.url)">{{ file.original_name	}}</el-link>-->
+        <!--            </div>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
 
       <div style="display: flex;justify-content: center;">
@@ -116,7 +142,7 @@ export default {
     },
     init() {
       const cardDom = document.getElementById('article-card')
-      const cardTitleH = 60
+      const cardTitleH = 61
       const elementResize = ElementResize({
         strategy: 'scroll'
       })
@@ -133,7 +159,7 @@ export default {
 
 <style scoped lang="scss">
 .body {
-  overflow: scroll;
+  // overflow: scroll;
 
   ul {
     list-style: none;
diff --git a/src/views/system/DashboardComponents/toDo.vue b/src/views/system/DashboardComponents/toDo.vue
index 8011ef3..211ea14 100644
--- a/src/views/system/DashboardComponents/toDo.vue
+++ b/src/views/system/DashboardComponents/toDo.vue
@@ -39,9 +39,9 @@
             :align="item.align"
             :formatter="item.formatter"
           />
-          <el-table-column label="操作" header-align="center" min-width="122" fixed="right">
+          <el-table-column label="操作" header-align="center" width="160" fixed="right">
             <template #default="{ row }">
-              <el-button size="mini" style="padding: 5px 10px;" @click="read(row)">设为已读</el-button>
+              <el-button size="mini" style="padding: 5px 10px;background: #f0f3fa;color: #333;border: 1px solid #dae1f0;" @click="read(row)">设为已读</el-button>
               <el-button size="mini" type="primary" style="padding: 5px 10px;" @click="handle(row)">办理</el-button>
             </template>
           </el-table-column>