From 1c0bc1594f7ba0d3a1a1ec24ec9bfb741a764089 Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Sun, 7 May 2023 22:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                  |  2 ++
 src/layouts/PageLayout.vue                  |  5 +++--
 src/pages/Middle/Base/BaseCompany/i18n.js   |  4 ++--
 src/pages/Middle/Base/BaseCompany/list.vue  |  6 +++---
 src/pages/Middle/Base/BaseConfig/list.vue   |  8 ++++----
 src/pages/dashboard/workplace/WorkPlace.vue | 12 ++++++------
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5542012..a6bfa0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ selenium-debug.log
 *.sln
 package-lock.json
 .env.production.local
+.env
+.env.development
\ No newline at end of file
diff --git a/src/layouts/PageLayout.vue b/src/layouts/PageLayout.vue
index aa0a791..87c974c 100644
--- a/src/layouts/PageLayout.vue
+++ b/src/layouts/PageLayout.vue
@@ -3,8 +3,9 @@
     <page-header ref="pageHeader" :style="`margin-top: ${multiPage ? 0 : -24}px`" :breadcrumb="breadcrumb" :title="pageTitle" :logo="logo" :avatar="avatar">
       <slot name="action"  slot="action"></slot>
       <slot slot="content" name="headerContent"></slot>
-      <div slot="content" v-if="!this.$slots.headerContent && desc">
-        <p  v-html="desc"></p>
+      <div slot="content"  v-if="(!this.$slots.headerContent && desc) || (this.$slots.headerContent == ' ' || desc == ' ')">
+        <!-- 如果desc存在内容则显示，如果不存在则不显示 -->
+        <p  v-if="desc" v-html="desc"></p>
         <div v-if="this.linkList" class="link">
           <template  v-for="(link, index) in linkList">
             <a :key="index" :href="link.href"><a-icon :type="link.icon" />{{link.title}}</a>
diff --git a/src/pages/Middle/Base/BaseCompany/i18n.js b/src/pages/Middle/Base/BaseCompany/i18n.js
index 847ef50..70b93df 100644
--- a/src/pages/Middle/Base/BaseCompany/i18n.js
+++ b/src/pages/Middle/Base/BaseCompany/i18n.js
@@ -1,9 +1,9 @@
 module.exports = {
     messages: {
       CN: { 
-        pageDesc:'管理公司',
+        pageDesc:' ',
         
-        editPageDesc:'编辑更新公司'
+        editPageDesc:' '
       },
       HK: {
         
diff --git a/src/pages/Middle/Base/BaseCompany/list.vue b/src/pages/Middle/Base/BaseCompany/list.vue
index cbbcba4..ec738b6 100644
--- a/src/pages/Middle/Base/BaseCompany/list.vue
+++ b/src/pages/Middle/Base/BaseCompany/list.vue
@@ -44,7 +44,7 @@
         </template>
 
         <template #logo="{ row }">
-          <img v-if="row.logo" :src="row.logo" style="width: 100px;" />
+          <img v-if="row.logo" :src="row.logo" style="width: 60px;" />
           <span v-else>无</span>
         </template>
       </vxe-grid>
@@ -166,7 +166,7 @@ export default {
           { field: 'title', sortable: true, title: '公司名称', width: 250 }, // 公司名称
           // 将 auth_stop_date 时间戵转换为日期格式
           { field: 'auth_stop_date', formatter: "formatDate", width: 120, sortable: true, title: '授权截止日期', showHeaderOverflow: true },
-          { field: 'token', width: 120, sortable: true, title: 'token', showHeaderOverflow: true },  // 公司token
+          // { field: 'token', width: 120, sortable: true, title: 'token', showHeaderOverflow: true },  // 公司token
           { field: 'is_private_cloud', width: 110, sortable: true, title: '私有云', showHeaderOverflow: true }, // 是否私有云
           { field: 'admin_count', width: 110, sortable: true, title: '用户数', showHeaderOverflow: true }, // 用户数
           { field: 'status', slots: { default: 'status' }, width: 80, sortable: true, title: '状态', showHeaderOverflow: true }, // 状态
@@ -361,7 +361,7 @@ export default {
 }
 
 .gridPanel {
-  height: calc(100vh - 400px);
+  height: calc((100vh*2) - 400px);
 }
 </style> 
 
diff --git a/src/pages/Middle/Base/BaseConfig/list.vue b/src/pages/Middle/Base/BaseConfig/list.vue
index 2ad77ce..be6cf70 100644
--- a/src/pages/Middle/Base/BaseConfig/list.vue
+++ b/src/pages/Middle/Base/BaseConfig/list.vue
@@ -43,7 +43,7 @@
         </template>
 
         <template #logo="{ row }">
-          <img v-if="row.logo" :src="row.logo" style="width: 100px;" />
+          <img v-if="row.logo" :src="row.logo" style="width: 60px;" />
           <span v-else>无</span>
         </template>
       </vxe-grid>
@@ -151,10 +151,10 @@ export default {
           { type: 'checkbox', width: 50 },
           { type: 'seq', width: 50 },
           { field: 'title', sortable: true, title: '标题' },
-          { slots: { default: 'logo' }, width: 120, sortable: true, title: '公司Logo', showHeaderOverflow: true },
+          { slots: { default: 'logo' }, width: 120, sortable: true, title: '项目Logo', showHeaderOverflow: true },
           { field: 'domain', sortable: true, title: '网址域名', showHeaderOverflow: true },
           { field: 'token', sortable: true, title: 'token', showHeaderOverflow: true },
-          { field: 'desc', sortable: true, title: '描述', showHeaderOverflow: true },
+          // { field: 'desc', sortable: true, title: '描述', showHeaderOverflow: true },
           { title: '操作', slots: { default: 'op' }, width: 120 }
         ]
       }
@@ -338,7 +338,7 @@ export default {
 }
 
 .gridPanel {
-  height: calc(100vh - 400px);
+  height: calc((100vh*2) - 400px);
 }
 </style> 
 
diff --git a/src/pages/dashboard/workplace/WorkPlace.vue b/src/pages/dashboard/workplace/WorkPlace.vue
index 8405530..b88b80b 100644
--- a/src/pages/dashboard/workplace/WorkPlace.vue
+++ b/src/pages/dashboard/workplace/WorkPlace.vue
@@ -1,9 +1,9 @@
 <template>
   <page-layout :avatar="currUser.avatar">
     <template slot="extra">
-      <head-info class="split-right" :title="$t('project')" content="56"/>
+      <!-- <head-info class="split-right" :title="$t('project')" content="56"/>
       <head-info class="split-right" :title="$t('ranking')" content="8/24"/>
-      <head-info class="split-right" :title="$t('visit')" content="2,223"/>
+      <head-info class="split-right" :title="$t('visit')" content="2,223"/> -->
     </template>
     <template>
       <a-row style="margin: 0 -12px">
@@ -18,12 +18,12 @@
         <a-col style="padding: 0 12px" :xl="8" :lg="24" :md="24" :sm="24" :xs="24">
           <a-card :title="$t('access')" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
             <div class="item-group">
-              <a>操作一</a>
+              <!-- <a>操作一</a>
               <a>操作二</a>
               <a>操作三</a>
               <a>操作四</a>
               <a>操作五</a>
-              <a>操作六</a>
+              <a>操作六</a> -->
               <a-button size="small" type="primary" ghost icon="plus">{{$t('add')}}</a-button>
             </div>
           </a-card>
@@ -41,14 +41,14 @@
 
 <script>
 import PageLayout from '@/layouts/PageLayout'
-import HeadInfo from '@/components/tool/HeadInfo'
+// import HeadInfo from '@/components/tool/HeadInfo'
 // import Radar from '@/components/chart/Radar'
 import {mapState} from 'vuex'
 // import {request, METHOD} from '@/utils/request'
 
 export default {
   name: 'WorkPlace',
-  components: {HeadInfo, PageLayout},
+  components: { PageLayout},
   i18n: require('./i18n'),
   data () {
     return {