ecinc-cloud-moadesktop 9.6.272 → 9.6.274

package/lang/en.js

@@ -40,7 +40,8 @@ module.exports = {
             latestToDoList: 'Latest To-Do List',
             officeDocument: 'Document Handling',
             holdWork: 'Handle Affairs',
-            HoldMeeting: 'Hold Meeting'
+            HoldMeeting: 'Hold Meeting',
+            mapServiceError: 'Map service loading failed. Retry?'
         }
     }
 }

package/lang/zhCN.js

@@ -40,7 +40,8 @@ module.exports = {
             latestToDoList: '最新待办',
             officeDocument: '办文',
             holdWork: '办事',
-            HoldMeeting: '办会'
+            HoldMeeting: '办会',
+            mapServiceError: '地图服务加载失败，是否重试？'
         }
     }
 }

package/lib/ecmoadesktop.common.js

@@ -131,7 +131,8 @@ module.exports = {
       latestToDoList: 'Latest To-Do List',
       officeDocument: 'Document Handling',
       holdWork: 'Handle Affairs',
-      HoldMeeting: 'Hold Meeting'
+      HoldMeeting: 'Hold Meeting',
+      mapServiceError: 'Map service loading failed. Retry?'
     }
   }
 };
@@ -227,7 +228,8 @@ module.exports = {
       latestToDoList: '最新待办',
       officeDocument: '办文',
       holdWork: '办事',
-      HoldMeeting: '办会'
+      HoldMeeting: '办会',
+      mapServiceError: '地图服务加载失败，是否重试？'
     }
   }
 };
@@ -256,7 +258,10 @@ var canDk = true;
 var dakaType = ['不可打卡', '上班打卡', '下班打卡', '更新打卡']; // 打卡按钮状态
 var loginUser = '';
 var mapObj = null;
-var lo = new T.Geolocation();
+var lo = null;
+if (window.T) {
+  lo = new T.Geolocation();
+}
 var moment = __webpack_require__(5093);
 
 /**
@@ -327,7 +332,7 @@ function getCurAddress(lng, lat) {
 }
 
 // 定位
-function curLocationAndDis() {
+function curLocationAndDis(timeSpanData) {
   var device = js_cookie__WEBPACK_IMPORTED_MODULE_0___default().get('device');
   return new Promise(function (resolve) {
     var locationed = false;
@@ -367,8 +372,12 @@ function curLocationAndDis() {
       }
     }
     if (!locationed) {
-      if (window.mappType === 'ecinc') {
+      if (!lo) {
+        //天地图服务加载失败
+        resolve(false);
+      } else if (window.mappType === 'ecinc') {
         //APP定位
+        var locationTimeout = false;
         $parent.$wv.getLocationInformation(function (res) {
           if (typeof res === 'string') res = JSON.parse(res);
           if (res && res.data) {
@@ -382,8 +391,11 @@ function curLocationAndDis() {
 
             if (dis === null || dis > gpsScope) {
               resolve(false);
-            } else {
+            } else if (!locationTimeout) {
               resolve(true);
+            } else {
+              //超时后返回定位成功信息,更新打卡状态
+              $parent.dakaType = dakaType[timeSpanData.dakaType];
             }
           }
         });
@@ -395,9 +407,10 @@ function curLocationAndDis() {
             } else {
               //console.log('$wv getCurrentPosition res =', res)
               resolve(false);
+              locationTimeout = true;
             }
           }
-        }, 15000);
+        }, 20000);
       } else if (window.isOpenMapLocation === 1) {
         lo.getCurrentPosition(h5Position);
       } else if (device === 'qywx') {
@@ -489,7 +502,7 @@ var defaultMethods = {
           $parent.$forceUpdate();
 
           // 获取位置信息
-          curLocationAndDis().then(function (res) {
+          curLocationAndDis(timeSpanData).then(function (res) {
             if (!res) {
               $parent.dakaType = dakaType[0];
             } else {
@@ -658,7 +671,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-ef203e2e]{display:-web
 
 /***/ }),
 
-/***/ 6094:
+/***/ 1951:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -677,7 +690,7 @@ var ___CSS_LOADER_URL_IMPORT_0___ = new URL(/* asset import */ __webpack_require
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 var ___CSS_LOADER_URL_REPLACEMENT_0___ = _node_modules_css_loader_dist_runtime_getUrl_js__WEBPACK_IMPORTED_MODULE_2___default()(___CSS_LOADER_URL_IMPORT_0___);
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "[data-v-209caa6f] .van-ellipsis{font-size:18px;color:#fff}[data-v-209caa6f] .van-dropdown-menu__title{color:#fff!important;padding:0 8px 0 0!important}[data-v-209caa6f] .van-dropdown-menu .van-dropdown-menu__bar .van-dropdown-menu__title--active{color:#fff!important}[data-v-209caa6f] .van-dropdown-menu__title:after{border-color:transparent transparent #fff #fff!important;right:0}[data-v-209caa6f] .van-dropdown-menu__bar{background-color:unset!important;-webkit-box-shadow:unset!important;box-shadow:unset!important}[data-v-209caa6f] .van-dropdown-menu__item{-webkit-box-pack:left;-ms-flex-pack:left;justify-content:left}[data-v-209caa6f] .chat_icon .van-info{top:5px!important;right:-4px!important}.work_pageHeader[data-v-209caa6f]{background:url(" + ___CSS_LOADER_URL_REPLACEMENT_0___ + ");padding:0 16px;height:123px;font-size:16px;color:#fff;background-repeat:no-repeat;background-size:cover;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transition:height .3s;transition:height .3s}.work_pageHeader[data-v-209caa6f],.work_pageHeader .flex-horizon-bw[data-v-209caa6f]{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.work_pageHeader .flex-horizon-bw[data-v-209caa6f]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageHeader .pageHeader_compony[data-v-209caa6f]{font-size:18px;font-weight:500;color:#fff;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-right:10px;height:48px;line-height:48px}.work_pageHeader .pageHeader_name[data-v-209caa6f]{font-size:14px;margin-left:8px}.work_pageHeader .pageHeader_check_work[data-v-209caa6f]{width:122px;border-radius:15px;background:hsla(0,0%,100%,.8);padding:7px 10px;display:-webkit-box;display:-ms-flexbox;display:flex;color:#333;font-size:12px}.work_pageHeader .pageHeader_timer[data-v-209caa6f]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;color:#fff;font-size:14px;line-height:30px;margin-right:16px}.work_pageHeader .more_compony[data-v-209caa6f]{position:relative;-webkit-transform:rotate(90deg);transform:rotate(90deg);font-size:10px;margin-left:6px}.check_time[data-v-209caa6f]{-webkit-box-flex:1;-ms-flex:1;flex:1;border-right:1px solid #999;text-align:left;font-size:13px;color:#333;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.check_time img[data-v-209caa6f]{width:14px;height:14px}.check_time span[data-v-209caa6f]{margin-left:5px}.check_button[data-v-209caa6f]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;line-height:18px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-86bb0962] .van-ellipsis{font-size:18px;color:#fff}[data-v-86bb0962] .van-dropdown-menu__title{color:#fff!important;padding:0 8px 0 0!important}[data-v-86bb0962] .van-dropdown-menu .van-dropdown-menu__bar .van-dropdown-menu__title--active{color:#fff!important}[data-v-86bb0962] .van-dropdown-menu__title:after{border-color:transparent transparent #fff #fff!important;right:0}[data-v-86bb0962] .van-dropdown-menu__bar{background-color:unset!important;-webkit-box-shadow:unset!important;box-shadow:unset!important}[data-v-86bb0962] .van-dropdown-menu__item{-webkit-box-pack:left;-ms-flex-pack:left;justify-content:left}[data-v-86bb0962] .chat_icon .van-info{top:5px!important;right:-4px!important}.work_pageHeader[data-v-86bb0962]{background:url(" + ___CSS_LOADER_URL_REPLACEMENT_0___ + ");padding:0 16px;height:123px;font-size:16px;color:#fff;background-repeat:no-repeat;background-size:cover;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transition:height .3s;transition:height .3s}.work_pageHeader[data-v-86bb0962],.work_pageHeader .flex-horizon-bw[data-v-86bb0962]{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.work_pageHeader .flex-horizon-bw[data-v-86bb0962]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageHeader .pageHeader_compony[data-v-86bb0962]{font-size:18px;font-weight:500;color:#fff;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-right:10px;height:48px;line-height:48px}.work_pageHeader .pageHeader_name[data-v-86bb0962]{font-size:14px;margin-left:8px}.work_pageHeader .pageHeader_check_work[data-v-86bb0962]{width:122px;border-radius:15px;background:hsla(0,0%,100%,.8);padding:7px 10px;display:-webkit-box;display:-ms-flexbox;display:flex;color:#333;font-size:12px}.work_pageHeader .pageHeader_timer[data-v-86bb0962]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;color:#fff;font-size:14px;line-height:30px;margin-right:16px}.work_pageHeader .more_compony[data-v-86bb0962]{position:relative;-webkit-transform:rotate(90deg);transform:rotate(90deg);font-size:10px;margin-left:6px}.check_time[data-v-86bb0962]{-webkit-box-flex:1;-ms-flex:1;flex:1;border-right:1px solid #999;text-align:left;font-size:13px;color:#333;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.check_time img[data-v-86bb0962]{width:14px;height:14px}.check_time span[data-v-86bb0962]{margin-left:5px}.check_button[data-v-86bb0962]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;line-height:18px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -22705,19 +22718,19 @@ var update = add("b0496ae0", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 3480:
+/***/ 7989:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(6094);
+var content = __webpack_require__(1951);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("091c2d84", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("40fdc02f", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -27736,8 +27749,8 @@ var commonApps_component = normalizeComponent(
 )
 
 /* harmony default export */ var commonApps = (commonApps_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=template&id=209caa6f&scoped=true
-var workHeadvue_type_template_id_209caa6f_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=template&id=86bb0962&scoped=true
+var workHeadvue_type_template_id_86bb0962_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -27861,7 +27874,7 @@ var workHeadvue_type_template_id_209caa6f_scoped_true_render = function render()
     staticClass: "pageHeader_timer"
   }, [_c('span', [_vm._v(_vm._s(_vm.nowDay))])])])]);
 };
-var workHeadvue_type_template_id_209caa6f_scoped_true_staticRenderFns = [];
+var workHeadvue_type_template_id_86bb0962_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/vuex/dist/vuex.esm.js
 /*!
@@ -29074,6 +29087,15 @@ var workClock = __webpack_require__(2396);
           _this.organName = item.code;
         }
       });
+    },
+    $route: function $route(to, from) {
+      var kqdkDis = sessionStorage.getItem('kqdk-dis');
+      if (kqdkDis) {
+        //从考勤打卡页面返回到首页，已经有定位成功信息，刷新打卡信息
+        if (this.dakaType === '正在定位' && to.path === '/main' && from.path.indexOf('login') === -1) {
+          workClock.freshData(this);
+        }
+      }
     }
   },
   created: function created() {
@@ -29167,6 +29189,8 @@ var workClock = __webpack_require__(2396);
                 document.querySelector('.work_pageHeader').style.background = 'url(' + url + ')';
                 document.querySelector('.work_pageHeader').style.backgroundSize = 'cover';
                 document.querySelector('.work_pageHeader').style.backgroundRepeat = 'no-repeat';
+              } else {
+                document.querySelector('.work_pageHeader').style.background = 'url(./images/m-imgs/workBg/workBg.png)';
               }
             case 8:
             case "end":
@@ -29224,13 +29248,13 @@ var workClock = __webpack_require__(2396);
     },
     loadH5apps: function loadH5apps() {
       var _this5 = this;
+      var productList = this.$store.getters.productCodeList;
+      if (!productList) return;
       var h5apps = this.routes.filter(function (route) {
         if (route.meta && route.meta.h5Url) return true;
       });
-      var productList = this.$store.getters.productCodeList;
       h5apps.forEach(function (route) {
         var mapp = route.meta;
-        if (!productList) return;
         for (var key in productList) {
           if (key === mapp.sysCode && productList[key] === 'ecykq') {
             window.$user.findUserRolePermissions().then(function (res) {
@@ -29248,10 +29272,12 @@ var workClock = __webpack_require__(2396);
                       workClock.default.freshData(_this5);
                     }
                     _this5.curInterval = setInterval(function () {
-                      if (workClock.freshData) {
-                        workClock.freshData(_this5);
-                      } else if (workClock.default) {
-                        workClock.default.freshData(_this5);
+                      if (_this5.$route.path == '/main') {
+                        if (workClock.freshData) {
+                          workClock.freshData(_this5);
+                        } else if (workClock.default) {
+                          workClock.default.freshData(_this5);
+                        }
                       }
                     }, 1000 * 60);
                   });
@@ -29264,10 +29290,18 @@ var workClock = __webpack_require__(2396);
     },
     // 检查打卡
     checkWork: function checkWork() {
-      if (workClock.dkEvent) {
-        workClock.dkEvent(this);
-      } else if (workClock.default) {
-        workClock.default.dkEvent(this);
+      if (window.T) {
+        if (workClock.dkEvent) {
+          workClock.dkEvent(this);
+        } else if (workClock.default) {
+          workClock.default.dkEvent(this);
+        }
+      } else {
+        this.$dialog.confirm({
+          message: this.$tx('desktop.components.mapServiceError', '地图服务加载失败，是否重试？')
+        }).then(function () {
+          location.reload();
+        });
       }
     },
     formatNowDay: function formatNowDay() {
@@ -29347,9 +29381,9 @@ var workClock = __webpack_require__(2396);
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=script&lang=js
  /* harmony default export */ var components_workHeadvue_type_script_lang_js = (workHeadvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=209caa6f&prod&scoped=true&lang=scss
-var workHeadvue_type_style_index_0_id_209caa6f_prod_scoped_true_lang_scss = __webpack_require__(3480);
-;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=209caa6f&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=86bb0962&prod&scoped=true&lang=scss
+var workHeadvue_type_style_index_0_id_86bb0962_prod_scoped_true_lang_scss = __webpack_require__(7989);
+;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=86bb0962&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue
 
@@ -29362,11 +29396,11 @@ var workHeadvue_type_style_index_0_id_209caa6f_prod_scoped_true_lang_scss = __we
 
 var workHead_component = normalizeComponent(
   components_workHeadvue_type_script_lang_js,
-  workHeadvue_type_template_id_209caa6f_scoped_true_render,
-  workHeadvue_type_template_id_209caa6f_scoped_true_staticRenderFns,
+  workHeadvue_type_template_id_86bb0962_scoped_true_render,
+  workHeadvue_type_template_id_86bb0962_scoped_true_staticRenderFns,
   false,
   null,
-  "209caa6f",
+  "86bb0962",
   null
   
 )

package/lib/ecmoadesktop.umd.js

@@ -141,7 +141,8 @@ module.exports = {
       latestToDoList: 'Latest To-Do List',
       officeDocument: 'Document Handling',
       holdWork: 'Handle Affairs',
-      HoldMeeting: 'Hold Meeting'
+      HoldMeeting: 'Hold Meeting',
+      mapServiceError: 'Map service loading failed. Retry?'
     }
   }
 };
@@ -237,7 +238,8 @@ module.exports = {
       latestToDoList: '最新待办',
       officeDocument: '办文',
       holdWork: '办事',
-      HoldMeeting: '办会'
+      HoldMeeting: '办会',
+      mapServiceError: '地图服务加载失败，是否重试？'
     }
   }
 };
@@ -266,7 +268,10 @@ var canDk = true;
 var dakaType = ['不可打卡', '上班打卡', '下班打卡', '更新打卡']; // 打卡按钮状态
 var loginUser = '';
 var mapObj = null;
-var lo = new T.Geolocation();
+var lo = null;
+if (window.T) {
+  lo = new T.Geolocation();
+}
 var moment = __webpack_require__(5093);
 
 /**
@@ -337,7 +342,7 @@ function getCurAddress(lng, lat) {
 }
 
 // 定位
-function curLocationAndDis() {
+function curLocationAndDis(timeSpanData) {
   var device = js_cookie__WEBPACK_IMPORTED_MODULE_0___default().get('device');
   return new Promise(function (resolve) {
     var locationed = false;
@@ -377,8 +382,12 @@ function curLocationAndDis() {
       }
     }
     if (!locationed) {
-      if (window.mappType === 'ecinc') {
+      if (!lo) {
+        //天地图服务加载失败
+        resolve(false);
+      } else if (window.mappType === 'ecinc') {
         //APP定位
+        var locationTimeout = false;
         $parent.$wv.getLocationInformation(function (res) {
           if (typeof res === 'string') res = JSON.parse(res);
           if (res && res.data) {
@@ -392,8 +401,11 @@ function curLocationAndDis() {
 
             if (dis === null || dis > gpsScope) {
               resolve(false);
-            } else {
+            } else if (!locationTimeout) {
               resolve(true);
+            } else {
+              //超时后返回定位成功信息,更新打卡状态
+              $parent.dakaType = dakaType[timeSpanData.dakaType];
             }
           }
         });
@@ -405,9 +417,10 @@ function curLocationAndDis() {
             } else {
               //console.log('$wv getCurrentPosition res =', res)
               resolve(false);
+              locationTimeout = true;
             }
           }
-        }, 15000);
+        }, 20000);
       } else if (window.isOpenMapLocation === 1) {
         lo.getCurrentPosition(h5Position);
       } else if (device === 'qywx') {
@@ -499,7 +512,7 @@ var defaultMethods = {
           $parent.$forceUpdate();
 
           // 获取位置信息
-          curLocationAndDis().then(function (res) {
+          curLocationAndDis(timeSpanData).then(function (res) {
             if (!res) {
               $parent.dakaType = dakaType[0];
             } else {
@@ -668,7 +681,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-ef203e2e]{display:-web
 
 /***/ }),
 
-/***/ 8814:
+/***/ 4671:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -687,7 +700,7 @@ var ___CSS_LOADER_URL_IMPORT_0___ = new URL(/* asset import */ __webpack_require
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 var ___CSS_LOADER_URL_REPLACEMENT_0___ = _node_modules_css_loader_dist_runtime_getUrl_js__WEBPACK_IMPORTED_MODULE_2___default()(___CSS_LOADER_URL_IMPORT_0___);
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "[data-v-209caa6f] .van-ellipsis{font-size:18px;color:#fff}[data-v-209caa6f] .van-dropdown-menu__title{color:#fff!important;padding:0 8px 0 0!important}[data-v-209caa6f] .van-dropdown-menu .van-dropdown-menu__bar .van-dropdown-menu__title--active{color:#fff!important}[data-v-209caa6f] .van-dropdown-menu__title:after{border-color:transparent transparent #fff #fff!important;right:0}[data-v-209caa6f] .van-dropdown-menu__bar{background-color:unset!important;-webkit-box-shadow:unset!important;box-shadow:unset!important}[data-v-209caa6f] .van-dropdown-menu__item{-webkit-box-pack:left;-ms-flex-pack:left;justify-content:left}[data-v-209caa6f] .chat_icon .van-info{top:5px!important;right:-4px!important}.work_pageHeader[data-v-209caa6f]{background:url(" + ___CSS_LOADER_URL_REPLACEMENT_0___ + ");padding:0 16px;height:123px;font-size:16px;color:#fff;background-repeat:no-repeat;background-size:cover;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transition:height .3s;transition:height .3s}.work_pageHeader[data-v-209caa6f],.work_pageHeader .flex-horizon-bw[data-v-209caa6f]{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.work_pageHeader .flex-horizon-bw[data-v-209caa6f]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageHeader .pageHeader_compony[data-v-209caa6f]{font-size:18px;font-weight:500;color:#fff;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-right:10px;height:48px;line-height:48px}.work_pageHeader .pageHeader_name[data-v-209caa6f]{font-size:14px;margin-left:8px}.work_pageHeader .pageHeader_check_work[data-v-209caa6f]{width:122px;border-radius:15px;background:hsla(0,0%,100%,.8);padding:7px 10px;display:-webkit-box;display:-ms-flexbox;display:flex;color:#333;font-size:12px}.work_pageHeader .pageHeader_timer[data-v-209caa6f]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;color:#fff;font-size:14px;line-height:30px;margin-right:16px}.work_pageHeader .more_compony[data-v-209caa6f]{position:relative;-webkit-transform:rotate(90deg);transform:rotate(90deg);font-size:10px;margin-left:6px}.check_time[data-v-209caa6f]{-webkit-box-flex:1;-ms-flex:1;flex:1;border-right:1px solid #999;text-align:left;font-size:13px;color:#333;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.check_time img[data-v-209caa6f]{width:14px;height:14px}.check_time span[data-v-209caa6f]{margin-left:5px}.check_button[data-v-209caa6f]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;line-height:18px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-86bb0962] .van-ellipsis{font-size:18px;color:#fff}[data-v-86bb0962] .van-dropdown-menu__title{color:#fff!important;padding:0 8px 0 0!important}[data-v-86bb0962] .van-dropdown-menu .van-dropdown-menu__bar .van-dropdown-menu__title--active{color:#fff!important}[data-v-86bb0962] .van-dropdown-menu__title:after{border-color:transparent transparent #fff #fff!important;right:0}[data-v-86bb0962] .van-dropdown-menu__bar{background-color:unset!important;-webkit-box-shadow:unset!important;box-shadow:unset!important}[data-v-86bb0962] .van-dropdown-menu__item{-webkit-box-pack:left;-ms-flex-pack:left;justify-content:left}[data-v-86bb0962] .chat_icon .van-info{top:5px!important;right:-4px!important}.work_pageHeader[data-v-86bb0962]{background:url(" + ___CSS_LOADER_URL_REPLACEMENT_0___ + ");padding:0 16px;height:123px;font-size:16px;color:#fff;background-repeat:no-repeat;background-size:cover;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transition:height .3s;transition:height .3s}.work_pageHeader[data-v-86bb0962],.work_pageHeader .flex-horizon-bw[data-v-86bb0962]{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.work_pageHeader .flex-horizon-bw[data-v-86bb0962]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageHeader .pageHeader_compony[data-v-86bb0962]{font-size:18px;font-weight:500;color:#fff;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-right:10px;height:48px;line-height:48px}.work_pageHeader .pageHeader_name[data-v-86bb0962]{font-size:14px;margin-left:8px}.work_pageHeader .pageHeader_check_work[data-v-86bb0962]{width:122px;border-radius:15px;background:hsla(0,0%,100%,.8);padding:7px 10px;display:-webkit-box;display:-ms-flexbox;display:flex;color:#333;font-size:12px}.work_pageHeader .pageHeader_timer[data-v-86bb0962]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;color:#fff;font-size:14px;line-height:30px;margin-right:16px}.work_pageHeader .more_compony[data-v-86bb0962]{position:relative;-webkit-transform:rotate(90deg);transform:rotate(90deg);font-size:10px;margin-left:6px}.check_time[data-v-86bb0962]{-webkit-box-flex:1;-ms-flex:1;flex:1;border-right:1px solid #999;text-align:left;font-size:13px;color:#333;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.check_time img[data-v-86bb0962]{width:14px;height:14px}.check_time span[data-v-86bb0962]{margin-left:5px}.check_button[data-v-86bb0962]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;line-height:18px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -22715,19 +22728,19 @@ var update = add("300ba1e0", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 2946:
+/***/ 4739:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(8814);
+var content = __webpack_require__(4671);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("493b1204", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("fdc6b6a2", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -27746,8 +27759,8 @@ var commonApps_component = normalizeComponent(
 )
 
 /* harmony default export */ var commonApps = (commonApps_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=template&id=209caa6f&scoped=true
-var workHeadvue_type_template_id_209caa6f_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=template&id=86bb0962&scoped=true
+var workHeadvue_type_template_id_86bb0962_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -27871,7 +27884,7 @@ var workHeadvue_type_template_id_209caa6f_scoped_true_render = function render()
     staticClass: "pageHeader_timer"
   }, [_c('span', [_vm._v(_vm._s(_vm.nowDay))])])])]);
 };
-var workHeadvue_type_template_id_209caa6f_scoped_true_staticRenderFns = [];
+var workHeadvue_type_template_id_86bb0962_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/vuex/dist/vuex.esm.js
 /*!
@@ -29084,6 +29097,15 @@ var workClock = __webpack_require__(2554);
           _this.organName = item.code;
         }
       });
+    },
+    $route: function $route(to, from) {
+      var kqdkDis = sessionStorage.getItem('kqdk-dis');
+      if (kqdkDis) {
+        //从考勤打卡页面返回到首页，已经有定位成功信息，刷新打卡信息
+        if (this.dakaType === '正在定位' && to.path === '/main' && from.path.indexOf('login') === -1) {
+          workClock.freshData(this);
+        }
+      }
     }
   },
   created: function created() {
@@ -29177,6 +29199,8 @@ var workClock = __webpack_require__(2554);
                 document.querySelector('.work_pageHeader').style.background = 'url(' + url + ')';
                 document.querySelector('.work_pageHeader').style.backgroundSize = 'cover';
                 document.querySelector('.work_pageHeader').style.backgroundRepeat = 'no-repeat';
+              } else {
+                document.querySelector('.work_pageHeader').style.background = 'url(./images/m-imgs/workBg/workBg.png)';
               }
             case 8:
             case "end":
@@ -29234,13 +29258,13 @@ var workClock = __webpack_require__(2554);
     },
     loadH5apps: function loadH5apps() {
       var _this5 = this;
+      var productList = this.$store.getters.productCodeList;
+      if (!productList) return;
       var h5apps = this.routes.filter(function (route) {
         if (route.meta && route.meta.h5Url) return true;
       });
-      var productList = this.$store.getters.productCodeList;
       h5apps.forEach(function (route) {
         var mapp = route.meta;
-        if (!productList) return;
         for (var key in productList) {
           if (key === mapp.sysCode && productList[key] === 'ecykq') {
             window.$user.findUserRolePermissions().then(function (res) {
@@ -29258,10 +29282,12 @@ var workClock = __webpack_require__(2554);
                       workClock.default.freshData(_this5);
                     }
                     _this5.curInterval = setInterval(function () {
-                      if (workClock.freshData) {
-                        workClock.freshData(_this5);
-                      } else if (workClock.default) {
-                        workClock.default.freshData(_this5);
+                      if (_this5.$route.path == '/main') {
+                        if (workClock.freshData) {
+                          workClock.freshData(_this5);
+                        } else if (workClock.default) {
+                          workClock.default.freshData(_this5);
+                        }
                       }
                     }, 1000 * 60);
                   });
@@ -29274,10 +29300,18 @@ var workClock = __webpack_require__(2554);
     },
     // 检查打卡
     checkWork: function checkWork() {
-      if (workClock.dkEvent) {
-        workClock.dkEvent(this);
-      } else if (workClock.default) {
-        workClock.default.dkEvent(this);
+      if (window.T) {
+        if (workClock.dkEvent) {
+          workClock.dkEvent(this);
+        } else if (workClock.default) {
+          workClock.default.dkEvent(this);
+        }
+      } else {
+        this.$dialog.confirm({
+          message: this.$tx('desktop.components.mapServiceError', '地图服务加载失败，是否重试？')
+        }).then(function () {
+          location.reload();
+        });
       }
     },
     formatNowDay: function formatNowDay() {
@@ -29357,9 +29391,9 @@ var workClock = __webpack_require__(2554);
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=script&lang=js
  /* harmony default export */ var components_workHeadvue_type_script_lang_js = (workHeadvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=209caa6f&prod&scoped=true&lang=scss
-var workHeadvue_type_style_index_0_id_209caa6f_prod_scoped_true_lang_scss = __webpack_require__(2946);
-;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=209caa6f&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=86bb0962&prod&scoped=true&lang=scss
+var workHeadvue_type_style_index_0_id_86bb0962_prod_scoped_true_lang_scss = __webpack_require__(4739);
+;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=86bb0962&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue
 
@@ -29372,11 +29406,11 @@ var workHeadvue_type_style_index_0_id_209caa6f_prod_scoped_true_lang_scss = __we
 
 var workHead_component = normalizeComponent(
   components_workHeadvue_type_script_lang_js,
-  workHeadvue_type_template_id_209caa6f_scoped_true_render,
-  workHeadvue_type_template_id_209caa6f_scoped_true_staticRenderFns,
+  workHeadvue_type_template_id_86bb0962_scoped_true_render,
+  workHeadvue_type_template_id_86bb0962_scoped_true_staticRenderFns,
   false,
   null,
-  "209caa6f",
+  "86bb0962",
   null
   
 )