格克

public/index.html

@@ -5,8 +5,8 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>格克项目管理平台</title>
-  <link rel="icon" href="<%= BASE_URL %>logo.png">
+  <title>格克员工管理平台</title>
+  <link rel="icon" href="<%= BASE_URL %>gk.png">
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
   <style>
     html,
@@ -251,7 +251,7 @@
     <div id="loader"></div>
     <div class="loader-section section-left"></div>
     <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 格克项目管理平台,请耐心等待
+    <div class="load_title">正在加载 格克员工管理平台,请耐心等待
 
     </div>
   </div>

src/components/layouts/TabLayout.vue

@@ -171,7 +171,7 @@
 
       // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
       changeTitle(title) {
-        let projectTitle = "格克项目管理平台"
+        let projectTitle = "格克员工管理平台"
         // 首页特殊处理
         if (this.$route.path === indexKey) {
           document.title = projectTitle

src/components/layouts/UserLayout.vue

@@ -3,11 +3,15 @@
     <div class="container">
       <div class="top">
         <div class="header">
+		<div>
           <a href="/">
-            <img src="~@/assets/logo.svg" class="logo" alt="logo">
-            <span class="title">格克项目管理平台</span>
+            <img src="~@/assets/gk.png" style="width: 90px;height: 90px;" class="logo" alt="logo">
           </a>
+		  <span class="title" style="top: 10px;">格克员工管理平台</span>
+		  </div>
+		 
         </div>
+		 
         <div class="desc">
           <!-- Jeecg Boot 是中国最具影响力的 企业级 快速开发平台 -->
         </div>

src/components/page/GlobalHeader.vue

@@ -17,7 +17,7 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">欢迎进入 格克项目管理平台</span>
+      <span v-if="device === 'desktop'">欢迎进入 格克员工管理平台</span>
       <span v-else>Jeecg-Boot</span>
 
       <user-menu :theme="theme"/>

src/components/tools/Logo.vue

@@ -4,10 +4,10 @@
 
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
       <img v-if="navTheme === 'dark'" src="~@/assets/logo-white.png" alt="logo">
-      <img v-else src="~@/assets/logo.svg" alt="logo">
+      <img v-else src="~@/assets/gk.png" alt="logo" style="width: 60px;height: 60px;margin-top: 5px;margin-left: -20px;">
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
 
-      <h1 v-if="showTitle">{{ title }}</h1>
+      <h1 v-if="showTitle" style="margin-top: -10px;">{{ title }}</h1>
     </router-link>
   </div>
 </template>

src/router/index.js

@@ -5,7 +5,7 @@ import { constantRouterMap } from '@/config/router.config'
 Vue.use(Router)
 
 export default new Router({
-  mode: 'history',
+  mode: 'hash',
   base: process.env.BASE_URL,
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap

src/views/Home.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home">
     <div class="banner">
-      <img alt="Vue logo" style="width: 64px; height: 64px" src="../assets/logo.png">
+      <img alt="Vue logo" style="width: 64px; height: 64px" src="../assets/gk.png">
       <h3 style="margin-top: 1rem">Welcome to Your Vue.js App</h3>
     </div>
 

src/views/system/Shift.vue

@@ -143,7 +143,7 @@ import moment from "moment"
             align:"center",
             dataIndex: 'startDate',
             customRender:function(t,r,index){
-              return moment(t).format('HH:mm:ss');
+              return moment(t).format('HH:mm');
             }
            },
 		   {
@@ -151,7 +151,7 @@ import moment from "moment"
             align:"center",
             dataIndex: 'endDate',
             customRender:function(t,r,index){
-              return moment(t).format('HH:mm:ss');
+              return moment(t).format('HH:mm');
             }
            },
 		   {

src/views/system/UserList.vue

@@ -75,7 +75,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
       <a-button @click="handleAdd()" type="primary" icon="plus" v-has="'user:add'" >添加员工</a-button>
-      <a-button @click="handleExportXltx()"type="primary" icon="plus" v-has="'user:add'" >模板</a-button>
+      <a-button @click="handleExportXltx()"type="primary" icon="plus"  >模板</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('用户信息')" v-has='"user:export"'>导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" v-has='"user:import"'>
         <a-button type="primary" icon="import">导入</a-button>
@@ -331,7 +331,7 @@
     },
     methods: {
       handleExportXltx(){
-        this.queryParam.orgCodeTxt="导入的空白模板";
+        this.queryParam.orgCodeTxt="空白模板";
         this.$options.methods.handleExportXls.call(this)
         this.queryParam.orgCodeTxt="";
       },

src/views/system/UserPrizeList.vue

@@ -128,16 +128,16 @@ import moment from "moment"
         description: '员工奖惩管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-           },
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          //  },
 		   {
             title: '员工姓名',
             align:"center",

src/views/system/modules/AttendanceRuleModal.vue

@@ -12,11 +12,37 @@
         </a-form-item>
         
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="*上班时间" v-if="types==1">
-          <a-time-picker showTime format='HH:mm:ss' v-model="startDate" />
+          <a-time-picker showTime format='HH:mm' v-model="startDate">
+          <div slot="addon" style="width:100%;overflow:hidden">
+           <div style="width:50%;float:left;border-right:solid 1px ;text-align:center">
+                <div style="padding-top:10%;padding-bottom:10%">
+                 <span style="width:100%;">时</span>
+                </div>
+               </div>
+               <div style="width:50%;float:right;text-align:center">
+                <div style="padding-top:10%;padding-bottom:10%">
+                 <span style="width:100%;">分</span>
+                </div>
+               </div>
+          </div>
+          </a-time-picker>
         </a-form-item>
 
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="*下班时间" v-if="types==1">
-          <a-time-picker showTime format='HH:mm:ss' v-model="endDate" />
+          <a-time-picker showTime format='HH:mm' v-model="endDate">
+          <div slot="addon" style="width:100%;overflow:hidden">
+           <div style="width:50%;float:left;border-right:solid 1px ;text-align:center">
+                <div style="padding-top:10%;padding-bottom:10%">
+                 <span style="width:100%;">时</span>
+                </div>
+               </div>
+               <div style="width:50%;float:right;text-align:center">
+                <div style="padding-top:10%;padding-bottom:10%">
+                 <span style="width:100%;">分</span>
+                </div>
+               </div>
+          </div>
+          </a-time-picker>
         </a-form-item>
       </a-form>
       <a-form-item v-if="types!=2" label="*打卡人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -474,8 +500,8 @@
               this.$message.warning('请选择下班时间');
               return;
             }
-            startDate = moment(this.startDate).format('YYYY-MM-DD HH:mm:ss');
-            endDate = moment(this.endDate).format('YYYY-MM-DD HH:mm:ss');
+            startDate = moment(this.startDate).format('YYYY-MM-DD HH:mm')+":00";
+            endDate = moment(this.endDate).format('YYYY-MM-DD HH:mm')+":00";
           }
           var ids = [];
           for (var i = 0; i < this.selectUsers.length; i++) {

src/views/system/modules/ShiftModal.vue

@@ -181,8 +181,8 @@
             }
             let formData = Object.assign(this.model, values);
             //时间格式化
-            formData.startDate = formData.startDate?formData.startDate.format('YYYY-MM-DD HH:mm:ss'):null;
-            formData.endDate = formData.endDate?formData.endDate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.startDate = formData.startDate?formData.startDate.format('YYYY-MM-DD HH:mm')+":00":null;
+            formData.endDate = formData.endDate?formData.endDate.format('YYYY-MM-DD HH:mm')+":00":null;
             // formData.createDate = formData.createDate?formData.createDate.format('YYYY-MM-DD HH:mm:ss'):null;
             // formData.updateDate = formData.updateDate?formData.updateDate.format('YYYY-MM-DD HH:mm:ss'):null;
             

src/views/user/Login.vue

@@ -83,15 +83,15 @@
         </a-tab-pane> -->
       </a-tabs>
 
-      <a-form-item>
+      <!-- <a-form-item>
         <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]" >自动登录</a-checkbox>
-       <!-- <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
+        <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
           忘记密码
         </router-link>
        <router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
           注册账户
-        </router-link> -->
-      </a-form-item>
+        </router-link> 
+      </a-form-item> -->
 
       <a-form-item style="margin-top:24px">
         <a-button
@@ -101,7 +101,7 @@
           class="login-button"
           :loading="loginBtn"
           @click.stop.prevent="handleSubmit"
-          :disabled="loginBtn">确定
+          :disabled="loginBtn">登录
         </a-button>
       </a-form-item>
     </a-form>
@@ -167,6 +167,7 @@
         currdatetime:'',
         randCodeImage:'',
         requestCodeSuccess:false,
+        code:"",
       }
     },
     created () {
@@ -174,6 +175,17 @@
       Vue.ls.remove(ACCESS_TOKEN)
       this.getRouterData();
       this.handleChangeCheckCode();
+      // const token = Vue.ls.get(ACCESS_TOKEN)
+      // if(token!=null&&token!=""){
+      
+      // }else{
+      //   var urls = location.search;
+      //   console.log(urls)
+      //   var ts=urls.split("?");
+      //   var tts=ts[1].split("&");
+      //   var sct=tts[0].split("=");
+      //   this.code=sct[1];
+      // }
       // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
       //this.getEncrypte();
       // update-end- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
@@ -223,6 +235,12 @@
               that.loginBtn = false;
             }
           })
+          // loginParams.username = this.code;
+          // that.Login(loginParams).then((res) => {
+          //   this.$refs.loginSelect.show(res.result)
+          // }).catch((err) => {
+          //   that.requestFailed(err);
+          // });
           // 使用手机号登录
         } else {
           that.form.validateFields([ 'mobile', 'captcha', 'rememberMe' ], { force: true }, (err, values) => {