提交分支修改样式

src/components/page/GlobalHeader.vue

@@ -4,7 +4,7 @@
     v-if="!headerBarFixed"
     :class="[
       fixedHeader && 'ant-header-fixedHeader',
-      sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',
+      //sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',
     ]"
     :style="{ padding: '0' }"
   >
@@ -31,7 +31,7 @@
         <div class="header-nowTime" :style="topMenuStyle.headerIndexLeft">末端数据接入处理系统</div>
         <div class="header-index-center" :style="topMenuStyle.headerIndexCenter">
           <div class="header-index-wide">
-            <div class="header-index-center" :style="topMenuStyle.topmenuCenter">
+            <div class="header-index-center" :style="topMenuStyle.headerIndexLeft">
               <s-menu mode="horizontal" :menu="menus" :theme="theme"></s-menu>
             </div>
           </div>

src/components/page/GlobalLayout.vue

@@ -1,28 +1,7 @@
 <template>
   <a-layout class="layout" :class="[device]">
-    <template v-if="layoutMode === 'sidemenu'">
+    <!-- <template v-if="layoutMode === 'sidemenu'">
-      <a-drawer
-        v-if="device === 'mobile'"
-        :wrapClassName="'drawer-sider ' + navTheme"
-        placement="left"
-        @close="() => (this.collapsed = false)"
-        :closable="false"
-        :visible="collapsed"
-        width="200px"
-      >
       <side-menu
-          mode="inline"
-          v-if="device === 'mobile'"
-          :menus="menus"
-          @menuSelect="menuSelect"
-          :theme="navTheme"
-          :collapsed="false"
-          :collapsible="true"
-        ></side-menu>
-      </a-drawer>
-
-      <side-menu
-        v-show="device === 'desktop'"
         mode="inline"
         :menus="menus"
         @menuSelect="myMenuSelect"
@@ -30,28 +9,7 @@
         :collapsed="collapsed"
         :collapsible="true"
       ></side-menu>
-    </template>
+    </template> -->
-    <!-- 下次优化这些代码 -->
-    <template v-else>
-      <a-drawer
-        v-if="device === 'mobile'"
-        :wrapClassName="'drawer-sider ' + navTheme"
-        placement="left"
-        @close="() => (this.collapsed = false)"
-        :closable="false"
-        :visible="collapsed"
-        width="200px"
-      >
-        <side-menu
-          mode="inline"
-          :menus="menus"
-          @menuSelect="menuSelect"
-          :theme="navTheme"
-          :collapsed="false"
-          :collapsible="true"
-        ></side-menu>
-      </a-drawer>
-    </template>
 
     <a-layout
       :class="[layoutMode, `content-width-${contentWidth}`]"

src/components/tools/UserMenu.vue

@@ -1,37 +1,5 @@
 <template>
   <div class="user-wrapper" :class="theme" style="min-width:460px">
-    <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <!-- update-begin author:sunjianlei date:20191@20 for: 解决全局样式冲突的问题 -->
-    <!-- <span class="action" @click="showClick">
-      <a-icon type="search"></a-icon>
-    </span> -->
-    <!-- update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
-    <!-- <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">
-      <a-select
-        class="search-input"
-        showSearch
-        :showArrow="false"
-        placeholder="搜索菜单"
-        optionFilterProp="children"
-        :filterOption="filterOption"
-        :open="isMobile()?true:null"
-        :getPopupContainer="(node) => node.parentNode"
-        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"
-        @change="searchMethods"
-        @blur="hiddenClick"
-      >
-        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>
-      </a-select>
-    </component> -->
-    <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
-    <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
-    <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <!-- <span class="action">
-      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">
-        <a-icon type="question-circle-o"></a-icon>
-      </a>
-    </span> -->
-    <!-- <header-notice class="action"/> -->
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu" >
         <!-- <a-avatar class="avatar" size="small" :src="getAvatar()"/> -->
@@ -39,12 +7,6 @@
         <span v-if="isDesktop()" style="color:#00c3ff">欢迎您，{{ nickname() }}</span>
       </span>
     </a-dropdown>
-    <span class="action">
-      <a class="logout_title" href="../../codeInstructions/index.html" target="_blank">
-<!--        <a class="target" href="../../codeInstructions/index.html" target="_blank">函数文档</a>-->
-        <span v-if="isDesktop()" style="color:#00c3ff">&nbsp;函数文档</span>
-      </a>
-    </span>
     <span class="action">
       <a class="logout_title" href="javascript:;" @click="handleLogout">
         <!-- <a-icon type="logout"/> -->