技能博物馆样式

public/index.html

@@ -263,6 +263,9 @@
          border-radius: 5px;
        }
      }
+      #home .ccfullCalendar .fc-scrollgrid-sync-inner a{
+        color: black !important;
+      }
     /* 滚动条优化 end */
   </style>
   <!-- 全局配置 -->

src/assets/less/mytodo.less

@@ -98,7 +98,8 @@
 
   // 日历
   .ccfullCalendar {
-    background-image: url('../date03.jpg');
+    // background-image: url('../date03.jpg');
+    background-color: white;
     opacity: 0.8;
     background-size: cover;
     background-repeat: no-repeat;

src/components/page/GlobalHeader.vue

@@ -189,9 +189,9 @@ export default {
 
   .header {
     z-index: 2;
-    color: white;
+    color: @menu-top-font-color;
     height: @height;
-    background-color: @primary-color !important;
+    background-color: @top-b-color !important;
     transition: background 300ms;
 
     /* dark 样式 */

src/components/tools/HeaderNotice.vue

@@ -82,8 +82,8 @@
       </a-spin>
     </template>
     <span @click="fetchNotice" class="header-notice">
-      <a-badge :count="msgTotal">
-        <a-icon style="font-size: 16px; padding: 4px" type="bell" />
+      <a-badge :count="msgTotal"><StepBackwardOutlined />
+        <a-icon style="color:grey; font-size: 16px; padding: 4px" type="bell" />
       </a-badge>
     </span>
     <show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>

src/components/tools/Logo.vue

@@ -14,7 +14,7 @@
       <!-- <img src="~@/assets/logo-cd-left1.png" alt="logo">
       <h1 >OA办公系统</h1>  -->
       <img :src="this.$store.state.logoUrl" alt="logo">
-      <h1 >{{this.$store.state.topTitle}}</h1>
+      <h1 style="color:grey">{{this.$store.state.topTitle}}</h1>
       <!-- <h1 >{{ dashboard }}</h1> -->
     </router-link>
   </div>
@@ -66,7 +66,7 @@
     }
 
     &.light .logo {
-      background-color: @primary-color !important;
+      background-color: @top-b-color !important;
     }
   }
 </style>

src/components/tools/UserMenu.vue

@@ -3,7 +3,7 @@
     <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
     <!-- update-begin author:sunjianlei date:20191@20 for: 解决全局样式冲突的问题 -->
     <span class="action" @click="showClick" v-if="showSwitch=='森语'">
-      <a-icon type="search"></a-icon>
+      <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">
@@ -31,13 +31,13 @@
         <a-icon type="question-circle-o"></a-icon>
       </a>
     </span>-->
-    <header-notice class="action" v-if="showSwitch=='森语'"/>
+    <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()"/>
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
-      <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
+      <a-menu slot="overlay" class="user-dropdown-menu-wrapper"  v-if="showSwitch =='森语'">
         <!-- <a-menu-item key="0">
           <router-link :to="{ name: 'account-center' }">
             <a-icon type="user"/>
@@ -102,6 +102,7 @@
       return{
         // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
         searchMenuOptions:[],
+        showSwitch:'森语',
         searchMenuComp: 'span',
         searchMenuVisible: false,
         // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
@@ -134,6 +135,9 @@
         if (!depart) {
           this.updateCurrentDepart()
         }
+        if(getProjctName() =='技能博物馆'){
+          this.showSwitch='技能'
+        }
     },
     computed: {
       ...mapState({
@@ -248,6 +252,10 @@
         }
       }
   }
+ /deep/ i.anticon.anticon-logout svg{
+    color: @menu-top-font-color;
+  }
+
   /* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
   /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
 </style>
@@ -257,4 +265,7 @@
     color: inherit;
     text-decoration: none;
   }
+  .layout .header .user-wrapper .action .avatar, .layout .top-nav-header-index .user-wrapper .action .avatar{
+    background: grey;
+  }
 </style>

src/defaultSettings.js

@@ -24,18 +24,18 @@ export default {
   colorWeak: false,
   multipage: true, //默认多页签模式
   //登陆界面logo
-  imgUrl : require("@assets/logo-new.png"),
-  // imgUrl : require("@assets/logo-cd-left1.png"),
+  // imgUrl : require("@assets/logo-new.png"),
+  imgUrl : require("@assets/logo-cd-left1.png"),
   //首页左上角logo
-  //  logoUrl : require("@assets/logo-cd-left1.png"),
-  logoUrl : require("@assets/logo-new.png"),
+   logoUrl : require("@assets/logo-cd-left1.png"),
+  // logoUrl : require("@assets/logo-new.png"),
    //菜单样式
    mode:'vertical',
    //文字信息
-   bottonTitle:'宁波森语国际贸易有限公司',
-  //  bottonTitle:'OA办公系统',
+  //  bottonTitle:'宁波森语国际贸易有限公司',
+   bottonTitle:'OA办公系统',
   //  topTitle:'森语',
-  //  topTitle:'OA办公系统',
+   topTitle:'OA办公系统',
   // vue-ls options
   storageOptions: {
     namespace: 'pro__', // key prefix

src/views/activiti/form/demoForm2.vue

@@ -571,7 +571,7 @@ export default {
                               this.$store.getters.userInfo
                                var that = this
                                setTimeout(function(){
-                               that.$refs.KFB.setData({[item[0].label]:that.$store.getters.userInfo.username})   
+                               that.$refs.KFB.setData({[item[0].label]:that.$store.getters.userInfo.realname})   
                                var jnDeparment = ''
 							   if(getProjctName() =='技能博物馆'){   //获取技能博物馆登录人对应的部门
                                    that.dynamicData.personListJn.map(item =>{
@@ -829,6 +829,14 @@ export default {
               })
         }
 
+        if(key == 'task_executor' &&this.processData.businessTable == 'task_management'){
+             this.dynamicData.personListJn.map(item =>{
+                  if(item.label == value){
+                      this.$refs.KFB.setData({task_department:item.departIds_dictText}) 
+                  }
+              })
+        }
+
          // 技能博物馆---物料申领--部门
         if(key == 'get_account' && this.processData.businessTable == 'application_form'){
             this.dynamicData.personListJn.map(item =>{

src/views/dashboard/MyToDo.vue

@@ -3,12 +3,12 @@
     <!-- 第一行 -->
     <a-row :gutter="24" class="firstLine">
       <!-- 我的 -->
-      <a-col :xs="24" :sm="24" :md="24" :lg="7" :style="{ marginBottom: '8px', paddingRight: 0 }">
+      <!-- <a-col :xs="24" :sm="24" :md="24" :lg="7" :style="{ marginBottom: '8px', paddingRight: 0 }"> -->
         <!-- 等高设置 -->
-        <a-card title="我的" style="width: 100%;" :bordered="false" :style="{ marginBottom: '8px', height: '250px' }">
-          <a-row :gutter="24">
+        <!-- <a-card title="我的" style="width: 100%;" :bordered="false" :style="{ marginBottom: '8px', height: '250px' }">
+          <a-row :gutter="24"> -->
             <!-- 头像 -->
-            <a-col :xs="24" :sm="24" :md="12" :lg="14">
+            <!-- <a-col :xs="24" :sm="24" :md="12" :lg="14">
               <a-row :gutter="24">
                 <a-col :xs="24" :sm="24" :md="12" :lg="8">
                   <div class="userImg">
@@ -23,10 +23,10 @@
                   </div>
                 </a-col>
               </a-row>
-            </a-col>
+            </a-col> -->
 
             <!-- 数量 -->
-            <a-col :xs="24" :sm="24" :md="12" :lg="10" class="msgBox">
+            <!-- <a-col :xs="24" :sm="24" :md="12" :lg="10" class="msgBox">
               <span> {{ todoList.length }}</span>
               <p>我的待办</p>
               <span>{{ msgTotal }}</span>
@@ -34,15 +34,15 @@
             </a-col>
           </a-row>
         </a-card>
-      </a-col>
+      </a-col> -->
 
       <!--  待办 -->
-      <a-col :xs="24" :sm="24" :md="24" :lg="11" :style="{ marginBottom: '8px', paddingRight: 0 }">
+      <a-col :xs="24" :sm="24" :md="24" :lg="11" :style="{ marginBottom: '8px', paddingRight: 0,    width: '67%' }">
         <MyoaTabs />
       </a-col>
 
       <!-- 按钮 -->
-      <a-col :xs="24" :sm="24" :md="24" :lg="6" :style="{ marginBottom: '8px' }">
+      <a-col :xs="24" :sm="24" :md="24" :lg="6" :style="{ marginBottom: '8px',    width: '33%' }">
         <!-- 等高设置 -->
         <a-card title="常用流程" :bordered="false" style="height: 250px;">
           <div v-for="(item, index) in activeKeyAll.slice(5, 10)" :key="index" class="oaBig">
@@ -115,7 +115,7 @@
                 <div v-for="item in linksList.slice(0, 8)" :key="item.id" class="links">
                   <button class="itemLink">
                     <a href="#" @click="openItemLink(item)">
-                      <span width="2em"> {{ item.name }}</span>
+                      <span width="2em" style='color:#5c5c5c'> {{ item.name }}</span>
                     </a>
                   </button>
                 </div>
@@ -695,4 +695,8 @@ export default {
   width: 100%;
   background: rgba(255, 255, 255, 0.3);
 }
+#home .secondLine .links .itemLink{
+ background-color: #f5f5f5 !important ;
+}
+
 </style>

url.config.js

@@ -14,7 +14,7 @@ export function getProjctManageUrl(){
 }
 
 export function getProjctName(){
-    let name="森语";
-    // let name="技能博物馆";
+    // let name="森语";
+    let name="技能博物馆";
     return name;
 }

vue.config.js

@@ -45,14 +45,18 @@ module.exports = {
       less: {
         modifyVars: {
           /* less 变量覆盖，用于自定义 ant design 主题 */
-          // 'primary-color': '#1890FF', //技能博物馆
-          'primary-color': '#6bc5f3', //森语
+          'primary-color': '#1890ff', //技能博物馆
+          // 'primary-color': '#6bc5f3', //森语
+          'top-b-color': '#fff', //技能博物馆
+          // 'top-b-color': '#6bc5f3', //森语
           'link-color': '#6bc5f3',
           'border-radius-base': '4px',
-          // 'font-color':'#fff', //侧边栏字体颜色
-          'font-color':'#595959', //侧边栏字体颜色
-          'layout-color':'#fff', //侧边栏背景颜色
-          // 'layout-color':' #221140', //侧边栏背景颜色
+          // 'menu-top-font-color':'#fff', //顶部菜单字体颜色-森语
+          'menu-top-font-color':'grey', //顶部菜单字体颜色 - 技能博物馆
+          'font-color':'#fff', //侧边栏字体颜色-技能博物馆
+          // 'font-color':'#595959', //侧边栏字体颜色
+          // 'layout-color':'#fff', //侧边栏背景颜色-森语
+          'layout-color':' #221140', //侧边栏背景颜色-技能博物馆
          
         },
         javascriptEnabled: true
@@ -72,8 +76,8 @@ module.exports = {
       }, */
       '/jeecg-boot': {
         // target: 'http://127.0.0.1:8090', // 请求本地 需要jeecg-boot后台项目
-        // target: 'http://106.15.206.14:8087', // 测试环境
-        target: 'http://220.191.168.86:18087', // 森语外网
+        target: 'http://106.15.206.14:8087', // 测试环境
+        // target: 'http://220.191.168.86:18087', // 森语外网
         // changeOrigin: true
       }
     }