Merge remote-tracking branch 'origin/master'

jero-web/src/common/lang/en-us.js

@@ -339,6 +339,7 @@ module.exports = {
   TextStatus:'TextStatus',
   PleaseEnter:'Please enter',
   PleaseSelect:'Please select',
+  PleaseEnterOrSelect:'Please Enter Or Select',
   ModificationTime:'Modification time',
   ModificationContent:'Modification content',
   personnel:'personnel',

jero-web/src/common/lang/zh-cn.js

@@ -343,6 +343,7 @@ module.exports = {
   TextStatus:'文本状态',
   PleaseEnter:'请输入',
   PleaseSelect:'请选择',
+  PleaseEnterOrSelect:'请输入或选择',
   ModificationTime:'修改时间',
   ModificationContent:'修改内容',
   personnel:'人员',

jero-web/src/components/PersonnelSelection/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="box-title-text">
-      <a-input class="box-input" :value="value" @input="indexclick($event)" :placeholder="query.placeholder"/>
+      <a-input class="box-input" :value="value" @input="indexclick($event)" :placeholder="$t('PleaseEnterOrSelect')+query.db_field_name"/>
       <a-button type="primary" class="button-box" @click="standardClick">
         人员选择
       </a-button>

jero-web/src/components/Standardselection/index.vue

@@ -6,7 +6,7 @@
       <!--        <span :class="{'title-text-text':false}">{{query.enName}}</span><br>-->
       <!--        <span :class="{'title-text-text':false}">{{query.name}}</span>-->
       <!--      </div>-->
-      <a-input class="box-input" :value="value" @input="indexclick($event)" :placeholder="query.placeholder"/>
+      <a-input class="box-input" :value="value" @input="indexclick($event)" :placeholder="$t('PleaseEnterOrSelect')+query.db_field_name"/>
       <a-button type="primary" class="button-box" @click="standardClick">
         标准选择
       </a-button>

jero-web/src/components/addForm/index.vue

@@ -3,150 +3,180 @@
     <a-form-model :model="formInline" v-if="isFormInline" class="formAdd" :rules="rules" ref="ruleForm">
       <a-row :gutter="24">
         <div v-for="(item,index) in dataList" :key="index">
-          <a-col :span="12" v-if="item.field_show_type === 'text'">
+          <a-col :span="12" v-if="item.field_show_type === '1'">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <a-input class="box-input" v-model="formInline[item.db_field_name]"
+                <a-input class="box-input"
                          :disabled="disabled"
-                         :placeholder="item.placeholder"/>
+                         v-model="formInline[item.db_field_name]"
+                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>
               </a-form-model-item>
             </div>
           </a-col>
 
-          <a-col :span="12" v-else-if="item.field_show_type === 'CHECKBOX'">
+          <a-col :span="12" v-else-if="item.field_show_type === '2'">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
-                <span class="title-text-text">{{item.db_field_txt}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                    :disabled="disabled"
-                                    :placeholder="$t('selectStatus')" :type="'checkbox'"
-                                    :triggerChange="false" :dictCode="item.dict_field"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-
-          <a-col :span="12" v-else-if="item.field_show_type === 'date'">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
-                <span class="title-text-text">{{item.db_field_txt}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <a-date-picker class="box-input" v-model="formInline[item.db_field_name]"
-                               @change="dateChange(item)"
-                               format="YYYY-MM-DD"
-                               :disabled="disabled"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-
-          <a-col :span="12" v-else-if="item.field_show_type === 'SMULTITIME'">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
-                <span class="title-text-text">{{item.db_field_txt}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <a-range-picker v-model="formInline[item.db_field_name]"
-                                :disabled="disabled"
-                                @change="onChange(item.db_field_name)"></a-range-picker>
-              </a-form-model-item>
-            </div>
-          </a-col>
-
-          <a-col :span="12" v-else-if="item.field_show_type === 'NUMBER'">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
                 <a-input-number class="box-input"
+                                :placeholder="$t('PleaseEnter')+item.db_field_txt"
                                 :disabled="disabled"
                                 v-model="formInline[item.db_field_name]" :min="1" :max="99999999"/>
               </a-form-model-item>
             </div>
           </a-col>
 
-          <a-col :span="12" v-else-if="item.field_show_type === 'list'">
+          <a-col :span="12" v-else-if="item.field_show_type === '3'">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
                 <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
                                    :disabled="disabled"
-                                   :placeholder="$t('selectStatus')" :type="'select'"
+                                   @input="handleInput(item.db_field_name)"
+                                   :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                                   :type="'select'"
                                    :triggerChange="false" :dictCode="item.dict_field"/>
               </a-form-model-item>
             </div>
           </a-col>
 
-          <a-col :span="12" v-else-if="item.field_show_type === 'list_multi'">
+          <a-col :span="12" v-else-if="item.field_show_type === '4'">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
                 <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
                                     :disabled="disabled"
-                                    :placeholder="$t('selectStatus')" :type="'select'"
+                                    :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                                    :type="'select'"
                                     :triggerChange="false" :dictCode="item.dict_field"/>
               </a-form-model-item>
             </div>
           </a-col>
+          <a-col :span="12" v-else-if="item.field_show_type === '5'">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="item.field_must_input == 0">*</span>
+                <span class="title-text-text">{{item.db_field_txt}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               @change="dateChange(item)"
+                               format="YYYY-MM-DD"
+                               v-model="formInline[item.db_field_name]"
+                               :disabled="disabled"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12" v-else-if="item.field_show_type === '6'">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="item.field_must_input == 0">*</span>
+                <span class="title-text-text">{{item.db_field_txt}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                                :disabled="disabled"
+                                @change="onChange(item.db_field_name)"></a-range-picker>
+              </a-form-model-item>
+            </div>
+          </a-col>
+
+          <a-col :span="12" v-else-if="item.field_show_type === '7'">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="item.field_must_input == 0">*</span>
+                <span class="title-text-text">{{item.db_field_txt}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload(item.db_field_name)">
+                  {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||
+                  formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件'
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </div>
+          </a-col>
+
+          <a-col :span="24" v-else-if="item.field_show_type === '8'">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="item.field_must_input == 0">*</span>
+                <span class="title-text-text">{{item.db_field_txt}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                <a-textarea
+                  :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                  :disabled="disabled"
+                  v-model="formInline[item.db_field_name]" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+
+          <a-col :span="24" v-else-if="item.field_show_type === '9'">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="item.field_must_input == 0">*</span>
+                <span class="title-text-text">{{item.db_field_txt}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                <PersonnelSelection :query="item"
+                                    :disabled="disabled"
+                                    v-model="formInline[item.db_field_name]"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+
+          <a-col :span="24" v-else-if="item.field_show_type === '10'">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="item.field_must_input == 0">*</span>
+                <span class="title-text-text">{{item.db_field_txt}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                <StandardSelection :query="item"
+                                   :disabled="disabled"
+                                   v-model="formInline[item.db_field_name]"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
 
           <a-col :span="12" v-else-if="item.field_show_type === 'RADIO'">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <j-dict-select-tag v-model="formInline[item.db_field_name]" :placeholder="$t('selectStatus')"
+                <j-dict-select-tag v-model="formInline[item.db_field_name]"
                                    :disabled="disabled"
+                                   @input="handleInput(item.db_field_name)"
+                                   :placeholder="$t('selectStatus')"
                                    :type="'radio'" :triggerChange="false" :dictCode="item.dict_field"/>
               </a-form-model-item>
             </div>
           </a-col>
 
-          <a-col :span="24" v-else-if="item.field_show_type === 'TEXTAREA'">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
-                <span class="title-text-text">{{item.db_field_txt}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <a-textarea :placeholder="$t('selectStatus')"
-                            :disabled="disabled"
-                            v-model="formInline[item.db_field_name]" :rows="4"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
           <a-col :span="12" v-else-if="item.field_show_type === 'treeSelect'">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -161,41 +191,22 @@
               </a-form-model-item>
             </div>
           </a-col>
-          <a-col :span="12" v-else-if="item.field_show_type === 'file'">
+
+          <a-col :span="12" v-else-if="item.field_show_type === 'CHECKBOX'">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <a-button type="primary" class="button-text"
+                <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                          @click="clickButtonToUpload(item.db_field_name)">
+                                    :disabled="disabled"
-                  {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||
+                                    :placeholder="$t('selectStatus')" :type="'checkbox'"
-                  formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件'
+                                    :triggerChange="false" :dictCode="item.dict_field"/>
-                  }}
-                </a-button>
               </a-form-model-item>
             </div>
           </a-col>
-
-          <a-col :span="24" v-else-if="item.field_show_type === 'STANDARD'">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="Required" v-if="item.field_must_input == 0">*</span>
-                <!--                <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
-                <span class="title-text-text">{{item.db_field_txt}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <Standardselection :query="item"
-                                   :disabled="disabled"
-                                   v-model="formInline[item.db_field_name]"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-
         </div>
-
       </a-row>
       <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
     </a-form-model>
@@ -204,7 +215,8 @@
 
 <script>
   import uploadFile from '@/components/uploadFile/file'
-  import Standardselection from '@/components/Standardselection/index'
+  import StandardSelection from '@/components/Standardselection/index'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
   import { getAction, postAction } from '@/api/manage'
   import eventBUs from '../../common/event'
   import moment from 'moment'
@@ -213,7 +225,8 @@
     name: 'index',
     components: {
       uploadFile,
-      Standardselection
+      StandardSelection,
+      PersonnelSelection
     },
     props: {
       url: {
@@ -373,7 +386,7 @@
           }
         })
       },
-      add(){
+      add() {
         this.formInline = {}
       }
     }

jero-web/src/components/layouts/TabLayout.vue

@@ -3,23 +3,25 @@
     <!-- update-begin- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
     <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" style="z-index: 9999;" @select="onMenuSelect"/>
     <!-- update-end- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
-    <a-tabs
+<!--    <a-tabs-->
-      @contextmenu.native="e => onContextmenu(e)"
+<!--      @contextmenu.native="e => onContextmenu(e)"-->
-      v-if="multipage"
+<!--      v-if="multipage"-->
-      :active-key="activePage"
+<!--      :active-key="activePage"-->
-      class="tab-layout-tabs"
+<!--      class="tab-layout-tabs"-->
-      style="height:52px"
+<!--      style="height:52px"-->
-      :hide-add="true"
+<!--      :hide-add="true"-->
-      type="editable-card"
+<!--      type="editable-card"-->
-      @change="changePage"
+<!--      @change="changePage"-->
-      @tabClick="tabCallBack"
+<!--      @tabClick="tabCallBack"-->
-      @edit="editPage">
+<!--      @edit="editPage">-->
-      <a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList"
+<!--      <a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList"-->
-                  :closable="!(page.meta.title=='首页')">
+<!--                  :closable="!(page.meta.title=='首页')">-->
-        <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
+<!--        <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>-->
-      </a-tab-pane>
+<!--      </a-tab-pane>-->
-    </a-tabs>
+<!--    </a-tabs>-->
-    <div style="margin: 12px 12px 0;">
+<!--    style="margin: 12px 12px 0;"-->
+    <Tabcrumbs />
+    <div>
       <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
       <keep-alive v-if="multipage">
         <router-view v-if="reloadFlag"/>
@@ -34,6 +36,7 @@
 
 <script>
   import GlobalLayout from '@/components/page/GlobalLayout'
+  import Tabcrumbs from '@/components/layouts/Tabcrumbs'
   import Contextmenu from '@/components/menu/Contextmenu'
   import { mixin, mixinDevice } from '@/utils/mixin.js'
   import { triggerWindowResizeEvent } from '@/utils/util'
@@ -46,7 +49,8 @@
     name: 'TabLayout',
     components: {
       GlobalLayout,
-      Contextmenu
+      Contextmenu,
+      Tabcrumbs
     },
     mixins: [mixin, mixinDevice],
     data() {

jero-web/src/components/layouts/Tabcrumbs.vue

@@ -0,0 +1,63 @@
+<template>
+  <div class="box">
+    <span class="box-text">
+        文档管理
+     </span>
+    <span class="box-text-content" v-if="subNavigation">
+      <img src="~@/assets/dayu.png" alt="">
+    </span>
+    <span class="box-text-text">
+        {{subNavigation}}
+    </span>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'Tabcrumbs',
+    data() {
+      return {
+        Navigation: '',
+        subNavigation: ''
+      }
+    },
+    watch: {
+      '$route': function(val) {
+        this.subNavigation = val.meta.title
+      }
+    },
+    mounted() {
+      this.subNavigation = this.$route.meta.title
+    },
+    methods: {}
+  }
+</script>
+
+<style scoped>
+  .box {
+    width: 100%;
+    height: 72px;
+    line-height: 92px;
+    background: #fff;
+    padding: 0 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    font-size: 20px;
+    color: #040B29;
+    font-weight: 400;
+    opacity: 0.5;
+  }
+
+  .box-text-content {
+    margin-left: 5px;
+    margin-right: 5px;
+  }
+
+  .box-text-text {
+    font-weight: 400;
+    color: #040B29;
+    font-size: 20px;
+  }
+</style>

jero-web/src/components/libraryAddForm/index.vue

@@ -8,60 +8,77 @@
         </div>
         <a-row :gutter="24">
           <div v-for="item in val.content">
-            <a-col :span="12" v-if="item.field_show_type === 'text'">
+            <a-col :span="12" v-if="item.field_show_type === '1'">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="formInline[item.db_field_name]"
-                           :placeholder="'请输入'+item.db_field_txt"/>
+                           :placeholder="$t('PleaseEnter')+item.db_field_txt"/>
                 </a-form-model-item>
               </div>
             </a-col>
 
-            <a-col :span="12" v-else-if="item.field_show_type === 'CHECKBOX'">
+            <a-col :span="12" v-else-if="item.field_show_type === '2'">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="title-text-text">{{item.db_field_txt}}</span>
+                </div>
+                <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                  <a-input-number class="box-input"
+                                  :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                                  :disabled="disabled"
+                                  v-model="formInline[item.db_field_name]" :min="1" :max="99999999"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+
+            <a-col :span="12" v-else-if="item.field_show_type === '3'">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="title-text-text">{{item.db_field_txt}}</span>
+                </div>
+                <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                  <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
+                                     :disabled="disabled"
+                                     @input="handleInput(item.db_field_name)"
+                                     :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="item.dict_field"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+
+            <a-col :span="12" v-else-if="item.field_show_type === '4'">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
                   <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
                                       :disabled="disabled"
-                                      :placeholder="$t('selectStatus')" :type="'checkbox'"
+                                      :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                                      :type="'select'"
                                       :triggerChange="false" :dictCode="item.dict_field"/>
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12" v-else-if="item.field_show_type === 'dateAll'">
+            <a-col :span="12" v-else-if="item.field_show_type === '5'">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
-                  <span class="title-text-text">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
-                                  :disabled="disabled"
-                                  @change="onChange(item.db_field_name)"></a-range-picker>
-                </a-form-model-item>
-              </div>
-            </a-col>
-            <a-col :span="12" v-else-if="item.field_show_type === 'date'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
                   <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+item.db_field_txt"
                                  @change="dateChange(item)"
                                  format="YYYY-MM-DD"
                                  v-model="formInline[item.db_field_name]"
@@ -70,52 +87,77 @@
                 </a-form-model-item>
               </div>
             </a-col>
-
+            <a-col :span="12" v-else-if="item.field_show_type === '6'">
-
-            <a-col :span="12" v-else-if="item.field_show_type === 'NUMBER'">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-input-number class="box-input"
+                  <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
+                                  :placeholder="$t('PleaseSelect')+item.db_field_txt"
                                   :disabled="disabled"
-                                  v-model="formInline[item.db_field_name]" :min="1" :max="99999999"/>
+                                  @change="onChange(item.db_field_name)"></a-range-picker>
                 </a-form-model-item>
               </div>
             </a-col>
 
-            <a-col :span="12" v-else-if="item.field_show_type === 'list'">
+            <a-col :span="12" v-else-if="item.field_show_type === '7'">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
+                  <a-button type="primary" class="button-text"
-                                     :disabled="disabled"
+                            @click="clickButtonToUpload(item.db_field_name)">
-                                     @input="handleInput(item.db_field_name)"
+                    {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||
-                                     :placeholder="$t('selectStatus')" :type="'select'"
+                    formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件'
-                                     :triggerChange="false" :dictCode="item.dict_field"/>
+                    }}
+                  </a-button>
                 </a-form-model-item>
               </div>
             </a-col>
 
-            <a-col :span="12" v-else-if="item.field_show_type === 'list_multi'">
+            <a-col :span="24" v-else-if="item.field_show_type === '8'">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
+                  <a-textarea
+                    :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                    :disabled="disabled"
+                    v-model="formInline[item.db_field_name]" :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+
+            <a-col :span="24" v-else-if="item.field_show_type === '9'">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="title-text-text">{{item.db_field_txt}}</span>
+                </div>
+                <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                  <PersonnelSelection :query="item"
                                       :disabled="disabled"
-                                      :placeholder="$t('selectStatus')" :type="'select'"
+                                      v-model="formInline[item.db_field_name]"/>
-                                      :triggerChange="false" :dictCode="item.dict_field"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+
+            <a-col :span="24" v-else-if="item.field_show_type === '10'">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="title-text-text">{{item.db_field_txt}}</span>
+                </div>
+                <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                  <Standardselection :query="item"
+                                     :disabled="disabled"
+                                     v-model="formInline[item.db_field_name]"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -124,7 +166,6 @@
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -137,25 +178,10 @@
               </div>
             </a-col>
 
-            <a-col :span="24" v-else-if="item.field_show_type === 'TEXTAREA'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
-                  <span class="title-text-text">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-textarea :placeholder="$t('selectStatus')"
-                              :disabled="disabled"
-                              v-model="formInline[item.db_field_name]" :rows="4"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
             <a-col :span="12" v-else-if="item.field_show_type === 'treeSelect'">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -170,45 +196,18 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="24" v-else-if="item.field_show_type === 'perSelect'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
-                  <span class="title-text-text">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <PersonnelSelection :query="item" :disabled="disabled" v-model="formInline[item.db_field_name]"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
 
-            <a-col :span="24" v-else-if="item.field_show_type === 'Standardselection'">
+            <a-col :span="12" v-else-if="item.field_show_type === 'CHECKBOX'">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <Standardselection :query="item" :disabled="disabled" v-model="formInline[item.db_field_name]"/>
+                  <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                </a-form-model-item>
+                                      :disabled="disabled"
-              </div>
+                                      :placeholder="$t('selectStatus')" :type="'checkbox'"
-            </a-col>
+                                      :triggerChange="false" :dictCode="item.dict_field"/>
-            <a-col :span="12" v-else-if="item.field_show_type === 'file'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
-                  <!--                  <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
-                  <span class="title-text-text">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload(item.db_field_name)">
-                    {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||
-                    formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件'
-                    }}
-                  </a-button>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -281,7 +280,7 @@
             content: []
           }
         ],
-        treeData:[
+        treeData: [
           {
             title: 'Node1',
             value: '0-0',
@@ -295,11 +294,11 @@
                   {
                     title: 'Child Node1',
                     value: '0-0-0-0',
-                    key: '0-0-0-0',
+                    key: '0-0-0-0'
-                  },
+                  }
-                ],
+                ]
-              },
+              }
-            ],
+            ]
           },
           {
             title: 'Node2',
@@ -310,21 +309,21 @@
                 title: 'Child Node3',
                 value: '0-1-0',
                 key: '0-1-0',
-                disabled: true,
+                disabled: true
               },
               {
                 title: 'Child Node4',
                 value: '0-1-1',
-                key: '0-1-1',
+                key: '0-1-1'
               },
               {
                 title: 'Child Node5',
                 value: '0-1-2',
-                key: '0-1-2',
+                key: '0-1-2'
-              },
+              }
-            ],
+            ]
-          },
+          }
-        ],
+        ]
       }
     },
     mounted() {

jero-web/src/components/menu/SideMenu.vue

@@ -1,11 +1,12 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="208px"
+    style="background: #EFF1F3"
+    width="240px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">
-    <logo />
+    <logo/>
     <s-menu
       :collapsed="collapsed"
       :menu="menus"
@@ -19,13 +20,13 @@
 </template>
 
 <script>
-  import ALayoutSider from "ant-design-vue/es/layout/Sider"
+  import ALayoutSider from 'ant-design-vue/es/layout/Sider'
   import Logo from '../tools/Logo'
   import SMenu from './index'
   import { mixin, mixinDevice } from '@/utils/mixin.js'
 
   export default {
-    name: "SideMenu",
+    name: 'SideMenu',
     components: { ALayoutSider, Logo, SMenu },
     mixins: [mixin, mixinDevice],
     props: {
@@ -54,9 +55,9 @@
         required: true
       }
     },
-    computed:{
+    computed: {
       smenuStyle() {
-        let style = { 'padding': '0' }
+        let style = { 'padding': '0', 'background': '#EFF1F3' }
         if (this.fixSiderbar) {
           style['height'] = 'calc(100% - 59px)'
           style['overflow'] = 'auto'
@@ -66,7 +67,7 @@
       }
     },
     methods: {
-      onSelect (obj) {
+      onSelect(obj) {
         this.$emit('menuSelect', obj)
       }
     }
@@ -81,6 +82,7 @@
     ul.ant-menu {
 
       /* 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
+
       &::-webkit-scrollbar {
         width: @scrollBarSize;
         height: @scrollBarSize;
@@ -103,11 +105,13 @@
       -ms-scroll-snap-points-x: snapList(100%, 200%, 300%, 400%, 500%);
 
       /* 定义滚动条轨道 */
+
       &::-webkit-scrollbar-track {
         background-color: transparent;
       }
 
       /* 定义滑块 */
+
       &::-webkit-scrollbar-thumb {
         border-radius: @scrollBarSize;
         background-color: #eee;
@@ -124,6 +128,7 @@
     }
 
     /** 暗色系滚动条样式 */
+
     &.dark ul.ant-menu {
       &::-webkit-scrollbar-thumb {
         background-color: #666666;
@@ -172,5 +177,29 @@
       }
     }
   }
+
+  .ant-menu-submenu > .ant-menu {
+    background: #e1e3e7 !important;
+  }
+
+  .ant-menu-item {
+    height: 48px !important;
+    line-height: 48px !important;
+    margin-top: 0 !important;
+    margin-bottom: 0 !important;
+  }
+
+  .ant-menu-item-selected {
+    height: 48px !important;
+    line-height: 48px !important;
+    margin-top: 0 !important;
+    margin-bottom: 0 !important;
+    background-color: #D9F4F5 !important;
+  }
+
+  .ant-menu-inline .ant-menu-item::after {
+    left: 0 !important;
+    right: inherit !important;
+  }
 </style>
 <!-- update_end author:sunjianlei date:20190530 for: 选中首页的时候不显示背景颜色 -->

jero-web/src/components/page/GlobalHeader.vue

@@ -3,22 +3,22 @@
   <a-layout-header
     v-if="!headerBarFixed"
     :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed', ]"
-    :style="{ padding: '0' }">
+    :style="{ padding: '0' , background:'#fff'}">
 
     <div v-if="mode === 'sidemenu'" class="header" :class="theme">
-      <a-icon
+<!--      <a-icon-->
-        v-if="device==='mobile'"
+<!--        v-if="device==='mobile'"-->
-        class="trigger"
+<!--        class="trigger"-->
-        :type="collapsed ? 'menu-fold' : 'menu-unfold'"
+<!--        :type="collapsed ? 'menu-fold' : 'menu-unfold'"-->
-        @click="toggle"></a-icon>
+<!--        @click="toggle"></a-icon>-->
-      <a-icon
+<!--      <a-icon-->
-        v-else
+<!--        v-else-->
-        class="trigger"
+<!--        class="trigger"-->
-        :type="collapsed ? 'menu-unfold' : 'menu-fold'"
+<!--        :type="collapsed ? 'menu-unfold' : 'menu-fold'"-->
-        @click="toggle"/>
+<!--        @click="toggle"/>-->
 
-      <span v-if="device === 'desktop'">欢迎进入 蔚来法规</span>
+<!--      <span v-if="device === 'desktop'">欢迎进入 蔚来法规</span>-->
-      <span v-else>Jero-Boot</span>
+<!--      <span v-else>Jero-Boot</span>-->
       <user-menu :theme="theme"/>
     </div>
     <!-- 顶部导航栏模式 -->
@@ -164,7 +164,7 @@
 <style lang="less" scoped>
   /* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
 
-  @height: 59px;
+  @height: 56px;
 
   .layout {
 
@@ -185,14 +185,16 @@
         }
       }
     }
-
+// @primary-color
     .header {
       z-index: 2;
       color: white;
       height: @height;
-      background-color: @primary-color;
+      line-height: @height;
+      background-color:#fff;
       transition: background 300ms;
-
+      box-shadow: none!important;
+      border-bottom: 2px #EFF1F3 solid;
       /* dark 样式 */
       &.dark {
         color: #000000;

jero-web/src/components/page/GlobalLayout.vue

@@ -321,10 +321,9 @@
 
         .action {
           cursor: pointer;
-          padding: 0 14px;
+          padding: 0 10px;
           display: inline-block;
           transition: all .3s;
-
           height: 70%;
           line-height: 46px;
 
@@ -585,7 +584,7 @@
       }
 
       img {
-        height: 32px;
+        /*height: 32px;*/
       }
 
       h1 {

jero-web/src/components/search/index.vue

@@ -2,81 +2,53 @@
   <a-form layout="inline" @keyup.enter.native="searchQuery">
     <a-row :gutter="24">
       <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
-        <template v-if="index < 2">
+        <template>
-          <div class="box-title-text" v-if="item.field_show_type == 'text'">
+          <div class="box-title-text" v-if="item.field_show_type == '1'">
             <div class="title-text">
               <span>{{item.db_field_txt}}</span>
             </div>
-            <a-input class="box-input" :placeholder="item.placeholder"
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
                      v-model="queryParam[item.db_field_name]"></a-input>
           </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == 'list_multi'">
+          <div class="box-title-text" v-if="item.field_show_type == '2'">
+            <div class="title-text">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
             <div class="title-text">
               <span>{{item.db_field_txt}}</span>
             </div>
             <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
-                                :placeholder="$t('selectStatus')" :type="'select'"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
                                 :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == 'dateAll'">
+          <div class="box-title-text" v-else-if="item.field_show_type == '6'">
             <div class="title-text">
               <span>{{item.db_field_txt}}</span>
             </div>
             <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
                             @change="onChange(item.db_field_name)"></a-range-picker>
           </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == 'date'">
+          <div class="box-title-text" v-else-if="item.field_show_type == '5'">
             <div class="title-text">
               <span>{{item.db_field_txt}}</span>
             </div>
             <a-date-picker class="box-input"
+                           :placeholder="$t('PleaseSelect')+item.db_field_txt"
                            @change="dateChange(item.db_field_name)"
                            v-model="queryParam[item.db_field_name]"/>
           </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == 'list'">
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
             <div class="title-text">
               <span>{{item.db_field_txt}}</span>
             </div>
             <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
-                               :placeholder="$t('selectStatus')" :type="'select'"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
-                               :triggerChange="false" :dictCode="item.dict_field"/>
+                               :type="'select'"
-          </div>
-        </template>
-        <template v-if="toggleSearchStatus && index >= 2">
-          <div class="box-title-text" v-if="item.field_show_type == 'text'">
-            <div class="title-text">
-              <span>{{item.db_field_txt}}</span>
-            </div>
-            <a-input class="box-input" :placeholder="item.placeholder"
-                     v-model="queryParam[item.db_field_name]"></a-input>
-          </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == 'list_multi'">
-            <div class="title-text">
-              <span>{{item.db_field_txt}}</span>
-            </div>
-            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
-                                :placeholder="$t('selectStatus')" :type="'select'"
-                                :triggerChange="false" :dictCode="item.dict_field"/>
-          </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == 'dateAll'">
-            <div class="title-text">
-              <span>{{item.db_field_txt}}</span>
-            </div>
-            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
-                            @change="onChange(item.db_field_name)"></a-range-picker>
-          </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == 'date'">
-            <div class="title-text">
-              <span>{{item.db_field_txt}}</span>
-            </div>
-            <a-date-picker @change="dateChange(item.db_field_name)" class="box-input" v-model="queryParam[item.db_field_name]"/>
-          </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == 'list'">
-            <div class="title-text">
-              <span>{{item.db_field_txt}}</span>
-            </div>
-            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
-                               :placeholder="$t('selectStatus')" :type="'select'"
                                :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
         </template>
@@ -85,10 +57,6 @@
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-                  <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length >= 2">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                  </a>
                </a-col>
       </span>
     </a-row>
@@ -137,20 +105,21 @@
         getAction(this.url.seachList, params).then((res) => {
           if (res.success) {
             this.searchList = res.result
+            console.log(this.searchList)
           }
         })
       },
-      handleToggleSearch() {
+      // handleToggleSearch() {
-        this.toggleSearchStatus = !this.toggleSearchStatus
+      //   this.toggleSearchStatus = !this.toggleSearchStatus
-      },
+      // },
       dateChange(item) {
         this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
       },
-      onChange(item){
+      onChange(item) {
         let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
         let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
         this.queryParam[item] = [dateOne, dateTwo]
-      },
+      }
     }
   }
 </script>

jero-web/src/components/tableDate/index.vue

@@ -143,11 +143,9 @@
             let width = 0
             if (this.OperationList.length > 0) {
               for (let i = 0; i < this.OperationList.length; i++) {
-                console.log(width)
                 width += this.getTextWith(this.OperationList[i].text)
               }
             }
-            console.log(width)
             if (this.showAction) {
               this.columns.push({
                 title: this.$t('operation'),

jero-web/src/components/tools/Logo.vue

@@ -1,13 +1,11 @@
 <template>
   <div class="logo">
     <router-link :to="{name:'dashboard'}">
-
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-<!--      <img v-if="navTheme === 'dark'" src="~@/assets/logo.png" alt="logo">-->
+      <img src="~@/assets/logo.png" alt="logo" class="logoImg">
-<!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
+      <!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-
+      <span v-if="showTitle" class="logoTitle">{{ title }}</span>
-      <h1 v-if="showTitle">{{ title }}</h1>
     </router-link>
   </div>
 </template>
@@ -21,7 +19,7 @@
     props: {
       title: {
         type: String,
-        default: '蔚来法规',
+        default: 'GPR',
         required: false
       },
       showTitle: {
@@ -38,6 +36,7 @@
 
   .sider {
     box-shadow: none !important;
+
     .logo {
       height: @height !important;
       line-height: @height !important;
@@ -46,6 +45,7 @@
 
       a {
         color: white;
+
         &:hover {
           color: rgba(255, 255, 255, 0.8);
         }
@@ -53,7 +53,22 @@
     }
 
     &.light .logo {
-      background-color: @primary-color;
+      background-color: #EFF1F3;
     }
   }
+
+  // <!--background-color: @primary-color;-->
+  .logoImg {
+    width: 90px;
+    height: 29px;
+  }
+
+  .logoTitle {
+    font-size: 25px;
+    font-weight: 300 !important;
+    color: #040B29;
+    display: inline-block;
+    position: absolute;
+    opacity: 0.5;
+  }
 </style>

jero-web/src/components/tools/UserMenu.vue

@@ -2,27 +2,27 @@
   <div class="user-wrapper" :class="theme">
     <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
     <!-- update-begin author:sunjianlei date:20191@20 for: 解决全局样式冲突的问题 -->
-    <span class="action" @click="showClick">
+<!--    <span class="action" @click="showClick">-->
-      <a-icon type="search"></a-icon>
+<!--      <a-icon type="search"></a-icon>-->
-    </span>
+<!--    </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">
+<!--    <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">-->
-      <a-select
+<!--      <a-select-->
-        class="search-input"
+<!--        class="search-input"-->
-        showSearch
+<!--        showSearch-->
-        :showArrow="false"
+<!--        :showArrow="false"-->
-        placeholder="搜索菜单"
+<!--        placeholder="搜索菜单"-->
-        optionFilterProp="children"
+<!--        optionFilterProp="children"-->
-        :filterOption="filterOption"
+<!--        :filterOption="filterOption"-->
-        :open="isMobile()?true:null"
+<!--        :open="isMobile()?true:null"-->
-        :getPopupContainer="(node) => node.parentNode"
+<!--        :getPopupContainer="(node) => node.parentNode"-->
-        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"
+<!--        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"-->
-        @change="searchMethods"
+<!--        @change="searchMethods"-->
-        @blur="hiddenClick"
+<!--        @blur="hiddenClick"-->
-      >
+<!--      >-->
-        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>
+<!--        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>-->
-      </a-select>
+<!--      </a-select>-->
-    </component>
+<!--    </component>-->
     <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
     <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
     <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
@@ -39,7 +39,7 @@
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
         <a-avatar class="avatar" size="small" :src="getAvatar()"/>
-        <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
+<!--        <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>-->
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
         <a-menu-item key="0">
@@ -70,6 +70,10 @@
           <a-icon type="sync"/>
           <span>清理缓存</span>
         </a-menu-item>
+        <a-menu-item key="6" @click="handleLogout">
+          <a-icon type="logout"/>
+          <span>退出登录</span>
+        </a-menu-item>
        <!-- <a-menu-item key="2" disabled>
           <a-icon type="setting"/>
           <span>测试</span>
@@ -83,12 +87,12 @@
         </a-menu-item>-->
       </a-menu>
     </a-dropdown>
-    <span class="action">
+<!--    <span class="action">-->
-      <a class="logout_title" href="javascript:;" @click="handleLogout">
+<!--      <a class="logout_title" href="javascript:;" @click="handleLogout">-->
-        <a-icon type="logout"/>
+<!--        <a-icon type="logout"/>-->
-        <span v-if="isDesktop()">&nbsp;退出登录</span>
+<!--        <span v-if="isDesktop()">&nbsp;退出登录</span>-->
-      </a>
+<!--      </a>-->
-    </span>
+<!--    </span>-->
     <user-password ref="userPassword"></user-password>
     <depart-select ref="departSelect" :closable="true" title="部门切换"></depart-select>
     <setting-drawer ref="settingDrawer" :closable="true" title="系统设置"></setting-drawer>
@@ -317,4 +321,10 @@
     color: inherit;
     text-decoration: none;
   }
+  .action {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+  .action .avatar{
+     background: #ccc !important;
+  }
 </style>

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -297,7 +297,7 @@
             text-align: center;
             color: #040b29;
             line-height: 50px;
-            font-weight: 600;
+            font-weight: 500;
             font-size: 16px;
             text-overflow: ellipsis;
             white-space: nowrap;