ecinc-cloud-moadesktop 9.6.273 → 9.6.274

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/ecmoadesktop.common.js +34 -20
  2. package/lib/ecmoadesktop.umd.js +34 -20
  3. package/lib/ecmoadesktop.umd.min.js +3 -3
  4. package/package.json +1 -1
package/lib/ecmoadesktop.common.js CHANGED
@@ -332,7 +332,7 @@ function getCurAddress(lng, lat) {
332
332
  }
333
333
 
334
334
  // 定位
335
- function curLocationAndDis() {
335
+ function curLocationAndDis(timeSpanData) {
336
336
  var device = js_cookie__WEBPACK_IMPORTED_MODULE_0___default().get('device');
337
337
  return new Promise(function (resolve) {
338
338
  var locationed = false;
@@ -377,6 +377,7 @@ function curLocationAndDis() {
377
377
  resolve(false);
378
378
  } else if (window.mappType === 'ecinc') {
379
379
  //APP定位
380
+ var locationTimeout = false;
380
381
  $parent.$wv.getLocationInformation(function (res) {
381
382
  if (typeof res === 'string') res = JSON.parse(res);
382
383
  if (res && res.data) {
@@ -390,8 +391,11 @@ function curLocationAndDis() {
390
391
 
391
392
  if (dis === null || dis > gpsScope) {
392
393
  resolve(false);
393
- } else {
394
+ } else if (!locationTimeout) {
394
395
  resolve(true);
396
+ } else {
397
+ //超时后返回定位成功信息,更新打卡状态
398
+ $parent.dakaType = dakaType[timeSpanData.dakaType];
395
399
  }
396
400
  }
397
401
  });
@@ -403,9 +407,10 @@ function curLocationAndDis() {
403
407
  } else {
404
408
  //console.log('$wv getCurrentPosition res =', res)
405
409
  resolve(false);
410
+ locationTimeout = true;
406
411
  }
407
412
  }
408
- }, 15000);
413
+ }, 20000);
409
414
  } else if (window.isOpenMapLocation === 1) {
410
415
  lo.getCurrentPosition(h5Position);
411
416
  } else if (device === 'qywx') {
@@ -497,7 +502,7 @@ var defaultMethods = {
497
502
  $parent.$forceUpdate();
498
503
 
499
504
  // 获取位置信息
500
- curLocationAndDis().then(function (res) {
505
+ curLocationAndDis(timeSpanData).then(function (res) {
501
506
  if (!res) {
502
507
  $parent.dakaType = dakaType[0];
503
508
  } else {
@@ -666,7 +671,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-ef203e2e]{display:-web
666
671
 
667
672
  /***/ }),
668
673
 
669
- /***/ 67:
674
+ /***/ 1951:
670
675
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
671
676
 
672
677
  "use strict";
@@ -685,7 +690,7 @@ var ___CSS_LOADER_URL_IMPORT_0___ = new URL(/* asset import */ __webpack_require
685
690
  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()));
686
691
  var ___CSS_LOADER_URL_REPLACEMENT_0___ = _node_modules_css_loader_dist_runtime_getUrl_js__WEBPACK_IMPORTED_MODULE_2___default()(___CSS_LOADER_URL_IMPORT_0___);
687
692
  // Module
688
- ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-129e43c6] .van-ellipsis{font-size:18px;color:#fff}[data-v-129e43c6] .van-dropdown-menu__title{color:#fff!important;padding:0 8px 0 0!important}[data-v-129e43c6] .van-dropdown-menu .van-dropdown-menu__bar .van-dropdown-menu__title--active{color:#fff!important}[data-v-129e43c6] .van-dropdown-menu__title:after{border-color:transparent transparent #fff #fff!important;right:0}[data-v-129e43c6] .van-dropdown-menu__bar{background-color:unset!important;-webkit-box-shadow:unset!important;box-shadow:unset!important}[data-v-129e43c6] .van-dropdown-menu__item{-webkit-box-pack:left;-ms-flex-pack:left;justify-content:left}[data-v-129e43c6] .chat_icon .van-info{top:5px!important;right:-4px!important}.work_pageHeader[data-v-129e43c6]{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-129e43c6],.work_pageHeader .flex-horizon-bw[data-v-129e43c6]{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.work_pageHeader .flex-horizon-bw[data-v-129e43c6]{-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-129e43c6]{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-129e43c6]{font-size:14px;margin-left:8px}.work_pageHeader .pageHeader_check_work[data-v-129e43c6]{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-129e43c6]{-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-129e43c6]{position:relative;-webkit-transform:rotate(90deg);transform:rotate(90deg);font-size:10px;margin-left:6px}.check_time[data-v-129e43c6]{-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-129e43c6]{width:14px;height:14px}.check_time span[data-v-129e43c6]{margin-left:5px}.check_button[data-v-129e43c6]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;line-height:18px}", ""]);
693
+ ___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}", ""]);
689
694
  // Exports
690
695
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
691
696
 
@@ -22713,19 +22718,19 @@ var update = add("b0496ae0", content, true, {"sourceMap":false,"shadowMode":fals
22713
22718
 
22714
22719
  /***/ }),
22715
22720
 
22716
- /***/ 5013:
22721
+ /***/ 7989:
22717
22722
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
22718
22723
 
22719
22724
  // style-loader: Adds some css to the DOM by adding a <style> tag
22720
22725
 
22721
22726
  // load the styles
22722
- var content = __webpack_require__(67);
22727
+ var content = __webpack_require__(1951);
22723
22728
  if(content.__esModule) content = content.default;
22724
22729
  if(typeof content === 'string') content = [[module.id, content, '']];
22725
22730
  if(content.locals) module.exports = content.locals;
22726
22731
  // add the styles to the DOM
22727
22732
  var add = (__webpack_require__(9548)/* ["default"] */ .A)
22728
- var update = add("0316488b", content, true, {"sourceMap":false,"shadowMode":false});
22733
+ var update = add("40fdc02f", content, true, {"sourceMap":false,"shadowMode":false});
22729
22734
 
22730
22735
  /***/ }),
22731
22736
 
@@ -27744,8 +27749,8 @@ var commonApps_component = normalizeComponent(
27744
27749
  )
27745
27750
 
27746
27751
  /* harmony default export */ var commonApps = (commonApps_component.exports);
27747
- ;// 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=129e43c6&scoped=true
27748
- var workHeadvue_type_template_id_129e43c6_scoped_true_render = function render() {
27752
+ ;// 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
27753
+ var workHeadvue_type_template_id_86bb0962_scoped_true_render = function render() {
27749
27754
  var _vm = this,
27750
27755
  _c = _vm._self._c;
27751
27756
  return _c('div', {
@@ -27869,7 +27874,7 @@ var workHeadvue_type_template_id_129e43c6_scoped_true_render = function render()
27869
27874
  staticClass: "pageHeader_timer"
27870
27875
  }, [_c('span', [_vm._v(_vm._s(_vm.nowDay))])])])]);
27871
27876
  };
27872
- var workHeadvue_type_template_id_129e43c6_scoped_true_staticRenderFns = [];
27877
+ var workHeadvue_type_template_id_86bb0962_scoped_true_staticRenderFns = [];
27873
27878
 
27874
27879
  ;// CONCATENATED MODULE: ./node_modules/vuex/dist/vuex.esm.js
27875
27880
  /*!
@@ -29082,6 +29087,15 @@ var workClock = __webpack_require__(2396);
29082
29087
  _this.organName = item.code;
29083
29088
  }
29084
29089
  });
29090
+ },
29091
+ $route: function $route(to, from) {
29092
+ var kqdkDis = sessionStorage.getItem('kqdk-dis');
29093
+ if (kqdkDis) {
29094
+ //从考勤打卡页面返回到首页，已经有定位成功信息，刷新打卡信息
29095
+ if (this.dakaType === '正在定位' && to.path === '/main' && from.path.indexOf('login') === -1) {
29096
+ workClock.freshData(this);
29097
+ }
29098
+ }
29085
29099
  }
29086
29100
  },
29087
29101
  created: function created() {
@@ -29234,13 +29248,13 @@ var workClock = __webpack_require__(2396);
29234
29248
  },
29235
29249
  loadH5apps: function loadH5apps() {
29236
29250
  var _this5 = this;
29251
+ var productList = this.$store.getters.productCodeList;
29252
+ if (!productList) return;
29237
29253
  var h5apps = this.routes.filter(function (route) {
29238
29254
  if (route.meta && route.meta.h5Url) return true;
29239
29255
  });
29240
- var productList = this.$store.getters.productCodeList;
29241
29256
  h5apps.forEach(function (route) {
29242
29257
  var mapp = route.meta;
29243
- if (!productList) return;
29244
29258
  for (var key in productList) {
29245
29259
  if (key === mapp.sysCode && productList[key] === 'ecykq') {
29246
29260
  window.$user.findUserRolePermissions().then(function (res) {
@@ -29367,9 +29381,9 @@ var workClock = __webpack_require__(2396);
29367
29381
  });
29368
29382
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=script&lang=js
29369
29383
  /* harmony default export */ var components_workHeadvue_type_script_lang_js = (workHeadvue_type_script_lang_js);
29370
- // 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=129e43c6&prod&scoped=true&lang=scss
29371
- var workHeadvue_type_style_index_0_id_129e43c6_prod_scoped_true_lang_scss = __webpack_require__(5013);
29372
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=129e43c6&prod&scoped=true&lang=scss
29384
+ // 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
29385
+ var workHeadvue_type_style_index_0_id_86bb0962_prod_scoped_true_lang_scss = __webpack_require__(7989);
29386
+ ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=86bb0962&prod&scoped=true&lang=scss
29373
29387
 
29374
29388
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue
29375
29389
 
@@ -29382,11 +29396,11 @@ var workHeadvue_type_style_index_0_id_129e43c6_prod_scoped_true_lang_scss = __we
29382
29396
 
29383
29397
  var workHead_component = normalizeComponent(
29384
29398
  components_workHeadvue_type_script_lang_js,
29385
- workHeadvue_type_template_id_129e43c6_scoped_true_render,
29386
- workHeadvue_type_template_id_129e43c6_scoped_true_staticRenderFns,
29399
+ workHeadvue_type_template_id_86bb0962_scoped_true_render,
29400
+ workHeadvue_type_template_id_86bb0962_scoped_true_staticRenderFns,
29387
29401
  false,
29388
29402
  null,
29389
- "129e43c6",
29403
+ "86bb0962",
29390
29404
  null
29391
29405
 
29392
29406
  )
package/lib/ecmoadesktop.umd.js CHANGED
@@ -342,7 +342,7 @@ function getCurAddress(lng, lat) {
342
342
  }
343
343
 
344
344
  // 定位
345
- function curLocationAndDis() {
345
+ function curLocationAndDis(timeSpanData) {
346
346
  var device = js_cookie__WEBPACK_IMPORTED_MODULE_0___default().get('device');
347
347
  return new Promise(function (resolve) {
348
348
  var locationed = false;
@@ -387,6 +387,7 @@ function curLocationAndDis() {
387
387
  resolve(false);
388
388
  } else if (window.mappType === 'ecinc') {
389
389
  //APP定位
390
+ var locationTimeout = false;
390
391
  $parent.$wv.getLocationInformation(function (res) {
391
392
  if (typeof res === 'string') res = JSON.parse(res);
392
393
  if (res && res.data) {
@@ -400,8 +401,11 @@ function curLocationAndDis() {
400
401
 
401
402
  if (dis === null || dis > gpsScope) {
402
403
  resolve(false);
403
- } else {
404
+ } else if (!locationTimeout) {
404
405
  resolve(true);
406
+ } else {
407
+ //超时后返回定位成功信息,更新打卡状态
408
+ $parent.dakaType = dakaType[timeSpanData.dakaType];
405
409
  }
406
410
  }
407
411
  });
@@ -413,9 +417,10 @@ function curLocationAndDis() {
413
417
  } else {
414
418
  //console.log('$wv getCurrentPosition res =', res)
415
419
  resolve(false);
420
+ locationTimeout = true;
416
421
  }
417
422
  }
418
- }, 15000);
423
+ }, 20000);
419
424
  } else if (window.isOpenMapLocation === 1) {
420
425
  lo.getCurrentPosition(h5Position);
421
426
  } else if (device === 'qywx') {
@@ -507,7 +512,7 @@ var defaultMethods = {
507
512
  $parent.$forceUpdate();
508
513
 
509
514
  // 获取位置信息
510
- curLocationAndDis().then(function (res) {
515
+ curLocationAndDis(timeSpanData).then(function (res) {
511
516
  if (!res) {
512
517
  $parent.dakaType = dakaType[0];
513
518
  } else {
@@ -676,7 +681,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-ef203e2e]{display:-web
676
681
 
677
682
  /***/ }),
678
683
 
679
- /***/ 2787:
684
+ /***/ 4671:
680
685
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
681
686
 
682
687
  "use strict";
@@ -695,7 +700,7 @@ var ___CSS_LOADER_URL_IMPORT_0___ = new URL(/* asset import */ __webpack_require
695
700
  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()));
696
701
  var ___CSS_LOADER_URL_REPLACEMENT_0___ = _node_modules_css_loader_dist_runtime_getUrl_js__WEBPACK_IMPORTED_MODULE_2___default()(___CSS_LOADER_URL_IMPORT_0___);
697
702
  // Module
698
- ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-129e43c6] .van-ellipsis{font-size:18px;color:#fff}[data-v-129e43c6] .van-dropdown-menu__title{color:#fff!important;padding:0 8px 0 0!important}[data-v-129e43c6] .van-dropdown-menu .van-dropdown-menu__bar .van-dropdown-menu__title--active{color:#fff!important}[data-v-129e43c6] .van-dropdown-menu__title:after{border-color:transparent transparent #fff #fff!important;right:0}[data-v-129e43c6] .van-dropdown-menu__bar{background-color:unset!important;-webkit-box-shadow:unset!important;box-shadow:unset!important}[data-v-129e43c6] .van-dropdown-menu__item{-webkit-box-pack:left;-ms-flex-pack:left;justify-content:left}[data-v-129e43c6] .chat_icon .van-info{top:5px!important;right:-4px!important}.work_pageHeader[data-v-129e43c6]{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-129e43c6],.work_pageHeader .flex-horizon-bw[data-v-129e43c6]{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.work_pageHeader .flex-horizon-bw[data-v-129e43c6]{-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-129e43c6]{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-129e43c6]{font-size:14px;margin-left:8px}.work_pageHeader .pageHeader_check_work[data-v-129e43c6]{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-129e43c6]{-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-129e43c6]{position:relative;-webkit-transform:rotate(90deg);transform:rotate(90deg);font-size:10px;margin-left:6px}.check_time[data-v-129e43c6]{-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-129e43c6]{width:14px;height:14px}.check_time span[data-v-129e43c6]{margin-left:5px}.check_button[data-v-129e43c6]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;line-height:18px}", ""]);
703
+ ___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}", ""]);
699
704
  // Exports
700
705
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
701
706
 
@@ -22723,19 +22728,19 @@ var update = add("300ba1e0", content, true, {"sourceMap":false,"shadowMode":fals
22723
22728
 
22724
22729
  /***/ }),
22725
22730
 
22726
- /***/ 2895:
22731
+ /***/ 4739:
22727
22732
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
22728
22733
 
22729
22734
  // style-loader: Adds some css to the DOM by adding a <style> tag
22730
22735
 
22731
22736
  // load the styles
22732
- var content = __webpack_require__(2787);
22737
+ var content = __webpack_require__(4671);
22733
22738
  if(content.__esModule) content = content.default;
22734
22739
  if(typeof content === 'string') content = [[module.id, content, '']];
22735
22740
  if(content.locals) module.exports = content.locals;
22736
22741
  // add the styles to the DOM
22737
22742
  var add = (__webpack_require__(9548)/* ["default"] */ .A)
22738
- var update = add("43352d0b", content, true, {"sourceMap":false,"shadowMode":false});
22743
+ var update = add("fdc6b6a2", content, true, {"sourceMap":false,"shadowMode":false});
22739
22744
 
22740
22745
  /***/ }),
22741
22746
 
@@ -27754,8 +27759,8 @@ var commonApps_component = normalizeComponent(
27754
27759
  )
27755
27760
 
27756
27761
  /* harmony default export */ var commonApps = (commonApps_component.exports);
27757
- ;// 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=129e43c6&scoped=true
27758
- var workHeadvue_type_template_id_129e43c6_scoped_true_render = function render() {
27762
+ ;// 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
27763
+ var workHeadvue_type_template_id_86bb0962_scoped_true_render = function render() {
27759
27764
  var _vm = this,
27760
27765
  _c = _vm._self._c;
27761
27766
  return _c('div', {
@@ -27879,7 +27884,7 @@ var workHeadvue_type_template_id_129e43c6_scoped_true_render = function render()
27879
27884
  staticClass: "pageHeader_timer"
27880
27885
  }, [_c('span', [_vm._v(_vm._s(_vm.nowDay))])])])]);
27881
27886
  };
27882
- var workHeadvue_type_template_id_129e43c6_scoped_true_staticRenderFns = [];
27887
+ var workHeadvue_type_template_id_86bb0962_scoped_true_staticRenderFns = [];
27883
27888
 
27884
27889
  ;// CONCATENATED MODULE: ./node_modules/vuex/dist/vuex.esm.js
27885
27890
  /*!
@@ -29092,6 +29097,15 @@ var workClock = __webpack_require__(2554);
29092
29097
  _this.organName = item.code;
29093
29098
  }
29094
29099
  });
29100
+ },
29101
+ $route: function $route(to, from) {
29102
+ var kqdkDis = sessionStorage.getItem('kqdk-dis');
29103
+ if (kqdkDis) {
29104
+ //从考勤打卡页面返回到首页，已经有定位成功信息，刷新打卡信息
29105
+ if (this.dakaType === '正在定位' && to.path === '/main' && from.path.indexOf('login') === -1) {
29106
+ workClock.freshData(this);
29107
+ }
29108
+ }
29095
29109
  }
29096
29110
  },
29097
29111
  created: function created() {
@@ -29244,13 +29258,13 @@ var workClock = __webpack_require__(2554);
29244
29258
  },
29245
29259
  loadH5apps: function loadH5apps() {
29246
29260
  var _this5 = this;
29261
+ var productList = this.$store.getters.productCodeList;
29262
+ if (!productList) return;
29247
29263
  var h5apps = this.routes.filter(function (route) {
29248
29264
  if (route.meta && route.meta.h5Url) return true;
29249
29265
  });
29250
- var productList = this.$store.getters.productCodeList;
29251
29266
  h5apps.forEach(function (route) {
29252
29267
  var mapp = route.meta;
29253
- if (!productList) return;
29254
29268
  for (var key in productList) {
29255
29269
  if (key === mapp.sysCode && productList[key] === 'ecykq') {
29256
29270
  window.$user.findUserRolePermissions().then(function (res) {
@@ -29377,9 +29391,9 @@ var workClock = __webpack_require__(2554);
29377
29391
  });
29378
29392
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=script&lang=js
29379
29393
  /* harmony default export */ var components_workHeadvue_type_script_lang_js = (workHeadvue_type_script_lang_js);
29380
- // 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=129e43c6&prod&scoped=true&lang=scss
29381
- var workHeadvue_type_style_index_0_id_129e43c6_prod_scoped_true_lang_scss = __webpack_require__(2895);
29382
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=129e43c6&prod&scoped=true&lang=scss
29394
+ // 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
29395
+ var workHeadvue_type_style_index_0_id_86bb0962_prod_scoped_true_lang_scss = __webpack_require__(4739);
29396
+ ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=86bb0962&prod&scoped=true&lang=scss
29383
29397
 
29384
29398
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue
29385
29399
 
@@ -29392,11 +29406,11 @@ var workHeadvue_type_style_index_0_id_129e43c6_prod_scoped_true_lang_scss = __we
29392
29406
 
29393
29407
  var workHead_component = normalizeComponent(
29394
29408
  components_workHeadvue_type_script_lang_js,
29395
- workHeadvue_type_template_id_129e43c6_scoped_true_render,
29396
- workHeadvue_type_template_id_129e43c6_scoped_true_staticRenderFns,
29409
+ workHeadvue_type_template_id_86bb0962_scoped_true_render,
29410
+ workHeadvue_type_template_id_86bb0962_scoped_true_staticRenderFns,
29397
29411
  false,
29398
29412
  null,
29399
- "129e43c6",
29413
+ "86bb0962",
29400
29414
  null
29401
29415
 
29402
29416
  )