浏览代码

工时管家——管理系统修改

ZhouRuiTing 5 年之前
父节点
当前提交
7193215bc3

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

@@ -75,7 +75,7 @@
                         </div>
                         <div class="card-body">
                             <h4 class="card-title">Windows版</h4>
-                            <a class="btn-solid-lg page-scroll" href="./download/WorkTime.exe" download="工时管家">立即下载</a>
+                            <a class="btn-solid-lg page-scroll" href="./download/WorkTime.exe" download="WorkTime.exe">立即下载</a>
                         </div>
                     </div>
                     <div class="card">
@@ -84,7 +84,7 @@
                         </div>
                         <div class="card-body">
                             <h4 class="card-title">Mac版</h4>
-                            <a class="btn-solid-lg page-scroll" href="./download/WorkTime.dmg" download="工时管家">立即下载</a>
+                            <a class="btn-solid-lg page-scroll" href="./download/WorkTime.dmg" download="WorkTime.dmg">立即下载</a>
                         </div>
                     </div>
                 </div>

+ 1 - 0
fhKeeper/formulahousekeeper/timesheet/src/port.js

@@ -20,6 +20,7 @@ export default {
     desktop: {
         list: '/screenshot/getLatestScreenshotList', //获取当前每个人最新的桌面截图
         listToday: '/screenshot/getTodayScreenshotList', //获取今日截图
+        getScreenshotDate: '/screenshot/getScreenshotDate',
     },
 
     //项目

+ 2 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/desktop/detail.vue

@@ -8,7 +8,7 @@
         </el-form-item>
         <el-form-item class="divLine"></el-form-item>
         <el-form-item>
-          <span class="workName">{{uName}} / {{uTime}}</span>
+          <span class="workName">{{uName}} / {{date}}</span>
         </el-form-item>
         <el-form-item style="float:right;">
           今日工作时长:
@@ -71,9 +71,7 @@ export default {
         this.listLoading = true;
         this.http.post(
             this.port.time.getToday,
-            { 
-                userId: this.detailId,
-            },
+            { userId: this.detailId,date: this.date },
             res => {
             this.listLoading = false;
             if (res.code == "ok") {

+ 9 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/desktop/index.vue

@@ -24,7 +24,9 @@
 
         <!-- 卡片列表 -->
         <div>
-            <el-col :span="24" v-if="desktopList.length == 0" style="padding: 200px 0;text-align:center;color:#20a0ff" @click="getHavePic()">今日暂无截图,点击查看近期</el-col>
+            <el-col :span="24" v-if="desktopList.length == 0" style="padding: 200px 0;text-align:center;cursor:pointer">
+                <el-link :underline="false" type="primary" @click="getHavePic">今日暂无截图,点击查看近期</el-link>
+            </el-col>
             <el-col :span="6" v-for="(item, index) in desktopList" :key="index" class="one_div">
                 <el-card :body-style="{ padding: '0px' }" shadow="hover" class="one_card">
                 <div class="one_card_img">
@@ -113,11 +115,14 @@
             // 获取最近有数据的日期
             getHavePic() {
                 this.http.post(
-                    this.port.desktop.list,
-                    {date: this.date},
+                    this.port.desktop.getScreenshotDate,
+                    {date: new Date()},
                     res => {
                     if (res.code == "ok") {
-                        this.desktopList = res.data.data;
+                        if(res.data != null) {
+                            this.date = res.data;
+                            this.getDesktopList();
+                        }
                     } else {
                         this.$message({
                         message: res.msg,