From 9f62a20febcf2bf49cba2cca1a5af38f7133c44f Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 18 Jul 2025 15:37:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/viewFile/viewFile.vue | 19 +++++++++++--------
 src/views/system/user.vue            |  2 ++
 vue.config.js                        |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/viewFile/viewFile.vue b/src/components/viewFile/viewFile.vue
index 781d508..3f56d0c 100644
--- a/src/components/viewFile/viewFile.vue
+++ b/src/components/viewFile/viewFile.vue
@@ -12,16 +12,15 @@
         <a class="ivu-modal-screen" @click="isfullscreen = !isfullscreen">
           <i :class="isfullscreen?'el-icon-aim':'el-icon-full-screen'"></i></a>
         <a @click='coloseDia'><i class="el-icon-close"></i></a>
-
       </div>
     </div>
 
-    <div class="dialogConcent">
+    <div :class="isfullscreen?'dialogConcentFull':'dialogConcent'">
       <div v-if="typeName=='file'" style="height:100%;overflow: scroll;">
-        <vue-office-docx v-if="urlType==='docx'" :src="url" @rendered="renderingCompleted"></vue-office-docx>
-        <vue-office-pdf v-else-if="urlType==='pdf'" :src="url" @rendered="renderingCompleted"></vue-office-pdf>
-        <vue-office-excel v-else-if="urlType==='excel'" :src="url" @rendered="renderingCompleted"></vue-office-excel>
-        <vue-office-pptx v-else-if="urlType==='pptx'" :src="url" @rendered="renderingCompleted"></vue-office-pptx>
+        <vue-office-docx  style="height:100%" v-if="urlType==='docx'" :src="url" @rendered="renderingCompleted"></vue-office-docx>
+        <vue-office-pdf style="height:100%" v-else-if="urlType==='pdf'" :src="url" @rendered="renderingCompleted"></vue-office-pdf>
+        <vue-office-excel style="height:100%" v-else-if="urlType==='excel'" :src="url" @rendered="renderingCompleted"></vue-office-excel>
+        <vue-office-pptx style="height:100%" v-else-if="urlType==='pptx'" :src="url" @rendered="renderingCompleted"></vue-office-pptx>
         <img v-else-if="urlType==='image'"  :src="url" style="width:100%"></img>
 
         <iframe v-else id="iframeWin" :src="url" frameborder="0" scrolling="auto" align="center" class="iframeWeb">
@@ -80,7 +79,7 @@
     data() {
       return {
         diaShow: this.isShow,
-        isfullscreen: false,
+        isfullscreen: true,
         baseUrl: `${process.env.VUE_APP_PREVIEW_API}?url=`,
         url: '',
         wheight: "400",
@@ -151,7 +150,11 @@
 
   .dialogConcent {
     overflow-y: scroll;
-    height:400px;
+    /* height:400px; */
+    min-height:400px;
+  }
+  .dialogConcentFull{
+    height:calc(100vh - 150px)
   }
 
   .iframeWeb {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 2194546..b850b39 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -332,6 +332,8 @@
           this.$Message.warning('密码不能少于6位')
           return
         }
+        console.log("that.form.catalogs_ids",that.form.catalogs_ids)
+        // return
         this.$refs[formName].validate((valid) => {
           if (valid) {
             save({
diff --git a/vue.config.js b/vue.config.js
index c82404e..5201527 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin_test',
+  outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项