home

src/components/patientRegister/PatientLis.vue

@@ -110,7 +110,7 @@
           <!-- 给合项目 -->
           <el-tab-pane label="预览" name="1">
             <embed :src="lisLabel" type="application/pdf" width="100%" :style="`margin-top: ${-LocalConfig.lisLabel.MarginTop}px;`"
-              :height="(window.pageHeight < 600 ? 119 : Math.floor((window.pageHeight - 243) / 3)) + LocalConfig.lisLabel.MarginTop" />
+              :height="(window.pageHeight < 600 ? 119 : Math.floor((window.pageHeight - 243) / 3)) + Number(LocalConfig.lisLabel.MarginTop)" />
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -314,7 +314,6 @@ export default {
 
   },
   methods: {
-    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
     moment, dddw, deepCopy, checkPagePriv,
 
     // 扩展定义表格行样式

src/views/Home.vue

@@ -1,5 +1,8 @@
 <template>
   <div style="background: #F4F8FF">
+    <div style="position: absolute; top:15px;right:5px; z-index: 1000;">
+      <i class="el-icon-close" @click="windowClose" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
+    </div>
     <div>
       <el-container>
         <el-header style="height:50px; line-height: 40px" class="principalheader">
@@ -77,10 +80,12 @@
 
                   <el-dropdown-item @click.native="localSet">本地设置</el-dropdown-item>
                   <el-dropdown-item @click.native="toggleDevTools">调试工具</el-dropdown-item>
-                  <el-dropdown-item @click.native="clientConfigShow">客户端参数</el-dropdown-item>                  
+                  <el-dropdown-item @click.native="clientConfigShow">客户端参数</el-dropdown-item>
                   <el-dropdown-item @click.native="windowMin">最小化</el-dropdown-item>
+                  <!--
                   <el-dropdown-item @click.native="windowMax">最大化</el-dropdown-item>
                   <el-dropdown-item @click.native="windowClose">关闭</el-dropdown-item>
+                  -->
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -110,6 +115,7 @@
           </el-main>
         </el-container>
       </el-container>
+
     </div>
     <div>
       <!--通用本地参数设置-->
@@ -125,7 +131,7 @@
 import router from "@/router";
 import { getapi, postapi } from "@/api/api";
 import { mapState } from "vuex";
-import { getTreeNode,madeTree } from "../utlis/tree";
+import { getTreeNode, madeTree } from "../utlis/tree";
 import LocalConfig from "../components/common/LocalConfig.vue";
 
 export default {
@@ -193,9 +199,9 @@ export default {
           window.sessionStorage.setItem("userPriv", JSON.stringify(res.data));
 
           let menuPriv = res.data.filter(e => { return e.menuType == '0' || e.menuType == '1' })
-          this.menuPriv = madeTree(menuPriv,'treeChildren','parentId','id',null)
+          this.menuPriv = madeTree(menuPriv, 'treeChildren', 'parentId', 'id', null)
           this.menuPriv = this.menuFilter(this.menuPriv)
-          
+
         }
       })
     },
@@ -297,7 +303,7 @@ export default {
     },
 
     // 打开客户端设置
-    clientConfigShow(){
+    clientConfigShow() {
       if (!this.$peisAPI) {
         this.$message.info("此功能，需要在壳客户端才可运行！")
         return