Просмотр исходного кода

工时管家——日报列表修改

ZhouRuiTing 5 лет назад
Родитель
Сommit
b6c01983af

+ 3 - 3
fhKeeper/formulahousekeeper/inva_4_tivo/download.html

@@ -3,9 +3,9 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="keywords" content="工时管家,远程办公,员工管理,项目管理,绩效考核,项目成本统计,远程监控,兼职软件开发,软件外包,外包人员管理" />
-    <meta name="description" content="工时管家利用智能图像识别技术,统计员工每日实际的工作时长,并能自动分析员工每天时间分配情况,如研发,设计,上网,影视娱乐等,能有效提高领导对团队工作时间的把控,进而制定降低成本、提高效率的措施。同时领导可以查看员工在每个项目上投入的时间,核算项目的人力成本。"/>
-    <title>工时管家|反馈真实工作情况,提供员工考核数据</title>
+    <meta name="keywords" content="工时管理,工时统计,项目成本统计,远程监控" />
+    <meta name="description" content="工时管家利用智能图像识别技术实现工时管理和工时统计。可按项目,部门,岗位等多维度统计成本。软件可实现远程监管,有效反馈工作实际情况,对非工作情况主动检测上报。"/>
+    <title>工时管家-工时管理和统计的好助手,反馈真实工作情况,降低企业成本!</title>
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700&display=swap&subset=latin-ext" rel="stylesheet">
     <link href="css/bootstrap.css" rel="stylesheet">
     <!-- <link href="css/fontawesome-all.css" rel="stylesheet"> -->

+ 28 - 15
fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -43,42 +43,54 @@ export const fixedRouter = [
 ]
 
 export const manageRouter = [
-    //工作桌面
+    //智能监控
     {
         path: '/',
         component: Home,
-        name: '工作桌面',
+        name: '智能监控',
         iconCls: 'fa fa-desktop',
         children: [
-            { path: '/desktop', component: desktop, name: '桌面查看' },
-            { path: '/desktop/:id/:date', component: desktopDetail, name: '个人桌面', hidden: true },
+            { path: '/desktop', component: desktop, name: '员工桌面' },
+            { path: '/desktop/:id/:date', component: desktopDetail, name: '员工桌面详情', hidden: true },
             { path: '/unusual', component: unusual, name: '异常统计' },
+            { path: '/statistics', component: statistics, name: '智能分析' },
         ]
     },
-    //工报告
+    //工报告
     {
         path: '/',
         component: Home,
-        name: '工报告',
+        name: '工报告',
         iconCls: 'fa fa-sticky-note',
+        leaf: true,
         children: [
-            { path: '/statistics', component: statistics, name: '工时统计' },
-            { path: '/daily', component: daily, name: '工作日报' },
+            { path: '/daily', component: daily, name: '工时报告' },
         ]
     },
-    //项目管理
+    //成本统计
     {
         path: '/',
         component: Home,
-        name: '项目管理',
-        iconCls: 'fa fa-briefcase',
+        name: '成本统计',
+        iconCls: 'fa fa-clock-o',
+        leaf: true,
         children: [
-            { path: '/list', component: list, name: '项目列表' },
             { path: '/cost', component: cost, name: '成本统计' },
             { path: '/cost/:id/:name', component: proDetail, name: '成本详情', hidden: true },
             { path: '/costDep/:id/:name', component: depDetail, name: '成本详情', hidden: true },
         ]
     },
+    //项目管理
+    {
+        path: '/',
+        component: Home,
+        name: '项目管理',
+        iconCls: 'fa fa-briefcase',
+        leaf: true,
+        children: [
+            { path: '/list', component: list, name: '项目管理' },
+        ]
+    },
     //组织架构
     {
         path: '/',
@@ -104,14 +116,15 @@ export const manageRouter = [
 ];
 
 export const staffRouter = [
-    //工报告
+    //工报告
     {
         path: '/',
         component: Home,
-        name: '工报告',
+        name: '工报告',
         iconCls: 'fa fa-sticky-note',
+        leaf: true,
         children: [
-            { path: '/daily', component: daily, name: '工作日报' },
+            { path: '/daily', component: daily, name: '工时报告' },
         ]
     },
     {

+ 1 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/desktop/index.vue

@@ -20,6 +20,7 @@
                     ></el-date-picker>
                 </el-form-item>
                 <el-form-item style="float:right;">
+                    <span style="color:#aaa;font-size:12px;">(员工安装客户端,领导即可查看工作桌面远程监管)</span>
                     <el-link type="primary" :underline="false" href="http://gsgj.ttkuaiban.com/download.html" target="_blank">客户端下载</el-link>
                 </el-form-item>
             </el-form>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/detail.vue

@@ -11,7 +11,7 @@
                     <span class="workName">{{detailName}}</span>
                 </el-form-item>
                 <el-form-item style="float:right;">
-                    <span style="font-size:18px;">项目成本:<span style="color:#20a0ff;">{{cost}}元</span></span>
+                    <span style="font-size:18px;">项目成本:<span style="color:#20a0ff;">{{cost.toFixed(2)}}元</span></span>
                 </el-form-item>
             </el-form>
         </el-col>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/detailDep.vue

@@ -13,7 +13,7 @@
                     :options="option" :props="{ checkStrictly: true }" :show-all-levels="false"></el-cascader>
                 </el-form-item>
                 <el-form-item style="float:right;">
-                    <span style="font-size:18px;">部门成本:<span style="color:#20a0ff;">{{cost}}元</span></span>
+                    <span style="font-size:18px;">部门成本:<span style="color:#20a0ff;">{{cost.toFixed(2)}}元</span></span>
                 </el-form-item>
             </el-form>
         </el-col>

+ 9 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -26,7 +26,15 @@
                 </div>
                 <div class="allDaily">
                     <div class="one_daily" v-for="(item1,index1) in reportList" :key="index1">
-                        <el-link><i class="fa fa-circle"></i>{{item1.name}}</el-link>
+                        <i class="fa fa-circle"></i>{{item1.name}}
+                        <span style="margin-left:30px;">
+                            <span style="margin-right:20px;">
+                                <i v-if="parseFloat(item1.reportTime)>parseFloat(item1.calculateTime)+0.5" style="color:red;margin-right:8px;" class="fa fa-exclamation-triangle"></i>
+                                总填报:
+                                <span :style="parseFloat(item1.reportTime)>parseFloat(item1.calculateTime)+0.5?'color:red':''">{{item1.reportTime}}h</span>
+                            </span>
+                            <span>系统智能统计:{{item1.calculateTime}}h</span>
+                        </span>
                         <div class="one_daily_body">
                             <el-timeline>
                                 <el-timeline-item v-for="(item2,index2) in item1.data" :key="index2">